[SCM] Civilization turn-based strategy game branch, upstream, updated. upstream/2.1.9
Clint Adams
schizo at debian.org
Wed Nov 4 16:47:24 UTC 2009
The following commit has been merged in the upstream branch:
commit 5ceec30bae6454bb3f1f084563a99d091f633608
Author: Clint Adams <schizo at debian.org>
Date: Mon Jun 22 22:41:44 2009 -0400
Imported Upstream version 2.1.9
diff --git a/ChangeLog b/ChangeLog
index 4523e45..1f9b065 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,795 @@
+------------------------------------------------------------------------
+r15604 | dmarks | 2009-03-25 08:07:13 +0900 (Wed, 25 Mar 2009) | 1 line
+
+Changes after running update-po
+------------------------------------------------------------------------
+r15603 | chrisk | 2009-03-25 06:09:52 +0900 (Wed, 25 Mar 2009) | 2 lines
+
+
+4330 translated messages.
+------------------------------------------------------------------------
+r15601 | dmarks | 2009-03-24 22:11:57 +0900 (Tue, 24 Mar 2009) | 1 line
+
+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
+
+
+4330 translated messages.
+------------------------------------------------------------------------
+r15599 | dmarks | 2009-03-24 09:31:07 +0900 (Tue, 24 Mar 2009) | 1 line
+
+Changes after running update-po
+------------------------------------------------------------------------
+r15598 | jcreus | 2009-03-24 07:46:38 +0900 (Tue, 24 Mar 2009) | 1 line
+
+4330 translated messages
+------------------------------------------------------------------------
+r15596 | mbook | 2009-03-24 03:19:27 +0900 (Tue, 24 Mar 2009) | 4 lines
+
+Automatically update old metaserver address.
+
+See #40752
+
+------------------------------------------------------------------------
+r15595 | dmarks | 2009-03-23 19:29:19 +0900 (Mon, 23 Mar 2009) | 1 line
+
+Fix gettext error
+------------------------------------------------------------------------
+r15594 | dmarks | 2009-03-22 19:19:02 +0900 (Sun, 22 Mar 2009) | 1 line
+
+Update NEWS for 2.1.9
+------------------------------------------------------------------------
+r15593 | dmarks | 2009-03-22 19:06:30 +0900 (Sun, 22 Mar 2009) | 1 line
+
+77 translated messages, 4251 untranslated messages.
+------------------------------------------------------------------------
+r15592 | dmarks | 2009-03-22 18:58:31 +0900 (Sun, 22 Mar 2009) | 1 line
+
+2503 translated messages, 1825 untranslated messages.
+------------------------------------------------------------------------
+r15591 | dmarks | 2009-03-22 18:42:17 +0900 (Sun, 22 Mar 2009) | 1 line
+
+2501 translated messages, 1827 untranslated messages.
+------------------------------------------------------------------------
+r15590 | dmarks | 2009-03-22 18:22:44 +0900 (Sun, 22 Mar 2009) | 1 line
+
+Changes after running update-po
+------------------------------------------------------------------------
+r15589 | dmarks | 2009-03-22 16:06:52 +0900 (Sun, 22 Mar 2009) | 1 line
+
+2494 translated messages, 1834 untranslated messages.
+------------------------------------------------------------------------
+r15587 | mbook | 2009-03-22 12:24:59 +0900 (Sun, 22 Mar 2009) | 4 lines
+
+Use cazfi.net metaserver as the default.
+
+See #40752
+
+------------------------------------------------------------------------
+r15586 | dmarks | 2009-03-22 12:15:51 +0900 (Sun, 22 Mar 2009) | 1 line
+
+Straighten out some fuzzies in Korean translation.
+------------------------------------------------------------------------
+r15584 | chrisk | 2009-03-20 21:37:19 +0900 (Fri, 20 Mar 2009) | 2 lines
+
+city report headers, waste is Verschwendung
+4328 translated messages.
+------------------------------------------------------------------------
+r15583 | chrisk | 2009-03-18 20:39:39 +0900 (Wed, 18 Mar 2009) | 2 lines
+
+Tried to get the shortcuts right
+4328 translated messages.
+------------------------------------------------------------------------
+r15582 | chrisk | 2009-03-17 22:19:32 +0900 (Tue, 17 Mar 2009) | 2 lines
+
+
+4328 translated messages.
+------------------------------------------------------------------------
+r15580 | chrisk | 2009-03-17 04:28:13 +0900 (Tue, 17 Mar 2009) | 2 lines
+
+
+4316 translated messages, 7 fuzzy translations, 5 untranslated messages.
+------------------------------------------------------------------------
+r15578 | mbook | 2009-03-16 08:58:27 +0900 (Mon, 16 Mar 2009) | 6 lines
+
+Work around crash due to missing NULL pointer check in gtk notebook code.
+
+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
+
+Fix data type bug causing unit power factor to lose precision.
+
+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
+
+Updated translation by Joe Dalton
+
+------------------------------------------------------------------------
+r15574 | cazfi | 2009-03-09 03:42:13 +0900 (Mon, 09 Mar 2009) | 2 lines
+
+Updated translation by Joe Dalton
+
+------------------------------------------------------------------------
+r15570 | jcreus | 2009-03-08 03:20:38 +0900 (Sun, 08 Mar 2009) | 1 line
+
+4328 messages
+------------------------------------------------------------------------
+r15568 | cazfi | 2009-03-06 23:25:30 +0900 (Fri, 06 Mar 2009) | 2 lines
+
+Updated translation by Sini Ruohomaa.
+
+------------------------------------------------------------------------
+r15566 | mbook | 2009-03-04 07:59:28 +0900 (Wed, 04 Mar 2009) | 20 lines
+
+Rearrange widget layout to fit on an 800x600 display.
+
+- Main page buttons are arranged in a 3x2 table.
+- Removed most calls to gtk_widget_set_size_request().
+- Do not fill in the unit pixmap table until after
+ the game starts.
+- Player report buttons are replaced by a menu bar.
+- Allow horizontal scrolling for the pregame player
+ list and chat textview.
+- The unit info label and civilization info label
+ contents are aligned to the left.
+
+See #12825
+
+Requested by:
+ Steve Walton <swalton at clara.net>
+ Peeter Vois <Peeter.Vois at mail.ee>
+ jukey <jukey at ju-key.de>
+ Vadim Peretokin <vperetokin at gmail.com>
+
+------------------------------------------------------------------------
+r15564 | mbook | 2009-03-04 07:41:50 +0900 (Wed, 04 Mar 2009) | 8 lines
+
+Sort small wonders separately in production lists.
+
+- Small wonders are sorted before great wonders in
+ their own block, instead of being mixed in with
+ regular buildings.
+
+See #40740
+
+------------------------------------------------------------------------
+r15562 | mbook | 2009-03-04 07:36:36 +0900 (Wed, 04 Mar 2009) | 15 lines
+
+Improved popit info text.
+
+- Added location coordinates, native coordinates and
+ continent number.
+- Added owner username (or player name for AIs) and
+ owner team to tile, city and unit description strings.
+- Added line break and indent between city description
+ and city improvements.
+- Updated TRANS comments and used angled brackets <>
+ for %s example placeholders.
+
+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
+
+Multiplayer allies-only chat toggle button and option.
+
+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
+
+Workaround for gcc optimization bug causing server to crash immediately
+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
+
+Updated translation by Joe Dalton.
+
+------------------------------------------------------------------------
+r15553 | cproc | 2009-03-01 07:37:27 +0900 (Sun, 01 Mar 2009) | 3 lines
+
+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
+
+Some new translations, some fixes to oddites
+------------------------------------------------------------------------
+r15548 | mbook | 2009-02-26 12:23:39 +0900 (Thu, 26 Feb 2009) | 4 lines
+
+Fix missing Q_() for qualified column name.
+
+See #40738
+
+------------------------------------------------------------------------
+r15545 | cazfi | 2009-02-25 01:35:44 +0900 (Wed, 25 Feb 2009) | 4 lines
+
+Fixed compiler warnings.
+
+See #40736
+
+------------------------------------------------------------------------
+r15542 | mbook | 2009-02-23 06:56:48 +0900 (Mon, 23 Feb 2009) | 6 lines
+
+Avoid gtk warning due to focusing unrealized treeview.
+
+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
+
+Use localtime() instead of localtime_r() since latter does not exist on all
+supported platforms (MinGW).
+
+See #40726
+
+------------------------------------------------------------------------
+r15538 | mbook | 2009-02-22 09:03:26 +0900 (Sun, 22 Feb 2009) | 19 lines
+
+Improved mass unit selection.
+
+- Shortcut 'j' selects a single unit (the first
+ unit in the selection list).
+- Shortcut 'k' selects all units of the same type
+ as the currently selected units on the same tiles
+ as the currently selected units.
+- Shortcut '<shift>k' selects all units on the same
+ tiles as the currenty selected units.
+- Shortcut 'y' selects all units of the same type
+ on the same continents as the currently selected
+ units.
+- Shortcut '<shift>y' selects all units of the same
+ type as the currently selected units.
+- Selection includes units with orders or units under
+ AI control.
+
+See #40727
+
+------------------------------------------------------------------------
+r15536 | mbook | 2009-02-22 08:46:13 +0900 (Sun, 22 Feb 2009) | 7 lines
+
+City report "Add 2nd Last" production menu item.
+
+See #40729
+
+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
+
+Added set and append worklist menu items to the city report.
+
+See #40728
+
+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
+
+Option to disable caravan popup.
+
+See #40730
+
+------------------------------------------------------------------------
+r15530 | mbook | 2009-02-22 08:24:42 +0900 (Sun, 22 Feb 2009) | 6 lines
+
+Fix "leader" translation ambiguity.
+
+See #40725
+
+Reported by: Susanna Bj?\195?\182rverud <susanna.bjorverud at telia.com>
+
+------------------------------------------------------------------------
+r15528 | mbook | 2009-02-22 08:20:22 +0900 (Sun, 22 Feb 2009) | 4 lines
+
+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
+
+Option to hide message window buttons.
+
+See #40733
+
+------------------------------------------------------------------------
+r15524 | mbook | 2009-02-22 08:08:30 +0900 (Sun, 22 Feb 2009) | 11 lines
+
+Option to have new events appear at the top of the message window.
+
+- Some cleanup and generalization of message
+ window code.
+- The message window list store now keeps track
+ of the "meswin" row of an event added to the
+ store. This value is the index passed to such
+ functions as get_message() and meswin_goto().
+
+See #40718
+
+------------------------------------------------------------------------
+r15522 | mbook | 2009-02-22 07:17:28 +0900 (Sun, 22 Feb 2009) | 4 lines
+
+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
+
+Option to split the lower area into two notebooks.
+
+- If the option is enabled, the message window will
+ always appear in the right notebook.
+
+See #40705
+
+------------------------------------------------------------------------
+r15518 | mbook | 2009-02-22 06:08:41 +0900 (Sun, 22 Feb 2009) | 9 lines
+
+Revert city report column ordering changes of r12989.
+
+- The first four columns of the city report are name,
+ size, state and concise state.
+- In the gtk2 client, columns may be reordered by clicking
+ and dragging the column headers.
+
+See #40680
+
+------------------------------------------------------------------------
+r15516 | mbook | 2009-02-20 14:08:25 +0900 (Fri, 20 Feb 2009) | 9 lines
+
+Option to not clear unit orders on selection.
+
+- If the option is enabled, selecting a unit does
+ not clear its orders.
+- Orders can be cleared by issuing new orders or
+ by pressing <space>.
+
+See #40724
+
+------------------------------------------------------------------------
+r15514 | mbook | 2009-02-20 11:03:49 +0900 (Fri, 20 Feb 2009) | 4 lines
+
+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
+
+Improved automatic chatline scrolling.
+
+- The chatline textview is scrolled to the bottom
+ when switching to the pregame or game page, and
+ whenever the textview widget is resized.
+
+See #40721
+
+------------------------------------------------------------------------
+r15510 | mbook | 2009-02-20 10:46:06 +0900 (Fri, 20 Feb 2009) | 4 lines
+
+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
+
+Map decoration drawing speedup and cleanup.
+
+- Removed drawing code from client/goto.[ch].
+- Removed expensive redraws caused by calls to
+ update_map_canvas_visible() in popit and
+ selection rectangle code.
+- Replaced map-sized arrays by hash tables.
+- Added 'mapdeco' API for marking tile highlights,
+ tile crosshairs, and goto line segments.
+
+See #40717
+
+------------------------------------------------------------------------
+r15507 | mbook | 2009-02-20 10:17:20 +0900 (Fri, 20 Feb 2009) | 4 lines
+
+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
+
+Updating Catalan translation
+------------------------------------------------------------------------
+r15504 | mbook | 2009-02-18 13:31:03 +0900 (Wed, 18 Feb 2009) | 13 lines
+
+Server player list addition and server scan cleanup.
+
+- Information about players on a server is visible
+ in a list view in the network page (it remains
+ empty for lan servers because they do not send
+ this information).
+- General cleanup and simplification of server
+ scan API and usage.
+- Fixed memory leak due to server scans or their
+ resources not being freed in some situations.
+
+See #40707
+
+------------------------------------------------------------------------
+r15502 | mbook | 2009-02-18 13:13:41 +0900 (Wed, 18 Feb 2009) | 7 lines
+
+Buy city production directly from mapview.
+
+- Selecting cities and pressing 'b' buys the cities'
+ productions in the order of cheapest first.
+
+See #40704
+
+------------------------------------------------------------------------
+r15500 | mbook | 2009-02-18 13:05:31 +0900 (Wed, 18 Feb 2009) | 4 lines
+
+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
+
+Revert city report concise status symbols changes.
+
+- The concise city status symbols are changed back to
+ * for celebrating and X for disorder.
+
+See #40700
+
+------------------------------------------------------------------------
+r15496 | mbook | 2009-02-18 11:26:17 +0900 (Wed, 18 Feb 2009) | 8 lines
+
+Use XOR drawing operation for selection rectangle.
+
+- The selection rectangle is erased by drawing over
+ itself.
+- Removed unneeded calls to redraw_selection_rectangle().
+
+See #40646
+
+------------------------------------------------------------------------
+r15485 | mbook | 2009-02-16 09:18:21 +0900 (Mon, 16 Feb 2009) | 6 lines
+
+Minor fixes and improvements in nation legend texts.
+
+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
+
+Fix veteran notify message grammar.
+
+- Do not try to "link up" veteran notify message
+ with previous event.
+- Simplified notify_unit_experience().
+
+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
+
+Fix typo and unused code in SDL strings.
+
+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
+
+Fix "<government> of the <nation>" constructs.
+
+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
+
+Fix and improve gold upkeep disband message.
+
+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
+
+Do not translate internal game loading error message.
+
+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
+
+Fix typos in tutorial scenario.
+
+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
+
+Capitalize first letter of civilization frame label.
+
+See #40692
+
+------------------------------------------------------------------------
+r15477 | mbook | 2009-02-16 09:18:00 +0900 (Mon, 16 Feb 2009) | 6 lines
+
+Fix "workers" translation ambiguity.
+
+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
+
+Fix sentence fragments in text_happiness_units().
+
+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
+
+Fix typo and awkward phrasing in diplomacy help text.
+
+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
+
+Fix civil war message grammar.
+
+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
+
+Improved autogenerated savename with turn number.
+
+See #40681
+
+------------------------------------------------------------------------
+r15468 | mbook | 2009-02-10 13:10:43 +0900 (Tue, 10 Feb 2009) | 4 lines
+
+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
+
+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
+
+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
+
+S2_1 port of the total buy cost label update bug fix.
+
+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
+
+Fix assertion failure when doing irrigation-connect on a mine.
+
+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
+
+Updated translation by Sini Ruohomaa.
+
+------------------------------------------------------------------------
+r15456 | mbook | 2009-01-30 12:42:47 +0900 (Fri, 30 Jan 2009) | 9 lines
+
+Minimal mapview traderoute lines by popular request.
+
+- View menu entry "City Traderoutes" (shortcut ctrl+t)
+ controls whether traderoute lines are drawn on the map.
+
+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
+
+Re-enable copy to production clipboard.
+
+- shift + right mouse button is copy.
+- shift + ctrl + right mouse button is paste.
+
+See #40679
+
+------------------------------------------------------------------------
+r15450 | mbook | 2009-01-29 10:35:12 +0900 (Thu, 29 Jan 2009) | 4 lines
+
+Option to disable all mouse cursor changes.
+
+See #40678
+
+------------------------------------------------------------------------
+r15449 | mbook | 2009-01-29 10:29:39 +0900 (Thu, 29 Jan 2009) | 4 lines
+
+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
+
+Fix teleporting exploit by modifying bounce_unit() behavior.
+
+- When resolving stack conflicts, instead of teleporting
+ to the nearest owned city, units are moved to a random
+ safe tile within a 2 tile distance of their current
+ position.
+
+See #40658
+
+------------------------------------------------------------------------
+r15441 | mbook | 2009-01-26 14:30:57 +0900 (Mon, 26 Jan 2009) | 4 lines
+
+Somewhat clearer client hack access messages.
+
+See #40662
+
+------------------------------------------------------------------------
+r15438 | cazfi | 2009-01-26 00:53:44 +0900 (Mon, 26 Jan 2009) | 5 lines
+
+Fixed a bug that mysql libraries wewre never searched from alternative
+locations.
+
+See #40674
+
+------------------------------------------------------------------------
+r15425 | cazfi | 2009-01-17 20:44:55 +0900 (Sat, 17 Jan 2009) | 6 lines
+
+Fixed bashisms from configure to make it work with Solaris /bin/sh
+
+Patch by Halton Huo
+
+See #40659
+
+------------------------------------------------------------------------
+r15415 | mbook | 2009-01-12 11:18:15 +0900 (Mon, 12 Jan 2009) | 9 lines
+
+Fix compilation with Sun Studio Community Edition compiler.
+
+- Replaced O_COUNT by O_MAX in local struct array field.
+- Replaced COREQ_APPEND macro by equivalent code.
+
+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
+
+Fix startunits in default server script.
+
+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
+
+Make auto-explore respect borders.
+
+See #40570
+
+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
+
+Check for NULL ping timers when closing a connection.
+
+- Add timer_list_iterate macro.
+- Check for NULL connection in close_connection().
+- Check for NULL timer in free_timer().
+
+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
+
+Fix river generation for island generator.
+
+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
+
+Prevent island generator from connecting continents.
+
+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
+
+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
+
+4290 messages
+------------------------------------------------------------------------
+r15346 | dmarks | 2008-11-30 21:46:55 +0900 (Sun, 30 Nov 2008) | 1 line
+
+Bump version to 2.1.8+
+------------------------------------------------------------------------
+r15344 | dmarks | 2008-11-30 21:44:26 +0900 (Sun, 30 Nov 2008) | 1 line
+
+Update changelog for 2.1.8
+
Sun, 30 Nov 2008 03:48:06 -0800 dmarks:
Changed paths:
diff --git a/NEWS b/NEWS
index 19f40ab..26be4e3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,83 @@
-Please see http://www.freeciv.org/wiki/NEWS-2.1.0 for a list of
-changes since Freeciv 2.0.
+This is Freeciv 2.1.9.
-Please see http://www.freeciv.org/wiki/NEWS for a complete list.
+What's changed since 2.1.8:
+
+--
+Fixed crash due to gcc 4.x optimization bug. (#40610)
+
+Fixed island generator rivers and double-continent bug. (#15947, #17435)
+
+Fixed auto-explore not respecting borders. (#40570)
+
+Fixed stack teleporting exploit. (#40658)
+
+Fixed crash when doing irrigation-connect on a mine. (#40676)
+
+Fixed update bug for the city report total buy cost label. (#40695)
+
+Fixed memory leak in server scan code. (#40707)
+
+Fixed data type conversion bug affecting unit power factor. (#40746)
+
+Fixed many typos and style errors in translated messages. (#40688, #40686, #40685, #40684, #40699, #40687, #40689, #40691, #40693, #40694, #40725)
+
+Changed the save file name format to <savename>-T<turn>-Y<year>.sav. (#40681)
+
+Changed the selection rectangle drawing method to speed up map drawing. (#40646)
+
+Changed the city report concise rapture symbols back to * and X. (#40700)
+
+Changed mass unit selection to include units with order or units under AI control. (#40727)
+
+Changed the default metaserver for both client and server to the one at cazfi.net. (#40752)
+
+Improved gtk widget layout so that the Freeciv window can fit on a 800x600 display. (#12825)
+
+Improved map decoration drawing (popup info, goto lines, city high-lighting) for speed and memory efficiency. (#40717)
+
+Improved mass unit selection: j selects a single unit, k selects tile units, y selects continent units. (#40727)
+
+Improved automatic chatline scrolling. (#40721)
+
+Added option to disable mouse cursor changing. (#40678)
+
+Added option to draw traderoute lines with toggle shortcut Ctrl+t. (#40668)
+
+Added option to prefix client chat messages with the current time. (#40706)
+
+Added option to preferentially select cities over units with the selection rectangle. (#40703)
+
+Added option to show production buy cost in the city descriptions. (#40702)
+
+Added option to not clear unit orders when units are selected. (#40724)
+
+Added option to split the lower chatline area in to two notebooks, with the message window appearing in the right notebook. (#40705)
+
+Added option to disable the automatic caravan arrival popup. (#40730)
+
+Added client shortcut b for buying production in selected cities. (#40704)
+
+Added a list view in the network page showing current players on a server. (#40707)
+
+Added client ability to center on an event tile by right-clicking on a row in the message window. (#40719)
+
+Added client ability to reorder city report columns by dragging the column headers in the gtk2 client. (#40680)
+
+Added worklist manipulation operations to the city report menus. (#40723, #40728, #40729)
+
+Added multiplayer allies-only chat toggle button. (#40487)
+
+Added more information to map popup info window. (#40488)
+
+Added a toplevel menu item for the Governor menu in the city report. (#40677)
+
+Added city production clipboard shortcuts Shift+right-click to copy and Ctrl+Shift+right-click to paste. (#40679)
+
+Updated Finnish, Catalan, Estontian, Danish, Lithuanian, German, and Korean translations.
+--
+
+Please see http://www.freeciv.org/wiki/NEWS-2.1.0 for an overview of
+major changes since Freeciv 2.0.
+
+Please see http://www.freeciv.org/wiki/NEWS for a complete list of
+changes.
diff --git a/aclocal.m4 b/aclocal.m4
index de0dcb9..339be12 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -906,20 +906,19 @@ AC_DEFUN([FC_CHECK_AUTH],
[AC_MSG_WARN([couldn't find mysql libs in normal locations]);
auth=false])
- if test x$auth = x$true ; then
+ 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"
- auth=true
AC_CHECK_LIB(mysqlclient, mysql_query,
[AUTH_LIBS="-lmysqlclient $AUTH_LIBS";
- AC_MSG_WARN([had to add $__ldpath to LDFLAGS])],
- [AC_MSG_WARN([couldn't find mysql libs in $__ldpath]);
- auth=false])
+ 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
@@ -927,6 +926,10 @@ AC_DEFUN([FC_CHECK_AUTH],
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"
@@ -4460,7 +4463,7 @@ dnl
# Version number of this script.
# First part is upstream (ggz) version and second Freeciv modifications.
-# serial 0014.1
+# serial 0014.2
dnl ------------------------------------------------------------------------
dnl Find a directory containing a single file
@@ -4646,7 +4649,8 @@ AC_DEFUN([AC_GGZ_VERSION],
LDFLAGS=$LIBGGZ_LDFLAGS
LIBS=$LIB_GGZ
CPPFLAGS=$LIBGGZ_INCLUDES
- export LD_LIBRARY_PATH=$save_ldlibrary_path:$libggz_libraries
+ 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(
diff --git a/ai/aiexplorer.c b/ai/aiexplorer.c
index 7f44a20..75fe158 100644
--- a/ai/aiexplorer.c
+++ b/ai/aiexplorer.c
@@ -108,6 +108,64 @@ static bool is_likely_trireme_loss(struct tile *ptile, struct player *pplayer,
}
/**************************************************************************
+ Returns TRUE if a unit owned by the given player can safely "explore" the
+ given tile. This mainly takes care that military units do not try to
+ move into another player's territory in violation of a treaty.
+**************************************************************************/
+static bool ai_may_explore(const struct tile *ptile,
+ const struct player *pplayer,
+ const bv_flags unit_flags)
+{
+ /* Don't allow military units to cross borders. */
+ if (!BV_ISSET(unit_flags, F_NONMIL)
+ && players_non_invade(tile_owner(ptile), pplayer)) {
+ return FALSE;
+ }
+
+ /* Can't visit tiles with non-allied units. */
+ if (is_non_allied_unit_tile(ptile, pplayer)) {
+ return FALSE;
+ }
+
+ /* Non-allied cities are taboo even if no units are inside. */
+ if (tile_get_city(ptile)
+ && !pplayers_allied(tile_owner(ptile), pplayer)) {
+ return FALSE;
+ }
+
+ return TRUE;
+}
+
+/***************************************************************************
+ TB function used by ai_explorer_goto().
+***************************************************************************/
+static enum tile_behavior ai_explorer_tb(const struct tile *ptile,
+ enum known_type k,
+ struct pf_parameter *param)
+{
+ if (!ai_may_explore(ptile, param->owner, param->unit_flags)) {
+ return TB_IGNORE;
+ }
+ return TB_NORMAL;
+}
+
+/***************************************************************************
+ Constrained goto using ai_may_explore().
+***************************************************************************/
+static bool ai_explorer_goto(struct unit *punit, struct tile *ptile)
+{
+ struct pf_parameter parameter;
+ struct ai_risk_cost risk_cost;
+
+ ai_fill_unit_param(¶meter, &risk_cost, punit, ptile);
+ parameter.get_TB = ai_explorer_tb;
+
+ UNIT_LOG(LOG_DEBUG, punit, "ai_explorer_goto to %d,%d",
+ ptile->x, ptile->y);
+ return ai_unit_goto_constrained(punit, ptile, ¶meter);
+}
+
+/**************************************************************************
Return a value indicating how desirable it is to explore the given tile.
In general, we want to discover unknown terrain of the opposite kind to
our natural terrain, i.e. pedestrians like ocean and boats like land.
@@ -159,17 +217,19 @@ static int explorer_desirable(struct tile *ptile, struct player *pplayer,
int unknown = 0;
/* First do some checks that would make a tile completely non-desirable.
- * If we're a trireme and we could die at the given tile, or if there
- * is a city on the tile, or if the tile is not accessible, or if the
- * tile is on a different continent, or if we're a barbarian and
- * the tile has a hut, don't go there. */
+ * If we're a trireme and we could die at the given tile, or if we're a
+ * barbarian and the tile has a hut, don't go there. */
if ((unit_has_type_flag(punit, F_TRIREME) &&
is_likely_trireme_loss(ptile, pplayer, punit))
- || tile_get_city(ptile)
|| (is_barbarian(pplayer) && tile_has_special(ptile, S_HUT))) {
return 0;
}
+ /* Do no try to cross borders and break a treaty, etc. */
+ if (!ai_may_explore(ptile, punit->owner, unit_type(punit)->flags)) {
+ return 0;
+ }
+
/* What value we assign to the number of land and water tiles
* depends on if we're a land or water unit. */
if (is_ground_unit(punit)) {
@@ -345,7 +405,7 @@ enum unit_move_result ai_manage_explorer(struct unit *punit)
if (best_tile != NULL) {
/* TODO: read the path off the map we made. Then we can make a path
* which goes beside the unknown, with a good EC callback... */
- if (!ai_unit_goto(punit, best_tile)) {
+ if (!ai_explorer_goto(punit, best_tile)) {
/* Died? Strange... */
return MR_DEATH;
}
diff --git a/autogen.sh b/autogen.sh
index 2890ada..5dd48cf 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -19,6 +19,7 @@ BUILDDIR=`pwd`
FC_USE_NLS=yes
FC_USE_NEWAUTOCONF=yes
FC_HELP=no
+FC_RUN_CONFIGURE=yes
# Leave out NLS checks
for NAME in $@ ; do
@@ -29,6 +30,9 @@ for NAME in $@ ; do
echo "! nls checks disabled"
FC_USE_NLS=no
fi
+ if [ "x$NAME" = "x--no-configure-run" ]; then
+ FC_RUN_CONFIGURE=no
+ fi
FC_NEWARGLINE="$FC_NEWARGLINE $NAME"
done
@@ -289,6 +293,13 @@ cd $BUILDDIR
echo "+ removing config.cache ... "
rm -f config.cache
+# exit if we did --no-configure-run
+if [ "$FC_RUN_CONFIGURE" = "no" ]; then
+ echo
+ echo "Now type 'configure' to configure $package."
+ exit 0
+fi
+
echo "+ running configure ... "
echo
if [ -z "$FC_NEWARGLINE" ]; then
diff --git a/client/Makefile.in b/client/Makefile.in
index 606f2d9..318470e 100644
--- a/client/Makefile.in
+++ b/client/Makefile.in
@@ -350,7 +350,7 @@ RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
install-exec-recursive installdirs-recursive install-recursive \
uninstall-recursive check-recursive installcheck-recursive
DIST_COMMON = Makefile.am Makefile.in
-DIST_SUBDIRS = gui-sdl gui-stub gui-win32 gui-xaw gui-ftwl gui-gtk-2.0 \
+DIST_SUBDIRS = gui-win32 gui-gtk-2.0 gui-stub gui-xaw gui-ftwl gui-sdl \
include agents
SOURCES = $(civclient_SOURCES)
diff --git a/client/cityrepdata.c b/client/cityrepdata.c
index 5d923c8..c78e0f5 100644
--- a/client/cityrepdata.c
+++ b/client/cityrepdata.c
@@ -60,8 +60,8 @@ static const char *cr_entry_hstate_concise(const struct city *pcity,
const void *data)
{
static char buf[4];
- my_snprintf(buf, sizeof(buf), "%s", (city_celebrating(pcity) ? "+" :
- (city_unhappy(pcity) ? "-" : " ")));
+ my_snprintf(buf, sizeof(buf), "%s", (city_celebrating(pcity) ? "*" :
+ (city_unhappy(pcity) ? "X" : " ")));
return buf;
}
@@ -443,17 +443,21 @@ static const char *cr_entry_cma(const struct city *pcity,
#define FUNC_TAG(var) cr_entry_##var, #var
static const struct city_report_spec base_city_report_specs[] = {
+ { TRUE, -15, 0, NULL, N_("?city:Name"), N_("City Name"),
+ NULL, FUNC_TAG(cityname) },
+ { TRUE, 2, 1, NULL, N_("?size [short]:Sz"), N_("Size"),
+ NULL, FUNC_TAG(size) },
+ { TRUE, -8, 1, NULL, N_("State"), N_("Rapture/Peace/Disorder"),
+ NULL, FUNC_TAG(hstate_verbose) },
+ { FALSE, 1, 1, NULL, NULL, N_("Concise *=Rapture, X=Disorder"),
+ NULL, FUNC_TAG(hstate_concise) },
+
/* Specialists grouped with init_city_report_game_data specialists */
{ FALSE, 7, 1, N_("Special"),
N_("?entertainers/scientists/taxmen:E/S/T"),
N_("Entertainers, Scientists, Taxmen"),
NULL, FUNC_TAG(specialists) },
- { FALSE, 1, 1, NULL, NULL, N_("Concise + Rapture, - Disorder"),
- NULL, FUNC_TAG(hstate_concise) },
- { TRUE, -8, 1, NULL, N_("State"), N_("Rapture/Peace/Disorder"),
- NULL, FUNC_TAG(hstate_verbose) },
-
{ FALSE, 2, 1, NULL, N_("?Happy workers:H"), N_("Workers: Happy"),
NULL, FUNC_TAG(happy) },
{ FALSE, 2, 1, NULL, N_("?Content workers:C"), N_("Workers: Content"),
@@ -462,7 +466,7 @@ static const struct city_report_spec base_city_report_specs[] = {
NULL, FUNC_TAG(unhappy) },
{ FALSE, 2, 1, NULL, N_("?Angry workers:A"), N_("Workers: Angry"),
NULL, FUNC_TAG(angry) },
- { TRUE, 10, 1, N_("Workers"),
+ { TRUE, 10, 1, N_("?city:Workers"),
N_("?happy/content/unhappy/angry:H/C/U/A"),
N_("Workers: Happy, Content, Unhappy, Angry"),
NULL, FUNC_TAG(workers) },
@@ -485,12 +489,6 @@ static const struct city_report_spec base_city_report_specs[] = {
N_("?Stock/Target:(Have/Need)"),
N_("Turns until growth/famine"),
NULL, FUNC_TAG(growturns) },
- { TRUE, 2, 1, NULL, N_("?size [short]:Sz"), N_("Size"),
- NULL, FUNC_TAG(size) },
-
- /* city name closer to center, try to keep within scroll window */
- { TRUE, -15, 0, NULL, N_("?city:Name"), N_("City Name"),
- NULL, FUNC_TAG(cityname) },
{ TRUE, 10, 1, N_("Surplus"), N_("?food/production/trade:F/P/T"),
N_("Surplus: Food, Production, Trade"),
diff --git a/client/civclient.c b/client/civclient.c
index d0c26ed..f56ab3d 100644
--- a/client/civclient.c
+++ b/client/civclient.c
@@ -72,6 +72,7 @@
#include "pages_g.h"
#include "plrdlg_g.h"
#include "repodlgs_g.h"
+#include "servers.h"
#include "tilespec.h"
#include "themes_common.h"
@@ -383,8 +384,18 @@ int main(int argc, char *argv[])
sz_strlcpy(server_host, default_server_host);
if (user_name[0] == '\0')
sz_strlcpy(user_name, default_user_name);
- if (metaserver[0] == '\0')
- sz_strlcpy(metaserver, default_metaserver);
+ if (metaserver[0] == '\0') {
+ /* FIXME: Find a cleaner way to achieve this. */
+ const char *oldaddr = "http://meta.freeciv.org/metaserver.phtml";
+ if (0 == strcmp(default_metaserver, oldaddr)) {
+ freelog(LOG_NORMAL, _("Updating old metaserver address \"%s\"."),
+ oldaddr);
+ sz_strlcpy(default_metaserver, METALIST_ADDR);
+ freelog(LOG_NORMAL, _("Default metaserver has been set to \"%s\"."),
+ METALIST_ADDR);
+ }
+ sz_strlcpy(metaserver, default_metaserver);
+ }
if (server_port == -1) server_port = default_server_port;
/* This seed is not saved anywhere; randoms in the client should
diff --git a/client/climisc.c b/client/climisc.c
index 1df843f..bf2b2ec 100644
--- a/client/climisc.c
+++ b/client/climisc.c
@@ -51,6 +51,7 @@ used throughout the client.
#include "climisc.h"
#include "clinet.h"
#include "control.h"
+#include "mapctrl_common.h"
#include "messagewin_common.h"
#include "packhand.h"
#include "plrdlg_common.h"
@@ -571,8 +572,10 @@ static int target_get_section(struct city_production target)
} else {
if (improvement_has_flag(target.value, IF_GOLD)) {
return 1;
- } else if (is_great_wonder(target.value)) {
+ } else if (is_small_wonder(target.value)) {
return 4;
+ } else if (is_great_wonder(target.value)) {
+ return 5;
} else {
return 0;
}
@@ -602,7 +605,8 @@ static int my_cmp(const void *p1, const void *p2)
section 1: Capitalization
section 2: F_NONMIL units
section 3: other units
- section 4: wonders
+ section 4: small wonders
+ section 5: great wonders
**************************************************************************/
void name_and_sort_items(struct city_production *targets, int num_targets,
struct item *items,
@@ -1103,3 +1107,59 @@ bool can_units_do_connect(struct unit_list *punits,
return FALSE;
}
+
+/****************************************************************************
+ Comparison function used by qsort in buy_production_in_selected_cities().
+****************************************************************************/
+static int city_buy_cost_compare(const void *a, const void *b)
+{
+ const struct city *ca, *cb;
+ ca = *((const struct city **) a);
+ cb = *((const struct city **) b);
+ return city_buy_cost(ca) - city_buy_cost(cb);
+}
+
+/****************************************************************************
+ For each selected city, buy the current production. The selected cities
+ are sorted so production is bought in the cities with lowest cost first.
+****************************************************************************/
+void buy_production_in_selected_cities(void)
+{
+ const struct player *pplayer = game.player_ptr;
+ if (!pplayer || !pplayer->cities
+ || city_list_size(pplayer->cities) < 1) {
+ return;
+ }
+
+ int gold = pplayer->economic.gold;
+ if (gold < 1) {
+ return;
+ }
+
+ const int n = city_list_size(pplayer->cities);
+ struct city *cities[n];
+ int i, count = 0;
+
+ city_list_iterate(pplayer->cities, pcity) {
+ if (!is_city_hilited(pcity) || !city_can_buy(pcity)) {
+ continue;
+ }
+ cities[count++] = pcity;
+ } city_list_iterate_end;
+
+ if (count < 1) {
+ return;
+ }
+
+ qsort(cities, count, sizeof(*cities), city_buy_cost_compare);
+
+ struct connection *pconn = &aconnection;
+ connection_do_buffer(pconn);
+
+ for (i = 0; i < count && gold > 0; i++) {
+ gold -= city_buy_cost(cities[i]);
+ city_buy_production(cities[i]);
+ }
+
+ connection_do_unbuffer(pconn);
+}
diff --git a/client/climisc.h b/client/climisc.h
index 1803b10..d52702b 100644
--- a/client/climisc.h
+++ b/client/climisc.h
@@ -118,4 +118,6 @@ void common_taxrates_callback(int i);
bool can_units_do_connect(struct unit_list *punits,
enum unit_activity activity);
+void buy_production_in_selected_cities(void);
+
#endif /* FC__CLIMISC_H */
diff --git a/client/connectdlg_common.c b/client/connectdlg_common.c
index 3cf8ead..9f26b6e 100644
--- a/client/connectdlg_common.c
+++ b/client/connectdlg_common.c
@@ -467,13 +467,14 @@ void handle_single_want_hack_reply(bool you_have_hack)
}
if (you_have_hack) {
- append_output_window(_("We have control of the server "
- "(command access level hack)"));
+ append_output_window(_("Established control over the server. "
+ "You have command access level 'hack'."));
client_has_hack = TRUE;
} else if (is_server_running()) {
/* only output this if we started the server and we NEED hack */
- append_output_window(_("We can't take control of server, "
- "attempting to kill it."));
+ append_output_window(_("Failed to obtain the required access "
+ "level to take control of the server. "
+ "The server will now be shutdown."));
client_kill_server(TRUE);
}
}
diff --git a/client/control.c b/client/control.c
index 31a9a09..17e2073 100644
--- a/client/control.c
+++ b/client/control.c
@@ -18,6 +18,7 @@
#include <assert.h>
#include "fcintl.h"
+#include "hash.h"
#include "log.h"
#include "mem.h"
#include "timing.h"
@@ -309,6 +310,20 @@ static void current_focus_append(struct unit *punit)
punit->focus_status = FOCUS_AVAIL;
refresh_unit_mapcanvas(punit, punit->tile, TRUE, FALSE);
+ if (unit_selection_clears_orders) {
+ clear_unit_orders(punit);
+ }
+}
+
+/**************************************************************************
+ Clear all orders for the given unit.
+**************************************************************************/
+void clear_unit_orders(struct unit *punit)
+{
+ if (!punit) {
+ return;
+ }
+
if (unit_has_orders(punit)) {
/* Clear the focus unit's orders. */
request_orders_cleared(punit);
@@ -931,6 +946,10 @@ void control_mouse_cursor(struct tile *ptile)
struct city *pcity = NULL;
struct unit_list *active_units = get_units_in_focus();
+ if (!enable_cursor_changes) {
+ return;
+ }
+
if (C_S_RUNNING != client_state()) {
action_state = CURSOR_ACTION_DEFAULT;
return;
@@ -1192,22 +1211,75 @@ void request_unit_wakeup(struct unit *punit)
}
/****************************************************************************
- Select all units of the same type as the given unit.
+ Select all units based on the given list of units and the selection modes.
****************************************************************************/
-void request_unit_select_same_type(struct unit_list *punits)
-{
- if (can_client_change_view()) {
- unit_list_iterate(punits, punit) {
- unit_list_iterate(unit_owner(punit)->units, punit2) {
- if (unit_type(punit2) == unit_type(punit)
- && !unit_list_search(punits, punit2)
- && punit2->activity == ACTIVITY_IDLE
- && !unit_has_orders(punit2)) {
- add_unit_focus(punit2);
- }
+void request_unit_select(struct unit_list *punits,
+ enum unit_select_type_mode seltype,
+ enum unit_select_location_mode selloc)
+{
+ const struct player *pplayer;
+ struct unit *punit_first;
+ struct hash_table *tile_table, *type_table, *cont_table;
+
+ if (!can_client_change_view() || !punits
+ || unit_list_size(punits) < 1) {
+ return;
+ }
+
+ punit_first = unit_list_get(punits, 0);
+
+ if (seltype == SELTYPE_SINGLE) {
+ set_unit_focus(punit_first);
+ return;
+ }
+
+ pplayer = unit_owner(punit_first);
+ tile_table = hash_new(hash_fval_keyval, hash_fcmp_keyval);
+ type_table = hash_new(hash_fval_keyval, hash_fcmp_keyval);
+ cont_table = hash_new(hash_fval_int, hash_fcmp_int);
+
+ unit_list_iterate(punits, punit) {
+ if (seltype == SELTYPE_SAME) {
+ hash_insert(type_table, unit_type(punit), NULL);
+ }
+
+ if (selloc == SELLOC_TILE) {
+ hash_insert(tile_table, punit->tile, NULL);
+ } else if (selloc == SELLOC_CONT) {
+ hash_insert(cont_table, &punit->tile->continent, NULL);
+ }
+ } unit_list_iterate_end;
+
+ if (selloc == SELLOC_TILE) {
+ hash_keys_iterate(tile_table, key) {
+ const struct tile *ptile = key;
+ unit_list_iterate(ptile->units, punit) {
+ if (unit_owner(punit) != pplayer) {
+ continue;
+ }
+ if (seltype == SELTYPE_SAME
+ && !hash_key_exists(type_table, unit_type(punit))) {
+ continue;
+ }
+ add_unit_focus(punit);
} unit_list_iterate_end;
+ } hash_keys_iterate_end;
+ } else {
+ unit_list_iterate(pplayer->units, punit) {
+ if ((seltype == SELTYPE_SAME
+ && !hash_key_exists(type_table, unit_type(punit)))
+ || (selloc == SELLOC_CONT
+ && !hash_key_exists(cont_table, &punit->tile->continent))) {
+ continue;
+ }
+
+ add_unit_focus(punit);
} unit_list_iterate_end;
}
+
+ hash_free(tile_table);
+ hash_free(type_table);
+ hash_free(cont_table);
}
/**************************************************************************
@@ -1623,6 +1695,32 @@ void request_toggle_city_productions(void)
}
/**************************************************************************
+ Toggle display of city buycost
+**************************************************************************/
+void request_toggle_city_buycost(void)
+{
+ if (!can_client_change_view()) {
+ return;
+ }
+
+ draw_city_buycost ^= 1;
+ update_map_canvas_visible();
+}
+
+/**************************************************************************
+ Toggle display of city traderoutes
+**************************************************************************/
+void request_toggle_city_traderoutes(void)
+{
+ if (!can_client_change_view()) {
+ return;
+ }
+
+ draw_city_traderoutes ^= 1;
+ update_map_canvas_visible();
+}
+
+/**************************************************************************
Toggle display of terrain
**************************************************************************/
void request_toggle_terrain(void)
@@ -1811,6 +1909,7 @@ void request_unit_move_done(void)
{
if (get_num_units_in_focus() > 0) {
unit_list_iterate(get_units_in_focus(), punit) {
+ clear_unit_orders(punit);
punit->focus_status = FOCUS_DONE;
} unit_list_iterate_end;
advance_unit_focus();
@@ -2684,6 +2783,23 @@ void key_city_productions_toggle(void)
}
/**************************************************************************
+ Toggles the showing of the buy cost of the current production in the
+ city descriptions.
+**************************************************************************/
+void key_city_buycost_toggle(void)
+{
+ request_toggle_city_buycost();
+}
+
+/**************************************************************************
+...
+**************************************************************************/
+void key_city_traderoutes_toggle(void)
+{
+ request_toggle_city_traderoutes();
+}
+
+/**************************************************************************
...
**************************************************************************/
void key_terrain_toggle(void)
diff --git a/client/control.h b/client/control.h
index 6bdbb27..bb996ec 100644
--- a/client/control.h
+++ b/client/control.h
@@ -96,7 +96,25 @@ void request_unit_return(struct unit *punit);
void request_unit_upgrade(struct unit *punit);
void request_units_wait(struct unit_list *punits);
void request_unit_wakeup(struct unit *punit);
-void request_unit_select_same_type(struct unit_list *punits);
+
+enum unit_select_type_mode {
+ SELTYPE_SINGLE = 0,
+ SELTYPE_SAME,
+ SELTYPE_ALL,
+ NUM_SELTYPES
+};
+
+enum unit_select_location_mode {
+ SELLOC_TILE = 0,
+ SELLOC_CONT, /* Continent. */
+ SELLOC_ALL,
+ NUM_SELLOCS
+};
+
+void request_unit_select(struct unit_list *punits,
+ enum unit_select_type_mode seltype,
+ enum unit_select_location_mode selloc);
+
void request_diplomat_action(enum diplomat_actions action, int dipl_id,
int target_id, int value);
void request_diplomat_answer(enum diplomat_actions action, int dipl_id,
@@ -107,6 +125,8 @@ void request_toggle_map_borders(void);
void request_toggle_city_names(void);
void request_toggle_city_growth(void);
void request_toggle_city_productions(void);
+void request_toggle_city_buycost(void);
+void request_toggle_city_traderoutes(void);
void request_toggle_terrain(void);
void request_toggle_coastline(void);
void request_toggle_roads_rails(void);
@@ -121,6 +141,7 @@ void request_toggle_focus_unit(void);
void request_toggle_fog_of_war(void);
void wakeup_sentried_units(struct tile *ptile);
+void clear_unit_orders(struct unit *punit);
bool unit_is_in_focus(const struct unit *punit);
struct unit *get_focus_unit_on_tile(const struct tile *ptile);
@@ -151,6 +172,8 @@ void key_center_capital(void);
void key_city_names_toggle(void);
void key_city_growth_toggle(void);
void key_city_productions_toggle(void);
+void key_city_buycost_toggle(void);
+void key_city_traderoutes_toggle(void);
void key_terrain_toggle(void);
void key_coastline_toggle(void);
void key_roads_rails_toggle(void);
diff --git a/client/goto.c b/client/goto.c
index 240e76a..8115325 100644
--- a/client/goto.c
+++ b/client/goto.c
@@ -38,21 +38,6 @@
#define PATH_LOG_LEVEL LOG_DEBUG
#define PACKET_LOG_LEVEL LOG_DEBUG
-/* For each tile and each direction we store the number of lines going out
- * of the tile in this direction. Since each line is undirected, we only
- * store the 4 lower-numbered directions for each tile; the 4 upper-numbered
- * directions are stored as reverses from the target tile.
- * Notes: 1. This assumes that
- * - there are 8 directions
- * - out of every two opposite directions (like NORTH and SOUTH) one and
- * only one has number less than 4
- * 2. There _can_ be more than one line drawn between two tiles, because of
- * the waypoints. */
-struct goto_tiles {
- unsigned char drawn[4];
-};
-static struct goto_tiles *tiles = NULL;
-
/*
* The whole path is separated by waypoints into parts. Each part has its
* own starting position and requires its own map. When the unit is unable
@@ -95,10 +80,6 @@ struct goto_map {
static struct goto_map_list *goto_maps = NULL;
-#define DRAWN(ptile, dir) (tiles[(ptile)->index].drawn[dir])
-
-static void increment_drawn(struct tile *src_tile, enum direction8 dir);
-static void decrement_drawn(struct tile *src_tile, enum direction8 dir);
static void reset_last_part(struct goto_map *goto_map);
static void remove_last_part(struct goto_map *goto_map);
@@ -146,8 +127,6 @@ void init_client_goto(void)
free_client_goto();
goto_maps = goto_map_list_new();
-
- tiles = fc_calloc(MAP_INDEX_SIZE, sizeof(*tiles));
}
/**********************************************************************
@@ -163,11 +142,6 @@ void free_client_goto(void)
goto_map_list_free(goto_maps);
goto_maps = NULL;
}
-
- if (NULL != tiles) {
- free(tiles);
- tiles = NULL;
- }
}
/**********************************************************************
@@ -223,7 +197,7 @@ static bool update_last_part(struct goto_map *goto_map,
struct pf_position *a = &p->path->positions[i];
if (is_valid_dir(a->dir_to_next_pos)) {
- decrement_drawn(a->tile, a->dir_to_next_pos);
+ mapdeco_remove_gotoline(a->tile, a->dir_to_next_pos);
} else {
assert(i < p->path->length - 1
&& a->tile == p->path->positions[i + 1].tile);
@@ -240,7 +214,7 @@ static bool update_last_part(struct goto_map *goto_map,
struct pf_position *a = &new_path->positions[i];
if (is_valid_dir(a->dir_to_next_pos)) {
- increment_drawn(a->tile, a->dir_to_next_pos);
+ mapdeco_add_gotoline(a->tile, a->dir_to_next_pos);
} else {
assert(i < new_path->length - 1
&& a->tile == new_path->positions[i + 1].tile);
@@ -764,7 +738,7 @@ static void fill_client_goto_parameter(struct unit *punit,
}
} else {
/* otherwise moves_left_initially = punit->moves_left (default) */
- assert(*connect_initial == 0);
+ *connect_initial = 0;
}
break;
case HOVER_NUKE:
@@ -1207,6 +1181,7 @@ void send_goto_route(void)
path = pft_concat(path, goto_map->parts[i].path);
}
+ clear_unit_orders(punit);
if (goto_last_order == ORDER_LAST) {
send_goto_path(punit, path, NULL);
} else {
@@ -1222,87 +1197,6 @@ void send_goto_route(void)
} goto_map_unit_iterate_end;
}
-/* ================= drawn functions ============================ */
-
-/**********************************************************************
- Every line segment has 2 ends; we only keep track of it at one end
- (the one from which dir i <4). This function returns pointer to the
- correct char. This function is for internal use only. Use get_drawn
- when in doubt.
-***********************************************************************/
-static unsigned char *get_drawn_char(struct tile *ptile, enum direction8 dir)
-{
- struct tile *tile1;
-
- tile1 = mapstep(ptile, dir);
-
- if (dir >= 4) {
- ptile = tile1;
- dir = DIR_REVERSE(dir);
- }
-
- return &DRAWN(ptile, dir);
-}
-
-/**************************************************************************
- Increments the number of segments at the location, and draws the
- segment if necessary.
-**************************************************************************/
-static void increment_drawn(struct tile *src_tile, enum direction8 dir)
-{
- unsigned char *count = get_drawn_char(src_tile, dir);
-
- freelog(LOG_DEBUG, "increment_drawn(src=(%d,%d) dir=%s)",
- TILE_XY(src_tile), dir_get_name(dir));
-
- if (*count < 255) {
- (*count)++;
- } else {
- /* don't overflow unsigned char. */
- assert(*count < 255);
- }
-
- if (*count == 1) {
- draw_segment(src_tile, dir);
- }
-}
-
-/**************************************************************************
- Decrements the number of segments at the location, and clears the
- segment if necessary.
-**************************************************************************/
-static void decrement_drawn(struct tile *src_tile, enum direction8 dir)
-{
- unsigned char *count = get_drawn_char(src_tile, dir);
-
- freelog(LOG_DEBUG, "decrement_drawn(src=(%d,%d) dir=%s)",
- TILE_XY(src_tile), dir_get_name(dir));
-
- if (*count > 0) {
- (*count)--;
- } else {
- /* don't underflow unsigned char. */
- assert(*count > 0);
- }
-
- if (*count == 0) {
- undraw_segment(src_tile, dir);
- }
-}
-
-/****************************************************************************
- Return TRUE if there is a line drawn from (x,y) in the given direction.
- This is used by mapview to determine whether to draw a goto line.
-****************************************************************************/
-bool is_drawn_line(struct tile *ptile, int dir)
-{
- if (!mapstep(ptile, dir)) {
- return 0;
- }
-
- return (*get_drawn_char(ptile, dir) != 0);
-}
-
/**************************************************************************
Find the path to the nearest (fastest to reach) allied city for the
unit, or NULL if none is reachable.
diff --git a/client/goto.h b/client/goto.h
index edf79cd..4702928 100644
--- a/client/goto.h
+++ b/client/goto.h
@@ -32,7 +32,6 @@ bool goto_pop_waypoint(void);
bool is_valid_goto_destination(const struct tile *ptile);
bool is_valid_goto_draw_line(struct tile *dest_tile);
-bool is_drawn_line(struct tile *dest_tile, int dir);
void request_orders_cleared(struct unit *punit);
void send_goto_path(struct unit *punit, struct pf_path *path,
diff --git a/client/gui-gtk-2.0/chatline.c b/client/gui-gtk-2.0/chatline.c
index 0431e22..0c2821b 100644
--- a/client/gui-gtk-2.0/chatline.c
+++ b/client/gui-gtk-2.0/chatline.c
@@ -18,6 +18,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <time.h>
#include <gdk/gdkkeysyms.h>
@@ -26,6 +27,7 @@
#include "packets.h"
#include "support.h"
+#include "civclient.h"
#include "climisc.h"
#include "clinet.h"
#include "gui_main.h"
@@ -37,6 +39,55 @@
struct genlist *history_list;
int history_pos;
+/**************************************************************************
+ Helper function to determine if a given client input line is intended as
+ a "plain" public message. Note that messages prefixed with : are a
+ special case (explicit public messages), and will return FALSE.
+**************************************************************************/
+static bool is_plain_public_message(const char *s)
+{
+ /* FIXME: These prefix definitions are duplicated in the server. */
+ const char ALLIES_CHAT_PREFIX = '.';
+ const char SERVER_COMMAND_PREFIX = '/';
+ const char MESSAGE_PREFIX = ':';
+
+ const char *p;
+
+ /* If it is a server command or an explicit ally
+ * message, then it is not a public message. */
+ if (s[0] == SERVER_COMMAND_PREFIX || s[0] == ALLIES_CHAT_PREFIX) {
+ return FALSE;
+ }
+
+ /* It might be a private message of the form
+ * 'player name with spaces':the message
+ * or with ". So skip past the player name part. */
+ if (s[0] == '\'' || s[0] == '"') {
+ p = strchr(s + 1, s[0]);
+ } else {
+ p = s;
+ }
+
+ /* Now we just need to check that it is not a private
+ * message. If we encounter a space then the preceeding
+ * text could not have been a user/player name (the
+ * quote check above eliminated names with spaces) so
+ * it must be a public message. Otherwise if we encounter
+ * the message prefix : then the text parsed up until now
+ * was a player/user name and the line is intended as
+ * a private message (or explicit public message if the
+ * first character is :). */
+ while (p != NULL && *p != '\0') {
+ if (my_isspace(*p)) {
+ return TRUE;
+ } else if (*p == MESSAGE_PREFIX) {
+ return FALSE;
+ }
+ p++;
+ }
+ return TRUE;
+}
+
/**************************************************************************
...
@@ -48,7 +99,14 @@ void inputline_return(GtkEntry *w, gpointer data)
theinput = gtk_entry_get_text(w);
if (*theinput) {
- send_chat(theinput);
+ if (client_state() == C_S_RUNNING && allied_chat_only
+ && is_plain_public_message(theinput)) {
+ char buf[MAX_LEN_MSG];
+ my_snprintf(buf, sizeof(buf), ". %s", theinput);
+ send_chat(buf);
+ } else {
+ send_chat(theinput);
+ }
if (genlist_size(history_list) >= MAX_CHATLINE_HISTORY) {
void *data;
@@ -66,56 +124,72 @@ void inputline_return(GtkEntry *w, gpointer data)
}
/**************************************************************************
+ Scroll a textview so that the given mark is visible, but only if the
+ scroll window containing the textview is very close to the bottom. The
+ text mark 'scroll_target' should probably be the first character of the
+ last line in the text buffer.
+**************************************************************************/
+static void scroll_if_necessary(GtkTextView *textview,
+ GtkTextMark *scroll_target)
+{
+ GtkWidget *sw;
+ GtkAdjustment *vadj;
+ gdouble val, max, upper, page_size;
+
+ g_return_if_fail(textview != NULL);
+ g_return_if_fail(scroll_target != NULL);
+
+ sw = gtk_widget_get_parent(GTK_WIDGET(textview));
+ g_return_if_fail(sw != NULL);
+ g_return_if_fail(GTK_IS_SCROLLED_WINDOW(sw));
+
+ vadj = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(sw));
+ val = gtk_adjustment_get_value(GTK_ADJUSTMENT(vadj));
+ g_object_get(G_OBJECT(vadj), "upper", &upper,
+ "page-size", &page_size, NULL);
+ max = upper - page_size;
+ if (max - val < 10.0) {
+ gtk_text_view_scroll_to_mark(GTK_TEXT_VIEW(textview), scroll_target,
+ 0.0, TRUE, 1.0, 0.0);
+ }
+}
+
+/**************************************************************************
Appends the string to the chat output window. The string should be
inserted on its own line, although it will have no newline.
**************************************************************************/
void real_append_output_window(const char *astring, int conn_id)
{
- GtkWidget *sw;
- GtkAdjustment *slider;
- bool scroll;
-
GtkTextBuffer *buf;
- GtkTextIter i;
+ GtkTextIter iter;
GtkTextMark *mark;
-
buf = message_buffer;
- gtk_text_buffer_get_end_iter(buf, &i);
- gtk_text_buffer_insert(buf, &i, "\n", -1);
- gtk_text_buffer_insert(buf, &i, astring, -1);
-
- /* have to use a mark, or this won't work properly */
- gtk_text_buffer_get_end_iter(buf, &i);
- mark = gtk_text_buffer_create_mark(buf, NULL, &i, FALSE);
-
-
- sw = gtk_widget_get_parent(GTK_WIDGET(main_message_area));
- slider = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(sw));
-
- /* scroll forward only if slider is near the bottom */
- scroll = ((slider->value + slider->page_size) >=
- (slider->upper - slider->step_increment));
- if (scroll) {
- gtk_text_view_scroll_mark_onscreen(GTK_TEXT_VIEW(main_message_area),
- mark);
+ gtk_text_buffer_get_end_iter(buf, &iter);
+ gtk_text_buffer_insert(buf, &iter, "\n", -1);
+ mark = gtk_text_buffer_create_mark(buf, NULL, &iter, TRUE);
+
+ if (show_chat_message_time) {
+ char timebuf[64];
+ time_t now;
+ struct tm *now_tm;
+
+ now = time(NULL);
+ now_tm = localtime(&now);
+ strftime(timebuf, sizeof(timebuf), "[%H:%M:%S] ", now_tm);
+ gtk_text_buffer_insert(buf, &iter, timebuf, -1);
}
- sw = gtk_widget_get_parent(GTK_WIDGET(start_message_area));
- slider = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(sw));
+ gtk_text_buffer_insert(buf, &iter, astring, -1);
- /* scroll forward only if slider is near the bottom */
- scroll = ((slider->value + slider->page_size) >=
- (slider->upper - slider->step_increment));
- if (scroll) {
- gtk_text_view_scroll_mark_onscreen(GTK_TEXT_VIEW(start_message_area),
- mark);
+ if (main_message_area) {
+ scroll_if_necessary(GTK_TEXT_VIEW(main_message_area), mark);
+ }
+ if (start_message_area) {
+ scroll_if_necessary(GTK_TEXT_VIEW(start_message_area), mark);
}
-
-
gtk_text_buffer_delete_mark(buf, mark);
-
append_network_statusbar(astring, FALSE);
}
@@ -151,3 +225,25 @@ void set_output_window_text(const char *text)
{
gtk_text_buffer_set_text(message_buffer, text, -1);
}
+
+/**************************************************************************
+ Scrolls the pregame and in-game chat windows all the way to the bottom.
+**************************************************************************/
+void chatline_scroll_to_bottom(void)
+{
+ GtkTextIter end;
+
+ if (!message_buffer) {
+ return;
+ }
+ gtk_text_buffer_get_end_iter(message_buffer, &end);
+
+ if (main_message_area) {
+ gtk_text_view_scroll_to_iter(GTK_TEXT_VIEW(main_message_area),
+ &end, 0.0, TRUE, 1.0, 0.0);
+ }
+ if (start_message_area) {
+ gtk_text_view_scroll_to_iter(GTK_TEXT_VIEW(start_message_area),
+ &end, 0.0, TRUE, 1.0, 0.0);
+ }
+}
diff --git a/client/gui-gtk-2.0/chatline.h b/client/gui-gtk-2.0/chatline.h
index ca5b8f3..4e64684 100644
--- a/client/gui-gtk-2.0/chatline.h
+++ b/client/gui-gtk-2.0/chatline.h
@@ -24,5 +24,6 @@ extern int history_pos;
void inputline_return(GtkEntry *w, gpointer data);
void set_output_window_text(const char *text);
+void chatline_scroll_to_bottom(void);
#endif /* FC__CHATLINE_H */
diff --git a/client/gui-gtk-2.0/cityrep.c b/client/gui-gtk-2.0/cityrep.c
index fef2336..c04c090 100644
--- a/client/gui-gtk-2.0/cityrep.c
+++ b/client/gui-gtk-2.0/cityrep.c
@@ -58,7 +58,7 @@
#define CMA_CUSTOM (10001)
enum city_operation_type {
- CO_CHANGE, CO_LAST, CO_NEXT, CO_FIRST, CO_NONE
+ CO_CHANGE, CO_LAST, CO_NEXT, CO_FIRST, CO_NEXT_TO_LAST, CO_NONE
};
/******************************************************************/
@@ -72,12 +72,15 @@ static void city_command_callback(struct gui_dialog *dlg, int response,
gpointer data);
static void city_selection_changed_callback(GtkTreeSelection *selection);
+static void city_clear_worklist_callback(GtkMenuItem *item, gpointer data);
+static void update_total_buy_cost(void);
static void create_select_menu(GtkWidget *item);
static void create_change_menu(GtkWidget *item);
static void create_last_menu(GtkWidget *item);
static void create_first_menu(GtkWidget *item);
static void create_next_menu(GtkWidget *item);
+static void create_next_to_last_menu(GtkWidget *item);
static struct gui_dialog *city_dialog_shell = NULL;
@@ -94,16 +97,19 @@ static void popup_change_menu(GtkMenuShell *menu, gpointer data);
static void popup_last_menu(GtkMenuShell *menu, gpointer data);
static void popup_first_menu(GtkMenuShell *menu, gpointer data);
static void popup_next_menu(GtkMenuShell *menu, gpointer data);
+static void popup_next_to_last_menu(GtkMenuShell *menu, gpointer data);
-static GtkWidget *city_center_command, *city_popup_command, *city_buy_command;
+static GtkWidget *city_center_command;
+static GtkWidget *city_popup_command;
+static GtkWidget *city_buy_command;
static GtkWidget *city_production_command;
+static GtkWidget *city_governor_command;
static GtkWidget *city_total_buy_cost_label;
static GtkWidget *change_improvements_item;
static GtkWidget *change_units_item;
static GtkWidget *change_wonders_item;
-static GtkWidget *change_cma_item;
static GtkWidget *last_improvements_item;
static GtkWidget *last_units_item;
@@ -117,6 +123,9 @@ static GtkWidget *next_improvements_item;
static GtkWidget *next_units_item;
static GtkWidget *next_wonders_item;
+static GtkWidget *next_to_last_improvements_item;
+static GtkWidget *next_to_last_units_item;
+static GtkWidget *next_to_last_wonders_item;
static GtkWidget *select_island_item;
@@ -393,6 +402,32 @@ static void worklist_next_impr_or_unit_iterate(GtkTreeModel *model,
/* perhaps should warn the user if not successful? */
}
+/**************************************************************************
+ Called by select_impr_or_unit_callback for each city that is selected in
+ the city list dialog to have an object added before the last position in
+ the worklist.
+**************************************************************************/
+static void worklist_next_to_last_impr_or_unit_iterate(GtkTreeModel *model,
+ GtkTreePath *path,
+ GtkTreeIter *it,
+ gpointer data)
+{
+ struct city_production target;
+ struct city *pcity;
+ gint id, n;
+
+ target = cid_decode(GPOINTER_TO_INT(data));
+
+ gtk_tree_model_get(model, it, 1, &id, -1);
+ pcity = game_find_city_by_number(id);
+ if (!pcity) {
+ return;
+ }
+
+ n = worklist_length(&pcity->worklist);
+ city_queue_insert(pcity, n, target);
+}
+
/****************************************************************
...
*****************************************************************/
@@ -422,6 +457,7 @@ static void select_impr_or_unit_callback(GtkWidget *w, gpointer data)
}
}
} else {
+ GtkTreeSelectionForeachFunc foreach_func;
connection_do_buffer(&aconnection);
switch (city_operation) {
case CO_LAST:
@@ -444,6 +480,11 @@ static void select_impr_or_unit_callback(GtkWidget *w, gpointer data)
worklist_next_impr_or_unit_iterate,
GINT_TO_POINTER(cid_encode(target)));
break;
+ case CO_NEXT_TO_LAST:
+ foreach_func = worklist_next_to_last_impr_or_unit_iterate;
+ gtk_tree_selection_selected_foreach(city_selection, foreach_func,
+ GINT_TO_POINTER(cid_encode(target)));
+ break;
default:
assert(FALSE); /* should never get here. */
}
@@ -542,6 +583,11 @@ static void append_cma_to_menu_item(GtkMenuItem *parent_item, bool change_cma)
struct cm_parameter parameter;
GtkWidget *w;
+ w = gtk_menu_item_get_submenu(parent_item);
+ if (w != NULL && GTK_WIDGET_VISIBLE(w)) {
+ return;
+ }
+
gtk_menu_item_remove_submenu(parent_item);
if (!can_client_issue_orders()) {
return;
@@ -629,20 +675,151 @@ static void append_cma_to_menu_item(GtkMenuItem *parent_item, bool change_cma)
gtk_widget_show_all(menu);
}
+/**************************************************************************
+ Helper function to append a worklist to the current work list of one city
+ in the city report. This function is called over all selected rows in the
+ list view.
+**************************************************************************/
+static void append_worklist_foreach(GtkTreeModel *model, GtkTreePath *path,
+ GtkTreeIter *it, gpointer data)
+{
+ struct worklist *pwl;
+ struct city *pcity;
+
+ pwl = data;
+ g_return_if_fail(pwl != NULL);
+ g_return_if_fail(pwl->is_valid);
+
+ gtk_tree_model_get(model, it, 0, &pcity, -1);
+ if (!pcity || !game_find_city_by_number(pcity->id)) {
+ return;
+ }
+ city_queue_insert_worklist(pcity, -1, pwl);
+}
+
+/**************************************************************************
+ Menu item callback to append the global worklist associated with this
+ item to the worklists of all selected cities. The worklist pointer is
+ passed in 'data'.
+**************************************************************************/
+static void append_worklist_callback(GtkMenuItem *menuitem, gpointer data)
+{
+ g_return_if_fail(city_selection != NULL);
+ gtk_tree_selection_selected_foreach(city_selection,
+ append_worklist_foreach, data);
+}
+
+/**************************************************************************
+ Helper function to set a worklist for one city in the city report. This
+ function is called over all selected rows in the list view.
+**************************************************************************/
+static void set_worklist_foreach(GtkTreeModel *model, GtkTreePath *path,
+ GtkTreeIter *it, gpointer data)
+{
+ struct worklist *pwl;
+ struct city *pcity;
+
+ pwl = data;
+ g_return_if_fail(pwl != NULL);
+ g_return_if_fail(pwl->is_valid);
+
+ gtk_tree_model_get(model, it, 0, &pcity, -1);
+ if (!pcity || !game_find_city_by_number(pcity->id)) {
+ return;
+ }
+ city_set_queue(pcity, pwl);
+}
+
+/**************************************************************************
+ Menu item callback to set a city's worklist to the global worklist
+ associated with this menu item. The worklist pointer is passed in 'data'.
+**************************************************************************/
+static void set_worklist_callback(GtkMenuItem *menuitem, gpointer data)
+{
+ g_return_if_fail(city_selection != NULL);
+ gtk_tree_selection_selected_foreach(city_selection, set_worklist_foreach,
+ data);
+}
+
+/**************************************************************************
+ Empty and refill the submenu of the menu item passed as 'data'. The menu
+ will be filled with menu items corresponding to the global worklists.
+**************************************************************************/
+static void production_menu_shown(GtkWidget *widget, gpointer data)
+{
+ struct worklist *worklists;
+ struct player *pplayer;
+ GtkWidget *menu, *item;
+ GtkMenuItem *parent_item;
+ GCallback callback;
+ int i, count = 0;
+
+ parent_item = data;
+ g_return_if_fail(parent_item != NULL);
+ g_return_if_fail(GTK_IS_MENU_ITEM(parent_item));
+
+ callback = g_object_get_data(G_OBJECT(parent_item), "item_callback");
+ g_return_if_fail(callback != NULL);
+
+ menu = gtk_menu_item_get_submenu(parent_item);
+ if (menu != NULL && GTK_WIDGET_VISIBLE(menu)) {
+ gtk_menu_shell_deactivate(GTK_MENU_SHELL(menu));
+ }
+
+ if (menu == NULL) {
+ menu = gtk_menu_new();
+ gtk_menu_item_set_submenu(parent_item, menu);
+ }
+
+ pplayer = game.player_ptr;
+ if (!pplayer || !can_client_issue_orders()) {
+ return;
+ }
+
+ gtk_container_forall(GTK_CONTAINER(menu),
+ (GtkCallback) gtk_widget_destroy, NULL);
+
+ worklists = pplayer->worklists;
+ for (i = 0; i < MAX_NUM_WORKLISTS; i++) {
+ if (!worklists[i].is_valid) {
+ continue;
+ }
+ item = gtk_menu_item_new_with_label(worklists[i].name);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
+ g_signal_connect(item, "activate", callback, &worklists[i]);
+ count++;
+ }
+
+ if (count == 0) {
+ item = gtk_menu_item_new_with_label(_("(no worklists defined)"));
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
+ }
+
+ gtk_widget_show_all(menu);
+}
+
/****************************************************************
...
*****************************************************************/
static void city_report_update_views(void)
{
struct city_report_spec *spec;
- int i;
+ GtkTreeView *view;
+ GtkTreeViewColumn *col;
+ GList *columns, *p;
- for (i=0, spec=city_report_specs; i<NUM_CREPORT_COLS; i++, spec++) {
- GtkTreeViewColumn *col;
+ view = GTK_TREE_VIEW(city_view);
+ g_return_if_fail(view != NULL);
+
+ columns = gtk_tree_view_get_columns(view);
- col = gtk_tree_view_get_column(GTK_TREE_VIEW(city_view), i);
+ for (p = columns; p != NULL; p = p->next) {
+ col = p->data;
+ spec = g_object_get_data(G_OBJECT(col), "city_report_spec");
gtk_tree_view_column_set_visible(col, spec->show);
}
+
+ g_list_free(columns);
}
/****************************************************************
@@ -708,10 +885,39 @@ static GtkWidget *create_city_report_menubar(void)
gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
create_next_menu(item);
+ item = gtk_menu_item_new_with_mnemonic(_("Add _2nd Last"));
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
+ create_next_to_last_menu(item);
+
item = gtk_menu_item_new_with_mnemonic(_("Add _Last"));
gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
create_last_menu(item);
+ item = gtk_separator_menu_item_new();
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
+
+ item = gtk_menu_item_new_with_label(_("Set Worklist"));
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
+ g_object_set_data(G_OBJECT(item), "item_callback",
+ set_worklist_callback);
+ g_signal_connect(menu, "show", G_CALLBACK(production_menu_shown), item);
+
+ item = gtk_menu_item_new_with_label(_("Append Worklist"));
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
+ g_object_set_data(G_OBJECT(item), "item_callback",
+ append_worklist_callback);
+ g_signal_connect(menu, "show", G_CALLBACK(production_menu_shown), item);
+
+ item = gtk_menu_item_new_with_mnemonic(_("Clear _Worklist"));
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
+ g_signal_connect(item, "activate",
+ G_CALLBACK(city_clear_worklist_callback), NULL);
+
+ item = gtk_menu_item_new_with_mnemonic(_("Gover_nor"));
+ city_governor_command = item;
+ gtk_menu_shell_append(GTK_MENU_SHELL(menubar), item);
+ append_cma_to_menu_item(GTK_MENU_ITEM(item), TRUE);
+
item = gtk_menu_item_new_with_mnemonic(_("_Select"));
gtk_menu_shell_append(GTK_MENU_SHELL(menubar), item);
create_select_menu(item);
@@ -864,6 +1070,8 @@ static void create_city_report_dialog(bool make_modal)
col = gtk_tree_view_column_new_with_attributes(titles[i], renderer,NULL);
gtk_tree_view_column_set_visible(col, spec->show);
gtk_tree_view_column_set_sort_column_id(col, i);
+ gtk_tree_view_column_set_reorderable(col, TRUE);
+ g_object_set_data(G_OBJECT(col), "city_report_spec", spec);
gtk_tree_view_append_column(GTK_TREE_VIEW(city_view), col);
gtk_tree_view_column_set_cell_data_func(col, renderer,
cityrep_cell_data_func, GINT_TO_POINTER(i), NULL);
@@ -1173,6 +1381,10 @@ void city_report_dialog_update(void)
city_selection_changed_callback(city_selection);
+ if (GTK_WIDGET_SENSITIVE(city_governor_command)) {
+ append_cma_to_menu_item(GTK_MENU_ITEM(city_governor_command), TRUE);
+ }
+
select_menu_cached = FALSE;
}
}
@@ -1203,8 +1415,8 @@ void city_report_dialog_update_city(struct city *pcity)
/* update. */
if (found) {
update_row(TREE_ITER_PTR(it), pcity);
-
select_menu_cached = FALSE;
+ update_total_buy_cost();
} else {
city_report_dialog_update();
}
@@ -1228,8 +1440,6 @@ static void create_change_menu(GtkWidget *item)
gtk_menu_shell_append(GTK_MENU_SHELL(menu), change_improvements_item);
change_wonders_item = gtk_menu_item_new_with_label(_("Wonders"));
gtk_menu_shell_append(GTK_MENU_SHELL(menu), change_wonders_item);
- change_cma_item = gtk_menu_item_new_with_label(_("Citizen Governor"));
- gtk_menu_shell_append(GTK_MENU_SHELL(menu), change_cma_item);
}
/****************************************************************
@@ -1289,6 +1499,30 @@ static void create_next_menu(GtkWidget *item)
gtk_menu_shell_append(GTK_MENU_SHELL(menu), next_wonders_item);
}
+/**************************************************************************
+ Append the "next to last" submenu to the given menu item.
+**************************************************************************/
+static void create_next_to_last_menu(GtkWidget *parent_item)
+{
+ GtkWidget *menu, *item;
+
+ menu = gtk_menu_new();
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(parent_item), menu);
+ g_signal_connect(menu, "show",
+ G_CALLBACK(popup_next_to_last_menu), NULL);
+
+ item = gtk_menu_item_new_with_label(_("Units"));
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
+ next_to_last_units_item = item;
+
+ item = gtk_menu_item_new_with_label(_("Improvements"));
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
+ next_to_last_improvements_item = item;
+
+ item = gtk_menu_item_new_with_label(_("Wonders"));
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
+ next_to_last_wonders_item = item;
+}
/****************************************************************
@@ -1312,7 +1546,6 @@ static void popup_change_menu(GtkMenuShell *menu, gpointer data)
FALSE, TRUE, CO_CHANGE,
city_can_build_impr_or_unit,
G_CALLBACK(select_impr_or_unit_callback), n);
- append_cma_to_menu_item(GTK_MENU_ITEM(change_cma_item), TRUE);
}
/****************************************************************
@@ -1384,7 +1617,36 @@ static void popup_next_menu(GtkMenuShell *menu, gpointer data)
G_CALLBACK(select_impr_or_unit_callback), n);
}
+/**************************************************************************
+ Re-create the submenus in the next-to-last production change menu.
+**************************************************************************/
+static void popup_next_to_last_menu(GtkMenuShell *menu, gpointer data)
+{
+ GtkWidget *item;
+ GCallback callback;
+ int n;
+
+ g_return_if_fail(city_selection != NULL);
+ n = gtk_tree_selection_count_selected_rows(city_selection);
+ callback = G_CALLBACK(select_impr_or_unit_callback);
+
+ item = next_to_last_improvements_item;
+ append_impr_or_unit_to_menu_item(GTK_MENU_ITEM(item),
+ FALSE, FALSE, CO_NEXT_TO_LAST,
+ city_can_build_impr_or_unit,
+ callback, n);
+ item = next_to_last_units_item;
+ append_impr_or_unit_to_menu_item(GTK_MENU_ITEM(item),
+ TRUE, FALSE, CO_NEXT_TO_LAST,
+ city_can_build_impr_or_unit,
+ callback, n);
+ item = next_to_last_wonders_item;
+ append_impr_or_unit_to_menu_item(GTK_MENU_ITEM(item),
+ FALSE, TRUE, CO_NEXT_TO_LAST,
+ city_can_build_impr_or_unit,
+ callback, n);
+}
/****************************************************************
...
@@ -1576,59 +1838,109 @@ static void popup_select_menu(GtkMenuShell *menu, gpointer data)
select_menu_cached = TRUE;
}
-/****************************************************************
-...
-*****************************************************************/
-static void city_selection_changed_callback(GtkTreeSelection *selection)
+/***************************************************************************
+ Update the value displayed by the "total buy cost" label in the city
+ report, or make it blank if nothing can be bought.
+***************************************************************************/
+static void update_total_buy_cost(void)
{
- int n;
+ GtkWidget *label, *view;
+ GList *rows, *p;
+ GtkTreeModel *model;
+ GtkTreeSelection *sel;
+ GtkTreePath *path;
+ GtkTreeIter iter;
+ gpointer res;
+ struct city *pcity;
int total = 0;
- n = gtk_tree_selection_count_selected_rows(selection);
+ view = city_view;
+ label = city_total_buy_cost_label;
- if (n == 0) {
- gtk_widget_set_sensitive(city_production_command, FALSE);
- gtk_widget_set_sensitive(city_center_command, FALSE);
- gtk_widget_set_sensitive(city_popup_command, FALSE);
- gtk_widget_set_sensitive(city_buy_command, FALSE);
- } else {
- GList *rows, *p;
- GtkTreeModel *model;
- GtkTreePath *path;
- GtkTreeIter iter;
- gpointer res;
- struct city *pcity;
+ if (!view || !label) {
+ return;
+ }
- gtk_widget_set_sensitive(city_production_command,
- can_client_issue_orders());
- gtk_widget_set_sensitive(city_center_command, TRUE);
- gtk_widget_set_sensitive(city_popup_command, TRUE);
- gtk_widget_set_sensitive(city_buy_command, can_client_issue_orders());
-
- rows = gtk_tree_selection_get_selected_rows(selection, &model);
- for (p = rows; p != NULL; p = p->next) {
- path = p->data;
- if (gtk_tree_model_get_iter(model, &iter, path)) {
- gtk_tree_model_get(model, &iter, 0, &res, -1);
- pcity = res;
- if (pcity != NULL) {
- total += city_buy_cost(pcity);
- }
+ sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(view));
+ rows = gtk_tree_selection_get_selected_rows(sel, &model);
+
+ for (p = rows; p != NULL; p = p->next) {
+ path = p->data;
+ if (gtk_tree_model_get_iter(model, &iter, path)) {
+ gtk_tree_model_get(model, &iter, 0, &res, -1);
+ pcity = res;
+ if (pcity != NULL) {
+ total += city_buy_cost(pcity);
}
- gtk_tree_path_free(path);
}
- g_list_free(rows);
+ gtk_tree_path_free(path);
}
+ g_list_free(rows);
if (total > 0) {
- char buf[64];
+ char buf[128];
my_snprintf(buf, sizeof(buf), _("Total Buy Cost: %d"), total);
- gtk_label_set_text(GTK_LABEL(city_total_buy_cost_label), buf);
+ gtk_label_set_text(GTK_LABEL(label), buf);
} else {
- gtk_label_set_text(GTK_LABEL(city_total_buy_cost_label), NULL);
+ gtk_label_set_text(GTK_LABEL(label), NULL);
+ }
+}
+
+/***************************************************************************
+ Update city report button sensitivity and total buy cost label when the
+ user makes a change in the selection of cities.
+***************************************************************************/
+static void city_selection_changed_callback(GtkTreeSelection *selection)
+{
+ int n;
+
+ n = gtk_tree_selection_count_selected_rows(selection);
+
+ gtk_widget_set_sensitive(city_production_command,
+ n > 0 && can_client_issue_orders());
+ gtk_widget_set_sensitive(city_governor_command,
+ n > 0 && can_client_issue_orders());
+ gtk_widget_set_sensitive(city_center_command, n > 0);
+ gtk_widget_set_sensitive(city_popup_command, n > 0);
+ gtk_widget_set_sensitive(city_buy_command,
+ n > 0 && can_client_issue_orders());
+
+ update_total_buy_cost();
+}
+
+/**************************************************************************
+ Clear the worklist in one selected city in the city report.
+**************************************************************************/
+static void clear_worklist_foreach_func(GtkTreeModel *model,
+ GtkTreePath *path,
+ GtkTreeIter *it,
+ gpointer data)
+{
+ struct city *pcity;
+
+ gtk_tree_model_get(model, it, 0, &pcity, -1);
+ if (pcity && game_find_city_by_number(pcity->id)) {
+ struct worklist empty;
+ init_worklist(&empty);
+ city_set_worklist(pcity, &empty);
}
}
+/**************************************************************************
+ Called when the "clear worklist" menu item is activated.
+**************************************************************************/
+static void city_clear_worklist_callback(GtkMenuItem *item, gpointer data)
+{
+ struct connection *pconn = &aconnection;
+
+ g_return_if_fail(city_selection != NULL);
+
+ connection_do_buffer(pconn);
+ gtk_tree_selection_selected_foreach(city_selection,
+ clear_worklist_foreach_func, NULL);
+ connection_do_unbuffer(pconn);
+}
+
/****************************************************************
After a selection rectangle is defined, make the cities that
are hilited on the canvas exclusively hilited in the
diff --git a/client/gui-gtk-2.0/gui_main.c b/client/gui-gtk-2.0/gui_main.c
index 93ce820..af4b844 100644
--- a/client/gui-gtk-2.0/gui_main.c
+++ b/client/gui-gtk-2.0/gui_main.c
@@ -55,6 +55,7 @@
#include "clinet.h"
#include "colors.h"
#include "connectdlg.h"
+#include "connectdlg_common.h"
#include "control.h"
#include "cma_fe.h"
#include "dialogs.h"
@@ -94,13 +95,20 @@ int overview_canvas_store_height = 2 * 50;
bool enable_tabs = TRUE;
bool better_fog = TRUE;
+bool show_chat_message_time = FALSE;
+bool split_bottom_notebook = FALSE;
+bool new_messages_go_to_top = FALSE;
+bool show_message_window_buttons = TRUE;
+bool metaserver_tab_first = FALSE;
+bool allied_chat_only = FALSE;
GtkWidget *toplevel;
GdkWindow *root_window;
GtkWidget *toplevel_tabs;
GtkWidget *top_vbox;
-GtkWidget *top_notebook, *bottom_notebook;
+GtkWidget *top_notebook, *bottom_notebook, *right_notebook;
GtkWidget *map_widget;
+static GtkWidget *bottom_hpaned;
int city_names_font_size = 0, city_productions_font_size = 0;
PangoFontDescription *main_font;
@@ -114,6 +122,7 @@ GdkGC *fill_tile_gc;
GdkGC *thin_line_gc;
GdkGC *thick_line_gc;
GdkGC *border_line_gc;
+GdkGC *selection_gc;
GdkPixmap *gray50, *gray25, *black50;
GdkPixmap *mask_bitmap;
@@ -145,6 +154,9 @@ GtkWidget *government_ebox;
const char * const gui_character_encoding = "UTF-8";
const bool gui_use_transliteration = FALSE;
+static void split_bottom_notebook_callback(struct client_option *op);
+static void allied_chat_only_callback(struct client_option *op);
+
client_option gui_options[] = {
/* This option is the same as the one in gui-gtk */
GEN_BOOL_OPTION(map_scrollbars, N_("Show Map Scrollbars"),
@@ -178,7 +190,55 @@ client_option gui_options[] = {
N_("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."),
- COC_GRAPHICS, mapview_redraw_callback)
+ COC_GRAPHICS, mapview_redraw_callback),
+ GEN_BOOL_OPTION(show_chat_message_time,
+ N_("Show time for each chat message"),
+ N_("If this option is enabled then all chat messages "
+ "will be prefixed by a time string of the form "
+ "[hour:minute:second]."),
+ COC_INTERFACE),
+ GEN_BOOL_OPTION_CB(split_bottom_notebook,
+ N_("Split bottom notebook area"),
+ N_("Enabling this option will split the bottom "
+ "notebook into a left and right notebook so that "
+ "two tabs may be viewed at once."),
+ COC_INTERFACE, split_bottom_notebook_callback),
+ GEN_BOOL_OPTION(new_messages_go_to_top,
+ N_("New message events go to top of list"),
+ N_("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."),
+ COC_INTERFACE),
+ GEN_BOOL_OPTION(show_message_window_buttons,
+ N_("Show extra message window buttons"),
+ N_("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 is disabled, these buttons will not appear "
+ "(you can still double-click with the left mouse "
+ "button or right-click on a row to inspect or goto "
+ "respectively). This option will only take effect "
+ "once the message window is closed and reopened."),
+ COC_INTERFACE),
+ GEN_BOOL_OPTION(metaserver_tab_first,
+ N_("Metaserver tab first in network page"),
+ N_("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."),
+ COC_NETWORK),
+ GEN_BOOL_OPTION_CB(allied_chat_only,
+ N_("Plain chat messages are sent to allies only"),
+ N_("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 messages will be sent as "
+ "public chat messages. To send a public chat "
+ "message with this option enabled, prefix the "
+ "message with a single colon ':'. This option "
+ "can also be set using a toggle button beside "
+ "the chat entry (only visible in multiplayer "
+ "games)."),
+ COC_NETWORK, allied_chat_only_callback)
};
const int num_gui_options = ARRAY_SIZE(gui_options);
@@ -196,6 +256,7 @@ static int unit_ids[MAX_NUM_UNITS_BELOW]; /* ids of the units icons in
GtkTextView *main_message_area;
GtkTextBuffer *message_buffer;
static GtkWidget *inputline;
+static GtkWidget *allied_chat_toggle_button;
static enum Display_color_type display_color_type; /* practically unused */
static gint timer_id; /* ditto */
@@ -224,6 +285,8 @@ static gboolean select_unit_pixmap_callback(GtkWidget *w, GdkEvent *ev,
gpointer data);
static gboolean quit_dialog_callback(void);
+static void allied_chat_button_toggled(GtkToggleButton *button,
+ gpointer user_data);
/****************************************************************************
Called by the tileset code to set the font size that should be used to
@@ -397,6 +460,48 @@ static gboolean toplevel_handler(GtkWidget *w, GdkEventKey *ev, gpointer data)
return FALSE;
}
+
+/**************************************************************************
+ Idle callback for scrolling down the chatline.
+ NB: Only to be used by queue_chatline_scroll_to_bottom().
+**************************************************************************/
+static gboolean chatline_scroll_callback(gpointer data)
+{
+ guint *pid = data;
+ chatline_scroll_to_bottom();
+ *pid = 0;
+ return FALSE; /* Remove this idle function. */
+}
+
+/**************************************************************************
+ Adds an idle callback to scroll the chatline to the bottom.
+**************************************************************************/
+static void queue_chatline_scroll_to_bottom(void)
+{
+ static guint id = 0;
+ if (id == 0) {
+ id = g_idle_add(chatline_scroll_callback, &id);
+ }
+}
+
+/**************************************************************************
+ When the chatline text view is resized, scroll it to the bottom. This
+ prevents users from accidentally missing messages when the chatline
+ gets scrolled up a small amount and stops scrolling down automatically.
+**************************************************************************/
+static void main_message_area_size_allocate(GtkWidget *widget,
+ GtkAllocation *allocation,
+ gpointer data)
+{
+ static int old_width = 0, old_height = 0;
+ if (allocation->width != old_width
+ || allocation->height != old_height) {
+ queue_chatline_scroll_to_bottom();
+ old_width = allocation->width;
+ old_height = allocation->height;
+ }
+}
+
/**************************************************************************
...
**************************************************************************/
@@ -561,6 +666,13 @@ static gboolean keyboard_map_canvas(GtkWidget *w, GdkEventKey *ev, gpointer data
key_cancel_action();
return TRUE;
+ case GDK_b:
+ if (tiles_hilited_cities) {
+ buy_production_in_selected_cities();
+ return TRUE;
+ }
+ break;
+
default:
break;
};
@@ -807,8 +919,6 @@ static void populate_unit_pixmap_table(void)
gtk_table_attach_defaults(GTK_TABLE(table), unit_below_pixmap_button[i],
i, i + 1, 1, 2);
- gtk_widget_set_size_request(unit_below_pixmap[i],
- tileset_full_tile_width(tileset), tileset_full_tile_height(tileset));
gtk_pixcomm_clear(GTK_PIXCOMM(unit_below_pixmap[i]));
}
@@ -827,23 +937,25 @@ void reset_unit_table(void)
{
int i;
- /* Unreference all of the widgets that we're about to reallocate, thus
- * avoiding a memory leak. Remove them from the container first, just
- * to be safe. Note, the widgets are ref'd in
- * populatate_unit_pixmap_table. */
- gtk_container_remove(GTK_CONTAINER(unit_pixmap_table),
- unit_pixmap_button);
- gtk_widget_unref(unit_pixmap);
- gtk_widget_unref(unit_pixmap_button);
- for (i = 0; i < num_units_below; i++) {
+ if (unit_pixmap_button) {
+ /* Unreference all of the widgets that we're about to reallocate, thus
+ * avoiding a memory leak. Remove them from the container first, just
+ * to be safe. Note, the widgets are ref'd in
+ * populatate_unit_pixmap_table. */
+ gtk_container_remove(GTK_CONTAINER(unit_pixmap_table),
+ unit_pixmap_button);
+ gtk_widget_unref(unit_pixmap);
+ gtk_widget_unref(unit_pixmap_button);
+ for (i = 0; i < num_units_below; i++) {
+ gtk_container_remove(GTK_CONTAINER(unit_pixmap_table),
+ unit_below_pixmap_button[i]);
+ gtk_widget_unref(unit_below_pixmap[i]);
+ gtk_widget_unref(unit_below_pixmap_button[i]);
+ }
gtk_container_remove(GTK_CONTAINER(unit_pixmap_table),
- unit_below_pixmap_button[i]);
- gtk_widget_unref(unit_below_pixmap[i]);
- gtk_widget_unref(unit_below_pixmap_button[i]);
+ more_arrow_pixmap);
+ gtk_widget_unref(more_arrow_pixmap);
}
- gtk_container_remove(GTK_CONTAINER(unit_pixmap_table),
- more_arrow_pixmap);
- gtk_widget_unref(more_arrow_pixmap);
populate_unit_pixmap_table();
@@ -879,12 +991,36 @@ void enable_menus(bool enable)
}
/**************************************************************************
+ Workaround for a crash that occurs when a button release event is
+ emitted for a notebook with no pages. See PR#40743.
+ FIXME: Remove this hack once gtk_notebook_button_release() in
+ gtk/gtknotebook.c checks for NULL notebook->cur_page.
+**************************************************************************/
+static gboolean right_notebook_button_release(GtkWidget *widget,
+ GdkEventButton *event)
+{
+ if (event->type != GDK_BUTTON_RELEASE) {
+ return FALSE;
+ }
+
+ if (!GTK_IS_NOTEBOOK(widget)
+ || -1 == gtk_notebook_get_current_page(GTK_NOTEBOOK(widget))) {
+ /* Make sure the default gtk handler
+ * does NOT get called in this case. */
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
+/**************************************************************************
do the heavy lifting for the widget setup.
**************************************************************************/
static void setup_widgets(void)
{
GtkWidget *box, *ebox, *hbox, *sbox, *align, *label;
- GtkWidget *frame, *table, *table2, *paned, *sw, *text;
+ GtkWidget *frame, *table, *table2, *paned, *hpaned, *sw, *text;
+ GtkWidget *button;
int i;
char buf[256];
struct sprite *sprite;
@@ -990,13 +1126,15 @@ static void setup_widgets(void)
ebox = gtk_event_box_new();
gtk_widget_add_events(ebox, GDK_BUTTON_PRESS_MASK);
-
- gtk_box_pack_start(GTK_BOX(vbox), ebox, FALSE, FALSE, 0);
-
- main_label_info = gtk_label_new("\n\n\n\n");
- gtk_container_add(GTK_CONTAINER(ebox), main_label_info);
g_signal_connect(ebox, "button_press_event",
G_CALLBACK(show_info_popup), NULL);
+ gtk_box_pack_start(GTK_BOX(vbox), ebox, FALSE, FALSE, 0);
+
+ label = gtk_label_new(NULL);
+ gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
+ gtk_misc_set_padding(GTK_MISC(label), 2, 2);
+ gtk_container_add(GTK_CONTAINER(ebox), label);
+ main_label_info = label;
/* Production status */
@@ -1079,7 +1217,6 @@ static void setup_widgets(void)
timeout_label = gtk_label_new("");
frame = gtk_frame_new(NULL);
- gtk_widget_set_size_request(frame, tileset_small_sprite_width(tileset), tileset_small_sprite_height(tileset));
gtk_table_attach_defaults(GTK_TABLE(table), frame, 4, 10, 1, 2);
gtk_container_add(GTK_CONTAINER(frame), timeout_label);
@@ -1100,8 +1237,11 @@ static void setup_widgets(void)
unit_info_frame = gtk_frame_new("");
gtk_box_pack_start(GTK_BOX(avbox), unit_info_frame, FALSE, FALSE, 0);
- unit_info_label = gtk_label_new("\n\n\n");
- gtk_container_add(GTK_CONTAINER(unit_info_frame), unit_info_label);
+ label = gtk_label_new(NULL);
+ gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
+ gtk_misc_set_padding(GTK_MISC(label), 2, 2);
+ gtk_container_add(GTK_CONTAINER(unit_info_frame), label);
+ unit_info_label = label;
box = gtk_hbox_new(FALSE,0);
gtk_box_pack_start(GTK_BOX(avbox), box, FALSE, FALSE, 0);
@@ -1113,7 +1253,6 @@ static void setup_widgets(void)
gtk_table_set_col_spacings(GTK_TABLE(table), 2);
unit_pixmap_table = table;
- populate_unit_pixmap_table();
top_notebook = gtk_notebook_new();
gtk_notebook_set_tab_pos(GTK_NOTEBOOK(top_notebook), GTK_POS_BOTTOM);
@@ -1149,7 +1288,6 @@ static void setup_widgets(void)
|GDK_POINTER_MOTION_MASK
|GDK_SCROLL_MASK);
- gtk_widget_set_size_request(map_canvas, 510, 300);
gtk_container_add(GTK_CONTAINER(frame), map_canvas);
map_horizontal_scrollbar = gtk_hscrollbar_new(NULL);
@@ -1190,10 +1328,24 @@ static void setup_widgets(void)
gtk_paned_pack2(GTK_PANED(paned), sbox, TRUE, TRUE);
avbox = detached_widget_fill(sbox);
+ hpaned = gtk_hpaned_new();
+ gtk_box_pack_start(GTK_BOX(avbox), hpaned, TRUE, TRUE, 0);
+ bottom_hpaned = hpaned;
+
bottom_notebook = gtk_notebook_new();
gtk_notebook_set_tab_pos(GTK_NOTEBOOK(bottom_notebook), GTK_POS_TOP);
gtk_notebook_set_scrollable(GTK_NOTEBOOK(bottom_notebook), TRUE);
- gtk_box_pack_start(GTK_BOX(avbox), bottom_notebook, TRUE, TRUE, 0);
+ gtk_paned_pack1(GTK_PANED(hpaned), bottom_notebook, TRUE, TRUE);
+
+ right_notebook = gtk_notebook_new();
+ g_object_ref(right_notebook);
+ gtk_notebook_set_tab_pos(GTK_NOTEBOOK(right_notebook), GTK_POS_TOP);
+ gtk_notebook_set_scrollable(GTK_NOTEBOOK(right_notebook), TRUE);
+ g_signal_connect(right_notebook, "button-release-event",
+ G_CALLBACK(right_notebook_button_release), NULL);
+ if (split_bottom_notebook) {
+ gtk_paned_pack2(GTK_PANED(hpaned), right_notebook, TRUE, TRUE);
+ }
vbox = gtk_vbox_new(FALSE, 0);
@@ -1202,7 +1354,6 @@ static void setup_widgets(void)
GTK_SHADOW_ETCHED_IN);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), GTK_POLICY_AUTOMATIC,
GTK_POLICY_ALWAYS);
- gtk_widget_set_size_request(sw, 600, 100);
gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 0);
label = gtk_label_new(_("Chat"));
@@ -1211,6 +1362,8 @@ static void setup_widgets(void)
text = gtk_text_view_new_with_buffer(message_buffer);
gtk_text_view_set_editable(GTK_TEXT_VIEW(text), FALSE);
gtk_container_add(GTK_CONTAINER(sw), text);
+ g_signal_connect(text, "size-allocate",
+ G_CALLBACK(main_message_area_size_allocate), NULL);
gtk_widget_set_name(text, "chatline");
@@ -1226,18 +1379,28 @@ static void setup_widgets(void)
" menu.\nNow.. Go give'em hell!") );
/* the chat line */
- inputline = gtk_entry_new();
- gtk_box_pack_start(GTK_BOX(vbox), inputline, FALSE, FALSE, 3);
+ hbox = gtk_hbox_new(FALSE, 4);
+ gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 3);
+ inputline = gtk_entry_new();
g_signal_connect(inputline, "activate",
G_CALLBACK(inputline_return), NULL);
g_signal_connect(inputline, "key_press_event",
G_CALLBACK(inputline_handler), NULL);
+ gtk_box_pack_start(GTK_BOX(hbox), inputline, TRUE, TRUE, 0);
+
+ button = gtk_toggle_button_new_with_label(_("Allies Only"));
+ gtk_button_set_focus_on_click(GTK_BUTTON(button), FALSE);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button),
+ allied_chat_only);
+ g_signal_connect(button, "toggled",
+ G_CALLBACK(allied_chat_button_toggled), NULL);
+ gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 2);
+ allied_chat_toggle_button = button;
/* Other things to take care of */
gtk_widget_show_all(gtk_bin_get_child(GTK_BIN(toplevel)));
- gtk_widget_hide(more_arrow_pixmap);
if (enable_tabs) {
popup_meswin_dialog(FALSE);
@@ -1426,6 +1589,9 @@ void ui_main(int argc, char **argv)
gdk_gc_set_foreground(mask_bg_gc, &pixel);
}
+ selection_gc = gdk_gc_new(root_window);
+ gdk_gc_set_function(selection_gc, GDK_XOR);
+
tileset_init(tileset);
tileset_load_tiles(tileset);
@@ -1684,6 +1850,10 @@ void set_unit_icon(int idx, struct unit *punit)
unit_ids[idx] = punit ? punit->id : 0;
}
+ if (!w) {
+ return;
+ }
+
gtk_pixcomm_freeze(GTK_PIXCOMM(w));
if (punit) {
@@ -1704,6 +1874,10 @@ void set_unit_icons_more_arrow(bool onoff)
{
static bool showing = FALSE;
+ if (!more_arrow_pixmap) {
+ return;
+ }
+
if (onoff && !showing) {
gtk_widget_show(more_arrow_pixmap);
showing = TRUE;
@@ -1950,3 +2124,65 @@ void add_idle_callback(void (callback)(void *), void *data)
cb->data = data;
gtk_idle_add(idle_callback_wrapper, cb);
}
+
+/****************************************************************************
+ Option callback for the 'split_bottom_notebook' option.
+****************************************************************************/
+static void split_bottom_notebook_callback(struct client_option *op)
+{
+ popdown_meswin_dialog();
+ if (*op->p_bool_value) {
+ gtk_paned_pack2(GTK_PANED(bottom_hpaned), right_notebook, TRUE, TRUE);
+ gtk_widget_show_all(right_notebook);
+ } else {
+ gtk_container_remove(GTK_CONTAINER(bottom_hpaned), right_notebook);
+ }
+ popup_meswin_dialog(FALSE);
+}
+
+/****************************************************************************
+ Option callback for the 'allied_chat_only' option. This updates the state
+ of the associated toggle button.
+****************************************************************************/
+static void allied_chat_only_callback(struct client_option *op)
+{
+ GtkWidget *button;
+
+ button = allied_chat_toggle_button;
+ g_return_if_fail(button != NULL);
+ g_return_if_fail(GTK_IS_TOGGLE_BUTTON(button));
+
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button),
+ *op->p_bool_value);
+}
+
+/**************************************************************************
+ Set the chatline buttons to reflect the state of the game and current
+ client options. This function should be called on game start.
+**************************************************************************/
+void refresh_chat_buttons(void)
+{
+ GtkWidget *button;
+
+ button = allied_chat_toggle_button;
+ g_return_if_fail(button != NULL);
+ g_return_if_fail(GTK_IS_TOGGLE_BUTTON(button));
+
+ /* Hide the "Allies Only" button for local games. */
+ if (is_server_running()) {
+ gtk_widget_hide(button);
+ } else {
+ gtk_widget_show(button);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button),
+ allied_chat_only);
+ }
+}
+
+/**************************************************************************
+ Handle a toggle of the "Allies Only" chat button.
+**************************************************************************/
+static void allied_chat_button_toggled(GtkToggleButton *button,
+ gpointer user_data)
+{
+ allied_chat_only = gtk_toggle_button_get_active(button);
+}
diff --git a/client/gui-gtk-2.0/gui_main.h b/client/gui-gtk-2.0/gui_main.h
index 0b4c063..7bc7071 100644
--- a/client/gui-gtk-2.0/gui_main.h
+++ b/client/gui-gtk-2.0/gui_main.h
@@ -26,6 +26,12 @@ extern PangoFontDescription * city_productions_font;
extern bool enable_tabs;
extern bool better_fog;
+extern bool show_chat_message_time;
+extern bool split_bottom_notebook;
+extern bool new_messages_go_to_top;
+extern bool show_message_window_buttons;
+extern bool metaserver_tab_first;
+extern bool allied_chat_only;
extern GdkGC * civ_gc;
extern GdkGC * mask_fg_gc;
@@ -35,6 +41,7 @@ extern GdkGC * fill_tile_gc;
extern GdkGC * thin_line_gc;
extern GdkGC * thick_line_gc;
extern GdkGC * border_line_gc;
+extern GdkGC * selection_gc;
extern GdkPixmap * gray50;
extern GdkPixmap * gray25;
extern GdkPixmap * black50;
@@ -71,6 +78,7 @@ extern GtkWidget * toplevel_tabs;
extern GtkWidget * top_notebook;
extern GtkWidget * map_widget;
extern GtkWidget * bottom_notebook;
+extern GtkWidget * right_notebook;
extern GtkTextBuffer * message_buffer;
extern GtkTreeStore *conn_model;
@@ -82,6 +90,7 @@ gboolean inputline_handler(GtkWidget *w, GdkEventKey *ev);
void reset_unit_table(void);
void popup_quit_dialog(void);
+void refresh_chat_buttons(void);
/* There simply is no proper header to place this define. Creating one
* just for this seems overkill. */
diff --git a/client/gui-gtk-2.0/gui_stuff.c b/client/gui-gtk-2.0/gui_stuff.c
index 2f209b7..8937bb0 100644
--- a/client/gui-gtk-2.0/gui_stuff.c
+++ b/client/gui-gtk-2.0/gui_stuff.c
@@ -974,3 +974,35 @@ void gui_dialog_set_return_dialog(struct gui_dialog *dlg,
dlg->return_dialog_id = return_dialog->id;
}
}
+
+/**************************************************************************
+ Convenience function to add a column to a GtkTreeView. Returns the added
+ column, or NULL if an error occured.
+**************************************************************************/
+GtkTreeViewColumn *add_treeview_column(GtkWidget *view, const char *title,
+ GType gtype, int model_index)
+{
+ GtkTreeViewColumn *col;
+ GtkCellRenderer *rend;
+ const char *attr;
+
+ g_return_val_if_fail(view != NULL, NULL);
+ g_return_val_if_fail(GTK_IS_TREE_VIEW(view), NULL);
+ g_return_val_if_fail(title != NULL, NULL);
+
+ if (gtype == G_TYPE_BOOLEAN) {
+ rend = gtk_cell_renderer_toggle_new();
+ attr = "active";
+ } else if (gtype == GDK_TYPE_PIXBUF) {
+ rend = gtk_cell_renderer_pixbuf_new();
+ attr = "pixbuf";
+ } else {
+ rend = gtk_cell_renderer_text_new();
+ attr = "text";
+ }
+
+ col = gtk_tree_view_column_new_with_attributes(title, rend, attr,
+ model_index, NULL);
+ gtk_tree_view_append_column(GTK_TREE_VIEW(view), col);
+ return col;
+}
diff --git a/client/gui-gtk-2.0/gui_stuff.h b/client/gui-gtk-2.0/gui_stuff.h
index 9acfde1..f16b2f6 100644
--- a/client/gui-gtk-2.0/gui_stuff.h
+++ b/client/gui-gtk-2.0/gui_stuff.h
@@ -50,7 +50,8 @@ void itree_unselect(GtkTreeSelection *selection, ITree *it);
gint gtk_tree_selection_get_row(GtkTreeSelection *selection);
void gtk_tree_view_focus(GtkTreeView *view);
void setup_dialog(GtkWidget *shell, GtkWidget *parent);
-
+GtkTreeViewColumn *add_treeview_column(GtkWidget *view, const char *title,
+ GType gtype, int model_index);
enum gui_dialog_type {
diff --git a/client/gui-gtk-2.0/mapctrl.c b/client/gui-gtk-2.0/mapctrl.c
index 150fe1f..6b28f6c 100644
--- a/client/gui-gtk-2.0/mapctrl.c
+++ b/client/gui-gtk-2.0/mapctrl.c
@@ -110,12 +110,8 @@ static void popupinfo_positioning_callback(GtkWidget *w, GtkAllocation *alloc,
static void popit(GdkEventButton *event, struct tile *ptile)
{
GtkWidget *p;
- struct tile *cross_list[2 + 1];
- struct tile **cross_head = cross_list;
- int i;
static struct tmousepos mousepos;
struct unit *punit;
- bool is_orders;
if (client_tile_get_known(ptile) >= TILE_KNOWN_FOGGED) {
p=gtk_window_new(GTK_WINDOW_POPUP);
@@ -125,21 +121,14 @@ static void popit(GdkEventButton *event, struct tile *ptile)
punit = find_visible_unit(ptile);
- is_orders = show_unit_orders(punit);
-
- if (punit && punit->goto_tile) {
- map_deco[punit->goto_tile->index].crosshair++;
- *cross_head = punit->goto_tile;
- cross_head++;
+ if (punit) {
+ mapdeco_set_gotoroute(punit);
+ if (punit->goto_tile) {
+ mapdeco_set_crosshair(punit->goto_tile, TRUE);
+ }
}
- map_deco[ptile->index].crosshair++;
- *cross_head = ptile;
- cross_head++;
+ mapdeco_set_crosshair(ptile, TRUE);
- *cross_head = NULL;
- for (i = 0; cross_list[i]; i++) {
- put_cross_overlay_tile(cross_list[i]);
- }
g_signal_connect(p, "destroy",
G_CALLBACK(popupinfo_popdown_callback), NULL);
@@ -165,13 +154,8 @@ static void popit(GdkEventButton *event, struct tile *ptile)
**************************************************************************/
void popupinfo_popdown_callback(GtkWidget *w, gpointer data)
{
- /* We could just remove the crosshairs that we placed earlier, but
- * this is easier. */
- whole_map_iterate(ptile) {
- map_deco[ptile->index].crosshair = 0;
- } whole_map_iterate_end;
-
- update_map_canvas_visible();
+ mapdeco_clear_crosshairs();
+ mapdeco_clear_gotoroutes();
}
/**************************************************************************
@@ -290,16 +274,17 @@ gboolean butt_down_mapcanvas(GtkWidget *w, GdkEventButton *ev, gpointer data)
case 3: /* RIGHT mouse button */
- /* <CONTROL> + RMB : Quickselect a land unit. */
- if (ev->state & GDK_CONTROL_MASK) {
- action_button_pressed(ev->x, ev->y, SELECT_LAND);
- }
- /* <SHIFT> + RMB: Paste Production. */
- else if ((ev->state & GDK_SHIFT_MASK) && pcity) {
+ /* <SHIFT + CONTROL> + RMB: Paste Production. */
+ if ((ev->state & GDK_SHIFT_MASK) && (ev->state & GDK_CONTROL_MASK)
+ && pcity != NULL) {
clipboard_paste_production(pcity);
cancel_tile_hiliting();
}
- /* Plain RMB click. */
+ /* <CONTROL> + RMB : Quickselect a land unit. */
+ else if (ev->state & GDK_CONTROL_MASK) {
+ action_button_pressed(ev->x, ev->y, SELECT_LAND);
+ }
+ /* Plain RMB click, possibly with <SHIFT>. */
else {
/* A foolproof user will depress button on canvas,
* release it on another widget, and return to canvas
diff --git a/client/gui-gtk-2.0/mapview.c b/client/gui-gtk-2.0/mapview.c
index 0c7ece5..188eda3 100644
--- a/client/gui-gtk-2.0/mapview.c
+++ b/client/gui-gtk-2.0/mapview.c
@@ -98,11 +98,22 @@ void update_timeout_label(void)
void update_info_label( void )
{
GtkWidget *label;
+ const struct player *pplayer = game.player_ptr;
label = gtk_frame_get_label_widget(GTK_FRAME(main_frame_civ_name));
- if (game.player_ptr) {
- gtk_label_set_text(GTK_LABEL(label),
- nation_adjective_for_player(game.player_ptr));
+ if (pplayer != NULL) {
+ char nation[MAX_LEN_NAME];
+
+ /* Capitalize the first character of the translated nation
+ * plural name so that the frame label looks good. I assume
+ * that in the case that capitalization does not make sense
+ * (e.g. multi-byte characters or no "upper case" form in
+ * the translation language) my_toupper() will just return
+ * the same value as was passed into it. */
+ sz_strlcpy(nation, nation_plural_for_player(pplayer));
+ nation[0] = my_toupper(nation[0]);
+
+ gtk_label_set_text(GTK_LABEL(label), nation);
} else {
gtk_label_set_text(GTK_LABEL(label), "-");
}
@@ -430,7 +441,6 @@ static bool is_flush_queued = FALSE;
static gint unqueue_flush(gpointer data)
{
flush_dirty();
- redraw_selection_rectangle();
is_flush_queued = FALSE;
return 0;
}
@@ -810,14 +820,27 @@ void scrollbar_jump_callback(GtkAdjustment *adj, gpointer hscrollbar)
}
/**************************************************************************
- Area Selection
+ Draws a rectangle with top left corner at (canvas_x, canvas_y), and
+ width 'w' and height 'h'. It is drawn using the 'selection_gc' context,
+ so the pixel combining function is XOR. This means that drawing twice
+ in the same place will restore the image to its original state.
+
+ NB: A side effect of this function is to set the 'selection_gc' color
+ to COLOR_MAPVIEW_SELECTION.
**************************************************************************/
void draw_selection_rectangle(int canvas_x, int canvas_y, int w, int h)
{
GdkPoint points[5];
+ struct color *pcolor;
+
+ if (w == 0 || h == 0) {
+ return;
+ }
- gdk_gc_set_foreground(civ_gc,
- &get_color(tileset, COLOR_MAPVIEW_SELECTION)->color);
+ pcolor = get_color(tileset, COLOR_MAPVIEW_SELECTION);
+ if (!pcolor) {
+ return;
+ }
/* gdk_draw_rectangle() must start top-left.. */
points[0].x = canvas_x;
@@ -834,7 +857,10 @@ void draw_selection_rectangle(int canvas_x, int canvas_y, int w, int h)
points[4].x = canvas_x;
points[4].y = canvas_y;
- gdk_draw_lines(map_canvas->window, civ_gc, points, ARRAY_SIZE(points));
+
+ gdk_gc_set_foreground(selection_gc, &pcolor->color);
+ gdk_draw_lines(map_canvas->window, selection_gc,
+ points, ARRAY_SIZE(points));
}
/**************************************************************************
diff --git a/client/gui-gtk-2.0/menu.c b/client/gui-gtk-2.0/menu.c
index 009ec01..e3ed747 100644
--- a/client/gui-gtk-2.0/menu.c
+++ b/client/gui-gtk-2.0/menu.c
@@ -100,6 +100,8 @@ enum MenuID {
MENU_VIEW_SHOW_CITY_NAMES,
MENU_VIEW_SHOW_CITY_GROWTH_TURNS,
MENU_VIEW_SHOW_CITY_PRODUCTIONS,
+ MENU_VIEW_SHOW_CITY_BUYCOST,
+ MENU_VIEW_SHOW_CITY_TRADEROUTES,
MENU_VIEW_SHOW_CITY_WORKERS,
MENU_VIEW_SHOW_TERRAIN,
MENU_VIEW_SHOW_COASTLINE,
@@ -146,6 +148,10 @@ enum MenuID {
MENU_ORDER_UPGRADE,
MENU_ORDER_DIPLOMAT_DLG,
MENU_ORDER_NUKE,
+ MENU_ORDER_SELECT_SINGLE,
+ MENU_ORDER_SELECT_SAME_TYPE_TILE,
+ MENU_ORDER_SELECT_ALL_ON_TILE,
+ MENU_ORDER_SELECT_SAME_TYPE_CONT,
MENU_ORDER_SELECT_SAME_TYPE,
MENU_ORDER_WAIT,
MENU_ORDER_DONE,
@@ -329,6 +335,15 @@ static void view_menu_callback(gpointer callback_data, guint callback_action,
if (draw_city_productions ^ GTK_CHECK_MENU_ITEM(widget)->active)
key_city_productions_toggle();
break;
+ case MENU_VIEW_SHOW_CITY_BUYCOST:
+ if (draw_city_buycost ^ GTK_CHECK_MENU_ITEM(widget)->active) {
+ key_city_buycost_toggle();
+ }
+ break;
+ case MENU_VIEW_SHOW_CITY_TRADEROUTES:
+ if (draw_city_traderoutes ^ GTK_CHECK_MENU_ITEM(widget)->active)
+ key_city_traderoutes_toggle();
+ break;
case MENU_VIEW_SHOW_CITY_WORKERS:
key_city_workers();
break;
@@ -409,8 +424,20 @@ static void orders_menu_callback(gpointer callback_data,
guint callback_action, GtkWidget *widget)
{
switch(callback_action) {
+ case MENU_ORDER_SELECT_SINGLE:
+ request_unit_select(get_units_in_focus(), SELTYPE_SINGLE, SELLOC_TILE);
+ break;
+ case MENU_ORDER_SELECT_SAME_TYPE_TILE:
+ request_unit_select(get_units_in_focus(), SELTYPE_SAME, SELLOC_TILE);
+ break;
+ case MENU_ORDER_SELECT_ALL_ON_TILE:
+ request_unit_select(get_units_in_focus(), SELTYPE_ALL, SELLOC_TILE);
+ break;
+ case MENU_ORDER_SELECT_SAME_TYPE_CONT:
+ request_unit_select(get_units_in_focus(), SELTYPE_SAME, SELLOC_CONT);
+ break;
case MENU_ORDER_SELECT_SAME_TYPE:
- request_unit_select_same_type(get_units_in_focus());
+ request_unit_select(get_units_in_focus(), SELTYPE_SAME, SELLOC_ALL);
break;
case MENU_ORDER_BUILD_CITY:
unit_list_iterate(get_units_in_focus(), punit) {
@@ -781,6 +808,10 @@ static GtkItemFactoryEntry menu_items[] =
view_menu_callback, MENU_VIEW_SHOW_CITY_GROWTH_TURNS, "<CheckItem>" },
{ "/" N_("View") "/" N_("City _Productions"), "<control>p",
view_menu_callback, MENU_VIEW_SHOW_CITY_PRODUCTIONS, "<CheckItem>" },
+ { "/" N_("View") "/" N_("City Buy Cost"), NULL,
+ view_menu_callback, MENU_VIEW_SHOW_CITY_BUYCOST, "<CheckItem>" },
+ { "/" N_("View") "/" N_("City Traderoutes"), "<control>t",
+ view_menu_callback, MENU_VIEW_SHOW_CITY_TRADEROUTES, "<CheckItem>" },
{ "/" N_("View") "/" N_("Draw city worker map grid"), "t",
view_menu_callback, MENU_VIEW_SHOW_CITY_WORKERS },
{ "/" N_("View") "/sep1", NULL,
@@ -896,8 +927,20 @@ static GtkItemFactoryEntry menu_items[] =
orders_menu_callback, MENU_ORDER_NUKE },
{ "/" N_("Orders") "/sep5", NULL,
NULL, 0, "<Separator>" },
- { "/" N_("Orders") "/" N_("Select same type"), "y",
- orders_menu_callback, MENU_ORDER_SELECT_SAME_TYPE },
+ { "/" N_("Orders") "/" N_("Select"), NULL,
+ NULL, 0, "<Branch>" },
+ { "/" N_("Orders") "/" N_("Select") "/tearoff1", NULL,
+ NULL, 0, "<Tearoff>" },
+ { "/" N_("Orders") "/" N_("Select") "/" N_("Single"), "j",
+ orders_menu_callback, MENU_ORDER_SELECT_SINGLE },
+ { "/" N_("Orders") "/" N_("Select") "/" N_("Same Type On Tile"), "k",
+ orders_menu_callback, MENU_ORDER_SELECT_SAME_TYPE_TILE },
+ { "/" N_("Orders") "/" N_("Select") "/" N_("All On Tile"), "<shift>k",
+ orders_menu_callback, MENU_ORDER_SELECT_ALL_ON_TILE },
+ { "/" N_("Orders") "/" N_("Select") "/" N_("Same Type On Continent"), "y",
+ orders_menu_callback, MENU_ORDER_SELECT_SAME_TYPE_CONT },
+ { "/" N_("Orders") "/" N_("Select") "/" N_("Same Type Everywhere"), "<shift>y",
+ orders_menu_callback, MENU_ORDER_SELECT_SAME_TYPE },
{ "/" N_("Orders") "/" N_("_Wait"), "w",
orders_menu_callback, MENU_ORDER_WAIT },
{ "/" N_("Orders") "/" N_("Done"), "space",
@@ -1325,6 +1368,8 @@ void update_menus(void)
menus_set_active("<main>/_View/City G_rowth", draw_city_growth);
menus_set_active("<main>/_View/City _Productions", draw_city_productions);
+ menus_set_active("<main>/_View/City Buy Cost", draw_city_buycost);
+ menus_set_active("<main>/_View/City Traderoutes", draw_city_traderoutes);
menus_set_active("<main>/_View/Terrain", draw_terrain);
menus_set_active("<main>/_View/Coastline", draw_coastline);
menus_set_sensitive("<main>/_View/Coastline", !draw_terrain);
diff --git a/client/gui-gtk-2.0/messagewin.c b/client/gui-gtk-2.0/messagewin.c
index 0f5dfcf..d424041 100644
--- a/client/gui-gtk-2.0/messagewin.c
+++ b/client/gui-gtk-2.0/messagewin.c
@@ -98,27 +98,17 @@ bool is_meswin_open(void)
/****************************************************************
...
*****************************************************************/
-static void meswin_visited_item(gint n)
+static void meswin_set_visited(GtkTreeIter *it, bool visited)
{
- GtkTreeIter it;
-
- if (gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(meswin_store),&it,NULL,n)) {
- gtk_list_store_set(meswin_store, &it, 1, (gint)TRUE, -1);
- set_message_visited_state(n, TRUE);
- }
-}
+ GtkListStore *store;
+ gint row;
-/****************************************************************
-...
-*****************************************************************/
-static void meswin_not_visited_item(gint n)
-{
- GtkTreeIter it;
+ store = meswin_store;
+ g_return_if_fail(store != NULL);
- if (gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(meswin_store),&it,NULL,n)) {
- gtk_list_store_set(meswin_store, &it, 1, (gint)FALSE, -1);
- set_message_visited_state(n, FALSE);
- }
+ gtk_list_store_set(store, it, 1, visited, -1);
+ gtk_tree_model_get(GTK_TREE_MODEL(store), it, 2, &row, -1);
+ set_message_visited_state(row, visited);
}
/****************************************************************
@@ -142,6 +132,42 @@ static void meswin_cell_data_func(GtkTreeViewColumn *col,
}
}
+/**************************************************************************
+ Mouse button press handler for the message window treeview. We only
+ care about right clicks on a row; this action centers on the tile
+ associated with the event at that row (if applicable).
+**************************************************************************/
+static gboolean meswin_button_press_callback(GtkWidget *widget,
+ GdkEventButton *ev,
+ gpointer data)
+{
+ GtkTreePath *path = NULL;
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+ gint row;
+
+ g_return_val_if_fail(GTK_IS_TREE_VIEW(widget), FALSE);
+
+ if (ev->type != GDK_BUTTON_PRESS || ev->button != 3) {
+ return FALSE;
+ }
+
+ if (!gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(widget),
+ (gint) ev->x, (gint) ev->y,
+ &path, NULL, NULL, NULL)) {
+ return TRUE;
+ }
+
+ model = gtk_tree_view_get_model(GTK_TREE_VIEW(widget));
+ if (gtk_tree_model_get_iter(model, &iter, path)) {
+ gtk_tree_model_get(model, &iter, 2, &row, -1);
+ meswin_goto(row);
+ }
+ gtk_tree_path_free(path);
+
+ return TRUE;
+}
+
/****************************************************************
...
*****************************************************************/
@@ -149,12 +175,19 @@ static void create_meswin_dialog(void)
{
GtkCellRenderer *renderer;
GtkTreeViewColumn *col;
- GtkWidget *view, *sw, *cmd;
+ GtkWidget *view, *sw, *cmd, *notebook;
- gui_dialog_new(&meswin_shell, GTK_NOTEBOOK(bottom_notebook), NULL);
+ if (split_bottom_notebook) {
+ notebook = right_notebook;
+ } else {
+ notebook = bottom_notebook;
+ }
+ gui_dialog_new(&meswin_shell, GTK_NOTEBOOK(notebook), NULL);
gui_dialog_set_title(meswin_shell, _("Messages"));
- meswin_store = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_BOOLEAN);
+ meswin_store = gtk_list_store_new(3, G_TYPE_STRING,
+ G_TYPE_BOOLEAN,
+ G_TYPE_INT);
sw = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw),
@@ -181,14 +214,18 @@ static void create_meswin_dialog(void)
G_CALLBACK(meswin_selection_callback), NULL);
g_signal_connect(view, "row_activated",
G_CALLBACK(meswin_row_activated_callback), NULL);
+ g_signal_connect(view, "button-press-event",
+ G_CALLBACK(meswin_button_press_callback), NULL);
+
+ if (show_message_window_buttons) {
+ cmd = gui_dialog_add_stockbutton(meswin_shell, GTK_STOCK_JUMP_TO,
+ _("Goto _Location"), CMD_GOTO);
+ gtk_widget_set_sensitive(cmd, FALSE);
- cmd = gui_dialog_add_stockbutton(meswin_shell, GTK_STOCK_JUMP_TO,
- _("Goto _Location"), CMD_GOTO);
- gtk_widget_set_sensitive(cmd, FALSE);
-
- cmd = gui_dialog_add_stockbutton(meswin_shell, GTK_STOCK_ZOOM_IN,
- _("Inspect _City"), CMD_POPCITY);
- gtk_widget_set_sensitive(cmd, FALSE);
+ cmd = gui_dialog_add_stockbutton(meswin_shell, GTK_STOCK_ZOOM_IN,
+ _("Inspect _City"), CMD_POPCITY);
+ gtk_widget_set_sensitive(cmd, FALSE);
+ }
gui_dialog_add_button(meswin_shell, GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
@@ -196,8 +233,6 @@ static void create_meswin_dialog(void)
gui_dialog_set_default_size(meswin_shell, 520, 300);
gui_dialog_show_all(meswin_shell);
-
- gtk_tree_view_focus(GTK_TREE_VIEW(view));
}
/**************************************************************************
@@ -205,25 +240,29 @@ static void create_meswin_dialog(void)
**************************************************************************/
void real_update_meswin_dialog(void)
{
- int i, num = get_num_messages(), num_not_visited = 0;
+ int i, num, num_not_visited = 0;
+ struct message *pmsg;
+ GtkListStore *store;
GtkTreeIter it;
- gtk_list_store_clear(meswin_store);
-
- for (i = 0; i < num; i++) {
- GValue value = { 0, };
+ store = meswin_store;
+ g_return_if_fail(store != NULL);
- gtk_list_store_append(meswin_store, &it);
+ gtk_list_store_clear(store);
+ num = get_num_messages();
- g_value_init(&value, G_TYPE_STRING);
- g_value_set_static_string(&value, get_message(i)->descr);
- gtk_list_store_set_value(meswin_store, &it, 0, &value);
- g_value_unset(&value);
+ for (i = 0; i < num; i++) {
+ pmsg = get_message(i);
- if (get_message(i)->visited) {
- meswin_visited_item(i);
+ if (new_messages_go_to_top) {
+ gtk_list_store_prepend(store, &it);
} else {
- meswin_not_visited_item(i);
+ gtk_list_store_append(store, &it);
+ }
+ gtk_list_store_set(store, &it, 0, pmsg->descr, 2, i, -1);
+ meswin_set_visited(&it, pmsg->visited);
+
+ if (!pmsg->visited) {
num_not_visited++;
}
}
@@ -242,15 +281,23 @@ void real_update_meswin_dialog(void)
static void meswin_selection_callback(GtkTreeSelection *selection,
gpointer data)
{
- gint row = gtk_tree_selection_get_row(selection);
+ struct message *pmsg;
+ GtkTreeIter iter;
+ GtkTreeModel *model;
+ gint row;
+
+ if (!gtk_tree_selection_get_selected(selection, &model, &iter)) {
+ return;
+ }
- if (row != -1) {
- struct message *message = get_message(row);
+ gtk_tree_model_get(model, &iter, 2, &row, -1);
+ pmsg = get_message(row);
+ if (pmsg) {
gui_dialog_set_response_sensitive(meswin_shell, CMD_GOTO,
- message->location_ok);
+ pmsg->location_ok);
gui_dialog_set_response_sensitive(meswin_shell, CMD_POPCITY,
- message->city_ok);
+ pmsg->city_ok);
}
}
@@ -262,16 +309,26 @@ static void meswin_row_activated_callback(GtkTreeView *view,
GtkTreeViewColumn *col,
gpointer data)
{
- gint row = gtk_tree_path_get_indices(path)[0];
- struct message *message = get_message(row);
+ struct message *pmsg;
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+ gint row;
+
+ model = gtk_tree_view_get_model(view);
+ if (!gtk_tree_model_get_iter(model, &iter, path)) {
+ return;
+ }
+
+ gtk_tree_model_get(model, &iter, 2, &row, -1);
+ pmsg = get_message(row);
meswin_double_click(row);
- meswin_visited_item(row);
+ meswin_set_visited(&iter, TRUE);
gui_dialog_set_response_sensitive(meswin_shell, CMD_GOTO,
- message->location_ok);
+ pmsg->location_ok);
gui_dialog_set_response_sensitive(meswin_shell, CMD_POPCITY,
- message->city_ok);
+ pmsg->city_ok);
}
/**************************************************************************
@@ -280,33 +337,29 @@ static void meswin_row_activated_callback(GtkTreeView *view,
static void meswin_response_callback(struct gui_dialog *dlg, int response,
gpointer data)
{
- switch (response) {
- case CMD_GOTO:
- {
- gint row = gtk_tree_selection_get_row(meswin_selection);
-
- if (row == -1) {
- return;
- }
+ GtkTreeSelection *sel;
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+ gint row;
- meswin_goto(row);
- meswin_visited_item(row);
- }
- break;
- case CMD_POPCITY:
- {
- gint row = gtk_tree_selection_get_row(meswin_selection);
-
- if (row == -1) {
- return;
- }
- meswin_popup_city(row);
- meswin_visited_item(row);
- }
- break;
- default:
+ if (response != CMD_GOTO && response != CMD_POPCITY) {
gui_dialog_destroy(dlg);
- break;
+ return;
+ }
+
+ sel = meswin_selection;
+ g_return_if_fail(sel != NULL);
+ if (!gtk_tree_selection_get_selected(sel, &model, &iter)) {
+ return;
+ }
+
+ gtk_tree_model_get(model, &iter, 2, &row, -1);
+
+ if (response == CMD_GOTO) {
+ meswin_goto(row);
+ } else {
+ meswin_popup_city(row);
}
+ meswin_set_visited(&iter, TRUE);
}
diff --git a/client/gui-gtk-2.0/pages.c b/client/gui-gtk-2.0/pages.c
index a0f138b..067d03f 100644
--- a/client/gui-gtk-2.0/pages.c
+++ b/client/gui-gtk-2.0/pages.c
@@ -64,6 +64,9 @@ static GtkWidget *scenario_description;
static GtkListStore *load_store, *scenario_store,
*nation_store, *meta_store, *lan_store;
+static GtkListStore *server_playerlist_store;
+static GtkWidget *server_playerlist_view;
+
static GtkTreeSelection *load_selection, *scenario_selection,
*nation_selection, *meta_selection, *lan_selection;
@@ -72,14 +75,15 @@ static enum client_pages old_page = -1;
static void set_page_callback(GtkWidget *w, gpointer data);
static void update_nation_page(struct packet_game_load *packet);
-static guint scan_timer = 0;
-struct server_scan *lan, *meta;
+static guint meta_scan_timer, lan_scan_timer;
+static struct server_scan *meta_scan, *lan_scan;
static GtkWidget *statusbar, *statusbar_frame;
static GQueue *statusbar_queue;
static guint statusbar_timer = 0;
static GtkWidget *ruleset_combo;
+static GtkWidget *start_page_entry;
/**************************************************************************
spawn a server, if there isn't one, using the default settings.
@@ -173,19 +177,17 @@ static void ggz_login(void)
**************************************************************************/
GtkWidget *create_main_page(void)
{
- GtkWidget *align, *box, *sbox, *bbox, *frame, *image;
-
- GtkWidget *button;
+ GtkWidget *widget, *align, *vbox, *frame, *image, *button, *table;
GtkSizeGroup *size;
size = gtk_size_group_new(GTK_SIZE_GROUP_BOTH);
- box = gtk_vbox_new(FALSE, 6);
- gtk_container_set_border_width(GTK_CONTAINER(box), 4);
+ vbox = gtk_vbox_new(FALSE, 0);
+ widget = vbox;
align = gtk_alignment_new(0.5, 0.0, 0.0, 0.0);
gtk_container_set_border_width(GTK_CONTAINER(align), 18);
- gtk_box_pack_start(GTK_BOX(box), align, FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(vbox), align, FALSE, FALSE, 0);
frame = gtk_frame_new(NULL);
gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_ETCHED_OUT);
@@ -193,74 +195,68 @@ GtkWidget *create_main_page(void)
image = gtk_image_new_from_file(tileset_main_intro_filename(tileset));
g_signal_connect_after(image, "expose_event",
- G_CALLBACK(intro_expose), NULL);
+ G_CALLBACK(intro_expose), NULL);
gtk_container_add(GTK_CONTAINER(frame), image);
- align = gtk_alignment_new(0.5, 0.0, 0.0, 0.0);
- gtk_box_pack_start(GTK_BOX(box), align, FALSE, FALSE, 0);
+#if IS_BETA_VERSION
+ {
+ GtkWidget *label;
- sbox = gtk_vbox_new(FALSE, 18);
- gtk_container_add(GTK_CONTAINER(align), sbox);
+ label = gtk_label_new(beta_message());
+ gtk_widget_set_name(label, "beta label");
+ gtk_misc_set_alignment(GTK_MISC(label), 0.5, 0.5);
+ gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_CENTER);
+ gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
+ }
+#endif
- bbox = gtk_vbox_new(FALSE, 6);
- gtk_container_add(GTK_CONTAINER(sbox), bbox);
+ table = gtk_table_new(3, 2, TRUE);
+ align = gtk_alignment_new(0.5, 0.5, 0.0, 0.0);
+ gtk_box_pack_start(GTK_BOX(vbox), align, TRUE, TRUE, 12);
+
+ gtk_table_set_row_spacings(GTK_TABLE(table), 8);
+ gtk_table_set_col_spacings(GTK_TABLE(table), 18);
+ gtk_container_add(GTK_CONTAINER(align), table);
button = gtk_button_new_with_mnemonic(_("Start _New Game"));
gtk_size_group_add_widget(size, button);
- gtk_container_add(GTK_CONTAINER(bbox), button);
+ gtk_table_attach_defaults(GTK_TABLE(table), button, 0, 1, 0, 1);
g_signal_connect(button, "clicked",
- G_CALLBACK(start_new_game_callback), NULL);
+ G_CALLBACK(start_new_game_callback), NULL);
button = gtk_button_new_with_mnemonic(_("Start _Scenario Game"));
gtk_size_group_add_widget(size, button);
- gtk_container_add(GTK_CONTAINER(bbox), button);
+ gtk_table_attach_defaults(GTK_TABLE(table), button, 0, 1, 1, 2);
g_signal_connect(button, "clicked",
- G_CALLBACK(start_scenario_callback), NULL);
+ G_CALLBACK(start_scenario_callback), NULL);
button = gtk_button_new_with_mnemonic(_("_Load Saved Game"));
gtk_size_group_add_widget(size, button);
- gtk_container_add(GTK_CONTAINER(bbox), button);
+ gtk_table_attach_defaults(GTK_TABLE(table), button, 0, 1, 2, 3);
g_signal_connect(button, "clicked",
- G_CALLBACK(load_saved_game_callback), NULL);
-
- bbox = gtk_vbox_new(FALSE, 6);
- gtk_container_add(GTK_CONTAINER(sbox), bbox);
+ G_CALLBACK(load_saved_game_callback), NULL);
button = gtk_button_new_with_mnemonic(_("C_onnect to Network Game"));
gtk_size_group_add_widget(size, button);
- gtk_container_add(GTK_CONTAINER(bbox), button);
+ gtk_table_attach_defaults(GTK_TABLE(table), button, 1, 2, 0, 1);
g_signal_connect(button, "clicked",
- G_CALLBACK(set_page_callback), GUINT_TO_POINTER(PAGE_NETWORK));
+ G_CALLBACK(set_page_callback),
+ GUINT_TO_POINTER(PAGE_NETWORK));
#ifdef GGZ_GTK
button = gtk_button_new_with_mnemonic(_("Connect to Gaming _Zone"));
gtk_size_group_add_widget(size, button);
- gtk_container_add(GTK_CONTAINER(bbox), button);
+ gtk_table_attach_defaults(GTK_TABLE(table), button, 1, 2, 1, 2);
g_signal_connect(button, "clicked", ggz_login, NULL);
#endif
- bbox = gtk_vbox_new(FALSE, 6);
- gtk_container_add(GTK_CONTAINER(sbox), bbox);
-
button = gtk_button_new_from_stock(GTK_STOCK_QUIT);
gtk_size_group_add_widget(size, button);
- gtk_container_add(GTK_CONTAINER(bbox), button);
+ gtk_table_attach_defaults(GTK_TABLE(table), button, 1, 2, 2, 3);
g_signal_connect(button, "clicked",
- G_CALLBACK(gtk_main_quit), NULL);
-
-#if IS_BETA_VERSION
- {
- GtkWidget *label;
+ G_CALLBACK(gtk_main_quit), NULL);
- label = gtk_label_new(beta_message());
- gtk_widget_set_name(label, "beta label");
- gtk_misc_set_alignment(GTK_MISC(label), 0.5, 0.5);
- gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_CENTER);
- gtk_container_add(GTK_CONTAINER(sbox), label);
- }
-#endif
-
- return box;
+ return widget;
}
@@ -276,84 +272,106 @@ static GtkWidget *network_confirm_password_label, *network_confirm_password;
/**************************************************************************
update a server list.
**************************************************************************/
-static void update_server_list(GtkTreeSelection *selection,
- GtkListStore *store, struct server_list *list)
+static void update_server_list(enum server_scan_type sstype,
+ const struct server_list *list)
{
- const gchar *host, *port;
+ GtkTreeSelection *sel = NULL;
+ GtkTreeView *view;
+ GtkTreeIter it;
+ GtkListStore *store;
+ const gchar *host, *portstr;
+ int port;
- host = gtk_entry_get_text(GTK_ENTRY(network_host));
- port = gtk_entry_get_text(GTK_ENTRY(network_port));
+ switch (sstype) {
+ case SERVER_SCAN_LOCAL:
+ sel = lan_selection;
+ break;
+ case SERVER_SCAN_GLOBAL:
+ sel = meta_selection;
+ break;
+ default:
+ break;
+ }
+ if (!sel) {
+ return;
+ }
+
+ view = gtk_tree_selection_get_tree_view(sel);
+ store = GTK_LIST_STORE(gtk_tree_view_get_model(view));
gtk_list_store_clear(store);
if (!list) {
return;
}
- server_list_iterate(list, pserver) {
- GtkTreeIter it;
- gchar *row[6];
+ host = gtk_entry_get_text(GTK_ENTRY(network_host));
+ portstr = gtk_entry_get_text(GTK_ENTRY(network_port));
+ port = atoi(portstr);
+ server_list_iterate(list, pserver) {
gtk_list_store_append(store, &it);
-
- row[0] = pserver->host;
- row[1] = pserver->port;
- row[2] = pserver->version;
- row[3] = _(pserver->state);
- row[4] = pserver->nplayers;
- row[5] = pserver->message;
-
gtk_list_store_set(store, &it,
- 0, row[0], 1, row[1], 2, row[2],
- 3, row[3], 4, row[4], 5, row[5], -1);
-
- if (strcmp(host, pserver->host) == 0 && strcmp(port, pserver->port) == 0) {
- gtk_tree_selection_select_iter(selection, &it);
+ 0, pserver->host,
+ 1, pserver->port,
+ 2, pserver->version,
+ 3, _(pserver->state),
+ 4, pserver->nplayers,
+ 5, pserver->message,
+ -1);
+ if (strcmp(host, pserver->host) == 0 && port == pserver->port) {
+ gtk_tree_selection_select_iter(sel, &it);
}
} server_list_iterate_end;
}
/**************************************************************************
- this function frees the list of LAN servers on timeout destruction.
+ Free the server scans.
**************************************************************************/
-static void get_server_scan_destroy(gpointer data)
+static void destroy_server_scans(void)
{
- if (meta) {
- server_scan_finish(meta);
- meta = NULL;
+ if (meta_scan) {
+ server_scan_finish(meta_scan);
+ meta_scan = NULL;
}
- if (lan) {
- server_scan_finish(lan);
- lan = NULL;
+ if (meta_scan_timer != 0) {
+ g_source_remove(meta_scan_timer);
+ meta_scan_timer = 0;
+ }
+ if (lan_scan) {
+ server_scan_finish(lan_scan);
+ lan_scan = NULL;
+ }
+ if (lan_scan_timer != 0) {
+ g_source_remove(lan_scan_timer);
+ lan_scan_timer = 0;
}
- scan_timer = 0;
}
/**************************************************************************
- this function updates the list of servers every so often.
+ This function updates the list of servers every so often.
**************************************************************************/
-static gboolean get_server_scan_list(gpointer data)
+static gboolean check_server_scan(gpointer data)
{
- struct server_list *server_list;
+ struct server_scan *scan = data;
+ const struct server_list *servers;
+ enum server_scan_status stat;
- if (!meta && !lan) {
+ if (!scan) {
return FALSE;
}
- if (lan) {
- server_list = server_scan_get_servers(lan);
- if (server_list) {
- update_server_list(lan_selection, lan_store, server_list);
- }
+ stat = server_scan_poll(scan);
+ if (stat >= SCAN_STATUS_PARTIAL) {
+ enum server_scan_type type;
+ type = server_scan_get_type(scan);
+ servers = server_scan_get_list(scan);
+ update_server_list(type, servers);
}
- if (meta) {
- server_list = server_scan_get_servers(meta);
- if (server_list) {
- update_server_list(meta_selection, meta_store, server_list);
- }
+ if (stat == SCAN_STATUS_ERROR || stat == SCAN_STATUS_DONE) {
+ return FALSE;
}
-
return TRUE;
}
@@ -364,16 +382,16 @@ static void server_scan_error(struct server_scan *scan,
const char *message)
{
append_output_window(message);
- freelog(LOG_NORMAL, "%s", message);
+ freelog(LOG_ERROR, "%s", message);
switch (server_scan_get_type(scan)) {
case SERVER_SCAN_LOCAL:
- server_scan_finish(lan);
- lan = NULL;
+ server_scan_finish(lan_scan);
+ lan_scan = NULL;
break;
case SERVER_SCAN_GLOBAL:
- server_scan_finish(meta);
- meta = NULL;
+ server_scan_finish(meta_scan);
+ meta_scan = NULL;
break;
case SERVER_SCAN_LAST:
break;
@@ -381,25 +399,17 @@ static void server_scan_error(struct server_scan *scan,
}
/**************************************************************************
- update the metaserver and lan server lists.
+ Stop and restart the metaserver and lan server scans.
**************************************************************************/
static void update_network_lists(void)
{
- if (scan_timer != 0) {
- g_source_remove(scan_timer);
- }
+ destroy_server_scans();
- if (!meta) {
- meta = server_scan_begin(SERVER_SCAN_GLOBAL, server_scan_error);
- }
-
- if (!lan) {
- lan = server_scan_begin(SERVER_SCAN_LOCAL, server_scan_error);
- }
+ meta_scan = server_scan_begin(SERVER_SCAN_GLOBAL, server_scan_error);
+ meta_scan_timer = g_timeout_add(200, check_server_scan, meta_scan);
- scan_timer = g_timeout_add_full(G_PRIORITY_DEFAULT, 100,
- get_server_scan_list,
- NULL, get_server_scan_destroy);
+ lan_scan = server_scan_begin(SERVER_SCAN_LOCAL, server_scan_error);
+ lan_scan_timer = g_timeout_add(500, check_server_scan, lan_scan);
}
/**************************************************************************
@@ -644,29 +654,70 @@ static void network_activate_callback(GtkTreeView *view,
}
/**************************************************************************
- sets the host, port of the selected server.
+ Fills the server player list with the players in the given server, or
+ clears it if there is no player data.
+**************************************************************************/
+static void update_server_playerlist(const struct server *pserver)
+{
+ GtkListStore *store;
+ GtkTreeIter iter;
+ int n, i;
+
+ store = server_playerlist_store;
+ g_return_if_fail(store != NULL);
+
+ gtk_list_store_clear(store);
+ if (!pserver || !pserver->players) {
+ return;
+ }
+
+ n = pserver->nplayers;
+ for (i = 0; i < n; i++) {
+ gtk_list_store_append(store, &iter);
+ gtk_list_store_set(store, &iter,
+ 0, pserver->players[i].name,
+ 1, pserver->players[i].type,
+ 2, pserver->players[i].host,
+ 3, pserver->players[i].nation,
+ -1);
+ }
+}
+
+/**************************************************************************
+ Sets the host, port and player list of the selected server.
**************************************************************************/
static void network_list_callback(GtkTreeSelection *select, gpointer data)
{
GtkTreeModel *model;
GtkTreeIter it;
- char *host, *port;
+ const char *host;
+ int port;
+ char portstr[32];
+ const struct server *pserver = NULL;
if (!gtk_tree_selection_get_selected(select, &model, &it)) {
return;
}
- /* only one server can be selected in either list. */
if (select == meta_selection) {
- gtk_tree_selection_unselect_all(lan_selection);
- } else {
- gtk_tree_selection_unselect_all(meta_selection);
+ GtkTreePath *path;
+ const struct server_list *servers;
+
+ servers = server_scan_get_list(meta_scan);
+ path = gtk_tree_model_get_path(model, &it);
+ if (servers && path) {
+ gint pos = gtk_tree_path_get_indices(path)[0];
+ pserver = server_list_get(servers, pos);
+ }
+ gtk_tree_path_free(path);
}
+ update_server_playerlist(pserver);
gtk_tree_model_get(model, &it, 0, &host, 1, &port, -1);
gtk_entry_set_text(GTK_ENTRY(network_host), host);
- gtk_entry_set_text(GTK_ENTRY(network_port), port);
+ my_snprintf(portstr, sizeof(portstr), "%d", port);
+ gtk_entry_set_text(GTK_ENTRY(network_port), portstr);
}
/**************************************************************************
@@ -692,27 +743,10 @@ static void update_network_page(void)
**************************************************************************/
GtkWidget *create_network_page(void)
{
- GtkWidget *salign, *box, *sbox, *bbox, *notebook;
-
- GtkWidget *button, *label, *view, *sw;
- GtkCellRenderer *rend;
+ GtkWidget *box, *sbox, *bbox, *hbox, *notebook;
+ GtkWidget *button, *label, *view, *sw, *table;
GtkTreeSelection *selection;
-
- GtkWidget *table;
-
- static const char *titles[] = {
- N_("Server Name"),
- N_("Port"),
- N_("Version"),
- N_("Status"),
- N_("Players"),
- N_("Comment")
- };
- static bool titles_done;
-
- int i;
-
- intl_slist(ARRAY_SIZE(titles), titles, &titles_done);
+ GtkListStore *store;
box = gtk_vbox_new(FALSE, 0);
gtk_container_set_border_width(GTK_CONTAINER(box), 4);
@@ -721,8 +755,12 @@ GtkWidget *create_network_page(void)
gtk_container_add(GTK_CONTAINER(box), notebook);
/* LAN pane. */
- lan_store = gtk_list_store_new(6, G_TYPE_STRING, G_TYPE_STRING,
- G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
+ lan_store = gtk_list_store_new(6, G_TYPE_STRING, /* host */
+ G_TYPE_INT, /* port */
+ G_TYPE_STRING, /* version */
+ G_TYPE_STRING, /* state */
+ G_TYPE_INT, /* nplayers */
+ G_TYPE_STRING); /* message */
view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(lan_store));
g_object_unref(lan_store);
@@ -738,11 +776,12 @@ GtkWidget *create_network_page(void)
g_signal_connect(selection, "changed",
G_CALLBACK(network_list_callback), NULL);
- rend = gtk_cell_renderer_text_new();
- for (i = 0; i < ARRAY_SIZE(titles); i++) {
- gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(view),
- -1, titles[i], rend, "text", i, NULL);
- }
+ add_treeview_column(view, _("Server Name"), G_TYPE_STRING, 0);
+ add_treeview_column(view, _("Port"), G_TYPE_INT, 1);
+ add_treeview_column(view, _("Version"), G_TYPE_STRING, 2);
+ add_treeview_column(view, _("Status"), G_TYPE_STRING, 3);
+ add_treeview_column(view, _("Players"), G_TYPE_INT, 4);
+ add_treeview_column(view, _("Comment"), G_TYPE_STRING, 5);
label = gtk_label_new_with_mnemonic(_("Local _Area Network"));
@@ -757,8 +796,12 @@ GtkWidget *create_network_page(void)
/* Metaserver pane. */
- meta_store = gtk_list_store_new(6, G_TYPE_STRING, G_TYPE_STRING,
- G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
+ meta_store = gtk_list_store_new(6, G_TYPE_STRING, /* host */
+ G_TYPE_INT, /* port */
+ G_TYPE_STRING, /* version */
+ G_TYPE_STRING, /* state */
+ G_TYPE_INT, /* nplayers */
+ G_TYPE_STRING); /* message */
view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(meta_store));
g_object_unref(meta_store);
@@ -774,11 +817,12 @@ GtkWidget *create_network_page(void)
g_signal_connect(selection, "changed",
G_CALLBACK(network_list_callback), NULL);
- rend = gtk_cell_renderer_text_new();
- for (i = 0; i < ARRAY_SIZE(titles); i++) {
- gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(view),
- -1, titles[i], rend, "text", i, NULL);
- }
+ add_treeview_column(view, _("Server Name"), G_TYPE_STRING, 0);
+ add_treeview_column(view, _("Port"), G_TYPE_INT, 1);
+ add_treeview_column(view, _("Version"), G_TYPE_STRING, 2);
+ add_treeview_column(view, _("Status"), G_TYPE_STRING, 3);
+ add_treeview_column(view, _("Players"), G_TYPE_INT, 4);
+ add_treeview_column(view, _("Comment"), G_TYPE_STRING, 5);
label = gtk_label_new_with_mnemonic(_("Internet _Metaserver"));
@@ -789,21 +833,24 @@ GtkWidget *create_network_page(void)
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
gtk_container_add(GTK_CONTAINER(sw), view);
- gtk_notebook_append_page(GTK_NOTEBOOK(notebook), sw, label);
+ if (metaserver_tab_first) {
+ gtk_notebook_prepend_page(GTK_NOTEBOOK(notebook), sw, label);
+ } else {
+ gtk_notebook_append_page(GTK_NOTEBOOK(notebook), sw, label);
+ }
/* Bottom part of the page, outside the inner notebook. */
sbox = gtk_vbox_new(FALSE, 0);
gtk_box_pack_start(GTK_BOX(box), sbox, FALSE, FALSE, 0);
- salign = gtk_alignment_new(0.5, 0.5, 0.0, 0.0);
- gtk_box_pack_start(GTK_BOX(sbox), salign, FALSE, FALSE, 18);
+ hbox = gtk_hbox_new(FALSE, 12);
+ gtk_box_pack_start(GTK_BOX(sbox), hbox, FALSE, FALSE, 8);
table = gtk_table_new(6, 2, FALSE);
gtk_table_set_row_spacings(GTK_TABLE(table), 2);
gtk_table_set_col_spacings(GTK_TABLE(table), 12);
gtk_table_set_row_spacing(GTK_TABLE(table), 2, 12);
- gtk_widget_set_size_request(table, 400, -1);
- gtk_container_add(GTK_CONTAINER(salign), table);
+ gtk_box_pack_start(GTK_BOX(hbox), table, FALSE, FALSE, 0);
network_host = gtk_entry_new();
g_signal_connect(network_host, "activate",
@@ -892,11 +939,33 @@ GtkWidget *create_network_page(void)
gtk_table_attach(GTK_TABLE(table), label, 0, 1, 5, 6,
GTK_FILL, GTK_FILL, 0, 0);
+ /* Server player list. */
+ store = gtk_list_store_new(4, G_TYPE_STRING,
+ G_TYPE_STRING,
+ G_TYPE_STRING,
+ G_TYPE_STRING);
+ server_playerlist_store = store;
+
+ view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
+ add_treeview_column(view, _("Name"), G_TYPE_STRING, 0);
+ add_treeview_column(view, _("Type"), G_TYPE_STRING, 1);
+ add_treeview_column(view, _("Host"), G_TYPE_STRING, 2);
+ add_treeview_column(view, _("Nation"), G_TYPE_STRING, 3);
+ server_playerlist_view = view;
+
+ sw = gtk_scrolled_window_new(NULL, NULL);
+ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw),
+ GTK_SHADOW_ETCHED_IN);
+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
+ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+ gtk_container_add(GTK_CONTAINER(sw), view);
+ gtk_box_pack_start(GTK_BOX(hbox), sw, TRUE, TRUE, 0);
+
bbox = gtk_hbutton_box_new();
gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
gtk_box_set_spacing(GTK_BOX(bbox), 12);
- gtk_box_pack_start(GTK_BOX(sbox), bbox, FALSE, FALSE, 2);
+ gtk_box_pack_start(GTK_BOX(sbox), bbox, FALSE, FALSE, 0);
button = gtk_button_new_from_stock(GTK_STOCK_REFRESH);
gtk_container_add(GTK_CONTAINER(bbox), button);
@@ -1529,8 +1598,8 @@ GtkWidget *create_start_page(void)
rend = gtk_cell_renderer_text_new();
gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(view),
- -1, _("Leader"), rend,
- "text", 3, NULL);
+ -1, Q_("?player:Leader"),
+ rend, "text", 3, NULL);
rend = gtk_cell_renderer_text_new();
col = gtk_tree_view_column_new_with_attributes(_("Nation"),
@@ -1551,7 +1620,8 @@ GtkWidget *create_start_page(void)
gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw),
GTK_SHADOW_ETCHED_IN);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
- GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
+ GTK_POLICY_AUTOMATIC,
+ GTK_POLICY_ALWAYS);
gtk_widget_set_size_request(sw, -1, 200);
gtk_container_add(GTK_CONTAINER(sw), view);
gtk_box_pack_start(GTK_BOX(sbox), sw, TRUE, TRUE, 0);
@@ -1561,7 +1631,8 @@ GtkWidget *create_start_page(void)
gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw),
GTK_SHADOW_ETCHED_IN);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
- GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
+ GTK_POLICY_AUTOMATIC,
+ GTK_POLICY_ALWAYS);
gtk_box_pack_start(GTK_BOX(box), sw, TRUE, TRUE, 0);
text = gtk_text_view_new_with_buffer(message_buffer);
@@ -1582,6 +1653,7 @@ GtkWidget *create_start_page(void)
G_CALLBACK(inputline_handler), NULL);
g_signal_connect(entry, "activate",
G_CALLBACK(inputline_return), NULL);
+ start_page_entry = entry;
bbox = gtk_hbutton_box_new();
gtk_box_set_spacing(GTK_BOX(bbox), 12);
@@ -2166,10 +2238,7 @@ void set_client_page(enum client_pages page)
case PAGE_LOAD:
break;
case PAGE_NETWORK:
- if (scan_timer != 0) {
- g_source_remove(scan_timer);
- scan_timer = 0;
- }
+ destroy_server_scans();
break;
case PAGE_GAME:
enable_menus(FALSE);
@@ -2193,6 +2262,7 @@ void set_client_page(enum client_pages page)
case PAGE_NATION:
break;
case PAGE_GAME:
+ reset_unit_table();
enable_menus(TRUE);
break;
case PAGE_LOAD:
@@ -2223,7 +2293,11 @@ void set_client_page(enum client_pages page)
switch (new_page) {
case PAGE_MAIN:
+ break;
case PAGE_START:
+ gtk_widget_grab_focus(start_page_entry);
+ chatline_scroll_to_bottom();
+ break;
case PAGE_GGZ:
break;
case PAGE_NATION:
@@ -2236,6 +2310,8 @@ void set_client_page(enum client_pages page)
gtk_tree_view_focus(gtk_tree_selection_get_tree_view(scenario_selection));
break;
case PAGE_GAME:
+ chatline_scroll_to_bottom();
+ refresh_chat_buttons();
break;
case PAGE_NETWORK:
update_network_lists();
diff --git a/client/gui-gtk-2.0/plrdlg.c b/client/gui-gtk-2.0/plrdlg.c
index cd88021..e49fd3e 100644
--- a/client/gui-gtk-2.0/plrdlg.c
+++ b/client/gui-gtk-2.0/plrdlg.c
@@ -305,6 +305,62 @@ static void toggle_dead_players(GtkCheckMenuItem* item, gpointer data)
}
/**************************************************************************
+ Create and return the "diplomacy" menu for the player report. This menu
+ contains diplomacy actions the current player can use on other nations.
+**************************************************************************/
+static GtkWidget *create_diplomacy_menu(void)
+{
+ GtkWidget *menu, *item;
+
+ menu = gtk_menu_new();
+
+ item = gtk_menu_item_new_with_mnemonic(_("_Meet"));
+ g_signal_connect(item, "activate",
+ G_CALLBACK(players_meet_callback), NULL);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
+ players_meet_command = item;
+
+ item = gtk_menu_item_new_with_mnemonic(_("Cancel _Treaty"));
+ g_signal_connect(item, "activate",
+ G_CALLBACK(players_war_callback), NULL);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
+ players_war_command = item;
+
+ item = gtk_menu_item_new_with_mnemonic(_("_Withdraw Vision"));
+ g_signal_connect(item, "activate",
+ G_CALLBACK(players_vision_callback), NULL);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
+ players_vision_command = item;
+
+ return menu;
+}
+
+/**************************************************************************
+ Create and return the "intelligence" menu. The items in this menu are
+ used by the player to see more detailed information about other nations.
+**************************************************************************/
+static GtkWidget *create_intelligence_menu(void)
+{
+ GtkWidget *menu, *item;
+
+ menu = gtk_menu_new();
+
+ item = gtk_menu_item_new_with_mnemonic(_("_Report"));
+ g_signal_connect(item, "activate",
+ G_CALLBACK(players_intel_callback), NULL);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
+ players_int_command = item;
+
+ item = gtk_menu_item_new_with_mnemonic(_("_Spaceship"));
+ g_signal_connect(item, "activate",
+ G_CALLBACK(players_sship_callback), NULL);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
+ players_sship_command = item;
+
+ return menu;
+}
+
+/**************************************************************************
...
**************************************************************************/
static GtkWidget* create_show_menu(void)
@@ -440,41 +496,6 @@ void create_players_dialog(void)
gtk_box_pack_start(GTK_BOX(players_dialog_shell->vbox), sw,
TRUE, TRUE, 0);
- players_int_command = gtk_button_new_with_mnemonic(_("_Intelligence"));
- g_signal_connect(players_int_command, "clicked",
- G_CALLBACK(players_intel_callback), NULL);
- gui_dialog_add_widget(players_dialog_shell, players_int_command);
- gtk_size_group_add_widget(players_dialog_shell->gui_button,
- players_int_command);
-
- players_meet_command = gtk_button_new_with_mnemonic(_("_Meet"));
- g_signal_connect(players_meet_command, "clicked",
- G_CALLBACK(players_meet_callback), NULL);
- gui_dialog_add_widget(players_dialog_shell, players_meet_command);
- gtk_size_group_add_widget(players_dialog_shell->gui_button,
- players_meet_command);
-
- players_war_command = gtk_button_new_with_mnemonic(_("Cancel _Treaty"));
- g_signal_connect(players_war_command, "clicked",
- G_CALLBACK(players_war_callback), NULL);
- gui_dialog_add_widget(players_dialog_shell, players_war_command);
- gtk_size_group_add_widget(players_dialog_shell->gui_button,
- players_war_command);
-
- players_vision_command = gtk_button_new_with_mnemonic(_("_Withdraw vision"));
- g_signal_connect(players_vision_command, "clicked",
- G_CALLBACK(players_vision_callback), NULL);
- gui_dialog_add_widget(players_dialog_shell, players_vision_command);
- gtk_size_group_add_widget(players_dialog_shell->gui_button,
- players_vision_command);
-
- players_sship_command = gtk_button_new_with_mnemonic(_("_Spaceship"));
- g_signal_connect(players_sship_command, "clicked",
- G_CALLBACK(players_sship_callback), NULL);
- gui_dialog_add_widget(players_dialog_shell, players_sship_command);
- gtk_size_group_add_widget(players_dialog_shell->gui_button,
- players_sship_command);
-
vbox = gtk_vbox_new(FALSE, 0);
sep = gtk_hseparator_new();
@@ -485,7 +506,17 @@ void create_players_dialog(void)
gui_dialog_add_widget(players_dialog_shell, vbox);
gtk_box_set_child_packing(GTK_BOX(players_dialog_shell->action_area),
- vbox, FALSE, FALSE, 0, GTK_PACK_END);
+ vbox, FALSE, FALSE, 0, GTK_PACK_START);
+
+ item = gtk_menu_item_new_with_mnemonic(_("Di_plomacy"));
+ menu = create_diplomacy_menu();
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), menu);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menubar), item);
+
+ item = gtk_menu_item_new_with_mnemonic(_("_Intelligence"));
+ menu = create_intelligence_menu();
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), menu);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menubar), item);
item = gtk_menu_item_new_with_mnemonic(_("_Display"));
menu = create_show_menu();
diff --git a/client/gui-gtk-2.0/repodlgs.c b/client/gui-gtk-2.0/repodlgs.c
index 7f40ea1..1272966 100644
--- a/client/gui-gtk-2.0/repodlgs.c
+++ b/client/gui-gtk-2.0/repodlgs.c
@@ -1178,7 +1178,7 @@ void activeunits_report_dialog_update(void)
{
struct repoinfo {
int active_count;
- int upkeep[O_COUNT];
+ int upkeep[O_MAX];
int building_count;
};
diff --git a/client/gui-sdl/connectdlg.c b/client/gui-sdl/connectdlg.c
index 4f83be8..e991676 100644
--- a/client/gui-sdl/connectdlg.c
+++ b/client/gui-sdl/connectdlg.c
@@ -54,7 +54,7 @@
#include "connectdlg.h"
-static struct server_list *pServer_list = NULL;
+static const struct server_list *pServer_list = NULL;
static struct server_scan *pServer_scan = NULL;
static struct ADVANCED_DLG *pMeta_Severs = NULL;
@@ -148,7 +148,7 @@ static int sellect_meta_severs_callback(struct widget *pWidget)
struct server *pServer = (struct server *)pWidget->data.ptr;
sz_strlcpy(server_host, pServer->host);
- sscanf(pServer->port, "%d", &server_port);
+ server_port = pServer->port;
exit_meta_severs_dlg_callback(NULL);
}
@@ -185,9 +185,9 @@ static void server_scan_error(struct server_scan *scan,
same functionality for LAN server dettection.
WARING !: for LAN scan use "finish_lanserver_scan()" to free server list.
**************************************************************************/
-static struct server_list *sdl_create_server_list(bool lan)
+static const struct server_list *sdl_create_server_list(bool lan)
{
- struct server_list *server_list = NULL;
+ const struct server_list *server_list = NULL;
int i;
if (lan) {
@@ -203,7 +203,8 @@ static struct server_list *sdl_create_server_list(bool lan)
SDL_Delay(5000);
for (i = 0; i < 100; i++) {
- server_list = server_scan_get_servers(pServer_scan);
+ server_scan_poll(pServer_scan);
+ server_list = server_scan_get_list(pServer_scan);
if (server_list) {
break;
}
@@ -312,7 +313,7 @@ void popup_connection_dialog(bool lan_scan)
/* servers */
server_list_iterate(pServer_list, pServer) {
- my_snprintf(cBuf, sizeof(cBuf), "%s Port %s Ver: %s %s %s %s\n%s",
+ my_snprintf(cBuf, sizeof(cBuf), "%s Port %d Ver: %s %s %s %d\n%s",
pServer->host, pServer->port, pServer->version, _(pServer->state),
_("Players"), pServer->nplayers, pServer->message);
diff --git a/client/gui-sdl/graphics.c b/client/gui-sdl/graphics.c
index c9f10c9..25daf43 100644
--- a/client/gui-sdl/graphics.c
+++ b/client/gui-sdl/graphics.c
@@ -1018,8 +1018,8 @@ void init_sdl(int iFlags)
/* Initialize the TTF library */
if (TTF_Init() < 0) {
- freelog(LOG_FATAL, _("Unable to initialize SDL_ttf library: %s"),
- SDL_GetError());
+ freelog(LOG_FATAL, _("Unable to initialize SDL_ttf library: %s"),
+ SDL_GetError());
exit(2);
}
diff --git a/client/gui-sdl/gui_string.c b/client/gui-sdl/gui_string.c
index 7f8bce7..0a65db5 100644
--- a/client/gui-sdl/gui_string.c
+++ b/client/gui-sdl/gui_string.c
@@ -601,15 +601,6 @@ static TTF_Font * load_font(Uint16 ptsize)
if(!pFont_with_FullPath) {
const char *path = theme_font_filename(theme);
-#if 0
- if(!path) {
- path = datafilename("stdfont.ttf");
- if (!path) {
- die(_("Couldn't find stdfont.ttf file. Please link/copy/move any"
- "unicode ttf font to data dir as stdfont.ttf"));
- }
- }
-#endif
pFont_with_FullPath = mystrdup(path);
assert(pFont_with_FullPath != NULL);
}
diff --git a/client/gui-win32/connectdlg.c b/client/gui-win32/connectdlg.c
index ddc1319..67d9c0d 100644
--- a/client/gui-win32/connectdlg.c
+++ b/client/gui-win32/connectdlg.c
@@ -529,7 +529,8 @@ static int get_lanservers(HWND list)
struct server_list *server_list = NULL;
if (lan) {
- server_list = server_scan_get_servers(lan);
+ server_scan_poll(lan);
+ server_list = server_scan_get_list(lan);
if (!server_list) {
return -1;
}
@@ -583,7 +584,8 @@ static int get_meta_list(HWND list)
if (meta) {
for (i = 0; i < 100; i++) {
- server_list = server_scan_get_servers(meta);
+ server_scan_poll(meta);
+ server_list = server_scan_get_list(meta);
if (server_list) {
break;
}
diff --git a/client/gui-xaw/Freeciv.h b/client/gui-xaw/Freeciv.h
index b4dba5f..80eb6ea 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.8",
+"Freeciv*version: 2.1.9",
"Freeciv.title: Freeciv",
"Freeciv.iconName: Freeciv",
"Freeciv*borderColor: black",
diff --git a/client/gui-xaw/citydlg.c b/client/gui-xaw/citydlg.c
index bc1a864..9fd43bf 100644
--- a/client/gui-xaw/citydlg.c
+++ b/client/gui-xaw/citydlg.c
@@ -2398,7 +2398,11 @@ void cityopt_cancel_command_callback(Widget w, XtPointer client_data,
void cityopt_newcit_triggle_callback(Widget w, XtPointer client_data,
XtPointer call_data);
-char *newcitizen_labels[] = { N_("Workers"), N_("Scientists"), N_("Taxmen") };
+char *newcitizen_labels[] = {
+ N_("?city:Workers"),
+ N_("Scientists"),
+ N_("Taxmen")
+};
static Widget cityopt_shell = 0;
static Widget cityopt_triggle;
diff --git a/client/gui-xaw/connectdlg.c b/client/gui-xaw/connectdlg.c
index b340b81..b26c40d 100644
--- a/client/gui-xaw/connectdlg.c
+++ b/client/gui-xaw/connectdlg.c
@@ -533,11 +533,12 @@ void meta_list_destroy(Widget w, XtPointer client_data, XtPointer call_data)
static int get_server_list(char **list, char *errbuf, int n_errbuf)
{
char line[256];
- struct server_list *server_list = NULL;
+ const struct server_list *server_list = NULL;
if (lan_mode) {
if (lan) {
- server_list = server_scan_get_servers(lan);
+ server_scan_poll(lan);
+ server_list = server_scan_get_list(lan);
if (server_list == NULL) {
if (num_lanservers_timer == 0) {
*list = mystrdup(" ");;
@@ -549,7 +550,8 @@ static int get_server_list(char **list, char *errbuf, int n_errbuf)
}
} else {
if (meta) {
- server_list = server_scan_get_servers(meta);
+ server_scan_poll(meta);
+ server_list = server_scan_get_list(meta);
if (!server_list) {
return -1;
}
@@ -558,7 +560,7 @@ static int get_server_list(char **list, char *errbuf, int n_errbuf)
server_list_iterate(server_list,pserver) {
if (pserver == NULL) continue;
- my_snprintf(line, sizeof(line), "%-35s %-5s %-11s %-11s %2s %s",
+ my_snprintf(line, sizeof(line), "%-35s %-5d %-11s %-11s %2d %s",
pserver->host, pserver->port, pserver->version,
_(pserver->state), pserver->nplayers, pserver->message);
if (*list) free(*list);
diff --git a/client/gui-xaw/menu.c b/client/gui-xaw/menu.c
index 8ce86c3..060ef36 100644
--- a/client/gui-xaw/menu.c
+++ b/client/gui-xaw/menu.c
@@ -776,7 +776,7 @@ static void orders_menu_callback(Widget w, XtPointer client_data,
key_unit_nuke();
break;
case MENU_ORDER_SELECT_SAME_TYPE:
- request_unit_select_same_type(get_units_in_focus());
+ request_unit_select(get_units_in_focus(), SELTYPE_SAME, SELLOC_ALL);
break;
case MENU_ORDER_WAIT:
key_unit_wait();
diff --git a/client/helpdata.c b/client/helpdata.c
index 45850e2..fa8f6be 100644
--- a/client/helpdata.c
+++ b/client/helpdata.c
@@ -237,42 +237,40 @@ static void insert_allows(struct req_source *psource,
buf[0] = '\0';
/* FIXME: show other data like range and survives. */
-#define COREQ_APPEND(s) \
- (coreq_buf[0] != '\0' \
- ? cat_snprintf(coreq_buf, sizeof(coreq_buf), Q_("?clistmore:, %s"), (s)) \
- : sz_strlcpy(coreq_buf, (s)))
-
impr_type_iterate(impr_id) {
struct impr_type *building = improvement_by_number(impr_id);
requirement_vector_iterate(&building->reqs, req) {
if (are_req_sources_equal(psource, &req->source)) {
- char coreq_buf[512] = "";
-
- requirement_vector_iterate(&building->reqs, coreq) {
- if (!are_req_sources_equal(psource, &coreq->source)) {
- char buf2[512];
-
- COREQ_APPEND(get_req_source_text(&coreq->source,
- buf2, sizeof(buf2)));
- }
- } requirement_vector_iterate_end;
+ char coreq_buf[512] = "";
+
+ requirement_vector_iterate(&building->reqs, coreq) {
+ if (!are_req_sources_equal(psource, &coreq->source)) {
+ char buf2[512] = "";
+
+ get_req_source_text(&coreq->source, buf2, sizeof(buf2));
+ if (coreq_buf[0] == '\0') {
+ sz_strlcpy(coreq_buf, buf2);
+ } else {
+ cat_snprintf(coreq_buf, sizeof(coreq_buf),
+ Q_("?clistmore:, %s"), buf2);
+ }
+ }
+ } requirement_vector_iterate_end;
- if (coreq_buf[0] == '\0') {
- cat_snprintf(buf, bufsz, _("Allows %s."),
- improvement_name_translation(impr_id));
- } else {
- cat_snprintf(buf, bufsz, _("Allows %s (with %s)."),
- improvement_name_translation(impr_id),
- coreq_buf);
- }
- cat_snprintf(buf, bufsz, "\n");
+ if (coreq_buf[0] == '\0') {
+ cat_snprintf(buf, bufsz, _("Allows %s."),
+ improvement_name_translation(impr_id));
+ } else {
+ cat_snprintf(buf, bufsz, _("Allows %s (with %s)."),
+ improvement_name_translation(impr_id),
+ coreq_buf);
+ }
+ cat_snprintf(buf, bufsz, "\n");
}
} requirement_vector_iterate_end;
} impr_type_iterate_end;
-
-#undef COREQ_APPEND
}
/****************************************************************
diff --git a/client/mapctrl_common.c b/client/mapctrl_common.c
index 8c3cc88..2b4bebc 100644
--- a/client/mapctrl_common.c
+++ b/client/mapctrl_common.c
@@ -106,6 +106,9 @@ void anchor_selection_rectangle(int canvas_x, int canvas_y,
on the map and hilited in the City List Window.
Later, I'll want to add unit hiliting for mass orders. -ali
+
+ NB: At the end of this function the current selection rectangle will be
+ erased (by being redrawn).
**************************************************************************/
static void define_tiles_within_rectangle(void)
{
@@ -118,7 +121,7 @@ static void define_tiles_within_rectangle(void)
const int inc_x = (rec_w > 0 ? half_W : -half_W);
const int inc_y = (rec_h > 0 ? half_H : -half_H);
int x, y, x2, y2, xx, yy;
- int units = 0;
+ struct unit_list *units = unit_list_new();
y = rec_corner_y;
for (yy = 0; yy <= segments_y; yy++, y += inc_y) {
@@ -150,22 +153,34 @@ static void define_tiles_within_rectangle(void)
*/
if (ptile->city && city_owner(ptile->city) == game.player_ptr) {
/* FIXME: handle rectangle_append */
- map_deco[ptile->index].hilite = HILITE_CITY;
+ mapdeco_set_highlight(ptile, TRUE);
tiles_hilited_cities = TRUE;
}
unit_list_iterate(ptile->units, punit) {
- if (unit_owner(punit) == game.player_ptr) {
- if (units == 0 && !rectangle_append) {
- set_unit_focus(punit);
- } else {
- add_unit_focus(punit);
- }
- units++;
- }
+ if (unit_owner(punit) == game.player_ptr) {
+ unit_list_append(units, punit);
+ }
} unit_list_iterate_end;
}
}
+ if (!(separate_unit_selection && tiles_hilited_cities)
+ && unit_list_size(units) > 0) {
+ if (!rectangle_append) {
+ struct unit *punit = unit_list_get(units, 0);
+ set_unit_focus(punit);
+ unit_list_unlink(units, punit);
+ }
+ unit_list_iterate(units, punit) {
+ add_unit_focus(punit);
+ } unit_list_iterate_end;
+ }
+ unit_list_unlink_all(units);
+ unit_list_free(units);
+
+ /* Clear previous rectangle. */
+ draw_selection_rectangle(rec_corner_x, rec_corner_y, rec_w, rec_h);
+
/* Hilite in City List Window */
if (tiles_hilited_cities) {
hilite_cities_from_canvas(); /* cityrep.c */
@@ -195,8 +210,7 @@ void update_selection_rectangle(int canvas_x, int canvas_y)
rec_tile = ptile;
/* Clear previous rectangle. */
- dirty_all();
- flush_dirty();
+ draw_selection_rectangle(rec_corner_x, rec_corner_y, rec_w, rec_h);
/* Fix canvas coords to the center of the tile.
*/
@@ -267,7 +281,9 @@ void cancel_selection_rectangle(void)
if (rectangle_active) {
rectangle_active = FALSE;
rbutton_down = FALSE;
- dirty_rect(rec_corner_x, rec_corner_y, rec_w, rec_h);
+
+ /* Erase the previously drawn selection rectangle. */
+ draw_selection_rectangle(rec_corner_x, rec_corner_y, rec_w, rec_h);
}
}
@@ -276,7 +292,7 @@ void cancel_selection_rectangle(void)
**************************************************************************/
bool is_city_hilited(struct city *pcity)
{
- return map_deco[pcity->tile->index].hilite == HILITE_CITY;
+ return pcity && mapdeco_is_highlight_set(pcity->tile);
}
/**************************************************************************
@@ -286,12 +302,7 @@ void cancel_tile_hiliting(void)
{
if (tiles_hilited_cities) {
tiles_hilited_cities = FALSE;
-
- whole_map_iterate(ptile) {
- map_deco[ptile->index].hilite = HILITE_NONE;
- } whole_map_iterate_end;
-
- update_map_canvas_visible();
+ mapdeco_clear_highlights();
}
}
@@ -303,9 +314,17 @@ void release_right_button(int canvas_x, int canvas_y)
{
if (rectangle_active) {
define_tiles_within_rectangle();
- update_map_canvas_visible();
} else {
- recenter_button_pressed(canvas_x, canvas_y);
+ /* NB: Assumes 'rectangle_append' was set because <SHIFT> was on. */
+ if (rectangle_append) {
+ struct tile *ptile = canvas_pos_to_tile(canvas_x, canvas_y);
+ if (ptile != NULL) {
+ /* <SHIFT> + RMB: Copy Production. */
+ clipboard_copy_production(ptile);
+ }
+ } else {
+ recenter_button_pressed(canvas_x, canvas_y);
+ }
}
rectangle_active = FALSE;
rbutton_down = FALSE;
@@ -318,22 +337,20 @@ void toggle_tile_hilite(struct tile *ptile)
{
struct city *pcity = ptile->city;
- if (map_deco[ptile->index].hilite == HILITE_CITY) {
- map_deco[ptile->index].hilite = HILITE_NONE;
+ if (mapdeco_is_highlight_set(ptile)) {
+ mapdeco_set_highlight(ptile, FALSE);
if (pcity) {
toggle_city_hilite(pcity, FALSE); /* cityrep.c */
}
}
else if (pcity && city_owner(pcity) == game.player_ptr) {
- map_deco[ptile->index].hilite = HILITE_CITY;
+ mapdeco_set_highlight(ptile, TRUE);
tiles_hilited_cities = TRUE;
toggle_city_hilite(pcity, TRUE);
}
else {
return;
}
-
- refresh_tile_mapcanvas(ptile, FALSE, TRUE);
}
/**************************************************************************
diff --git a/client/mapview_common.c b/client/mapview_common.c
index 0fcff9d..023a4b7 100644
--- a/client/mapview_common.c
+++ b/client/mapview_common.c
@@ -18,11 +18,13 @@
#include <assert.h>
#include "fcintl.h"
+#include "hash.h"
#include "log.h"
#include "rand.h"
#include "support.h"
#include "timing.h"
+#include "game.h"
#include "map.h"
#include "unitlist.h"
@@ -40,7 +42,14 @@
#include "overview_common.h"
#include "tilespec.h"
-struct mapview_decoration *map_deco;
+struct hash_table *mapdeco_highlight_table;
+struct hash_table *mapdeco_crosshair_table;
+
+struct gotoline_counter {
+ int line_count[DIR8_COUNT];
+};
+struct hash_table *mapdeco_gotoline_table;
+
struct view mapview;
bool can_slide = TRUE;
@@ -68,6 +77,15 @@ static void queue_mapview_update(enum update_type update);
static void queue_mapview_tile_update(struct tile *ptile,
enum tile_update_type type);
+/* Helper struct for drawing traderoutes. */
+struct traderoute_line {
+ int x, y, width, height;
+};
+
+/* A traderoute line might need to be drawn in two parts. */
+static const int MAX_TRADEROUTE_DRAW_LINES = 2;
+
+
/**************************************************************************
Refreshes a single tile on the map canvas.
**************************************************************************/
@@ -587,7 +605,6 @@ void set_mapview_origin(int gui_x0, int gui_y0)
base_set_mapview_origin(start_x + diff_x * (mytime / timing_sec),
start_y + diff_y * (mytime / timing_sec));
flush_dirty();
- redraw_selection_rectangle();
gui_flush();
frames++;
} while (currtime < timing_sec);
@@ -1048,7 +1065,6 @@ void put_nuke_mushroom_pixmaps(struct tile *ptile)
dirty_rect(canvas_x, canvas_y, width, height);
flush_dirty();
- redraw_selection_rectangle();
gui_flush();
myusleep(1000000);
@@ -1071,6 +1087,130 @@ static void put_one_tile(struct canvas *pcanvas, enum mapview_layer layer,
}
/**************************************************************************
+ Depending on where ptile1 and ptile2 are on the map canvas, a traderoute
+ line may need to be drawn as two disjointed line segments. This function
+ fills the given line array 'lines' with the necessary line segments.
+
+ The return value is the number of line segments that need to be drawn.
+
+ NB: It is assumed ptile1 and ptile2 are already consistently ordered.
+ NB: 'lines' must be able to hold least MAX_TRADEROUTE_DRAW_LINES
+ elements.
+**************************************************************************/
+static int traderoute_to_canvas_lines(const struct tile *ptile1,
+ const struct tile *ptile2,
+ struct traderoute_line *lines)
+{
+ int dx, dy;
+
+ if (!ptile1 || !ptile2 || !lines) {
+ return 0;
+ }
+
+ base_map_distance_vector(&dx, &dy, TILE_XY(ptile1), TILE_XY(ptile2));
+ map_to_gui_pos(tileset, &lines[0].width, &lines[0].height, dx, dy);
+
+ /* FIXME: Remove these casts. */
+ tile_to_canvas_pos(&lines[0].x, &lines[0].y, (struct tile *)ptile1);
+ tile_to_canvas_pos(&lines[1].x, &lines[1].y, (struct tile *)ptile2);
+
+ if (lines[1].x - lines[0].x == lines[0].width
+ && lines[1].y - lines[0].y == lines[0].height) {
+ return 1;
+ }
+
+ lines[1].width = -lines[0].width;
+ lines[1].height = -lines[0].height;
+ return 2;
+}
+
+/**************************************************************************
+ Draw a colored traderoute line from one tile to another.
+**************************************************************************/
+static void draw_traderoute_line(const struct tile *ptile1,
+ const struct tile *ptile2,
+ enum color_std color)
+{
+ struct traderoute_line lines[MAX_TRADEROUTE_DRAW_LINES];
+ int line_count, i;
+ struct color *pcolor;
+
+ if (!ptile1 || !ptile2) {
+ return;
+ }
+
+ pcolor = get_color(tileset, color);
+ if (!pcolor) {
+ return;
+ }
+
+ /* Order the source and destination tiles consistently
+ * so that if a line is drawn twice it does not produce
+ * ugly effects due to dashes not lining up. */
+ if (ptile2->index > ptile1->index) {
+ const struct tile *tmp;
+ tmp = ptile1;
+ ptile1 = ptile2;
+ ptile2 = tmp;
+ }
+
+ line_count = traderoute_to_canvas_lines(ptile1, ptile2, lines);
+ for (i = 0; i < line_count; i++) {
+ canvas_put_line(mapview.store, pcolor, LINE_BORDER,
+ lines[i].x + tileset_tile_width(tileset) / 2,
+ lines[i].y + tileset_tile_height(tileset) / 2,
+ lines[i].width, lines[i].height);
+ }
+}
+
+/**************************************************************************
+ Draw all traderoutes for the given city.
+**************************************************************************/
+static void draw_traderoutes_for_city(const struct city *pcity_src)
+{
+ int i;
+ const struct city *pcity_dest;
+
+ if (!pcity_src) {
+ return;
+ }
+
+ for (i = 0; i < NUM_TRADEROUTES; i++) {
+ pcity_dest = game_find_city_by_number(pcity_src->trade[i]);
+ if (!pcity_dest) {
+ continue;
+ }
+ draw_traderoute_line(pcity_src->tile, pcity_dest->tile,
+ COLOR_MAPVIEW_GOTO); /* Cyan. */
+ }
+}
+
+/**************************************************************************
+ Draw traderoutes between cities as lines on the main map canvas.
+**************************************************************************/
+static void draw_traderoutes(void)
+{
+ struct player *pplayer = game.player_ptr;
+
+ if (!draw_city_traderoutes) {
+ return;
+ }
+
+ if (client_is_observer() && !pplayer) {
+ cities_iterate(pcity) {
+ draw_traderoutes_for_city(pcity);
+ } cities_iterate_end;
+ } else {
+ if (!pplayer) {
+ return;
+ }
+ city_list_iterate(pplayer->cities, pcity) {
+ draw_traderoutes_for_city(pcity);
+ } city_list_iterate_end;
+ }
+}
+
+/**************************************************************************
Update (refresh) the map canvas starting at the given tile (in map
coordinates) and with the given dimensions (also in map coordinates).
@@ -1152,6 +1292,8 @@ void update_map_canvas(int canvas_x, int canvas_y, int width, int height)
} gui_rect_iterate_end;
} mapview_layer_iterate_end;
+ draw_traderoutes();
+
/* Draw the goto lines on top of the whole thing. This is done last as
* we want it completely on top.
*
@@ -1165,8 +1307,8 @@ void update_map_canvas(int canvas_x, int canvas_y, int width, int height)
continue;
}
adjc_dir_iterate(ptile, adjc_tile, dir) {
- if (is_drawn_line(ptile, dir)) {
- draw_segment(ptile, dir);
+ if (mapdeco_is_gotoline_set(ptile, dir)) {
+ draw_segment(ptile, dir);
}
} adjc_dir_iterate_end;
} gui_rect_iterate_end;
@@ -1678,22 +1820,6 @@ void draw_segment(struct tile *src_tile, enum direction8 dir)
* which fails when the size of the mapview approaches that of the map. */
}
-/**************************************************************************
- Remove the line from src_x, src_y in the given direction, and redraw
- the change if necessary.
-**************************************************************************/
-void undraw_segment(struct tile *src_tile, enum direction8 dir)
-{
- struct tile *dst_tile = mapstep(src_tile, dir);
-
- if (is_drawn_line(src_tile, dir) || !dst_tile) {
- assert(0);
- return;
- }
- refresh_tile_mapcanvas(src_tile, FALSE, FALSE);
- refresh_tile_mapcanvas(dst_tile, FALSE, FALSE);
-}
-
/****************************************************************************
This function is called to decrease a unit's HP smoothly in battle
when combat_animation is turned on.
@@ -1763,7 +1889,6 @@ void decrease_unit_hp_smooth(struct unit *punit0, int hp0,
dirty_rect(canvas_x, canvas_y, tileset_tile_width(tileset), tileset_tile_height(tileset));
flush_dirty();
- redraw_selection_rectangle();
gui_flush();
usleep_since_timer_start(anim_timer, 20000);
@@ -1843,7 +1968,6 @@ void move_unit_map_canvas(struct unit *punit,
/* Flush. */
flush_dirty();
- redraw_selection_rectangle();
gui_flush();
/* Restore the backup. It won't take effect until the next flush. */
@@ -1903,7 +2027,7 @@ struct city *find_city_or_settler_near_tile(const struct tile *ptile,
* causing it to be marked as C_TILE_UNAVAILABLE.
*/
- if (map_deco[pcity->tile->index].hilite == HILITE_CITY) {
+ if (mapdeco_is_highlight_set(pcity->tile)) {
/* rule c */
return pcity;
}
@@ -1958,6 +2082,26 @@ struct city *find_city_near_tile(const struct tile *ptile)
}
/**************************************************************************
+ Append the buy cost of the current production of the given city to the
+ already NULL-terminated buffer. Does nothing if draw_city_buycost is
+ set to FALSE, or if it does not make sense to buy the current production
+ (e.g. coinage).
+**************************************************************************/
+static void append_city_buycost_string(const struct city *pcity,
+ char *buffer, int buffer_len)
+{
+ if (!pcity || !buffer || buffer_len < 1) {
+ return;
+ }
+
+ if (!draw_city_buycost || !city_can_buy(pcity)) {
+ return;
+ }
+
+ cat_snprintf(buffer, buffer_len, "/%d", city_buy_cost(pcity));
+}
+
+/**************************************************************************
Find the mapview city production text for the given city, and place it
into the buffer.
**************************************************************************/
@@ -1991,6 +2135,8 @@ void get_city_mapview_production(struct city *pcity,
improvement_name_translation(pcity->production.value));
}
}
+
+ append_city_buycost_string(pcity, buffer, buffer_len);
}
static enum update_type needed_updates = UPDATE_NONE;
@@ -2180,7 +2326,6 @@ void unqueue_mapview_updates(bool write_to_screen)
if (write_to_screen) {
flush_dirty();
- redraw_selection_rectangle();
flush_dirty_overview();
}
}
@@ -2301,16 +2446,300 @@ static bool can_do_cached_drawing(void)
Called when we receive map dimensions. It initialized the mapview
decorations.
**************************************************************************/
-void init_mapview_decorations(void)
+void mapdeco_init(void)
{
/* HACK: this must be called on a map_info packet. */
mapview.can_do_cached_drawing = can_do_cached_drawing();
- map_deco = fc_realloc(map_deco, MAP_INDEX_SIZE * sizeof(*map_deco));
- whole_map_iterate(ptile) {
- map_deco[ptile->index].hilite = HILITE_NONE;
- map_deco[ptile->index].crosshair = 0;
- } whole_map_iterate_end;
+ mapdeco_free();
+ mapdeco_highlight_table = hash_new(hash_fval_keyval, hash_fcmp_keyval);
+ mapdeco_crosshair_table = hash_new(hash_fval_keyval, hash_fcmp_keyval);
+ mapdeco_gotoline_table = hash_new(hash_fval_keyval, hash_fcmp_keyval);
+}
+
+/**************************************************************************
+ Free all memory used for map decorations.
+**************************************************************************/
+void mapdeco_free(void)
+{
+ if (mapdeco_highlight_table) {
+ hash_free(mapdeco_highlight_table);
+ mapdeco_highlight_table = NULL;
+ }
+ if (mapdeco_crosshair_table) {
+ hash_free(mapdeco_crosshair_table);
+ mapdeco_crosshair_table = NULL;
+ }
+ if (mapdeco_gotoline_table) {
+ hash_values_iterate(mapdeco_gotoline_table, pglc) {
+ free(pglc);
+ } hash_values_iterate_end;
+ hash_free(mapdeco_gotoline_table);
+ mapdeco_gotoline_table = NULL;
+ }
+}
+
+/**************************************************************************
+ Set the given tile's map decoration as either highlighted or not,
+ depending on the value of 'highlight'.
+**************************************************************************/
+void mapdeco_set_highlight(const struct tile *ptile, bool highlight)
+{
+ bool changed = FALSE;
+ if (!ptile || !mapdeco_highlight_table) {
+ return;
+ }
+
+ if (highlight) {
+ changed = hash_insert(mapdeco_highlight_table, ptile, NULL);
+ } else {
+ changed = hash_key_exists(mapdeco_highlight_table, ptile);
+ hash_delete_entry(mapdeco_highlight_table, ptile);
+ }
+
+ if (changed) {
+ /* FIXME: Remove the cast. */
+ refresh_tile_mapcanvas((struct tile *) ptile, TRUE, FALSE);
+ }
+}
+
+/**************************************************************************
+ Return TRUE if the given tile is highlighted.
+**************************************************************************/
+bool mapdeco_is_highlight_set(const struct tile *ptile)
+{
+ if (!ptile || !mapdeco_highlight_table) {
+ return FALSE;
+ }
+ return hash_key_exists(mapdeco_highlight_table, ptile);
+}
+
+/**************************************************************************
+ Clears all highlighting. Marks the previously highlighted tiles as
+ needing a mapview update.
+**************************************************************************/
+void mapdeco_clear_highlights(void)
+{
+ if (!mapdeco_highlight_table) {
+ return;
+ }
+
+ hash_keys_iterate(mapdeco_highlight_table, ptile) {
+ refresh_tile_mapcanvas(ptile, TRUE, FALSE);
+ } hash_keys_iterate_end;
+
+ hash_delete_all_entries(mapdeco_highlight_table);
+}
+
+/**************************************************************************
+ Marks the given tile as having a "crosshair" map decoration.
+**************************************************************************/
+void mapdeco_set_crosshair(const struct tile *ptile, bool crosshair)
+{
+ bool changed;
+
+ if (!mapdeco_crosshair_table || !ptile) {
+ return;
+ }
+
+ if (crosshair) {
+ changed = hash_insert(mapdeco_crosshair_table, ptile, NULL);
+ } else {
+ changed = hash_key_exists(mapdeco_crosshair_table, ptile);
+ hash_delete_entry(mapdeco_crosshair_table, ptile);
+ }
+
+ if (changed) {
+ /* FIXME: Remove the cast. */
+ refresh_tile_mapcanvas((struct tile *) ptile, FALSE, FALSE);
+ }
+}
+
+/**************************************************************************
+ Returns TRUE if there is a "crosshair" decoration set at the given tile.
+**************************************************************************/
+bool mapdeco_is_crosshair_set(const struct tile *ptile)
+{
+ if (!mapdeco_crosshair_table || !ptile) {
+ return FALSE;
+ }
+ return hash_key_exists(mapdeco_crosshair_table, ptile);
+}
+
+/**************************************************************************
+ Clears all previous set tile crosshair decorations. Marks the affected
+ tiles as needing a mapview update.
+**************************************************************************/
+void mapdeco_clear_crosshairs(void)
+{
+ if (!mapdeco_crosshair_table) {
+ return;
+ }
+
+ hash_keys_iterate(mapdeco_crosshair_table, ptile) {
+ refresh_tile_mapcanvas(ptile, FALSE, FALSE);
+ } hash_keys_iterate_end;
+
+ hash_delete_all_entries(mapdeco_crosshair_table);
+}
+
+/**************************************************************************
+ Add a goto line from the given tile 'ptile' in the direction 'dir'. If
+ there was no previously drawn line there, a mapview update is queued
+ for the source and destination tiles.
+**************************************************************************/
+void mapdeco_add_gotoline(const struct tile *ptile, enum direction8 dir)
+{
+ struct gotoline_counter *pglc;
+ const struct tile *ptile_dest;
+ bool changed;
+
+ if (!mapdeco_gotoline_table || !ptile
+ || !(0 <= dir && dir < DIR8_COUNT)) {
+ return;
+ }
+ ptile_dest = mapstep(ptile, dir);
+ if (!ptile_dest) {
+ return;
+ }
+
+ pglc = hash_lookup_data(mapdeco_gotoline_table, ptile);
+ if (!pglc) {
+ pglc = fc_calloc(1, sizeof(*pglc));
+ hash_insert(mapdeco_gotoline_table, ptile, pglc);
+ }
+ changed = (pglc->line_count[dir] < 1);
+ pglc->line_count[dir]++;
+
+ if (changed) {
+ /* FIXME: Remove cast. */
+ refresh_tile_mapcanvas((struct tile *) ptile, FALSE, FALSE);
+ refresh_tile_mapcanvas((struct tile *) ptile_dest, FALSE, FALSE);
+ }
+}
+
+/**************************************************************************
+ Removes a goto line from the given tile 'ptile' going in the direction
+ 'dir'. If this was the last line there, a mapview update is queued to
+ erase the drawn line.
+**************************************************************************/
+void mapdeco_remove_gotoline(const struct tile *ptile,
+ enum direction8 dir)
+{
+ struct gotoline_counter *pglc;
+ bool changed = FALSE;
+
+ if (!mapdeco_gotoline_table || !ptile
+ || !(0 <= dir && dir < DIR8_COUNT)) {
+ return;
+ }
+
+ pglc = hash_lookup_data(mapdeco_gotoline_table, ptile);
+ if (!pglc) {
+ return;
+ }
+
+ pglc->line_count[dir]--;
+ if (pglc->line_count[dir] <= 0) {
+ pglc->line_count[dir] = 0;
+ changed = TRUE;
+ }
+
+ if (changed) {
+ /* FIXME: Remove the casts. */
+ refresh_tile_mapcanvas((struct tile *) ptile, FALSE, FALSE);
+ ptile = mapstep(ptile, dir);
+ if (ptile != NULL) {
+ refresh_tile_mapcanvas((struct tile *) ptile, FALSE, FALSE);
+ }
+ }
+}
+
+/**************************************************************************
+ Set the map decorations for the given unit's goto route. A goto route
+ consists of one or more goto lines, with each line being from the center
+ of one tile to the center of another tile.
+**************************************************************************/
+void mapdeco_set_gotoroute(const struct unit *punit)
+{
+ const struct unit_order *porder;
+ const struct tile *ptile;
+ int i, ind;
+
+ if (!punit || !punit->tile || !unit_has_orders(punit)
+ || punit->orders.length < 1) {
+ return;
+ }
+
+ ptile = punit->tile;
+
+ for (i = 0; ptile != NULL && i < punit->orders.length; i++) {
+ if (punit->orders.index + i >= punit->orders.length
+ && !punit->orders.repeat) {
+ break;
+ }
+
+ ind = (punit->orders.index + i) % punit->orders.length;
+ porder = &punit->orders.list[ind];
+ if (porder->order != ORDER_MOVE) {
+ break;
+ }
+
+ mapdeco_add_gotoline(ptile, porder->dir);
+ ptile = mapstep(ptile, porder->dir);
+ }
+}
+
+/**************************************************************************
+ Returns TRUE if a goto line should be drawn from the given tile in the
+ given direction.
+**************************************************************************/
+bool mapdeco_is_gotoline_set(const struct tile *ptile,
+ enum direction8 dir)
+{
+ struct gotoline_counter *pglc;
+
+ if (!ptile || !(0 <= dir && dir < DIR8_COUNT)
+ || !mapdeco_gotoline_table) {
+ return FALSE;
+ }
+
+ pglc = hash_lookup_data(mapdeco_gotoline_table, ptile);
+ if (!pglc) {
+ return FALSE;
+ }
+
+ return pglc->line_count[dir] > 0;
+}
+
+/**************************************************************************
+ Clear all goto line map decorations and queues mapview updates for the
+ affected tiles.
+**************************************************************************/
+void mapdeco_clear_gotoroutes(void)
+{
+ const struct tile *ptile;
+ struct gotoline_counter *pglc;
+
+ if (!mapdeco_gotoline_table) {
+ return;
+ }
+
+ hash_iterate(mapdeco_gotoline_table, iter) {
+ ptile = hash_iter_get_key(iter);
+ pglc = hash_iter_get_value(iter);
+
+ /* FIXME: Remove the casts. */
+ refresh_tile_mapcanvas((struct tile *) ptile, FALSE, FALSE);
+ adjc_dir_iterate(ptile, ptile_dest, dir) {
+ if (pglc->line_count[dir] > 0) {
+ refresh_tile_mapcanvas((struct tile *) ptile_dest, FALSE, FALSE);
+ }
+ } adjc_dir_iterate_end;
+
+ free(pglc);
+ } hash_iterate_end;
+ hash_delete_all_entries(mapdeco_gotoline_table);
}
/**************************************************************************
diff --git a/client/mapview_common.h b/client/mapview_common.h
index 6958728..0901a7b 100644
--- a/client/mapview_common.h
+++ b/client/mapview_common.h
@@ -25,15 +25,6 @@
struct canvas_store; /* opaque type, real type is gui-dep */
-struct mapview_decoration {
- /* For client Area Selection */
- enum tile_hilite {
- HILITE_NONE, HILITE_CITY
- } hilite;
-
- int crosshair; /* A refcount */
-};
-
struct view {
int gui_x0, gui_y0;
int width, height; /* Size in pixels. */
@@ -43,7 +34,24 @@ struct view {
struct canvas *store, *tmp_store;
};
-extern struct mapview_decoration *map_deco;
+void mapdeco_init(void);
+void mapdeco_free(void);
+void mapdeco_set_highlight(const struct tile *ptile, bool highlight);
+bool mapdeco_is_highlight_set(const struct tile *ptile);
+void mapdeco_clear_highlights(void);
+void mapdeco_set_crosshair(const struct tile *ptile, bool crosshair);
+bool mapdeco_is_crosshair_set(const struct tile *ptile);
+void mapdeco_clear_crosshairs(void);
+void mapdeco_set_gotoroute(const struct unit *punit);
+void mapdeco_add_gotoline(const struct tile *ptile,
+ enum direction8 dir);
+void mapdeco_remove_gotoline(const struct tile *ptile,
+ enum direction8 dir);
+bool mapdeco_is_gotoline_set(const struct tile *ptile,
+ enum direction8 dir);
+void mapdeco_clear_gotoroutes(void);
+
+
extern struct view mapview;
/* HACK: Callers can set this to FALSE to disable sliding. It should be
@@ -293,7 +301,6 @@ void get_city_mapview_name_and_growth(struct city *pcity,
size_t growth_buffer_len,
enum color_std *grwoth_color);
-void init_mapview_decorations(void);
bool map_canvas_resized(int width, int height);
void init_mapcanvas_and_overview(void);
diff --git a/client/options.c b/client/options.c
index f72717b..4c7e6a8 100644
--- a/client/options.c
+++ b/client/options.c
@@ -85,8 +85,12 @@ bool map_scrollbars = FALSE;
bool dialogs_on_top = TRUE;
bool ask_city_name = TRUE;
bool popup_new_cities = TRUE;
+bool popup_caravan_arrival = TRUE;
bool keyboardless_goto = TRUE;
bool show_task_icons = TRUE;
+bool enable_cursor_changes = TRUE;
+bool separate_unit_selection = FALSE;
+bool unit_selection_clears_orders = TRUE;
/* This option is currently set by the client - not by the user. */
bool update_city_text_in_refresh_tile = TRUE;
@@ -243,6 +247,36 @@ static client_option common_options[] = {
N_("Setting this option will pop up a newly-founded "
"city's city dialog automatically."),
COC_INTERFACE),
+ GEN_BOOL_OPTION(popup_caravan_arrival, N_("Pop up caravan actions"),
+ N_("If this option is enabled, when caravans arrive "
+ "at a city where they can establish a traderoute "
+ "or help build a wonder, a window will popup asking "
+ "which action should be performed. Disabling this "
+ "option means you will have 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."),
+ COC_INTERFACE),
+ GEN_BOOL_OPTION(enable_cursor_changes, N_("Enable cursor changing"),
+ N_("This option controls whether the client should "
+ "try to change the mouse cursor depending on what "
+ "is being pointed at, as well as to indicate "
+ "changes in the client or server state."),
+ COC_INTERFACE),
+ GEN_BOOL_OPTION(separate_unit_selection, N_("Select cities before units"),
+ N_("If this option is enabled, when both cities and "
+ "units are present in the selection rectangle, only "
+ "cities will be selected."),
+ COC_INTERFACE),
+ GEN_BOOL_OPTION(unit_selection_clears_orders,
+ N_("Clear unit orders on selection"),
+ N_("Enabling this option will cause unit orders to be "
+ "cleared whenever one or more units are selected. If "
+ "this option is disabled, selecting units will 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>."),
+ COC_INTERFACE),
GEN_BOOL_OPTION(overview.layers[OLAYER_BACKGROUND],
N_("Background layer"),
@@ -285,6 +319,8 @@ bool draw_map_grid = FALSE;
bool draw_city_names = TRUE;
bool draw_city_growth = TRUE;
bool draw_city_productions = FALSE;
+bool draw_city_buycost = FALSE;
+bool draw_city_traderoutes = FALSE;
bool draw_terrain = TRUE;
bool draw_coastline = FALSE;
bool draw_roads_rails = TRUE;
@@ -312,6 +348,8 @@ view_option view_options[] = {
VIEW_OPTION(draw_city_names),
VIEW_OPTION(draw_city_growth),
VIEW_OPTION(draw_city_productions),
+ VIEW_OPTION(draw_city_buycost),
+ VIEW_OPTION(draw_city_traderoutes),
VIEW_OPTION(draw_terrain),
VIEW_OPTION(draw_coastline),
VIEW_OPTION(draw_roads_rails),
diff --git a/client/options.h b/client/options.h
index 31268ea..41967c2 100644
--- a/client/options.h
+++ b/client/options.h
@@ -48,9 +48,13 @@ extern bool map_scrollbars;
extern bool dialogs_on_top;
extern bool ask_city_name;
extern bool popup_new_cities;
+extern bool popup_caravan_arrival;
extern bool update_city_text_in_refresh_tile;
extern bool keyboardless_goto;
extern bool show_task_icons;
+extern bool enable_cursor_changes;
+extern bool separate_unit_selection;
+extern bool unit_selection_clears_orders;
enum client_option_type {
COT_BOOL,
@@ -129,6 +133,8 @@ extern bool draw_map_grid;
extern bool draw_city_names;
extern bool draw_city_growth;
extern bool draw_city_productions;
+extern bool draw_city_buycost;
+extern bool draw_city_traderoutes;
extern bool draw_terrain;
extern bool draw_coastline;
extern bool draw_roads_rails;
diff --git a/client/packhand.c b/client/packhand.c
index c5422a0..b28dcf6 100644
--- a/client/packhand.c
+++ b/client/packhand.c
@@ -1229,6 +1229,7 @@ static bool handle_unit_packet_common(struct unit *packet_unit)
&& 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);
@@ -1413,7 +1414,7 @@ void handle_map_info(int xsize, int ysize, int topology_id)
map_allocate();
init_client_goto();
- init_mapview_decorations();
+ mapdeco_init();
generate_citydlg_dimensions();
diff --git a/client/servers.c b/client/servers.c
index d41a996..8b2dff2 100644
--- a/client/servers.c
+++ b/client/servers.c
@@ -124,7 +124,7 @@ static struct server_list *parse_metaserver_data(fz_FILE *f)
pserver->host = mystrdup(host);
port = secfile_lookup_str_default(file, "", "server%d.port", i);
- pserver->port = mystrdup(port);
+ pserver->port = atoi(port);
version = secfile_lookup_str_default(file, "", "server%d.version", i);
pserver->version = mystrdup(version);
@@ -136,8 +136,8 @@ static struct server_list *parse_metaserver_data(fz_FILE *f)
pserver->message = mystrdup(message);
nplayers = secfile_lookup_str_default(file, "0", "server%d.nplayers", i);
- pserver->nplayers = mystrdup(nplayers);
n = atoi(nplayers);
+ pserver->nplayers = n;
if (n > 0) {
pserver->players = fc_malloc(n * sizeof(*pserver->players));
@@ -366,7 +366,6 @@ static void meta_read_response(struct server_scan *scan)
f = fz_from_stream(scan->meta.fp);
assert(f != NULL);
-
/* skip HTTP headers */
/* XXX: TODO check for magic Content-Type: text/x-ini -vasc */
while (fz_fgets(str, sizeof(str), f) && strcmp(str, "\r\n") != 0) {
@@ -378,6 +377,10 @@ static void meta_read_response(struct server_scan *scan)
/* parse HTTP message body */
scan->servers = parse_metaserver_data(f);
scan->meta.state = META_DONE;
+
+ /* 'f' (hence 'meta.fp') was closed in parse_metaserver_data(). */
+ scan->meta.fp = NULL;
+
return;
} else {
if (fwrite(buf, 1, result, scan->meta.fp) != result) {
@@ -442,50 +445,52 @@ static bool begin_metaserver_scan(struct server_scan *scan)
}
/**************************************************************************
- Create the list of servers from the metaserver
- The result must be free'd with delete_server_list() when no
- longer used
+ Check for data received from the metaserver.
**************************************************************************/
-static struct server_list *get_metaserver_list(struct server_scan *scan)
+static enum server_scan_status
+get_metaserver_list(struct server_scan *scan)
{
- struct timeval tv = {.tv_sec = 0, .tv_usec = 0};
+ struct timeval tv;
fd_set sockset;
- if (scan->sock < 0) {
- return NULL;
+ if (!scan || scan->sock < 0) {
+ return SCAN_STATUS_ERROR;
}
+ tv.tv_sec = 0;
+ tv.tv_usec = 0;
FD_ZERO(&sockset);
FD_SET(scan->sock, &sockset);
switch (scan->meta.state) {
case META_CONNECTING:
if (my_select(scan->sock + 1, NULL, &sockset, NULL, &tv) < 0) {
- (scan->error_func)(scan, mystrerror());
+ scan->error_func(scan, mystrerror());
} else if (FD_ISSET(scan->sock, &sockset)) {
meta_send_request(scan);
- } else {
- /* Keep waiting. */
}
- return NULL;
+ /* Keep waiting. */
+ return SCAN_STATUS_WAITING;
+ break;
case META_WAITING:
if (my_select(scan->sock + 1, &sockset, NULL, NULL, &tv) < 0) {
- (scan->error_func)(scan, mystrerror());
+ scan->error_func(scan, mystrerror());
} else if (FD_ISSET(scan->sock, &sockset)) {
meta_read_response(scan);
- return scan->servers;
- } else {
- /* Keep waiting. */
+ return SCAN_STATUS_PARTIAL;
}
- return NULL;
+ /* Keep waiting. */
+ return SCAN_STATUS_WAITING;
+ break;
case META_DONE:
- /* We already have a server list but we don't return it since it hasn't
- * changed. */
- return NULL;
+ return SCAN_STATUS_DONE;
+ break;
+ default:
+ break;
}
assert(0);
- return NULL;
+ return SCAN_STATUS_ERROR;
}
/**************************************************************************
@@ -495,12 +500,15 @@ static struct server_list *get_metaserver_list(struct server_scan *scan)
**************************************************************************/
static void delete_server_list(struct server_list *server_list)
{
+ if (!server_list) {
+ return;
+ }
+
server_list_iterate(server_list, ptmp) {
int i;
- int n = atoi(ptmp->nplayers);
+ int n = ptmp->nplayers;
free(ptmp->host);
- free(ptmp->port);
free(ptmp->version);
free(ptmp->state);
free(ptmp->message);
@@ -514,7 +522,6 @@ static void delete_server_list(struct server_list *server_list)
}
free(ptmp->players);
}
- free(ptmp->nplayers);
free(ptmp);
} server_list_iterate_end;
@@ -600,7 +607,7 @@ static bool begin_lanserver_scan(struct server_scan *scan)
/* Create a socket for listening for server packets. */
if ((scan->sock = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
- (scan->error_func)(scan, mystrerror());
+ scan->error_func(scan, mystrerror());
return FALSE;
}
@@ -617,7 +624,7 @@ static bool begin_lanserver_scan(struct server_scan *scan)
addr.sockaddr_in.sin_port = htons(SERVER_LAN_PORT + 1);
if (bind(scan->sock, &addr.sockaddr, sizeof(addr)) < 0) {
- (scan->error_func)(scan, mystrerror());
+ scan->error_func(scan, mystrerror());
return FALSE;
}
@@ -625,7 +632,7 @@ static bool begin_lanserver_scan(struct server_scan *scan)
mreq.imr_interface.s_addr = htonl(INADDR_ANY);
if (setsockopt(scan->sock, IPPROTO_IP, IP_ADD_MEMBERSHIP,
(const char*)&mreq, sizeof(mreq)) < 0) {
- (scan->error_func)(scan, mystrerror());
+ scan->error_func(scan, mystrerror());
return FALSE;
}
@@ -638,7 +645,8 @@ static bool begin_lanserver_scan(struct server_scan *scan)
Listens for UDP packets broadcasted from a server that responded
to the request-packet sent from the client.
**************************************************************************/
-static struct server_list *get_lan_server_list(struct server_scan *scan)
+static enum server_scan_status
+get_lan_server_list(struct server_scan *scan)
{
socklen_t fromlen;
union my_sockaddr fromend;
@@ -647,7 +655,8 @@ static struct server_list *get_lan_server_list(struct server_scan *scan)
int type;
struct data_in din;
char servername[512];
- char port[256];
+ char portstr[256];
+ int port;
char version[256];
char status[256];
char players[256];
@@ -673,7 +682,8 @@ static struct server_list *get_lan_server_list(struct server_scan *scan)
continue;
}
dio_get_string(&din, servername, sizeof(servername));
- dio_get_string(&din, port, sizeof(port));
+ dio_get_string(&din, portstr, sizeof(portstr));
+ port = atoi(portstr);
dio_get_string(&din, version, sizeof(version));
dio_get_string(&din, status, sizeof(status));
dio_get_string(&din, players, sizeof(players));
@@ -687,8 +697,8 @@ static struct server_list *get_lan_server_list(struct server_scan *scan)
/* UDP can send duplicate or delayed packets. */
server_list_iterate(scan->servers, aserver) {
- if (!mystrcasecmp(aserver->host, servername)
- && !mystrcasecmp(aserver->port, port)) {
+ if (0 == mystrcasecmp(aserver->host, servername)
+ && aserver->port == port) {
duplicate = TRUE;
break;
}
@@ -702,10 +712,10 @@ static struct server_list *get_lan_server_list(struct server_scan *scan)
pserver = fc_malloc(sizeof(*pserver));
pserver->host = mystrdup(servername);
- pserver->port = mystrdup(port);
+ pserver->port = port;
pserver->version = mystrdup(version);
pserver->state = mystrdup(status);
- pserver->nplayers = mystrdup(players);
+ pserver->nplayers = atoi(players);
pserver->message = mystrdup(message);
pserver->players = NULL;
found_new = TRUE;
@@ -713,47 +723,52 @@ static struct server_list *get_lan_server_list(struct server_scan *scan)
server_list_prepend(scan->servers, pserver);
}
- return found_new ? scan->servers : NULL;
+ if (found_new) {
+ return SCAN_STATUS_PARTIAL;
+ }
+ return SCAN_STATUS_WAITING;
}
/****************************************************************************
- Creates a new server scan, and starts scanning.
+ Creates a new server scan and returns it, or NULL if impossible.
Depending on 'type' the scan will look for either local or internet
games.
error_func provides a callback to be used in case of error; this
callback probably should call server_scan_finish.
+
+ NB: You must call server_scan_finish() when you are done with the
+ scan to free the memory and resources allocated by it.
****************************************************************************/
struct server_scan *server_scan_begin(enum server_scan_type type,
ServerScanErrorFunc error_func)
{
- struct server_scan *scan = fc_calloc(sizeof(*scan), 1);
+ struct server_scan *scan;
+ bool ok = FALSE;
+ scan = fc_calloc(1, sizeof(*scan));
scan->type = type;
scan->error_func = error_func;
-
scan->sock = -1;
switch (type) {
case SERVER_SCAN_GLOBAL:
- if (begin_metaserver_scan(scan)) {
- return scan;
- } else {
- return NULL;
- }
+ ok = begin_metaserver_scan(scan);
+ break;
case SERVER_SCAN_LOCAL:
- if (begin_lanserver_scan(scan)) {
- return scan;
- } else {
- return NULL;
- }
- case SERVER_SCAN_LAST:
+ ok = begin_lanserver_scan(scan);
+ break;
+ default:
break;
}
- assert(0);
- return NULL;
+ if (!ok) {
+ server_scan_finish(scan);
+ scan = NULL;
+ }
+
+ return scan;
}
/****************************************************************************
@@ -762,43 +777,68 @@ struct server_scan *server_scan_begin(enum server_scan_type type,
****************************************************************************/
enum server_scan_type server_scan_get_type(const struct server_scan *scan)
{
+ if (!scan) {
+ return SERVER_SCAN_LAST;
+ }
return scan->type;
}
/****************************************************************************
- A function to query servers of the server scan. This will check any
- pending network data and update the server list. It then returns
- a server_list if any new servers are found, or NULL if the list has not
- changed.
-
- Note that unless the list has changed NULL will be returned. Since
- polling is likely to be used with the server scans, callers should poll
- this function often (every 100 ms) but only need to take further action
- when a non-NULL value is returned.
+ A function to query servers of the server scan. This will check any
+ pending network data and update the server list.
+
+ The return value indicates the status of the server scan:
+ SCAN_STATUS_ERROR - The scan failed and should be aborted.
+ SCAN_STATUS_WAITING - The scan is in progress (continue polling).
+ SCAN_STATUS_PARTIAL - The scan received some data, with more expected.
+ Get the servers with server_scan_get_list(), and
+ continue polling.
+ SCAN_STATUS_DONE - The scan received all data it expected to receive.
+ Get the servers with server_scan_get_list(), and
+ stop calling this function.
****************************************************************************/
-struct server_list *server_scan_get_servers(struct server_scan *scan)
+enum server_scan_status server_scan_poll(struct server_scan *scan)
{
+ if (!scan) {
+ return SCAN_STATUS_ERROR;
+ }
+
switch (scan->type) {
case SERVER_SCAN_GLOBAL:
return get_metaserver_list(scan);
+ break;
case SERVER_SCAN_LOCAL:
- return get_lan_server_list(scan);
- case SERVER_SCAN_LAST:
+ return get_lan_server_list(scan);
+ break;
+ default:
break;
}
- assert(0);
- return NULL;
+ return SCAN_STATUS_ERROR;
}
/**************************************************************************
- Closes the socket listening on the scan and frees the list of servers.
+ Returns the server_list currently held by the scan (may be NULL).
+**************************************************************************/
+const struct server_list *
+server_scan_get_list(const struct server_scan *scan)
+{
+ if (!scan) {
+ return NULL;
+ }
+ return scan->servers;
+}
+
+/**************************************************************************
+ Closes the socket listening on the scan, frees the list of servers, and
+ frees the memory allocated for 'scan' by server_scan_begin().
**************************************************************************/
void server_scan_finish(struct server_scan *scan)
{
if (!scan) {
return;
}
+
if (scan->sock >= 0) {
my_closesocket(scan->sock);
scan->sock = -1;
@@ -809,5 +849,10 @@ void server_scan_finish(struct server_scan *scan)
scan->servers = NULL;
}
- /* FIXME: do we need to close scan->meta.fp or free scan->meta.urlpath? */
+ if (scan->meta.fp) {
+ fclose(scan->meta.fp);
+ scan->meta.fp = NULL;
+ }
+
+ free(scan);
}
diff --git a/client/servers.h b/client/servers.h
index 84e6ef8..6b7ec12 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://meta.freeciv.org/metaserver.phtml"
+#define METALIST_ADDR "http://www.cazfi.net/freeciv/metaserver/"
#define SERVER_LAN_PORT 4555
#define SERVER_LAN_TTL 1
@@ -23,7 +23,7 @@
struct server
{
char *host;
- char *port;
+ int port;
char *capability;
char *patches;
char *version;
@@ -39,7 +39,7 @@ struct server
char *nation;
} *players;
- char *nplayers;
+ int nplayers;
};
#define SPECLIST_TAG server
@@ -64,7 +64,15 @@ typedef void (*ServerScanErrorFunc)(struct server_scan *scan,
struct server_scan *server_scan_begin(enum server_scan_type type,
ServerScanErrorFunc error_func);
enum server_scan_type server_scan_get_type(const struct server_scan *scan);
-struct server_list *server_scan_get_servers(struct server_scan *scan);
+enum server_scan_status {
+ SCAN_STATUS_ERROR = 0,
+ SCAN_STATUS_WAITING,
+ SCAN_STATUS_PARTIAL,
+ SCAN_STATUS_DONE
+};
+enum server_scan_status server_scan_poll(struct server_scan *scan);
+const struct server_list *
+server_scan_get_list(const struct server_scan *scan);
void server_scan_finish(struct server_scan *scan);
#endif /* FC__SERVERS_H */
diff --git a/client/text.c b/client/text.c
index 9295f14..7ab9db6 100644
--- a/client/text.c
+++ b/client/text.c
@@ -74,6 +74,56 @@ const char *get_tile_output_text(const struct tile *ptile)
}
/****************************************************************************
+ For AIs, fill the buffer with their player name prefixed with "AI". For
+ humans, just fill it with their username.
+****************************************************************************/
+static inline void get_full_username(char *buf, int buflen,
+ const struct player *pplayer)
+{
+ if (!buf || buflen < 1) {
+ return;
+ }
+
+ if (!pplayer) {
+ buf[0] = '\0';
+ return;
+ }
+
+ if (pplayer->ai.control) {
+ /* TRANS: "AI <player name>" */
+ my_snprintf(buf, buflen, _("AI %s"), pplayer->name);
+ } else {
+ mystrlcpy(buf, pplayer->username, buflen);
+ }
+}
+
+/****************************************************************************
+ Fill the buffer with the player's nation name (in adjective form) and
+ optionally add the player's team name.
+****************************************************************************/
+static inline void get_full_nation(char *buf, int buflen,
+ const struct player *pplayer)
+{
+ if (!buf || buflen < 1) {
+ return;
+ }
+
+ if (!pplayer) {
+ buf[0] = '\0';
+ return;
+ }
+
+ if (pplayer->team) {
+ /* TRANS: "<nation adjective>, team <team name>" */
+ my_snprintf(buf, buflen, _("%s, team %s"),
+ nation_adjective_for_player(pplayer),
+ team_get_name(pplayer->team));
+ } else {
+ mystrlcpy(buf, nation_adjective_for_player(pplayer), buflen);
+ }
+}
+
+/****************************************************************************
Text to popup on a middle-click in the mapview.
****************************************************************************/
const char *popup_info_text(struct tile *ptile)
@@ -94,13 +144,14 @@ const char *popup_info_text(struct tile *ptile)
int infracount;
bv_special infra;
static struct astring str = ASTRING_INIT;
+ char username[MAX_LEN_NAME + 32];
+ char nation[2 * MAX_LEN_NAME + 32];
astr_clear(&str);
-#ifdef DEBUG
- astr_add_line(&str, _("Location: (%d, %d) [%d]"),
- TILE_XY(ptile),
- ptile->continent);
-#endif /*DEBUG*/
+ astr_add_line(&str, _("Location: (%d, %d) [%d]"),
+ ptile->x, ptile->y, ptile->continent);
+ astr_add_line(&str, _("Native coordinates: (%d, %d)"),
+ ptile->nat_x, ptile->nat_y);
if (client_tile_get_known(ptile) == TILE_UNKNOWN) {
astr_add(&str, _("Unknown"));
@@ -115,31 +166,35 @@ const char *popup_info_text(struct tile *ptile)
if (game.info.borders > 0 && !pcity) {
struct player *owner = tile_owner(ptile);
+ get_full_username(username, sizeof(username), owner);
+ get_full_nation(nation, sizeof(nation), owner);
+
if (game.player_ptr && owner == game.player_ptr){
astr_add_line(&str, _("Our territory"));
} else if (owner && !game.player_ptr) {
- /* TRANS: "Polish territory" */
- astr_add_line(&str, _("%s territory"),
- nation_adjective_for_player(owner));
+ /* TRANS: "Territory of <username> (<nation + team>)" */
+ astr_add_line(&str, _("Territory of %s (%s)"), username, nation);
} else if (owner) {
struct player_diplstate *ds = game.player_ptr->diplstates;
if (ds[player_index(owner)].type == DS_CEASEFIRE) {
int turns = ds[player_index(owner)].turns_left;
- /* TRANS: "Polish territory (5 turn cease-fire)" */
- astr_add_line(&str, PL_("%s territory (%d turn cease-fire)",
- "%s territory (%d turn cease-fire)",
- turns),
- nation_adjective_for_player(owner),
- turns);
+ /* TRANS: "Territory of <username> (<nation + team>)
+ * (<number> turn cease-fire)" */
+ astr_add_line(&str,
+ PL_("Territory of %s (%s) (%d turn cease-fire)",
+ "Territory of %s (%s) (%d turn cease-fire)",
+ turns),
+ username, nation, turns);
} else {
int type = ds[player_index(owner)].type;
- /* TRANS: "Polish territory (friendly)" */
- astr_add_line(&str, _("%s territory (%s)"),
- nation_adjective_for_player(owner),
- diplo_nation_plural_adjectives[type]);
+ /* TRANS: "Territory of <username>
+ * (<nation + team> | <diplomatic state>)" */
+ astr_add_line(&str, _("Territory of %s (%s | %s)"),
+ username, nation,
+ diplo_nation_plural_adjectives[type]);
}
} else {
astr_add_line(&str, _("Unclaimed territory"));
@@ -151,44 +206,46 @@ const char *popup_info_text(struct tile *ptile)
struct player *owner = city_owner(pcity);
int has_improvements = 0;
+ get_full_username(username, sizeof(username), owner);
+ get_full_nation(nation, sizeof(nation), owner);
+
if (!game.player_ptr || owner == game.player_ptr){
- /* TRANS: "City: Warsaw (Polish)" */
- astr_add_line(&str, _("City: %s (%s)"),
- city_name(pcity),
- nation_adjective_for_player(owner));
+ /* TRANS: "City: <city name> | <username> (<nation + team>)" */
+ astr_add_line(&str, _("City: %s | %s (%s)"),
+ city_name(pcity), username, nation);
} else {
struct player_diplstate *ds = game.player_ptr->diplstates;
if (ds[player_index(owner)].type == DS_CEASEFIRE) {
int turns = ds[player_index(owner)].turns_left;
- /* TRANS: "City: Warsaw (Polish, 5 turn cease-fire)" */
- astr_add_line(&str, PL_("City: %s (%s, %d turn cease-fire)",
- "City: %s (%s, %d turn cease-fire)",
- turns),
- city_name(pcity),
- nation_adjective_for_player(owner),
- turns);
+ /* TRANS: "City: <city name> | <username>
+ * (<nation + team>, <number> turn cease-fire)" */
+ astr_add_line(&str, PL_("City: %s | %s (%s, %d turn cease-fire)",
+ "City: %s | %s (%s, %d turn cease-fire)",
+ turns),
+ city_name(pcity), username, nation, turns);
} else {
- /* TRANS: "City: Warsaw (Polish,friendly)" */
- astr_add_line(&str, _("City: %s (%s, %s)"),
- city_name(pcity),
- nation_adjective_for_player(owner),
- diplo_city_adjectives[ds[player_index(owner)].type]);
+ /* TRANS: "City: <city name> | <username>
+ * (<nation + team>, <diplomatic state>)" */
+ astr_add_line(&str, _("City: %s | %s (%s, %s)"),
+ city_name(pcity), username, nation,
+ diplo_city_adjectives[ds[player_index(owner)].type]);
}
}
impr_type_iterate(i) {
if (is_improvement_visible(i)
- && city_got_building(pcity, i)) {
- if (has_improvements++ > 0) {
- /* TRANS: continue list, in case comma is not the separator of choice. */
- astr_add(&str, Q_("?clistmore:, %s"),
- improvement_name_translation(i));
- } else {
- /* TRANS: previous lines gave other information about the city. */
- astr_add(&str, Q_("?clistbegin: with %s"),
- improvement_name_translation(i));
- }
+ && city_got_building(pcity, i)) {
+ if (has_improvements++ > 0) {
+ /* TRANS: continue list, in case comma is not the separator of choice. */
+ astr_add(&str, Q_("?clistmore:, %s"),
+ improvement_name_translation(i));
+ } else {
+ astr_add_line(&str, " ");
+ /* TRANS: previous lines gave other information about the city. */
+ astr_add(&str, Q_("?clistbegin: with %s"),
+ improvement_name_translation(i));
+ }
}
} impr_type_iterate_end;
@@ -218,20 +275,22 @@ const char *popup_info_text(struct tile *ptile)
struct player *owner = unit_owner(punit);
struct unit_type *ptype = unit_type(punit);
+ get_full_username(username, sizeof(username), owner);
+ get_full_nation(nation, sizeof(nation), owner);
+
if (!game.player_ptr || owner == game.player_ptr){
struct city *pcity = player_find_city_by_id(owner, punit->homecity);
if (pcity) {
- /* TRANS: "Unit: Musketeers (Polish, Warsaw)" */
- astr_add_line(&str, _("Unit: %s (%s, %s)"),
- utype_name_translation(ptype),
- nation_adjective_for_player(owner),
- city_name(pcity));
+ /* TRANS: "Unit: <unit type> | <username>
+ * (<nation + team>, <homecity>)" */
+ astr_add_line(&str, _("Unit: %s | %s (%s, %s)"),
+ utype_name_translation(ptype), username,
+ nation, city_name(pcity));
} else {
- /* TRANS: "Unit: Musketeers (Polish)" */
- astr_add_line(&str, _("Unit: %s (%s)"),
- utype_name_translation(ptype),
- nation_adjective_for_player(owner));
+ /* TRANS: "Unit: <unit type> | <username> (<nation + team>)" */
+ astr_add_line(&str, _("Unit: %s | %s (%s)"),
+ utype_name_translation(ptype), username, nation);
}
} else if (owner) {
struct player_diplstate *ds = game.player_ptr->diplstates;
@@ -241,19 +300,19 @@ const char *popup_info_text(struct tile *ptile)
if (ds[player_index(owner)].type == DS_CEASEFIRE) {
int turns = ds[player_index(owner)].turns_left;
- /* TRANS: "Unit: Musketeers (Polish, 5 turn cease-fire)" */
- astr_add_line(&str, PL_("Unit: %s (%s, %d turn cease-fire)",
- "Unit: %s (%s, %d turn cease-fire)",
- turns),
- utype_name_translation(ptype),
- nation_adjective_for_player(owner),
- turns);
+ /* TRANS: "Unit: <unit type> | <username> (<nation + team>,
+ * <number> turn cease-fire)" */
+ astr_add_line(&str, PL_("Unit: %s | %s (%s, %d turn cease-fire)",
+ "Unit: %s | %s (%s, %d turn cease-fire)",
+ turns),
+ utype_name_translation(ptype),
+ username, nation, turns);
} else {
- /* TRANS: "Unit: Musketeers (Polish,friendly)" */
- astr_add_line(&str, _("Unit: %s (%s, %s)"),
- utype_name_translation(ptype),
- nation_adjective_for_player(owner),
- diplo_city_adjectives[ds[player_index(owner)].type]);
+ /* TRANS: "Unit: <unit type> | <username> (<nation + team>,
+ * <diplomatic state>)" */
+ astr_add_line(&str, _("Unit: %s | %s (%s, %s)"),
+ utype_name_translation(ptype), username, nation,
+ diplo_city_adjectives[ds[player_index(owner)].type]);
}
}
@@ -1117,21 +1176,23 @@ const char *get_score_text(const struct player *pplayer)
const char *get_report_title(const char *report_name)
{
static struct astring str = ASTRING_INIT;
+ const struct player *pplayer = game.player_ptr;
astr_clear(&str);
astr_add_line(&str, "%s", report_name);
- if (game.player_ptr) {
- /* TRANS: "Republic of the Poles" */
- astr_add_line(&str, _("%s of the %s"),
- government_name_for_player(game.player_ptr),
- nation_plural_for_player(game.player_ptr));
+ if (pplayer != NULL) {
+ /* TRANS: <nation adjective> <government name>.
+ * E.g. "Polish Republic". */
+ astr_add_line(&str, _("?nationgovernment:%s %s"),
+ nation_adjective_for_player(pplayer),
+ government_name_for_player(pplayer));
astr_add_line(&str, "%s %s: %s",
- ruler_title_translation(game.player_ptr),
- player_name(game.player_ptr),
- textyear(game.info.year));
+ ruler_title_translation(pplayer),
+ player_name(pplayer),
+ textyear(game.info.year));
} else {
/* TRANS: "Observer: 1985" */
astr_add_line(&str, _("Observer: %s"),
@@ -1263,7 +1324,6 @@ const char *text_happiness_cities(const struct city *pcity)
/****************************************************************************
Describing units that affect happiness.
- FIXME: sentence fragments with parenthesis are hard to translate!
****************************************************************************/
const char *text_happiness_units(const struct city *pcity)
{
@@ -1274,25 +1334,19 @@ const char *text_happiness_units(const struct city *pcity)
astr_clear(&str);
if (mlmax > 0) {
- astr_add_line(&str,
- /* TRANS: Martial law opening parenthesis */
- _("Martial law in effect ("));
-
+ int mleach = get_city_bonus(pcity, EFT_MARTIAL_LAW_EACH);
if (mlmax == 100) {
- astr_add(&str,
- /* TRANS: no [unit] maximum */
- _("no maximum, "));
+ astr_add_line(&str, "%s", _("Unlimited martial law in effect."));
} else {
- astr_add(&str,
- PL_("%d unit maximum, ",
- "%d units maximum, ",
- mlmax),
- mlmax);
+ astr_add_line(&str, PL_("%d military unit may impose martial law.",
+ "Up to %d military units may impose martial "
+ "law.", mlmax), mlmax);
}
- astr_add(&str,
- /* TRANS: Martial law closing parenthesis */
- _("%d per unit). "),
- get_city_bonus(pcity, EFT_MARTIAL_LAW_EACH));
+ astr_add_line(&str, PL_("Each military unit makes %d "
+ "unhappy citizen content.",
+ "Each military unit makes %d "
+ "unhappy citizens content.",
+ mleach), mleach);
} else if (uhcfac > 0) {
astr_add_line(&str,
_("Military units in the field may cause unhappiness. "));
diff --git a/client/tilespec.c b/client/tilespec.c
index 606f640..dde0d79 100644
--- a/client/tilespec.c
+++ b/client/tilespec.c
@@ -3885,10 +3885,8 @@ static int fill_grid_sprite_array(const struct tileset *t,
}
}
- if ((pedge->tile[0]
- && map_deco[pedge->tile[0]->index].hilite == HILITE_CITY)
- || (pedge->tile[1]
- && map_deco[pedge->tile[1]->index].hilite == HILITE_CITY)) {
+ if (mapdeco_is_highlight_set(pedge->tile[0])
+ || mapdeco_is_highlight_set(pedge->tile[1])) {
ADD_SPRITE_SIMPLE(t->sprites.grid.selected[pedge->type]);
} else if (!draw_terrain && draw_coastline
&& pedge->tile[0] && pedge->tile[1]
@@ -4263,7 +4261,7 @@ int fill_sprite_array(struct tileset *t,
case LAYER_OVERLAYS:
sprs += fill_city_overlays_sprite_array(t, sprs, ptile, citymode);
- if (ptile && map_deco[ptile->index].crosshair > 0) {
+ if (mapdeco_is_crosshair_set(ptile)) {
ADD_SPRITE_SIMPLE(t->sprites.user.attention);
}
break;
diff --git a/common/aicore/cm.c b/common/aicore/cm.c
index d83958f..e73ada8 100644
--- a/common/aicore/cm.c
+++ b/common/aicore/cm.c
@@ -1042,14 +1042,23 @@ static void clean_lattice(struct tile_type_vector *lattice,
{
int i, j; /* i is the index we read, j is the index we write */
struct tile_type_vector tofree;
+ bool forced_loop = FALSE;
/* We collect the types we want to remove and free them in one fell
swoop at the end, in order to avoid memory errors. */
tile_type_vector_init(&tofree);
- for (i = 0, j = 0; i < lattice->size; i++) {
+ /* forced_loop is workaround for what seems like gcc optimization
+ * bug.
+ * This applies to -O2 optimization on some distributions. */
+ if (lattice->size > 0) {
+ forced_loop = TRUE;
+ }
+ for (i = 0, j = 0; i < lattice->size || forced_loop; i++) {
struct cm_tile_type *ptype = lattice->p[i];
+ forced_loop = FALSE;
+
if (ptype->lattice_depth >= pcity->size) {
tile_type_vector_add(&tofree, ptype);
} else {
diff --git a/common/map.h b/common/map.h
index f6f6a1e..58cbff4 100644
--- a/common/map.h
+++ b/common/map.h
@@ -77,6 +77,12 @@ enum topo_flag {
TF_HEX = 8
};
+/* Parameters for terrain counting functions. */
+static const bool C_ADJACENT = FALSE;
+static const bool C_CARDINAL = TRUE;
+static const bool C_NUMBER = FALSE;
+static const bool C_PERCENT = TRUE;
+
#define MAP_IS_ISOMETRIC (topo_has_flag(TF_ISO) || topo_has_flag(TF_HEX))
#define CURRENT_TOPOLOGY (map.topology_id)
diff --git a/common/unit.c b/common/unit.c
index c2e4af8..100af79 100644
--- a/common/unit.c
+++ b/common/unit.c
@@ -459,7 +459,7 @@ bool can_unit_change_homecity(const struct unit *punit)
**************************************************************************/
int get_activity_rate(const struct unit *punit)
{
- int fact = unit_type(punit)->veteran[punit->veteran].power_fact;
+ double fact = unit_type(punit)->veteran[punit->veteran].power_fact;
/* The speed of the settler depends on its base move_rate, not on
* the number of moves actually remaining or the adjusted move rate.
diff --git a/configure b/configure
index e400366..f81a69a 100755
--- a/configure
+++ b/configure
@@ -1502,15 +1502,15 @@ _ACEOF
MAJOR_VERSION="2"
MINOR_VERSION="1"
- PATCH_VERSION="8"
+ PATCH_VERSION="9"
VERSION_LABEL=""""
IS_DEVEL_VERSION=0
IS_BETA_VERSION=0
-NEXT_STABLE_VERSION="2.1.9"
-RELEASE_MONTH=1
+NEXT_STABLE_VERSION="2.1.10"
+RELEASE_MONTH=5
# Freeciv network capstring: see documentation in common/capstr.c
#
@@ -3689,14 +3689,13 @@ echo "$as_me: WARNING: couldn't find mysql libs in normal locations" >&2;};
fi
- if test x$auth = x$true ; then
+ 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"
- auth=true
echo "$as_me:$LINENO: checking for mysql_query in -lmysqlclient" >&5
echo $ECHO_N "checking for mysql_query in -lmysqlclient... $ECHO_C" >&6
@@ -3756,10 +3755,10 @@ if test $ac_cv_lib_mysqlclient_mysql_query = 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;}
+ 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;};
- auth=false
+echo "$as_me: WARNING: couldn't find mysql libs in $__ldpath" >&2;}
fi
@@ -3769,6 +3768,12 @@ fi
LDFLAGS="$fc_preauth_LDFLAGS"
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; }; }
+ fi
fi
else
AUTH_CFLAGS="-I$mysql_prefix/include $AUTH_CFLAGS"
@@ -6895,6 +6900,7 @@ 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
@@ -18018,7 +18024,7 @@ for i in $libggz_incdirs;
do
for j in $libggz_header;
do
- echo "configure: 18021: $i/$j" >&5
+ echo "configure: 18027: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
libggz_incdir=$i
@@ -18152,7 +18158,8 @@ fi
LDFLAGS=$LIBGGZ_LDFLAGS
LIBS=$LIB_GGZ
CPPFLAGS=$LIBGGZ_INCLUDES
- export LD_LIBRARY_PATH=$save_ldlibrary_path:$libggz_libraries
+ 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
@@ -18293,7 +18300,7 @@ for i in $ggzmod_incdirs;
do
for j in $ggzmod_header;
do
- echo "configure: 18296: $i/$j" >&5
+ echo "configure: 18303: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ggzmod_incdir=$i
@@ -18423,7 +18430,7 @@ for i in $ggz_config_dirs;
do
for j in ggz-config;
do
- echo "configure: 18426: $i/$j" >&5
+ echo "configure: 18433: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ggz_config_dir=$i
@@ -18660,7 +18667,7 @@ for i in $ggz_gtk_incdirs;
do
for j in $ggz_gtk_header;
do
- echo "configure: 18663: $i/$j" >&5
+ echo "configure: 18670: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ggz_gtk_incdir=$i
@@ -18858,7 +18865,7 @@ for i in $libggz_incdirs;
do
for j in $libggz_header;
do
- echo "configure: 18861: $i/$j" >&5
+ echo "configure: 18868: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
libggz_incdir=$i
@@ -18988,7 +18995,8 @@ fi
LDFLAGS=$LIBGGZ_LDFLAGS
LIBS=$LIB_GGZ
CPPFLAGS=$LIBGGZ_INCLUDES
- export LD_LIBRARY_PATH=$save_ldlibrary_path:$libggz_libraries
+ 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
@@ -19129,7 +19137,7 @@ for i in $ggzdmod_incdirs;
do
for j in $ggzdmod_header;
do
- echo "configure: 19132: $i/$j" >&5
+ echo "configure: 19140: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ggzdmod_incdir=$i
@@ -19606,7 +19614,7 @@ for i in $libggz_incdirs;
do
for j in $libggz_header;
do
- echo "configure: 19609: $i/$j" >&5
+ echo "configure: 19617: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
libggz_incdir=$i
@@ -19740,7 +19748,8 @@ fi
LDFLAGS=$LIBGGZ_LDFLAGS
LIBS=$LIB_GGZ
CPPFLAGS=$LIBGGZ_INCLUDES
- export LD_LIBRARY_PATH=$save_ldlibrary_path:$libggz_libraries
+ 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
@@ -19881,7 +19890,7 @@ for i in $ggzmod_incdirs;
do
for j in $ggzmod_header;
do
- echo "configure: 19884: $i/$j" >&5
+ echo "configure: 19893: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ggzmod_incdir=$i
@@ -20011,7 +20020,7 @@ for i in $ggz_config_dirs;
do
for j in ggz-config;
do
- echo "configure: 20014: $i/$j" >&5
+ echo "configure: 20023: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ggz_config_dir=$i
@@ -20248,7 +20257,7 @@ for i in $ggz_gtk_incdirs;
do
for j in $ggz_gtk_header;
do
- echo "configure: 20251: $i/$j" >&5
+ echo "configure: 20260: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ggz_gtk_incdir=$i
@@ -20446,7 +20455,7 @@ for i in $libggz_incdirs;
do
for j in $libggz_header;
do
- echo "configure: 20449: $i/$j" >&5
+ echo "configure: 20458: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
libggz_incdir=$i
@@ -20576,7 +20585,8 @@ fi
LDFLAGS=$LIBGGZ_LDFLAGS
LIBS=$LIB_GGZ
CPPFLAGS=$LIBGGZ_INCLUDES
- export LD_LIBRARY_PATH=$save_ldlibrary_path:$libggz_libraries
+ 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
@@ -20717,7 +20727,7 @@ for i in $ggzdmod_incdirs;
do
for j in $ggzdmod_header;
do
- echo "configure: 20720: $i/$j" >&5
+ echo "configure: 20730: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ggzdmod_incdir=$i
diff --git a/configure.ac b/configure.ac
index c7d0341..06b9fb1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -193,7 +193,8 @@ fi
dnl I18n support
ALL_LINGUAS="ar cs ca da de el en_GB eo es et fa fi fr he hu it ja ko lt nl
-nb no pl pt pt_BR ro ru sv tr uk zh_CN" AM_GNU_GETTEXT(,need-ngettext)
+nb no pl pt pt_BR ro ru sv tr uk zh_CN"
+AM_GNU_GETTEXT(,need-ngettext)
dnl AM_GNU_GETTEXT doesn't have all features we want
dnl or they don't behave correctly.
diff --git a/data/Freeciv b/data/Freeciv
index 2915772..cdbd361 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.8
+Freeciv*version: 2.1.9
Freeciv.title: Freeciv
Freeciv.iconName: Freeciv
Freeciv*borderColor: black
diff --git a/data/default.serv b/data/default.serv
index 59c020d..8ff4916 100644
--- a/data/default.serv
+++ b/data/default.serv
@@ -8,5 +8,5 @@ rulesetdir default
# HACK: These are included to cancel out the settings from civ2.ruleset, etc.
set sciencebox 100
-set startunits cccwwx
+set startunits ccwwx
set borders 4
diff --git a/data/default/units.ruleset b/data/default/units.ruleset
index 3737f67..6a47f75 100644
--- a/data/default/units.ruleset
+++ b/data/default/units.ruleset
@@ -235,7 +235,7 @@ Settlers and Engineers may work together to decrease the amount of\
")
[unit_worker]
-name = _("Workers")
+name = _("?unit:Workers")
class = "Land"
tech_req = "Pottery"
obsolete_by = "Engineers"
@@ -1861,7 +1861,7 @@ Explorers are very useful for mapping unknown territory.\
")
[unit_leader]
-name = _("Leader")
+name = _("?unit:Leader")
class = "Land"
tech_req = "None"
obsolete_by = "None"
diff --git a/data/helpdata.txt b/data/helpdata.txt
index c469ec9..075f269 100644
--- a/data/helpdata.txt
+++ b/data/helpdata.txt
@@ -779,12 +779,12 @@ other player isn't getting a better deal than you expect.\
Cease-fire, Armistice, Peace, and Alliance. The first is the default state, \
while the others can be achieved by signing diplomatic treaties.\
"), _("\
- To have a diplomatic relationship with another player, you must fist \
-establish first contact with that player. To establish first contact, you \
-have to move one of your units next to a city or unit belonging to that \
-player, or vice versa. Unless you establish an embassy with that player, \
-you may again lose contact with them after a set number of turns without \
-direct physical contact.\
+ To have a diplomatic relationship with another player, you must first \
+establish contact with that player. To establish contact, you have to move \
+one of your units next to a city or unit belonging to that player, or vice \
+versa. Unless you establish an embassy with that player, you may again \
+lose contact with them after a set number of turns without direct physical \
+contact.\
"), _("\
The diplomatic state between players defaults to War. \
During War, you can freely move you units inside enemy territory and \
diff --git a/data/nation/armenian.ruleset b/data/nation/armenian.ruleset
index caba625..3d84a77 100644
--- a/data/nation/armenian.ruleset
+++ b/data/nation/armenian.ruleset
@@ -5,7 +5,7 @@ plural=_("?plural:Armenians")
groups="Ancient", "Modern", "European"
legend=_("According to legend, the Armenian people are the descendants of\
Haik - the great-great-grandson of Noah. The modern Republic of Armenia\
- gained independence from Soviet in 1991 AD")
+ gained independence from the Soviet Union in 1991.")
leader=
"Armenak",
"Ishpuinis",
diff --git a/data/nation/illyrian.ruleset b/data/nation/illyrian.ruleset
index 42fd664..6118892 100644
--- a/data/nation/illyrian.ruleset
+++ b/data/nation/illyrian.ruleset
@@ -4,13 +4,12 @@ name=_("Illyrian")
plural=_("?plural:Illyrians")
groups="Ancient", "European"
legend=_("Illyrians were Indo-European tribes who appeared in the\
- western part of the Balkan Peninsula before 1000 BC,\
- including the Dalmatians to the north,\
- Corcyra island and Ambracia bay in prehistoric Epirus to the south,\
- mixing with Thracians in Dardania to the east,\
- and settling Messapia across the Adriatic Sea.\
- Illyrian kingdoms were independent for centuries,\
- until conquered by the Roman Republic.")
+ western part of the Balkan Peninsula before 1000 BC, including\
+ Corcyra island and Ambracia bay in prehistoric Epirus to the south.\
+ They mixed with Thracians in Dardania to the east,\
+ and settled Messapia across the Adriatic Sea.\
+ Illyrian kingdoms were independent for centuries,\
+ until conquered by the Roman Republic.")
; listed from legendary founder, until conquered by romans.
; researching turns out to be annoyingly difficult due to
diff --git a/data/nation/malian.ruleset b/data/nation/malian.ruleset
index 1c115d2..58dfe40 100644
--- a/data/nation/malian.ruleset
+++ b/data/nation/malian.ruleset
@@ -6,8 +6,8 @@ groups="Modern", "Medieval", "African"
legend=_("Sub-Saharan Africa has been a cultural and ethnical melting pot\
for millennia. In medieval times, the region was home to a succession of\
empires called the Sahelian kingdoms. Of these, the Islamic Mali empire\
- with it's capital in Timbuktu was the most influential. This empire\
- reigned from the 14th to the 17th century and was famed for it's wealth and\
+ with its capital in Timbuktu was the most influential. This empire\
+ reigned from the 14th to the 17th century and was famed for its wealth and\
benevolent kings. The modern Republic of Mali derives its name from this\
empire.")
leader=
diff --git a/data/nation/mayan.ruleset b/data/nation/mayan.ruleset
index 046a78d..c163b6c 100644
--- a/data/nation/mayan.ruleset
+++ b/data/nation/mayan.ruleset
@@ -3,8 +3,8 @@
name=_("Mayan")
plural=_("?plural:Mayas")
groups="Ancient", "Medieval", "American"
-legend=_("The Mayans were a Mesoamerican civilization. Famous for building\
- great pyramids and palaces in the jungle.")
+legend=_("The Mayans were a Mesoamerican civilization. They are\
+ famous for building great pyramids and palaces in the jungle.")
leader=
"K'uk B'alam",
"Zac-Kuk",
diff --git a/data/nation/slovakian.ruleset b/data/nation/slovakian.ruleset
index 256a35f..1147886 100644
--- a/data/nation/slovakian.ruleset
+++ b/data/nation/slovakian.ruleset
@@ -23,7 +23,7 @@ flag_alt = "-" ; former CzechoSlovakia has the same flag as Czech
; - the blue triangle in it means Slovakia
city_style = "European"
ruler_titles = { "government", "male_title", "female_title"
- "Despotism", _("Leader"), _("Leader")
+ "Despotism", _("?male:Leader"), _("?female:Leader")
"Republic", _("President"), _("President")
"Democracy", _("Prime Minister"), _("Prime Minister")
"Fundamentalism", _("Pope"), _("Priestess")
diff --git a/data/nation/soviet.ruleset b/data/nation/soviet.ruleset
index 059463b..24244e2 100644
--- a/data/nation/soviet.ruleset
+++ b/data/nation/soviet.ruleset
@@ -3,12 +3,13 @@
name=_("Soviet")
plural=_("?plural:Soviets")
groups="European", "Asian"
-legend=_("Soviet Union's history starts in November 1917,\
+legend=_("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 republics integrated into one\
- country. Soviet Union became one of most powerful states in\
- the 20th century. But by the end of 1991 due to many social\
- shocks it disintegrated into fifteen independent countries")
+ country. The Soviet Union became one of most powerful states in\
+ the 20th century, but by the end of 1991 it had disintegrated\
+ into fifteen independent countries due to social and economic\
+ problems.")
leader=
"Vladimir Lenin",
"Iosif Stalin",
diff --git a/data/nation/westphalian.ruleset b/data/nation/westphalian.ruleset
index 40539c6..91a55e1 100644
--- a/data/nation/westphalian.ruleset
+++ b/data/nation/westphalian.ruleset
@@ -4,7 +4,7 @@ name=_("Westphalian")
plural=_("?plural:Westphalians")
groups="Medieval", "European"
legend=_("Westphalia, before becoming a Prussian province, was the western\
- region the duchy of Saxony. Present-day it consists of the Northern part of\
+ region of the duchy of Saxony. Today it makes up the northern part of\
the largest German federal state, North Rhine-Westphalia.")
leader =
"Widukind",
diff --git a/data/scenario/tutorial.sav b/data/scenario/tutorial.sav
index ead9365..3c8f649 100644
--- a/data/scenario/tutorial.sav
+++ b/data/scenario/tutorial.sav
@@ -87,7 +87,7 @@ view. This display shows some useful information about the city.\n\
The flag and background color indicate what civilization the city\n\
belongs to (this will be useful when you meet other civilizations).\n\
The top row of the bar also shows the name and size of the city, and\n\
-will show one or more starts to indicate if there are units in the\n\
+will show one or more stars to indicate if there are units in the\n\
city. The bottom row shows what the city is building, and how long it\n\
will take; it also shows how long the city will take to grow to the\n\
next largest size."))
@@ -145,7 +145,7 @@ only luxuries (which will not be useful until later)."))
_("Now your city has grown to size five. As cities get larger unrest\n\
becomes a problem. A city of this size will usually have one unhappy\n\
citizen unless pacifying effects are used; meaning one entertainer\n\
-specialist is required to keep your citzens content. This is basically\n\
+specialist is required to keep your citizens content. This is basically\n\
a wasted citizen.\n\
\n\
There are several things that can be done about this. One quick fix\n\
@@ -227,7 +227,7 @@ already on the map view that shows which tiles are covered by your\n\
existing cities. Generally when building new cities you want to make\n\
sure that all tiles are covered by at least one city, but after that\n\
it is best that your cities overlap as little as possible. Spreading\n\
-out cities properly gives each city access to more resrouces, allowing\n\
+out cities properly gives each city access to more resources, allowing\n\
them to grow to larger sizes."))
end
settlersbuilt = settlersbuilt + 1
diff --git a/data/themes/Makefile.in b/data/themes/Makefile.in
index 7fbb5c6..15c4fb2 100644
--- a/data/themes/Makefile.in
+++ b/data/themes/Makefile.in
@@ -192,7 +192,7 @@ RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
install-exec-recursive installdirs-recursive install-recursive \
uninstall-recursive check-recursive installcheck-recursive
DIST_COMMON = Makefile.am Makefile.in
-DIST_SUBDIRS = gui-sdl gui-gtk-2.0
+DIST_SUBDIRS = gui-gtk-2.0 gui-sdl
all: all-recursive
.SUFFIXES:
diff --git a/m4/auth.m4 b/m4/auth.m4
index 08c0313..ef90c67 100644
--- a/m4/auth.m4
+++ b/m4/auth.m4
@@ -33,20 +33,19 @@ AC_DEFUN([FC_CHECK_AUTH],
[AC_MSG_WARN([couldn't find mysql libs in normal locations]);
auth=false])
- if test x$auth = x$true ; then
+ 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"
- auth=true
AC_CHECK_LIB(mysqlclient, mysql_query,
[AUTH_LIBS="-lmysqlclient $AUTH_LIBS";
- AC_MSG_WARN([had to add $__ldpath to LDFLAGS])],
- [AC_MSG_WARN([couldn't find mysql libs in $__ldpath]);
- auth=false])
+ 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
@@ -54,6 +53,10 @@ AC_DEFUN([FC_CHECK_AUTH],
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"
diff --git a/m4/ggz.m4 b/m4/ggz.m4
index 64f7962..a5c716c 100644
--- a/m4/ggz.m4
+++ b/m4/ggz.m4
@@ -54,7 +54,7 @@ dnl
# Version number of this script.
# First part is upstream (ggz) version and second Freeciv modifications.
-# serial 0014.1
+# serial 0014.2
dnl ------------------------------------------------------------------------
dnl Find a directory containing a single file
@@ -240,7 +240,8 @@ AC_DEFUN([AC_GGZ_VERSION],
LDFLAGS=$LIBGGZ_LDFLAGS
LIBS=$LIB_GGZ
CPPFLAGS=$LIBGGZ_INCLUDES
- export LD_LIBRARY_PATH=$save_ldlibrary_path:$libggz_libraries
+ 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(
diff --git a/po/ar.gmo b/po/ar.gmo
index 1186e30..c4556ee 100644
Binary files a/po/ar.gmo and b/po/ar.gmo differ
diff --git a/po/ar.po b/po/ar.po
index 93b3c11..04cb55f 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ar\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 07:45+0900\n"
+"POT-Creation-Date: 2009-03-29 21:13+0900\n"
"PO-Revision-Date: 2007-08-10 18:00+0300\n"
"Last-Translator: Ahmad M. Zawawi <zeus_go64 at yahoo.com>\n"
"Language-Team: Arabic <freeciv-i18n at freeciv.org>\n"
@@ -636,7 +636,7 @@ msgid "Road"
msgstr "طريق"
#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
-#: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
+#: client/gui-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"
@@ -653,7 +653,7 @@ msgid "Mine"
msgstr "منجم"
#: common/terrain.c:396 common/unit.c:548 server/report.c:124
-#: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
+#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr "تلوث"
@@ -699,7 +699,7 @@ msgstr "متØصن"
msgid "Sentry"
msgstr "Øرس"
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:851 client/gui-sdl/menu.c:648
+#: common/unit.c:566 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 "اسرق"
@@ -716,7 +716,7 @@ msgstr "استكشÙ"
msgid "Transform"
msgstr "تØول"
-#: common/unit.c:584 client/text.c:106 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:584 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 "مجهول"
@@ -789,11 +789,11 @@ msgstr "نووي"
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1406
+#: common/unittype.c:349 client/helpdata.c:1404
msgid " and "
msgstr "Ùˆ"
-#: common/unittype.c:355 client/helpdata.c:1392
+#: common/unittype.c:355 client/helpdata.c:1390
msgid "?and:, "
msgstr "?مع:, "
@@ -1411,104 +1411,99 @@ msgstr ""
#: server/auth.c:281
#, fuzzy, c-format
-msgid "Auth config filename \"%s\" not allowed!"
-msgstr "ذلك الاسم غير مسموØ."
-
-#: server/auth.c:286
-#, fuzzy, c-format
msgid "Cannot load auth config file \"%s\"!"
msgstr "Ùشل العثور على مل٠الصوت %s"
-#: server/auth.c:397
+#: server/auth.c:392
#, c-format
msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
msgstr "تØذير: تم أخذ اسم الضي٠'%s' ØŒ جاري إعادة التسمية إلى المستخدم '%s'."
-#: server/auth.c:404
+#: server/auth.c:399
msgid "Guests are not allowed on this server. Sorry."
msgstr "الضيو٠غير Ù…Ø³Ù…ÙˆØ Ø¨Ù‡Ù… على هذا الخادم. آسÙ."
-#: server/auth.c:406
+#: server/auth.c:401
#, c-format
msgid "%s was rejected: Guests not allowed."
msgstr "تم رÙض %s: الضيو٠غير Ù…Ø³Ù…ÙˆØ Ø¨Ù‡Ù…."
-#: server/auth.c:425
+#: server/auth.c:420
#, c-format
msgid ""
"There was an error reading the user database, logging in as guest connection "
"'%s'."
msgstr "خطأ قراءة قاعدة معلومات المستخدمين، جاري الدخول كاتصال الضي٠'%s'."
-#: server/auth.c:431
+#: server/auth.c:426
msgid ""
"There was an error reading the user database and guest logins are not "
"allowed. Sorry"
msgstr "خطأ قراءة قاعدة معلومات المستخدمين والدخول للضيو٠غير Ù…Ø³Ù…ÙˆØ Ø¨Ù‡. متأسÙ"
-#: server/auth.c:434
+#: server/auth.c:429
#, c-format
msgid "%s was rejected: Database error and guests not allowed."
msgstr "تم رÙض %s: خطأ قاعدة المعلومات والضيو٠غير Ù…Ø³Ù…ÙˆØ Ø¨Ù‡Ù…."
-#: server/auth.c:441
+#: server/auth.c:436
#, c-format
msgid "Enter password for %s:"
msgstr "إدخال كلمة السر ل %s:"
-#: server/auth.c:450
+#: server/auth.c:445
msgid "Enter a new password (and remember it)."
msgstr "إدخال كلمة سر جديدة (وتذكرها)."
-#: server/auth.c:456
+#: server/auth.c:451
msgid "This server allows only preregistered users. Sorry."
msgstr "آسÙØŒ هذا الخادم ÙŠØ³Ù…Ø Ùقط المستخدمين المسجلين مسبقا."
-#: server/auth.c:459
+#: server/auth.c:454
#, c-format
msgid "%s was rejected: Only preregister users allowed."
msgstr "تم رÙض %s: ÙŠØ³Ù…Ø Ùقط بالمستخدمين المسجلين مسبقا."
-#: server/auth.c:488 server/auth.c:547
+#: server/auth.c:483 server/auth.c:542
msgid "Sorry, too many wrong tries..."
msgstr "آسÙØŒ Ù…Øاولات خاطئة كثيرة..."
-#: server/auth.c:489
+#: server/auth.c:484
#, c-format
msgid "%s was rejected: Too many wrong password verifies for new user."
msgstr "تم رÙض %s: Ù…Øاولات التØقق من كلمة السر خاطئة وكثيرة لمستخدم جديد."
-#: server/auth.c:505
+#: server/auth.c:500
msgid ""
"Warning: There was an error in saving to the database. Continuing, but your "
"stats will not be saved."
msgstr ""
"تØذير: Ùشل الØÙظ ÙÙŠ قاعدة المعلومات. سيتم الاستمرار، ولكن لن تØÙظ اØصائياتك."
-#: server/auth.c:549
+#: server/auth.c:544
#, c-format
msgid "%s was rejected: Too many wrong password tries."
msgstr "تم رÙض %s: Ù…Øاولات دخول خاطئة كثيرة."
-#: server/auth.c:558
+#: server/auth.c:553
msgid "Your password is incorrect. Try again."
msgstr "كلمة السر غير صØÙŠØØ©. Øاول مرة أخرى."
-#: server/auth.c:569
+#: server/auth.c:564
msgid "Sorry, your connection timed out..."
msgstr "متأسÙØŒ اتصالك انÙصل بعد عدم الاستخدام..."
-#: server/auth.c:571
+#: server/auth.c:566
#, c-format
msgid "%s was rejected: Connection timeout waiting for password."
msgstr "تم رÙض %s: انتهت مدة الخروج للاتصال بينما جاري الانتظار لكلمة السر."
-#: server/auth.c:636
+#: server/auth.c:631
#, c-format
msgid "Your password is too short, the minimum length is %d. Try again."
msgstr "كلمة السر قصيرة جدا، أقل طول هو %d. Øاول مرة أخرى."
-#: server/auth.c:642
+#: server/auth.c:637
#, c-format
msgid ""
"The password must have at least %d capital letters, %d numbers, and be at "
@@ -2012,7 +2007,7 @@ msgstr "هذا هو الخادم ل %s"
msgid "You can learn a lot about Freeciv at %s"
msgstr "يمكنك تعلم الكثير عن برنامج Freeciv على %s"
-#: server/civserver.c:206 client/civclient.c:237 manual/civmanual.c:380
+#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
@@ -2040,14 +2035,14 @@ msgstr " -N --Newusers\tØ§Ù„Ø³Ù…Ø§Ø Ù„Ù…ØªØ³Ø®Ø¯Ù…ÙŠÙ† جدد بالدخول
msgid " -b --bind ADDR\tListen for clients on ADDR\n"
msgstr " -b --bind ADDR\tانتظار العملاء على العنوان ADDR\n"
-#: server/civserver.c:217 client/civclient.c:241
+#: server/civserver.c:217 client/civclient.c:242
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:245
+#: server/civserver.c:221 client/civclient.c:246
msgid " -d, --debug NUM\tSet debug log level (0 to 3)\n"
msgstr " -d, --debug NUM\tتØديد مستوى سجل Ø§Ù„ØªÙ†Ù‚ÙŠØ (0 إلى 3)\n"
@@ -2055,7 +2050,7 @@ msgstr " -d, --debug NUM\tتØديد مستوى سجل Ø§Ù„ØªÙ†Ù‚ÙŠØ (0 إلى
msgid " -f, --file FILE\tLoad saved game FILE\n"
msgstr " -f, --file FILE\tتØميل اللعبة المØÙوظة ÙÙŠ FILE\n"
-#: server/civserver.c:225 client/civclient.c:248 manual/civmanual.c:382
+#: server/civserver.c:225 client/civclient.c:249 manual/civmanual.c:382
msgid " -h, --help\t\tPrint a summary of the options\n"
msgstr " -h, --help\t\tطباعة ملخص عن الخيارات\n"
@@ -2104,11 +2099,11 @@ msgstr " -r, --read FILE\tقراءة سكربت البداية FILE\n"
msgid " -R, --Ranklog FILE\tUse FILE as ranking logfile\n"
msgstr " -R, --Ranklog FILE\tاستعمال FILE كمل٠سجل تصني٠الرتب\n"
-#: server/civserver.c:247 client/civclient.c:267 manual/civmanual.c:383
+#: server/civserver.c:247 client/civclient.c:268 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:279
+#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, fuzzy, c-format
@@ -3281,7 +3276,7 @@ msgid "Sea moving start units are not yet supported. Nobody gets %s."
msgstr ""
"الوØدات البØرية البادئة غير مدعومة Øتى اﻵن, لا يستطيع أي Ø£Øد الØصول على %s."
-#: server/gamehand.c:310 client/text.c:632
+#: server/gamehand.c:310 client/text.c:691
#, c-format
msgid "Year: %s"
msgstr "السنة: %s"
@@ -3556,10 +3551,10 @@ msgid "Could not throw %s into civil war - no available nations"
msgstr "لا يمكن اشعال الØرب الأهلية ÙÙŠ %s - لوجود لاعبيين كثر"
#: server/plrhand.c:1686
-#, c-format
+#, fuzzy, c-format
msgid ""
-"Your nation is thrust into civil war, %s is declared the leader of the "
-"rebel states."
+"Your nation is thrust into civil war! %s is declared the leader of the rebel "
+"states."
msgstr "أمتك ÙÙŠ Øرب أهلية تØت قيادة %s للولايات الثائرة."
#: server/plrhand.c:1707
@@ -3657,7 +3652,7 @@ msgstr "سرعة البØØ« العلمي"
msgid "Literacy"
msgstr "معرÙØ© القراءة والكتابة"
-#: server/report.c:121 client/cityrepdata.c:526 client/cityrepdata.c:527
+#: server/report.c:121 client/cityrepdata.c:524 client/cityrepdata.c:525
#: client/gui-sdl/cityrep.c:174
msgid "Production"
msgstr "انتاج"
@@ -3812,7 +3807,7 @@ msgstr ""
"تØتوي السلسلة الØرÙية للديمغراÙيا على Ø£Øر٠غير صØÙŠØØ©. جرّب \"help demography"
"\"."
-#: server/report.c:743 server/report.c:766
+#: server/report.c:743 server/report.c:768
msgid "Demographics Report:"
msgstr "تقرير الديمغراÙية:"
@@ -3820,10 +3815,12 @@ msgstr "تقرير الديمغراÙية:"
msgid "Sorry, the Demographics report is unavailable."
msgstr "آسÙØŒ تقرير الديمغراÙية غير متوÙر."
-#: server/report.c:748
-#, c-format
-msgid "The %s of the %s (%s)"
-msgstr "ال %s من %s (%s)"
+#. TRANS: <nation adjective> <government name> (<year>).
+#. * E.g. "Polish Despotism (200 AD)".
+#: server/report.c:750
+#, fuzzy, c-format
+msgid "%s %s (%s)"
+msgstr "%s ÙÙŠ %s (%s)\n"
#. TRANS: message about an installation error.
#: server/ruleset.c:163
@@ -3879,15 +3876,6 @@ msgstr ""
msgid "%s had invalid nation; changing to %s."
msgstr ""
-#. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4073
-#, fuzzy, c-format
-msgid ""
-"Illegal alliance structure detected: %s alliance to %s reduced to peace "
-"treaty."
-msgstr ""
-"تم الكش٠عن هيكل تØال٠غير قانوني: تم تخÙيض تØال٠%sمع %s إلى معاهدة سلام."
-
#: server/settings.c:32
msgid "Geological"
msgstr "جيولوجي"
@@ -4987,9 +4975,10 @@ msgid "Auto-save name prefix"
msgstr "بادئة اسم الØÙظ التلقائي"
#: server/settings.c:1016
+#, fuzzy
msgid ""
-"Automatically saved games will have name \"<prefix><year>.sav\". This "
-"setting sets the <prefix> part."
+"Automatically saved games will have name \"<prefix>-T<turn>-Y<year>.sav\". "
+"This setting sets the <prefix> part."
msgstr ""
"يكون اسم اللعب المØÙوظة تلقائيا على شكل \"<البادئة><السنة>.sav\". ÙŠØدد هذا "
"الاعداد جزء <البادئة>."
@@ -5006,11 +4995,11 @@ msgid ""
"the game."
msgstr "إذا دوران هذه."
-#: server/sernet.c:147
+#: server/sernet.c:150
msgid "Server cannot read standard input. Ignoring input."
msgstr "Ùشل قراءة الخادم للادخال القياسي.جاري إهمال الادخال."
-#: server/sernet.c:922
+#: server/sernet.c:929
#, c-format
msgid "Server: bad address: [%s:%d]."
msgstr "الخادم: العنوان سيء: [%s:%d]."
@@ -5129,112 +5118,112 @@ msgid ""
"alliance with both."
msgstr "أعلن زميلك ÙÙŠ الÙريق %s الØرب على %s. أنت مجبر أن تلغي تØالÙÙƒ مع %s."
-#: server/srv_main.c:928
+#: server/srv_main.c:961
#, c-format
msgid "Failed saving game as %s"
msgstr "Ùشل ØÙظ اللعبة Ùƒ %s"
-#: server/srv_main.c:930
+#: server/srv_main.c:963
#, c-format
msgid "Game saved as %s"
msgstr "تم ØÙظ اللعبة Ùƒ %s"
-#: server/srv_main.c:962
+#: server/srv_main.c:994
msgid "The game is already running."
msgstr "اللعبة أصلا شغالة."
-#: server/srv_main.c:970
+#: server/srv_main.c:1002
#, c-format
msgid "%s lost control cmdlevel on game start. Use voting from now on."
msgstr "Ùقد %s سيطرة cmdlevel عند بداية اللعبة. استخدم التصويت من اﻵن Ùصاعدا."
-#: server/srv_main.c:977
+#: server/srv_main.c:1009
msgid "Starting game."
msgstr "جاري بدء اللعبة."
-#: server/srv_main.c:1039
+#: server/srv_main.c:1071
#, c-format
msgid "request for unknown report (type %d)"
msgstr "طلب لتقرير مجهول (نوع %d)"
-#: server/srv_main.c:1104
+#: server/srv_main.c:1136
#, c-format
msgid "Warning: rejecting old client %s"
msgstr "تØذير: جاري رÙض عميل قديم %s"
-#: server/srv_main.c:1206
+#: server/srv_main.c:1238
#, c-format
msgid "Got a packet of type %d from a dead or observer player"
msgstr "Øصلت على Øزمة من النوع %d من لاعب ميت أو مراقب"
-#: server/srv_main.c:1306
+#: server/srv_main.c:1338
msgid "Please choose a non-blank name."
msgstr "الرجاء إختيار اسم بدون Ùراغات."
-#: server/srv_main.c:1322
+#: server/srv_main.c:1354
msgid "That nation is already in use."
msgstr "هذه الأمة أصلا مستعملة."
-#: server/srv_main.c:1338
+#: server/srv_main.c:1370
#, c-format
msgid "Another player already has the name '%s'. Please choose another name."
msgstr "عند لاعب آخر أصلا هذا الاسم '%s'. الرجاء اختيار اسم آخر."
-#: server/srv_main.c:1359
+#: server/srv_main.c:1391
msgid "Please choose a name containing only ASCII characters."
msgstr "الرجاء اختيار اسم ÙŠØتوي على Ø£Øر٠ASCII Ùقط."
-#: server/srv_main.c:1458
+#: server/srv_main.c:1490
#, c-format
msgid "%s nation is not available in this scenario."
msgstr "الأمة %s غير متوÙرة ÙÙŠ هذا السيناريو."
-#: server/srv_main.c:1464
+#: server/srv_main.c:1496
#, c-format
msgid "%s nation is already in use."
msgstr "الأمة %s أصلا مستعملة."
-#: server/srv_main.c:1482
+#: server/srv_main.c:1514
#, c-format
msgid "%s is the %s ruler %s."
msgstr "%s Øاكم %s على %s."
-#: server/srv_main.c:1538
+#: server/srv_main.c:1570
#, c-format
msgid "Waiting to start game: %d out of %d players are ready to start."
msgstr "جاري الانتظار لبدء اللعبة، %d من %d لاعب جاهز لبدء اللعب."
-#: server/srv_main.c:1582 server/srv_main.c:1586
+#: server/srv_main.c:1614 server/srv_main.c:1618
#, c-format
msgid "%s has been added as %s level AI-controlled player."
msgstr "تم إضاÙØ© %s كلاعب ذكاء اصتناعي من مستوى %s."
-#: server/srv_main.c:1728
+#: server/srv_main.c:1760
#, c-format
msgid "Player %d"
msgstr "اللاعب %d"
-#: server/srv_main.c:1739 server/srv_main.c:1745
+#: server/srv_main.c:1771 server/srv_main.c:1777
#, c-format
msgid "%s rules the %s."
msgstr "%s ÙŠØكم %s."
-#: server/srv_main.c:1910
+#: server/srv_main.c:1942
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
msgstr ""
-#: server/srv_main.c:1961
+#: server/srv_main.c:1993
#, c-format
msgid "Sending info to metaserver [%s]"
msgstr "جاري إرسال المعلومات إلى metaserver [%s]"
-#: server/srv_main.c:1992
+#: server/srv_main.c:2024
msgid "The game is over..."
msgstr "انتهت اللعبة..."
-#: server/srv_main.c:2205
+#: server/srv_main.c:2237
msgid "Now accepting new client connections."
msgstr "جاري اﻵن استقبال اتصالات عملاء جدد."
@@ -6036,24 +6025,24 @@ msgid "Barbarian"
msgstr "بربري"
#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2030 client/gui-sdl/plrdlg.c:645
+#: client/gui-gtk-2.0/pages.c:2102 client/gui-sdl/plrdlg.c:645
#: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
msgid "AI"
msgstr "ذكاء اصطناعي"
#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
+#: client/gui-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
msgid "Human"
msgstr "انساني"
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
-#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
+#: 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
msgid "Alive"
msgstr "ØÙŠ"
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
#: client/gui-win32/connectdlg.c:200
msgid "Dead"
msgstr "ميت"
@@ -6306,9 +6295,9 @@ 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:242
-#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
-#: client/text.c:1201
+#: 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
#, c-format
msgid "?clistmore:, %s"
msgstr ", %s"
@@ -6557,7 +6546,7 @@ msgstr "يستطيع %s Ùقط الهجوم من البØر."
msgid "Cannot attack from sea."
msgstr "لا تستطيع الهجوم من البØر."
-#: server/unithand.c:996 server/unittools.c:2103
+#: server/unithand.c:996 server/unittools.c:2137
msgid "Cannot attack unless you declare war first."
msgstr "لا تستطيع الهجوم إلا بعد إعلانك الØرب أولا."
@@ -6656,101 +6645,101 @@ msgid "%s was upgraded for free to %s."
msgstr "تم تطوير %s مجانيا إلى %s."
#: server/unittools.c:297
-#, c-format
-msgid "Not enough gold. %s disbanded"
+#, fuzzy, c-format
+msgid "Not enough gold to pay upkeep for %s. Unit disbanded."
msgstr "الذهب غير كاÙÙŠ. تم ØªØ³Ø±ÙŠØ %s"
-#: server/unittools.c:342
+#: server/unittools.c:343
#, c-format
msgid "Your %s has run out of hit points."
msgstr "لقد انتهت نقاط تØمل ÙˆØدتك %s ."
-#: server/unittools.c:358
+#: server/unittools.c:359
#, c-format
msgid "Your %s has been lost on the high seas."
msgstr "تم Ùقد %s ÙÙŠ البØر الهائج."
-#: server/unittools.c:365
+#: server/unittools.c:366
#, c-format
msgid "Your %s survived on the high seas and became more experienced!"
msgstr "نجت ÙˆØدتك %s الأمواج العارمة وأصبØت أكثر خبرة!"
-#: server/unittools.c:376
+#: server/unittools.c:377
#, c-format
msgid "Your %s has been lost on unsafe terrain."
msgstr "تم Ùقد %s على تضاريص خطرة."
-#: server/unittools.c:430
+#: server/unittools.c:431
#, c-format
msgid "Your %s has returned to refuel."
msgstr "رجعت ÙˆØدتك %s للتزود بالوقود."
-#: server/unittools.c:454
+#: server/unittools.c:455
#, c-format
msgid "Your %s has run out of fuel."
msgstr "انتهي الوقود لوØدتك %s."
-#. TRANS: And, <the unit> became ...
-#: server/unittools.c:616
-#, fuzzy
-msgid "And, became more experienced!"
-msgstr " أكثر خبرة!"
-
#. TRANS: Your <unit> became ...
-#: server/unittools.c:620
+#: server/unittools.c:619
#, c-format
msgid "Your %s became more experienced!"
msgstr "أصبØت ÙˆØدتك %s أكثر خبرة!"
-#: server/unittools.c:1011
+#: server/unittools.c:1009
#, c-format
msgid "Teleported your %s to %s."
msgstr "تم نقل %s إلى %s."
-#: server/unittools.c:1041
+#. TRANS: A unit is moved to resolve stack conflicts.
+#: server/unittools.c:1065
+#, fuzzy, c-format
+msgid "Moved your %s."
+msgstr "تم ØªØ³Ø±ÙŠØ ÙˆØدتك %s."
+
+#: server/unittools.c:1076
#, c-format
msgid "Disbanded your %s."
msgstr "تم ØªØ³Ø±ÙŠØ ÙˆØدتك %s."
-#: server/unittools.c:1363
+#: server/unittools.c:1397
#, c-format
msgid "Unable to defend %s, %s has lost the game."
msgstr "لا يمكن الدÙاع عن %sØŒ خسر %s اللعبة."
-#: server/unittools.c:1367
+#: server/unittools.c:1401
#, c-format
msgid "Losing %s meant losing the game! Be more careful next time!"
msgstr "تعني خسارة %s خسارة اللعبة! كل Øذرا ÙÙŠ المرة القادمة!"
-#: server/unittools.c:1469
+#: server/unittools.c:1503
#, c-format
msgid "%s escaped the destruction of %s, and fled to %s."
msgstr "هرب %s من دمار %s إلى %s."
-#: server/unittools.c:1478
+#: server/unittools.c:1512
#, c-format
msgid "%s lost when %s was lost."
msgstr "خسر %s عند خسارة %s."
-#: server/unittools.c:1527
+#: server/unittools.c:1561
#, c-format
msgid "Barbarian leader captured, %d gold ransom paid."
msgstr "تم القبض على القائد البربري، ودÙع Ùدية ذهب بقيمة %d."
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unittools.c:1545
+#: server/unittools.c:1579
#, fuzzy, c-format
msgid "Your attacking %s succeeded against the %s %s!"
msgstr "نجØت ÙˆØدتك المهاجمة %s ضد %s %s!"
#. TRANS: "Cannon ... the Polish Destroyer."
-#: server/unittools.c:1554 server/unittools.c:1612
+#: server/unittools.c:1588 server/unittools.c:1646
#, 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:1588
+#: server/unittools.c:1622
#, fuzzy, c-format
msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
msgid_plural ""
@@ -6761,14 +6750,14 @@ msgstr[2] "نجØت ÙˆØدتك المهاجمة %s ضد %s %s (Ùˆ %d ÙˆØدات
#. TRANS: "Cannon lost when the Polish Destroyer
#. * attacked the German Musketeers."
-#: server/unittools.c:1621
+#: server/unittools.c:1655
#, 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:1636
+#: server/unittools.c:1670
#, fuzzy, c-format
msgid "%s (and %s) lost to an attack from the %s %s."
msgstr "تم Ùقد %s (Ùˆ %s) عند هجوم من %s %s."
@@ -6776,7 +6765,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:1646
+#: server/unittools.c:1680
#, 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."
@@ -6787,7 +6776,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:1660
+#: server/unittools.c:1694
#, 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."
@@ -6795,187 +6784,187 @@ msgstr[0] "خسارة %d ÙˆØدة عندما هاجم %s %s ال %s %s."
msgstr[1] "خسارة %d ÙˆØدتان عندما هاجم %s %s ال %s %s."
msgstr[2] "خسارة %d ÙˆØدات عندما هاجم %s %s ال %s %s."
-#: server/unittools.c:1928
+#: server/unittools.c:1962
#, c-format
msgid "Your %s was nuked by %s."
msgstr "تم قص٠وØدتك %s Ø¨Ø§Ù„Ø³Ù„Ø§Ø Ø§Ù„Ù†ÙˆÙˆÙŠ من قبل %s."
-#: server/unittools.c:1931 server/unittools.c:1947
+#: server/unittools.c:1965 server/unittools.c:1981
msgid "yourself"
msgstr "Ù†Ùسك"
-#: server/unittools.c:1935
+#: server/unittools.c:1969
#, fuzzy, c-format
msgid "The %s %s was nuked."
msgstr "تم قص٠وØدة %s %s Ø¨Ø§Ù„Ø³Ù„Ø§Ø Ø§Ù„Ù†ÙˆÙˆÙŠ."
-#: server/unittools.c:1944
+#: server/unittools.c:1978
#, c-format
msgid "%s was nuked by %s."
msgstr "تم قص٠%s Ø¨Ø§Ù„Ø³Ù„Ø§Ø Ø§Ù„Ù†ÙˆÙˆÙŠ من قبل %s."
-#: server/unittools.c:1952
+#: server/unittools.c:1986
#, c-format
msgid "You nuked %s."
msgstr "لقد قصÙت %s Ø¨Ø§Ù„Ø³Ù„Ø§Ø Ø§Ù„Ù†ÙˆÙˆÙŠ."
-#: server/unittools.c:1993
+#: server/unittools.c:2027
#, fuzzy, c-format
msgid "The %s detonated a nuke!"
msgstr "Ùجر %s سلاØا نوويا!"
-#: server/unittools.c:2017
+#: server/unittools.c:2051
#, c-format
msgid "%s transported successfully."
msgstr "تم نقل %s بنجاØ."
-#: server/unittools.c:2069
+#: server/unittools.c:2103
msgid "This unit type can not be paradropped."
msgstr "لا يمكن اسقاط نوع هذه الوØدة بالمظلة."
-#: server/unittools.c:2079
+#: server/unittools.c:2113
#, fuzzy
msgid "You cannot paradrop a unit that is transporting other units."
msgstr "لا تستطيع اسقاط ÙˆØدة منقولة بالمظلة."
-#: server/unittools.c:2085
+#: server/unittools.c:2119
msgid "The destination location is not known."
msgstr "موقع الاتجاه مجهول."
-#: server/unittools.c:2092
+#: server/unittools.c:2126
#, c-format
msgid "This unit cannot paradrop into %s."
msgstr "لا تستطيع اسقاط هذه الوØدة بالمظلة على %s."
-#: server/unittools.c:2112
+#: server/unittools.c:2146
#, c-format
msgid "The distance to the target (%i) is greater than the unit's range (%i)."
msgstr "المساÙØ© إلى الهد٠(%i) أكبر من مدى تØرك الوØدة (%i)."
-#: server/unittools.c:2123
+#: server/unittools.c:2157
#, c-format
msgid "Your %s paradropped into the %s and was lost."
msgstr "تم اسقاط ÙˆØدتك %s بالمظلة على %sØŒ ÙˆÙقدانها."
-#: server/unittools.c:2136
+#: server/unittools.c:2170
#, c-format
msgid "Your %s was killed by enemy units at the paradrop destination."
msgstr "تم قتل ÙˆØدتك %s من قبل ÙˆØدات العدو عند موقع اسقاط المظليين."
-#: server/unittools.c:2158
+#: server/unittools.c:2192
#, c-format
msgid "You found %d gold."
msgstr "لقد عثرت على %d من الذهب."
-#: server/unittools.c:2175
+#: server/unittools.c:2209
#, c-format
msgid "You found %s in ancient scrolls of wisdom."
msgstr "لقد عثرت على %s ÙÙŠ مخطوطات قديمة للØكمة."
-#: server/unittools.c:2182
+#: server/unittools.c:2216
#, c-format
msgid "The %s have acquired %s from ancient scrolls of wisdom."
msgstr "Øصل %s على %s من مخطوطات Øكمة قديمة."
-#: server/unittools.c:2196
+#: server/unittools.c:2230
msgid "A band of friendly mercenaries joins your cause."
msgstr "تنضم زمرة من المرتزقة إلى قضيتك."
-#: server/unittools.c:2214
+#: server/unittools.c:2248
msgid "An abandoned village is here."
msgstr "توجد قرية مهجورة هنا."
-#: server/unittools.c:2224
+#: server/unittools.c:2258
msgid "You have unleashed a horde of barbarians!"
msgstr "لقد أطلقت العنان Ù„Øشود من البرابرة!"
-#: server/unittools.c:2227
+#: server/unittools.c:2261
#, c-format
msgid "Your %s has been killed by barbarians!"
msgstr "تم قتل ÙˆØدتك %s من قبل البرابرة!"
-#: server/unittools.c:2243
+#: server/unittools.c:2277
msgid "You found a friendly city."
msgstr "لقد عثرت على مدينة صديقة."
-#: server/unittools.c:2257
+#: server/unittools.c:2291
msgid "Friendly nomads are impressed by you, and join you."
msgstr "أعجب بدو وديون بك، وانضموا إليك."
-#: server/unittools.c:2282
+#: server/unittools.c:2316
#, fuzzy
msgid "Your overflight frightens the tribe; they scatter in terror."
msgstr "ملكك."
-#: server/unittools.c:2540
+#: server/unittools.c:2574
#, c-format
msgid "Orders for %s aborted after enemy movement was spotted."
msgstr "تم الغاء الأوامر Ù„ %s بعد اكتشا٠تØرك للعدو."
-#: server/unittools.c:2989
+#: server/unittools.c:3023
#, c-format
msgid "Orders for %s aborted as there are units nearby."
msgstr "تم الغاء الأوامر Ù„ %s عن العمل لوجود ÙˆØدات قريبة."
-#: server/unittools.c:3041
+#: server/unittools.c:3075
#, c-format
msgid "Orders for %s aborted because building of city failed."
msgstr "تم الغاء الأوامر Ù„ %s عن العمل Ù„Ùشل بناء مدينة."
-#: server/unittools.c:3054
+#: server/unittools.c:3088
#, c-format
msgid "Orders for %s aborted since they give an invalid activity."
msgstr "تم الغاء الأوامر ل %s عن العمل لاعطائهم نشاط خاطئ."
-#: server/unittools.c:3068
+#: server/unittools.c:3102
#, c-format
msgid "Orders for %s aborted since they give an invalid location."
msgstr "تم الغاء الأوامر ل %s عن العمل لاعطائهم موقع خاطئ."
-#: server/unittools.c:3078
+#: server/unittools.c:3112
#, c-format
msgid "Orders for %s aborted as there are units in the way."
msgstr "تم الغاء الأوامر Ù„ %s عن العمل لوجود ÙˆØدات على الطريق."
-#: server/unittools.c:3104
+#: server/unittools.c:3138
#, c-format
msgid "Orders for %s aborted because of failed move."
msgstr "تم الغاء الأوامر Ù„ %s عن العمل Ù„Øركة Ùاشلة."
-#: server/unittools.c:3145
+#: server/unittools.c:3179
#, c-format
msgid "Attempt to change homecity for %s failed."
msgstr "Ùشل Ù…Øاولة تغيير مدينة المنشأ Ù„ %s."
-#: server/unittools.c:3156
+#: server/unittools.c:3190
#, c-format
msgid "Attempt to establish trade route for %s failed."
msgstr "Ùشل Ù…Øاولة انشاء طريق للتجارة Ù„ %s."
-#: server/unittools.c:3168
+#: server/unittools.c:3202
#, c-format
msgid "Attempt to build wonder for %s failed."
msgstr "Ùشل Ù…Øاولة بناء أعجوبة Ù„ %s."
-#: server/unittools.c:3177
+#: server/unittools.c:3211
#, c-format
msgid "Your %s has invalid orders."
msgstr "لدى ÙˆØدتك %s أوامر خاطئة."
-#: server/generator/mapgen.c:1737
+#: server/generator/mapgen.c:1771
msgid "High landmass - this may take a few seconds."
msgstr "كتلة أرض عالية - هذا سيأخد بعض الثواني."
-#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
+#: server/generator/mapgen.c:1969 server/generator/mapgen.c:2039
#, c-format
msgid "Falling back to generator %d."
msgstr "جاري الرجوع إلى المولد %d."
-#: server/generator/mapgen.c:2025
+#: server/generator/mapgen.c:2059
msgid "Generator 3 didn't place all big islands."
msgstr "لم يضع المولّد 3 كل الجزر الكبيرة."
-#: server/generator/mapgen.c:2054
+#: server/generator/mapgen.c:2088
#, c-format
msgid "Generator 3 left %li landmass unplaced."
msgstr "ترك المولّد 3 %li كتل أرضية بدون مكان."
@@ -7079,7 +7068,7 @@ msgstr[0] "%3d دور"
msgstr[1] "%3d دوران"
msgstr[2] "%3d أدوار"
-#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:631
#: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
@@ -7198,350 +7187,350 @@ msgstr "?city_state:السلام"
msgid "(worklist)"
msgstr "(قائمة العمل)"
-#: client/cityrepdata.c:447
-msgid "Special"
-msgstr "خاص"
-
-#: client/cityrepdata.c:448
-msgid "?entertainers/scientists/taxmen:E/S/T"
-msgstr "?entertainers/scientists/taxmen:ه/ع/ج"
+#: client/cityrepdata.c:446
+msgid "?city:Name"
+msgstr "?city:الاسم"
-#: client/cityrepdata.c:449
-msgid "Entertainers, Scientists, Taxmen"
-msgstr "الهزليون،العلماء،جباة الضريبة"
+#: client/cityrepdata.c:446 client/gui-sdl/cityrep.c:169
+msgid "City Name"
+msgstr "اسم المدينة"
-#: client/cityrepdata.c:452
+#: client/cityrepdata.c:448
#, fuzzy
-msgid "Concise + Rapture, - Disorder"
-msgstr "دقيق + نشوة الطرب, - Ùوضى"
+msgid "?size [short]:Sz"
+msgstr "الØجم"
+
+#: client/cityrepdata.c:448
+msgid "Size"
+msgstr "الØجم"
-#: client/cityrepdata.c:454 client/plrdlg_common.c:261
+#: client/cityrepdata.c:450 client/plrdlg_common.c:261
#: client/gui-win32/plrdlg.c:337
msgid "State"
msgstr "الØالة"
-#: client/cityrepdata.c:454
+#: client/cityrepdata.c:450
msgid "Rapture/Peace/Disorder"
msgstr "نشوة الطرب/السلام/الÙوضى"
+#: client/cityrepdata.c:452
+#, fuzzy
+msgid "Concise *=Rapture, X=Disorder"
+msgstr "دقيق + نشوة الطرب, - Ùوضى"
+
+#: client/cityrepdata.c:456
+msgid "Special"
+msgstr "خاص"
+
#: client/cityrepdata.c:457
+msgid "?entertainers/scientists/taxmen:E/S/T"
+msgstr "?entertainers/scientists/taxmen:ه/ع/ج"
+
+#: client/cityrepdata.c:458
+msgid "Entertainers, Scientists, Taxmen"
+msgstr "الهزليون،العلماء،جباة الضريبة"
+
+#: client/cityrepdata.c:461
msgid "?Happy workers:H"
msgstr "?Happy workers:س"
-#: client/cityrepdata.c:457
+#: client/cityrepdata.c:461
msgid "Workers: Happy"
msgstr "العمال: سعيدون"
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
msgid "?Content workers:C"
msgstr "?Content workers:ر"
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
msgid "Workers: Content"
msgstr "العمال: راضون"
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
msgid "?Unhappy workers:U"
msgstr "?Unhappy workers:ت"
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
msgid "Workers: Unhappy"
msgstr "العمال: تعيسون"
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
msgid "?Angry workers:A"
msgstr "?Angry workers:غ"
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
msgid "Workers: Angry"
msgstr "العمال: غاطبون"
-#: client/cityrepdata.c:465 client/gui-xaw/citydlg.c:2401
-#: data/default/units.ruleset:238
-msgid "Workers"
+#: client/cityrepdata.c:469 client/gui-xaw/citydlg.c:2402
+#, fuzzy
+msgid "?city:Workers"
msgstr "العمال"
-#: client/cityrepdata.c:466
+#: client/cityrepdata.c:470
msgid "?happy/content/unhappy/angry:H/C/U/A"
msgstr "?happy/content/unhappy/angry:س/ر/ت/غ"
-#: client/cityrepdata.c:467
+#: client/cityrepdata.c:471
msgid "Workers: Happy, Content, Unhappy, Angry"
msgstr "العمال: سعيدون, راضون, تعساء, غاطبون"
-#: client/cityrepdata.c:470 client/cityrepdata.c:472
+#: client/cityrepdata.c:474 client/cityrepdata.c:476
msgid "Best"
msgstr "Ø£Ùضل"
-#: client/cityrepdata.c:470
+#: client/cityrepdata.c:474
msgid "attack"
msgstr "الهجوم"
-#: client/cityrepdata.c:471
+#: client/cityrepdata.c:475
msgid "Best attacking units"
msgstr "Ø£Ùضل الوØدات الهجومية"
-#: client/cityrepdata.c:472
+#: client/cityrepdata.c:476
msgid "defense"
msgstr "الدÙاع"
-#: client/cityrepdata.c:473
+#: client/cityrepdata.c:477
msgid "Best defending units"
msgstr "Ø£Ùضل الوØدات الدÙاعية"
-#: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
-#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
-#: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
-#: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
-#: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
-#: client/gui-win32/menu.c:351 client/gui-win32/repodlgs.c:616
-#: client/gui-win32/repodlgs.c:707 client/gui-win32/repodlgs.c:716
-#: client/gui-xaw/menu.c:157 client/gui-xaw/menu.c:219
-#: client/gui-xaw/menu.c:242 client/gui-xaw/repodlgs.c:881
-#: client/gui-xaw/repodlgs.c:1069 data/Freeciv.in:1895 data/helpdata.txt:909
+#: client/cityrepdata.c:478 client/cityrepdata.c:482
+#: client/gui-gtk-2.0/cityrep.c:1437 client/gui-gtk-2.0/cityrep.c:1456
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-gtk-2.0/cityrep.c:1494
+#: client/gui-gtk-2.0/cityrep.c:1514 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/repodlgs.c:960 client/gui-sdl/helpdlg.c:688
+#: client/gui-sdl/mapctrl.c:1605 client/gui-sdl/optiondlg.c:1827
+#: client/gui-sdl/repodlgs.c:356 client/gui-win32/menu.c:351
+#: client/gui-win32/repodlgs.c:616 client/gui-win32/repodlgs.c:707
+#: client/gui-win32/repodlgs.c:716 client/gui-xaw/menu.c:157
+#: client/gui-xaw/menu.c:219 client/gui-xaw/menu.c:242
+#: client/gui-xaw/repodlgs.c:881 client/gui-xaw/repodlgs.c:1069
+#: data/Freeciv.in:1895 data/helpdata.txt:909
msgid "Units"
msgstr "الوØدات"
#. TRANS: Header "Number of units inside city"
-#: client/cityrepdata.c:476
+#: client/cityrepdata.c:480
#, fuzzy
msgid "?Present (units):Here"
msgstr "?Present (units):موجودة"
-#: client/cityrepdata.c:477
+#: client/cityrepdata.c:481
msgid "Number of units present"
msgstr "عدد الوØدات الموجودة"
#. TRANS: Header "Number of units supported by given city"
-#: client/cityrepdata.c:480
+#: client/cityrepdata.c:484
#, fuzzy
msgid "?Supported (units):Owned"
msgstr "?Supported (units):مدعومة"
-#: client/cityrepdata.c:481
+#: client/cityrepdata.c:485
msgid "Number of units supported"
msgstr "عدد الوØدات المدعومة"
#. TRANS: Header "It will take this many turns before city grows"
-#: client/cityrepdata.c:484
+#: client/cityrepdata.c:488
#, fuzzy
msgid "?food (population):Grow"
msgstr "توسع"
-#: client/cityrepdata.c:485 client/cityrepdata.c:530
+#: client/cityrepdata.c:489 client/cityrepdata.c:528
#, fuzzy
msgid "?Stock/Target:(Have/Need)"
msgstr "(المخزون/الهدÙ)"
-#: client/cityrepdata.c:486
+#: client/cityrepdata.c:490
msgid "Turns until growth/famine"
msgstr "الأدوار Øتى التوسع/المجاعة"
-#: client/cityrepdata.c:488
-#, fuzzy
-msgid "?size [short]:Sz"
-msgstr "الØجم"
-
-#: client/cityrepdata.c:488
-msgid "Size"
-msgstr "الØجم"
-
-#: client/cityrepdata.c:492
-msgid "?city:Name"
-msgstr "?city:الاسم"
-
-#: client/cityrepdata.c:492 client/gui-sdl/cityrep.c:169
-msgid "City Name"
-msgstr "اسم المدينة"
-
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
msgid "Surplus"
msgstr "الÙائض"
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
msgid "?food/production/trade:F/P/T"
msgstr "?food/production/trade:ط/ن/ت"
-#: client/cityrepdata.c:496
+#: client/cityrepdata.c:494
msgid "Surplus: Food, Production, Trade"
msgstr "الÙائض: الطعام، الإنتاج ،التجارة"
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
#, fuzzy
msgid "?Food surplus [short]:+F"
msgstr "?Food surplus [short]:+Ø·"
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
msgid "Surplus: Food"
msgstr "الÙائض: الطعام"
-#: client/cityrepdata.c:500
+#: client/cityrepdata.c:498
#, fuzzy
msgid "?Production surplus [short]:+P"
msgstr "?Production surplus [short]:+Ù†"
-#: client/cityrepdata.c:501
+#: client/cityrepdata.c:499
msgid "Surplus: Production"
msgstr "الÙائض: الانتاج"
-#: client/cityrepdata.c:502
+#: client/cityrepdata.c:500
#, fuzzy
msgid "?Production loss (waste) [short]:-P"
msgstr "-Ù†"
-#: client/cityrepdata.c:503
+#: client/cityrepdata.c:501
msgid "Waste"
msgstr "النÙاية"
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
#, fuzzy
msgid "?Trade surplus [short]:+T"
msgstr "?Trade surplus [short]:+ت"
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
msgid "Surplus: Trade"
msgstr "الÙائض: التجارة"
-#: client/cityrepdata.c:506
+#: client/cityrepdata.c:504
#, fuzzy
msgid "?Trade loss (corruption) [short]:-T"
msgstr "-ت"
-#: client/cityrepdata.c:507
+#: client/cityrepdata.c:505
msgid "Corruption"
msgstr "الÙساد"
-#: client/cityrepdata.c:509 client/gui-gtk-2.0/repodlgs.c:654
+#: client/cityrepdata.c:507 client/gui-gtk-2.0/repodlgs.c:654
#: client/gui-sdl/mapctrl.c:1400 client/gui-win32/repodlgs.c:334
#: client/gui-xaw/menu.c:222 client/gui-xaw/repodlgs.c:644
#: client/gui-xaw/repodlgs.c:773 data/Freeciv.in:1819
msgid "Economy"
msgstr "الاقتصاد"
-#: client/cityrepdata.c:509
+#: client/cityrepdata.c:507
msgid "?gold/luxury/science:G/L/S"
msgstr "?gold/luxury/science:ذ/ر/ع"
-#: client/cityrepdata.c:510
+#: client/cityrepdata.c:508
msgid "Economy: Gold, Luxuries, Science"
msgstr "الإقتصاد: الذّهب، الرÙاهيات، العلوم"
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
msgid "?Gold:G"
msgstr "?Gold:Ø°"
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
msgid "Economy: Gold"
msgstr "الاقتصاد: الذهب"
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
msgid "?Luxury:L"
msgstr "?Luxury:ر"
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
msgid "Economy: Luxury"
msgstr "الاقتصاد: الرÙاهية"
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
msgid "?Science:S"
msgstr "?Science:ع"
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
msgid "Economy: Science"
msgstr "الإقتصاد : العلوم"
-#: client/cityrepdata.c:518
+#: client/cityrepdata.c:516
msgid "?number_trade_routes:n"
msgstr "?number_trade_routes:ت"
-#: client/cityrepdata.c:518
+#: client/cityrepdata.c:516
msgid "?number_trade_routes:R"
msgstr "?number_trade_routes:Ø·"
-#: client/cityrepdata.c:519
+#: client/cityrepdata.c:517
msgid "Number of Trade Routes"
msgstr "عدد طرق التجارة"
-#: client/cityrepdata.c:521
+#: client/cityrepdata.c:519
msgid "?pollution [short]:Pol"
msgstr "?pollution [short]:تلوث"
-#: client/cityrepdata.c:523
+#: client/cityrepdata.c:521
msgid "?cma:Governor"
msgstr "?cma:الØاكم"
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
-#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
-#: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
-#: data/Freeciv.in:1459 data/helpdata.txt:820
+#: client/cityrepdata.c:521 client/gui-gtk-2.0/cityrep.c:1766
+#: client/gui-sdl/citydlg.c:3809 client/gui-sdl/cma_fe.c:858
+#: client/gui-win32/citydlg.c:726 data/Freeciv.in:1459 data/helpdata.txt:820
msgid "Citizen Governor"
msgstr "Øاكم المواطنيين "
-#: client/cityrepdata.c:526
+#: client/cityrepdata.c:524
#, fuzzy
msgid "Turns/Buy"
msgstr "الأدوار/الشراء"
-#: client/cityrepdata.c:529 client/cityrepdata.c:531
+#: client/cityrepdata.c:527 client/cityrepdata.c:529
msgid "Currently Building"
msgstr "جاري البناء"
-#: client/cityrepdata.c:575
+#: client/cityrepdata.c:573
msgid "?specialist:S"
msgstr "?specialist:Ø®"
-#: client/cityrepdata.c:578
+#: client/cityrepdata.c:576
#, fuzzy
msgid "Specialists"
msgstr "الإختصاصيون"
-#: client/civclient.c:239
+#: client/civclient.c:240
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr " -a, --autoconnect\tتخطي مربع Øوار الاتصال\n"
-#: client/civclient.c:249
+#: client/civclient.c:250
msgid " -l, --log FILE\tUse FILE as logfile (spawned server also uses this)\n"
msgstr ""
" -l, --log FILE\tستعمل FILE كمل٠السجل (يمكن أن يستعمله الخادم أيضا)\n"
-#: client/civclient.c:251
+#: client/civclient.c:252
msgid " -m, --meta HOST\tConnect to the metaserver at HOST\n"
msgstr " -m, --meta HOST\tاتصال إلى metaserver على عنوان HOST\n"
-#: client/civclient.c:253
+#: client/civclient.c:254
msgid " -n, --name NAME\tUse NAME as name\n"
msgstr " -n, --name NAME\tاستعمال NAME كاسم\n"
-#: client/civclient.c:255
+#: client/civclient.c:256
#, fuzzy
msgid " -p, --port PORT\tConnect to server port PORT (usually with -a)\n"
msgstr " -p, --port PORT\tالاتصال بالخادم على منÙد PORT\n"
-#: client/civclient.c:257
+#: client/civclient.c:258
#, c-format
msgid " -P, --Plugin PLUGIN\tUse PLUGIN for sound output %s\n"
msgstr " -P, --Plugin PLUGIN\tستعمال PLUGIN لمخرج الصوت %s\n"
-#: client/civclient.c:259
+#: client/civclient.c:260
msgid " -r, --read FILE\tRead startup script FILE (for spawned server only)\n"
msgstr ""
-#: client/civclient.c:262
+#: client/civclient.c:263
#, 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:264
+#: client/civclient.c:265
#, fuzzy
msgid " -S, --Sound FILE\tRead sound tags from FILE\n"
msgstr "أس - الØر٠التاسع عشر ÙÙŠ اللغة الإنجليزية الصوت"
-#: client/civclient.c:265
+#: client/civclient.c:266
msgid " -t, --tiles FILE\tUse data file FILE.tilespec for tiles\n"
msgstr ""
-#: client/civclient.c:268
+#: client/civclient.c:269
#, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -7549,145 +7538,155 @@ msgid ""
msgstr ""
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:273
+#: client/civclient.c:274
#, fuzzy, c-format
msgid "Report bugs at %s\n"
msgstr "ارسل تقارير المشاكل إلى <%s>.\n"
-#: client/civclient.c:297
+#: client/civclient.c:298
#, fuzzy, c-format
msgid "Invalid port \"%s\" specified with --port option.\n"
msgstr "العاجز مع"
-#: client/civclient.c:299 client/civclient.c:314
+#: client/civclient.c:300 client/civclient.c:315
msgid "Try using --help.\n"
msgstr "Øاول استعمال --help.\n"
-#: client/civclient.c:312
+#: client/civclient.c:313
#, fuzzy, c-format
msgid "Invalid debug level \"%s\" specified with --debug option.\n"
msgstr "العاجز مع"
-#: client/civclient.c:325
+#: client/civclient.c:326
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr "الخيار غير معتر٠به: \"%s\"\n"
-#: client/civclient.c:539
+#: client/civclient.c:391
+#, fuzzy, c-format
+msgid "Updating old metaserver address \"%s\"."
+msgstr "metaserver <عنوان انترنت>"
+
+#: client/civclient.c:394
+#, fuzzy, c-format
+msgid "Default metaserver has been set to \"%s\"."
+msgstr "الخيار: %s تم تغييره إلى \"%s\"."
+
+#: client/civclient.c:550
msgid "Game started."
msgstr "تم بدء اللعبة."
-#: client/civclient.c:577
+#: client/civclient.c:588
msgid "There was an error while auto connecting; aborting."
msgstr "Øصل خطأ عند إعادة الاتصال التلقائي، سيتم الالغاء."
-#: client/climisc.c:176
+#: client/climisc.c:177
#, c-format
msgid "Changing production of every %s into %s."
msgstr "تغيير انتاج كل %s إلى %s."
-#: client/climisc.c:214
+#: client/climisc.c:215
msgid "?embassy:Both"
msgstr "?embassy:كلاهما"
-#: client/climisc.c:216
+#: client/climisc.c:217
msgid "?embassy:Yes"
msgstr "?embassy:نعم"
-#: client/climisc.c:219
+#: client/climisc.c:220
msgid "?embassy:With Us"
msgstr "?embassy:معنا"
-#: client/climisc.c:222
+#: client/climisc.c:223
msgid "?embassy:Contact"
msgstr "?embassy:اتصال"
-#: client/climisc.c:224
+#: client/climisc.c:225
msgid "?embassy:No Contact"
msgstr "?embassy:بدون اتصال"
-#: client/climisc.c:236
+#: client/climisc.c:237
msgid "?vision:Both"
msgstr "?vision:كلاهما"
-#: client/climisc.c:238
+#: client/climisc.c:239
msgid "?vision:To Them"
msgstr "?vision:إليهم"
-#: client/climisc.c:241
+#: client/climisc.c:242
msgid "?vision:To Us"
msgstr "?vision:إلينا"
-#: client/climisc.c:257 client/climisc.c:264
+#: client/climisc.c:258 client/climisc.c:265
#, c-format
msgid "The %s give %s"
msgstr "يعطي %s ال%s"
-#: client/climisc.c:268
+#: client/climisc.c:269
#, c-format
msgid "The %s give unknown city."
msgstr "يعطي %s مدينة مجهولة."
-#: client/climisc.c:273
+#: client/climisc.c:274
#, c-format
msgid "The %s give %d gold"
msgstr "يعطي %s كمية %d ذهب"
-#: client/climisc.c:278
+#: client/climisc.c:279
#, c-format
msgid "The %s give their worldmap"
msgstr "يعطي %s خريطتهم للعالم"
-#: client/climisc.c:282
+#: client/climisc.c:283
#, c-format
msgid "The %s give their seamap"
msgstr "يعطي %s خريطتهم البØرية"
-#: client/climisc.c:286
+#: client/climisc.c:287
msgid "The parties agree on a cease-fire"
msgstr "يواÙÙ‚ الأطرا٠على وق٠إطلاق النار"
-#: client/climisc.c:289
+#: client/climisc.c:290
msgid "The parties agree on a peace"
msgstr "يواÙÙ‚ الأطرا٠على السلام"
-#: client/climisc.c:292
+#: client/climisc.c:293
msgid "The parties create an alliance"
msgstr "يواÙÙ‚ الأطرا٠على التØالÙ"
-#: client/climisc.c:295
+#: client/climisc.c:296
#, c-format
msgid "The %s give shared vision"
msgstr "يعطي %s رؤية مشتركة"
-#: client/climisc.c:299
+#: client/climisc.c:300
#, c-format
msgid "The %s give an embassy"
msgstr "يعطي %s سÙارة"
-#: client/climisc.c:902
+#: client/climisc.c:906
#, fuzzy
msgid "Popup Request"
msgstr "قاÙزة الطلب"
-#: client/climisc.c:932
+#: client/climisc.c:936
msgid "Exporting output window to civgame.log ..."
msgstr "جاري تصدير ناÙذة المخرجات لمل٠civgame.log ..."
-#: client/climisc.c:936
+#: client/climisc.c:940
msgid "Export complete."
msgstr "تم التصدير."
-#: client/climisc.c:938
+#: client/climisc.c:942
msgid "Export failed, couldn't write to file."
msgstr "Ùشل التصدير، لا يمكن الكتابة على ملÙ."
-#: client/climisc.c:1038
+#: client/climisc.c:1042
#, c-format
msgid "You don't buy %s in %s!"
msgstr "لا تستطيع شراء %s ÙÙŠ %s!"
-#: client/climisc.c:1056
+#: client/climisc.c:1060
#, c-format
msgid "%s costs %d gold and you only have %d gold."
msgstr "يكل٠%s %d ذهب ولكن عندك Ùقط %d ذهب."
@@ -7731,19 +7730,19 @@ msgid ""
"%d times"
msgstr "السّيّارة"
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1289
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
msgid "novice"
msgstr "مبتدئ"
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1289
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1358
msgid "easy"
msgstr "سهل"
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1290
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
msgid "normal"
msgstr "عادي"
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1290
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
msgid "hard"
msgstr "صعب"
@@ -7773,39 +7772,41 @@ msgstr "لن نستطيع غالبا تشغيلها من هنا."
#: client/connectdlg_common.c:470
#, fuzzy
-msgid "We have control of the server (command access level hack)"
+msgid ""
+"Established control over the server. You have command access level 'hack'."
msgstr "Ù†ØÙ†"
#: client/connectdlg_common.c:475
-#, fuzzy
-msgid "We can't take control of server, attempting to kill it."
-msgstr "Ù†ØÙ†."
+msgid ""
+"Failed to obtain the required access level to take control of the server. "
+"The server will now be shutdown."
+msgstr ""
-#: client/control.c:1104
+#: client/control.c:1123
msgid "Only transporter units can be unloaded."
msgstr "يمكن Ùقط تنزيل الوØدات المنقولة."
-#: client/control.c:1353
+#: client/control.c:1425
msgid "Only settler units can be put into auto mode."
msgstr "يمكن Ùقط وضع الوØدات المستعمرة ÙÙŠ النمط التلقائي."
-#: client/control.c:1444
+#: client/control.c:1516
msgid "Only nuclear units can do this."
msgstr "تستطيع Ùقط الوØدات النووية Ùعل هذا."
-#: client/control.c:1473
+#: client/control.c:1545
msgid "Only paratrooper units can do this."
msgstr "تستطيع Ùقط الوØدات المظلية Ùعل هذا."
-#: client/control.c:1921
+#: client/control.c:2020
msgid "Too far for this unit."
msgstr "بعيد جدا لهذه الوØدة."
-#: client/control.c:2131 client/control.c:2161 client/control.c:2177
+#: client/control.c:2230 client/control.c:2260 client/control.c:2276
msgid "Didn't find a route to the destination!"
msgstr "Ùشل العثور على طريق إلى الاتجاه المقصود!"
-#: client/control.c:2221
+#: client/control.c:2320
msgid "Oh my! You seem to have no capital!"
msgstr "أوه يا! يبدو أنك بدون عاصمة!"
@@ -7892,16 +7893,16 @@ msgid "Allows %s (with %s)."
msgstr "ÙŠØ³Ù…Ø %s (مع %s)."
#. TRANS: preserve single space at beginning
-#: client/helpdata.c:418
+#: client/helpdata.c:416
msgid " Rivers"
msgstr "الأنهار"
-#: client/helpdata.c:576
+#: client/helpdata.c:574
#, c-format
msgid "Sorry, no help topic for %s.\n"
msgstr "آسÙ, لا يوجد موضوع مساعدة Ù„ %s.\n"
-#: client/helpdata.c:580
+#: client/helpdata.c:578
#, c-format
msgid ""
"Sorry, no help topic for %s.\n"
@@ -7912,7 +7913,7 @@ msgstr ""
"تم انشاء هذه الصÙØØ© تلقائيا.\n"
"\n"
-#: client/helpdata.c:670
+#: client/helpdata.c:668
#, fuzzy
msgid ""
"Requires: Nothing\n"
@@ -7921,58 +7922,58 @@ msgstr ""
"يتطلّب البناية %s.\n"
" \n"
-#: client/helpdata.c:675
+#: client/helpdata.c:673
#, c-format
msgid "* The discovery of %s will make %s obsolete.\n"
msgstr "* سيجعل اكتشا٠%s ال %s قديما.\n"
-#: client/helpdata.c:694
+#: client/helpdata.c:692
#, c-format
msgid "* Allows all players with knowledge of %s to build %s units.\n"
msgstr "* Ø§Ù„Ø³Ù…Ø§Ø Ù„ÙƒÙ„ اللاعبين مع معرÙØ© ال %s ببناء ÙˆØدات %s.\n"
-#: client/helpdata.c:706
+#: client/helpdata.c:704
#, c-format
msgid "* Allows %s (with %s).\n"
msgstr "* ÙŠØ³Ù…Ø %s (مع %s).\n"
-#: client/helpdata.c:710
+#: client/helpdata.c:708
#, c-format
msgid "* Allows %s.\n"
msgstr "* ÙŠØ³Ù…Ø %s.\n"
-#: client/helpdata.c:780
+#: client/helpdata.c:778
#, fuzzy, c-format
msgid "* Can only be built if there is %s in the city.\n"
msgstr "* يمكن Ùقط بنائها مع Øكومة %s \n"
-#: client/helpdata.c:786
+#: client/helpdata.c:784
#, c-format
msgid "* Can only be built with %s as government.\n"
msgstr "* يمكن Ùقط بنائها مع Øكومة %s \n"
-#: client/helpdata.c:791
+#: client/helpdata.c:789
msgid "* May not be built in cities.\n"
msgstr "* لا يمكن بنائها ÙÙŠ المدن.\n"
-#: client/helpdata.c:794
+#: client/helpdata.c:792
msgid "* Never has a home city.\n"
msgstr "* لا مدينة الأصل أبدا.\n"
-#: client/helpdata.c:797
+#: client/helpdata.c:795
msgid "* Losing this unit will lose you the game!\n"
msgstr "* خسارة هذه الوØدة تعني خسارة اللعبة!\n"
-#: client/helpdata.c:801
+#: client/helpdata.c:799
msgid "* Each player may only have one of this type of unit.\n"
msgstr "* يمكن لكل لاعب الØصول على واØدة من نوع هذه الوØدة.\n"
-#: client/helpdata.c:805
+#: client/helpdata.c:803
#, c-format
msgid "* Requires %d population to build.\n"
msgstr "* ÙŠØتاج إلى عدد السكان %d للبناء.\n"
-#: client/helpdata.c:811
+#: client/helpdata.c:809
#, fuzzy, c-format
msgid "* Can carry and refuel %d air unit.\n"
msgid_plural "* Can carry and refuel %d air units.\n"
@@ -7980,7 +7981,7 @@ msgstr[0] "يمكن أن ÙˆØدات"
msgstr[1] "يمكن أن ÙˆØدات"
msgstr[2] "يمكن أن ÙˆØدات"
-#: client/helpdata.c:816
+#: client/helpdata.c:814
#, fuzzy, c-format
msgid "* Can carry and refuel %d missile unit.\n"
msgid_plural "* Can carry and refuel %d missile units.\n"
@@ -7988,7 +7989,7 @@ msgstr[0] "يمكن أن ÙˆØدات"
msgstr[1] "يمكن أن ÙˆØدات"
msgstr[2] "يمكن أن ÙˆØدات"
-#: client/helpdata.c:821
+#: client/helpdata.c:819
#, fuzzy, c-format
msgid "* Can carry %d ground unit across water.\n"
msgid_plural "* Can carry %d ground units across water.\n"
@@ -7996,229 +7997,229 @@ msgstr[0] "يمكن أن ÙˆØدات"
msgstr[1] "يمكن أن ÙˆØدات"
msgstr[2] "يمكن أن ÙˆØدات"
-#: client/helpdata.c:830
+#: client/helpdata.c:828
#, fuzzy
msgid ""
"* Can establish trade routes (must travel to target city and must be at "
"least 9 tiles [in Manhattan distance] from this unit's home city).\n"
msgstr "يمكن أن كوكتيل مانهاتان ÙˆØدات"
-#: client/helpdata.c:836
+#: client/helpdata.c:834
#, fuzzy, c-format
msgid "* Can help build wonders (adds %d production).\n"
msgstr "يمكن أن"
-#: client/helpdata.c:840
+#: client/helpdata.c:838
msgid "* May not be disbanded.\n"
msgstr "* لا يمكن تسريØها.\n"
-#: client/helpdata.c:842
+#: client/helpdata.c:840
#, fuzzy, c-format
msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
msgstr "أيار"
-#: client/helpdata.c:846
+#: client/helpdata.c:844
msgid "* Can build new cities.\n"
msgstr "* يستطيع بناء مدن جديدة.\n"
-#: client/helpdata.c:849
+#: client/helpdata.c:847
#, fuzzy, c-format
msgid "* Can add on %d population to cities of no more than size %d.\n"
msgstr "يمكن أن الØجم"
-#: client/helpdata.c:858
+#: client/helpdata.c:856
msgid "* Can build roads and railroads.\n"
msgstr "* يستطيع بناء طرق وسكك Øديدية.\n"
-#: client/helpdata.c:859
+#: client/helpdata.c:857
msgid "* Can build mines on tiles.\n"
msgstr "* يستطيع بناء مناجم على المربعات.\n"
-#: client/helpdata.c:860
+#: client/helpdata.c:858
msgid "* Can build irrigation on tiles.\n"
msgstr "* يستطيع بناء قنوات ري على المربعات.\n"
-#: client/helpdata.c:865
+#: client/helpdata.c:863
msgid "* Can build farmland.\n"
msgstr "* يستطيع بناء أرض زراعية.\n"
-#: client/helpdata.c:869
+#: client/helpdata.c:867
#, c-format
msgid "* Can build farmland (if %s is known).\n"
msgstr "* يستطيع بناء أرض زراعية (إذا كان %s معروÙا).\n"
-#: client/helpdata.c:873
+#: client/helpdata.c:871
#, fuzzy, c-format
msgid "* Can build farmland (if any of the following are known: %s).\n"
msgstr "يمكن أن"
-#: client/helpdata.c:881
+#: client/helpdata.c:879
msgid "* Can build fortresses.\n"
msgstr "* يستطيع بناء القلاع.\n"
-#: client/helpdata.c:885
+#: client/helpdata.c:883
#, c-format
msgid "* Can build fortresses (if %s is known).\n"
msgstr "* يستطيع بناء القلاع (إذا كان %s معروÙا).\n"
-#: client/helpdata.c:889
+#: client/helpdata.c:887
#, c-format
msgid "* Can build fortresses (if any of the following are known: %s).\n"
msgstr "* يستطيع بناء القلاع (إذا كان أي من التالى معروÙا: %s).\n"
-#: client/helpdata.c:895
+#: client/helpdata.c:893
msgid "* Can clean pollution from tiles.\n"
msgstr "* يستطيع تنظي٠التلوث من المربعات.\n"
-#: client/helpdata.c:896
+#: client/helpdata.c:894
msgid "* Can clean nuclear fallout from tiles.\n"
msgstr "* يستطيع تنظي٠الغبار الذري من المربعات.\n"
-#: client/helpdata.c:899
+#: client/helpdata.c:897
msgid "* Can transform tiles.\n"
msgstr "* يستطيع تØويل مربعات.\n"
-#: client/helpdata.c:902
+#: client/helpdata.c:900
msgid "* Can build airbases.\n"
msgstr "* يستطيع بناء قواعد جوية.\n"
-#: client/helpdata.c:906
+#: client/helpdata.c:904
#, c-format
msgid "* May fortify, granting a 50%% defensive bonus.\n"
msgstr "* يستطيع التØصن، Ùيعطى مكاÙأة دÙاع بمقدار 50%%.\n"
-#: client/helpdata.c:909
+#: client/helpdata.c:907
msgid "* May pillage to destroy infrastructure from tiles.\n"
msgstr "* يستطيع النهب لتدمير البنية التØتية من المربعات.\n"
-#: client/helpdata.c:913
+#: client/helpdata.c:911
msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
msgstr "* يستطيع تنÙيذ أوامر دبلوماسية، بالاضاÙØ© إلى امكانيات التجسس الخاصة.\n"
-#: client/helpdata.c:916
+#: client/helpdata.c:914
msgid "* Can perform diplomatic actions.\n"
msgstr "* يستطيع تنÙيذ أوامر دبلوماسية.\n"
-#: client/helpdata.c:920
+#: client/helpdata.c:918
#, fuzzy
msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
msgstr "سو٠مستØيل"
-#: client/helpdata.c:923
+#: client/helpdata.c:921
msgid "* May not be bribed.\n"
msgstr "* لا تستطيع رشوته.\n"
-#: client/helpdata.c:926
+#: client/helpdata.c:924
msgid "* Can attack enemy air units.\n"
msgstr "* يستطيع مهاجمة ÙˆØدات العدو الجوية.\n"
-#: client/helpdata.c:930
+#: client/helpdata.c:928
msgid "* Is invisible except when next to an enemy unit or city.\n"
msgstr "* يكون Ø®Ùيا إلا قرب ÙˆØدة أو مدينة العدو.\n"
-#: client/helpdata.c:934
+#: client/helpdata.c:932
msgid "* Can only attack units on ocean squares (no land attacks).\n"
msgstr "* يستطيع Ùقط مهاجمة الوØدات على مربعات المØيط (بدون هجوم بري ).\n"
-#: client/helpdata.c:938
+#: client/helpdata.c:936
#, fuzzy
msgid ""
"* Can attack from aboard sea units: against enemy cities and onto land "
"squares.\n"
msgstr "يمكن أن الهجوم"
-#: client/helpdata.c:943
+#: client/helpdata.c:941
#, c-format
msgid "* Can be paradropped from a friendly city (Range: %d).\n"
msgstr "* يمكن اسقاطه بالمظلة من مدينة صديقة (المدى: %d).\n"
-#: client/helpdata.c:949
+#: client/helpdata.c:947
#, fuzzy
msgid "* Gets double defense against units specified as 'mounted'.\n"
msgstr "ÙŠØµØ¨Ø Ø§Ù„Ø¯Ùاع"
-#: client/helpdata.c:953
+#: client/helpdata.c:951
#, fuzzy
msgid "* Counts as 'mounted' against certain defenders.\n"
msgstr "التهم"
-#: client/helpdata.c:957
+#: client/helpdata.c:955
#, fuzzy
msgid "* A missile unit: gets used up in making an attack.\n"
msgstr "أي - الØر٠الأوّل ÙÙŠ الأبجديّة اللّاتينيّة ÙˆØدات الهجوم"
-#: client/helpdata.c:960
+#: client/helpdata.c:958
#, fuzzy
msgid "* Making an attack ends this unit's turn.\n"
msgstr "الجعل الهجوم ÙˆØدات دوران"
-#: client/helpdata.c:964
+#: client/helpdata.c:962
#, fuzzy
msgid "* This unit's attack causes a nuclear explosion!\n"
msgstr "هذا ÙˆØدات الهجوم"
-#: client/helpdata.c:968
+#: client/helpdata.c:966
#, fuzzy
msgid "* Gets double firepower when attacking cities.\n"
msgstr "يصبØ"
-#: client/helpdata.c:971
+#: client/helpdata.c:969
msgid "* Ignores the effects of city walls.\n"
msgstr "* يهمل آثار جدران المدينة.\n"
-#: client/helpdata.c:975
+#: client/helpdata.c:973
#, fuzzy, c-format
msgid ""
"* Does bombard attacks (%d per turn). These attacks will only damage (never "
"kill) the defender, but have no risk for the attacker.\n"
msgstr "يعمل دوران هذه مستØيل"
-#: client/helpdata.c:982
+#: client/helpdata.c:980
#, fuzzy
msgid "* Gets quintuple defense against missiles and aircraft.\n"
msgstr "يصبØ"
-#: client/helpdata.c:986
+#: client/helpdata.c:984
#, fuzzy
msgid "* Ignores terrain effects (treats all squares as roads).\n"
msgstr "يهمل"
-#: client/helpdata.c:989
+#: client/helpdata.c:987
msgid "* Ignores zones of control.\n"
msgstr "* يهمل مناطق السيطرة.\n"
-#: client/helpdata.c:993
+#: client/helpdata.c:991
#, fuzzy
msgid "* A non-military unit (cannot attack; no martial law).\n"
msgstr "أي - الØر٠الأوّل ÙÙŠ الأبجديّة اللّاتينيّة ÙˆØدات الهجوم"
-#: client/helpdata.c:997
+#: client/helpdata.c:995
#, fuzzy
msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
msgstr "أي - الØر٠الأوّل ÙÙŠ الأبجديّة اللّاتينيّة ÙˆØدات"
-#: client/helpdata.c:1000
+#: client/helpdata.c:998
msgid "* Will never achieve veteran status.\n"
msgstr "* لا يستطيع أبدا الØصول على وضع الخبير.\n"
-#: client/helpdata.c:1002
+#: client/helpdata.c:1000
#, fuzzy
msgid "* May become veteran through training or combat.\n"
msgstr "أيار خيير"
-#: client/helpdata.c:1008
+#: client/helpdata.c:1006
#, fuzzy, c-format
msgid ""
"* Must end turn in a city or next to land, or has a 50%% risk of being lost "
"at sea.\n"
msgstr "يجب أن دوران"
-#: client/helpdata.c:1012
+#: client/helpdata.c:1010
#, fuzzy, c-format
msgid "* The discovery of %s reduces the risk to 25%%.\n"
msgstr "الـ"
-#: client/helpdata.c:1017
+#: client/helpdata.c:1015
#, c-format
msgid "* %s reduces the risk to 12%%.\n"
msgstr "* يخÙض %s المخاطرة إلى 12%%.\n"
@@ -8227,15 +8228,15 @@ msgstr "* يخÙض %s المخاطرة إلى 12%%.\n"
#. * last two elements
#. TRANS: List of possible output types has this between
#. * last two elements
-#: client/helpdata.c:1068 client/helpdata.c:1402
+#: client/helpdata.c:1066 client/helpdata.c:1400
msgid " or "
msgstr " أو "
-#: client/helpdata.c:1070 client/helpdata.c:1390
+#: client/helpdata.c:1068 client/helpdata.c:1388
msgid "?or:, "
msgstr "?or:، "
-#: client/helpdata.c:1082
+#: client/helpdata.c:1080
#, 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"
@@ -8243,100 +8244,100 @@ msgstr[0] "الوØدة دوران"
msgstr[1] "الوØدة دوران"
msgstr[2] "الوØدة دوران"
-#: client/helpdata.c:1124
+#: client/helpdata.c:1122
#, fuzzy, c-format
msgid "If we would now start with %s we would need %d bulbs."
msgstr "إذا مع."
-#: client/helpdata.c:1129
+#: client/helpdata.c:1127
#, 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:1137
+#: client/helpdata.c:1135
msgid "You cannot research this technology."
msgstr "لا تستطيع بØØ« هذه التكنولوجيا."
-#: client/helpdata.c:1141
+#: client/helpdata.c:1139
msgid " This number may vary depending on what other players will research.\n"
msgstr "هذا الرقم متغيير Øسب أبØاث اللاعبيين اﻵخرين.\n"
-#: client/helpdata.c:1153
+#: client/helpdata.c:1151
#, fuzzy, c-format
msgid "* The first player to research %s gets an immediate advance.\n"
msgstr "الـ"
-#: client/helpdata.c:1158
+#: client/helpdata.c:1156
#, c-format
msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
msgstr "* يخÙض من Ùرصة خسارة مراكب ÙÙŠ الأمواج العارمة إلى 25%%.\n"
-#: client/helpdata.c:1161
+#: client/helpdata.c:1159
#, c-format
msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
msgstr "* يخÙض من Ùرصة خسارة مراكب ÙÙŠ الأمواج العارمة إلى 12%%.\n"
-#: client/helpdata.c:1165
+#: client/helpdata.c:1163
msgid "* Increases the pollution generated by the population.\n"
msgstr "* يزيد من التلوث الصادر من عدد السكان.\n"
-#: client/helpdata.c:1170
+#: client/helpdata.c:1168
#, c-format
msgid "* Allows %s to build roads on river squares.\n"
msgstr "* ÙŠØ³Ù…Ø %s ببناء طرق على مربعات الأنهار.\n"
-#: client/helpdata.c:1177
+#: client/helpdata.c:1175
#, c-format
msgid "* Allows %s to build fortresses.\n"
msgstr "* ÙŠØ³Ù…Ø %s ببناء القلاع.\n"
-#: client/helpdata.c:1185
+#: client/helpdata.c:1183
#, c-format
msgid "* Allows %s to build airbases.\n"
msgstr "* ÙŠØ³Ù…Ø %s ببناء القواعد الجوية.\n"
-#: client/helpdata.c:1194
+#: client/helpdata.c:1192
#, c-format
msgid "* Allows %s to upgrade roads to railroads.\n"
msgstr "* ÙŠØ³Ù…Ø %s بتطوير الطرق إلى سكك Øديدية.\n"
-#: client/helpdata.c:1202
+#: client/helpdata.c:1200
#, c-format
msgid "* Allows %s to upgrade irrigation to farmland.\n"
msgstr "* ÙŠØ³Ù…Ø %s بتطوير قنوات الري إلى أرض زراعية.\n"
-#: client/helpdata.c:1236
+#: client/helpdata.c:1234
msgid "* Pollution cannot be generated on this terrain."
msgstr "* لا تستطيع توليد التلوث على هذه التضاريص."
-#: client/helpdata.c:1241
+#: client/helpdata.c:1239
msgid "* You cannot build cities on this terrain."
msgstr "* لا تستطيع بناء المدن على هذه التضاريص."
-#: client/helpdata.c:1247
+#: client/helpdata.c:1245
msgid "* The coastline of this terrain is unsafe."
msgstr "* الشريط الساØلي لهذه التضاريص خطر."
-#: client/helpdata.c:1252
+#: client/helpdata.c:1250
msgid "* This terrain is unsafe for units to travel on."
msgstr "* هذه التضاريص خطرة لترØال الوØدات عليها."
-#: client/helpdata.c:1257
+#: client/helpdata.c:1255
msgid "* Land units cannot travel on oceanic terrains."
msgstr "* لا تستطيع الوØدات الأرضية الترØال على تضاريص Ù…Øيطية."
-#: client/helpdata.c:1307
+#: client/helpdata.c:1305
msgid "Features:\n"
msgstr "الميزّات:\n"
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1413 client/helpdata.c:1414
+#: client/helpdata.c:1411 client/helpdata.c:1412
msgid "?outputlist: Nothing "
msgstr ""
-#: client/helpdata.c:1421
+#: client/helpdata.c:1419
#, fuzzy, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
@@ -8348,7 +8349,7 @@ msgstr[0] "عسكري"
msgstr[1] "عسكري"
msgstr[2] "عسكري"
-#: client/helpdata.c:1431
+#: client/helpdata.c:1429
#, fuzzy, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8356,23 +8357,23 @@ msgid ""
msgstr "كلّ :: كلّ امرئ :: لكل قطعة :: لكل واØد"
#. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1439
+#: client/helpdata.c:1437
#, fuzzy, c-format
msgid "* You pay %d times normal %s upkeep for your units.\n"
msgstr "أنت عادي"
-#: client/helpdata.c:1444
+#: client/helpdata.c:1442
#, 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:1449
+#: client/helpdata.c:1447
#, fuzzy, c-format
msgid "* You pay no %s upkeep for your units.\n"
msgstr "أنت عادي"
-#: client/helpdata.c:1453
+#: client/helpdata.c:1451
#, fuzzy
msgid "* You pay no upkeep for your units.\n"
msgstr "أنت عادي"
@@ -8380,25 +8381,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:1462
+#: client/helpdata.c:1460
#, 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:1470
+#: client/helpdata.c:1468
#, fuzzy, c-format
msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
msgstr "كلّ :: كلّ امرئ :: لكل قطعة :: لكل واØد ÙˆØدات"
-#: client/helpdata.c:1477
+#: client/helpdata.c:1475
#, 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:1484
+#: client/helpdata.c:1482
#, fuzzy, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -8406,24 +8407,24 @@ msgid ""
msgstr "الـ مواطنيين الØجم"
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1491
+#: client/helpdata.c:1489
#, 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:1499
+#: client/helpdata.c:1497
#, fuzzy, c-format
msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
msgstr "الـ الذهب"
-#: client/helpdata.c:1504
+#: client/helpdata.c:1502
#, fuzzy
msgid "Has unlimited science/gold/luxuries rates.\n"
msgstr "له الذهب"
-#: client/helpdata.c:1509
+#: client/helpdata.c:1507
#, fuzzy, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
@@ -8435,7 +8436,7 @@ msgstr[0] "ملكك كلّ :: كلّ امرئ :: لكل قطعة :: لكل وا
msgstr[1] "ملكك كلّ :: كلّ امرئ :: لكل قطعة :: لكل واØد ÙˆØدات"
msgstr[2] "ملكك كلّ :: كلّ امرئ :: لكل قطعة :: لكل واØد ÙˆØدات"
-#: client/helpdata.c:1521
+#: client/helpdata.c:1519
#, 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"
@@ -8444,69 +8445,69 @@ msgstr[1] "أي - الØر٠الأوّل ÙÙŠ الأبجديّة اللّاتي
msgstr[2] "أي - الØر٠الأوّل ÙÙŠ الأبجديّة اللّاتينيّة"
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1532
+#: client/helpdata.c:1530
#, 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:1538
+#: client/helpdata.c:1536
#, fuzzy
msgid "* Your units cannot be bribed.\n"
msgstr "ملكك"
-#: client/helpdata.c:1541
+#: client/helpdata.c:1539
#, fuzzy
msgid "* Your cities cannot be incited.\n"
msgstr "ملكك"
-#: client/helpdata.c:1545
+#: client/helpdata.c:1543
#, 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:1551
+#: client/helpdata.c:1549
#, fuzzy
msgid "* Has a senate that may prevent declaration of war.\n"
msgstr "له"
-#: client/helpdata.c:1555
+#: client/helpdata.c:1553
#, fuzzy
msgid "* Allows partisans when cities are taken by the enemy.\n"
msgstr "يسمØ"
-#: client/helpdata.c:1559
+#: client/helpdata.c:1557
#, fuzzy
msgid ""
"* Buildings that normally confer bonuses against unhappiness will instead "
"give gold.\n"
msgstr "المباني :: العمارات الذهب"
-#: client/helpdata.c:1563
+#: client/helpdata.c:1561
#, fuzzy
msgid "* Pays no upkeep for fanatics.\n"
msgstr "الدÙعات"
-#: client/helpdata.c:1566
+#: client/helpdata.c:1564
#, fuzzy
msgid "* Has no unhappy citizens.\n"
msgstr "له"
-#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
+#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
#, fuzzy, c-format
msgid "* Veteran %s units.\n"
msgstr "الخبير"
-#: client/helpdata.c:1587
+#: client/helpdata.c:1585
#, fuzzy
msgid "* Veteran units.\n"
msgstr "الخبير"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1593
+#: client/helpdata.c:1591
#, fuzzy, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8514,7 +8515,7 @@ msgid ""
msgstr "كلّ :: كلّ امرئ :: لكل قطعة :: لكل واØد"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1602
+#: client/helpdata.c:1600
#, fuzzy, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8522,147 +8523,147 @@ msgid ""
msgstr "كلّ :: كلّ امرئ :: لكل قطعة :: لكل واØد مع"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1610
+#: client/helpdata.c:1608
#, 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:1619
+#: client/helpdata.c:1617
#, 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:1627
+#: client/helpdata.c:1625
#, 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:1632
+#: client/helpdata.c:1630
#, 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:1637
+#: client/helpdata.c:1635
#, 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:1645
+#: client/helpdata.c:1643
#, 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:1651
+#: client/helpdata.c:1649
#, 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:1657
+#: client/helpdata.c:1655
#, fuzzy, c-format
msgid "* %s waste will increase slowly with distance from capital.\n"
msgstr "مع"
-#: client/helpdata.c:1674
+#: client/helpdata.c:1672
#, c-format
msgid "* Allows you to build %s.\n"
msgstr "* ÙŠØ³Ù…Ø Ù„Ùƒ ببناء %s.\n"
#. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1701
+#: client/helpdata.c:1699
#, c-format
msgid "%s%d %s"
msgstr "%s%d %s"
-#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1700 client/helpdata.c:1708 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:1709
+#: client/helpdata.c:1707
#, c-format
msgid "%s%d unhappy"
msgstr "%s%d تعساء"
-#: client/mapctrl_common.c:382
+#: client/mapctrl_common.c:399
#, c-format
msgid "You don't know how to build %s!"
msgstr "لا تعر٠كيÙية بناء %s!"
-#: client/mapctrl_common.c:392
+#: client/mapctrl_common.c:409
#, c-format
msgid "Copy %s to clipboard."
msgstr "نسخ %s إلى ذاكرة النصوص."
-#: client/mapctrl_common.c:408
+#: client/mapctrl_common.c:425
msgid "Clipboard is empty."
msgstr "ذاكرة النصوص Ùارغة."
-#: client/options.c:98
+#: client/options.c:102
msgid "Graphics"
msgstr "الجراÙيكس"
-#: client/options.c:99
+#: client/options.c:103
msgid "Overview"
msgstr "الملخص"
-#: client/options.c:100
+#: client/options.c:104
msgid "Sound"
msgstr "الصوت"
-#: client/options.c:101
+#: client/options.c:105
msgid "Interface"
msgstr "واجهة البرنامج"
-#: client/options.c:102
+#: client/options.c:106
msgid "Network"
msgstr "الشبكة"
-#: client/options.c:107
+#: client/options.c:111
msgid "Login name"
msgstr "اسم الدخول"
-#: client/options.c:108
+#: client/options.c:112
#, fuzzy
msgid ""
"This is the default login username that will be used in the connection "
"dialogs or with the -a command-line parameter."
msgstr "هذا مع."
-#: client/options.c:113
+#: client/options.c:117
msgid "Server"
msgstr "الخادم"
-#: client/options.c:114
+#: client/options.c:118
#, fuzzy
msgid ""
"This is the default server hostname that will be used in the connection "
"dialogs or with the -a command-line parameter."
msgstr "هذا مع."
-#: client/options.c:119
+#: client/options.c:123
msgid "Server port"
msgstr "منÙØ° الخادم"
-#: client/options.c:120
+#: client/options.c:124
#, fuzzy
msgid ""
"This is the default server port that will be used in the connection dialogs "
"or with the -a command-line parameter."
msgstr "هذا مع."
-#: client/options.c:125 client/gui-win32/connectdlg.c:912 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
msgid "Metaserver"
msgstr "Metaserver"
-#: client/options.c:126
+#: client/options.c:130
#, fuzzy
msgid ""
"The metaserver is a host that the client contacts to find out about games on "
@@ -8670,23 +8671,23 @@ msgid ""
"you're doing."
msgstr "الـ دون."
-#: client/options.c:132
+#: client/options.c:136
msgid "Soundset"
msgstr "مجموعة أصوات"
-#: client/options.c:133
+#: client/options.c:137
#, fuzzy
msgid ""
"This is the soundset that will be used. Changing this is the same as using "
"the -S command-line parameter."
msgstr "هذا التغيير أس - الØر٠التاسع عشر ÙÙŠ اللغة الإنجليزية."
-#: client/options.c:138
+#: client/options.c:142
#, fuzzy
msgid "Sound plugin"
msgstr "الصوت"
-#: client/options.c:139
+#: client/options.c:143
#, fuzzy
msgid ""
"If you have a problem with sound, try changing the sound plugin. The new "
@@ -8696,33 +8697,33 @@ msgstr ""
"إذا مع الـ جديد برنامج Freeciv التغيير بي - الØر٠السادس عشر ÙÙŠ اللغة "
"الإنجليزية."
-#: client/options.c:144 client/gui-sdl/gui_main.c:162
+#: client/options.c:148 client/gui-sdl/gui_main.c:162
#, fuzzy
msgid "Theme"
msgstr "المعبد"
-#: client/options.c:145
+#: client/options.c:149
#, fuzzy
msgid "By changing this option you change the active theme."
msgstr "ب Ù…Ùعل هذا."
-#: client/options.c:148
+#: client/options.c:152
msgid "Tileset"
msgstr "مجموعة بلاطات"
-#: client/options.c:149
+#: client/options.c:153
#, fuzzy
msgid ""
"By changing this option you change the active tileset. This is the same as "
"using the -t command-line parameter."
msgstr "ب Ù…Ùعل هذا."
-#: client/options.c:156
+#: client/options.c:160
#, fuzzy
msgid "Solid unit background color"
msgstr "صلب ÙˆØدات"
-#: client/options.c:157
+#: client/options.c:161
#, fuzzy
msgid ""
"Setting this option will cause units on the map view to be drawn with a "
@@ -8731,12 +8732,12 @@ msgstr ""
"وضْع :: إطار الÙصّ (ÙÙŠ خاتم) :: Ù…Øيط :: خلÙيّة :: مكان :: الموسيقى الموضوعة "
"لقصيدة إلخ :: \"Øَضْنَة\" بيض مع."
-#: client/options.c:161 client/gui-sdl/optiondlg.c:960
+#: client/options.c:165 client/gui-sdl/optiondlg.c:960
#, fuzzy
msgid "Sound bell at new turn"
msgstr "الصوت جديد دوران"
-#: client/options.c:162
+#: client/options.c:166
#, fuzzy
msgid ""
"Set this option to have a \"bell\" event be generated at the start of a new "
@@ -8744,23 +8745,23 @@ msgid ""
"message options."
msgstr "المجموعة جديد دوران أنت."
-#: client/options.c:168
+#: client/options.c:172
#, fuzzy
msgid "Unit movement animation time (milliseconds)"
msgstr "الوØدة"
-#: client/options.c:169
+#: client/options.c:173
#, fuzzy
msgid ""
"This option controls how long unit \"animation\" takes when a unit moves on "
"the map view. Set it to 0 to disable animation entirely."
msgstr "هذا ÙˆØدات ÙˆØدات المجموعة."
-#: client/options.c:174
+#: client/options.c:178
msgid "Mapview recentering time (milliseconds)"
msgstr "وقت إعادة توسيط عرض الخريطة (ملي ثانية)"
-#: client/options.c:175
+#: client/options.c:179
#, fuzzy
msgid ""
"When the map view is recentered, it will slide smoothly over the map to its "
@@ -8768,24 +8769,24 @@ msgid ""
"to disable mapview sliding entirely."
msgstr "متى جديد هذا المجموعة."
-#: client/options.c:180 client/gui-sdl/optiondlg.c:1014
+#: client/options.c:184 client/gui-sdl/optiondlg.c:1014
#, fuzzy
msgid "Show combat animation"
msgstr "المعرض"
-#: client/options.c:181
+#: client/options.c:185
#, fuzzy
msgid ""
"Disabling this option will turn off combat animation between units on the "
"mapview."
msgstr "التعطيل دوران."
-#: client/options.c:184
+#: client/options.c:188
#, fuzzy
msgid "Draw the citybar"
msgstr "السØب"
-#: client/options.c:185
+#: client/options.c:189
#, fuzzy
msgid ""
"Setting this option will display a 'citybar' containing useful information "
@@ -8795,12 +8796,12 @@ msgstr ""
"وضْع :: إطار الÙصّ (ÙÙŠ خاتم) :: Ù…Øيط :: خلÙيّة :: مكان :: الموسيقى الموضوعة "
"لقصيدة إلخ :: \"Øَضْنَة\" بيض التعطيل."
-#: client/options.c:191
+#: client/options.c:195
#, fuzzy
msgid "Show icons in the technology tree"
msgstr "المعرض"
-#: client/options.c:192
+#: client/options.c:196
#, fuzzy
msgid ""
"Setting this option will display icons on the technology tree diagram. "
@@ -8809,12 +8810,12 @@ msgstr ""
"وضْع :: إطار الÙصّ (ÙÙŠ خاتم) :: Ù…Øيط :: خلÙيّة :: مكان :: الموسيقى الموضوعة "
"لقصيدة إلخ :: \"Øَضْنَة\" بيض المنعطÙ."
-#: client/options.c:197
+#: client/options.c:201
#, fuzzy
msgid "Draw shield graphics for units"
msgstr "السØب درع"
-#: client/options.c:198
+#: client/options.c:202
#, fuzzy
msgid ""
"Setting this option will draw a shield icon as the flags on units. If "
@@ -8823,36 +8824,36 @@ msgstr ""
"وضْع :: إطار الÙصّ (ÙÙŠ خاتم) :: Ù…Øيط :: خلÙيّة :: مكان :: الموسيقى الموضوعة "
"لقصيدة إلخ :: \"Øَضْنَة\" بيض درع إذا."
-#: client/options.c:202
+#: client/options.c:206
#, fuzzy
msgid "Manual Turn Done in AI Mode"
msgstr "الدليل الدور انتهى ذكاء اصطناعي النمط"
-#: client/options.c:203
+#: client/options.c:207
#, fuzzy
msgid ""
"Disable this option if you do not want to press the Turn Done button "
"manually when watching an AI player."
msgstr "يضعÙØŒ يعجز، ÙŠÙقد الأهلية الدور انتهى ذكاء اصطناعي."
-#: client/options.c:207 client/gui-sdl/optiondlg.c:1121
+#: client/options.c:211 client/gui-sdl/optiondlg.c:1121
#, fuzzy
msgid "Auto Center on Units"
msgstr "السّيّارة توسيط الوØدات"
-#: client/options.c:208
+#: client/options.c:212
#, fuzzy
msgid ""
"Set this option to have the active unit centered automatically when the unit "
"focus changes."
msgstr "المجموعة Ù…Ùعل ÙˆØدات ÙˆØدات."
-#: client/options.c:211 client/gui-sdl/optiondlg.c:1147
+#: client/options.c:215 client/gui-sdl/optiondlg.c:1147
#, fuzzy
msgid "Auto Center on Combat"
msgstr "السّيّارة توسيط معركة"
-#: client/options.c:212
+#: client/options.c:216
#, fuzzy
msgid ""
"Set this option to have any combat be centered automatically. Disabled this "
@@ -8860,22 +8861,22 @@ msgid ""
"entirely."
msgstr "المجموعة معوّق، عاجز، Ùاقد الأهلية أدوار."
-#: client/options.c:217 client/gui-sdl/optiondlg.c:1174
+#: client/options.c:221 client/gui-sdl/optiondlg.c:1174
#, fuzzy
msgid "Focus on Awakened Units"
msgstr "التركيز أيقظ الوØدات"
-#: client/options.c:218
+#: client/options.c:222
#, fuzzy
msgid "Set this option to have newly awoken units be focused automatically."
msgstr "المجموعة."
-#: client/options.c:221
+#: client/options.c:225
#, fuzzy
msgid "Allow goto into the unknown"
msgstr "Ø§Ø³Ù…Ø Ù…Ø¬Ù‡ÙˆÙ„"
-#: client/options.c:222
+#: client/options.c:226
#, fuzzy
msgid ""
"Setting this option will make the game consider moving into unknown tiles. "
@@ -8884,12 +8885,12 @@ msgstr ""
"وضْع :: إطار الÙصّ (ÙÙŠ خاتم) :: Ù…Øيط :: خلÙيّة :: مكان :: الموسيقى الموضوعة "
"لقصيدة إلخ :: \"Øَضْنَة\" بيض متØرك مجهول إذا مسدود مجهول."
-#: client/options.c:226
+#: client/options.c:230
#, fuzzy
msgid "Center map when Popup city"
msgstr "توسيط قاÙزة"
-#: client/options.c:227
+#: client/options.c:231
#, fuzzy
msgid ""
"Setting this option makes the mapview center on a city when its city dialog "
@@ -8898,24 +8899,24 @@ msgstr ""
"وضْع :: إطار الÙصّ (ÙÙŠ خاتم) :: Ù…Øيط :: خلÙيّة :: مكان :: الموسيقى الموضوعة "
"لقصيدة إلخ :: \"Øَضْنَة\" بيض."
-#: client/options.c:230
+#: client/options.c:234
#, fuzzy
msgid "Concise City Production"
msgstr "مصغّر المدينة انتاج"
-#: client/options.c:231
+#: client/options.c:235
#, fuzzy
msgid ""
"Set this option to make the city production (as shown in the city dialog) to "
"be more compact."
msgstr "المجموعة."
-#: client/options.c:234 client/gui-sdl/optiondlg.c:1252
+#: client/options.c:238 client/gui-sdl/optiondlg.c:1252
#, fuzzy
msgid "End Turn when done moving"
msgstr "النهاية الدور منتهي متØرك"
-#: client/options.c:235
+#: client/options.c:239
#, fuzzy
msgid ""
"Setting this option makes your turn end automatically when all your units "
@@ -8924,24 +8925,24 @@ msgstr ""
"وضْع :: إطار الÙصّ (ÙÙŠ خاتم) :: Ù…Øيط :: خلÙيّة :: مكان :: الموسيقى الموضوعة "
"لقصيدة إلخ :: \"Øَضْنَة\" بيض دوران منتهي متØرك."
-#: client/options.c:238 client/gui-sdl/optiondlg.c:1226
+#: client/options.c:242 client/gui-sdl/optiondlg.c:1226
#, fuzzy
msgid "Prompt for city names"
msgstr "الأجل"
-#: client/options.c:239
+#: client/options.c:243
#, fuzzy
msgid ""
"Disabling this option will make the names of newly founded cities chosen "
"automatically by the server."
msgstr "التعطيل."
-#: client/options.c:242 client/gui-sdl/optiondlg.c:1200
+#: client/options.c:246 client/gui-sdl/optiondlg.c:1200
#, fuzzy
msgid "Pop up city dialog for new cities"
msgstr "البوب جديد"
-#: client/options.c:243
+#: client/options.c:247
#, fuzzy
msgid ""
"Setting this option will pop up a newly-founded city's city dialog "
@@ -8950,80 +8951,128 @@ msgstr ""
"وضْع :: إطار الÙصّ (ÙÙŠ خاتم) :: Ù…Øيط :: خلÙيّة :: مكان :: الموسيقى الموضوعة "
"لقصيدة إلخ :: \"Øَضْنَة\" بيض."
-#: client/options.c:248
+#: client/options.c:250
+#, fuzzy
+msgid "Pop up caravan actions"
+msgstr "أوامر العربة"
+
+#: client/options.c:251
+msgid ""
+"If this option is enabled, when caravans arrive at a city where they can "
+"establish a traderoute or help build a wonder, a window will popup asking "
+"which action should be performed. Disabling this option means you will have "
+"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 ""
+
+#: client/options.c:260
+#, fuzzy
+msgid "Enable cursor changing"
+msgstr "تÙعيل مزج ألÙا"
+
+#: client/options.c:261
+msgid ""
+"This option controls whether the client should try to change the mouse "
+"cursor depending on what is being pointed at, as well as to indicate changes "
+"in the client or server state."
+msgstr ""
+
+#: client/options.c:266
+msgid "Select cities before units"
+msgstr ""
+
+#: 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 ""
+
+#: client/options.c:272
+msgid "Clear unit orders on selection"
+msgstr ""
+
+#: client/options.c:273
+msgid ""
+"Enabling this option will cause unit orders to be cleared whenever one or "
+"more units are selected. If this option is disabled, selecting units will "
+"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 ""
+
+#: client/options.c:282
msgid "Background layer"
msgstr "طبقة الخلÙية"
-#: client/options.c:249
+#: client/options.c:283
#, fuzzy
msgid "The background layer of the overview shows just ocean and land."
msgstr "الـ."
-#: client/options.c:252
+#: client/options.c:286
#, fuzzy
msgid "Terrain relief map layer"
msgstr "طبيعة الأرض"
-#: client/options.c:253
+#: client/options.c:287
#, fuzzy
msgid "The relief layer shows all terrains on the map."
msgstr "الـ."
-#: client/options.c:256
+#: client/options.c:290
msgid "Borders layer"
msgstr "طبقة الØدود"
-#: client/options.c:257
+#: client/options.c:291
#, fuzzy
msgid ""
"The borders layer of the overview shows which tiles are owned by each player."
msgstr "الـ."
-#: client/options.c:261
+#: client/options.c:295
msgid "Units layer"
msgstr "طبقة الوØدات"
-#: client/options.c:262
+#: client/options.c:296
#, fuzzy
msgid "Enabling this will draw units on the overview."
msgstr "التمكين."
-#: client/options.c:265
+#: client/options.c:299
msgid "Cities layer"
msgstr "طبقة المدن"
-#: client/options.c:266
+#: client/options.c:300
#, fuzzy
msgid "Enabling this will draw cities on the overview."
msgstr "التمكين."
-#: client/options.c:269
+#: client/options.c:303
msgid "Overview fog of war"
msgstr "ملخص عن ضباب الØرب"
-#: client/options.c:270
+#: client/options.c:304
msgid "Enabling this will show fog of war on the overview."
msgstr "سيظهر تÙعيل هذه ضباب الØرب على الملخص."
-#: client/options.c:488
+#: client/options.c:526
#, fuzzy
msgid "If you add a preset by hand, also update \"number_of_presets\""
msgstr "إذا"
-#: client/options.c:516
+#: client/options.c:554
msgid "Cannot find your home directory"
msgstr "Ùشل العثور على دليل ملÙاتي"
-#: client/options.c:665 client/options.c:796
+#: client/options.c:703 client/options.c:834
msgid "Save failed, cannot find a filename."
msgstr "Ùشل الØÙظ، لا يمكن العثور على اسم ملÙ."
-#: client/options.c:678 client/options.c:859
+#: client/options.c:716 client/options.c:897
#, c-format
msgid "Save failed, cannot write to file %s"
msgstr "Ùشل الØÙظ، لا يمكن الكتابة على مل٠%s"
-#: client/options.c:680 client/options.c:862
+#: client/options.c:718 client/options.c:900
#, c-format
msgid "Saved settings to file %s"
msgstr "تم ØÙظ الاعدادات على المل٠%s"
@@ -9048,16 +9097,16 @@ msgstr "الخادم"
msgid "Start of turn %d"
msgstr "بداية الدور %d"
-#: client/packhand.c:1590
+#: client/packhand.c:1591
#, c-format
msgid "AI Mode is now %s."
msgstr "نمط ذ.ا هو اﻵن %s."
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "ON"
msgstr "شغال"
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "OFF"
msgstr "مطÙئ"
@@ -9089,14 +9138,15 @@ msgid "Username"
msgstr "اسم المستخدم"
#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
-#: client/gui-gtk-2.0/pages.c:2085
+#: client/gui-gtk-2.0/pages.c:2157
msgid "Flag"
msgstr "علم"
#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
-#: client/gui-gtk-2.0/pages.c:1536 client/gui-gtk-2.0/pages.c:2087
-#: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
-#: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
+#: 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/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr "أمة"
@@ -9108,7 +9158,7 @@ msgstr "Øدود"
msgid "Score"
msgstr "نتيجة"
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
msgid "Team"
msgstr "Ùريق"
@@ -9179,181 +9229,207 @@ msgstr "لا يمكن ØªØ³Ø±ÙŠØ %s."
msgid "Could not open temp file."
msgstr "Ùشل ÙØªØ Ù…Ù„Ù Ù…Ø¤Ù‚Øª."
-#: client/servers.c:407
+#: client/servers.c:410
#, fuzzy
msgid "Invalid $http_proxy or metaserver value, must start with 'http://'"
msgstr "العاجز مع"
-#: client/servers.c:413
+#: client/servers.c:416
#, fuzzy
msgid "Failed looking up metaserver's host"
msgstr "Ùاشل"
-#: client/text.c:85 client/text.c:86 client/text.c:91
+#. TRANS: "AI <player name>"
+#: client/text.c:94
+#, c-format
+msgid "AI %s"
+msgstr ""
+
+#. TRANS: "<nation adjective>, team <team name>"
+#: client/text.c:118
+#, fuzzy, c-format
+msgid "%s, team %s"
+msgstr ", الÙريق %s"
+
+#: client/text.c:135 client/text.c:136 client/text.c:141
#: client/gui-sdl/mapview.c:752
msgid "?nation:Neutral"
msgstr "?nation:Ù…Øايد"
-#: client/text.c:85 client/gui-sdl/mapview.c:752
+#: client/text.c:135 client/gui-sdl/mapview.c:752
msgid "?nation:Hostile"
msgstr "?nation:معادي"
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Peaceful"
msgstr "?nation:Ù…Øب للسلام"
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Friendly"
msgstr "?nation:صديق"
-#: client/text.c:88 client/gui-sdl/mapview.c:755
+#: client/text.c:138 client/gui-sdl/mapview.c:755
msgid "?nation:Mysterious"
msgstr "?nation:غامض"
-#: client/text.c:88
+#: client/text.c:138
msgid "?nation:Friendly(team)"
msgstr "?nation:صديق(Ùريق)"
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
msgid "?city:Neutral"
msgstr "?city:Ù…Øايد"
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
msgid "?city:Hostile"
msgstr "?city:معادي"
-#: client/text.c:92 client/gui-sdl/mapview.c:786
+#: client/text.c:142 client/gui-sdl/mapview.c:786
msgid "?city:Peaceful"
msgstr "?city:Ù…Øب للسلام"
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Friendly"
msgstr "?city:صديق"
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Mysterious"
msgstr "?city:غامض"
-#: client/text.c:93
+#: client/text.c:143
msgid "?city:Friendly(team)"
msgstr "?city:صديق(Ùريق)"
-#: client/text.c:100
+#: client/text.c:151
#, c-format
msgid "Location: (%d, %d) [%d]"
msgstr "الموقع: (%d, %d) [%d]"
-#: client/text.c:109
+#: client/text.c:153
+#, c-format
+msgid "Native coordinates: (%d, %d)"
+msgstr ""
+
+#: client/text.c:160
#, c-format
msgid "Terrain: %s"
msgstr "التضاريص: %s"
-#: client/text.c:110
+#: client/text.c:161
#, c-format
msgid "Food/Prod/Trade: %s"
msgstr "الطعام/الانتاج/التجارة: %s"
-#: client/text.c:113
+#: client/text.c:164
msgid "Minor Tribe Village"
msgstr "قرية قبيلة أقلية"
-#: client/text.c:119
+#: client/text.c:173
#, fuzzy
msgid "Our territory"
msgstr "أرضنا"
-#. TRANS: "Polish territory"
-#: client/text.c:122
+#. TRANS: "Territory of <username> (<nation + team>)"
+#: client/text.c:176
#, fuzzy, c-format
-msgid "%s territory"
-msgstr "أرض ال %s"
+msgid "Territory of %s (%s)"
+msgstr ""
+"\n"
+"أرض ال %s %s"
-#. TRANS: "Polish territory (5 turn cease-fire)"
-#: client/text.c:131
+#: client/text.c:186
#, fuzzy, c-format
-msgid "%s territory (%d turn cease-fire)"
-msgid_plural "%s territory (%d turn cease-fire)"
-msgstr[0] "دوران"
-msgstr[1] "دوران"
-msgstr[2] "دوران"
+msgid "Territory of %s (%s) (%d turn cease-fire)"
+msgid_plural "Territory of %s (%s) (%d turn cease-fire)"
+msgstr[0] "المدينة دوران"
+msgstr[1] "المدينة دوران"
+msgstr[2] "المدينة دوران"
-#. TRANS: "Polish territory (friendly)"
-#: client/text.c:140
+#. TRANS: "Territory of <username>
+#. * (<nation + team> | <diplomatic state>)"
+#: client/text.c:195
#, fuzzy, c-format
-msgid "%s territory (%s)"
-msgstr "أرض ال %s %s"
+msgid "Territory of %s (%s | %s)"
+msgstr ""
+"\n"
+"أرض ال %s %s"
-#: client/text.c:145
+#: client/text.c:200
msgid "Unclaimed territory"
msgstr "أرض غير Ù…Øتلة"
-#. TRANS: "City: Warsaw (Polish)"
-#: client/text.c:156
-#, c-format
-msgid "City: %s (%s)"
-msgstr "المدينة: %s (%s)"
+#. TRANS: "City: <city name> | <username> (<nation + team>)"
+#: client/text.c:214
+#, fuzzy, c-format
+msgid "City: %s | %s (%s)"
+msgstr "المدينة: %s (%s, %s)"
-#. TRANS: "City: Warsaw (Polish, 5 turn cease-fire)"
-#: client/text.c:166
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <number> turn cease-fire)"
+#: client/text.c:224
#, fuzzy, c-format
-msgid "City: %s (%s, %d turn cease-fire)"
-msgid_plural "City: %s (%s, %d turn cease-fire)"
+msgid "City: %s | %s (%s, %d turn cease-fire)"
+msgid_plural "City: %s | %s (%s, %d turn cease-fire)"
msgstr[0] "المدينة دوران"
msgstr[1] "المدينة دوران"
msgstr[2] "المدينة دوران"
-#. TRANS: "City: Warsaw (Polish,friendly)"
-#: client/text.c:174
-#, c-format
-msgid "City: %s (%s, %s)"
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <diplomatic state>)"
+#: client/text.c:231
+#, fuzzy, c-format
+msgid "City: %s | %s (%s, %s)"
msgstr "المدينة: %s (%s, %s)"
#. TRANS: previous lines gave other information about the city.
-#: client/text.c:189
+#: client/text.c:246
#, fuzzy, c-format
msgid "?clistbegin: with %s"
msgstr "مع %s"
#. TRANS: "Trade from Warsaw: 5"
-#: client/text.c:202
+#: client/text.c:259
#, c-format
msgid "Trade from %s: %d"
msgstr "تجارة من %s: %d"
-#: client/text.c:210
+#: client/text.c:267
#, c-format
msgid "Infrastructure: %s"
msgstr "البنية التØتية: %s"
-#: client/text.c:215
+#: client/text.c:272
#, c-format
msgid "Activity: %s"
msgstr "النشاط: %s"
-#. TRANS: "Unit: Musketeers (Polish, Warsaw)"
-#. TRANS: "Unit: Musketeers (Polish,friendly)"
-#: client/text.c:226 client/text.c:253
-#, c-format
-msgid "Unit: %s (%s, %s)"
+#. TRANS: "Unit: <unit type> | <username>
+#. * (<nation + team>, <homecity>)"
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <diplomatic state>)"
+#: client/text.c:287 client/text.c:313
+#, fuzzy, c-format
+msgid "Unit: %s | %s (%s, %s)"
msgstr "الوØدة: %s (%s, %s)"
-#. TRANS: "Unit: Musketeers (Polish)"
-#: client/text.c:232
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>)"
+#: client/text.c:292
#, fuzzy, c-format
-msgid "Unit: %s (%s)"
-msgstr "الوØدة: %s (%s)"
+msgid "Unit: %s | %s (%s)"
+msgstr "الوØدة: %s (%s, %s)"
-#. TRANS: "Unit: Musketeers (Polish, 5 turn cease-fire)"
-#: client/text.c:245
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <number> turn cease-fire)"
+#: client/text.c:305
#, fuzzy, c-format
-msgid "Unit: %s (%s, %d turn cease-fire)"
-msgid_plural "Unit: %s (%s, %d turn cease-fire)"
+msgid "Unit: %s | %s (%s, %d turn cease-fire)"
+msgid_plural "Unit: %s | %s (%s, %d turn cease-fire)"
msgstr[0] "الوØدة دوران"
msgstr[1] "الوØدة دوران"
msgstr[2] "الوØدة دوران"
#. TRANS: "Chance to win: A:95% D:46%"
-#: client/text.c:279
+#: client/text.c:338
#, fuzzy, c-format
msgid "Chance to win: A:%d%% D:%d%%"
msgstr ""
@@ -9362,7 +9438,7 @@ msgstr ""
#. TRANS: A is attack power, D is defense power, FP is firepower,
#. * HP is hitpoints (current and max).
-#: client/text.c:286
+#: client/text.c:345
#, fuzzy, c-format
msgid "A:%d D:%d FP:%d HP:%d/%d (%s)"
msgstr ""
@@ -9370,44 +9446,44 @@ msgstr ""
"شركه هولت باكرد"
#. TRANS: "5 more" units on this tile
-#: client/text.c:295
+#: client/text.c:354
#, c-format
msgid " (%d more)"
msgstr " (%d زيادة)"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:364
+#: client/text.c:423
#, c-format
msgid "far from %s"
msgstr "بعيد عن %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:367
+#: client/text.c:426
#, c-format
msgid "near %s"
msgstr "قرب %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:370
+#: client/text.c:429
#, c-format
msgid "in %s"
msgstr "ÙÙŠ %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:403
+#: client/text.c:462
#, c-format
msgid "from %s"
msgstr "من %s"
-#: client/text.c:466
+#: client/text.c:525
msgid "Progress: no research"
msgstr "التقدّم: بلا بØØ« علمي"
-#: client/text.c:470
+#: client/text.c:529
msgid "Progress: no research target"
msgstr "التقدّم: بلا هد٠للبØØ« العلمي"
-#: client/text.c:475
+#: client/text.c:534
#, c-format
msgid "Progress: %d turn/advance"
msgid_plural "Progress: %d turns/advance"
@@ -9415,7 +9491,7 @@ msgstr[0] "التقدّم: %d دور/تقدّم"
msgstr[1] "التقدّم: %d دوران/تقدّم"
msgstr[2] "التقدّم: %d أدوار/تقدّم"
-#: client/text.c:480
+#: client/text.c:539
#, c-format
msgid "%d bulb/turn"
msgid_plural "%d bulbs/turn"
@@ -9423,7 +9499,7 @@ msgstr[0] "%d شمعة/دور"
msgstr[1] "%d شمعتان/دور"
msgstr[2] "%d شمعات/دور"
-#: client/text.c:485
+#: client/text.c:544
#, c-format
msgid ", %d bulb/turn from team"
msgid_plural ", %d bulbs/turn from team"
@@ -9431,12 +9507,12 @@ msgstr[0] "،و %d شمعة/دور من الÙريق"
msgstr[1] "،و %d شمعتان/دور من الÙريق"
msgstr[2] "،و %d شمعات/دور من الÙريق"
-#: client/text.c:512
+#: client/text.c:571
#, c-format
msgid "%d/- (never)"
msgstr "%d/- (أبدا)"
-#: client/text.c:524
+#: client/text.c:583
#, c-format
msgid "%d/%d (%d turn)"
msgid_plural "%d/%d (%d turns)"
@@ -9444,12 +9520,12 @@ msgstr[0] "%d/%d (%d دور)"
msgstr[1] "%d/%d (%d دوران)"
msgstr[2] "%d/%d (%d أدوار)"
-#: client/text.c:527
+#: client/text.c:586
#, c-format
msgid "%d/%d (never)"
msgstr "%d/%d (أبدا)"
-#: client/text.c:564
+#: client/text.c:623
#, c-format
msgid "%d step"
msgid_plural "%d steps"
@@ -9457,7 +9533,7 @@ msgstr[0] "%d خطوة"
msgstr[1] "%d خطوتان"
msgstr[2] "%d خطوات"
-#: client/text.c:566
+#: client/text.c:625
#, c-format
msgid "%d bulb"
msgid_plural "%d bulbs"
@@ -9465,7 +9541,7 @@ msgstr[0] "%d شمعة"
msgstr[1] "%d شمعتان"
msgstr[2] "%d شمعات"
-#: client/text.c:570 client/agents/cma_fec.c:269 client/agents/cma_fec.c:313
+#: 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
#, c-format
msgid "%d turn"
@@ -9474,89 +9550,89 @@ msgstr[0] "%d دور"
msgstr[1] "%d دوران"
msgstr[2] "%d أدوار"
-#: client/text.c:592
+#: client/text.c:651
#, c-format
msgid "Population: %s"
msgstr "عدد السكان: %s"
-#: client/text.c:595
+#: client/text.c:654
#, fuzzy, c-format
msgid "Year: %s (T%d)"
msgstr "السّنة :: سنة :: عام ::العام تي - الØر٠العشرون ÙÙŠ اللغة الإنجليزية"
-#: client/text.c:598
+#: client/text.c:657
#, c-format
msgid "Gold: %d (%+d)"
msgstr "الذهب: %d (%+d)"
-#: client/text.c:600
+#: client/text.c:659
#, c-format
msgid "Tax: %d Lux: %d Sci: %d"
msgstr "الضريبة: %d الرÙاهية: %d العلوم: %d"
-#: client/text.c:607
+#: client/text.c:666
#, fuzzy
msgid "Moving: Nobody"
msgstr "جاري التØرك: %s"
-#: client/text.c:609
+#: client/text.c:668
#, c-format
msgid "Moving: %s"
msgstr "جاري التØرك: %s"
-#: client/text.c:613
+#: client/text.c:672
msgid "(Click for more info)"
msgstr "(انقر لمعلومات أكثر)"
-#: client/text.c:629
+#: client/text.c:688
#, c-format
msgid "%s People"
msgstr "%s الناس"
-#: client/text.c:633
+#: client/text.c:692
#, c-format
msgid "Turn: %d"
msgstr "الدور: %d"
-#: client/text.c:635 client/gui-win32/inteldlg.c:111
+#: client/text.c:694 client/gui-win32/inteldlg.c:111
#: client/gui-xaw/inteldlg.c:208
#, c-format
msgid "Gold: %d"
msgstr "الذهب: %d"
-#: client/text.c:636
+#: client/text.c:695
#, c-format
msgid "Net Income: %d"
msgstr "الدخل الصاÙÙŠ: %d"
#. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:639
+#: client/text.c:698
#, c-format
msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
msgstr "نسب الضريبة: الذهب:%d%% الرÙاهية:%d%% العلوم:%d%%"
-#: client/text.c:643
+#: client/text.c:702
#, c-format
msgid "Researching %s: %s"
msgstr "جاري البØØ« العلمي %s: %s"
-#: client/text.c:650
+#: client/text.c:709
#, c-format
msgid "Global warming chance: %d%% (%+d%%/turn)"
msgstr "Ùرصة الاØترار العالمي: %d%% (%+d%%/دور)"
-#: client/text.c:653
+#: client/text.c:712
#, c-format
msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
msgstr "Ùرصة الشتاء النووي: %d%% (%+d%%/دور)"
-#: client/text.c:658 client/gui-win32/inteldlg.c:104
+#: client/text.c:717 client/gui-win32/inteldlg.c:104
#: client/gui-xaw/inteldlg.c:200
#, c-format
msgid "Government: %s"
msgstr "الØكومة: %s"
-#: client/text.c:682
+#: client/text.c:741
#, c-format
msgid "%d unit"
msgid_plural "%d units"
@@ -9565,21 +9641,21 @@ msgstr[1] "%d ÙˆØدتان"
msgstr[2] "%d ÙˆØدات"
#. TRANS: Impossible to reach goto target tile
-#: client/text.c:715 client/gui-sdl/mapview.c:566
+#: client/text.c:774 client/gui-sdl/mapview.c:566
msgid "?goto:Unreachable"
msgstr ""
-#: client/text.c:717 client/gui-sdl/mapview.c:568
+#: client/text.c:776 client/gui-sdl/mapview.c:568
#, c-format
msgid "Turns to target: %d"
msgstr "الأدوار للهدÙ: %d"
-#: client/text.c:719 client/gui-sdl/mapview.c:570
+#: client/text.c:778 client/gui-sdl/mapview.c:570
#, c-format
msgid "Turns to target: %d to %d"
msgstr "الأدوار للهدÙ: %d إلى %d"
-#: client/text.c:725 client/gui-sdl/mapview.c:576
+#: client/text.c:784 client/gui-sdl/mapview.c:576
#, c-format
msgid "%d unit selected"
msgid_plural "%d units selected"
@@ -9587,34 +9663,34 @@ msgstr[0] "%d ÙˆØدة مختارة"
msgstr[1] "%d ÙˆØدتان مختارتان"
msgstr[2] "%d ÙˆØدات مختارة"
-#: client/text.c:730 client/gui-sdl/mapview.c:581
+#: client/text.c:789 client/gui-sdl/mapview.c:581
msgid "No units selected."
msgstr "بلا أي ÙˆØدات مختارة."
-#: client/text.c:804 client/gui-sdl/mapview.c:654
+#: client/text.c:863 client/gui-sdl/mapview.c:654
#, c-format
msgid "Others: %d civil; %d military"
msgstr "الآخرون: %d مدني; %d عسكري"
-#: client/text.c:806 client/gui-sdl/mapview.c:656
+#: client/text.c:865 client/gui-sdl/mapview.c:656
#, c-format
msgid "Others: %d civilian"
msgstr "الآخرون: %d مدني"
-#: client/text.c:808 client/gui-sdl/mapview.c:658
+#: client/text.c:867 client/gui-sdl/mapview.c:658
#, c-format
msgid "Others: %d military"
msgstr "الآخرون: %d عسكري"
-#: client/text.c:839
+#: client/text.c:898
msgid "No units to upgrade!"
msgstr "لا توجد أي ÙˆØدة لتطويرها!"
-#: client/text.c:864
+#: client/text.c:923
msgid "None of these units may be upgraded."
msgstr "لا يمكن تطوير أي من هذه الوØدات."
-#: client/text.c:870
+#: client/text.c:929
#, fuzzy, c-format
msgid ""
"Upgrade %d unit for %d gold?\n"
@@ -9626,73 +9702,73 @@ msgstr[0] "تطوير ÙˆØدات الذهب الذهب."
msgstr[1] "تطوير ÙˆØدات الذهب الذهب."
msgstr[2] "تطوير ÙˆØدات الذهب الذهب."
-#: client/text.c:891
+#: client/text.c:950
#, fuzzy
msgid "Shows your progress in researching the current technology."
msgstr "المعارض."
-#: client/text.c:897
+#: client/text.c:956
msgid "no research target."
msgstr "بلا هد٠للبØØ« العلمي."
#. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:900
+#: client/text.c:959
#, c-format
msgid "%s: %d/%d."
msgstr "%s: %d/%d."
-#: client/text.c:920
+#: client/text.c:979
msgid "Shows the progress of global warming:"
msgstr "يعرض لك تقدم الاØترار العالمي:"
-#: client/text.c:921
+#: client/text.c:980
#, c-format
msgid "Pollution rate: %d%%"
msgstr "نسبة التلوث: %d%%"
-#: client/text.c:923
+#: client/text.c:982
#, c-format
msgid "Chance of catastrophic warming each turn: %d%%"
msgstr "Ùرصة Øصول كارثة الاØترار لكل دور: %d%%"
-#: client/text.c:939
+#: client/text.c:998
msgid "Shows the progress of nuclear winter:"
msgstr "يعرض لك تقدم الشتاء النووي:"
-#: client/text.c:940
+#: client/text.c:999
#, c-format
msgid "Fallout rate: %d%%"
msgstr "نسبة الغبار الذري: %d%%"
-#: client/text.c:942
+#: client/text.c:1001
#, c-format
msgid "Chance of catastrophic winter each turn: %d%%"
msgstr "Ùرصة Øصول كارثة الشتاء لكل دور: %d%%"
-#: client/text.c:957
+#: client/text.c:1016
msgid "Shows your current government:"
msgstr "يظهر لك Øكومتك الØالية:"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:981
+#: client/text.c:1040
#, c-format
msgid "Population: %5d"
msgstr "عدد السكان: %5d"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:1043
#, c-format
msgid "Support: %5d %%"
msgstr "الدعم: %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:1047
#, c-format
msgid "Energy: %5d %%"
msgstr "الطاقة: %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:992
+#: client/text.c:1051
#, c-format
msgid "Mass: %5d ton"
msgid_plural "Mass: %5d tons"
@@ -9701,96 +9777,97 @@ msgstr[1] "الكتلة: %5d طنان"
msgstr[2] "الكتلة: %5d أطنان"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1057
#, c-format
msgid "Travel time: %5.1f years"
msgstr "مدة السÙر: %5.1f سنوات"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1061
msgid "Travel time: N/A "
msgstr "مدة السÙر: غير متوÙرة "
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1065
#, c-format
msgid "Success prob.: %5d %%"
msgstr "اØتمالية النجاØ: %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1010
+#: client/text.c:1069
#, c-format
msgid "Year of arrival: %8s"
msgstr "سنة الوصول: %8s"
-#: client/text.c:1030
+#: client/text.c:1089
msgid "?timeout:off"
msgstr "?timeout:مطÙئ"
-#: client/text.c:1054
+#: client/text.c:1113
#, c-format
msgid "?seconds:%02ds"
msgstr "?seconds:%02dث"
-#: client/text.c:1056
+#: client/text.c:1115
#, c-format
msgid "?mins/secs:%02dm %02ds"
msgstr "?mins/secs:%02dد %02dث"
-#: client/text.c:1058
+#: client/text.c:1117
#, c-format
msgid "?hrs/mns:%02dh %02dm"
msgstr ""
-#: client/text.c:1060
+#: client/text.c:1119
#, c-format
msgid "?dys/hrs:%02dd %02dh"
msgstr ""
-#: client/text.c:1063
+#: client/text.c:1122
msgid "?duration:overflow"
msgstr "?duration:Ùائض"
-#: client/text.c:1084
+#: client/text.c:1143
#, c-format
msgid "%6d.%02d ms"
msgstr "%6d.%02d ملي ثانية"
-#. TRANS: "Republic of the Poles"
-#: client/text.c:1127
-#, c-format
-msgid "%s of the %s"
-msgstr "%s من ال %s"
+#. TRANS: <nation adjective> <government name>.
+#. * E.g. "Polish Republic".
+#: client/text.c:1188
+#, fuzzy, c-format
+msgid "?nationgovernment:%s %s"
+msgstr "الØكومة: %s"
#. TRANS: "Observer: 1985"
-#: client/text.c:1137
+#: client/text.c:1198
#, c-format
msgid "Observer: %s"
msgstr "المراقب : %s"
-#: client/text.c:1155
+#: client/text.c:1216
msgid "Buildings: "
msgstr "المباني : "
-#: client/text.c:1172 client/text.c:1211
+#: client/text.c:1233 client/text.c:1272
msgid "None. "
msgstr "لا شيئ. "
-#: client/text.c:1174 client/text.c:1213
+#: client/text.c:1235 client/text.c:1274
msgid "?clistend:."
msgstr "."
-#: client/text.c:1192
+#: client/text.c:1253
msgid "Wonders: "
msgstr "العجائب: "
-#: client/text.c:1247
+#: client/text.c:1308
#, 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:1251
+#: client/text.c:1312
#, fuzzy, c-format
msgid "%d content before penalty."
msgid_plural "%d content before penalty."
@@ -9799,7 +9876,7 @@ msgstr[1] "%d السعادة قبل العقوبة مع"
msgstr[2] "%d السعادة قبل العقوبة مع"
#. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1257
+#: client/text.c:1318
#, fuzzy, c-format
msgid "%d additional unhappy citizen."
msgid_plural "%d additional unhappy citizens."
@@ -9807,39 +9884,36 @@ msgstr[0] "%d مواطنين تعيسيين إضاÙيين."
msgstr[1] "%d مواطنين تعيسيين إضاÙيين."
msgstr[2] "%d مواطنين تعيسيين إضاÙيين."
-#. TRANS: Martial law opening parenthesis
-#: client/text.c:1279
-msgid "Martial law in effect ("
+#: client/text.c:1339
+#, fuzzy
+msgid "Unlimited martial law in effect."
msgstr "الØكم العرÙÙŠ موجود ("
-#. TRANS: no [unit] maximum
-#: client/text.c:1284
-msgid "no maximum, "
-msgstr "بدون Øد أقصى, "
-
-#: client/text.c:1287
-#, c-format
-msgid "%d unit maximum, "
-msgid_plural "%d units maximum, "
-msgstr[0] "%d ÙˆØدة الØد الأقصى, "
-msgstr[1] "%d ÙˆØدتان الØد الأقصى, "
-msgstr[2] "%d ÙˆØدات الØد الأقصى, "
+#: client/text.c:1341
+#, fuzzy, 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] "أي - الØر٠الأوّل ÙÙŠ الأبجديّة اللّاتينيّة ÙˆØدات الهجوم"
+msgstr[2] "أي - الØر٠الأوّل ÙÙŠ الأبجديّة اللّاتينيّة ÙˆØدات الهجوم"
-#. TRANS: Martial law closing parenthesis
-#: client/text.c:1294
-#, c-format
-msgid "%d per unit). "
-msgstr "%d لكل ÙˆØدة). "
+#: client/text.c:1345
+#, fuzzy, 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] "يسلّي."
+msgstr[2] "يسلّي."
-#: client/text.c:1298
+#: client/text.c:1352
msgid "Military units in the field may cause unhappiness. "
msgstr "يمكن للوØدات العسكرية ÙÙŠ الميدان أن تسبب التعاسة. "
-#: client/text.c:1301
+#: client/text.c:1355
msgid "Military units have no happiness effect. "
msgstr "لا يوجد للوØدات العسكرية تأثير على السعادة. "
-#: client/text.c:1316
+#: client/text.c:1370
#, c-format
msgid "Luxury: %d total."
msgstr "الرÙاهية: %d المجموع."
@@ -9862,7 +9936,7 @@ msgid ""
"instead."
msgstr "الزبون الإستعمال."
-#: client/tilespec.c:3968
+#: client/tilespec.c:3966
#, fuzzy, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
@@ -9883,12 +9957,12 @@ msgid ""
"have a look."
msgstr "الـ مواطنيين مع أنت."
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
-#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:599
+#: client/gui-gtk-2.0/cityrep.c:624 client/gui-sdl/citydlg.c:2009
msgid "none"
msgstr "لا شيئ"
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:645
msgid "custom"
msgstr "Ù…Ùعدّل"
@@ -10194,7 +10268,7 @@ msgstr "انشاء طريق _تجارة"
msgid "Enter Marketplace"
msgstr "الدخول إلى السوق"
-#: client/gui-gtk-2.0/chatline.c:144 client/gui-win32/chatline.c:134
+#: client/gui-gtk-2.0/chatline.c:218 client/gui-win32/chatline.c:134
#: client/gui-xaw/chatline.c:120
msgid "Cleared output window."
msgstr "تم Ù…ØÙˆ ناÙذة المخرجات."
@@ -10275,11 +10349,11 @@ msgid "%d/%d %d turns"
msgstr "%d/%d %d أدوار"
#: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:821
+#: client/gui-gtk-2.0/cityrep.c:1027
msgid "_Buy"
msgstr "_شراء"
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:869
#, fuzzy
msgid "_Production"
msgstr "ا_نتاج"
@@ -10301,12 +10375,12 @@ msgid "Entertainers"
msgstr "المغنيين"
#: client/gui-gtk-2.0/citydlg.c:1029 client/gui-win32/citydlg.c:1989
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2403
msgid "Scientists"
msgstr "العلماء"
#: client/gui-gtk-2.0/citydlg.c:1030 client/gui-win32/citydlg.c:1991
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2404
msgid "Taxmen"
msgstr "جباة الضريبة"
@@ -10399,7 +10473,7 @@ msgstr "الوØدات المدعومة %d"
msgid "Present units %d"
msgstr "الوØدات الموجودة %d"
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:1019
msgid "Cen_ter"
msgstr "و_سط"
@@ -10488,32 +10562,62 @@ msgstr "تغيير اسم المدينة"
msgid "What should we rename the city to?"
msgstr "ماذا تريد تغيير اسم المدينة إلى?"
-#: client/gui-gtk-2.0/cityrep.c:699
+#: client/gui-gtk-2.0/cityrep.c:794
+#, fuzzy
+msgid "(no worklists defined)"
+msgstr "(قائمة العمل)"
+
+#: client/gui-gtk-2.0/cityrep.c:876
msgid "Chan_ge"
msgstr "ت_غيير"
-#: client/gui-gtk-2.0/cityrep.c:703
+#: client/gui-gtk-2.0/cityrep.c:880
msgid "Add _First"
msgstr "إضاÙØ© إلى الأ_ول"
-#: client/gui-gtk-2.0/cityrep.c:707
+#: client/gui-gtk-2.0/cityrep.c:884
msgid "Add _Next"
msgstr "إضاÙØ© _بعد الØالي"
-#: client/gui-gtk-2.0/cityrep.c:711
+#: client/gui-gtk-2.0/cityrep.c:888
+#, fuzzy
+msgid "Add _2nd Last"
+msgstr "إضاÙØ© إلى اﻵ_خر"
+
+#: client/gui-gtk-2.0/cityrep.c:892
msgid "Add _Last"
msgstr "إضاÙØ© إلى اﻵ_خر"
-#: client/gui-gtk-2.0/cityrep.c:715
+#: client/gui-gtk-2.0/cityrep.c:899
+#, fuzzy
+msgid "Set Worklist"
+msgstr "قائمة العمل"
+
+#: client/gui-gtk-2.0/cityrep.c:905
+#, fuzzy
+msgid "Append Worklist"
+msgstr "اعادة تسمية قائمة عمل"
+
+#: client/gui-gtk-2.0/cityrep.c:911
+#, fuzzy
+msgid "Clear _Worklist"
+msgstr "الهد٠قائمة العمل:"
+
+#: client/gui-gtk-2.0/cityrep.c:916
+#, fuzzy
+msgid "Gover_nor"
+msgstr "Ù…ØاÙظ"
+
+#: client/gui-gtk-2.0/cityrep.c:921
msgid "_Select"
msgstr "ا_ختيار"
-#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
+#: client/gui-gtk-2.0/cityrep.c:925 client/gui-gtk-2.0/plrdlg.c:521
#, fuzzy
msgid "_Display"
msgstr "ا_ظهار"
-#: client/gui-gtk-2.0/cityrep.c:800 client/gui-gtk-2.0/menu.c:808
+#: 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-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
#: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -10523,101 +10627,101 @@ msgstr "ا_ظهار"
msgid "Cities"
msgstr "المدن"
-#: client/gui-gtk-2.0/cityrep.c:817
+#: client/gui-gtk-2.0/cityrep.c:1023
#, fuzzy
msgid "_Inspect"
msgstr "قاÙزة"
-#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
-#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-sdl/helpdlg.c:297 client/gui-win32/menu.c:342
-#: client/gui-xaw/menu.c:241
+#: 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
+#: client/gui-gtk-2.0/cityrep.c:1518 client/gui-gtk-2.0/menu.c:823
+#: client/gui-gtk-2.0/menu.c:825 client/gui-gtk-2.0/menu.c:827
+#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:831
+#: client/gui-gtk-2.0/menu.c:833 client/gui-sdl/helpdlg.c:297
+#: client/gui-win32/menu.c:342 client/gui-xaw/menu.c:241
msgid "Improvements"
msgstr "التØسينات"
-#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
-#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
-#: client/gui-xaw/menu.c:247
+#: client/gui-gtk-2.0/cityrep.c:1441 client/gui-gtk-2.0/cityrep.c:1460
+#: client/gui-gtk-2.0/cityrep.c:1479 client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1522 client/gui-xaw/menu.c:247
msgid "Wonders"
msgstr "العجائب"
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1662 client/gui-win32/cityrep.c:439
#: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
msgid "All Cities"
msgstr "كل المدن"
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1667 client/gui-win32/cityrep.c:440
msgid "No Cities"
msgstr "بلا مدن"
-#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1672 client/gui-win32/cityrep.c:441
msgid "Invert Selection"
msgstr "عكس الاختيار"
-#: client/gui-gtk-2.0/cityrep.c:1420
+#: client/gui-gtk-2.0/cityrep.c:1682
msgid "Building Units"
msgstr "جاري بناء الوØدات"
-#: client/gui-gtk-2.0/cityrep.c:1426
+#: client/gui-gtk-2.0/cityrep.c:1688
msgid "Building Improvements"
msgstr "جاري بناء التØسينات"
-#: client/gui-gtk-2.0/cityrep.c:1432
+#: client/gui-gtk-2.0/cityrep.c:1694
msgid "Building Wonders"
msgstr "جاري بناء العجائب"
-#: client/gui-gtk-2.0/cityrep.c:1444
+#: client/gui-gtk-2.0/cityrep.c:1706
msgid "Building Unit"
msgstr "جاري بناء الوØدة"
-#: client/gui-gtk-2.0/cityrep.c:1448
+#: client/gui-gtk-2.0/cityrep.c:1710
msgid "Building Improvement"
msgstr "Øاري بناء التØسين"
-#: client/gui-gtk-2.0/cityrep.c:1452
+#: client/gui-gtk-2.0/cityrep.c:1714
msgid "Building Wonder"
msgstr "جاري بناء الأعجوبة"
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1722 client/gui-win32/cityrep.c:443
msgid "Coastal Cities"
msgstr "المدن الساØلية"
-#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1727 client/gui-win32/cityrep.c:444
msgid "Same Island"
msgstr "Ù†Ùس الجزيرة"
-#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1737 client/gui-win32/cityrep.c:447
msgid "Supported Units"
msgstr "الوØدات المدعومة"
-#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1740 client/gui-win32/cityrep.c:454
msgid "Units Present"
msgstr "الوØدات الموجودة"
-#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1744 client/gui-win32/cityrep.c:469
msgid "Improvements in City"
msgstr "تØسينات المدينة"
-#: client/gui-gtk-2.0/cityrep.c:1486
+#: client/gui-gtk-2.0/cityrep.c:1748
msgid "Wonders in City"
msgstr "عجائب المدينة"
-#: client/gui-gtk-2.0/cityrep.c:1495
+#: client/gui-gtk-2.0/cityrep.c:1757
msgid "Available Units"
msgstr "الوØدات المتوÙرة"
-#: client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1760
msgid "Available Improvements"
msgstr "التØسينات المتوÙرة"
-#: client/gui-gtk-2.0/cityrep.c:1501
+#: client/gui-gtk-2.0/cityrep.c:1763
msgid "Available Wonders"
msgstr "العجائب المتوÙرة"
-#: client/gui-gtk-2.0/cityrep.c:1625
+#: client/gui-gtk-2.0/cityrep.c:1882
#, fuzzy, c-format
msgid "Total Buy Cost: %d"
msgstr "الكلÙØ© الكلية: "
@@ -10684,11 +10788,11 @@ msgstr "ماذا تريدنا أن نسمي التجهيز المسبق?"
msgid "Remove this preset?"
msgstr "هل تريد إزالة هذا التجهيز المسبق?"
-#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:186
+#: client/gui-gtk-2.0/dialogs.c:196 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:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
#, fuzzy
msgid "Inspect _City"
msgstr "قاÙزة المدينة"
@@ -10717,10 +10821,10 @@ msgstr "اختيار ماذا تريد أن تنهب:"
msgid "Unit"
msgstr "الوØدة"
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
-#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
-#: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
-#: manual/civmanual.c:302 data/Freeciv.in:80
+#: 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-win32/plrdlg.c:335 manual/civmanual.c:302 data/Freeciv.in:80
msgid "Name"
msgstr "الاسم"
@@ -10746,7 +10850,7 @@ 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:1036 data/Freeciv.in:3371
+#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
msgid "Pick Nation"
msgstr "اختيار الأمة"
@@ -10828,7 +10932,7 @@ msgstr "_خرائط"
msgid "_Advances"
msgstr "الت_قدم"
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:910
+#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr "_مدن"
@@ -10934,118 +11038,187 @@ msgstr "اختيار الإتجاه"
msgid "Show _All Cities"
msgstr "إظهار _كل المدن"
-#: client/gui-gtk-2.0/gui_main.c:150
+#: client/gui-gtk-2.0/gui_main.c:162
#, fuzzy
msgid "Show Map Scrollbars"
msgstr ""
"المعرض الخريطة شرائط ØªØªÙŠØ Ø±Ø¤ÙŠØ© الكلام والصّور من الوثيقة الكبيرة عن طريق "
"التمرير"
-#: client/gui-gtk-2.0/gui_main.c:151
+#: client/gui-gtk-2.0/gui_main.c:163
#, fuzzy
msgid "Disable this option to hide the scrollbars on the map view."
msgstr "يضعÙØŒ يعجز، ÙŠÙقد الأهلية."
-#: client/gui-gtk-2.0/gui_main.c:155
+#: client/gui-gtk-2.0/gui_main.c:167
msgid "Keyboardless goto"
msgstr "الذهاب بدون لوØØ© المÙاتيØ"
-#: client/gui-gtk-2.0/gui_main.c:156
+#: client/gui-gtk-2.0/gui_main.c:168
#, 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:161
+#: client/gui-gtk-2.0/gui_main.c:173
msgid "Keep dialogs on top"
msgstr "ابقاء مربعات الØوار ÙÙŠ المقدمة"
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:174
#, 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:166
+#: client/gui-gtk-2.0/gui_main.c:178
msgid "Show worklist task icons"
msgstr "اعرض أيقونات مهام قائمة العمل"
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:179
#, 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:171
+#: client/gui-gtk-2.0/gui_main.c:183
#, fuzzy
msgid "Enable status report tabs"
msgstr "يؤهّل‎، يخول، يمكن"
-#: client/gui-gtk-2.0/gui_main.c:172
+#: client/gui-gtk-2.0/gui_main.c:184
#, 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:177 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:189 client/gui-win32/gui_main.c:110
msgid "Better fog-of-war drawing"
msgstr "رسم ضباب الØرب بشكل Ø£Ùضل"
-#: client/gui-gtk-2.0/gui_main.c:178 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:190 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:277 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:195
+msgid "Show time for each chat message"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:196
+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
+msgid "Split bottom notebook area"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:202
+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
+msgid "New message events go to top of list"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:208
+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
+msgid "Show extra message window buttons"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:214
+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 "
+"is disabled, these buttons will not appear (you can still double-click with "
+"the left mouse button or right-click on a row to inspect or goto "
+"respectively). This option will only take effect once the message window is "
+"closed and reopened."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:224
+msgid "Metaserver tab first in network page"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:225
+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
+msgid "Plain chat messages are sent to allies only"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:231
+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 "
+"messages will be sent as public chat messages. To send a public chat message "
+"with this option enabled, prefix the message with a single colon ':'. This "
+"option can also be set using a toggle button beside the chat entry (only "
+"visible in multiplayer games)."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:340 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:723 client/gui-gtk-2.0/gui_main.c:1345
+#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
msgid "Freeciv"
msgstr "برنامج Freeciv"
-#: client/gui-gtk-2.0/gui_main.c:1088 client/gui-gtk-2.0/gui_main.c:1095
+#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
#: 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:1095 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1232 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:1127 client/gui-gtk-2.0/menu.c:770
-#: client/gui-gtk-2.0/menu.c:772 client/gui-gtk-2.0/menu.c:774
-#: client/gui-gtk-2.0/menu.c:776 client/gui-gtk-2.0/menu.c:778
-#: client/gui-gtk-2.0/menu.c:780 client/gui-gtk-2.0/menu.c:782
-#: client/gui-gtk-2.0/menu.c:784 client/gui-gtk-2.0/menu.c:786
-#: client/gui-gtk-2.0/menu.c:788 client/gui-gtk-2.0/menu.c:790
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-gtk-2.0/menu.c:804 client/gui-gtk-2.0/menu.c:806
-#: client/gui-gtk-2.0/menu.c:808 client/gui-gtk-2.0/menu.c:810
-#: client/gui-gtk-2.0/menu.c:812 client/gui-gtk-2.0/menu.c:814
-#: client/gui-gtk-2.0/menu.c:816 client/gui-gtk-2.0/menu.c:818
-#: client/gui-gtk-2.0/menu.c:820 client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/gui_main.c:1266 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
+#: client/gui-gtk-2.0/menu.c:811 client/gui-gtk-2.0/menu.c:813
+#: client/gui-gtk-2.0/menu.c:815 client/gui-gtk-2.0/menu.c:817
+#: client/gui-gtk-2.0/menu.c:819 client/gui-gtk-2.0/menu.c:821
+#: client/gui-gtk-2.0/menu.c:823 client/gui-gtk-2.0/menu.c:825
+#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
+#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
+#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
+#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
+#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
+#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
#: data/Freeciv.in:2028
msgid "View"
msgstr "العرض"
-#: client/gui-gtk-2.0/gui_main.c:1208
+#: client/gui-gtk-2.0/gui_main.c:1359
msgid "Chat"
msgstr "دردشة"
-#: client/gui-gtk-2.0/gui_main.c:1224 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1377 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"
@@ -11056,71 +11229,75 @@ msgstr ""
"ضمن بعض الشروط، انظر إلى عنصر \"النسخ\" على قائمة المساعدة.\n"
"اﻵن.. اذقهم الجØيم!"
-#: client/gui-gtk-2.0/gui_main.c:1491
+#: client/gui-gtk-2.0/gui_main.c:1392
+msgid "Allies Only"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:1657
msgid "Not _ready"
msgstr "غير _جاهز"
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
+#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
msgid "_Ready"
msgstr "_جاهز"
-#: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2132
+#: 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
msgid "_Start"
msgstr "_بدء"
-#: client/gui-gtk-2.0/gui_main.c:1520
+#: client/gui-gtk-2.0/gui_main.c:1686
#, fuzzy
msgid "_Take Player"
msgstr "أخذ مكان هذا اللاعب"
-#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
+#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
msgid "Pick _Nation"
msgstr "اختيار الأ_مة"
-#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
+#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
msgid "_Observe"
msgstr "_مراقبة"
-#: client/gui-gtk-2.0/gui_main.c:1532
+#: client/gui-gtk-2.0/gui_main.c:1698
#, fuzzy
msgid "Do not _observe"
msgstr "_لا تراقب"
-#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
msgid "<AI>"
msgstr "<ذ.ا>"
-#: client/gui-gtk-2.0/gui_main.c:1557
+#: client/gui-gtk-2.0/gui_main.c:1723
msgid "<Novice AI>"
msgstr "<ذ.ا مبتدئ>"
-#: client/gui-gtk-2.0/gui_main.c:1560
+#: client/gui-gtk-2.0/gui_main.c:1726
msgid "<Easy AI>"
msgstr "<ذ.ا سهل>"
-#: client/gui-gtk-2.0/gui_main.c:1563
+#: client/gui-gtk-2.0/gui_main.c:1729
msgid "<Normal AI>"
msgstr "<ذ.ا عادي>"
-#: client/gui-gtk-2.0/gui_main.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1732
msgid "<Hard AI>"
msgstr "<ذ.ا صعب>"
-#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1742 client/gui-win32/dialogs.c:594
#: client/gui-xaw/pages.c:217
msgid "Random"
msgstr "عشوائي"
-#: client/gui-gtk-2.0/gui_main.c:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
msgid "Observer"
msgstr "متÙرج"
-#: client/gui-gtk-2.0/gui_main.c:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
msgid "Detached"
msgstr "منÙصل"
-#: client/gui-gtk-2.0/gui_main.c:1899
+#: client/gui-gtk-2.0/gui_main.c:2073
msgid "Are you sure you want to quit?"
msgstr "هل تريد الخروج?"
@@ -11356,469 +11533,506 @@ msgstr "ال_تكنولوجيات"
msgid "Foreign Intelligence: %s Empire"
msgstr "مخابرات خارجية: %s الامبراطورية"
-#: client/gui-gtk-2.0/mapctrl.c:195 client/gui-sdl/mapctrl.c:2565
+#: client/gui-gtk-2.0/mapctrl.c:179 client/gui-sdl/mapctrl.c:2565
#: client/gui-sdl/menu.c:839 client/gui-sdl/menu.c:1021
#: client/gui-win32/mapctrl.c:353
msgid "Build New City"
msgstr "بناء مدينة جديدة"
-#: client/gui-gtk-2.0/mapctrl.c:196 client/gui-sdl/mapctrl.c:2594
+#: client/gui-gtk-2.0/mapctrl.c:180 client/gui-sdl/mapctrl.c:2594
#: client/gui-win32/mapctrl.c:354 client/gui-xaw/mapctrl.c:89
msgid "What should we call our new city?"
msgstr "ماذا تريد أن نسمي مدينتنا الجديدة?"
-#: client/gui-gtk-2.0/mapview.c:147
+#: client/gui-gtk-2.0/mapview.c:158
msgid "Shows your current luxury/science/tax rates;click to toggle them."
msgstr "إظهار النسب الØالية للرÙاهية/العلوم/الضريبة; انقر للتشغيل أو للتعطيل."
-#: client/gui-gtk-2.0/mapview.c:692 client/gui-win32/canvas.c:275
+#: client/gui-gtk-2.0/mapview.c:702 client/gui-win32/canvas.c:275
msgid "Better fog will only work in truecolor. Disabling it"
msgstr "سيعمل الضباب الأÙضل Ùقط ÙÙŠ نمط الألوان الØقيقية. جاري تعطيله"
-#: client/gui-gtk-2.0/menu.c:250
+#: client/gui-gtk-2.0/menu.c:256
msgid "Leaving a local game will end it!"
msgstr "تركك للعبة داخلية سينهيها!"
-#: client/gui-gtk-2.0/menu.c:700 client/gui-win32/menu.c:303
+#: client/gui-gtk-2.0/menu.c:727 client/gui-win32/menu.c:303
msgid "_Game"
msgstr "الل_عبة"
-#: client/gui-gtk-2.0/menu.c:702 client/gui-gtk-2.0/menu.c:704
-#: client/gui-gtk-2.0/menu.c:706 client/gui-gtk-2.0/menu.c:708
-#: client/gui-gtk-2.0/menu.c:710 client/gui-gtk-2.0/menu.c:712
-#: client/gui-gtk-2.0/menu.c:714 client/gui-gtk-2.0/menu.c:717
-#: client/gui-gtk-2.0/menu.c:720 client/gui-gtk-2.0/menu.c:722
-#: client/gui-gtk-2.0/menu.c:724 client/gui-gtk-2.0/menu.c:726
-#: client/gui-gtk-2.0/menu.c:728 client/gui-gtk-2.0/menu.c:730
-#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:736
-#: client/gui-gtk-2.0/menu.c:738 client/gui-gtk-2.0/menu.c:740
+#: client/gui-gtk-2.0/menu.c:729 client/gui-gtk-2.0/menu.c:731
+#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:735
+#: client/gui-gtk-2.0/menu.c:737 client/gui-gtk-2.0/menu.c:739
+#: client/gui-gtk-2.0/menu.c:741 client/gui-gtk-2.0/menu.c:744
+#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
+#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
+#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
+#: client/gui-gtk-2.0/menu.c:760 client/gui-gtk-2.0/menu.c:763
+#: client/gui-gtk-2.0/menu.c:765 client/gui-gtk-2.0/menu.c:767
#: data/Freeciv.in:2026
msgid "Game"
msgstr "اللعبة"
-#: client/gui-gtk-2.0/menu.c:704 client/gui-gtk-2.0/menu.c:706
-#: client/gui-gtk-2.0/menu.c:708
+#: client/gui-gtk-2.0/menu.c:731 client/gui-gtk-2.0/menu.c:733
+#: client/gui-gtk-2.0/menu.c:735
msgid "_Chat"
msgstr "_دردشة"
-#: client/gui-gtk-2.0/menu.c:706 client/gui-win32/menu.c:314
+#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:314
msgid "_Clear Log"
msgstr "_Ù…ØÙˆ السجل"
-#: client/gui-gtk-2.0/menu.c:708 client/gui-win32/menu.c:313
+#: client/gui-gtk-2.0/menu.c:735 client/gui-win32/menu.c:313
#, fuzzy
msgid "_Write Log"
msgstr "_تصدير السجل"
-#: client/gui-gtk-2.0/menu.c:710 client/gui-win32/menu.c:304
+#: client/gui-gtk-2.0/menu.c:737 client/gui-win32/menu.c:304
msgid "Local _Options"
msgstr "ال_خيارات الداخلية"
-#: client/gui-gtk-2.0/menu.c:712 client/gui-win32/menu.c:305
+#: client/gui-gtk-2.0/menu.c:739 client/gui-win32/menu.c:305
msgid "_Message Options"
msgstr "خيارات ال_رسالة"
-#: client/gui-gtk-2.0/menu.c:717
+#: client/gui-gtk-2.0/menu.c:744
msgid "_Reload Tileset"
msgstr "Ø¥_عادة تØميل مجموعة البلاط"
-#: client/gui-gtk-2.0/menu.c:720
+#: client/gui-gtk-2.0/menu.c:747
msgid "Save Options on _Exit"
msgstr "ØÙظ الخيارات عند ال_خروج"
-#: client/gui-gtk-2.0/menu.c:722
+#: client/gui-gtk-2.0/menu.c:749
msgid "Sa_ve Options"
msgstr "_ØÙظ الخيارات"
-#: client/gui-gtk-2.0/menu.c:726 client/gui-win32/menu.c:308
+#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:308
msgid "Server O_ptions"
msgstr "خيارات ال_خادم"
-#: client/gui-gtk-2.0/menu.c:730 client/gui-win32/menu.c:310
+#: client/gui-gtk-2.0/menu.c:757 client/gui-win32/menu.c:310
msgid "_Save Game"
msgstr "Ø_Ùظ اللعبة"
-#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:311
+#: client/gui-gtk-2.0/menu.c:760 client/gui-win32/menu.c:311
msgid "Save Game _As..."
msgstr "ØÙظ اللعبة _Ùƒ..."
-#: client/gui-gtk-2.0/menu.c:738
+#: client/gui-gtk-2.0/menu.c:765
msgid "_Leave"
msgstr "_ترك"
-#: client/gui-gtk-2.0/menu.c:740 client/gui-win32/menu.c:317
+#: client/gui-gtk-2.0/menu.c:767 client/gui-win32/menu.c:317
msgid "_Quit"
msgstr "_خروج"
-#: client/gui-gtk-2.0/menu.c:745 client/gui-win32/menu.c:321
+#: client/gui-gtk-2.0/menu.c:772 client/gui-win32/menu.c:321
msgid "Gov_ernment"
msgstr "_Øكومة"
-#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
-#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
-#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:774 client/gui-gtk-2.0/menu.c:776
+#: client/gui-gtk-2.0/menu.c:778 client/gui-gtk-2.0/menu.c:780
+#: client/gui-gtk-2.0/menu.c:782 client/gui-gtk-2.0/menu.c:784
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
#: client/gui-xaw/menu.c:248 data/Freeciv.in:2027 data/helpdata.txt:1320
msgid "Government"
msgstr "Øكومة"
-#: client/gui-gtk-2.0/menu.c:749 client/gui-win32/menu.c:322
+#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:322
msgid "_Tax Rates"
msgstr "نسب ال_ضريبة"
-#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:324
+#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:324
msgid "_Find City"
msgstr "العثور على مدينة"
-#: client/gui-gtk-2.0/menu.c:755 client/gui-win32/menu.c:325
+#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:325
msgid "_Worklists"
msgstr "_قوائم العمل"
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
-#: client/gui-gtk-2.0/menu.c:764 client/gui-win32/menu.c:327
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
+#: client/gui-gtk-2.0/menu.c:791 client/gui-win32/menu.c:327
msgid "_Change Government"
msgstr "ت_غيير الØكومة"
-#: client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:788
msgid "_Revolution..."
msgstr "_ثورة..."
-#: client/gui-gtk-2.0/menu.c:764 client/gui-gtk-2.0/menu.c:970
+#: client/gui-gtk-2.0/menu.c:791 client/gui-gtk-2.0/menu.c:1013
#: client/gui-win32/menu.c:431
msgid "_Government"
msgstr "_Øكومة"
-#: client/gui-gtk-2.0/menu.c:768 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:795 client/gui-gtk-2.0/menu.c:959
#: client/gui-win32/menu.c:334
msgid "_View"
msgstr "ال_عرض"
-#: client/gui-gtk-2.0/menu.c:772
+#: client/gui-gtk-2.0/menu.c:799
msgid "City Outlines"
msgstr "Øدود المدينة"
-#: client/gui-gtk-2.0/menu.c:774 client/gui-win32/menu.c:335
+#: client/gui-gtk-2.0/menu.c:801 client/gui-win32/menu.c:335
msgid "Map _Grid"
msgstr "_شبكة الخريطة"
-#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:336
+#: client/gui-gtk-2.0/menu.c:803 client/gui-win32/menu.c:336
msgid "National _Borders"
msgstr "ال_Øدود الاقليمية"
-#: client/gui-gtk-2.0/menu.c:778 client/gui-win32/menu.c:337
+#: client/gui-gtk-2.0/menu.c:805 client/gui-win32/menu.c:337
msgid "City _Names"
msgstr "أ_سماء المدن"
-#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:338
+#: client/gui-gtk-2.0/menu.c:807 client/gui-win32/menu.c:338
msgid "City G_rowth"
msgstr "_توسع المدينة"
-#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:339
+#: client/gui-gtk-2.0/menu.c:809 client/gui-win32/menu.c:339
msgid "City _Productions"
msgstr "ا_نتاج المدينة"
-#: client/gui-gtk-2.0/menu.c:784 client/gui-sdl/optiondlg.c:1719
+#: client/gui-gtk-2.0/menu.c:811
+#, fuzzy
+msgid "City Buy Cost"
+msgstr "الكلÙØ© الكلية: "
+
+#: client/gui-gtk-2.0/menu.c:813
+#, fuzzy
+msgid "City Traderoutes"
+msgstr "طرق التجارة : "
+
+#: client/gui-gtk-2.0/menu.c:815 client/gui-sdl/optiondlg.c:1719
msgid "Draw city worker map grid"
msgstr "رسم شبكة خريطة عامل المدينة"
-#: client/gui-gtk-2.0/menu.c:788 client/gui-sdl/optiondlg.c:1635
+#: client/gui-gtk-2.0/menu.c:819 client/gui-sdl/optiondlg.c:1635
#: client/gui-win32/menu.c:340 client/gui-xaw/menu.c:148
#: client/gui-xaw/menu.c:246 manual/civmanual.c:220 data/helpdata.txt:1220
msgid "Terrain"
msgstr "طبيعة الأرض"
-#: client/gui-gtk-2.0/menu.c:790 client/gui-win32/menu.c:341
+#: client/gui-gtk-2.0/menu.c:821 client/gui-win32/menu.c:341
#: client/gui-xaw/menu.c:149
msgid "Coastline"
msgstr "الشريط الساØلي"
-#: client/gui-gtk-2.0/menu.c:796 client/gui-win32/menu.c:343
+#: client/gui-gtk-2.0/menu.c:827 client/gui-win32/menu.c:343
msgid "Roads & Rails"
msgstr "الطرق والسكك"
-#: client/gui-gtk-2.0/menu.c:800 client/gui-sdl/optiondlg.c:1933
+#: client/gui-gtk-2.0/menu.c:831 client/gui-sdl/optiondlg.c:1933
#: client/gui-win32/menu.c:345 client/gui-xaw/menu.c:152
msgid "Mines"
msgstr "المناجم"
-#: client/gui-gtk-2.0/menu.c:802 client/gui-win32/menu.c:346
+#: client/gui-gtk-2.0/menu.c:833 client/gui-win32/menu.c:346
msgid "Fortress & Airbase"
msgstr "الØصن والقاعدة الجوية"
-#: client/gui-gtk-2.0/menu.c:804 client/gui-win32/menu.c:348
+#: client/gui-gtk-2.0/menu.c:835 client/gui-win32/menu.c:348
#: client/gui-xaw/menu.c:154
msgid "Specials"
msgstr "الأشياء الخاصة"
-#: client/gui-gtk-2.0/menu.c:806 client/gui-win32/menu.c:349
+#: client/gui-gtk-2.0/menu.c:837 client/gui-win32/menu.c:349
#: client/gui-xaw/menu.c:155
msgid "Pollution & Fallout"
msgstr "التلوث والغبار الذري"
-#: client/gui-gtk-2.0/menu.c:812 client/gui-win32/menu.c:352
+#: client/gui-gtk-2.0/menu.c:843 client/gui-win32/menu.c:352
#: client/gui-xaw/menu.c:158
msgid "Focus Unit"
msgstr "التركيز على ÙˆØدة"
-#: client/gui-gtk-2.0/menu.c:814 client/gui-sdl/optiondlg.c:1854
+#: client/gui-gtk-2.0/menu.c:845 client/gui-sdl/optiondlg.c:1854
#: client/gui-win32/menu.c:353 client/gui-xaw/menu.c:159
msgid "Fog of War"
msgstr "ضباب الØرب"
-#: client/gui-gtk-2.0/menu.c:818
+#: client/gui-gtk-2.0/menu.c:849
msgid "_Full Screen"
msgstr "_شاشة كاملة"
-#: client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/menu.c:853
msgid "_Center View"
msgstr "_وسط العرض"
-#: client/gui-gtk-2.0/menu.c:825 client/gui-win32/menu.c:358
+#: client/gui-gtk-2.0/menu.c:856 client/gui-win32/menu.c:358
msgid "_Orders"
msgstr "الأو_امر"
-#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
-#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
-#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
-#: client/gui-gtk-2.0/menu.c:855 client/gui-gtk-2.0/menu.c:857
-#: client/gui-gtk-2.0/menu.c:859 client/gui-gtk-2.0/menu.c:861
-#: client/gui-gtk-2.0/menu.c:863 client/gui-gtk-2.0/menu.c:865
-#: client/gui-gtk-2.0/menu.c:867 client/gui-gtk-2.0/menu.c:869
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875 client/gui-gtk-2.0/menu.c:877
-#: client/gui-gtk-2.0/menu.c:879 client/gui-gtk-2.0/menu.c:881
-#: client/gui-gtk-2.0/menu.c:883 client/gui-gtk-2.0/menu.c:885
-#: client/gui-gtk-2.0/menu.c:887 client/gui-gtk-2.0/menu.c:889
-#: client/gui-gtk-2.0/menu.c:891 client/gui-gtk-2.0/menu.c:893
-#: client/gui-gtk-2.0/menu.c:895 client/gui-gtk-2.0/menu.c:897
-#: client/gui-gtk-2.0/menu.c:899 client/gui-gtk-2.0/menu.c:901
-#: client/gui-gtk-2.0/menu.c:903 data/Freeciv.in:2029
+#: client/gui-gtk-2.0/menu.c:858 client/gui-gtk-2.0/menu.c:860
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:864
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:868
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:872
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:876
+#: client/gui-gtk-2.0/menu.c:878 client/gui-gtk-2.0/menu.c:880
+#: client/gui-gtk-2.0/menu.c:882 client/gui-gtk-2.0/menu.c:884
+#: client/gui-gtk-2.0/menu.c:886 client/gui-gtk-2.0/menu.c:888
+#: client/gui-gtk-2.0/menu.c:890 client/gui-gtk-2.0/menu.c:892
+#: client/gui-gtk-2.0/menu.c:894 client/gui-gtk-2.0/menu.c:896
+#: client/gui-gtk-2.0/menu.c:898 client/gui-gtk-2.0/menu.c:900
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906 client/gui-gtk-2.0/menu.c:908
+#: client/gui-gtk-2.0/menu.c:910 client/gui-gtk-2.0/menu.c:912
+#: client/gui-gtk-2.0/menu.c:914 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:918 client/gui-gtk-2.0/menu.c:920
+#: client/gui-gtk-2.0/menu.c:922 client/gui-gtk-2.0/menu.c:924
+#: client/gui-gtk-2.0/menu.c:926 client/gui-gtk-2.0/menu.c:928
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
+#: client/gui-gtk-2.0/menu.c:946 data/Freeciv.in:2029
msgid "Orders"
msgstr "الأوامر"
-#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:1444
+#: client/gui-gtk-2.0/menu.c:860 client/gui-gtk-2.0/menu.c:1489
#: client/gui-win32/menu.c:359
msgid "_Build City"
msgstr "_بناء مدينة"
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:1466
-#: client/gui-gtk-2.0/menu.c:1472 client/gui-win32/menu.c:360
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:1511
+#: client/gui-gtk-2.0/menu.c:1517 client/gui-win32/menu.c:360
msgid "Build _Road"
msgstr "بناء _طريق"
-#: client/gui-gtk-2.0/menu.c:833 client/gui-gtk-2.0/menu.c:1360
+#: 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 "بناء قناة _ري"
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:1361
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:1406
#: client/gui-win32/menu.c:362
msgid "Build _Mine"
msgstr "بناء _منجم"
-#: client/gui-gtk-2.0/menu.c:837 client/gui-gtk-2.0/menu.c:1362
+#: client/gui-gtk-2.0/menu.c:868 client/gui-gtk-2.0/menu.c:1407
msgid "Transf_orm Terrain"
msgstr "ت_Øويل طبيعة الأرض"
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:1508
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:1553
#: client/gui-win32/menu.c:364
msgid "Build _Fortress"
msgstr "بناء _Øصن"
-#: client/gui-gtk-2.0/menu.c:841 client/gui-win32/menu.c:365
+#: client/gui-gtk-2.0/menu.c:872 client/gui-win32/menu.c:365
msgid "Build Airbas_e"
msgstr "بناء _قاعدة جوية"
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:1514
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:1559
#: client/gui-win32/menu.c:366
msgid "Clean _Pollution"
msgstr "تنظي٠ال_تلوث"
-#: client/gui-gtk-2.0/menu.c:845 client/gui-win32/menu.c:367
+#: client/gui-gtk-2.0/menu.c:876 client/gui-win32/menu.c:367
msgid "Clean _Nuclear Fallout"
msgstr "تنظي٠الغبار ال_ذري"
-#: client/gui-gtk-2.0/menu.c:849 client/gui-win32/menu.c:369
+#: client/gui-gtk-2.0/menu.c:880 client/gui-win32/menu.c:369
msgid "_Sentry"
msgstr "ال_Øراسة"
-#: client/gui-gtk-2.0/menu.c:855 client/gui-win32/menu.c:372
+#: client/gui-gtk-2.0/menu.c:886 client/gui-win32/menu.c:372
msgid "Make _Homecity"
msgstr "مدينة ال_منشأ"
-#: client/gui-gtk-2.0/menu.c:857 client/gui-win32/menu.c:373
+#: client/gui-gtk-2.0/menu.c:888 client/gui-win32/menu.c:373
msgid "_Load"
msgstr "ت_Øميل"
-#: client/gui-gtk-2.0/menu.c:859
+#: client/gui-gtk-2.0/menu.c:890
msgid "_Unload Transporter"
msgstr "تن_زيل الناقل"
-#: client/gui-gtk-2.0/menu.c:861 client/gui-win32/menu.c:374
+#: client/gui-gtk-2.0/menu.c:892 client/gui-win32/menu.c:374
msgid "_Unload"
msgstr "ت_نزيل"
-#: client/gui-gtk-2.0/menu.c:863 client/gui-win32/menu.c:375
+#: client/gui-gtk-2.0/menu.c:894 client/gui-win32/menu.c:375
msgid "Wake up o_thers"
msgstr "إيقاظ اﻵ_خرين"
-#: client/gui-gtk-2.0/menu.c:867
+#: client/gui-gtk-2.0/menu.c:898
msgid "_Auto Settler"
msgstr "استعمار _تلقائي"
-#: client/gui-gtk-2.0/menu.c:869 client/gui-win32/menu.c:378
+#: client/gui-gtk-2.0/menu.c:900 client/gui-win32/menu.c:378
msgid "Auto E_xplore"
msgstr "ا_ستكشا٠تلقائي"
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906
msgid "_Connect"
msgstr "ات_صال"
-#: client/gui-gtk-2.0/menu.c:871 client/gui-win32/menu.c:380
+#: client/gui-gtk-2.0/menu.c:902 client/gui-win32/menu.c:380
msgid "_Road"
msgstr "_طريق"
-#: client/gui-gtk-2.0/menu.c:873 client/gui-win32/menu.c:381
+#: client/gui-gtk-2.0/menu.c:904 client/gui-win32/menu.c:381
msgid "Rai_l"
msgstr "_سكة Øديد"
-#: client/gui-gtk-2.0/menu.c:875 client/gui-win32/menu.c:382
+#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:382
msgid "_Irrigate"
msgstr "_قناة ري"
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
msgid "Go _to"
msgstr "الذهاب إ_لى"
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
msgid "_Build city"
msgstr "_بناء مدينة"
-#: client/gui-gtk-2.0/menu.c:879
+#: client/gui-gtk-2.0/menu.c:910
msgid "Patrol (_Q)"
msgstr "Øراسة الخÙر (_Ø®)"
-#: client/gui-gtk-2.0/menu.c:881 client/gui-win32/menu.c:385
+#: client/gui-gtk-2.0/menu.c:912 client/gui-win32/menu.c:385
msgid "_Go to"
msgstr "ال_ذهاب إلى"
-#: client/gui-gtk-2.0/menu.c:883
+#: client/gui-gtk-2.0/menu.c:914
msgid "Go\\/Airlift to City"
msgstr "الذهاب\\/النقل جوا إلى مدينة"
-#: client/gui-gtk-2.0/menu.c:885 client/gui-sdl/menu.c:450
+#: client/gui-gtk-2.0/menu.c:916 client/gui-sdl/menu.c:450
#: client/gui-win32/menu.c:387 client/gui-xaw/menu.c:203
msgid "Return to nearest city"
msgstr "الرجوع إلى أقرب مدينة"
-#: client/gui-gtk-2.0/menu.c:889 client/gui-win32/menu.c:389
+#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:389
#: client/gui-xaw/menu.c:205
msgid "Disband Unit"
msgstr "ØªØ³Ø±ÙŠØ Ø§Ù„ÙˆØدة"
-#: client/gui-gtk-2.0/menu.c:891 client/gui-sdl/citydlg.c:532
+#: client/gui-gtk-2.0/menu.c:922 client/gui-sdl/citydlg.c:532
#: data/Freeciv.in:1186
msgid "Upgrade unit"
msgstr "تØديث الوØدة"
-#: client/gui-gtk-2.0/menu.c:893
+#: client/gui-gtk-2.0/menu.c:924
msgid "Diplomat\\/Spy Actions"
msgstr "أعمال الدبلوماسية\\/التجسس"
-#: client/gui-gtk-2.0/menu.c:895 client/gui-sdl/menu.c:399
+#: client/gui-gtk-2.0/menu.c:926 client/gui-sdl/menu.c:399
#: client/gui-win32/menu.c:391 client/gui-xaw/menu.c:209
msgid "Explode Nuclear"
msgstr "تÙجير نووي"
-#: client/gui-gtk-2.0/menu.c:899
-msgid "Select same type"
-msgstr "اختيار Ù†Ùس النوع"
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/cityrep.c:882
+msgid "Select"
+msgstr "اختيار"
+
+#: client/gui-gtk-2.0/menu.c:934
+#, fuzzy
+msgid "Single"
+msgstr "الأدغال"
+
+#: client/gui-gtk-2.0/menu.c:936
+msgid "Same Type On Tile"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:938
+msgid "All On Tile"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:940
+msgid "Same Type On Continent"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:942
+msgid "Same Type Everywhere"
+msgstr ""
-#: client/gui-gtk-2.0/menu.c:901 client/gui-win32/menu.c:393
+#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:393
msgid "_Wait"
msgstr "ا_نتظار"
-#: client/gui-gtk-2.0/menu.c:903 client/gui-win32/menu.c:394
+#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:394
#: client/gui-xaw/menu.c:213
msgid "Done"
msgstr "انتهى"
-#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:398
+#: client/gui-gtk-2.0/menu.c:949 client/gui-win32/menu.c:398
msgid "_Reports"
msgstr "ال_تقارير"
-#: client/gui-gtk-2.0/menu.c:908 client/gui-gtk-2.0/menu.c:910
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:914
-#: client/gui-gtk-2.0/menu.c:916 client/gui-gtk-2.0/menu.c:918
-#: client/gui-gtk-2.0/menu.c:920 client/gui-gtk-2.0/menu.c:922
-#: client/gui-gtk-2.0/menu.c:924 client/gui-gtk-2.0/menu.c:926
-#: client/gui-gtk-2.0/menu.c:928 client/gui-gtk-2.0/menu.c:930
-#: client/gui-gtk-2.0/menu.c:932 data/Freeciv.in:2030
+#: client/gui-gtk-2.0/menu.c:951 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:957
+#: client/gui-gtk-2.0/menu.c:959 client/gui-gtk-2.0/menu.c:961
+#: client/gui-gtk-2.0/menu.c:963 client/gui-gtk-2.0/menu.c:965
+#: client/gui-gtk-2.0/menu.c:967 client/gui-gtk-2.0/menu.c:969
+#: client/gui-gtk-2.0/menu.c:971 client/gui-gtk-2.0/menu.c:973
+#: client/gui-gtk-2.0/menu.c:975 data/Freeciv.in:2030
msgid "Reports"
msgstr "التقارير"
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:958
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:1001
#: client/gui-win32/menu.c:400 client/gui-win32/menu.c:425
msgid "_Units"
msgstr "ال_ÙˆØدات"
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/menu.c:914 client/gui-win32/menu.c:402
+#: client/gui-gtk-2.0/menu.c:957 client/gui-win32/menu.c:402
#, fuzzy
msgid "_Nations"
msgstr "_الأمم"
-#: client/gui-gtk-2.0/menu.c:918 client/gui-win32/menu.c:403
+#: client/gui-gtk-2.0/menu.c:961 client/gui-win32/menu.c:403
msgid "_Economy"
msgstr "الا_قتصاد"
#. TRANS: Research report action
-#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:405
+#: client/gui-gtk-2.0/menu.c:963 client/gui-win32/menu.c:405
#, fuzzy
msgid "_Research"
msgstr "_بØØ« علمي"
-#: client/gui-gtk-2.0/menu.c:924 client/gui-win32/menu.c:407
+#: client/gui-gtk-2.0/menu.c:967 client/gui-win32/menu.c:407
msgid "_Wonders of the World"
msgstr "_عجائب العالم"
-#: client/gui-gtk-2.0/menu.c:926 client/gui-win32/menu.c:408
+#: client/gui-gtk-2.0/menu.c:969 client/gui-win32/menu.c:408
msgid "_Top Five Cities"
msgstr "أ_كبر خمس مدن"
-#: client/gui-gtk-2.0/menu.c:928 client/gui-win32/menu.c:409
+#: client/gui-gtk-2.0/menu.c:971 client/gui-win32/menu.c:409
msgid "_Messages"
msgstr "_رسائل"
-#: client/gui-gtk-2.0/menu.c:930 client/gui-win32/menu.c:410
+#: client/gui-gtk-2.0/menu.c:973 client/gui-win32/menu.c:410
msgid "_Demographics"
msgstr "_ديمغراÙية"
-#: client/gui-gtk-2.0/menu.c:932 client/gui-gtk-2.0/plrdlg.c:471
+#: client/gui-gtk-2.0/menu.c:975 client/gui-gtk-2.0/plrdlg.c:354
#: client/gui-win32/menu.c:411
msgid "_Spaceship"
msgstr "سÙينة _Ùضاء"
-#: client/gui-gtk-2.0/menu.c:936 client/gui-win32/menu.c:415
+#: client/gui-gtk-2.0/menu.c:979 client/gui-win32/menu.c:415
msgid "_Help"
msgstr "ال_مساعدة"
-#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
-#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
-#: client/gui-gtk-2.0/menu.c:946 client/gui-gtk-2.0/menu.c:948
-#: client/gui-gtk-2.0/menu.c:950 client/gui-gtk-2.0/menu.c:952
-#: client/gui-gtk-2.0/menu.c:954 client/gui-gtk-2.0/menu.c:956
-#: client/gui-gtk-2.0/menu.c:958 client/gui-gtk-2.0/menu.c:960
-#: client/gui-gtk-2.0/menu.c:962 client/gui-gtk-2.0/menu.c:964
-#: client/gui-gtk-2.0/menu.c:966 client/gui-gtk-2.0/menu.c:968
-#: client/gui-gtk-2.0/menu.c:970 client/gui-gtk-2.0/menu.c:972
-#: client/gui-gtk-2.0/menu.c:974 client/gui-gtk-2.0/menu.c:976
-#: client/gui-gtk-2.0/menu.c:978 client/gui-gtk-2.0/menu.c:980
+#: client/gui-gtk-2.0/menu.c:981 client/gui-gtk-2.0/menu.c:983
+#: client/gui-gtk-2.0/menu.c:985 client/gui-gtk-2.0/menu.c:987
+#: client/gui-gtk-2.0/menu.c:989 client/gui-gtk-2.0/menu.c:991
+#: client/gui-gtk-2.0/menu.c:993 client/gui-gtk-2.0/menu.c:995
+#: client/gui-gtk-2.0/menu.c:997 client/gui-gtk-2.0/menu.c:999
+#: client/gui-gtk-2.0/menu.c:1001 client/gui-gtk-2.0/menu.c:1003
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-gtk-2.0/menu.c:1007
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-gtk-2.0/menu.c:1011
+#: client/gui-gtk-2.0/menu.c:1013 client/gui-gtk-2.0/menu.c:1015
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-gtk-2.0/menu.c:1019
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-gtk-2.0/menu.c:1023
#: client/gui-gtk-2.0/repodlgs.c:313 client/gui-win32/citydlg.c:1077
#: client/gui-win32/repodlgs.c:289 client/gui-win32/wldlg.c:846
#: data/Freeciv.in:1466 data/Freeciv.in:2031 data/Freeciv.in:2101
@@ -11826,119 +12040,119 @@ msgstr "ال_مساعدة"
msgid "Help"
msgstr "المساعدة"
-#: client/gui-gtk-2.0/menu.c:940 client/gui-win32/menu.c:416
+#: client/gui-gtk-2.0/menu.c:983 client/gui-win32/menu.c:416
msgid "Language_s"
msgstr "الل_غات"
-#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/menu.c:417
+#: client/gui-gtk-2.0/menu.c:985 client/gui-win32/menu.c:417
msgid "Co_nnecting"
msgstr "جاري ال_اتصال"
-#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:418
+#: client/gui-gtk-2.0/menu.c:987 client/gui-win32/menu.c:418
msgid "C_ontrols"
msgstr "_Ù…ÙØ§ØªÙŠØ Ø§Ù„ØªØكم"
-#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:419
+#: client/gui-gtk-2.0/menu.c:989 client/gui-win32/menu.c:419
msgid "C_hatline"
msgstr "خط ال_دردشة"
-#: client/gui-gtk-2.0/menu.c:948 client/gui-win32/menu.c:420
+#: client/gui-gtk-2.0/menu.c:991 client/gui-win32/menu.c:420
msgid "_Worklist Editor"
msgstr "Ù…Øرر _قائمة العمل"
-#: client/gui-gtk-2.0/menu.c:950 client/gui-win32/menu.c:421
+#: client/gui-gtk-2.0/menu.c:993 client/gui-win32/menu.c:421
msgid "Citizen _Management"
msgstr "إ_دارة المواطنة"
-#: client/gui-gtk-2.0/menu.c:952 client/gui-win32/menu.c:422
+#: client/gui-gtk-2.0/menu.c:995 client/gui-win32/menu.c:422
msgid "_Playing"
msgstr "ال_لعب"
-#: client/gui-gtk-2.0/menu.c:956 client/gui-win32/menu.c:424
+#: client/gui-gtk-2.0/menu.c:999 client/gui-win32/menu.c:424
msgid "City _Improvements"
msgstr "_تØسينات المدينة"
-#: client/gui-gtk-2.0/menu.c:960 client/gui-win32/menu.c:426
+#: client/gui-gtk-2.0/menu.c:1003 client/gui-win32/menu.c:426
msgid "Com_bat"
msgstr "ال_معركة"
-#: client/gui-gtk-2.0/menu.c:962 client/gui-win32/menu.c:427
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-win32/menu.c:427
msgid "_ZOC"
msgstr "_مناطق المعارك"
-#: client/gui-gtk-2.0/menu.c:964 client/gui-win32/menu.c:428
+#: client/gui-gtk-2.0/menu.c:1007 client/gui-win32/menu.c:428
msgid "Techno_logy"
msgstr "ال_تكنولوجيا"
-#: client/gui-gtk-2.0/menu.c:966 client/gui-win32/menu.c:429
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-win32/menu.c:429
msgid "_Terrain"
msgstr "_طبيعة الأرض"
-#: client/gui-gtk-2.0/menu.c:968 client/gui-win32/menu.c:430
+#: client/gui-gtk-2.0/menu.c:1011 client/gui-win32/menu.c:430
msgid "Won_ders"
msgstr "ال_أعاجيب"
-#: client/gui-gtk-2.0/menu.c:972 client/gui-win32/menu.c:432
+#: client/gui-gtk-2.0/menu.c:1015 client/gui-win32/menu.c:432
msgid "Happin_ess"
msgstr "ال_سعادة"
-#: client/gui-gtk-2.0/menu.c:974 client/gui-win32/menu.c:433
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-win32/menu.c:433
msgid "Space _Race"
msgstr "_سباق الÙضاء"
-#: client/gui-gtk-2.0/menu.c:978 client/gui-win32/menu.c:435
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-win32/menu.c:435
msgid "_Copying"
msgstr "ال_نسخ"
-#: client/gui-gtk-2.0/menu.c:980 client/gui-win32/menu.c:436
+#: client/gui-gtk-2.0/menu.c:1023 client/gui-win32/menu.c:436
msgid "_About"
msgstr "_عن البرنامج"
-#: client/gui-gtk-2.0/menu.c:1264
+#: client/gui-gtk-2.0/menu.c:1307
#, c-format
msgid "%s..."
msgstr "%s..."
-#: client/gui-gtk-2.0/menu.c:1352
+#: client/gui-gtk-2.0/menu.c:1397
#, c-format
msgid "Change to %s (_I)"
msgstr "تغيير إلى %s (_ا)"
-#: client/gui-gtk-2.0/menu.c:1353
+#: client/gui-gtk-2.0/menu.c:1398
#, c-format
msgid "Change to %s (_M)"
msgstr "تغيير إلى %s (_م)"
-#: client/gui-gtk-2.0/menu.c:1354
+#: client/gui-gtk-2.0/menu.c:1399
#, c-format
msgid "Transf_orm to %s"
msgstr "تØ_ويل إلى %s"
-#: client/gui-gtk-2.0/menu.c:1427
+#: client/gui-gtk-2.0/menu.c:1472
msgid "Help _Build Wonder"
msgstr "المساعدة ببناء الأ_عجوبة"
-#: client/gui-gtk-2.0/menu.c:1441
+#: client/gui-gtk-2.0/menu.c:1486
msgid "Add to City (_B)"
msgstr "إضاÙØ© إلى مدينة (_ب)"
-#: client/gui-gtk-2.0/menu.c:1449
+#: client/gui-gtk-2.0/menu.c:1494
msgid "Make Trade _Route"
msgstr "انشاء _طريق للتجارة"
-#: client/gui-gtk-2.0/menu.c:1463
+#: client/gui-gtk-2.0/menu.c:1508
msgid "Build _Railroad"
msgstr "بناء _سكة Øديد"
-#: client/gui-gtk-2.0/menu.c:1486
+#: client/gui-gtk-2.0/menu.c:1531
msgid "Bu_ild Farmland"
msgstr "بناء أرض _زارعية"
-#: client/gui-gtk-2.0/menu.c:1506
+#: client/gui-gtk-2.0/menu.c:1551
msgid "_Fortify"
msgstr "ت_Øصين"
-#: client/gui-gtk-2.0/menu.c:1512
+#: client/gui-gtk-2.0/menu.c:1557
msgid "_Paradrop"
msgstr "ا_سقاط جوي"
@@ -11974,13 +12188,32 @@ msgstr "رسالة"
msgid "Pop"
msgstr "البوب"
-#: client/gui-gtk-2.0/messagewin.c:155 client/gui-sdl/messagewin.c:247
+#: client/gui-gtk-2.0/messagewin.c:186 client/gui-sdl/messagewin.c:247
#: client/gui-win32/messagewin.c:132 client/gui-xaw/menu.c:228
#: data/Freeciv.in:3273 data/Freeciv.in:3274 data/Freeciv.in:3283
msgid "Messages"
msgstr "الرسائل"
-#: client/gui-gtk-2.0/plrdlg.c:330
+#: client/gui-gtk-2.0/plrdlg.c:317
+msgid "_Meet"
+msgstr "ا_جتماع"
+
+#: client/gui-gtk-2.0/plrdlg.c:323
+#, fuzzy
+msgid "Cancel _Treaty"
+msgstr "ال_غاء المعاهدة"
+
+#: client/gui-gtk-2.0/plrdlg.c:329
+#, fuzzy
+msgid "_Withdraw Vision"
+msgstr "_سØب الرؤية"
+
+#: client/gui-gtk-2.0/plrdlg.c:348
+#, fuzzy
+msgid "_Report"
+msgstr "ال_تقارير"
+
+#: client/gui-gtk-2.0/plrdlg.c:386
msgid "?show:Dead Players"
msgstr "?show:اللاعبيين الموتى"
@@ -11988,268 +12221,271 @@ msgstr "?show:اللاعبيين الموتى"
#. TRANS: Nations report action
#. TRANS: Nations report title
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/plrdlg.c:350 client/gui-sdl/mapctrl.c:1580
+#: client/gui-gtk-2.0/plrdlg.c:406 client/gui-sdl/mapctrl.c:1580
#: client/gui-sdl/plrdlg.c:608 client/gui-win32/plrdlg.c:344
#: client/gui-xaw/menu.c:221 data/Freeciv.in:3192 data/Freeciv.in:3193
msgid "Nations"
msgstr "الأمم"
-#: client/gui-gtk-2.0/plrdlg.c:443
-msgid "_Intelligence"
-msgstr "_الاستخبارات"
-
-#: client/gui-gtk-2.0/plrdlg.c:450
-msgid "_Meet"
-msgstr "ا_جتماع"
-
-#: client/gui-gtk-2.0/plrdlg.c:457
+#: client/gui-gtk-2.0/plrdlg.c:511
#, fuzzy
-msgid "Cancel _Treaty"
-msgstr "ال_غاء المعاهدة"
+msgid "Di_plomacy"
+msgstr "دبلوماسية"
-#: client/gui-gtk-2.0/plrdlg.c:464
-msgid "_Withdraw vision"
-msgstr "_سØب الرؤية"
+#: client/gui-gtk-2.0/plrdlg.c:516
+msgid "_Intelligence"
+msgstr "_الاستخبارات"
-#: client/gui-gtk-2.0/plrdlg.c:495
+#: client/gui-gtk-2.0/plrdlg.c:526
msgid "_AI"
msgstr "_ذ.ا"
-#: client/gui-gtk-2.0/plrdlg.c:501
+#: client/gui-gtk-2.0/plrdlg.c:532
msgid "_Toggle AI Mode"
msgstr "تÙعيل أو تعطيل نمط Ø°.ا"
-#: client/gui-gtk-2.0/pages.c:208
+#: client/gui-gtk-2.0/pages.c:221
msgid "Start _New Game"
msgstr "بدأ لعبة _جديدة"
-#: client/gui-gtk-2.0/pages.c:214
+#: client/gui-gtk-2.0/pages.c:227
msgid "Start _Scenario Game"
msgstr "بدأ لعبة _سيناريو"
-#: client/gui-gtk-2.0/pages.c:220
+#: client/gui-gtk-2.0/pages.c:233
msgid "_Load Saved Game"
msgstr "تØميل لعبة Ù…ØÙوظة"
-#: client/gui-gtk-2.0/pages.c:229
+#: client/gui-gtk-2.0/pages.c:239
msgid "C_onnect to Network Game"
msgstr "الا_تصال بلعبة على الشبكة"
-#: client/gui-gtk-2.0/pages.c:236
+#: client/gui-gtk-2.0/pages.c:247
msgid "Connect to Gaming _Zone"
msgstr "الاتصال ب_منطقة اللعب"
-#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:300
#: client/gui-xaw/connectdlg.c:326
msgid "Passwords don't match, enter password."
msgstr "كلمات السر غير مطابقة، إدخل كلمة السر."
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:779 client/gui-gtk-2.0/pages.c:820
+#: client/gui-win32/connectdlg.c:916
msgid "Server Name"
msgstr "اسم الخادم"
-#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
+#: 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
+#: data/Freeciv.in:96
msgid "Port"
msgstr "المنÙØ°"
-#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
+#: client/gui-win32/connectdlg.c:917
msgid "Version"
msgstr "اصدار"
-#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
-#: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
+#: 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
msgid "Status"
msgstr "الØالة"
-#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
-#: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
+#: 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
msgid "Players"
msgstr "اللاعبين"
-#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
+#: client/gui-win32/connectdlg.c:918
msgid "Comment"
msgstr "ملاØظة"
-#: client/gui-gtk-2.0/pages.c:747
+#: client/gui-gtk-2.0/pages.c:786
msgid "Local _Area Network"
msgstr "الشبكة الداخلية"
-#: client/gui-gtk-2.0/pages.c:783
+#: client/gui-gtk-2.0/pages.c:827
msgid "Internet _Metaserver"
msgstr "إنترنت _Metaserver"
-#: client/gui-gtk-2.0/pages.c:817
+#: client/gui-gtk-2.0/pages.c:864
msgid "_Host:"
msgstr "المضيÙ:"
-#: client/gui-gtk-2.0/pages.c:834
+#: client/gui-gtk-2.0/pages.c:881
msgid "_Port:"
msgstr "ال_منÙØ°:"
-#: client/gui-gtk-2.0/pages.c:851
+#: client/gui-gtk-2.0/pages.c:898
msgid "_Login:"
msgstr "اسم ال_مستخدم:"
-#: client/gui-gtk-2.0/pages.c:869
+#: client/gui-gtk-2.0/pages.c:916
msgid "Pass_word:"
msgstr "كلمة ال_سر:"
-#: client/gui-gtk-2.0/pages.c:887
+#: client/gui-gtk-2.0/pages.c:934
msgid "Conf_irm Password:"
msgstr "_تأكيد كلمة السر:"
-#: client/gui-gtk-2.0/pages.c:912
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: 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/wldlg.c:800 client/gui-win32/wldlg.c:806
+msgid "Type"
+msgstr "النوع"
+
+#: client/gui-gtk-2.0/pages.c:952 client/gui-win32/plrdlg.c:337
+#: data/Freeciv.in:88
+msgid "Host"
+msgstr "المضيÙ"
+
+#: client/gui-gtk-2.0/pages.c:981
msgid "C_onnect"
msgstr "ا_تصال"
-#: client/gui-gtk-2.0/pages.c:1142
+#: client/gui-gtk-2.0/pages.c:1211
#, c-format
msgid "Connection name: %s"
msgstr "اسم الاتصال: %s"
-#: client/gui-gtk-2.0/pages.c:1145
+#: client/gui-gtk-2.0/pages.c:1214
#, c-format
msgid "Player name: %s"
msgstr "اسم اللاعب: %s"
-#: client/gui-gtk-2.0/pages.c:1150
+#: client/gui-gtk-2.0/pages.c:1219
#, c-format
msgid "Host: %s"
msgstr "المضيÙ: %s"
-#: client/gui-gtk-2.0/pages.c:1158
+#: client/gui-gtk-2.0/pages.c:1227
msgid "Player/conn info"
msgstr "معلومات اللاعب والاتصال"
-#: client/gui-gtk-2.0/pages.c:1185
+#: client/gui-gtk-2.0/pages.c:1254
#, c-format
msgid "%s info"
msgstr "معلومات %s "
-#: client/gui-gtk-2.0/pages.c:1196
+#: client/gui-gtk-2.0/pages.c:1265
msgid "Toggle player ready"
msgstr "تÙعيل أو تعطيل جاهزية اللاعب"
-#: client/gui-gtk-2.0/pages.c:1204
+#: client/gui-gtk-2.0/pages.c:1273
msgid "Pick nation"
msgstr "اختيار الأمة"
-#: client/gui-gtk-2.0/pages.c:1214
+#: client/gui-gtk-2.0/pages.c:1283
msgid "Observe this player"
msgstr "مراقبة هذا اللاعب"
-#: client/gui-gtk-2.0/pages.c:1221
+#: client/gui-gtk-2.0/pages.c:1290
msgid "Take this player"
msgstr "أخذ مكان هذا اللاعب"
-#: client/gui-gtk-2.0/pages.c:1238
+#: client/gui-gtk-2.0/pages.c:1307
msgid "Cut connection"
msgstr "Ùصل الاتصال"
-#: client/gui-gtk-2.0/pages.c:1248
+#: client/gui-gtk-2.0/pages.c:1317
msgid "Aitoggle player"
msgstr "تÙعيل أو تعطيل ال Ø°.ا للاعب"
-#: client/gui-gtk-2.0/pages.c:1257
+#: client/gui-gtk-2.0/pages.c:1326
msgid "Remove player"
msgstr "إزالة اللاعب"
-#: client/gui-gtk-2.0/pages.c:1268
+#: client/gui-gtk-2.0/pages.c:1337
msgid "Give info access"
msgstr "اعطاء صلاØية info"
-#: client/gui-gtk-2.0/pages.c:1276
+#: client/gui-gtk-2.0/pages.c:1345
msgid "Give ctrl access"
msgstr "اعطاء صلاØية ctrl"
#. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1338
+#: client/gui-gtk-2.0/pages.c:1407
#, c-format
msgid "Put on %s"
msgstr "وضع على %s"
-#: client/gui-gtk-2.0/pages.c:1442
+#: client/gui-gtk-2.0/pages.c:1511
#, fuzzy
msgid "Number of _Players (including AI):"
msgstr "عدد اللاعبين (مع ذ.ا):"
-#: client/gui-gtk-2.0/pages.c:1465
+#: client/gui-gtk-2.0/pages.c:1534
#, fuzzy
msgid "AI Skill _Level:"
msgstr "مستوى مهارة ال _ذ.ا:"
-#: client/gui-gtk-2.0/pages.c:1481
+#: client/gui-gtk-2.0/pages.c:1550
#, fuzzy
msgid "Ruleset _Version:"
msgstr "مجموعة ال_قواعد:"
-#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
msgid "_More Game Options..."
msgstr "خيارات اللعبة أكثر..."
-#: client/gui-gtk-2.0/pages.c:1514
+#: client/gui-gtk-2.0/pages.c:1583
msgid "Record"
msgstr "السجل"
-#: client/gui-gtk-2.0/pages.c:1519
+#: client/gui-gtk-2.0/pages.c:1588
msgid "Rating"
msgstr "التقدير"
-#: client/gui-gtk-2.0/pages.c:1525
+#: client/gui-gtk-2.0/pages.c:1594
msgid "Ready"
msgstr "جاهز"
-#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
-#: data/nation/slovakian.ruleset:26
-msgid "Leader"
-msgstr "القائد"
+#: client/gui-gtk-2.0/pages.c:1601
+#, fuzzy
+msgid "?player:Leader"
+msgstr "?Player:الاسم"
-#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1732 client/gui-sdl/chatline.c:185
msgid "Choose Saved Game to Load"
msgstr "اختيار اللعبة المØÙوظة للتØميل"
-#: client/gui-gtk-2.0/pages.c:1752
+#: client/gui-gtk-2.0/pages.c:1824
msgid "Choose Saved Game to _Load:"
msgstr "اختيار اللعبة المØÙوظة لل_تØميل:"
-#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
-#: client/gui-gtk-2.0/pages.c:2375
+#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
+#: client/gui-gtk-2.0/pages.c:2451
msgid "_Browse..."
msgstr "ال_تصÙÙ‘Ø..."
-#: client/gui-gtk-2.0/pages.c:1839
+#: client/gui-gtk-2.0/pages.c:1911
msgid "Choose a Scenario"
msgstr "إختيار سيناريو"
-#: client/gui-gtk-2.0/pages.c:1926
+#: client/gui-gtk-2.0/pages.c:1998
msgid "Choose a _Scenario:"
msgstr "إختيار _سيناريو:"
-#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
-#: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
-#: client/gui-win32/wldlg.c:806
-msgid "Type"
-msgstr "النوع"
-
-#: client/gui-gtk-2.0/pages.c:2101
+#: client/gui-gtk-2.0/pages.c:2173
msgid "Choose a _nation to play:"
msgstr "اختيار الأمة للعب بها:"
-#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2363 client/gui-win32/menu.c:581
msgid "Select Location to Save"
msgstr "اختيار موقع الØÙظ"
-#: client/gui-gtk-2.0/pages.c:2372 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2448 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr "ØÙظ اللعبة"
-#: client/gui-gtk-2.0/pages.c:2413
+#: client/gui-gtk-2.0/pages.c:2489
msgid "Saved _Games:"
msgstr "ال_لعب المØÙوظة:"
-#: client/gui-gtk-2.0/pages.c:2440
+#: client/gui-gtk-2.0/pages.c:2516
msgid "Save _Filename:"
msgstr "اسم مل٠الØÙظ:"
@@ -12604,7 +12840,7 @@ msgstr ""
msgid "Total users logged in : %d"
msgstr "مجموع المستخدمين المتصلين : %d"
-#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1094
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
msgid "Back"
msgstr "رجوع"
@@ -12613,7 +12849,7 @@ msgid "Start"
msgstr "بدء"
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:775
+#: client/gui-win32/connectdlg.c:777
msgid "Load Game"
msgstr "تØميل لعبة"
@@ -12654,12 +12890,12 @@ msgid "Make new homecity"
msgstr "مدينة المنشأ الجديدة"
#: client/gui-sdl/citydlg.c:546 client/gui-sdl/citydlg.c:1418
-#: client/gui-sdl/connectdlg.c:307 client/gui-sdl/connectdlg.c:616
-#: client/gui-sdl/connectdlg.c:802 client/gui-sdl/connectdlg.c:984
+#: 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/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1039
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
#: 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
@@ -12709,7 +12945,7 @@ msgstr "هل تريد شرائها?"
#: client/gui-sdl/diplodlg.c:1335 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:2427
+#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
#: client/gui-xaw/cityrep.c:666 client/gui-xaw/cma_fe.c:327
#: client/gui-xaw/cma_fe.c:511 client/gui-xaw/cma_fe.c:765
#: client/gui-xaw/messagedlg.c:72 client/gui-xaw/optiondlg.c:76
@@ -12725,7 +12961,7 @@ msgstr "لا"
#: client/gui-sdl/diplodlg.c:1345 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:2427 client/gui-xaw/cityrep.c:666
+#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
#: client/gui-xaw/cma_fe.c:327 client/gui-xaw/cma_fe.c:511
#: client/gui-xaw/cma_fe.c:765 client/gui-xaw/messagedlg.c:72
#: client/gui-xaw/optiondlg.c:76 client/gui-xaw/optiondlg.c:304
@@ -13013,37 +13249,37 @@ msgstr "تطبيق لمرة واØدة"
msgid "Release city"
msgstr "ØªØ³Ø±ÙŠØ Ù…Ø¯ÙŠÙ†Ø©"
-#: client/gui-sdl/connectdlg.c:238
+#: client/gui-sdl/connectdlg.c:239
msgid "Creating Server List..."
msgstr "جاري انشاء قائمة الخادم..."
-#: client/gui-sdl/connectdlg.c:279 client/gui-sdl/connectdlg.c:343
+#: client/gui-sdl/connectdlg.c:280 client/gui-sdl/connectdlg.c:344
#, fuzzy
msgid "No LAN servers found"
msgstr "خادمات الشبكة الداخلية"
-#: client/gui-sdl/connectdlg.c:281 client/gui-sdl/connectdlg.c:345
+#: client/gui-sdl/connectdlg.c:282 client/gui-sdl/connectdlg.c:346
msgid "No public servers found"
msgstr ""
-#: client/gui-sdl/connectdlg.c:555
+#: client/gui-sdl/connectdlg.c:556
msgid "Player Name :"
msgstr "اسم اللاعب:"
-#: client/gui-sdl/connectdlg.c:571
+#: client/gui-sdl/connectdlg.c:572
msgid "Freeciv Server :"
msgstr "خادم Freeciv:"
-#: client/gui-sdl/connectdlg.c:588
+#: client/gui-sdl/connectdlg.c:589
msgid "Port :"
msgstr "المنÙØ°:"
-#: client/gui-sdl/connectdlg.c:608 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr "توصيل"
-#: client/gui-sdl/connectdlg.c:794 client/gui-sdl/connectdlg.c:977
+#: client/gui-sdl/connectdlg.c:795 client/gui-sdl/connectdlg.c:978
#: client/gui-xaw/connectdlg.c:145
msgid "Next"
msgstr "التالي"
@@ -13328,8 +13564,8 @@ msgid "Unable to initialize SDL library: %s"
msgstr "Ùشل بدء تشغيل مكتبة SDL: %s"
#: client/gui-sdl/graphics.c:1021
-#, c-format
-msgid "Unable to initialize SDL_ttf library: %s"
+#, fuzzy, c-format
+msgid "Unable to initialize SDL_ttf library: %s"
msgstr "Ùشل بدء تشغيل مكتبة SDL_ttf: %s"
#: client/gui-sdl/graphics.c:1058
@@ -13425,13 +13661,6 @@ msgstr "جاري بدء تشغيل العميل"
msgid "Waiting for the beginning of the game"
msgstr "جاري الإنتظار لبداية اللعبة"
-#: client/gui-sdl/gui_string.c:608
-#, fuzzy
-msgid ""
-"Couldn't find stdfont.ttf file. Please link/copy/move anyunicode ttf font to "
-"data dir as stdfont.ttf"
-msgstr "رجاء"
-
#. TRANS: Future Technology
#: client/gui-sdl/gui_tilespec.c:506
msgid "FT"
@@ -14034,12 +14263,12 @@ msgid "Leave Game"
msgstr "ØÙظ اللعبة"
#: client/gui-sdl/optiondlg.c:2302 client/gui-sdl/pages.c:255
-#: client/gui-win32/connectdlg.c:1098 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1100 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:963
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
msgid "Start New Game"
msgstr "بدء لعبة جديدة"
@@ -14152,8 +14381,8 @@ msgstr "الدخل الصاÙÙŠ: "
msgid "%s max rate : %d%%"
msgstr "%s النسبة الأعلى: %d%%"
-#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1081
-#: client/gui-win32/connectdlg.c:1089 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
+#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
msgid "Update"
msgstr "تØديث"
@@ -14605,10 +14834,6 @@ msgstr "تغيير الكل"
msgid "Refresh"
msgstr "اعادة تØميل"
-#: client/gui-win32/cityrep.c:882
-msgid "Select"
-msgstr "اختيار"
-
#: client/gui-win32/cityrep.c:883
msgid "Configure"
msgstr "تعريÙ"
@@ -14658,55 +14883,55 @@ msgstr "Ùشل تØميل اللعبة المØÙوظة"
msgid "Verify Password"
msgstr "تأكيد كلمة السر"
-#: client/gui-win32/connectdlg.c:912 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr "اختيار خادم Freeciv"
-#: client/gui-win32/connectdlg.c:913
+#: client/gui-win32/connectdlg.c:915
msgid "Local Area Network"
msgstr "شبكة داخلية"
-#: client/gui-win32/connectdlg.c:947
+#: client/gui-win32/connectdlg.c:949
msgid "Welcome to Freeciv"
msgstr "مرØبا بكم ÙÙŠ برنامج Freeciv"
-#: client/gui-win32/connectdlg.c:965
+#: client/gui-win32/connectdlg.c:967
msgid "Load Saved Game"
msgstr "تØميل لعبة Ù…ØÙوظة"
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
msgid "Connect To Network Game"
msgstr "الوصول إلى لعبة على الشبكة"
-#: client/gui-win32/connectdlg.c:977
+#: client/gui-win32/connectdlg.c:979
msgid "Choose a nation to play"
msgstr "اختيار الأمة للعب"
-#: client/gui-win32/connectdlg.c:1012
+#: client/gui-win32/connectdlg.c:1014
msgid "Number of players (Including AI):"
msgstr "عدد اللاعبيين (مع ذ.ا):"
-#: client/gui-win32/connectdlg.c:1020
+#: client/gui-win32/connectdlg.c:1022
msgid "AI skill level:"
msgstr "مستوى الذكاء الاصطناعي ذ.ا:"
-#: client/gui-win32/connectdlg.c:1034 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
msgid "Game Options"
msgstr "خيارات اللعبة"
-#: client/gui-win32/connectdlg.c:1038
+#: client/gui-win32/connectdlg.c:1040
msgid "Start Game"
msgstr "بدء لعبة"
-#: client/gui-win32/connectdlg.c:1057
+#: client/gui-win32/connectdlg.c:1059
msgid "Login:"
msgstr "اسم الدخول:"
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
msgid "Host:"
msgstr "الخادم:"
-#: client/gui-win32/connectdlg.c:1060
+#: client/gui-win32/connectdlg.c:1062
msgid "Port:"
msgstr "المنÙØ°:"
@@ -14965,10 +15190,6 @@ msgstr[0] "(عاطل %d دور)"
msgstr[1] "(عاطل %d دوران)"
msgstr[2] "(عاطل %d أدوار)"
-#: client/gui-win32/plrdlg.c:337 data/Freeciv.in:88
-msgid "Host"
-msgstr "المضيÙ"
-
#: client/gui-win32/plrdlg.c:355 data/Freeciv.in:3230
msgid "Intelligence"
msgstr "مخابرات"
@@ -16617,12 +16838,12 @@ msgstr ""
#: data/helpdata.txt:781
msgid ""
-" To have a diplomatic relationship with another player, you must fist "
-"establish first contact with that player. To establish first contact, you "
-"have to move one of your units next to a city or unit belonging to that "
-"player, or vice versa. Unless you establish an embassy with that player, you "
-"may again lose contact with them after a set number of turns without direct "
-"physical contact."
+" To have a diplomatic relationship with another player, you must first "
+"establish contact with that player. To establish contact, you have to move "
+"one of your units next to a city or unit belonging to that player, or vice "
+"versa. Unless you establish an embassy with that player, you may again lose "
+"contact with them after a set number of turns without direct physical "
+"contact."
msgstr ""
#: data/helpdata.txt:788
@@ -18973,7 +19194,7 @@ msgid "Communism"
msgstr "الشيوعية"
#: data/default/governments.ruleset:121 data/civ2/governments.ruleset:118
-#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:26
+#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:27
msgid "Comrade"
msgstr "الرÙيق"
@@ -19873,6 +20094,11 @@ msgstr ""
"مستعمرين هم جديد أجور الصيانة مستعمرين الطعام المستوطن الطعام مهندسين إذا "
"مستعمرين مهندسين دوران انتهى كن مستعمرين مهندسين."
+#: data/default/units.ruleset:238
+#, fuzzy
+msgid "?unit:Workers"
+msgstr "العمال"
+
#: data/default/units.ruleset:264
#, fuzzy
msgid ""
@@ -20464,6 +20690,11 @@ msgstr "مستكشÙ"
msgid "Explorers are very useful for mapping unknown territory."
msgstr "المستكشÙون Ù…Ùيدون جدا لتخطيط مناطق مجهولة."
+#: data/default/units.ruleset:1864
+#, fuzzy
+msgid "?unit:Leader"
+msgstr "القائد"
+
#: data/default/units.ruleset:1892
msgid "This is you. If you lose this unit, you lose the game. So don't."
msgstr "هذا هو أنت. إذا خسرت هذه الوØدة، Ùستخسر اللعبة, Ùلا تخسرها."
@@ -20688,7 +20919,7 @@ msgid "Emir"
msgstr "أمير"
#: data/nation/afghani.ruleset:25 data/nation/slovakian.ruleset:30
-#: data/nation/soviet.ruleset:27
+#: data/nation/soviet.ruleset:28
msgid "General Secretary"
msgstr "السكرتير العام"
@@ -20809,7 +21040,7 @@ msgstr "?plural:الأرمن"
msgid ""
"According to legend, the Armenian people are the descendants of Haik - the "
"great-great-grandson of Noah. The modern Republic of Armenia gained "
-"independence from Soviet in 1991 AD"
+"independence from the Soviet Union in 1991."
msgstr "التّواÙÙ‚ الأرمينيّ Ù†ÙˆØ Ø§Ù„Ù€ الØكم الجمهوري أرمينيا سوÙيتي"
#: data/nation/assyrian.ruleset:3
@@ -21837,12 +22068,11 @@ msgstr ""
#: 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 the Dalmatians to the north, "
-"Corcyra island and Ambracia bay in prehistoric Epirus to the south, mixing "
-"with Thracians in Dardania to the east, and settling Messapia across the "
-"Adriatic Sea. Illyrian kingdoms were independent for centuries, until "
-"conquered by the Roman Republic."
+"Illyrians were Indo-European tribes who appeared in the western part of the "
+"Balkan Peninsula before 1000 BC, including Corcyra island and Ambracia bay "
+"in prehistoric Epirus to the south. They mixed with Thracians in Dardania to "
+"the east, and settled Messapia across the Adriatic Sea. Illyrian kingdoms "
+"were independent for centuries, until conquered by the Roman Republic."
msgstr "أوروبي بلقانيّ شبه الجزيرة مع أدرياتيكي البØر رومي الØكم الجمهوري."
#: data/nation/inca.ruleset:3
@@ -22156,7 +22386,7 @@ msgid ""
"1953."
msgstr "التّواÙÙ‚ كوري الـ كوري اليوم كوري الشمال الجنوب كوريا كوري."
-#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:28
+#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:29
msgid "Great Leader"
msgstr "القائد الأعظم"
@@ -22325,9 +22555,9 @@ msgstr ""
msgid ""
"Sub-Saharan Africa has been a cultural and ethnical melting pot for "
"millennia. In medieval times, the region was home to a succession of empires "
-"called the Sahelian kingdoms. Of these, the Islamic Mali empire with it's "
+"called the Sahelian kingdoms. Of these, the Islamic Mali empire with its "
"capital in Timbuktu was the most influential. This empire reigned from the "
-"14th to the 17th century and was famed for it's wealth and benevolent kings. "
+"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 "الغواصة Ø¥Ùريقيا ÙÙŠ من إسلامي مالي مع هذا الـ الØكم الجمهوري مالي."
@@ -22390,8 +22620,8 @@ msgstr "?plural:أهل المايا"
#: data/nation/mayan.ruleset:6
#, fuzzy
msgid ""
-"The Mayans were a Mesoamerican civilization. Famous for building great "
-"pyramids and palaces in the jungle."
+"The Mayans were a Mesoamerican civilization. They are famous for building "
+"great pyramids and palaces in the jungle."
msgstr "الـ مجموعة لغات ينطق بها ÙÙŠ أمريكا الوسطى والمكسيك مشهور."
#: data/nation/mayan.ruleset:19
@@ -22912,6 +23142,16 @@ msgid ""
"Czechoslovakia, until 1918 it was part of the Austro-Hungarian Empire."
msgstr "سلوÙاكيا أوروبا سابقا تشيكوسلوÙاكيا هنغاري الإمبراطورية."
+#: data/nation/slovakian.ruleset:26
+#, fuzzy
+msgid "?male:Leader"
+msgstr "القائد"
+
+#: data/nation/slovakian.ruleset:26
+#, fuzzy
+msgid "?female:Leader"
+msgstr "?female:الرÙيق"
+
#: data/nation/slovakian.ruleset:29
msgid "Pope"
msgstr "البابا"
@@ -22955,11 +23195,12 @@ msgstr "?plural:سوÙيتيين"
#: data/nation/soviet.ruleset:6
#, fuzzy
msgid ""
-"Soviet Union's history starts in November 1917, when under Lenin's "
+"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 "
-"republics integrated into one country. Soviet Union became one of most "
-"powerful states in the 20th century. But by the end of 1991 due to many "
-"social shocks it disintegrated into fifteen independent countries"
+"republics integrated into one country. The Soviet Union became one of most "
+"powerful states in the 20th century, but by the end of 1991 it had "
+"disintegrated into fifteen independent countries due to social and economic "
+"problems."
msgstr ""
"سوÙيتي الإتØاد تشرين ثاني لينين البلشÙيّ على كانون أول سوÙيتي سوÙيتي الإتØاد "
"لكنّ"
@@ -23360,8 +23601,8 @@ msgstr ""
#: data/nation/westphalian.ruleset:6
#, fuzzy
msgid ""
-"Westphalia, before becoming a Prussian province, was the western region the "
-"duchy of Saxony. Present-day it consists of the Northern part of the largest "
+"Westphalia, before becoming a Prussian province, was the western region of "
+"the duchy of Saxony. Today it makes up the northern part of the largest "
"German federal state, North Rhine-Westphalia."
msgstr "ويستÙاليا بروسي ساكسوني الهدية شمالي ألماني الشمال الراين ويستÙاليا."
@@ -23511,7 +23752,7 @@ msgid ""
"The flag and background color indicate what civilization the city\n"
"belongs to (this will be useful when you meet other civilizations).\n"
"The top row of the bar also shows the name and size of the city, and\n"
-"will show one or more starts to indicate if there are units in the\n"
+"will show one or more stars to indicate if there are units in the\n"
"city. The bottom row shows what the city is building, and how long it\n"
"will take; it also shows how long the city will take to grow to the\n"
"next largest size."
@@ -23567,7 +23808,7 @@ msgid ""
"Now your city has grown to size five. As cities get larger unrest\n"
"becomes a problem. A city of this size will usually have one unhappy\n"
"citizen unless pacifying effects are used; meaning one entertainer\n"
-"specialist is required to keep your citzens content. This is basically\n"
+"specialist is required to keep your citizens content. This is basically\n"
"a wasted citizen.\n"
"\n"
"There are several things that can be done about this. One quick fix\n"
@@ -23639,7 +23880,7 @@ msgid ""
"existing cities. Generally when building new cities you want to make\n"
"sure that all tiles are covered by at least one city, but after that\n"
"it is best that your cities overlap as little as possible. Spreading\n"
-"out cities properly gives each city access to more resrouces, allowing\n"
+"out cities properly gives each city access to more resources, allowing\n"
"them to grow to larger sizes."
msgstr ""
@@ -23922,6 +24163,75 @@ msgstr "الÙريق 30"
msgid "Team 31"
msgstr "الÙريق 31"
+#, fuzzy
+#~ msgid "Auth config filename \"%s\" not allowed!"
+#~ msgstr "ذلك الاسم غير مسموØ."
+
+#~ msgid "The %s of the %s (%s)"
+#~ msgstr "ال %s من %s (%s)"
+
+#, fuzzy
+#~ msgid ""
+#~ "Illegal alliance structure detected: %s alliance to %s reduced to peace "
+#~ "treaty."
+#~ msgstr ""
+#~ "تم الكش٠عن هيكل تØال٠غير قانوني: تم تخÙيض تØال٠%sمع %s إلى معاهدة "
+#~ "سلام."
+
+#, fuzzy
+#~ msgid "And, became more experienced!"
+#~ msgstr " أكثر خبرة!"
+
+#, fuzzy
+#~ msgid "We can't take control of server, attempting to kill it."
+#~ msgstr "Ù†ØÙ†."
+
+#, fuzzy
+#~ msgid "%s territory"
+#~ msgstr "أرض ال %s"
+
+#, fuzzy
+#~ msgid "%s territory (%d turn cease-fire)"
+#~ msgid_plural "%s territory (%d turn cease-fire)"
+#~ msgstr[0] "دوران"
+#~ msgstr[1] "دوران"
+#~ msgstr[2] "دوران"
+
+#, fuzzy
+#~ msgid "%s territory (%s)"
+#~ msgstr "أرض ال %s %s"
+
+#~ msgid "City: %s (%s)"
+#~ msgstr "المدينة: %s (%s)"
+
+#, fuzzy
+#~ msgid "Unit: %s (%s)"
+#~ msgstr "الوØدة: %s (%s)"
+
+#~ msgid "%s of the %s"
+#~ msgstr "%s من ال %s"
+
+#~ msgid "no maximum, "
+#~ msgstr "بدون Øد أقصى, "
+
+#~ msgid "%d unit maximum, "
+#~ msgid_plural "%d units maximum, "
+#~ msgstr[0] "%d ÙˆØدة الØد الأقصى, "
+#~ msgstr[1] "%d ÙˆØدتان الØد الأقصى, "
+#~ msgstr[2] "%d ÙˆØدات الØد الأقصى, "
+
+#~ msgid "%d per unit). "
+#~ msgstr "%d لكل ÙˆØدة). "
+
+#~ msgid "Select same type"
+#~ msgstr "اختيار Ù†Ùس النوع"
+
+#, fuzzy
+#~ msgid ""
+#~ "Couldn't find stdfont.ttf file. Please link/copy/move anyunicode ttf font "
+#~ "to data dir as stdfont.ttf"
+#~ msgstr "رجاء"
+
#~ msgid "Units: "
#~ msgstr "الوØدات: "
@@ -24031,9 +24341,6 @@ msgstr "الÙريق 31"
#~ msgid ", nation %s"
#~ msgstr ", الأمة %s"
-#~ msgid ", team %s"
-#~ msgstr ", الÙريق %s"
-
#~ msgid "_Map"
#~ msgstr "_خريطة"
diff --git a/po/ca.gmo b/po/ca.gmo
index 846e369..1128729 100644
Binary files a/po/ca.gmo and b/po/ca.gmo differ
diff --git a/po/ca.po b/po/ca.po
index 801dc68..141889f 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,17 +1,17 @@
# translation of ca.po to CatalÃ
# FREECIV CATALAN TRANSLATION
-# Copyright (C) 2003, 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2007, 2008, 2009 Free Software Foundation, Inc.
#
# Albert Astals Cid <astals11 at terra.es>, 2003.
# David <david.gaya at terra.es>, 2003.
-# Joan Creus <joan.creus at gmail dot com>, 2007, 2008.
+# Joan Creus <joan.creus at gmail dot com>, 2007, 2008, 2009.
# David <david.gaya at gmail.com>, 2007.
msgid ""
msgstr ""
"Project-Id-Version: ca\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 07:45+0900\n"
-"PO-Revision-Date: 2008-11-25 23:47+0100\n"
+"POT-Creation-Date: 2009-03-29 21:13+0900\n"
+"PO-Revision-Date: 2009-03-23 23:46+0100\n"
"Last-Translator: Joan Creus <joan.creus at gmail dot com>\n"
"Language-Team: Català <ca at li.org>\n"
"MIME-Version: 1.0\n"
@@ -638,7 +638,7 @@ msgid "Road"
msgstr "CamÃ"
#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
-#: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
+#: client/gui-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"
@@ -655,7 +655,7 @@ msgid "Mine"
msgstr "Mina"
#: common/terrain.c:396 common/unit.c:548 server/report.c:124
-#: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
+#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr "Contaminació"
@@ -701,7 +701,7 @@ msgstr "Fortificat"
msgid "Sentry"
msgstr "Sentinella"
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:851 client/gui-sdl/menu.c:648
+#: common/unit.c:566 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"
@@ -718,7 +718,7 @@ msgstr "Explorar"
msgid "Transform"
msgstr "Transformar"
-#: common/unit.c:584 client/text.c:106 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:584 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"
@@ -787,11 +787,11 @@ msgstr "MÃssil nuclear"
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1406
+#: common/unittype.c:349 client/helpdata.c:1404
msgid " and "
msgstr " i "
-#: common/unittype.c:355 client/helpdata.c:1392
+#: common/unittype.c:355 client/helpdata.c:1390
msgid "?and:, "
msgstr ", "
@@ -1410,31 +1410,26 @@ msgstr "Valor il·legal per al port d'autenticació: \"%s\""
#: server/auth.c:281
#, c-format
-msgid "Auth config filename \"%s\" not allowed!"
-msgstr "El nom de fitxer \"%s\" de configuració d'autenticació no és permès!"
-
-#: server/auth.c:286
-#, c-format
msgid "Cannot load auth config file \"%s\"!"
msgstr ""
"No s'ha pogut carregar el fitxer de configuració d'autenticació \"%s\"!"
-#: server/auth.c:397
+#: server/auth.c:392
#, c-format
msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
msgstr ""
"Atenció: ja s'ha usat el nom de convidat '%s', renomenant a usuari '%s'."
-#: server/auth.c:404
+#: server/auth.c:399
msgid "Guests are not allowed on this server. Sorry."
msgstr "No es permeten convidats en aquest servidor. Ho sentim."
-#: server/auth.c:406
+#: server/auth.c:401
#, c-format
msgid "%s was rejected: Guests not allowed."
msgstr "%s s'ha refusat. No es permeten convidats."
-#: server/auth.c:425
+#: server/auth.c:420
#, c-format
msgid ""
"There was an error reading the user database, logging in as guest connection "
@@ -1443,7 +1438,7 @@ msgstr ""
"Hi ha hagut un error en llegir la base de dades de l'usuari, accedint com a "
"connexió de convidat '%s'."
-#: server/auth.c:431
+#: server/auth.c:426
msgid ""
"There was an error reading the user database and guest logins are not "
"allowed. Sorry"
@@ -1451,41 +1446,41 @@ msgstr ""
"Hi ha hagut un error en llegir la base de dades de l'usuari i els accessos "
"de convidat no estan permesos. Ho sento."
-#: server/auth.c:434
+#: server/auth.c:429
#, c-format
msgid "%s was rejected: Database error and guests not allowed."
msgstr "%s s'ha refusat: error de base de dades i convidats no permesos."
-#: server/auth.c:441
+#: server/auth.c:436
#, c-format
msgid "Enter password for %s:"
msgstr "Entrar contrasenya per a %s:"
-#: server/auth.c:450
+#: server/auth.c:445
msgid "Enter a new password (and remember it)."
msgstr "Entrar una contrasenya nova (i recordar-la)."
-#: server/auth.c:456
+#: server/auth.c:451
msgid "This server allows only preregistered users. Sorry."
msgstr "Aquest servidor només accepta usuaris preregistrats. Ho sento."
-#: server/auth.c:459
+#: server/auth.c:454
#, c-format
msgid "%s was rejected: Only preregister users allowed."
msgstr "%s ha estat refusat: Només es permeten usuaris preregistrats."
-#: server/auth.c:488 server/auth.c:547
+#: server/auth.c:483 server/auth.c:542
msgid "Sorry, too many wrong tries..."
msgstr "Ho sento, massa intents erronis ..."
-#: server/auth.c:489
+#: server/auth.c:484
#, c-format
msgid "%s was rejected: Too many wrong password verifies for new user."
msgstr ""
"%s ha estat refusat: massa verificacions de contrasenya errònies per usuari "
"nou."
-#: server/auth.c:505
+#: server/auth.c:500
msgid ""
"Warning: There was an error in saving to the database. Continuing, but your "
"stats will not be saved."
@@ -1493,33 +1488,33 @@ msgstr ""
"Atenció: Hi ha hagut un error en guardar a la base de dades. Es continua "
"però les teves estadÃstiques no es conservaran."
-#: server/auth.c:549
+#: server/auth.c:544
#, c-format
msgid "%s was rejected: Too many wrong password tries."
msgstr "%s s'ha refusat. Massa intents erronis de contrasenya."
-#: server/auth.c:558
+#: server/auth.c:553
msgid "Your password is incorrect. Try again."
msgstr "La teva contrasenya és incorrecta. Torna-ho a provar."
-#: server/auth.c:569
+#: server/auth.c:564
msgid "Sorry, your connection timed out..."
msgstr "Ho sento, temps de connexió excedit..."
-#: server/auth.c:571
+#: server/auth.c:566
#, c-format
msgid "%s was rejected: Connection timeout waiting for password."
msgstr ""
"%s ha estat refusat: Temps de connexió excedit esperant la contrasenya."
-#: server/auth.c:636
+#: server/auth.c:631
#, c-format
msgid "Your password is too short, the minimum length is %d. Try again."
msgstr ""
"La teva contrasenya és massa curta, la longitud mÃnima és %d. Torna a provar-"
"ho."
-#: server/auth.c:642
+#: server/auth.c:637
#, c-format
msgid ""
"The password must have at least %d capital letters, %d numbers, and be at "
@@ -2031,7 +2026,7 @@ msgstr "Aquest és el servidor de %s"
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:237 manual/civmanual.c:380
+#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
@@ -2062,14 +2057,14 @@ msgstr ""
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:241
+#: server/civserver.c:217 client/civclient.c:242
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:245
+#: server/civserver.c:221 client/civclient.c:246
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"
@@ -2077,7 +2072,7 @@ msgstr " -d, --debug NÚM\tFixa nivell de registre de depuració (0 a 3)\n"
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:248 manual/civmanual.c:382
+#: server/civserver.c:225 client/civclient.c:249 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"
@@ -2088,7 +2083,7 @@ msgstr " -l, --log FITXER\tUsa FITXER com a fitxer de registre\n"
#: server/civserver.c:227
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 "
+" -m, --meta\t\tNotificar el metaservidor i enviar-hi la informació del "
"servidor\n"
#: server/civserver.c:229
@@ -2129,11 +2124,11 @@ 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:267 manual/civmanual.c:383
+#: server/civserver.c:247 client/civclient.c:268 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:279
+#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, c-format
@@ -2410,10 +2405,9 @@ msgid ""
"user defined metamessage will be used instead of automatically\n"
"generated messages, if it is available."
msgstr ""
-"Fixar la lÃnia d'informació per al metaservidor definida per l'usuari. Si \n"
-"s'omet el parà metre, es traurà el metamissatge anterior. La major \n"
-"part del temps s'utilitzarà el metamissatge definit per l'usuari en "
-"comptes \n"
+"Fixar la lÃnia d'informació per al metaservidor definida per l'usuari. Si\n"
+"s'omet el parà metre, es traurà el metamissatge anterior. La major\n"
+"part del temps s'utilitzarà el metamissatge definit per l'usuari en comptes\n"
"de missatges generats automà ticament, si és que està disponible."
#. TRANS: translate text between <> only
@@ -3394,7 +3388,7 @@ msgid "Sea moving start units are not yet supported. Nobody gets %s."
msgstr ""
"Les unitats marines d'inici encara no estan suportades. Ningú no obté %s."
-#: server/gamehand.c:310 client/text.c:632
+#: server/gamehand.c:310 client/text.c:691
#, c-format
msgid "Year: %s"
msgstr "Any: %s"
@@ -3685,11 +3679,11 @@ msgstr "No s'ha pogut posar els %s en guerra civil - no queden nacions."
#: server/plrhand.c:1686
#, c-format
msgid ""
-"Your nation is thrust into civil war, %s is declared the leader of the "
-"rebel states."
+"Your nation is thrust into civil war! %s is declared the leader of the rebel "
+"states."
msgstr ""
-"La teva nació es veu abocada a una guerra civil, %s és declarat el lÃder de "
-"la part rebel."
+"La teva nació es veu abocada a una guerra civil! %s és declarat el lÃder "
+"dels estats rebels."
#: server/plrhand.c:1707
#, c-format
@@ -3788,7 +3782,7 @@ msgstr "Velocitat recerca"
msgid "Literacy"
msgstr "Educació"
-#: server/report.c:121 client/cityrepdata.c:526 client/cityrepdata.c:527
+#: server/report.c:121 client/cityrepdata.c:524 client/cityrepdata.c:525
#: client/gui-sdl/cityrep.c:174
msgid "Production"
msgstr "Producció"
@@ -3940,7 +3934,7 @@ msgstr ""
"La cadena de demografia conté carà cters invà lids. Intenta \"help demography"
"\"."
-#: server/report.c:743 server/report.c:766
+#: server/report.c:743 server/report.c:768
msgid "Demographics Report:"
msgstr "Informe demogrà fic:"
@@ -3948,10 +3942,12 @@ msgstr "Informe demogrà fic:"
msgid "Sorry, the Demographics report is unavailable."
msgstr "Ho sento, l'informe demogrà fic no està disponible."
-#: server/report.c:748
+#. TRANS: <nation adjective> <government name> (<year>).
+#. * E.g. "Polish Despotism (200 AD)".
+#: server/report.c:750
#, c-format
-msgid "The %s of the %s (%s)"
-msgstr "La %s dels %s (%s)"
+msgid "%s %s (%s)"
+msgstr "%2$s dels %1$s (%3$s)"
#. TRANS: message about an installation error.
#: server/ruleset.c:163
@@ -4006,16 +4002,6 @@ msgstr ""
msgid "%s had invalid nation; changing to %s."
msgstr "%s tenia una nació no và lida; canviant a %s."
-#. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4073
-#, c-format
-msgid ""
-"Illegal alliance structure detected: %s alliance to %s reduced to peace "
-"treaty."
-msgstr ""
-"S'ha detectat una estructura d'aliances il·legal: l'aliança %s amb els %s es "
-"redueix a un tractat de pau."
-
#: server/settings.c:32
msgid "Geological"
msgstr "Geològic"
@@ -5263,11 +5249,11 @@ msgstr "Prefix dels noms de desar automà tic"
#: server/settings.c:1016
msgid ""
-"Automatically saved games will have name \"<prefix><year>.sav\". This "
-"setting sets the <prefix> part."
+"Automatically saved games will have name \"<prefix>-T<turn>-Y<year>.sav\". "
+"This setting sets the <prefix> part."
msgstr ""
-"Les partides desades automà ticament tindran el nom \"<prefix><any>.sav\".\n"
-"Aquest parà metre fixa la part <prefix>."
+"Les partides desades automà ticament tindran el format \"<prefix>-T<torn>-"
+"Y<any>.sav\". Aquest parà metre fixa la part <prefix>."
#: server/settings.c:1023
msgid "Whether to log player statistics"
@@ -5283,11 +5269,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:147
+#: server/sernet.c:150
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:922
+#: server/sernet.c:929
#, c-format
msgid "Server: bad address: [%s:%d]."
msgstr "Servidor: adreça incorrecta: [%s:%d]."
@@ -5413,101 +5399,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:928
+#: server/srv_main.c:961
#, c-format
msgid "Failed saving game as %s"
msgstr "No s'ha pogut desar la partida com a %s"
-#: server/srv_main.c:930
+#: server/srv_main.c:963
#, c-format
msgid "Game saved as %s"
msgstr "Partida desada com a %s"
-#: server/srv_main.c:962
+#: server/srv_main.c:994
msgid "The game is already running."
msgstr "La partida ja s'està jugant."
-#: server/srv_main.c:970
+#: server/srv_main.c:1002
#, 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:977
+#: server/srv_main.c:1009
msgid "Starting game."
msgstr "S'està iniciant la partida."
-#: server/srv_main.c:1039
+#: server/srv_main.c:1071
#, c-format
msgid "request for unknown report (type %d)"
msgstr "sol·licitud d'informe desconegut (tipus %d)"
-#: server/srv_main.c:1104
+#: server/srv_main.c:1136
#, c-format
msgid "Warning: rejecting old client %s"
msgstr "AvÃs: rebutjant client antic %s"
-#: server/srv_main.c:1206
+#: server/srv_main.c:1238
#, 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:1306
+#: server/srv_main.c:1338
msgid "Please choose a non-blank name."
msgstr "Si us plau, escull un nom no buit."
-#: server/srv_main.c:1322
+#: server/srv_main.c:1354
msgid "That nation is already in use."
msgstr "Aquesta nació ja està agafada."
-#: server/srv_main.c:1338
+#: server/srv_main.c:1370
#, 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:1359
+#: server/srv_main.c:1391
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:1458
+#: server/srv_main.c:1490
#, 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:1464
+#: server/srv_main.c:1496
#, c-format
msgid "%s nation is already in use."
msgstr "La nació %s ja està agafada."
-#: server/srv_main.c:1482
+#: server/srv_main.c:1514
#, c-format
msgid "%s is the %s ruler %s."
msgstr "%s és el dirigent %s %s."
-#: server/srv_main.c:1538
+#: server/srv_main.c:1570
#, 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:1582 server/srv_main.c:1586
+#: server/srv_main.c:1614 server/srv_main.c:1618
#, 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:1728
+#: server/srv_main.c:1760
#, c-format
msgid "Player %d"
msgstr "Jugador %d"
-#: server/srv_main.c:1739 server/srv_main.c:1745
+#: server/srv_main.c:1771 server/srv_main.c:1777
#, c-format
msgid "%s rules the %s."
msgstr "%s governa els %s."
-#: server/srv_main.c:1910
+#: server/srv_main.c:1942
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
@@ -5515,16 +5501,16 @@ msgstr ""
"Aquest programa civserver té suport d'autenticació de jugadors, però ara "
"mateix no es fa servir."
-#: server/srv_main.c:1961
+#: server/srv_main.c:1993
#, c-format
msgid "Sending info to metaserver [%s]"
msgstr "S'està enviant informació al metaservidor [%s]"
-#: server/srv_main.c:1992
+#: server/srv_main.c:2024
msgid "The game is over..."
msgstr "La partida ha acabat..."
-#: server/srv_main.c:2205
+#: server/srv_main.c:2237
msgid "Now accepting new client connections."
msgstr "S'estan acceptant noves connexions de clients."
@@ -6205,9 +6191,8 @@ 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
-#, fuzzy
msgid "You cannot take a new player at this time."
-msgstr "Ho sento, en aquesta partida no es poden prendre els jugadors humans."
+msgstr "No pots agafar un jugador nou en aquest moment."
#. TRANS: Do not translate "maxplayers".
#: server/stdinhand.c:2679
@@ -6219,11 +6204,16 @@ msgid_plural ""
"You cannot take a new player because the maximum of %d players has already "
"been reached (maxplayers setting)."
msgstr[0] ""
+"No pots agafar un nou jugador perquè s'ha arribat al mà xim de %d jugador (la "
+"preferència maxplayers)"
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
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
msgid "Sorry, one can't observe barbarians in this game."
@@ -6316,14 +6306,14 @@ msgid "Usage: take [connection-name] <player-name>"
msgstr "Ús: take [nom-connexió] <nom-jugador>"
#: server/stdinhand.c:3010
-#, fuzzy, c-format
+#, c-format
msgid "%s already controls %s."
-msgstr "%s ja controla %s"
+msgstr "%s ja controla %s."
#: server/stdinhand.c:3024
-#, fuzzy, c-format
+#, c-format
msgid "There is no free player slot for %s."
-msgstr "No queda cap espai de jugador lliure per a %s"
+msgstr "No queda cap espai de jugador lliure per a %s."
#: server/stdinhand.c:3059
#, c-format
@@ -6331,9 +6321,9 @@ msgid "being detached from %s."
msgstr "desconnectant-se de %s."
#: server/stdinhand.c:3135
-#, fuzzy, c-format
+#, c-format
msgid "%s now controls %s (%s, %s)."
-msgstr "%s ara controla %s (%s, %s)"
+msgstr "%s ara controla %s (%s, %s)."
#: server/stdinhand.c:3139 server/stdinhand.c:4260
#: data/nation/barbarian.ruleset:3
@@ -6341,32 +6331,32 @@ 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:2030 client/gui-sdl/plrdlg.c:645
+#: 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
msgid "AI"
msgstr "IA"
#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
+#: client/gui-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
msgid "Human"
msgstr "Humà "
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
-#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
+#: 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
msgid "Alive"
msgstr "Viu"
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
#: client/gui-win32/connectdlg.c:200
msgid "Dead"
msgstr "Mort"
#: server/stdinhand.c:3147
-#, fuzzy, c-format
+#, c-format
msgid "%s failed to attach to any player."
-msgstr "%s no s'ha pogut associar a cap jugador"
+msgstr "%s no s'ha pogut associar a cap jugador."
#: server/stdinhand.c:3182
msgid "Usage: detach <connection-name>"
@@ -6624,9 +6614,9 @@ 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:242
-#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
-#: client/text.c:1201
+#: 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
#, c-format
msgid "?clistmore:, %s"
msgstr "?clistmore:, %s"
@@ -6881,7 +6871,7 @@ msgstr "Només els %s poden atacar des del mar."
msgid "Cannot attack from sea."
msgstr "No pots atacar des del mar."
-#: server/unithand.c:996 server/unittools.c:2103
+#: server/unithand.c:996 server/unittools.c:2137
msgid "Cannot attack unless you declare war first."
msgstr "No pots atacar a no ser que declaris la guerra abans."
@@ -6987,100 +6977,102 @@ msgstr "%s s'ha millorat de franc a %s."
#: server/unittools.c:297
#, c-format
-msgid "Not enough gold. %s disbanded"
-msgstr "No hi ha prou or. %s desmantellada."
+msgid "Not enough gold to pay upkeep for %s. Unit disbanded."
+msgstr ""
+"No hi ha prou or per pagar el manteniment de %s. La unitat és desmantellada."
-#: server/unittools.c:342
+#: server/unittools.c:343
#, c-format
msgid "Your %s has run out of hit points."
msgstr "El teu %s s'ha quedat sense punts de vida."
-#: server/unittools.c:358
+#: server/unittools.c:359
#, c-format
msgid "Your %s has been lost on the high seas."
msgstr "El teu %s s'ha perdut a alta mar."
-#: server/unittools.c:365
+#: server/unittools.c:366
#, c-format
msgid "Your %s survived on the high seas and became more experienced!"
msgstr "El teu %s ha sobreviscut en alta mar i ha guanyat experiència!"
-#: server/unittools.c:376
+#: server/unittools.c:377
#, c-format
msgid "Your %s has been lost on unsafe terrain."
msgstr "El teu %s s'ha perdut en terreny insegur."
-#: server/unittools.c:430
+#: server/unittools.c:431
#, c-format
msgid "Your %s has returned to refuel."
msgstr "El teu %s ha tornat per carregar combustible."
-#: server/unittools.c:454
+#: server/unittools.c:455
#, c-format
msgid "Your %s has run out of fuel."
msgstr "El teu %s s'ha quedat sense combustible."
-#. TRANS: And, <the unit> became ...
-#: server/unittools.c:616
-msgid "And, became more experienced!"
-msgstr "I ha guanyat experiència!"
-
#. TRANS: Your <unit> became ...
-#: server/unittools.c:620
+#: server/unittools.c:619
#, c-format
msgid "Your %s became more experienced!"
msgstr "El teu %s ha guanyat experiència!"
-#: server/unittools.c:1011
+#: server/unittools.c:1009
#, c-format
msgid "Teleported your %s to %s."
msgstr "S'ha teleportat el teu %s a %s."
-#: server/unittools.c:1041
+#. TRANS: A unit is moved to resolve stack conflicts.
+#: server/unittools.c:1065
+#, c-format
+msgid "Moved your %s."
+msgstr "S'ha mogut el teu %s."
+
+#: server/unittools.c:1076
#, c-format
msgid "Disbanded your %s."
msgstr "S'ha desmantellat el teu %s."
-#: server/unittools.c:1363
+#: server/unittools.c:1397
#, 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:1367
+#: server/unittools.c:1401
#, 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:1469
+#: server/unittools.c:1503
#, 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:1478
+#: server/unittools.c:1512
#, c-format
msgid "%s lost when %s was lost."
msgstr "%s perdut en perdre %s."
-#: server/unittools.c:1527
+#: server/unittools.c:1561
#, 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:1545
+#: server/unittools.c:1579
#, 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:1554 server/unittools.c:1612
+#: server/unittools.c:1588 server/unittools.c:1646
#, 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:1588
+#: server/unittools.c:1622
#, c-format
msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
msgid_plural ""
@@ -7092,14 +7084,14 @@ msgstr[1] ""
#. TRANS: "Cannon lost when the Polish Destroyer
#. * attacked the German Musketeers."
-#: server/unittools.c:1621
+#: server/unittools.c:1655
#, 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:1636
+#: server/unittools.c:1670
#, 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."
@@ -7107,7 +7099,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:1646
+#: server/unittools.c:1680
#, 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."
@@ -7117,197 +7109,197 @@ 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:1660
+#: server/unittools.c:1694
#, 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:1928
+#: server/unittools.c:1962
#, 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:1931 server/unittools.c:1947
+#: server/unittools.c:1965 server/unittools.c:1981
msgid "yourself"
msgstr "tu mateix"
-#: server/unittools.c:1935
+#: server/unittools.c:1969
#, c-format
msgid "The %s %s was nuked."
msgstr "%2$s %1$s atacat amb una arma nuclear."
-#: server/unittools.c:1944
+#: server/unittools.c:1978
#, c-format
msgid "%s was nuked by %s."
msgstr "%s atacada amb una arma nuclear per %s."
-#: server/unittools.c:1952
+#: server/unittools.c:1986
#, c-format
msgid "You nuked %s."
msgstr "Has atacat amb una arma nuclear %s."
-#: server/unittools.c:1993
+#: server/unittools.c:2027
#, c-format
msgid "The %s detonated a nuke!"
msgstr "Els %s han detonat una arma nuclear!"
-#: server/unittools.c:2017
+#: server/unittools.c:2051
#, c-format
msgid "%s transported successfully."
msgstr "%s s'ha transportat satisfactòriament."
-#: server/unittools.c:2069
+#: server/unittools.c:2103
msgid "This unit type can not be paradropped."
msgstr "Aquest tipus d'unitat no pot ser llançat amb paracaigudes."
-#: server/unittools.c:2079
+#: server/unittools.c:2113
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:2085
+#: server/unittools.c:2119
msgid "The destination location is not known."
msgstr "La ubicació de destà és desconeguda."
-#: server/unittools.c:2092
+#: server/unittools.c:2126
#, c-format
msgid "This unit cannot paradrop into %s."
msgstr "Aquesta unitat no es pot llançar en paracaigudes a %s."
-#: server/unittools.c:2112
+#: server/unittools.c:2146
#, 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:2123
+#: server/unittools.c:2157
#, 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:2136
+#: server/unittools.c:2170
#, 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:2158
+#: server/unittools.c:2192
#, c-format
msgid "You found %d gold."
msgstr "Has trobat %d peces d'or."
-#: server/unittools.c:2175
+#: server/unittools.c:2209
#, c-format
msgid "You found %s in ancient scrolls of wisdom."
msgstr "Has trobat uns antics pergamins sobre %s."
-#: server/unittools.c:2182
+#: server/unittools.c:2216
#, 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:2196
+#: server/unittools.c:2230
msgid "A band of friendly mercenaries joins your cause."
msgstr "Una banda de mercenaris s'uneix a la teva causa."
-#: server/unittools.c:2214
+#: server/unittools.c:2248
msgid "An abandoned village is here."
msgstr "Només hi ha un poble abandonat."
-#: server/unittools.c:2224
+#: server/unittools.c:2258
msgid "You have unleashed a horde of barbarians!"
msgstr "Has alliberat una horda de bà rbars!"
-#: server/unittools.c:2227
+#: server/unittools.c:2261
#, c-format
msgid "Your %s has been killed by barbarians!"
msgstr "El teu %s ha mort a mans de bà rbars!"
-#: server/unittools.c:2243
+#: server/unittools.c:2277
msgid "You found a friendly city."
msgstr "Has trobat una ciutat amistosa."
-#: server/unittools.c:2257
+#: server/unittools.c:2291
msgid "Friendly nomads are impressed by you, and join you."
msgstr "Impressiones a uns nòmades i s'uneixen a tu."
-#: server/unittools.c:2282
+#: server/unittools.c:2316
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:2540
+#: server/unittools.c:2574
#, 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:2989
+#: server/unittools.c:3023
#, 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:3041
+#: server/unittools.c:3075
#, 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:3054
+#: server/unittools.c:3088
#, 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:3068
+#: server/unittools.c:3102
#, 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:3078
+#: server/unittools.c:3112
#, 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:3104
+#: server/unittools.c:3138
#, 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:3145
+#: server/unittools.c:3179
#, 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:3156
+#: server/unittools.c:3190
#, 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:3168
+#: server/unittools.c:3202
#, c-format
msgid "Attempt to build wonder for %s failed."
msgstr "L'intent de construir meravella per %s ha fallat"
-#: server/unittools.c:3177
+#: server/unittools.c:3211
#, c-format
msgid "Your %s has invalid orders."
msgstr "El teu %s té ordres incorrectes"
-#: server/generator/mapgen.c:1737
+#: server/generator/mapgen.c:1771
msgid "High landmass - this may take a few seconds."
msgstr "Massa de terra gran - pot trigar uns segons."
-#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
+#: server/generator/mapgen.c:1969 server/generator/mapgen.c:2039
#, c-format
msgid "Falling back to generator %d."
msgstr "Tornant al generador %d."
-#: server/generator/mapgen.c:2025
+#: server/generator/mapgen.c:2059
msgid "Generator 3 didn't place all big islands."
msgstr "El generador 3 no ha situat totes les illes grans."
-#: server/generator/mapgen.c:2054
+#: server/generator/mapgen.c:2088
#, c-format
msgid "Generator 3 left %li landmass unplaced."
msgstr "El generador 3 ha deixat massa de terra %li sense situar."
@@ -7416,7 +7408,7 @@ msgid_plural "%3d turns"
msgstr[0] "%3d torn"
msgstr[1] "%3d torns"
-#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:631
#: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
@@ -7534,339 +7526,338 @@ msgstr "Pau"
msgid "(worklist)"
msgstr "(llista de treball)"
-#: client/cityrepdata.c:447
-msgid "Special"
-msgstr "Especial"
+#: client/cityrepdata.c:446
+msgid "?city:Name"
+msgstr "Nom"
-#: client/cityrepdata.c:448
-msgid "?entertainers/scientists/taxmen:E/S/T"
-msgstr "A/C/R"
+#: client/cityrepdata.c:446 client/gui-sdl/cityrep.c:169
+msgid "City Name"
+msgstr "Nom de la ciutat"
-#: client/cityrepdata.c:449
-msgid "Entertainers, Scientists, Taxmen"
-msgstr "Artistes, CientÃfics, Recaptadors"
+#: client/cityrepdata.c:448
+msgid "?size [short]:Sz"
+msgstr "Mi"
-#: client/cityrepdata.c:452
-msgid "Concise + Rapture, - Disorder"
-msgstr "ConcÃs + Festa, - Desordre"
+#: client/cityrepdata.c:448
+msgid "Size"
+msgstr "Mida"
-#: client/cityrepdata.c:454 client/plrdlg_common.c:261
+#: client/cityrepdata.c:450 client/plrdlg_common.c:261
#: client/gui-win32/plrdlg.c:337
msgid "State"
msgstr "Estat"
-#: client/cityrepdata.c:454
+#: client/cityrepdata.c:450
msgid "Rapture/Peace/Disorder"
msgstr "En festa/Pau/Desordre"
+#: client/cityrepdata.c:452
+msgid "Concise *=Rapture, X=Disorder"
+msgstr "ConcÃs *=Festa, X=Desordre"
+
+#: client/cityrepdata.c:456
+msgid "Special"
+msgstr "Especial"
+
#: client/cityrepdata.c:457
+msgid "?entertainers/scientists/taxmen:E/S/T"
+msgstr "A/C/R"
+
+#: client/cityrepdata.c:458
+msgid "Entertainers, Scientists, Taxmen"
+msgstr "Artistes, CientÃfics, Recaptadors"
+
+#: client/cityrepdata.c:461
msgid "?Happy workers:H"
msgstr "F"
-#: client/cityrepdata.c:457
+#: client/cityrepdata.c:461
msgid "Workers: Happy"
msgstr "Treballadors: Feliços"
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
msgid "?Content workers:C"
msgstr "C"
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
msgid "Workers: Content"
msgstr "Treballadors: Contents"
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
msgid "?Unhappy workers:U"
msgstr "D"
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
msgid "Workers: Unhappy"
msgstr "Treballadors: Descontents"
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
msgid "?Angry workers:A"
msgstr "E"
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
msgid "Workers: Angry"
msgstr "Treballadors: Enfadats"
-#: client/cityrepdata.c:465 client/gui-xaw/citydlg.c:2401
-#: data/default/units.ruleset:238
-msgid "Workers"
+#: client/cityrepdata.c:469 client/gui-xaw/citydlg.c:2402
+msgid "?city:Workers"
msgstr "Treballadors"
-#: client/cityrepdata.c:466
+#: client/cityrepdata.c:470
msgid "?happy/content/unhappy/angry:H/C/U/A"
msgstr "F/C/D/E"
-#: client/cityrepdata.c:467
+#: client/cityrepdata.c:471
msgid "Workers: Happy, Content, Unhappy, Angry"
msgstr "Treballadors: Feliços, Contents, Descontents, Enfadats"
-#: client/cityrepdata.c:470 client/cityrepdata.c:472
+#: client/cityrepdata.c:474 client/cityrepdata.c:476
msgid "Best"
msgstr "Millor"
-#: client/cityrepdata.c:470
+#: client/cityrepdata.c:474
msgid "attack"
msgstr "atac"
-#: client/cityrepdata.c:471
+#: client/cityrepdata.c:475
msgid "Best attacking units"
msgstr "Unitats d'atac millors"
-#: client/cityrepdata.c:472
+#: client/cityrepdata.c:476
msgid "defense"
msgstr "defensa"
-#: client/cityrepdata.c:473
+#: client/cityrepdata.c:477
msgid "Best defending units"
msgstr "Unitats defensives millors"
-#: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
-#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
-#: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
-#: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
-#: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
-#: client/gui-win32/menu.c:351 client/gui-win32/repodlgs.c:616
-#: client/gui-win32/repodlgs.c:707 client/gui-win32/repodlgs.c:716
-#: client/gui-xaw/menu.c:157 client/gui-xaw/menu.c:219
-#: client/gui-xaw/menu.c:242 client/gui-xaw/repodlgs.c:881
-#: client/gui-xaw/repodlgs.c:1069 data/Freeciv.in:1895 data/helpdata.txt:909
+#: client/cityrepdata.c:478 client/cityrepdata.c:482
+#: client/gui-gtk-2.0/cityrep.c:1437 client/gui-gtk-2.0/cityrep.c:1456
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-gtk-2.0/cityrep.c:1494
+#: client/gui-gtk-2.0/cityrep.c:1514 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/repodlgs.c:960 client/gui-sdl/helpdlg.c:688
+#: client/gui-sdl/mapctrl.c:1605 client/gui-sdl/optiondlg.c:1827
+#: client/gui-sdl/repodlgs.c:356 client/gui-win32/menu.c:351
+#: client/gui-win32/repodlgs.c:616 client/gui-win32/repodlgs.c:707
+#: client/gui-win32/repodlgs.c:716 client/gui-xaw/menu.c:157
+#: client/gui-xaw/menu.c:219 client/gui-xaw/menu.c:242
+#: client/gui-xaw/repodlgs.c:881 client/gui-xaw/repodlgs.c:1069
+#: data/Freeciv.in:1895 data/helpdata.txt:909
msgid "Units"
msgstr "Unitats"
#. TRANS: Header "Number of units inside city"
-#: client/cityrepdata.c:476
+#: client/cityrepdata.c:480
msgid "?Present (units):Here"
msgstr "AquÃ"
-#: client/cityrepdata.c:477
+#: client/cityrepdata.c:481
msgid "Number of units present"
msgstr "Nombre d'unitats presents"
#. TRANS: Header "Number of units supported by given city"
-#: client/cityrepdata.c:480
+#: client/cityrepdata.c:484
msgid "?Supported (units):Owned"
msgstr "Pròpies"
-#: client/cityrepdata.c:481
+#: client/cityrepdata.c:485
msgid "Number of units supported"
msgstr "Nombre d'unitats suportades"
#. TRANS: Header "It will take this many turns before city grows"
-#: client/cityrepdata.c:484
+#: client/cityrepdata.c:488
msgid "?food (population):Grow"
msgstr "Creix"
-#: client/cityrepdata.c:485 client/cityrepdata.c:530
+#: client/cityrepdata.c:489 client/cityrepdata.c:528
msgid "?Stock/Target:(Have/Need)"
msgstr "(Fet/Cal)"
-#: client/cityrepdata.c:486
+#: client/cityrepdata.c:490
msgid "Turns until growth/famine"
msgstr "Torns fins creixement/fam"
-#: client/cityrepdata.c:488
-msgid "?size [short]:Sz"
-msgstr "Mi"
-
-#: client/cityrepdata.c:488
-msgid "Size"
-msgstr "Mida"
-
-#: client/cityrepdata.c:492
-msgid "?city:Name"
-msgstr "Nom"
-
-#: client/cityrepdata.c:492 client/gui-sdl/cityrep.c:169
-msgid "City Name"
-msgstr "Nom de la ciutat"
-
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
msgid "Surplus"
msgstr "Excedent"
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
msgid "?food/production/trade:F/P/T"
msgstr "M/P/C"
-#: client/cityrepdata.c:496
+#: client/cityrepdata.c:494
msgid "Surplus: Food, Production, Trade"
msgstr "Excedent: Menjar, Producció, Comerç"
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
msgid "?Food surplus [short]:+F"
msgstr "+M"
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
msgid "Surplus: Food"
msgstr "Excedent: Menjar"
-#: client/cityrepdata.c:500
+#: client/cityrepdata.c:498
msgid "?Production surplus [short]:+P"
msgstr "+P"
-#: client/cityrepdata.c:501
+#: client/cityrepdata.c:499
msgid "Surplus: Production"
msgstr "Excedent: Producció"
-#: client/cityrepdata.c:502
+#: client/cityrepdata.c:500
msgid "?Production loss (waste) [short]:-P"
msgstr "-P"
-#: client/cityrepdata.c:503
+#: client/cityrepdata.c:501
msgid "Waste"
msgstr "Malbaratament"
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
msgid "?Trade surplus [short]:+T"
msgstr "+C"
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
msgid "Surplus: Trade"
msgstr "Excedent: Comerç"
-#: client/cityrepdata.c:506
+#: client/cityrepdata.c:504
msgid "?Trade loss (corruption) [short]:-T"
msgstr "-C"
-#: client/cityrepdata.c:507
+#: client/cityrepdata.c:505
msgid "Corruption"
msgstr "Corrupció"
-#: client/cityrepdata.c:509 client/gui-gtk-2.0/repodlgs.c:654
+#: client/cityrepdata.c:507 client/gui-gtk-2.0/repodlgs.c:654
#: client/gui-sdl/mapctrl.c:1400 client/gui-win32/repodlgs.c:334
#: client/gui-xaw/menu.c:222 client/gui-xaw/repodlgs.c:644
#: client/gui-xaw/repodlgs.c:773 data/Freeciv.in:1819
msgid "Economy"
msgstr "Economia"
-#: client/cityrepdata.c:509
+#: client/cityrepdata.c:507
msgid "?gold/luxury/science:G/L/S"
msgstr "O/L/C"
-#: client/cityrepdata.c:510
+#: client/cityrepdata.c:508
msgid "Economy: Gold, Luxuries, Science"
msgstr "Economia: Or, Luxes, Ciència"
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
msgid "?Gold:G"
msgstr "O"
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
msgid "Economy: Gold"
msgstr "Economia: Or"
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
msgid "?Luxury:L"
msgstr "L"
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
msgid "Economy: Luxury"
msgstr "Economia: Luxes"
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
msgid "?Science:S"
msgstr "C"
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
msgid "Economy: Science"
msgstr "Economia: Ciència"
-#: client/cityrepdata.c:518
+#: client/cityrepdata.c:516
msgid "?number_trade_routes:n"
msgstr "n"
-#: client/cityrepdata.c:518
+#: client/cityrepdata.c:516
msgid "?number_trade_routes:R"
msgstr "R"
-#: client/cityrepdata.c:519
+#: client/cityrepdata.c:517
msgid "Number of Trade Routes"
msgstr "Nombre de Rutes Comercials"
-#: client/cityrepdata.c:521
+#: client/cityrepdata.c:519
msgid "?pollution [short]:Pol"
msgstr "Cont"
-#: client/cityrepdata.c:523
+#: client/cityrepdata.c:521
msgid "?cma:Governor"
msgstr "Gestor"
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
-#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
-#: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
-#: data/Freeciv.in:1459 data/helpdata.txt:820
+#: client/cityrepdata.c:521 client/gui-gtk-2.0/cityrep.c:1766
+#: client/gui-sdl/citydlg.c:3809 client/gui-sdl/cma_fe.c:858
+#: client/gui-win32/citydlg.c:726 data/Freeciv.in:1459 data/helpdata.txt:820
msgid "Citizen Governor"
msgstr "Gestor de Ciutadans"
-#: client/cityrepdata.c:526
+#: client/cityrepdata.c:524
msgid "Turns/Buy"
msgstr "Torns/Comprar"
-#: client/cityrepdata.c:529 client/cityrepdata.c:531
+#: client/cityrepdata.c:527 client/cityrepdata.c:529
msgid "Currently Building"
msgstr "Construcció actual"
-#: client/cityrepdata.c:575
+#: client/cityrepdata.c:573
msgid "?specialist:S"
msgstr "E"
-#: client/cityrepdata.c:578
+#: client/cityrepdata.c:576
msgid "Specialists"
msgstr "Especialistes"
-#: client/civclient.c:239
+#: client/civclient.c:240
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr " -a, --autoconnect\tSaltar el dià leg de connexió\n"
-#: client/civclient.c:249
+#: client/civclient.c:250
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:251
+#: client/civclient.c:252
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:253
+#: client/civclient.c:254
msgid " -n, --name NAME\tUse NAME as name\n"
msgstr " -n, --name NOM\tUsa NOM com a nom\n"
-#: client/civclient.c:255
+#: client/civclient.c:256
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:257
+#: client/civclient.c:258
#, 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:259
+#: client/civclient.c:260
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:262
+#: client/civclient.c:263
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:264
+#: client/civclient.c:265
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:265
+#: client/civclient.c:266
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:268
+#: client/civclient.c:269
#, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -7876,146 +7867,156 @@ msgstr ""
"\t\t\tProva \"%s -- --help\" per més ajuda.\n"
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:273
+#: client/civclient.c:274
#, c-format
msgid "Report bugs at %s\n"
msgstr "Informa dels errors a %s\n"
-#: client/civclient.c:297
+#: client/civclient.c:298
#, 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:299 client/civclient.c:314
+#: client/civclient.c:300 client/civclient.c:315
msgid "Try using --help.\n"
msgstr "Prova de fer servir --help.\n"
-#: client/civclient.c:312
+#: client/civclient.c:313
#, 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:325
+#: client/civclient.c:326
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr "Opció no reconeguda: \"%s\"\n"
-#: client/civclient.c:539
+#: client/civclient.c:391
+#, c-format
+msgid "Updating old metaserver address \"%s\"."
+msgstr "Actualitzant l'adreça antiga del metaservidor \"%s\"."
+
+#: client/civclient.c:394
+#, c-format
+msgid "Default metaserver has been set to \"%s\"."
+msgstr "S'ha fixat el metaservidor per defecte a \"%s\"."
+
+#: client/civclient.c:550
msgid "Game started."
msgstr "La partida ha començat."
-#: client/civclient.c:577
+#: client/civclient.c:588
msgid "There was an error while auto connecting; aborting."
msgstr ""
"Hi ha hagut un error mentre em connectava automà ticament; s'està avortant."
-#: client/climisc.c:176
+#: client/climisc.c:177
#, c-format
msgid "Changing production of every %s into %s."
msgstr "Canvi de la producció de totes les %s a %s."
-#: client/climisc.c:214
+#: client/climisc.c:215
msgid "?embassy:Both"
msgstr "Tots dos"
-#: client/climisc.c:216
+#: client/climisc.c:217
msgid "?embassy:Yes"
msgstr "SÃ"
-#: client/climisc.c:219
+#: client/climisc.c:220
msgid "?embassy:With Us"
msgstr "Amb nosatres"
-#: client/climisc.c:222
+#: client/climisc.c:223
msgid "?embassy:Contact"
msgstr "Contactat"
-#: client/climisc.c:224
+#: client/climisc.c:225
msgid "?embassy:No Contact"
msgstr "Sense contacte"
-#: client/climisc.c:236
+#: client/climisc.c:237
msgid "?vision:Both"
msgstr "Tots dos"
-#: client/climisc.c:238
+#: client/climisc.c:239
msgid "?vision:To Them"
msgstr "Per ells"
-#: client/climisc.c:241
+#: client/climisc.c:242
msgid "?vision:To Us"
msgstr "Per nosatres"
-#: client/climisc.c:257 client/climisc.c:264
+#: client/climisc.c:258 client/climisc.c:265
#, c-format
msgid "The %s give %s"
msgstr "Els %s donen %s"
-#: client/climisc.c:268
+#: client/climisc.c:269
#, c-format
msgid "The %s give unknown city."
msgstr "Els %s donen una ciutat desconeguda"
-#: client/climisc.c:273
+#: client/climisc.c:274
#, c-format
msgid "The %s give %d gold"
msgstr "Els %s donen %d peces d'or"
-#: client/climisc.c:278
+#: client/climisc.c:279
#, c-format
msgid "The %s give their worldmap"
msgstr "Els %s donen el seu mapa del món"
-#: client/climisc.c:282
+#: client/climisc.c:283
#, c-format
msgid "The %s give their seamap"
msgstr "Els %s donen el seu mapa marÃtim"
-#: client/climisc.c:286
+#: client/climisc.c:287
msgid "The parties agree on a cease-fire"
msgstr "Les parts acorden un alto el foc"
-#: client/climisc.c:289
+#: client/climisc.c:290
msgid "The parties agree on a peace"
msgstr "Les parts estan d'acord en signar la pau."
-#: client/climisc.c:292
+#: client/climisc.c:293
msgid "The parties create an alliance"
msgstr "Les parts creen una aliança."
-#: client/climisc.c:295
+#: client/climisc.c:296
#, c-format
msgid "The %s give shared vision"
msgstr "Els %s donen visió compartida"
-#: client/climisc.c:299
+#: client/climisc.c:300
#, c-format
msgid "The %s give an embassy"
msgstr "Els %s donen una ambaixada"
-#: client/climisc.c:902
+#: client/climisc.c:906
msgid "Popup Request"
msgstr "Sol·licitud en popup"
-#: client/climisc.c:932
+#: client/climisc.c:936
msgid "Exporting output window to civgame.log ..."
msgstr "S'està exportant la finestra de sortida a civgame.log ..."
-#: client/climisc.c:936
+#: client/climisc.c:940
msgid "Export complete."
msgstr "S'ha completat l'exportació."
-#: client/climisc.c:938
+#: client/climisc.c:942
msgid "Export failed, couldn't write to file."
msgstr "Ha fallat l'exportació, no s'ha pogut escriure a l'arxiu."
-#: client/climisc.c:1038
+#: client/climisc.c:1042
#, c-format
msgid "You don't buy %s in %s!"
msgstr "No compres %s a %s!"
-#: client/climisc.c:1056
+#: client/climisc.c:1060
#, c-format
msgid "%s costs %d gold and you only have %d gold."
msgstr "%s costa %d peces d'or i només en tens %d."
@@ -8065,19 +8066,19 @@ msgstr ""
"Connexió automà tica al servidor \"%s\" port %d com a \"%s\" cada %f segon(s) "
"durant %d intents"
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1289
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
msgid "novice"
msgstr "principiant"
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1289
+#: client/connectdlg_common.c:80 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:1290
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
msgid "normal"
msgstr "normal"
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1290
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
msgid "hard"
msgstr "difÃcil"
@@ -8106,38 +8107,43 @@ msgid "We probably couldn't start it from here."
msgstr "Probablement no podrÃem engegar-lo des d'aquÃ."
#: client/connectdlg_common.c:470
-msgid "We have control of the server (command access level hack)"
-msgstr "Controlem el servidor (nivell d'accés a comandes hack)"
+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
-msgid "We can't take control of server, attempting to kill it."
-msgstr "No podem controlar el servidor, intentant aturar-lo."
+msgid ""
+"Failed to obtain the required access level to take control of the server. "
+"The server will now be shutdown."
+msgstr ""
+"No s'ha pogut obtenir el nivell d'accés que cal per prendre el control del "
+"servidor. S'aturarà el servidor."
-#: client/control.c:1104
+#: client/control.c:1123
msgid "Only transporter units can be unloaded."
msgstr "Només es poden descarregar les unitats de transport."
-#: client/control.c:1353
+#: client/control.c:1425
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:1444
+#: client/control.c:1516
msgid "Only nuclear units can do this."
msgstr "Només les unitats nuclears poden fer això."
-#: client/control.c:1473
+#: client/control.c:1545
msgid "Only paratrooper units can do this."
msgstr "Només els paracaigudistes poden fer això."
-#: client/control.c:1921
+#: client/control.c:2020
msgid "Too far for this unit."
msgstr "Massa lluny per a aquesta unitat."
-#: client/control.c:2131 client/control.c:2161 client/control.c:2177
+#: client/control.c:2230 client/control.c:2260 client/control.c:2276
msgid "Didn't find a route to the destination!"
msgstr "No he trobat una ruta al destÃ."
-#: client/control.c:2221
+#: client/control.c:2320
msgid "Oh my! You seem to have no capital!"
msgstr "Bufa! Pel que sembla no tens capital!"
@@ -8207,16 +8213,16 @@ msgid "Allows %s (with %s)."
msgstr "Permet %s (amb %s)."
#. TRANS: preserve single space at beginning
-#: client/helpdata.c:418
+#: client/helpdata.c:416
msgid " Rivers"
msgstr " Rius"
-#: client/helpdata.c:576
+#: client/helpdata.c:574
#, c-format
msgid "Sorry, no help topic for %s.\n"
msgstr "Ho sento, no hi ha ajuda pel tema %s.\n"
-#: client/helpdata.c:580
+#: client/helpdata.c:578
#, c-format
msgid ""
"Sorry, no help topic for %s.\n"
@@ -8227,7 +8233,7 @@ msgstr ""
"Aquesta pà gina s'ha generat automà ticament.\n"
"\n"
-#: client/helpdata.c:670
+#: client/helpdata.c:668
msgid ""
"Requires: Nothing\n"
"\n"
@@ -8235,80 +8241,80 @@ msgstr ""
"Requereix: Res\n"
"\n"
-#: client/helpdata.c:675
+#: client/helpdata.c:673
#, c-format
msgid "* The discovery of %s will make %s obsolete.\n"
msgstr "* El descobriment de %s farà que %s sigui obsolet.\n"
-#: client/helpdata.c:694
+#: client/helpdata.c:692
#, c-format
msgid "* Allows all players with knowledge of %s to build %s units.\n"
msgstr ""
"* Permet a tots els jugadors amb coneixement de %s construir unitats %s.\n"
-#: client/helpdata.c:706
+#: client/helpdata.c:704
#, c-format
msgid "* Allows %s (with %s).\n"
msgstr "* Permet %s (amb %s).\n"
-#: client/helpdata.c:710
+#: client/helpdata.c:708
#, c-format
msgid "* Allows %s.\n"
msgstr "* Permet %s.\n"
-#: client/helpdata.c:780
+#: client/helpdata.c:778
#, c-format
msgid "* Can only be built if there is %s in the city.\n"
msgstr "* Només es pot construir si hi ha %s a la ciutat.\n"
-#: client/helpdata.c:786
+#: client/helpdata.c:784
#, c-format
msgid "* Can only be built with %s as government.\n"
msgstr "* Només es pot construir amb govern de %s.\n"
-#: client/helpdata.c:791
+#: client/helpdata.c:789
msgid "* May not be built in cities.\n"
msgstr "* No es pot construir en ciutats.\n"
-#: client/helpdata.c:794
+#: client/helpdata.c:792
msgid "* Never has a home city.\n"
msgstr "* No té mai una ciutat d'origen.\n"
-#: client/helpdata.c:797
+#: client/helpdata.c:795
msgid "* Losing this unit will lose you the game!\n"
msgstr "* Perdre aquesta unitat et farà perdre la partida!\n"
-#: client/helpdata.c:801
+#: client/helpdata.c:799
msgid "* Each player may only have one of this type of unit.\n"
msgstr "* Cada jugador pot tenir només un d'aquests tipus d'unitat.\n"
-#: client/helpdata.c:805
+#: client/helpdata.c:803
#, c-format
msgid "* Requires %d population to build.\n"
msgstr "* Requereix població %d per construir-se.\n"
-#: client/helpdata.c:811
+#: client/helpdata.c:809
#, c-format
msgid "* Can carry and refuel %d air unit.\n"
msgid_plural "* Can carry and refuel %d air units.\n"
msgstr[0] "* Pot transportar i carregar combustible a %d unitat aèria.\n"
msgstr[1] "* Pot transportar i carregar combustible a %d unitats aèries.\n"
-#: client/helpdata.c:816
+#: client/helpdata.c:814
#, c-format
msgid "* Can carry and refuel %d missile unit.\n"
msgid_plural "* Can carry and refuel %d missile units.\n"
msgstr[0] "* Pot transportar i carregar combustible a %d unitat de mÃssil.\n"
msgstr[1] "* Pot transportar i carregar combustible a %d unitats de mÃssil.\n"
-#: client/helpdata.c:821
+#: client/helpdata.c:819
#, c-format
msgid "* Can carry %d ground unit across water.\n"
msgid_plural "* Can carry %d ground units across water.\n"
msgstr[0] "* Pot transportar %d unitat de terra per l'aigua.\n"
msgstr[1] "* Pot transportar %d unitats de terra per l'aigua.\n"
-#: client/helpdata.c:830
+#: client/helpdata.c:828
msgid ""
"* Can establish trade routes (must travel to target city and must be at "
"least 9 tiles [in Manhattan distance] from this unit's home city).\n"
@@ -8317,127 +8323,127 @@ msgstr ""
"ha d'estar almenys a 9 caselles (seguint la graella, sense diagonals) des de "
"la ciutat original d'aquesta unitat).\n"
-#: client/helpdata.c:836
+#: client/helpdata.c:834
#, c-format
msgid "* Can help build wonders (adds %d production).\n"
msgstr "* Pot ajudar a construir meravelles (afegeix %d de producció).\n"
-#: client/helpdata.c:840
+#: client/helpdata.c:838
msgid "* May not be disbanded.\n"
msgstr "* No es pot desmantellar.\n"
-#: client/helpdata.c:842
+#: client/helpdata.c:840
#, c-format
msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
msgstr ""
"* Pot ser desmantellat en una ciutat per recuperar el 50%% del cost de "
"producció.\n"
-#: client/helpdata.c:846
+#: client/helpdata.c:844
msgid "* Can build new cities.\n"
msgstr "* Pot construir noves ciutats.\n"
-#: client/helpdata.c:849
+#: client/helpdata.c:847
#, c-format
msgid "* Can add on %d population to cities of no more than size %d.\n"
msgstr "* Pot afegir %d població a ciutats de mida no superior a %d.\n"
-#: client/helpdata.c:858
+#: client/helpdata.c:856
msgid "* Can build roads and railroads.\n"
msgstr "* Pot construir camins i ferrocarrils.\n"
-#: client/helpdata.c:859
+#: client/helpdata.c:857
msgid "* Can build mines on tiles.\n"
msgstr "* Pot construir mines en caselles.\n"
-#: client/helpdata.c:860
+#: client/helpdata.c:858
msgid "* Can build irrigation on tiles.\n"
msgstr "* Pot fer irrigacions en caselles.\n"
-#: client/helpdata.c:865
+#: client/helpdata.c:863
msgid "* Can build farmland.\n"
msgstr "* Pot fer hortes.\n"
-#: client/helpdata.c:869
+#: client/helpdata.c:867
#, c-format
msgid "* Can build farmland (if %s is known).\n"
msgstr "* Pot fer hortes (si es coneix %s).\n"
-#: client/helpdata.c:873
+#: client/helpdata.c:871
#, c-format
msgid "* Can build farmland (if any of the following are known: %s).\n"
msgstr "* Pot fer hortes (si es coneix alguna de les següents: %s).\n"
-#: client/helpdata.c:881
+#: client/helpdata.c:879
msgid "* Can build fortresses.\n"
msgstr "* Pot construir fortaleses.\n"
-#: client/helpdata.c:885
+#: client/helpdata.c:883
#, c-format
msgid "* Can build fortresses (if %s is known).\n"
msgstr "* Pot construir fortaleses (si es coneix %s).\n"
-#: client/helpdata.c:889
+#: client/helpdata.c:887
#, c-format
msgid "* Can build fortresses (if any of the following are known: %s).\n"
msgstr ""
"* Pot construir fortaleses (si es coneix alguna de les següents: %s).\n"
-#: client/helpdata.c:895
+#: client/helpdata.c:893
msgid "* Can clean pollution from tiles.\n"
msgstr "* Pot netejar contaminació de les caselles.\n"
-#: client/helpdata.c:896
+#: client/helpdata.c:894
msgid "* Can clean nuclear fallout from tiles.\n"
msgstr "* Pot netejar la radioactivitat de les caselles.\n"
-#: client/helpdata.c:899
+#: client/helpdata.c:897
msgid "* Can transform tiles.\n"
msgstr "* Pot transformar caselles.\n"
-#: client/helpdata.c:902
+#: client/helpdata.c:900
msgid "* Can build airbases.\n"
msgstr "* Pot construir bases aèries.\n"
-#: client/helpdata.c:906
+#: client/helpdata.c:904
#, c-format
msgid "* May fortify, granting a 50%% defensive bonus.\n"
msgstr "* Pot fortificar-se, rebent una bonificació defensiva del 50%%.\n"
-#: client/helpdata.c:909
+#: client/helpdata.c:907
msgid "* May pillage to destroy infrastructure from tiles.\n"
msgstr "* Pot saquejar per destruir infraestructura de les caselles.\n"
-#: client/helpdata.c:913
+#: client/helpdata.c:911
msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
msgstr "* Pot dur a terme accions diplomà tiques i té habilitats d'espia.\n"
-#: client/helpdata.c:916
+#: client/helpdata.c:914
msgid "* Can perform diplomatic actions.\n"
msgstr "* Pot dur a terme accions diplomà tiques.\n"
-#: client/helpdata.c:920
+#: client/helpdata.c:918
msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
msgstr "* Mai no perdrà una lluita de diplomà tic contra diplomà tic.\n"
-#: client/helpdata.c:923
+#: client/helpdata.c:921
msgid "* May not be bribed.\n"
msgstr "* No pot ser subornat.\n"
-#: client/helpdata.c:926
+#: client/helpdata.c:924
msgid "* Can attack enemy air units.\n"
msgstr "* Pot atacar unitats aèries enemigues.\n"
-#: client/helpdata.c:930
+#: client/helpdata.c:928
msgid "* Is invisible except when next to an enemy unit or city.\n"
msgstr ""
"* És invisible excepte quan és al costat d'una unitat o ciutat enemiga.\n"
-#: client/helpdata.c:934
+#: client/helpdata.c:932
msgid "* Can only attack units on ocean squares (no land attacks).\n"
msgstr "* Només pot atacar unitats que siguin al mar (cap atac terrestre).\n"
-#: client/helpdata.c:938
+#: client/helpdata.c:936
msgid ""
"* Can attack from aboard sea units: against enemy cities and onto land "
"squares.\n"
@@ -8445,40 +8451,40 @@ msgstr ""
"* Pot atacar estant embarcada en unitats marÃtimes: contra ciutats enemigues "
"i contra caselles de terra.\n"
-#: client/helpdata.c:943
+#: client/helpdata.c:941
#, c-format
msgid "* Can be paradropped from a friendly city (Range: %d).\n"
msgstr "* Pot ser llançat en paracaigudes des d'una ciutat amiga (Rang: %d).\n"
-#: client/helpdata.c:949
+#: client/helpdata.c:947
msgid "* Gets double defense against units specified as 'mounted'.\n"
msgstr "* Obté doble defensa contra unitats especificades com a 'muntades'.\n"
-#: client/helpdata.c:953
+#: client/helpdata.c:951
msgid "* Counts as 'mounted' against certain defenders.\n"
msgstr "* Compta com a unitat 'muntada' contra certs defensors.\n"
-#: client/helpdata.c:957
+#: client/helpdata.c:955
msgid "* A missile unit: gets used up in making an attack.\n"
msgstr "* Un mÃssil: es gasta en fer un atac.\n"
-#: client/helpdata.c:960
+#: client/helpdata.c:958
msgid "* Making an attack ends this unit's turn.\n"
msgstr "* S'acaba el torn d'aquesta unitat en atacar.\n"
-#: client/helpdata.c:964
+#: client/helpdata.c:962
msgid "* This unit's attack causes a nuclear explosion!\n"
msgstr "* L'atac d'aquesta unitat causa una explosió nuclear!\n"
-#: client/helpdata.c:968
+#: client/helpdata.c:966
msgid "* Gets double firepower when attacking cities.\n"
msgstr "* Obté el doble de potència de foc quan ataca ciutats.\n"
-#: client/helpdata.c:971
+#: client/helpdata.c:969
msgid "* Ignores the effects of city walls.\n"
msgstr "* Ignora els efectes de les muralles.\n"
-#: client/helpdata.c:975
+#: client/helpdata.c:973
#, c-format
msgid ""
"* Does bombard attacks (%d per turn). These attacks will only damage (never "
@@ -8487,38 +8493,38 @@ msgstr ""
"* Fa atacs de bombardeig (%d per torn). Aquests atacs només fereixen (no "
"maten mai) el defensor, però no suposen cap risc per l'atacant.\n"
-#: client/helpdata.c:982
+#: client/helpdata.c:980
msgid "* Gets quintuple defense against missiles and aircraft.\n"
msgstr "* Obté una defensa quintuplicada contra mÃssils i avions.\n"
-#: client/helpdata.c:986
+#: client/helpdata.c:984
msgid "* Ignores terrain effects (treats all squares as roads).\n"
msgstr ""
"* Ignora l'efecte del terreny (tracta totes les caselles com a camins).\n"
-#: client/helpdata.c:989
+#: client/helpdata.c:987
msgid "* Ignores zones of control.\n"
msgstr "* Ignora les zones de control.\n"
-#: client/helpdata.c:993
+#: client/helpdata.c:991
msgid "* A non-military unit (cannot attack; no martial law).\n"
msgstr "* No és una unitat militar (no pot atacar i no imposa llei marcial).\n"
-#: client/helpdata.c:997
+#: client/helpdata.c:995
msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
msgstr ""
"* És una unitat de camp, crea un descontent fins i tot quan no és "
"agressiva.\n"
-#: client/helpdata.c:1000
+#: client/helpdata.c:998
msgid "* Will never achieve veteran status.\n"
msgstr "* No aconseguirà mai veterania.\n"
-#: client/helpdata.c:1002
+#: client/helpdata.c:1000
msgid "* May become veteran through training or combat.\n"
msgstr "* Pot guanyar experiència mitjançant entrenament o combat.\n"
-#: client/helpdata.c:1008
+#: client/helpdata.c:1006
#, c-format
msgid ""
"* Must end turn in a city or next to land, or has a 50%% risk of being lost "
@@ -8527,12 +8533,12 @@ msgstr ""
"* Ha d'acabar el torn en una ciutat o prop de la costa, o té el 50%% de "
"possibilitats de perdre's al mar.\n"
-#: client/helpdata.c:1012
+#: client/helpdata.c:1010
#, c-format
msgid "* The discovery of %s reduces the risk to 25%%.\n"
msgstr "* El descobriment de %s redueix el risc a 25%%,\n"
-#: client/helpdata.c:1017
+#: client/helpdata.c:1015
#, c-format
msgid "* %s reduces the risk to 12%%.\n"
msgstr "* %s redueix el risc a 12%%.\n"
@@ -8541,27 +8547,27 @@ msgstr "* %s redueix el risc a 12%%.\n"
#. * last two elements
#. TRANS: List of possible output types has this between
#. * last two elements
-#: client/helpdata.c:1068 client/helpdata.c:1402
+#: client/helpdata.c:1066 client/helpdata.c:1400
msgid " or "
msgstr " o "
-#: client/helpdata.c:1070 client/helpdata.c:1390
+#: client/helpdata.c:1068 client/helpdata.c:1388
msgid "?or:, "
msgstr ", "
-#: client/helpdata.c:1082
+#: 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"
msgstr[0] "* Ha d'estar en una ciutat o en un %s després d'%d torn.\n"
msgstr[1] "* Ha d'estar en una ciutat o en un %s després de %d torns.\n"
-#: client/helpdata.c:1124
+#: client/helpdata.c:1122
#, 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:1129
+#: client/helpdata.c:1127
#, c-format
msgid ""
"To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8570,89 +8576,89 @@ msgstr ""
"Per assolir %s primer hem d'obtenir %d altres tecnologies. Per acabar tot el "
"projecte es necessitaran %d bombetes."
-#: client/helpdata.c:1137
+#: client/helpdata.c:1135
msgid "You cannot research this technology."
msgstr "No pots investigar aquesta tecnologia."
-#: client/helpdata.c:1141
+#: client/helpdata.c:1139
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:1153
+#: client/helpdata.c:1151
#, 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:1158
+#: client/helpdata.c:1156
#, 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:1161
+#: client/helpdata.c:1159
#, 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:1165
+#: client/helpdata.c:1163
msgid "* Increases the pollution generated by the population.\n"
msgstr "* Incrementa la contaminació generada per la població.\n"
-#: client/helpdata.c:1170
+#: client/helpdata.c:1168
#, 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:1177
+#: client/helpdata.c:1175
#, c-format
msgid "* Allows %s to build fortresses.\n"
msgstr "* Permet als %s construir fortificacions.\n"
-#: client/helpdata.c:1185
+#: client/helpdata.c:1183
#, c-format
msgid "* Allows %s to build airbases.\n"
msgstr "* Permet als %s construir bases aèries.\n"
-#: client/helpdata.c:1194
+#: client/helpdata.c:1192
#, c-format
msgid "* Allows %s to upgrade roads to railroads.\n"
msgstr "* Permet als %s millorar camins a ferrocarrils.\n"
-#: client/helpdata.c:1202
+#: client/helpdata.c:1200
#, c-format
msgid "* Allows %s to upgrade irrigation to farmland.\n"
msgstr "* Permet als %s millorar la irrigació a horta.\n"
-#: client/helpdata.c:1236
+#: client/helpdata.c:1234
msgid "* Pollution cannot be generated on this terrain."
msgstr "* Aquest terreny no pot ser contaminat."
-#: client/helpdata.c:1241
+#: client/helpdata.c:1239
msgid "* You cannot build cities on this terrain."
msgstr "* No pots construir ciutats sobre aquest terreny."
-#: client/helpdata.c:1247
+#: client/helpdata.c:1245
msgid "* The coastline of this terrain is unsafe."
msgstr "* La lÃnia de costa d'aquest terreny és insegura."
-#: client/helpdata.c:1252
+#: client/helpdata.c:1250
msgid "* This terrain is unsafe for units to travel on."
msgstr "* Aquest terreny no és segur perquè hi viatgin unitats."
-#: client/helpdata.c:1257
+#: client/helpdata.c:1255
msgid "* Land units cannot travel on oceanic terrains."
msgstr "* Les unitats terrestres no poden viatjar per terrenys oceà nics."
-#: client/helpdata.c:1307
+#: client/helpdata.c:1305
msgid "Features:\n"
msgstr "CaracterÃstiques:\n"
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1413 client/helpdata.c:1414
+#: client/helpdata.c:1411 client/helpdata.c:1412
msgid "?outputlist: Nothing "
msgstr "Res"
-#: client/helpdata.c:1421
+#: client/helpdata.c:1419
#, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
@@ -8667,7 +8673,7 @@ msgstr[1] ""
"* Les unitats militars fora de casa i les unitats de batalla faran que %d "
"ciutadans estiguin descontents.\n"
-#: client/helpdata.c:1431
+#: client/helpdata.c:1429
#, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8677,31 +8683,31 @@ msgstr ""
"les unitats en cas contrari.\n"
#. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1439
+#: client/helpdata.c:1437
#, 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:1444
+#: client/helpdata.c:1442
#, 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:1449
+#: client/helpdata.c:1447
#, 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:1453
+#: client/helpdata.c:1451
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:1462
+#: client/helpdata.c:1460
#, c-format
msgid "* Each of your cities will avoid paying %d %s towards unit upkeep.\n"
msgstr ""
@@ -8710,21 +8716,21 @@ msgstr ""
#. TRANS: Amount is subtracted from upkeep cost
#. * for each upkeep type.
-#: client/helpdata.c:1470
+#: client/helpdata.c:1468
#, 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:1477
+#: client/helpdata.c:1475
#, 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:1484
+#: client/helpdata.c:1482
#, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -8734,7 +8740,7 @@ msgstr ""
"civilització apareixerà quan tinguis %d ciutats.\n"
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1491
+#: client/helpdata.c:1489
#, c-format
msgid ""
"* After the first unhappy citizen due to city size, for each %d additional "
@@ -8743,16 +8749,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:1499
+#: client/helpdata.c:1497
#, 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:1504
+#: client/helpdata.c:1502
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:1509
+#: client/helpdata.c:1507
#, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
@@ -8767,7 +8773,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:1521
+#: client/helpdata.c:1519
#, 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"
@@ -8777,7 +8783,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:1532
+#: client/helpdata.c:1530
#, c-format
msgid ""
"* You may grow your cities by means of celebrations. Your cities must be at "
@@ -8786,15 +8792,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:1538
+#: client/helpdata.c:1536
msgid "* Your units cannot be bribed.\n"
msgstr "* Les teves unitats no poden ser subornades.\n"
-#: client/helpdata.c:1541
+#: client/helpdata.c:1539
msgid "* Your cities cannot be incited.\n"
msgstr "* Les teves ciutats no poden ser incitades a la revolta.\n"
-#: client/helpdata.c:1545
+#: client/helpdata.c:1543
msgid ""
"* Government will fall into anarchy if any city is in disorder for more than "
"two turns in a row.\n"
@@ -8802,15 +8808,15 @@ msgstr ""
"* El govern caurà en l'anarquia si qualsevol ciutat roman en desordre durant "
"meÅ› de dos torns seguits.\n"
-#: client/helpdata.c:1551
+#: client/helpdata.c:1549
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:1555
+#: client/helpdata.c:1553
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:1559
+#: client/helpdata.c:1557
msgid ""
"* Buildings that normally confer bonuses against unhappiness will instead "
"give gold.\n"
@@ -8818,25 +8824,25 @@ msgstr ""
"* Els edificis que normalment serveixen per mitigar la infelicitat generaran "
"or.\n"
-#: client/helpdata.c:1563
+#: client/helpdata.c:1561
msgid "* Pays no upkeep for fanatics.\n"
msgstr "* No paga manteniment pels fanà tics.\n"
-#: client/helpdata.c:1566
+#: client/helpdata.c:1564
msgid "* Has no unhappy citizens.\n"
msgstr "* No té ciutadans descontents.\n"
-#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
+#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
#, c-format
msgid "* Veteran %s units.\n"
msgstr "* Unitats %s veteranes.\n"
-#: client/helpdata.c:1587
+#: client/helpdata.c:1585
msgid "* Veteran units.\n"
msgstr "* Unitats veteranes.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1593
+#: client/helpdata.c:1591
#, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8846,7 +8852,7 @@ msgstr ""
"penalització de -1 quan no s'estigui en festa.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1602
+#: client/helpdata.c:1600
#, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8856,7 +8862,7 @@ msgstr ""
"més quan s'estigui en festa.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1610
+#: client/helpdata.c:1608
#, c-format
msgid "* Each worked tile with at least 1 %s will yield %d more of it.\n"
msgstr ""
@@ -8864,31 +8870,31 @@ msgstr ""
"més.\n"
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1619
+#: client/helpdata.c:1617
#, 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:1627
+#: client/helpdata.c:1625
#, 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:1632
+#: client/helpdata.c:1630
#, 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:1637
+#: client/helpdata.c:1635
#, 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:1645
+#: client/helpdata.c:1643
#, c-format
msgid "* %s waste will increase quickly with distance from capital.\n"
msgstr ""
@@ -8896,81 +8902,81 @@ msgstr ""
"capital.\n"
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1651
+#: client/helpdata.c:1649
#, 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:1657
+#: client/helpdata.c:1655
#, 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:1674
+#: client/helpdata.c:1672
#, 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:1701
+#: client/helpdata.c:1699
#, c-format
msgid "%s%d %s"
msgstr "%s%d %s"
-#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1700 client/helpdata.c:1708 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:1709
+#: client/helpdata.c:1707
#, c-format
msgid "%s%d unhappy"
msgstr "%s%d descontents"
-#: client/mapctrl_common.c:382
+#: client/mapctrl_common.c:399
#, c-format
msgid "You don't know how to build %s!"
msgstr "No saps com construir %s!"
-#: client/mapctrl_common.c:392
+#: client/mapctrl_common.c:409
#, c-format
msgid "Copy %s to clipboard."
msgstr "Copiar %s al portapapers."
-#: client/mapctrl_common.c:408
+#: client/mapctrl_common.c:425
msgid "Clipboard is empty."
msgstr "El portapapers és buit."
-#: client/options.c:98
+#: client/options.c:102
msgid "Graphics"
msgstr "Grà fics"
-#: client/options.c:99
+#: client/options.c:103
msgid "Overview"
msgstr "Resum"
-#: client/options.c:100
+#: client/options.c:104
msgid "Sound"
msgstr "So"
-#: client/options.c:101
+#: client/options.c:105
msgid "Interface"
msgstr "InterfÃcie"
-#: client/options.c:102
+#: client/options.c:106
msgid "Network"
msgstr "Xarxa"
-#: client/options.c:107
+#: client/options.c:111
msgid "Login name"
msgstr "Nom de login"
-#: client/options.c:108
+#: client/options.c:112
msgid ""
"This is the default login username that will be used in the connection "
"dialogs or with the -a command-line parameter."
@@ -8978,11 +8984,11 @@ msgstr ""
"Aquest és el nom d'usuari per defecte que es farà servir als dià legs de "
"connexió o amb el parà metre de lÃnia de comandes -a."
-#: client/options.c:113
+#: client/options.c:117
msgid "Server"
msgstr "Servidor"
-#: client/options.c:114
+#: client/options.c:118
msgid ""
"This is the default server hostname that will be used in the connection "
"dialogs or with the -a command-line parameter."
@@ -8990,11 +8996,11 @@ msgstr ""
"És el nom del host servidor per defecte que es farà servir als dià legs de "
"connexió o amb el parà metre de lÃnia de comandes -a."
-#: client/options.c:119
+#: client/options.c:123
msgid "Server port"
msgstr "Port del servidor."
-#: client/options.c:120
+#: client/options.c:124
msgid ""
"This is the default server port that will be used in the connection dialogs "
"or with the -a command-line parameter."
@@ -9002,11 +9008,11 @@ msgstr ""
"És el port del servidor per defecte que es farà servir als dià legs de "
"connexió o amb el parà metre de lÃnia de comandes -a."
-#: client/options.c:125 client/gui-win32/connectdlg.c:912 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
msgid "Metaserver"
msgstr "Metaservidor"
-#: client/options.c:126
+#: client/options.c:130
msgid ""
"The metaserver is a host that the client contacts to find out about games on "
"the internet. Don't change this from its default value unless you know what "
@@ -9016,11 +9022,11 @@ msgstr ""
"partides en curs a Internet. No modifiquis el seu valor per defecte si no "
"saps el que estàs fent."
-#: client/options.c:132
+#: client/options.c:136
msgid "Soundset"
msgstr "Joc de sons"
-#: client/options.c:133
+#: client/options.c:137
msgid ""
"This is the soundset that will be used. Changing this is the same as using "
"the -S command-line parameter."
@@ -9028,11 +9034,11 @@ msgstr ""
"Aquest és el joc de sons que es farà servir. Modificar això és el mateix que "
"fer servir el parà metre de lÃnia de comandes -S."
-#: client/options.c:138
+#: client/options.c:142
msgid "Sound plugin"
msgstr "Plugin de so"
-#: client/options.c:139
+#: client/options.c:143
msgid ""
"If you have a problem with sound, try changing the sound plugin. The new "
"plugin won't take effect until you restart Freeciv. Changing this is the "
@@ -9042,19 +9048,19 @@ msgstr ""
"plugin nou no es farà servir fins que no aturis i tornis a engegar el "
"Freeciv. Modificar això és el mateix que fer servir la lÃnia de comandes -P."
-#: client/options.c:144 client/gui-sdl/gui_main.c:162
+#: client/options.c:148 client/gui-sdl/gui_main.c:162
msgid "Theme"
msgstr "Tema"
-#: client/options.c:145
+#: client/options.c:149
msgid "By changing this option you change the active theme."
msgstr "Modificant aquesta opció, canvies el tema actiu."
-#: client/options.c:148
+#: client/options.c:152
msgid "Tileset"
msgstr "Joc de caselles"
-#: client/options.c:149
+#: client/options.c:153
msgid ""
"By changing this option you change the active tileset. This is the same as "
"using the -t command-line parameter."
@@ -9062,11 +9068,11 @@ msgstr ""
"Modificant aquesta opció, canvies el joc de caselles actiu. És el mateix que "
"fer servir el parà metre de lÃnia de comandes -t."
-#: client/options.c:156
+#: client/options.c:160
msgid "Solid unit background color"
msgstr "Color de fons d'unitat sòlid"
-#: client/options.c:157
+#: client/options.c:161
msgid ""
"Setting this option will cause units on the map view to be drawn with a "
"solid background color instead of the flag backdrop."
@@ -9074,11 +9080,11 @@ msgstr ""
"Fixar aquesta opció farà que, a la vista de mapa, les unitats es dibuixin "
"amb un color de fons sòlid en comptes de la bandera."
-#: client/options.c:161 client/gui-sdl/optiondlg.c:960
+#: client/options.c:165 client/gui-sdl/optiondlg.c:960
msgid "Sound bell at new turn"
msgstr "Fer sonar la campana a cada nou torn"
-#: client/options.c:162
+#: client/options.c:166
msgid ""
"Set this option to have a \"bell\" event be generated at the start of a new "
"turn. You can control the behavior of the \"bell\" event by editing the "
@@ -9088,11 +9094,11 @@ msgstr ""
"de cada torn. Pots controlar el comportament de l'esdeveniment \"campana\" "
"editant les opcions de missatge."
-#: client/options.c:168
+#: client/options.c:172
msgid "Unit movement animation time (milliseconds)"
msgstr "Temps d'animació de moviment d'unitat (milisegons)"
-#: client/options.c:169
+#: client/options.c:173
msgid ""
"This option controls how long unit \"animation\" takes when a unit moves on "
"the map view. Set it to 0 to disable animation entirely."
@@ -9100,11 +9106,11 @@ msgstr ""
"Aquesta opció controla quant dura l'\"animació\" quan es mou una unitat en "
"la vista de mapa. Deixa'l a 0 per inhabilitar del tot l'animació."
-#: client/options.c:174
+#: client/options.c:178
msgid "Mapview recentering time (milliseconds)"
msgstr "Temps de recentrar la vista de mapa (milisegons)"
-#: client/options.c:175
+#: client/options.c:179
msgid ""
"When the map view is recentered, it will slide smoothly over the map to its "
"new position. This option controls how long this slide lasts. Set it to 0 "
@@ -9114,11 +9120,11 @@ msgstr ""
"nova posició. Aquesta opció controla quant de temps dura aquest moviment. "
"Deixa'l a 0 perquè sigui instantani."
-#: client/options.c:180 client/gui-sdl/optiondlg.c:1014
+#: client/options.c:184 client/gui-sdl/optiondlg.c:1014
msgid "Show combat animation"
msgstr "Mostrar animació de combat"
-#: client/options.c:181
+#: client/options.c:185
msgid ""
"Disabling this option will turn off combat animation between units on the "
"mapview."
@@ -9126,11 +9132,11 @@ msgstr ""
"Inhabilitar aquesta opció eliminarà l'animació de combats entre unitats a la "
"vista de mapa."
-#: client/options.c:184
+#: client/options.c:188
msgid "Draw the citybar"
msgstr "Dibuixar la barra de ciutat"
-#: client/options.c:185
+#: client/options.c:189
msgid ""
"Setting this option will display a 'citybar' containing useful information "
"beneath each city. Disabling this option will display only the city's name "
@@ -9140,11 +9146,11 @@ msgstr ""
"útil a sota de cada ciutat. Sense aquesta opció es mostrarà només el nom de "
"la ciutat i, opcionalment, la producció."
-#: client/options.c:191
+#: client/options.c:195
msgid "Show icons in the technology tree"
msgstr "Mostrar icones a l'arbre de tecnologia"
-#: client/options.c:192
+#: client/options.c:196
msgid ""
"Setting this option will display icons on the technology tree diagram. "
"Turning this option off makes the technology tree more compact."
@@ -9152,11 +9158,11 @@ msgstr ""
"Amb aquesta opció permesa es mostraran icones al diagrama de l'arbre de "
"tecnologies. Sense aquesta opció, l'arbre queda més compacte."
-#: client/options.c:197
+#: client/options.c:201
msgid "Draw shield graphics for units"
msgstr "Dibuixar grà fic d'escut per les unitats"
-#: client/options.c:198
+#: client/options.c:202
msgid ""
"Setting this option will draw a shield icon as the flags on units. If "
"unset, the full flag will be drawn."
@@ -9164,11 +9170,11 @@ msgstr ""
"Amb aquesta opció permesa es dibuixarà un escut com a bandera per les "
"unitats. Sense aquesta opció, es dibuixarà la bandera sencera."
-#: client/options.c:202
+#: client/options.c:206
msgid "Manual Turn Done in AI Mode"
msgstr "Passar el torn manualment en mode d'IA"
-#: client/options.c:203
+#: client/options.c:207
msgid ""
"Disable this option if you do not want to press the Turn Done button "
"manually when watching an AI player."
@@ -9176,11 +9182,11 @@ msgstr ""
"Inhabilita aquesta opció si no vols prémer manualment el botó \"Acabar el "
"Torn\" quan estiguis observant un jugador IA."
-#: client/options.c:207 client/gui-sdl/optiondlg.c:1121
+#: client/options.c:211 client/gui-sdl/optiondlg.c:1121
msgid "Auto Center on Units"
msgstr "Centrar automà ticament a les unitats"
-#: client/options.c:208
+#: client/options.c:212
msgid ""
"Set this option to have the active unit centered automatically when the unit "
"focus changes."
@@ -9188,11 +9194,11 @@ msgstr ""
"Selecciona aquesta opció perquè la unitat activa quedi centrada "
"automà ticament quan canviï el focus de la unitat."
-#: client/options.c:211 client/gui-sdl/optiondlg.c:1147
+#: client/options.c:215 client/gui-sdl/optiondlg.c:1147
msgid "Auto Center on Combat"
msgstr "Centrar automà ticament en combat"
-#: client/options.c:212
+#: client/options.c:216
msgid ""
"Set this option to have any combat be centered automatically. Disabled this "
"will speed up the time between turns but may cause you to miss combat "
@@ -9202,21 +9208,21 @@ msgstr ""
"automà ticament. Amb això inhabilitat el temps entre torns serà més rà pid "
"però pot ser que et perdis del tot alguns combats."
-#: client/options.c:217 client/gui-sdl/optiondlg.c:1174
+#: client/options.c:221 client/gui-sdl/optiondlg.c:1174
msgid "Focus on Awakened Units"
msgstr "Focalitzar en unitats despertades"
-#: client/options.c:218
+#: client/options.c:222
msgid "Set this option to have newly awoken units be focused automatically."
msgstr ""
"Selecciona aquesta opció perquè les unitats que s'acaben de despertar rebin "
"el focus automà ticament."
-#: client/options.c:221
+#: client/options.c:225
msgid "Allow goto into the unknown"
msgstr "Permetre anar cap a terreny desconegut"
-#: client/options.c:222
+#: client/options.c:226
msgid ""
"Setting this option will make the game consider moving into unknown tiles. "
"If not, then goto routes will detour around or be blocked by unknown tiles."
@@ -9225,11 +9231,11 @@ msgstr ""
"desconegudes. Si no, les rutes donaran la volta o quedaran bloquejades per "
"les caselles desconegudes."
-#: client/options.c:226
+#: client/options.c:230
msgid "Center map when Popup city"
msgstr "Centrar mapa quan s'obre ciutat"
-#: client/options.c:227
+#: client/options.c:231
msgid ""
"Setting this option makes the mapview center on a city when its city dialog "
"is popped up."
@@ -9237,11 +9243,11 @@ msgstr ""
"Seleccionar aquesta opció farà que la vista de mapa se centri sobre una "
"ciutat quan s'obre el seu dià leg."
-#: client/options.c:230
+#: client/options.c:234
msgid "Concise City Production"
msgstr "Producció de ciutat concisa"
-#: client/options.c:231
+#: client/options.c:235
msgid ""
"Set this option to make the city production (as shown in the city dialog) to "
"be more compact."
@@ -9249,11 +9255,11 @@ msgstr ""
"Selecciona aquesta opció per fer que la producció de la ciutat (tal com la "
"mostra el dià leg de ciutat) es mostri de forma més compacta."
-#: client/options.c:234 client/gui-sdl/optiondlg.c:1252
+#: client/options.c:238 client/gui-sdl/optiondlg.c:1252
msgid "End Turn when done moving"
msgstr "Acabar el torn un cop s'hagin fet tots els moviments"
-#: client/options.c:235
+#: client/options.c:239
msgid ""
"Setting this option makes your turn end automatically when all your units "
"are done moving."
@@ -9261,11 +9267,11 @@ msgstr ""
"Seleccionar aquesta opció fa que el teu torn s'acabi automà ticament quan "
"totes les teves unitats s'hagin acabat de moure."
-#: client/options.c:238 client/gui-sdl/optiondlg.c:1226
+#: client/options.c:242 client/gui-sdl/optiondlg.c:1226
msgid "Prompt for city names"
msgstr "Demanar els noms de les ciutats"
-#: client/options.c:239
+#: client/options.c:243
msgid ""
"Disabling this option will make the names of newly founded cities chosen "
"automatically by the server."
@@ -9273,11 +9279,11 @@ msgstr ""
"Inhabilitar aquesta opció farà que els noms de les noves ciutats es triïn "
"automà ticament per part del servidor."
-#: client/options.c:242 client/gui-sdl/optiondlg.c:1200
+#: client/options.c:246 client/gui-sdl/optiondlg.c:1200
msgid "Pop up city dialog for new cities"
msgstr "Mostrar el dià leg de ciutat en crear-ne una"
-#: client/options.c:243
+#: client/options.c:247
msgid ""
"Setting this option will pop up a newly-founded city's city dialog "
"automatically."
@@ -9285,75 +9291,137 @@ msgstr ""
"Seleccionar aquesta opció farà que s'obri el dià leg de ciutat en el moment "
"de la fundació."
-#: client/options.c:248
+#: client/options.c:250
+msgid "Pop up caravan actions"
+msgstr "Finestra emergent per accions de caravana"
+
+#: client/options.c:251
+msgid ""
+"If this option is enabled, when caravans arrive at a city where they can "
+"establish a traderoute or help build a wonder, a window will popup asking "
+"which action should be performed. Disabling this option means you will have "
+"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 se selecciona aquesta opció, quan arribin caravanes en una ciutat on "
+"poden establir una ruta comercial o ajudar a construir una meravella, "
+"apareixerà una finestra emergent que demanarà quina acció s'ha de fer. Si "
+"s'inhabilita aquesta opció, vol dir que s'haurà de fer l'acció desitjada "
+"manualment, prement 'r' (per una ruta comercial) o 'b' (per construir una "
+"meravella) quan la caravana sigui a la ciutat."
+
+#: client/options.c:260
+msgid "Enable cursor changing"
+msgstr "Permetre canvi de cursor"
+
+#: client/options.c:261
+msgid ""
+"This option controls whether the client should try to change the mouse "
+"cursor depending on what is being pointed at, as well as to indicate changes "
+"in the client or server state."
+msgstr ""
+"Aquesta opció controla si el client ha de provar de modificar el cursor del "
+"ratolà segons on apunti, aixà com per indicar canvis en l'estat del client o "
+"del servidor."
+
+#: client/options.c:266
+msgid "Select cities before units"
+msgstr "Seleccionar ciutats abans d'unitats"
+
+#: 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 s'activa aquesta opció, quan al rectangle de selecció hi hagi tant "
+"ciutats com unitats, se seleccionaran només les ciutats."
+
+#: client/options.c:272
+msgid "Clear unit orders on selection"
+msgstr "Oblida les ordres de la unitat en seleccionar-la"
+
+#: client/options.c:273
+msgid ""
+"Enabling this option will cause unit orders to be cleared whenever one or "
+"more units are selected. If this option is disabled, selecting units will "
+"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 ""
+"Activar aquesta opció farà que les ordres de la unitat s'oblidin quan una o "
+"més unitats se seleccionin. Si aquesta opció està desactivada, seleccionar "
+"unitats no farà que deixin estar la seva activitat actual. En aquest cas, "
+"per fer-los oblidar les seves ordres cal donar-los-en de noves o clicar "
+"<espai>"
+
+#: client/options.c:282
msgid "Background layer"
msgstr "Capa de fons"
-#: client/options.c:249
+#: client/options.c:283
msgid "The background layer of the overview shows just ocean and land."
msgstr "La capa de fons del resum mostra només l'oceà i terra."
-#: client/options.c:252
+#: client/options.c:286
msgid "Terrain relief map layer"
msgstr "Capa de relleu del terreny"
-#: client/options.c:253
+#: client/options.c:287
msgid "The relief layer shows all terrains on the map."
msgstr "La capa de relleu mostra tots els terrenys del mapa."
-#: client/options.c:256
+#: client/options.c:290
msgid "Borders layer"
msgstr "Capa de fronteres"
-#: client/options.c:257
+#: client/options.c:291
msgid ""
"The borders layer of the overview shows which tiles are owned by each player."
msgstr ""
"La capa de fronteres del resum mostra quines caselles pertanyen a cada "
"jugador."
-#: client/options.c:261
+#: client/options.c:295
msgid "Units layer"
msgstr "Capa d'unitats"
-#: client/options.c:262
+#: client/options.c:296
msgid "Enabling this will draw units on the overview."
msgstr "Permetre-la farà que es dibuixin les unitats al resum."
-#: client/options.c:265
+#: client/options.c:299
msgid "Cities layer"
msgstr "Capa de ciutats"
-#: client/options.c:266
+#: client/options.c:300
msgid "Enabling this will draw cities on the overview."
msgstr "Permetre-la farà que es dibuixin les ciutats al resum."
-#: client/options.c:269
+#: client/options.c:303
msgid "Overview fog of war"
msgstr "Penombra al resum"
-#: client/options.c:270
+#: client/options.c:304
msgid "Enabling this will show fog of war on the overview."
msgstr "Si està activat, es mostrarà la penombra de guerra al resum."
-#: client/options.c:488
+#: client/options.c:526
msgid "If you add a preset by hand, also update \"number_of_presets\""
msgstr "Si afegeixes un prefixat a mà , actualitza també \"number_of_presets\""
-#: client/options.c:516
+#: client/options.c:554
msgid "Cannot find your home directory"
msgstr "No s'ha pogut trobar el teu directori d'inici"
-#: client/options.c:665 client/options.c:796
+#: client/options.c:703 client/options.c:834
msgid "Save failed, cannot find a filename."
msgstr "Desar ha fallat, no es pot trobar un nom de fitxer."
-#: client/options.c:678 client/options.c:859
+#: client/options.c:716 client/options.c:897
#, c-format
msgid "Save failed, cannot write to file %s"
msgstr "Error en desar, no s'ha pogut escriure al fitxer %s"
-#: client/options.c:680 client/options.c:862
+#: client/options.c:718 client/options.c:900
#, c-format
msgid "Saved settings to file %s"
msgstr "S'ha desat la configuració al fitxer %s"
@@ -9377,16 +9445,16 @@ msgstr "Capacitats del servidor: %s"
msgid "Start of turn %d"
msgstr "Inici del torn %d"
-#: client/packhand.c:1590
+#: client/packhand.c:1591
#, c-format
msgid "AI Mode is now %s."
msgstr "El mode IA és ara %s."
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "ON"
msgstr "ENCÈS"
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "OFF"
msgstr "APAGAT"
@@ -9418,14 +9486,15 @@ msgid "Username"
msgstr "Usuari"
#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
-#: client/gui-gtk-2.0/pages.c:2085
+#: client/gui-gtk-2.0/pages.c:2157
msgid "Flag"
msgstr "Bandera"
#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
-#: client/gui-gtk-2.0/pages.c:1536 client/gui-gtk-2.0/pages.c:2087
-#: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
-#: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
+#: 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/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr "Nació"
@@ -9437,7 +9506,7 @@ msgstr "Frontera"
msgid "Score"
msgstr "Puntuació"
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
msgid "Team"
msgstr "Equip"
@@ -9508,278 +9577,300 @@ msgstr "No s'ha pogut desmantellar cap %s."
msgid "Could not open temp file."
msgstr "No s'ha pogut obrir l'arxiu temporal."
-#: client/servers.c:407
+#: client/servers.c:410
msgid "Invalid $http_proxy or metaserver value, must start with 'http://'"
msgstr ""
"Valor de metaservidor o $http_proxy invà lids, ha de començar amb 'http://'"
-#: client/servers.c:413
+#: client/servers.c:416
msgid "Failed looking up metaserver's host"
msgstr "Fallada en buscar el host del metaservidor"
-#: client/text.c:85 client/text.c:86 client/text.c:91
+#. TRANS: "AI <player name>"
+#: client/text.c:94
+#, c-format
+msgid "AI %s"
+msgstr "IA %s"
+
+#. TRANS: "<nation adjective>, team <team name>"
+#: client/text.c:118
+#, c-format
+msgid "%s, team %s"
+msgstr "%s, equip %s"
+
+#: client/text.c:135 client/text.c:136 client/text.c:141
#: client/gui-sdl/mapview.c:752
msgid "?nation:Neutral"
msgstr "?nation:Neutrals"
-#: client/text.c:85 client/gui-sdl/mapview.c:752
+#: client/text.c:135 client/gui-sdl/mapview.c:752
msgid "?nation:Hostile"
msgstr "?nation:Hostils"
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Peaceful"
msgstr "?nation:PacÃfics"
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Friendly"
msgstr "?nation:Amistosos"
-#: client/text.c:88 client/gui-sdl/mapview.c:755
+#: client/text.c:138 client/gui-sdl/mapview.c:755
msgid "?nation:Mysterious"
msgstr "?nation:Misteriosos"
-#: client/text.c:88
+#: client/text.c:138
msgid "?nation:Friendly(team)"
msgstr "?nation:Amistosos(equip)"
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
msgid "?city:Neutral"
msgstr "?city:Neutrals"
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
msgid "?city:Hostile"
msgstr "?city:Hostils"
-#: client/text.c:92 client/gui-sdl/mapview.c:786
+#: client/text.c:142 client/gui-sdl/mapview.c:786
msgid "?city:Peaceful"
msgstr "?city:PacÃfics"
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Friendly"
msgstr "?city:Amistosos"
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Mysterious"
msgstr "?city:Misteriosos"
-#: client/text.c:93
+#: client/text.c:143
msgid "?city:Friendly(team)"
msgstr "?city:Amistosos(equip)"
-#: client/text.c:100
+#: client/text.c:151
#, c-format
msgid "Location: (%d, %d) [%d]"
msgstr "Situació: (%d, %d) [%d]"
-#: client/text.c:109
+#: client/text.c:153
+#, c-format
+msgid "Native coordinates: (%d, %d)"
+msgstr "Coordenades natives: (%d, %d)"
+
+#: client/text.c:160
#, c-format
msgid "Terrain: %s"
msgstr "Terreny: %s"
-#: client/text.c:110
+#: client/text.c:161
#, c-format
msgid "Food/Prod/Trade: %s"
msgstr "Menjar/Producció/Comerç: %s"
-#: client/text.c:113
+#: client/text.c:164
msgid "Minor Tribe Village"
msgstr "Llogarret indÃgena"
-#: client/text.c:119
+#: client/text.c:173
msgid "Our territory"
msgstr "Territori nostre"
-#. TRANS: "Polish territory"
-#: client/text.c:122
+#. TRANS: "Territory of <username> (<nation + team>)"
+#: client/text.c:176
#, c-format
-msgid "%s territory"
-msgstr "Territori %s"
+msgid "Territory of %s (%s)"
+msgstr "Territori dels %s (%s)"
-#. TRANS: "Polish territory (5 turn cease-fire)"
-#: client/text.c:131
+#: client/text.c:186
#, c-format
-msgid "%s territory (%d turn cease-fire)"
-msgid_plural "%s territory (%d turn cease-fire)"
-msgstr[0] "Territori %s (%d torn d'alto-el-foc)"
-msgstr[1] "Territori %s (%d torns d'alto-el-foc)"
+msgid "Territory of %s (%s) (%d turn cease-fire)"
+msgid_plural "Territory of %s (%s) (%d turn cease-fire)"
+msgstr[0] "Territori dels %s (%s) (%d torn d'alto el foc)"
+msgstr[1] "Territori dels %s (%s) (%d torns d'alto el foc)"
-#. TRANS: "Polish territory (friendly)"
-#: client/text.c:140
+#. TRANS: "Territory of <username>
+#. * (<nation + team> | <diplomatic state>)"
+#: client/text.c:195
#, c-format
-msgid "%s territory (%s)"
-msgstr "Territori %s (%s)"
+msgid "Territory of %s (%s | %s)"
+msgstr "Territori de %s (%s | %s)"
-#: client/text.c:145
+#: client/text.c:200
msgid "Unclaimed territory"
msgstr "Territori no reclamat"
-#. TRANS: "City: Warsaw (Polish)"
-#: client/text.c:156
+#. TRANS: "City: <city name> | <username> (<nation + team>)"
+#: client/text.c:214
#, c-format
-msgid "City: %s (%s)"
-msgstr "Ciutat: %s (%s)"
+msgid "City: %s | %s (%s)"
+msgstr "Ciutat: %s | %s (%s)"
-#. TRANS: "City: Warsaw (Polish, 5 turn cease-fire)"
-#: client/text.c:166
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <number> turn cease-fire)"
+#: client/text.c:224
#, c-format
-msgid "City: %s (%s, %d turn cease-fire)"
-msgid_plural "City: %s (%s, %d turn cease-fire)"
-msgstr[0] "Ciutat: %s (%s, %d torn de treva)"
-msgstr[1] "Ciutat: %s (%s, %d torns de treva)"
+msgid "City: %s | %s (%s, %d turn cease-fire)"
+msgid_plural "City: %s | %s (%s, %d turn cease-fire)"
+msgstr[0] "Ciutat: %s | %s (%s, %d torn d'alto el foc)"
+msgstr[1] "Ciutat: %s | %s (%s, %d torns d'alto el foc)"
-#. TRANS: "City: Warsaw (Polish,friendly)"
-#: client/text.c:174
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <diplomatic state>)"
+#: client/text.c:231
#, c-format
-msgid "City: %s (%s, %s)"
-msgstr "Ciutat: %s (%s, %s)"
+msgid "City: %s | %s (%s, %s)"
+msgstr "Ciutat: %s | %s (%s, %s)"
#. TRANS: previous lines gave other information about the city.
-#: client/text.c:189
+#: client/text.c:246
#, c-format
msgid "?clistbegin: with %s"
msgstr " amb %s"
#. TRANS: "Trade from Warsaw: 5"
-#: client/text.c:202
+#: client/text.c:259
#, c-format
msgid "Trade from %s: %d"
msgstr "Comerç des de %s: %d"
-#: client/text.c:210
+#: client/text.c:267
#, c-format
msgid "Infrastructure: %s"
msgstr "Infraestructures: %s"
-#: client/text.c:215
+#: client/text.c:272
#, c-format
msgid "Activity: %s"
msgstr "Activitat: %s"
-#. TRANS: "Unit: Musketeers (Polish, Warsaw)"
-#. TRANS: "Unit: Musketeers (Polish,friendly)"
-#: client/text.c:226 client/text.c:253
+#. TRANS: "Unit: <unit type> | <username>
+#. * (<nation + team>, <homecity>)"
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <diplomatic state>)"
+#: client/text.c:287 client/text.c:313
#, c-format
-msgid "Unit: %s (%s, %s)"
-msgstr "Unitat: %s (%s, %s)"
+msgid "Unit: %s | %s (%s, %s)"
+msgstr "Unitat: %s | %s (%s, %s)"
-#. TRANS: "Unit: Musketeers (Polish)"
-#: client/text.c:232
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>)"
+#: client/text.c:292
#, c-format
-msgid "Unit: %s (%s)"
-msgstr "Unitat: %s (%s)"
+msgid "Unit: %s | %s (%s)"
+msgstr "Unitat: %s | %s (%s)"
-#. TRANS: "Unit: Musketeers (Polish, 5 turn cease-fire)"
-#: client/text.c:245
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <number> turn cease-fire)"
+#: client/text.c:305
#, c-format
-msgid "Unit: %s (%s, %d turn cease-fire)"
-msgid_plural "Unit: %s (%s, %d turn cease-fire)"
-msgstr[0] "Unitat: %s (%s, %d torn d'alto el foc)"
-msgstr[1] "Unitat: %s (%s, %d torns d'alto el foc)"
+msgid "Unit: %s | %s (%s, %d turn cease-fire)"
+msgid_plural "Unit: %s | %s (%s, %d turn cease-fire)"
+msgstr[0] "Unitat: %s | %s (%s, %d torn d'alto el foc)"
+msgstr[1] "Unitat: %s | %s (%s, %d torns d'alto el foc)"
#. TRANS: "Chance to win: A:95% D:46%"
-#: client/text.c:279
+#: client/text.c:338
#, c-format
msgid "Chance to win: A:%d%% D:%d%%"
msgstr "Prob. guanyar: A:%d%% D:%d%%"
#. TRANS: A is attack power, D is defense power, FP is firepower,
#. * HP is hitpoints (current and max).
-#: client/text.c:286
+#: client/text.c:345
#, c-format
msgid "A:%d D:%d FP:%d HP:%d/%d (%s)"
msgstr "A:%d D:%d PF:%d V:%d/%d (%s)"
#. TRANS: "5 more" units on this tile
-#: client/text.c:295
+#: client/text.c:354
#, c-format
msgid " (%d more)"
msgstr " (%d més)"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:364
+#: client/text.c:423
#, c-format
msgid "far from %s"
msgstr "lluny de %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:367
+#: client/text.c:426
#, c-format
msgid "near %s"
msgstr "a prop de %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:370
+#: client/text.c:429
#, c-format
msgid "in %s"
msgstr "a %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:403
+#: client/text.c:462
#, c-format
msgid "from %s"
msgstr "des de %s"
-#: client/text.c:466
+#: client/text.c:525
msgid "Progress: no research"
msgstr "Progrés: sense recerca"
-#: client/text.c:470
+#: client/text.c:529
msgid "Progress: no research target"
msgstr "Progrés: sense objectiu de recerca"
-#: client/text.c:475
+#: client/text.c:534
#, c-format
msgid "Progress: %d turn/advance"
msgid_plural "Progress: %d turns/advance"
msgstr[0] "Progrés: %d torn/avenç"
msgstr[1] "Progrés: %d torns/avenç"
-#: client/text.c:480
+#: client/text.c:539
#, c-format
msgid "%d bulb/turn"
msgid_plural "%d bulbs/turn"
msgstr[0] "%d bombeta/torn"
msgstr[1] "%d bombetes/torn"
-#: client/text.c:485
+#: client/text.c:544
#, c-format
msgid ", %d bulb/turn from team"
msgid_plural ", %d bulbs/turn from team"
msgstr[0] ", %d bombeta/torn de l'equip"
msgstr[1] ", %d bombetes/torn de l'equip"
-#: client/text.c:512
+#: client/text.c:571
#, c-format
msgid "%d/- (never)"
msgstr "%d/- (mai)"
-#: client/text.c:524
+#: client/text.c:583
#, c-format
msgid "%d/%d (%d turn)"
msgid_plural "%d/%d (%d turns)"
msgstr[0] "%d/%d (%d torn)"
msgstr[1] "%d/%d (%d torns)"
-#: client/text.c:527
+#: client/text.c:586
#, c-format
msgid "%d/%d (never)"
msgstr "%d/%d (mai)"
-#: client/text.c:564
+#: client/text.c:623
#, c-format
msgid "%d step"
msgid_plural "%d steps"
msgstr[0] "%d pas"
msgstr[1] "%d passos"
-#: client/text.c:566
+#: client/text.c:625
#, c-format
msgid "%d bulb"
msgid_plural "%d bulbs"
msgstr[0] "%d bombeta"
msgstr[1] "%d bombetes"
-#: client/text.c:570 client/agents/cma_fec.c:269 client/agents/cma_fec.c:313
+#: 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
#, c-format
msgid "%d turn"
@@ -9787,88 +9878,88 @@ msgid_plural "%d turns"
msgstr[0] "%d torn"
msgstr[1] "%d torns"
-#: client/text.c:592
+#: client/text.c:651
#, c-format
msgid "Population: %s"
msgstr "Població: %s"
-#: client/text.c:595
+#: client/text.c:654
#, c-format
msgid "Year: %s (T%d)"
msgstr "Any: %s (T%d)"
-#: client/text.c:598
+#: client/text.c:657
#, c-format
msgid "Gold: %d (%+d)"
msgstr "Or: %d (%+d)"
-#: client/text.c:600
+#: client/text.c:659
#, c-format
msgid "Tax: %d Lux: %d Sci: %d"
msgstr "Imp:%d Lux:%d Ciè:%d"
-#: client/text.c:607
+#: client/text.c:666
msgid "Moving: Nobody"
msgstr "Movent: Ningú"
-#: client/text.c:609
+#: client/text.c:668
#, c-format
msgid "Moving: %s"
msgstr "Movent: %s"
-#: client/text.c:613
+#: client/text.c:672
msgid "(Click for more info)"
msgstr "(Clica per més info)"
-#: client/text.c:629
+#: client/text.c:688
#, c-format
msgid "%s People"
msgstr "%s Persones"
-#: client/text.c:633
+#: client/text.c:692
#, c-format
msgid "Turn: %d"
msgstr "Torn: %d"
-#: client/text.c:635 client/gui-win32/inteldlg.c:111
+#: client/text.c:694 client/gui-win32/inteldlg.c:111
#: client/gui-xaw/inteldlg.c:208
#, c-format
msgid "Gold: %d"
msgstr "Or: %d"
-#: client/text.c:636
+#: client/text.c:695
#, c-format
msgid "Net Income: %d"
msgstr "Ingressos nets: %d"
#. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:639
+#: client/text.c:698
#, c-format
msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
msgstr "Taxes: Or:%d%% Luxe:%d%% Ciè:%d%%"
-#: client/text.c:643
+#: client/text.c:702
#, c-format
msgid "Researching %s: %s"
msgstr "Investigant %s: %s"
-#: client/text.c:650
+#: client/text.c:709
#, c-format
msgid "Global warming chance: %d%% (%+d%%/turn)"
msgstr "Probabilitat d'escalfament global: %d%% (%+d%%/torn)"
-#: client/text.c:653
+#: client/text.c:712
#, c-format
msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
msgstr "Probabilitat d'hivern nuclear: %d%% (%+d%%/torn)"
-#: client/text.c:658 client/gui-win32/inteldlg.c:104
+#: client/text.c:717 client/gui-win32/inteldlg.c:104
#: client/gui-xaw/inteldlg.c:200
#, c-format
msgid "Government: %s"
msgstr "Govern: %s"
-#: client/text.c:682
+#: client/text.c:741
#, c-format
msgid "%d unit"
msgid_plural "%d units"
@@ -9876,55 +9967,55 @@ msgstr[0] "%d unitat"
msgstr[1] "%d unitats"
#. TRANS: Impossible to reach goto target tile
-#: client/text.c:715 client/gui-sdl/mapview.c:566
+#: client/text.c:774 client/gui-sdl/mapview.c:566
msgid "?goto:Unreachable"
msgstr "Inabastable"
-#: client/text.c:717 client/gui-sdl/mapview.c:568
+#: client/text.c:776 client/gui-sdl/mapview.c:568
#, c-format
msgid "Turns to target: %d"
msgstr "Torns fins l'objectiu: %d"
-#: client/text.c:719 client/gui-sdl/mapview.c:570
+#: client/text.c:778 client/gui-sdl/mapview.c:570
#, c-format
msgid "Turns to target: %d to %d"
msgstr "Torns fins l'objectiu: %d a %d"
-#: client/text.c:725 client/gui-sdl/mapview.c:576
+#: client/text.c:784 client/gui-sdl/mapview.c:576
#, c-format
msgid "%d unit selected"
msgid_plural "%d units selected"
msgstr[0] "%d unitat seleccionada"
msgstr[1] "%d unitats seleccionades"
-#: client/text.c:730 client/gui-sdl/mapview.c:581
+#: client/text.c:789 client/gui-sdl/mapview.c:581
msgid "No units selected."
msgstr "Cap unitat seleccionada."
-#: client/text.c:804 client/gui-sdl/mapview.c:654
+#: client/text.c:863 client/gui-sdl/mapview.c:654
#, c-format
msgid "Others: %d civil; %d military"
msgstr "Altres: %d civils; %d militars"
-#: client/text.c:806 client/gui-sdl/mapview.c:656
+#: client/text.c:865 client/gui-sdl/mapview.c:656
#, c-format
msgid "Others: %d civilian"
msgstr "Altres: %d civils"
-#: client/text.c:808 client/gui-sdl/mapview.c:658
+#: client/text.c:867 client/gui-sdl/mapview.c:658
#, c-format
msgid "Others: %d military"
msgstr "Altres: %d militars"
-#: client/text.c:839
+#: client/text.c:898
msgid "No units to upgrade!"
msgstr "No hi ha unitats a millorar!"
-#: client/text.c:864
+#: client/text.c:923
msgid "None of these units may be upgraded."
msgstr "Cap d'aquestes unitats no es pot millorar."
-#: client/text.c:870
+#: client/text.c:929
#, c-format
msgid ""
"Upgrade %d unit for %d gold?\n"
@@ -9939,72 +10030,72 @@ msgstr[1] ""
"Millorar %d unitats per %d peces d'or?\n"
"El tresor en té %d."
-#: client/text.c:891
+#: client/text.c:950
msgid "Shows your progress in researching the current technology."
msgstr "Mostra el teu progrés investigant la tecnologia actual."
-#: client/text.c:897
+#: client/text.c:956
msgid "no research target."
msgstr "sense objectiu d'investigació."
#. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:900
+#: client/text.c:959
#, c-format
msgid "%s: %d/%d."
msgstr "%s: %d/%d."
-#: client/text.c:920
+#: client/text.c:979
msgid "Shows the progress of global warming:"
msgstr "Mostra el progrés de l'escalfament global:"
-#: client/text.c:921
+#: client/text.c:980
#, c-format
msgid "Pollution rate: %d%%"
msgstr "Taxa de contaminació: %d%%"
-#: client/text.c:923
+#: client/text.c:982
#, c-format
msgid "Chance of catastrophic warming each turn: %d%%"
msgstr "Probabilitat d'escalfament catastròfic a cada torn: %d%%"
-#: client/text.c:939
+#: client/text.c:998
msgid "Shows the progress of nuclear winter:"
msgstr "Mostra el progrés de l'hivern nuclear:"
-#: client/text.c:940
+#: client/text.c:999
#, c-format
msgid "Fallout rate: %d%%"
msgstr "Taxa de radioactivitat: %d%%"
-#: client/text.c:942
+#: client/text.c:1001
#, c-format
msgid "Chance of catastrophic winter each turn: %d%%"
msgstr "Probabilitat d'hivern nuclear a cada torn: %d%%"
-#: client/text.c:957
+#: client/text.c:1016
msgid "Shows your current government:"
msgstr "Mostra el teu govern actual:"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:981
+#: client/text.c:1040
#, c-format
msgid "Population: %5d"
msgstr "Població: %5d"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:1043
#, c-format
msgid "Support: %5d %%"
msgstr "Suport: %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:1047
#, c-format
msgid "Energy: %5d %%"
msgstr "Energia: %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:992
+#: client/text.c:1051
#, c-format
msgid "Mass: %5d ton"
msgid_plural "Mass: %5d tons"
@@ -10012,96 +10103,97 @@ msgstr[0] "Massa: %5d tona"
msgstr[1] "Massa: %5d tones"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1057
#, c-format
msgid "Travel time: %5.1f years"
msgstr "Temps de viatge: %5.1f anys"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1061
msgid "Travel time: N/A "
msgstr "Temps de viatge: N/D "
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1065
#, c-format
msgid "Success prob.: %5d %%"
msgstr "Prob. d'èxit: %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1010
+#: client/text.c:1069
#, c-format
msgid "Year of arrival: %8s"
msgstr "Any d'arribada: %8s"
-#: client/text.c:1030
+#: client/text.c:1089
msgid "?timeout:off"
msgstr "Sense lÃmit"
-#: client/text.c:1054
+#: client/text.c:1113
#, c-format
msgid "?seconds:%02ds"
msgstr "?seconds:%02ds"
-#: client/text.c:1056
+#: client/text.c:1115
#, c-format
msgid "?mins/secs:%02dm %02ds"
msgstr "?mins/secs:%02dm %02ds"
-#: client/text.c:1058
+#: client/text.c:1117
#, c-format
msgid "?hrs/mns:%02dh %02dm"
msgstr "?hrs/mns:%02dh %02dm"
-#: client/text.c:1060
+#: client/text.c:1119
#, c-format
msgid "?dys/hrs:%02dd %02dh"
msgstr "?dys/hrs:%02dd %02dh"
-#: client/text.c:1063
+#: client/text.c:1122
msgid "?duration:overflow"
msgstr "desbordat"
-#: client/text.c:1084
+#: client/text.c:1143
#, c-format
msgid "%6d.%02d ms"
msgstr "%6d.%02d ms"
-#. TRANS: "Republic of the Poles"
-#: client/text.c:1127
+#. TRANS: <nation adjective> <government name>.
+#. * E.g. "Polish Republic".
+#: client/text.c:1188
#, c-format
-msgid "%s of the %s"
-msgstr "%s dels %s"
+msgid "?nationgovernment:%s %s"
+msgstr "%2$s dels %1$s"
#. TRANS: "Observer: 1985"
-#: client/text.c:1137
+#: client/text.c:1198
#, c-format
msgid "Observer: %s"
msgstr "Observador: %s"
-#: client/text.c:1155
+#: client/text.c:1216
msgid "Buildings: "
msgstr "Edificis: "
-#: client/text.c:1172 client/text.c:1211
+#: client/text.c:1233 client/text.c:1272
msgid "None. "
msgstr "Cap. "
-#: client/text.c:1174 client/text.c:1213
+#: client/text.c:1235 client/text.c:1274
msgid "?clistend:."
msgstr "?blistend:."
-#: client/text.c:1192
+#: client/text.c:1253
msgid "Wonders: "
msgstr "Meravelles: "
-#: client/text.c:1247
+#: client/text.c:1308
#, 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:1251
+#: client/text.c:1312
#, c-format
msgid "%d content before penalty."
msgid_plural "%d content before penalty."
@@ -10109,45 +10201,40 @@ 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:1257
+#: client/text.c:1318
#, 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."
-#. TRANS: Martial law opening parenthesis
-#: client/text.c:1279
-msgid "Martial law in effect ("
-msgstr "Llei marcial vigent ("
+#: client/text.c:1339
+msgid "Unlimited martial law in effect."
+msgstr "Llei marcial il·limitada vigent."
-#. TRANS: no [unit] maximum
-#: client/text.c:1284
-msgid "no maximum, "
-msgstr "sense mà xim, "
-
-#: client/text.c:1287
+#: client/text.c:1341
#, c-format
-msgid "%d unit maximum, "
-msgid_plural "%d units maximum, "
-msgstr[0] "%d unitats mà xim, "
-msgstr[1] "%d unitats mà xim, "
+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."
-#. TRANS: Martial law closing parenthesis
-#: client/text.c:1294
+#: client/text.c:1345
#, c-format
-msgid "%d per unit). "
-msgstr "%d per unitat). "
+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:1298
+#: client/text.c:1352
msgid "Military units in the field may cause unhappiness. "
msgstr "Les unitats militars al camp poden causar descontents."
-#: client/text.c:1301
+#: client/text.c:1355
msgid "Military units have no happiness effect. "
msgstr "Les unitats militars no tenen cap efecte sobre la felicitat."
-#: client/text.c:1316
+#: client/text.c:1370
#, c-format
msgid "Luxury: %d total."
msgstr "Luxes: %d en total."
@@ -10171,7 +10258,7 @@ msgstr ""
"EL client no suporta jocs de caselles zenitals. Per tant s'usarà el joc de "
"caselles per defecte."
-#: client/tilespec.c:3968
+#: client/tilespec.c:3966
#, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
@@ -10197,12 +10284,12 @@ msgid ""
msgstr ""
"El gestor de ciutadans s'ha confós a %s. Val més que hi donis un cop d'ull."
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
-#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:599
+#: client/gui-gtk-2.0/cityrep.c:624 client/gui-sdl/citydlg.c:2009
msgid "none"
msgstr "cap"
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:645
msgid "custom"
msgstr "a mida"
@@ -10509,7 +10596,7 @@ msgstr "Establir una _Ruta de comerç"
msgid "Enter Marketplace"
msgstr "Entrar al Mercat"
-#: client/gui-gtk-2.0/chatline.c:144 client/gui-win32/chatline.c:134
+#: client/gui-gtk-2.0/chatline.c:218 client/gui-win32/chatline.c:134
#: client/gui-xaw/chatline.c:120
msgid "Cleared output window."
msgstr "S'ha netejat la finestra de missatges."
@@ -10590,11 +10677,11 @@ msgid "%d/%d %d turns"
msgstr "%d/%d %d torns"
#: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:821
+#: client/gui-gtk-2.0/cityrep.c:1027
msgid "_Buy"
msgstr "_Comprar"
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:869
msgid "_Production"
msgstr "_Producció"
@@ -10615,12 +10702,12 @@ msgid "Entertainers"
msgstr "Artistes"
#: client/gui-gtk-2.0/citydlg.c:1029 client/gui-win32/citydlg.c:1989
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2403
msgid "Scientists"
msgstr "CientÃfics"
#: client/gui-gtk-2.0/citydlg.c:1030 client/gui-win32/citydlg.c:1991
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2404
msgid "Taxmen"
msgstr "Recaptadors"
@@ -10667,7 +10754,7 @@ msgstr "Ciutat"
#: client/gui-gtk-2.0/citydlg.c:1116
msgid "_Rename..."
-msgstr "_Renomenar"
+msgstr "_Reanomenar"
#: client/gui-gtk-2.0/citydlg.c:1251
msgid "_List present units..."
@@ -10713,7 +10800,7 @@ msgstr "Unitats suportades %d"
msgid "Present units %d"
msgstr "Unitats presents %d"
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:1019
msgid "Cen_ter"
msgstr "Cen_trar"
@@ -10795,38 +10882,62 @@ msgstr "Vendre-la!"
#: client/gui-gtk-2.0/citydlg.c:2572 client/gui-win32/citydlg.c:1201
msgid "Rename City"
-msgstr "Renomenar ciutat"
+msgstr "Reanomenar ciutat"
#: client/gui-gtk-2.0/citydlg.c:2573 client/gui-win32/citydlg.c:1202
#: client/gui-xaw/citydlg.c:1380
msgid "What should we rename the city to?"
msgstr "Com s'ha de dir la ciutat ?"
-#: client/gui-gtk-2.0/cityrep.c:699
+#: client/gui-gtk-2.0/cityrep.c:794
+msgid "(no worklists defined)"
+msgstr "(no s'han definit llistes de treball)"
+
+#: client/gui-gtk-2.0/cityrep.c:876
msgid "Chan_ge"
msgstr "Can_vi"
-#: client/gui-gtk-2.0/cityrep.c:703
+#: client/gui-gtk-2.0/cityrep.c:880
msgid "Add _First"
msgstr "Afegir al _Principi"
-#: client/gui-gtk-2.0/cityrep.c:707
+#: client/gui-gtk-2.0/cityrep.c:884
msgid "Add _Next"
msgstr "Afegir al _Següent"
-#: client/gui-gtk-2.0/cityrep.c:711
+#: client/gui-gtk-2.0/cityrep.c:888
+msgid "Add _2nd Last"
+msgstr "Afegir de _Penúltim"
+
+#: client/gui-gtk-2.0/cityrep.c:892
msgid "Add _Last"
msgstr "Afegir al _Final"
-#: client/gui-gtk-2.0/cityrep.c:715
+#: client/gui-gtk-2.0/cityrep.c:899
+msgid "Set Worklist"
+msgstr "Assignar llista de treball"
+
+#: client/gui-gtk-2.0/cityrep.c:905
+msgid "Append Worklist"
+msgstr "Afegir llista de treball"
+
+#: client/gui-gtk-2.0/cityrep.c:911
+msgid "Clear _Worklist"
+msgstr "Esborrar _Llista de treball:"
+
+#: client/gui-gtk-2.0/cityrep.c:916
+msgid "Gover_nor"
+msgstr "Gover_nador"
+
+#: client/gui-gtk-2.0/cityrep.c:921
msgid "_Select"
msgstr "_Seleccionar"
-#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
+#: client/gui-gtk-2.0/cityrep.c:925 client/gui-gtk-2.0/plrdlg.c:521
msgid "_Display"
msgstr "_Mostrar"
-#: client/gui-gtk-2.0/cityrep.c:800 client/gui-gtk-2.0/menu.c:808
+#: 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-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
#: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -10836,100 +10947,100 @@ msgstr "_Mostrar"
msgid "Cities"
msgstr "Ciutats"
-#: client/gui-gtk-2.0/cityrep.c:817
+#: client/gui-gtk-2.0/cityrep.c:1023
msgid "_Inspect"
msgstr "_Inspeccionar"
-#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
-#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-sdl/helpdlg.c:297 client/gui-win32/menu.c:342
-#: client/gui-xaw/menu.c:241
+#: 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
+#: client/gui-gtk-2.0/cityrep.c:1518 client/gui-gtk-2.0/menu.c:823
+#: client/gui-gtk-2.0/menu.c:825 client/gui-gtk-2.0/menu.c:827
+#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:831
+#: client/gui-gtk-2.0/menu.c:833 client/gui-sdl/helpdlg.c:297
+#: client/gui-win32/menu.c:342 client/gui-xaw/menu.c:241
msgid "Improvements"
msgstr "Edificis"
-#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
-#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
-#: client/gui-xaw/menu.c:247
+#: client/gui-gtk-2.0/cityrep.c:1441 client/gui-gtk-2.0/cityrep.c:1460
+#: client/gui-gtk-2.0/cityrep.c:1479 client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1522 client/gui-xaw/menu.c:247
msgid "Wonders"
msgstr "Meravelles"
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1662 client/gui-win32/cityrep.c:439
#: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
msgid "All Cities"
msgstr "Totes les ciutats"
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1667 client/gui-win32/cityrep.c:440
msgid "No Cities"
msgstr "Cap ciutat"
-#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1672 client/gui-win32/cityrep.c:441
msgid "Invert Selection"
msgstr "Invertir la Selecció"
-#: client/gui-gtk-2.0/cityrep.c:1420
+#: client/gui-gtk-2.0/cityrep.c:1682
msgid "Building Units"
msgstr "Construint Unitats"
-#: client/gui-gtk-2.0/cityrep.c:1426
+#: client/gui-gtk-2.0/cityrep.c:1688
msgid "Building Improvements"
msgstr "Construint Edificis"
-#: client/gui-gtk-2.0/cityrep.c:1432
+#: client/gui-gtk-2.0/cityrep.c:1694
msgid "Building Wonders"
msgstr "Construint Meravelles"
-#: client/gui-gtk-2.0/cityrep.c:1444
+#: client/gui-gtk-2.0/cityrep.c:1706
msgid "Building Unit"
msgstr "Construint Unitat"
-#: client/gui-gtk-2.0/cityrep.c:1448
+#: client/gui-gtk-2.0/cityrep.c:1710
msgid "Building Improvement"
msgstr "Construint Edifici"
-#: client/gui-gtk-2.0/cityrep.c:1452
+#: client/gui-gtk-2.0/cityrep.c:1714
msgid "Building Wonder"
msgstr "Construint Meravella"
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1722 client/gui-win32/cityrep.c:443
msgid "Coastal Cities"
msgstr "Ciutats Costaneres"
-#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1727 client/gui-win32/cityrep.c:444
msgid "Same Island"
msgstr "Mateixa illa"
-#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1737 client/gui-win32/cityrep.c:447
msgid "Supported Units"
msgstr "Unitats suportades"
-#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1740 client/gui-win32/cityrep.c:454
msgid "Units Present"
msgstr "Unitats presents"
-#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1744 client/gui-win32/cityrep.c:469
msgid "Improvements in City"
msgstr "Edificis de la ciutat"
-#: client/gui-gtk-2.0/cityrep.c:1486
+#: client/gui-gtk-2.0/cityrep.c:1748
msgid "Wonders in City"
msgstr "Meravelles de la ciutat"
-#: client/gui-gtk-2.0/cityrep.c:1495
+#: client/gui-gtk-2.0/cityrep.c:1757
msgid "Available Units"
msgstr "Unitats disponibles"
-#: client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1760
msgid "Available Improvements"
msgstr "Edificis disponibles"
-#: client/gui-gtk-2.0/cityrep.c:1501
+#: client/gui-gtk-2.0/cityrep.c:1763
msgid "Available Wonders"
msgstr "Meravelles disponibles"
-#: client/gui-gtk-2.0/cityrep.c:1625
+#: client/gui-gtk-2.0/cityrep.c:1882
#, c-format
msgid "Total Buy Cost: %d"
msgstr "Cost Total de Compra: %d"
@@ -10999,11 +11110,11 @@ 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:186
+#: client/gui-gtk-2.0/dialogs.c:196 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:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
msgid "Inspect _City"
msgstr "Inspeccionar _Ciutat"
@@ -11031,10 +11142,10 @@ msgstr "Selecciona què saquejar:"
msgid "Unit"
msgstr "Unitat"
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
-#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
-#: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
-#: manual/civmanual.c:302 data/Freeciv.in:80
+#: 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-win32/plrdlg.c:335 manual/civmanual.c:302 data/Freeciv.in:80
msgid "Name"
msgstr "Nom"
@@ -11059,7 +11170,7 @@ 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:1036 data/Freeciv.in:3371
+#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
msgid "Pick Nation"
msgstr "Tria Nació"
@@ -11138,7 +11249,7 @@ msgstr "_Mapes"
msgid "_Advances"
msgstr "_Avenços"
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:910
+#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr "_Ciutats"
@@ -11243,21 +11354,21 @@ msgstr "Escull destÃ"
msgid "Show _All Cities"
msgstr "Mostrar _totes les ciutats"
-#: client/gui-gtk-2.0/gui_main.c:150
+#: client/gui-gtk-2.0/gui_main.c:162
msgid "Show Map Scrollbars"
msgstr "Mostrar les barres de desplaçament del mapa"
-#: client/gui-gtk-2.0/gui_main.c:151
+#: client/gui-gtk-2.0/gui_main.c:163
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:155
+#: client/gui-gtk-2.0/gui_main.c:167
msgid "Keyboardless goto"
msgstr "\"Anar a\" sense teclat"
-#: client/gui-gtk-2.0/gui_main.c:156
+#: client/gui-gtk-2.0/gui_main.c:168
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."
@@ -11266,11 +11377,11 @@ msgstr ""
"botó esquerre i aguantant-lo mentre arrossegues el ratolà cap a una altra "
"casella."
-#: client/gui-gtk-2.0/gui_main.c:161
+#: client/gui-gtk-2.0/gui_main.c:173
msgid "Keep dialogs on top"
msgstr "Mantenir dià legs al damunt"
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:174
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."
@@ -11279,11 +11390,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:166
+#: client/gui-gtk-2.0/gui_main.c:178
msgid "Show worklist task icons"
msgstr "Mostrar icones de tasca a la llista de treballs"
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:179
msgid ""
"Disabling this will turn off the unit and building icons in the worklist "
"dialog and the production tab of the city dialog."
@@ -11291,11 +11402,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:171
+#: client/gui-gtk-2.0/gui_main.c:183
msgid "Enable status report tabs"
msgstr "Permetre pestanyes d'informe d'estat"
-#: client/gui-gtk-2.0/gui_main.c:172
+#: client/gui-gtk-2.0/gui_main.c:184
msgid ""
"If this option is enabled then report dialogs will be shown as separate tabs "
"rather than in popup dialogs."
@@ -11303,11 +11414,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:177 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:189 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:178 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:190 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."
@@ -11315,7 +11426,97 @@ 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:277 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:195
+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
+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 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
+msgid "Split bottom notebook area"
+msgstr "Partir à rea de llibreta de sota"
+
+#: client/gui-gtk-2.0/gui_main.c:202
+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 ""
+"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
+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
+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 s'activa aquesta opció, els esdeveniments nous de la finestra de "
+"missatges apareixeran al capdamunt de la llista, en comptes d'afegir-se al "
+"final."
+
+#: client/gui-gtk-2.0/gui_main.c:213
+msgid "Show extra message window buttons"
+msgstr "Mostrar botons de finestra de missatges addicionals"
+
+#: client/gui-gtk-2.0/gui_main.c:214
+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 "
+"is disabled, these buttons will not appear (you can still double-click with "
+"the left mouse button or right-click on a row to inspect or goto "
+"respectively). This option will only take effect once the message window is "
+"closed and reopened."
+msgstr ""
+"Si s'activa aquesta opció, es mostraran dos botons a la finestra de "
+"missatges per inspeccionar una ciutat i anar a una ubicació. Si es "
+"desactiva, aquests botons no apareixeran (es pot fer igualment clicant amb "
+"el botó esquerre del ratolà o amb el dret per inspeccionar o anar, "
+"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
+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
+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 s'activa aquesta opció, la pestanya del metaservidor serà la primera "
+"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
+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
+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 "
+"messages will be sent as public chat messages. To send a public chat message "
+"with this option enabled, prefix the message with a single colon ':'. This "
+"option can also be set using a toggle button beside the chat entry (only "
+"visible in multiplayer games)."
+msgstr ""
+"Si s'activa aquesta opció, els missatges normals escrits al xat mentre el "
+"joc està en marxa només s'enviaran als teus aliats. Altrament, els missatges "
+"normals s'enviaran com a missatges públics del xat. Per enviar un missatge "
+"públic amb aquesta opció activada, prefixar el missatge amb dos punts ':'. "
+"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
msgid ""
"This client has no special command line options\n"
"\n"
@@ -11323,44 +11524,45 @@ msgstr ""
"Aquest client no té opcions de lÃnia de comandes especials\n"
"\n"
-#: client/gui-gtk-2.0/gui_main.c:723 client/gui-gtk-2.0/gui_main.c:1345
+#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
msgid "Freeciv"
msgstr "Freeciv"
-#: client/gui-gtk-2.0/gui_main.c:1088 client/gui-gtk-2.0/gui_main.c:1095
+#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
#: 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:1095 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1232 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:1127 client/gui-gtk-2.0/menu.c:770
-#: client/gui-gtk-2.0/menu.c:772 client/gui-gtk-2.0/menu.c:774
-#: client/gui-gtk-2.0/menu.c:776 client/gui-gtk-2.0/menu.c:778
-#: client/gui-gtk-2.0/menu.c:780 client/gui-gtk-2.0/menu.c:782
-#: client/gui-gtk-2.0/menu.c:784 client/gui-gtk-2.0/menu.c:786
-#: client/gui-gtk-2.0/menu.c:788 client/gui-gtk-2.0/menu.c:790
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-gtk-2.0/menu.c:804 client/gui-gtk-2.0/menu.c:806
-#: client/gui-gtk-2.0/menu.c:808 client/gui-gtk-2.0/menu.c:810
-#: client/gui-gtk-2.0/menu.c:812 client/gui-gtk-2.0/menu.c:814
-#: client/gui-gtk-2.0/menu.c:816 client/gui-gtk-2.0/menu.c:818
-#: client/gui-gtk-2.0/menu.c:820 client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/gui_main.c:1266 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
+#: client/gui-gtk-2.0/menu.c:811 client/gui-gtk-2.0/menu.c:813
+#: client/gui-gtk-2.0/menu.c:815 client/gui-gtk-2.0/menu.c:817
+#: client/gui-gtk-2.0/menu.c:819 client/gui-gtk-2.0/menu.c:821
+#: client/gui-gtk-2.0/menu.c:823 client/gui-gtk-2.0/menu.c:825
+#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
+#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
+#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
+#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
+#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
+#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
#: data/Freeciv.in:2028
msgid "View"
msgstr "Vista de mapa"
-#: client/gui-gtk-2.0/gui_main.c:1208
+#: client/gui-gtk-2.0/gui_main.c:1359
msgid "Chat"
msgstr "Xat"
-#: client/gui-gtk-2.0/gui_main.c:1224 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1377 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"
@@ -11371,69 +11573,73 @@ 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:1491
+#: client/gui-gtk-2.0/gui_main.c:1392
+msgid "Allies Only"
+msgstr "Només Aliats"
+
+#: client/gui-gtk-2.0/gui_main.c:1657
msgid "Not _ready"
msgstr "No _preparat"
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
+#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
msgid "_Ready"
msgstr "_Totes Preparades"
-#: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2132
+#: 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
msgid "_Start"
msgstr "_Iniciar"
-#: client/gui-gtk-2.0/gui_main.c:1520
+#: client/gui-gtk-2.0/gui_main.c:1686
msgid "_Take Player"
msgstr "_Agafar jugador"
-#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
+#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
msgid "Pick _Nation"
msgstr "Tria _Nació"
-#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
+#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
msgid "_Observe"
msgstr "_Observar"
-#: client/gui-gtk-2.0/gui_main.c:1532
+#: client/gui-gtk-2.0/gui_main.c:1698
msgid "Do not _observe"
msgstr "No O_bservar"
-#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
msgid "<AI>"
msgstr "<IA>"
-#: client/gui-gtk-2.0/gui_main.c:1557
+#: client/gui-gtk-2.0/gui_main.c:1723
msgid "<Novice AI>"
msgstr "<IA Principiant>"
-#: client/gui-gtk-2.0/gui_main.c:1560
+#: client/gui-gtk-2.0/gui_main.c:1726
msgid "<Easy AI>"
msgstr "<IA FÃ cil>"
-#: client/gui-gtk-2.0/gui_main.c:1563
+#: client/gui-gtk-2.0/gui_main.c:1729
msgid "<Normal AI>"
msgstr "<IA Normal>"
-#: client/gui-gtk-2.0/gui_main.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1732
msgid "<Hard AI>"
msgstr "<IA DifÃcil>"
-#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1742 client/gui-win32/dialogs.c:594
#: client/gui-xaw/pages.c:217
msgid "Random"
msgstr "Aleatori"
-#: client/gui-gtk-2.0/gui_main.c:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
msgid "Observer"
msgstr "Observador"
-#: client/gui-gtk-2.0/gui_main.c:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
msgid "Detached"
msgstr "Deslligat"
-#: client/gui-gtk-2.0/gui_main.c:1899
+#: client/gui-gtk-2.0/gui_main.c:2073
msgid "Are you sure you want to quit?"
msgstr "Segur que vols sortir?"
@@ -11665,467 +11871,501 @@ msgstr "_Tecnologies"
msgid "Foreign Intelligence: %s Empire"
msgstr "Intel·ligència exterior: Imperi %s"
-#: client/gui-gtk-2.0/mapctrl.c:195 client/gui-sdl/mapctrl.c:2565
+#: client/gui-gtk-2.0/mapctrl.c:179 client/gui-sdl/mapctrl.c:2565
#: client/gui-sdl/menu.c:839 client/gui-sdl/menu.c:1021
#: client/gui-win32/mapctrl.c:353
msgid "Build New City"
msgstr "Construcció de Ciutat Nova"
-#: client/gui-gtk-2.0/mapctrl.c:196 client/gui-sdl/mapctrl.c:2594
+#: client/gui-gtk-2.0/mapctrl.c:180 client/gui-sdl/mapctrl.c:2594
#: client/gui-win32/mapctrl.c:354 client/gui-xaw/mapctrl.c:89
msgid "What should we call our new city?"
msgstr "Com hem d'anomenar la nostra nova ciutat?"
-#: client/gui-gtk-2.0/mapview.c:147
+#: client/gui-gtk-2.0/mapview.c:158
msgid "Shows your current luxury/science/tax rates;click to toggle them."
msgstr ""
"Mostra els ratis actuals luxes/ciència/impostos; clica per canviar-los."
-#: client/gui-gtk-2.0/mapview.c:692 client/gui-win32/canvas.c:275
+#: client/gui-gtk-2.0/mapview.c:702 client/gui-win32/canvas.c:275
msgid "Better fog will only work in truecolor. Disabling it"
msgstr "La boira millorada només funciona en \"true color\". Inhabilitant-la"
-#: client/gui-gtk-2.0/menu.c:250
+#: client/gui-gtk-2.0/menu.c:256
msgid "Leaving a local game will end it!"
msgstr "Sortir d'una partida local farà que s'acabi!"
-#: client/gui-gtk-2.0/menu.c:700 client/gui-win32/menu.c:303
+#: client/gui-gtk-2.0/menu.c:727 client/gui-win32/menu.c:303
msgid "_Game"
msgstr "_Joc"
-#: client/gui-gtk-2.0/menu.c:702 client/gui-gtk-2.0/menu.c:704
-#: client/gui-gtk-2.0/menu.c:706 client/gui-gtk-2.0/menu.c:708
-#: client/gui-gtk-2.0/menu.c:710 client/gui-gtk-2.0/menu.c:712
-#: client/gui-gtk-2.0/menu.c:714 client/gui-gtk-2.0/menu.c:717
-#: client/gui-gtk-2.0/menu.c:720 client/gui-gtk-2.0/menu.c:722
-#: client/gui-gtk-2.0/menu.c:724 client/gui-gtk-2.0/menu.c:726
-#: client/gui-gtk-2.0/menu.c:728 client/gui-gtk-2.0/menu.c:730
-#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:736
-#: client/gui-gtk-2.0/menu.c:738 client/gui-gtk-2.0/menu.c:740
+#: client/gui-gtk-2.0/menu.c:729 client/gui-gtk-2.0/menu.c:731
+#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:735
+#: client/gui-gtk-2.0/menu.c:737 client/gui-gtk-2.0/menu.c:739
+#: client/gui-gtk-2.0/menu.c:741 client/gui-gtk-2.0/menu.c:744
+#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
+#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
+#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
+#: client/gui-gtk-2.0/menu.c:760 client/gui-gtk-2.0/menu.c:763
+#: client/gui-gtk-2.0/menu.c:765 client/gui-gtk-2.0/menu.c:767
#: data/Freeciv.in:2026
msgid "Game"
msgstr "Joc"
-#: client/gui-gtk-2.0/menu.c:704 client/gui-gtk-2.0/menu.c:706
-#: client/gui-gtk-2.0/menu.c:708
+#: client/gui-gtk-2.0/menu.c:731 client/gui-gtk-2.0/menu.c:733
+#: client/gui-gtk-2.0/menu.c:735
msgid "_Chat"
msgstr "_Xat"
-#: client/gui-gtk-2.0/menu.c:706 client/gui-win32/menu.c:314
+#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:314
msgid "_Clear Log"
msgstr "Es_borrar registre de missatges"
-#: client/gui-gtk-2.0/menu.c:708 client/gui-win32/menu.c:313
+#: client/gui-gtk-2.0/menu.c:735 client/gui-win32/menu.c:313
msgid "_Write Log"
msgstr "E_scriure registre de missatges"
-#: client/gui-gtk-2.0/menu.c:710 client/gui-win32/menu.c:304
+#: client/gui-gtk-2.0/menu.c:737 client/gui-win32/menu.c:304
msgid "Local _Options"
msgstr "_Opcions Locals"
-#: client/gui-gtk-2.0/menu.c:712 client/gui-win32/menu.c:305
+#: client/gui-gtk-2.0/menu.c:739 client/gui-win32/menu.c:305
msgid "_Message Options"
msgstr "Opcions de _Missatges"
-#: client/gui-gtk-2.0/menu.c:717
+#: client/gui-gtk-2.0/menu.c:744
msgid "_Reload Tileset"
msgstr "_Recarregar Caselles"
-#: client/gui-gtk-2.0/menu.c:720
+#: client/gui-gtk-2.0/menu.c:747
msgid "Save Options on _Exit"
msgstr "Desar Opcions _en Sortir"
-#: client/gui-gtk-2.0/menu.c:722
+#: client/gui-gtk-2.0/menu.c:749
msgid "Sa_ve Options"
msgstr "_Desar Opcions"
-#: client/gui-gtk-2.0/menu.c:726 client/gui-win32/menu.c:308
+#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:308
msgid "Server O_ptions"
msgstr "Opcions del _Servidor"
-#: client/gui-gtk-2.0/menu.c:730 client/gui-win32/menu.c:310
+#: client/gui-gtk-2.0/menu.c:757 client/gui-win32/menu.c:310
msgid "_Save Game"
msgstr "De_sar Partida"
-#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:311
+#: client/gui-gtk-2.0/menu.c:760 client/gui-win32/menu.c:311
msgid "Save Game _As..."
msgstr "Desar Partida _Com..."
-#: client/gui-gtk-2.0/menu.c:738
+#: client/gui-gtk-2.0/menu.c:765
msgid "_Leave"
msgstr "_Plegar"
-#: client/gui-gtk-2.0/menu.c:740 client/gui-win32/menu.c:317
+#: client/gui-gtk-2.0/menu.c:767 client/gui-win32/menu.c:317
msgid "_Quit"
msgstr "_Sortir"
-#: client/gui-gtk-2.0/menu.c:745 client/gui-win32/menu.c:321
+#: client/gui-gtk-2.0/menu.c:772 client/gui-win32/menu.c:321
msgid "Gov_ernment"
msgstr "Go_vern"
-#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
-#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
-#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:774 client/gui-gtk-2.0/menu.c:776
+#: client/gui-gtk-2.0/menu.c:778 client/gui-gtk-2.0/menu.c:780
+#: client/gui-gtk-2.0/menu.c:782 client/gui-gtk-2.0/menu.c:784
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
#: client/gui-xaw/menu.c:248 data/Freeciv.in:2027 data/helpdata.txt:1320
msgid "Government"
msgstr "Govern"
-#: client/gui-gtk-2.0/menu.c:749 client/gui-win32/menu.c:322
+#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:322
msgid "_Tax Rates"
msgstr "_Taxes"
-#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:324
+#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:324
msgid "_Find City"
msgstr "_Buscar ciutat"
-#: client/gui-gtk-2.0/menu.c:755 client/gui-win32/menu.c:325
+#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:325
msgid "_Worklists"
msgstr "_Llistes de treball"
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
-#: client/gui-gtk-2.0/menu.c:764 client/gui-win32/menu.c:327
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
+#: client/gui-gtk-2.0/menu.c:791 client/gui-win32/menu.c:327
msgid "_Change Government"
msgstr "_Canvi de Govern"
-#: client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:788
msgid "_Revolution..."
msgstr "_Revolució..."
-#: client/gui-gtk-2.0/menu.c:764 client/gui-gtk-2.0/menu.c:970
+#: client/gui-gtk-2.0/menu.c:791 client/gui-gtk-2.0/menu.c:1013
#: client/gui-win32/menu.c:431
msgid "_Government"
msgstr "_Govern"
-#: client/gui-gtk-2.0/menu.c:768 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:795 client/gui-gtk-2.0/menu.c:959
#: client/gui-win32/menu.c:334
msgid "_View"
msgstr "_Veure"
-#: client/gui-gtk-2.0/menu.c:772
+#: client/gui-gtk-2.0/menu.c:799
msgid "City Outlines"
msgstr "Contorns de Ciutat"
-#: client/gui-gtk-2.0/menu.c:774 client/gui-win32/menu.c:335
+#: client/gui-gtk-2.0/menu.c:801 client/gui-win32/menu.c:335
msgid "Map _Grid"
msgstr "_Graella del mapa"
-#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:336
+#: client/gui-gtk-2.0/menu.c:803 client/gui-win32/menu.c:336
msgid "National _Borders"
msgstr "_Fronteres nacionals"
-#: client/gui-gtk-2.0/menu.c:778 client/gui-win32/menu.c:337
+#: client/gui-gtk-2.0/menu.c:805 client/gui-win32/menu.c:337
msgid "City _Names"
msgstr "_Noms de les ciutats"
-#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:338
+#: client/gui-gtk-2.0/menu.c:807 client/gui-win32/menu.c:338
msgid "City G_rowth"
msgstr "C_reixement de la ciutat"
-#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:339
+#: client/gui-gtk-2.0/menu.c:809 client/gui-win32/menu.c:339
msgid "City _Productions"
msgstr "_Producció de les ciutats"
-#: client/gui-gtk-2.0/menu.c:784 client/gui-sdl/optiondlg.c:1719
+#: client/gui-gtk-2.0/menu.c:811
+msgid "City Buy Cost"
+msgstr "Cost de Compra de la Ciutat"
+
+#: client/gui-gtk-2.0/menu.c:813
+msgid "City Traderoutes"
+msgstr "Rutes Comercials de la Ciutat"
+
+#: client/gui-gtk-2.0/menu.c:815 client/gui-sdl/optiondlg.c:1719
msgid "Draw city worker map grid"
msgstr "Dibuixar graella mapa treballadors"
-#: client/gui-gtk-2.0/menu.c:788 client/gui-sdl/optiondlg.c:1635
+#: client/gui-gtk-2.0/menu.c:819 client/gui-sdl/optiondlg.c:1635
#: client/gui-win32/menu.c:340 client/gui-xaw/menu.c:148
#: client/gui-xaw/menu.c:246 manual/civmanual.c:220 data/helpdata.txt:1220
msgid "Terrain"
msgstr "Terreny"
-#: client/gui-gtk-2.0/menu.c:790 client/gui-win32/menu.c:341
+#: client/gui-gtk-2.0/menu.c:821 client/gui-win32/menu.c:341
#: client/gui-xaw/menu.c:149
msgid "Coastline"
msgstr "LÃnia de la costa"
-#: client/gui-gtk-2.0/menu.c:796 client/gui-win32/menu.c:343
+#: client/gui-gtk-2.0/menu.c:827 client/gui-win32/menu.c:343
msgid "Roads & Rails"
msgstr "Camins i ferrocarrils"
-#: client/gui-gtk-2.0/menu.c:800 client/gui-sdl/optiondlg.c:1933
+#: client/gui-gtk-2.0/menu.c:831 client/gui-sdl/optiondlg.c:1933
#: client/gui-win32/menu.c:345 client/gui-xaw/menu.c:152
msgid "Mines"
msgstr "Mines"
-#: client/gui-gtk-2.0/menu.c:802 client/gui-win32/menu.c:346
+#: client/gui-gtk-2.0/menu.c:833 client/gui-win32/menu.c:346
msgid "Fortress & Airbase"
msgstr "Fortificacions i Bases Aèries"
-#: client/gui-gtk-2.0/menu.c:804 client/gui-win32/menu.c:348
+#: client/gui-gtk-2.0/menu.c:835 client/gui-win32/menu.c:348
#: client/gui-xaw/menu.c:154
msgid "Specials"
msgstr "Especials"
-#: client/gui-gtk-2.0/menu.c:806 client/gui-win32/menu.c:349
+#: client/gui-gtk-2.0/menu.c:837 client/gui-win32/menu.c:349
#: client/gui-xaw/menu.c:155
msgid "Pollution & Fallout"
msgstr "Contaminació i Radioactivitat"
-#: client/gui-gtk-2.0/menu.c:812 client/gui-win32/menu.c:352
+#: client/gui-gtk-2.0/menu.c:843 client/gui-win32/menu.c:352
#: client/gui-xaw/menu.c:158
msgid "Focus Unit"
msgstr "Enfocar unitat"
-#: client/gui-gtk-2.0/menu.c:814 client/gui-sdl/optiondlg.c:1854
+#: client/gui-gtk-2.0/menu.c:845 client/gui-sdl/optiondlg.c:1854
#: client/gui-win32/menu.c:353 client/gui-xaw/menu.c:159
msgid "Fog of War"
msgstr "Penombra de guerra"
-#: client/gui-gtk-2.0/menu.c:818
+#: client/gui-gtk-2.0/menu.c:849
msgid "_Full Screen"
msgstr "_Pantalla Completa"
-#: client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/menu.c:853
msgid "_Center View"
msgstr "_Centrar la vista"
-#: client/gui-gtk-2.0/menu.c:825 client/gui-win32/menu.c:358
+#: client/gui-gtk-2.0/menu.c:856 client/gui-win32/menu.c:358
msgid "_Orders"
msgstr "_Ordres"
-#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
-#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
-#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
-#: client/gui-gtk-2.0/menu.c:855 client/gui-gtk-2.0/menu.c:857
-#: client/gui-gtk-2.0/menu.c:859 client/gui-gtk-2.0/menu.c:861
-#: client/gui-gtk-2.0/menu.c:863 client/gui-gtk-2.0/menu.c:865
-#: client/gui-gtk-2.0/menu.c:867 client/gui-gtk-2.0/menu.c:869
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875 client/gui-gtk-2.0/menu.c:877
-#: client/gui-gtk-2.0/menu.c:879 client/gui-gtk-2.0/menu.c:881
-#: client/gui-gtk-2.0/menu.c:883 client/gui-gtk-2.0/menu.c:885
-#: client/gui-gtk-2.0/menu.c:887 client/gui-gtk-2.0/menu.c:889
-#: client/gui-gtk-2.0/menu.c:891 client/gui-gtk-2.0/menu.c:893
-#: client/gui-gtk-2.0/menu.c:895 client/gui-gtk-2.0/menu.c:897
-#: client/gui-gtk-2.0/menu.c:899 client/gui-gtk-2.0/menu.c:901
-#: client/gui-gtk-2.0/menu.c:903 data/Freeciv.in:2029
+#: client/gui-gtk-2.0/menu.c:858 client/gui-gtk-2.0/menu.c:860
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:864
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:868
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:872
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:876
+#: client/gui-gtk-2.0/menu.c:878 client/gui-gtk-2.0/menu.c:880
+#: client/gui-gtk-2.0/menu.c:882 client/gui-gtk-2.0/menu.c:884
+#: client/gui-gtk-2.0/menu.c:886 client/gui-gtk-2.0/menu.c:888
+#: client/gui-gtk-2.0/menu.c:890 client/gui-gtk-2.0/menu.c:892
+#: client/gui-gtk-2.0/menu.c:894 client/gui-gtk-2.0/menu.c:896
+#: client/gui-gtk-2.0/menu.c:898 client/gui-gtk-2.0/menu.c:900
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906 client/gui-gtk-2.0/menu.c:908
+#: client/gui-gtk-2.0/menu.c:910 client/gui-gtk-2.0/menu.c:912
+#: client/gui-gtk-2.0/menu.c:914 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:918 client/gui-gtk-2.0/menu.c:920
+#: client/gui-gtk-2.0/menu.c:922 client/gui-gtk-2.0/menu.c:924
+#: client/gui-gtk-2.0/menu.c:926 client/gui-gtk-2.0/menu.c:928
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
+#: client/gui-gtk-2.0/menu.c:946 data/Freeciv.in:2029
msgid "Orders"
msgstr "Ordres"
-#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:1444
+#: client/gui-gtk-2.0/menu.c:860 client/gui-gtk-2.0/menu.c:1489
#: client/gui-win32/menu.c:359
msgid "_Build City"
msgstr "_Bastir una ciutat"
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:1466
-#: client/gui-gtk-2.0/menu.c:1472 client/gui-win32/menu.c:360
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:1511
+#: client/gui-gtk-2.0/menu.c:1517 client/gui-win32/menu.c:360
msgid "Build _Road"
msgstr "Const_ruir un camÃ"
-#: client/gui-gtk-2.0/menu.c:833 client/gui-gtk-2.0/menu.c:1360
+#: 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"
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:1361
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:1406
#: client/gui-win32/menu.c:362
msgid "Build _Mine"
msgstr "Construir _Mina"
-#: client/gui-gtk-2.0/menu.c:837 client/gui-gtk-2.0/menu.c:1362
+#: client/gui-gtk-2.0/menu.c:868 client/gui-gtk-2.0/menu.c:1407
msgid "Transf_orm Terrain"
msgstr "Transf_ormar el terreny"
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:1508
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:1553
#: client/gui-win32/menu.c:364
msgid "Build _Fortress"
msgstr "Construir _Fortificació"
-#: client/gui-gtk-2.0/menu.c:841 client/gui-win32/menu.c:365
+#: client/gui-gtk-2.0/menu.c:872 client/gui-win32/menu.c:365
msgid "Build Airbas_e"
msgstr "Construir una Bas_e Aèria"
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:1514
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:1559
#: client/gui-win32/menu.c:366
msgid "Clean _Pollution"
msgstr "De_purar la Contaminació"
-#: client/gui-gtk-2.0/menu.c:845 client/gui-win32/menu.c:367
+#: client/gui-gtk-2.0/menu.c:876 client/gui-win32/menu.c:367
msgid "Clean _Nuclear Fallout"
msgstr "Descontaminació _Nuclear"
-#: client/gui-gtk-2.0/menu.c:849 client/gui-win32/menu.c:369
+#: client/gui-gtk-2.0/menu.c:880 client/gui-win32/menu.c:369
msgid "_Sentry"
msgstr "_Sentinella"
-#: client/gui-gtk-2.0/menu.c:855 client/gui-win32/menu.c:372
+#: client/gui-gtk-2.0/menu.c:886 client/gui-win32/menu.c:372
msgid "Make _Homecity"
msgstr "Esta_blir com a llar"
-#: client/gui-gtk-2.0/menu.c:857 client/gui-win32/menu.c:373
+#: client/gui-gtk-2.0/menu.c:888 client/gui-win32/menu.c:373
msgid "_Load"
msgstr "Embarcar (_L)"
-#: client/gui-gtk-2.0/menu.c:859
+#: client/gui-gtk-2.0/menu.c:890
msgid "_Unload Transporter"
msgstr "Desembarcar Transport (_U)"
-#: client/gui-gtk-2.0/menu.c:861 client/gui-win32/menu.c:374
+#: client/gui-gtk-2.0/menu.c:892 client/gui-win32/menu.c:374
msgid "_Unload"
msgstr "Desembarcar (_U)"
-#: client/gui-gtk-2.0/menu.c:863 client/gui-win32/menu.c:375
+#: client/gui-gtk-2.0/menu.c:894 client/gui-win32/menu.c:375
msgid "Wake up o_thers"
msgstr "Despertar al_tres"
-#: client/gui-gtk-2.0/menu.c:867
+#: client/gui-gtk-2.0/menu.c:898
msgid "_Auto Settler"
msgstr "Colon _Automà tic"
-#: client/gui-gtk-2.0/menu.c:869 client/gui-win32/menu.c:378
+#: client/gui-gtk-2.0/menu.c:900 client/gui-win32/menu.c:378
msgid "Auto E_xplore"
msgstr "E_xplorador Automà tic"
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906
msgid "_Connect"
msgstr "_Connectar"
-#: client/gui-gtk-2.0/menu.c:871 client/gui-win32/menu.c:380
+#: client/gui-gtk-2.0/menu.c:902 client/gui-win32/menu.c:380
msgid "_Road"
msgstr "Fe_r CamÃ"
-#: client/gui-gtk-2.0/menu.c:873 client/gui-win32/menu.c:381
+#: client/gui-gtk-2.0/menu.c:904 client/gui-win32/menu.c:381
msgid "Rai_l"
msgstr "_Ferrocarril"
-#: client/gui-gtk-2.0/menu.c:875 client/gui-win32/menu.c:382
+#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:382
msgid "_Irrigate"
msgstr "_Irrigar"
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
msgid "Go _to"
msgstr "A_nar a"
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
msgid "_Build city"
msgstr "Fundar ciutat (_B)"
-#: client/gui-gtk-2.0/menu.c:879
+#: client/gui-gtk-2.0/menu.c:910
msgid "Patrol (_Q)"
msgstr "Patrullar (_Q)"
-#: client/gui-gtk-2.0/menu.c:881 client/gui-win32/menu.c:385
+#: client/gui-gtk-2.0/menu.c:912 client/gui-win32/menu.c:385
msgid "_Go to"
msgstr "Anar (_G)"
-#: client/gui-gtk-2.0/menu.c:883
+#: client/gui-gtk-2.0/menu.c:914
msgid "Go\\/Airlift to City"
msgstr "Aerotransportar a ciutat"
-#: client/gui-gtk-2.0/menu.c:885 client/gui-sdl/menu.c:450
+#: client/gui-gtk-2.0/menu.c:916 client/gui-sdl/menu.c:450
#: client/gui-win32/menu.c:387 client/gui-xaw/menu.c:203
msgid "Return to nearest city"
msgstr "Tornar a ciutat més propera"
-#: client/gui-gtk-2.0/menu.c:889 client/gui-win32/menu.c:389
+#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:389
#: client/gui-xaw/menu.c:205
msgid "Disband Unit"
msgstr "Desmantellar la unitat"
-#: client/gui-gtk-2.0/menu.c:891 client/gui-sdl/citydlg.c:532
+#: client/gui-gtk-2.0/menu.c:922 client/gui-sdl/citydlg.c:532
#: data/Freeciv.in:1186
msgid "Upgrade unit"
msgstr "Millorar unitat"
-#: client/gui-gtk-2.0/menu.c:893
+#: client/gui-gtk-2.0/menu.c:924
msgid "Diplomat\\/Spy Actions"
msgstr "Accions de diplomà tic\\/Espia"
-#: client/gui-gtk-2.0/menu.c:895 client/gui-sdl/menu.c:399
+#: client/gui-gtk-2.0/menu.c:926 client/gui-sdl/menu.c:399
#: client/gui-win32/menu.c:391 client/gui-xaw/menu.c:209
msgid "Explode Nuclear"
msgstr "Explotar nuclear"
-#: client/gui-gtk-2.0/menu.c:899
-msgid "Select same type"
-msgstr "Seleccionar tipus igual"
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/cityrep.c:882
+msgid "Select"
+msgstr "Seleccionar"
+
+#: client/gui-gtk-2.0/menu.c:934
+msgid "Single"
+msgstr "Únic"
+
+#: client/gui-gtk-2.0/menu.c:936
+msgid "Same Type On Tile"
+msgstr "Tipus Igual Dins de la Casella"
+
+#: client/gui-gtk-2.0/menu.c:938
+msgid "All On Tile"
+msgstr "Tots els de la Casella"
-#: client/gui-gtk-2.0/menu.c:901 client/gui-win32/menu.c:393
+#: client/gui-gtk-2.0/menu.c:940
+msgid "Same Type On Continent"
+msgstr "Tipus Igual Dins del Continent"
+
+#: client/gui-gtk-2.0/menu.c:942
+msgid "Same Type Everywhere"
+msgstr "Tipus Igual a Tot Arreu"
+
+#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:393
msgid "_Wait"
msgstr "Es_perar"
-#: client/gui-gtk-2.0/menu.c:903 client/gui-win32/menu.c:394
+#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:394
#: client/gui-xaw/menu.c:213
msgid "Done"
msgstr "Passar el torn"
-#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:398
+#: client/gui-gtk-2.0/menu.c:949 client/gui-win32/menu.c:398
msgid "_Reports"
msgstr "Info_rmes"
-#: client/gui-gtk-2.0/menu.c:908 client/gui-gtk-2.0/menu.c:910
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:914
-#: client/gui-gtk-2.0/menu.c:916 client/gui-gtk-2.0/menu.c:918
-#: client/gui-gtk-2.0/menu.c:920 client/gui-gtk-2.0/menu.c:922
-#: client/gui-gtk-2.0/menu.c:924 client/gui-gtk-2.0/menu.c:926
-#: client/gui-gtk-2.0/menu.c:928 client/gui-gtk-2.0/menu.c:930
-#: client/gui-gtk-2.0/menu.c:932 data/Freeciv.in:2030
+#: client/gui-gtk-2.0/menu.c:951 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:957
+#: client/gui-gtk-2.0/menu.c:959 client/gui-gtk-2.0/menu.c:961
+#: client/gui-gtk-2.0/menu.c:963 client/gui-gtk-2.0/menu.c:965
+#: client/gui-gtk-2.0/menu.c:967 client/gui-gtk-2.0/menu.c:969
+#: client/gui-gtk-2.0/menu.c:971 client/gui-gtk-2.0/menu.c:973
+#: client/gui-gtk-2.0/menu.c:975 data/Freeciv.in:2030
msgid "Reports"
msgstr "Informes"
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:958
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:1001
#: client/gui-win32/menu.c:400 client/gui-win32/menu.c:425
msgid "_Units"
msgstr "_Unitats"
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/menu.c:914 client/gui-win32/menu.c:402
+#: client/gui-gtk-2.0/menu.c:957 client/gui-win32/menu.c:402
msgid "_Nations"
msgstr "_Nacions"
-#: client/gui-gtk-2.0/menu.c:918 client/gui-win32/menu.c:403
+#: client/gui-gtk-2.0/menu.c:961 client/gui-win32/menu.c:403
msgid "_Economy"
msgstr "_Economia"
#. TRANS: Research report action
-#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:405
+#: client/gui-gtk-2.0/menu.c:963 client/gui-win32/menu.c:405
msgid "_Research"
msgstr "_Recerca"
-#: client/gui-gtk-2.0/menu.c:924 client/gui-win32/menu.c:407
+#: client/gui-gtk-2.0/menu.c:967 client/gui-win32/menu.c:407
msgid "_Wonders of the World"
msgstr "Mera_velles del món"
-#: client/gui-gtk-2.0/menu.c:926 client/gui-win32/menu.c:408
+#: client/gui-gtk-2.0/menu.c:969 client/gui-win32/menu.c:408
msgid "_Top Five Cities"
msgstr "Mi_llors cinc ciutats"
-#: client/gui-gtk-2.0/menu.c:928 client/gui-win32/menu.c:409
+#: client/gui-gtk-2.0/menu.c:971 client/gui-win32/menu.c:409
msgid "_Messages"
msgstr "_Missatges"
-#: client/gui-gtk-2.0/menu.c:930 client/gui-win32/menu.c:410
+#: client/gui-gtk-2.0/menu.c:973 client/gui-win32/menu.c:410
msgid "_Demographics"
msgstr "_Demografia"
-#: client/gui-gtk-2.0/menu.c:932 client/gui-gtk-2.0/plrdlg.c:471
+#: client/gui-gtk-2.0/menu.c:975 client/gui-gtk-2.0/plrdlg.c:354
#: client/gui-win32/menu.c:411
msgid "_Spaceship"
msgstr "Nau e_spacial"
-#: client/gui-gtk-2.0/menu.c:936 client/gui-win32/menu.c:415
+#: client/gui-gtk-2.0/menu.c:979 client/gui-win32/menu.c:415
msgid "_Help"
msgstr "_Ajuda"
-#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
-#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
-#: client/gui-gtk-2.0/menu.c:946 client/gui-gtk-2.0/menu.c:948
-#: client/gui-gtk-2.0/menu.c:950 client/gui-gtk-2.0/menu.c:952
-#: client/gui-gtk-2.0/menu.c:954 client/gui-gtk-2.0/menu.c:956
-#: client/gui-gtk-2.0/menu.c:958 client/gui-gtk-2.0/menu.c:960
-#: client/gui-gtk-2.0/menu.c:962 client/gui-gtk-2.0/menu.c:964
-#: client/gui-gtk-2.0/menu.c:966 client/gui-gtk-2.0/menu.c:968
-#: client/gui-gtk-2.0/menu.c:970 client/gui-gtk-2.0/menu.c:972
-#: client/gui-gtk-2.0/menu.c:974 client/gui-gtk-2.0/menu.c:976
-#: client/gui-gtk-2.0/menu.c:978 client/gui-gtk-2.0/menu.c:980
+#: client/gui-gtk-2.0/menu.c:981 client/gui-gtk-2.0/menu.c:983
+#: client/gui-gtk-2.0/menu.c:985 client/gui-gtk-2.0/menu.c:987
+#: client/gui-gtk-2.0/menu.c:989 client/gui-gtk-2.0/menu.c:991
+#: client/gui-gtk-2.0/menu.c:993 client/gui-gtk-2.0/menu.c:995
+#: client/gui-gtk-2.0/menu.c:997 client/gui-gtk-2.0/menu.c:999
+#: client/gui-gtk-2.0/menu.c:1001 client/gui-gtk-2.0/menu.c:1003
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-gtk-2.0/menu.c:1007
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-gtk-2.0/menu.c:1011
+#: client/gui-gtk-2.0/menu.c:1013 client/gui-gtk-2.0/menu.c:1015
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-gtk-2.0/menu.c:1019
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-gtk-2.0/menu.c:1023
#: client/gui-gtk-2.0/repodlgs.c:313 client/gui-win32/citydlg.c:1077
#: client/gui-win32/repodlgs.c:289 client/gui-win32/wldlg.c:846
#: data/Freeciv.in:1466 data/Freeciv.in:2031 data/Freeciv.in:2101
@@ -12133,119 +12373,119 @@ msgstr "_Ajuda"
msgid "Help"
msgstr "Ajuda"
-#: client/gui-gtk-2.0/menu.c:940 client/gui-win32/menu.c:416
+#: client/gui-gtk-2.0/menu.c:983 client/gui-win32/menu.c:416
msgid "Language_s"
msgstr "_Idiomes"
-#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/menu.c:417
+#: client/gui-gtk-2.0/menu.c:985 client/gui-win32/menu.c:417
msgid "Co_nnecting"
msgstr "Com co_nnectar"
-#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:418
+#: client/gui-gtk-2.0/menu.c:987 client/gui-win32/menu.c:418
msgid "C_ontrols"
msgstr "C_ontrols"
-#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:419
+#: client/gui-gtk-2.0/menu.c:989 client/gui-win32/menu.c:419
msgid "C_hatline"
msgstr "LÃnia de _xat"
-#: client/gui-gtk-2.0/menu.c:948 client/gui-win32/menu.c:420
+#: client/gui-gtk-2.0/menu.c:991 client/gui-win32/menu.c:420
msgid "_Worklist Editor"
msgstr "Editor llista treball (_W)"
-#: client/gui-gtk-2.0/menu.c:950 client/gui-win32/menu.c:421
+#: client/gui-gtk-2.0/menu.c:993 client/gui-win32/menu.c:421
msgid "Citizen _Management"
msgstr "_Gestió ciutadans"
-#: client/gui-gtk-2.0/menu.c:952 client/gui-win32/menu.c:422
+#: client/gui-gtk-2.0/menu.c:995 client/gui-win32/menu.c:422
msgid "_Playing"
msgstr "_Com jugar"
-#: client/gui-gtk-2.0/menu.c:956 client/gui-win32/menu.c:424
+#: client/gui-gtk-2.0/menu.c:999 client/gui-win32/menu.c:424
msgid "City _Improvements"
msgstr "E_dificis"
-#: client/gui-gtk-2.0/menu.c:960 client/gui-win32/menu.c:426
+#: client/gui-gtk-2.0/menu.c:1003 client/gui-win32/menu.c:426
msgid "Com_bat"
msgstr "Com_bat"
-#: client/gui-gtk-2.0/menu.c:962 client/gui-win32/menu.c:427
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-win32/menu.c:427
msgid "_ZOC"
msgstr "_ZDC"
-#: client/gui-gtk-2.0/menu.c:964 client/gui-win32/menu.c:428
+#: client/gui-gtk-2.0/menu.c:1007 client/gui-win32/menu.c:428
msgid "Techno_logy"
msgstr "Tecno_logia"
-#: client/gui-gtk-2.0/menu.c:966 client/gui-win32/menu.c:429
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-win32/menu.c:429
msgid "_Terrain"
msgstr "_Terreny"
-#: client/gui-gtk-2.0/menu.c:968 client/gui-win32/menu.c:430
+#: client/gui-gtk-2.0/menu.c:1011 client/gui-win32/menu.c:430
msgid "Won_ders"
msgstr "_Meravelles"
-#: client/gui-gtk-2.0/menu.c:972 client/gui-win32/menu.c:432
+#: client/gui-gtk-2.0/menu.c:1015 client/gui-win32/menu.c:432
msgid "Happin_ess"
msgstr "F_elicitat"
-#: client/gui-gtk-2.0/menu.c:974 client/gui-win32/menu.c:433
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-win32/menu.c:433
msgid "Space _Race"
msgstr "Ca_rrera espacial"
-#: client/gui-gtk-2.0/menu.c:978 client/gui-win32/menu.c:435
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-win32/menu.c:435
msgid "_Copying"
msgstr "_Llicència"
-#: client/gui-gtk-2.0/menu.c:980 client/gui-win32/menu.c:436
+#: client/gui-gtk-2.0/menu.c:1023 client/gui-win32/menu.c:436
msgid "_About"
msgstr "_Quant a"
-#: client/gui-gtk-2.0/menu.c:1264
+#: client/gui-gtk-2.0/menu.c:1307
#, c-format
msgid "%s..."
msgstr "%s..."
-#: client/gui-gtk-2.0/menu.c:1352
+#: client/gui-gtk-2.0/menu.c:1397
#, c-format
msgid "Change to %s (_I)"
msgstr "Canviar a %s (_I)"
-#: client/gui-gtk-2.0/menu.c:1353
+#: client/gui-gtk-2.0/menu.c:1398
#, c-format
msgid "Change to %s (_M)"
msgstr "Canviar a %s (_M)"
-#: client/gui-gtk-2.0/menu.c:1354
+#: client/gui-gtk-2.0/menu.c:1399
#, c-format
msgid "Transf_orm to %s"
msgstr "Transf_ormar en %s"
-#: client/gui-gtk-2.0/menu.c:1427
+#: client/gui-gtk-2.0/menu.c:1472
msgid "Help _Build Wonder"
msgstr "Ajudar a _Bastir Meravella"
-#: client/gui-gtk-2.0/menu.c:1441
+#: client/gui-gtk-2.0/menu.c:1486
msgid "Add to City (_B)"
msgstr "Afegir a ciutat (_B)"
-#: client/gui-gtk-2.0/menu.c:1449
+#: client/gui-gtk-2.0/menu.c:1494
msgid "Make Trade _Route"
msgstr "Fer _Ruta Comercial"
-#: client/gui-gtk-2.0/menu.c:1463
+#: client/gui-gtk-2.0/menu.c:1508
msgid "Build _Railroad"
msgstr "Construir fe_rrocarril"
-#: client/gui-gtk-2.0/menu.c:1486
+#: client/gui-gtk-2.0/menu.c:1531
msgid "Bu_ild Farmland"
msgstr "Constru_ir Horta"
-#: client/gui-gtk-2.0/menu.c:1506
+#: client/gui-gtk-2.0/menu.c:1551
msgid "_Fortify"
msgstr "_Fortificar"
-#: client/gui-gtk-2.0/menu.c:1512
+#: client/gui-gtk-2.0/menu.c:1557
msgid "_Paradrop"
msgstr "Llançar _paracaigudes"
@@ -12280,13 +12520,29 @@ msgstr "Mis"
msgid "Pop"
msgstr "Ind"
-#: client/gui-gtk-2.0/messagewin.c:155 client/gui-sdl/messagewin.c:247
+#: client/gui-gtk-2.0/messagewin.c:186 client/gui-sdl/messagewin.c:247
#: client/gui-win32/messagewin.c:132 client/gui-xaw/menu.c:228
#: data/Freeciv.in:3273 data/Freeciv.in:3274 data/Freeciv.in:3283
msgid "Messages"
msgstr "Missatges"
-#: client/gui-gtk-2.0/plrdlg.c:330
+#: client/gui-gtk-2.0/plrdlg.c:317
+msgid "_Meet"
+msgstr "_Cimera"
+
+#: client/gui-gtk-2.0/plrdlg.c:323
+msgid "Cancel _Treaty"
+msgstr "Cancel·lar el _Tractat"
+
+#: client/gui-gtk-2.0/plrdlg.c:329
+msgid "_Withdraw Vision"
+msgstr "Retirar visió (_W)"
+
+#: client/gui-gtk-2.0/plrdlg.c:348
+msgid "_Report"
+msgstr "Info_rme"
+
+#: client/gui-gtk-2.0/plrdlg.c:386
msgid "?show:Dead Players"
msgstr "Jugadors Morts"
@@ -12294,264 +12550,266 @@ msgstr "Jugadors Morts"
#. TRANS: Nations report action
#. TRANS: Nations report title
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/plrdlg.c:350 client/gui-sdl/mapctrl.c:1580
+#: client/gui-gtk-2.0/plrdlg.c:406 client/gui-sdl/mapctrl.c:1580
#: client/gui-sdl/plrdlg.c:608 client/gui-win32/plrdlg.c:344
#: client/gui-xaw/menu.c:221 data/Freeciv.in:3192 data/Freeciv.in:3193
msgid "Nations"
msgstr "Nacions"
-#: client/gui-gtk-2.0/plrdlg.c:443
+#: client/gui-gtk-2.0/plrdlg.c:511
+msgid "Di_plomacy"
+msgstr "Di_plomà cia"
+
+#: client/gui-gtk-2.0/plrdlg.c:516
msgid "_Intelligence"
msgstr "_Intel·ligència"
-#: client/gui-gtk-2.0/plrdlg.c:450
-msgid "_Meet"
-msgstr "_Cimera"
-
-#: client/gui-gtk-2.0/plrdlg.c:457
-msgid "Cancel _Treaty"
-msgstr "Cancel·lar el _Tractat"
-
-#: client/gui-gtk-2.0/plrdlg.c:464
-msgid "_Withdraw vision"
-msgstr "Retirar visió (_W)"
-
-#: client/gui-gtk-2.0/plrdlg.c:495
+#: client/gui-gtk-2.0/plrdlg.c:526
msgid "_AI"
msgstr "I_A"
-#: client/gui-gtk-2.0/plrdlg.c:501
+#: client/gui-gtk-2.0/plrdlg.c:532
msgid "_Toggle AI Mode"
msgstr "_Commuta el mode d'IA"
-#: client/gui-gtk-2.0/pages.c:208
+#: client/gui-gtk-2.0/pages.c:221
msgid "Start _New Game"
msgstr "Començar Partida _Nova"
-#: client/gui-gtk-2.0/pages.c:214
+#: client/gui-gtk-2.0/pages.c:227
msgid "Start _Scenario Game"
msgstr "Començar Partida en _Escenari"
-#: client/gui-gtk-2.0/pages.c:220
+#: client/gui-gtk-2.0/pages.c:233
msgid "_Load Saved Game"
msgstr "_Carregar Partida Desada"
-#: client/gui-gtk-2.0/pages.c:229
+#: client/gui-gtk-2.0/pages.c:239
msgid "C_onnect to Network Game"
msgstr "C_onnectar a Partida en Xarxa"
-#: client/gui-gtk-2.0/pages.c:236
+#: client/gui-gtk-2.0/pages.c:247
msgid "Connect to Gaming _Zone"
msgstr "Connectar a _Zona de Jocs"
-#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:300
#: client/gui-xaw/connectdlg.c:326
msgid "Passwords don't match, enter password."
msgstr "Les contrasenyes no coincideixen, entra la contrasenya."
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:779 client/gui-gtk-2.0/pages.c:820
+#: client/gui-win32/connectdlg.c:916
msgid "Server Name"
msgstr "Nom del servidor"
-#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
+#: 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
+#: data/Freeciv.in:96
msgid "Port"
msgstr "Port"
-#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
+#: client/gui-win32/connectdlg.c:917
msgid "Version"
msgstr "Versió"
-#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
-#: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
+#: 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
msgid "Status"
msgstr "Estat"
-#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
-#: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
+#: 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
msgid "Players"
msgstr "Jugadors"
-#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
+#: client/gui-win32/connectdlg.c:918
msgid "Comment"
msgstr "Comentari"
-#: client/gui-gtk-2.0/pages.c:747
+#: client/gui-gtk-2.0/pages.c:786
msgid "Local _Area Network"
msgstr "Xarxa d'_Area Local"
-#: client/gui-gtk-2.0/pages.c:783
+#: client/gui-gtk-2.0/pages.c:827
msgid "Internet _Metaserver"
msgstr "_Metaservidor d'Internet"
-#: client/gui-gtk-2.0/pages.c:817
+#: client/gui-gtk-2.0/pages.c:864
msgid "_Host:"
msgstr "_Host:"
-#: client/gui-gtk-2.0/pages.c:834
+#: client/gui-gtk-2.0/pages.c:881
msgid "_Port:"
msgstr "_Port:"
-#: client/gui-gtk-2.0/pages.c:851
+#: client/gui-gtk-2.0/pages.c:898
msgid "_Login:"
msgstr "_Login:"
-#: client/gui-gtk-2.0/pages.c:869
+#: client/gui-gtk-2.0/pages.c:916
msgid "Pass_word:"
msgstr "Contra_senya:"
-#: client/gui-gtk-2.0/pages.c:887
+#: client/gui-gtk-2.0/pages.c:934
msgid "Conf_irm Password:"
msgstr "Conf_irmar la Contrasenya:"
-#: client/gui-gtk-2.0/pages.c:912
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: 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/wldlg.c:800 client/gui-win32/wldlg.c:806
+msgid "Type"
+msgstr "Tipus"
+
+#: client/gui-gtk-2.0/pages.c:952 client/gui-win32/plrdlg.c:337
+#: data/Freeciv.in:88
+msgid "Host"
+msgstr "Host"
+
+#: client/gui-gtk-2.0/pages.c:981
msgid "C_onnect"
msgstr "C_onnectar"
-#: client/gui-gtk-2.0/pages.c:1142
+#: client/gui-gtk-2.0/pages.c:1211
#, c-format
msgid "Connection name: %s"
msgstr "Nom de connexió: %s"
-#: client/gui-gtk-2.0/pages.c:1145
+#: client/gui-gtk-2.0/pages.c:1214
#, c-format
msgid "Player name: %s"
msgstr "Nom del jugador: %s"
-#: client/gui-gtk-2.0/pages.c:1150
+#: client/gui-gtk-2.0/pages.c:1219
#, c-format
msgid "Host: %s"
msgstr "Host: %s"
-#: client/gui-gtk-2.0/pages.c:1158
+#: client/gui-gtk-2.0/pages.c:1227
msgid "Player/conn info"
msgstr "Info Jugador/conn"
-#: client/gui-gtk-2.0/pages.c:1185
+#: client/gui-gtk-2.0/pages.c:1254
#, c-format
msgid "%s info"
msgstr "Info %s"
-#: client/gui-gtk-2.0/pages.c:1196
+#: client/gui-gtk-2.0/pages.c:1265
msgid "Toggle player ready"
msgstr "Commutar disponibilitat jugador"
-#: client/gui-gtk-2.0/pages.c:1204
+#: client/gui-gtk-2.0/pages.c:1273
msgid "Pick nation"
msgstr "Tria nació"
-#: client/gui-gtk-2.0/pages.c:1214
+#: client/gui-gtk-2.0/pages.c:1283
msgid "Observe this player"
msgstr "Observar aquest jugador"
-#: client/gui-gtk-2.0/pages.c:1221
+#: client/gui-gtk-2.0/pages.c:1290
msgid "Take this player"
msgstr "Agafar aquest jugador"
-#: client/gui-gtk-2.0/pages.c:1238
+#: client/gui-gtk-2.0/pages.c:1307
msgid "Cut connection"
msgstr "Tallar connexió"
-#: client/gui-gtk-2.0/pages.c:1248
+#: client/gui-gtk-2.0/pages.c:1317
msgid "Aitoggle player"
msgstr "Commutar IA per jugador"
-#: client/gui-gtk-2.0/pages.c:1257
+#: client/gui-gtk-2.0/pages.c:1326
msgid "Remove player"
msgstr "Eliminar jugador"
-#: client/gui-gtk-2.0/pages.c:1268
+#: client/gui-gtk-2.0/pages.c:1337
msgid "Give info access"
msgstr "Donar accés d'info"
-#: client/gui-gtk-2.0/pages.c:1276
+#: client/gui-gtk-2.0/pages.c:1345
msgid "Give ctrl access"
msgstr "Donar accés de control"
#. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1338
+#: client/gui-gtk-2.0/pages.c:1407
#, c-format
msgid "Put on %s"
msgstr "Posar a %s"
-#: client/gui-gtk-2.0/pages.c:1442
+#: client/gui-gtk-2.0/pages.c:1511
msgid "Number of _Players (including AI):"
msgstr "_Nombre de Jugadors (comptant IA):"
-#: client/gui-gtk-2.0/pages.c:1465
+#: client/gui-gtk-2.0/pages.c:1534
msgid "AI Skill _Level:"
msgstr "Nivell de _Dificultat dels IA:"
-#: client/gui-gtk-2.0/pages.c:1481
+#: client/gui-gtk-2.0/pages.c:1550
msgid "Ruleset _Version:"
msgstr "_Versió de Joc de Regles:"
-#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
msgid "_More Game Options..."
msgstr "Més _Opcions de Joc..."
-#: client/gui-gtk-2.0/pages.c:1514
+#: client/gui-gtk-2.0/pages.c:1583
msgid "Record"
msgstr "Registrar"
-#: client/gui-gtk-2.0/pages.c:1519
+#: client/gui-gtk-2.0/pages.c:1588
msgid "Rating"
msgstr "Valoració"
-#: client/gui-gtk-2.0/pages.c:1525
+#: client/gui-gtk-2.0/pages.c:1594
msgid "Ready"
msgstr "Preparat"
-#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
-#: data/nation/slovakian.ruleset:26
-msgid "Leader"
+#: client/gui-gtk-2.0/pages.c:1601
+msgid "?player:Leader"
msgstr "LÃder"
-#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1732 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:1752
+#: client/gui-gtk-2.0/pages.c:1824
msgid "Choose Saved Game to _Load:"
msgstr "Tria Partida Desada per _Carregar:"
-#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
-#: client/gui-gtk-2.0/pages.c:2375
+#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
+#: client/gui-gtk-2.0/pages.c:2451
msgid "_Browse..."
msgstr "_Fullejar..."
-#: client/gui-gtk-2.0/pages.c:1839
+#: client/gui-gtk-2.0/pages.c:1911
msgid "Choose a Scenario"
msgstr "Tria un Escenari"
-#: client/gui-gtk-2.0/pages.c:1926
+#: client/gui-gtk-2.0/pages.c:1998
msgid "Choose a _Scenario:"
msgstr "Tria un _Escenari:"
-#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
-#: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
-#: client/gui-win32/wldlg.c:806
-msgid "Type"
-msgstr "Tipus"
-
-#: client/gui-gtk-2.0/pages.c:2101
+#: client/gui-gtk-2.0/pages.c:2173
msgid "Choose a _nation to play:"
msgstr "Tria una _nació per jugar:"
-#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2363 client/gui-win32/menu.c:581
msgid "Select Location to Save"
msgstr "Tria el Lloc on Desar"
-#: client/gui-gtk-2.0/pages.c:2372 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2448 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr "Desar la Partida"
-#: client/gui-gtk-2.0/pages.c:2413
+#: client/gui-gtk-2.0/pages.c:2489
msgid "Saved _Games:"
msgstr "Partides _Desades:"
-#: client/gui-gtk-2.0/pages.c:2440
+#: client/gui-gtk-2.0/pages.c:2516
msgid "Save _Filename:"
msgstr "Nom de _Fitxer a Desar:"
@@ -12903,7 +13161,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:1094
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
msgid "Back"
msgstr "Enrere"
@@ -12912,7 +13170,7 @@ msgid "Start"
msgstr "Iniciar"
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:775
+#: client/gui-win32/connectdlg.c:777
msgid "Load Game"
msgstr "Carregar una partida"
@@ -12949,12 +13207,12 @@ msgid "Make new homecity"
msgstr "Establir com nova llar"
#: client/gui-sdl/citydlg.c:546 client/gui-sdl/citydlg.c:1418
-#: client/gui-sdl/connectdlg.c:307 client/gui-sdl/connectdlg.c:616
-#: client/gui-sdl/connectdlg.c:802 client/gui-sdl/connectdlg.c:984
+#: 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/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1039
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
#: 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
@@ -13001,7 +13259,7 @@ msgstr "Comprar?"
#: client/gui-sdl/diplodlg.c:1335 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:2427
+#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
#: client/gui-xaw/cityrep.c:666 client/gui-xaw/cma_fe.c:327
#: client/gui-xaw/cma_fe.c:511 client/gui-xaw/cma_fe.c:765
#: client/gui-xaw/messagedlg.c:72 client/gui-xaw/optiondlg.c:76
@@ -13017,7 +13275,7 @@ msgstr "No"
#: client/gui-sdl/diplodlg.c:1345 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:2427 client/gui-xaw/cityrep.c:666
+#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
#: client/gui-xaw/cma_fe.c:327 client/gui-xaw/cma_fe.c:511
#: client/gui-xaw/cma_fe.c:765 client/gui-xaw/messagedlg.c:72
#: client/gui-xaw/optiondlg.c:76 client/gui-xaw/optiondlg.c:304
@@ -13294,36 +13552,36 @@ msgstr "Aplicar un cop"
msgid "Release city"
msgstr "No controlar ciutat"
-#: client/gui-sdl/connectdlg.c:238
+#: client/gui-sdl/connectdlg.c:239
msgid "Creating Server List..."
msgstr "Creant llista servidors..."
-#: client/gui-sdl/connectdlg.c:279 client/gui-sdl/connectdlg.c:343
+#: client/gui-sdl/connectdlg.c:280 client/gui-sdl/connectdlg.c:344
msgid "No LAN servers found"
msgstr "No s'han trobat servidors de xarxa"
-#: client/gui-sdl/connectdlg.c:281 client/gui-sdl/connectdlg.c:345
+#: client/gui-sdl/connectdlg.c:282 client/gui-sdl/connectdlg.c:346
msgid "No public servers found"
msgstr "No s'han trobat servidors públics"
-#: client/gui-sdl/connectdlg.c:555
+#: client/gui-sdl/connectdlg.c:556
msgid "Player Name :"
msgstr "Nom del jugador:"
-#: client/gui-sdl/connectdlg.c:571
+#: client/gui-sdl/connectdlg.c:572
msgid "Freeciv Server :"
msgstr "Servidor de Freeciv:"
-#: client/gui-sdl/connectdlg.c:588
+#: client/gui-sdl/connectdlg.c:589
msgid "Port :"
msgstr "Port:"
-#: client/gui-sdl/connectdlg.c:608 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr "Connectar"
-#: client/gui-sdl/connectdlg.c:794 client/gui-sdl/connectdlg.c:977
+#: client/gui-sdl/connectdlg.c:795 client/gui-sdl/connectdlg.c:978
#: client/gui-xaw/connectdlg.c:145
msgid "Next"
msgstr "Següent"
@@ -13600,12 +13858,12 @@ msgstr ""
#: client/gui-sdl/graphics.c:1012
#, c-format
msgid "Unable to initialize SDL library: %s"
-msgstr "No s'ha pogut inicialitzar la biblioteca SDL: %s"
+msgstr "No s'ha pogut inicialitzar la llibreria SDL: %s"
#: client/gui-sdl/graphics.c:1021
#, c-format
-msgid "Unable to initialize SDL_ttf library: %s"
-msgstr "No s'ha pogut inicialitzar la biblioteca SDL_ttf: %s"
+msgid "Unable to initialize SDL_ttf library: %s"
+msgstr "No s'ha pogut inicialitzar la llibreria SDL_ttf: %s"
#: client/gui-sdl/graphics.c:1058
#, c-format
@@ -13696,14 +13954,6 @@ msgstr "Inicialitzant client"
msgid "Waiting for the beginning of the game"
msgstr "Esperant el començament de la partida"
-#: client/gui-sdl/gui_string.c:608
-msgid ""
-"Couldn't find stdfont.ttf file. Please link/copy/move anyunicode ttf font to "
-"data dir as stdfont.ttf"
-msgstr ""
-"No s'ha pogut trobar l'arxiu stdfont.ttf. Sisplau enllaça/copia/mou un font "
-"ttf unicode qualsevol al directori de dades com a stdfont.ttf"
-
#. TRANS: Future Technology
#: client/gui-sdl/gui_tilespec.c:506
msgid "FT"
@@ -14294,12 +14544,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:1098 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1100 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:963
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
msgid "Start New Game"
msgstr "Començar una partida nova"
@@ -14416,8 +14666,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:1081
-#: client/gui-win32/connectdlg.c:1089 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
+#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
msgid "Update"
msgstr "Actualitzar"
@@ -14738,7 +14988,7 @@ msgstr "Tancar"
#: client/gui-win32/citydlg.c:821 client/gui-win32/wldlg.c:430
#: data/Freeciv.in:2001
msgid "Rename"
-msgstr "Renomenar"
+msgstr "Reanomenar"
#: client/gui-win32/citydlg.c:825 data/Freeciv.in:3062
msgid "Activate Units"
@@ -14875,10 +15125,6 @@ msgstr "Canviar tot"
msgid "Refresh"
msgstr "Refrescar"
-#: client/gui-win32/cityrep.c:882
-msgid "Select"
-msgstr "Seleccionar"
-
#: client/gui-win32/cityrep.c:883
msgid "Configure"
msgstr "Configurar"
@@ -14928,55 +15174,55 @@ msgstr "No s'ha pogut carregar el fitxer desat"
msgid "Verify Password"
msgstr "Verificar contrasenya"
-#: client/gui-win32/connectdlg.c:912 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr "Selecció del servidor de Freeciv"
-#: client/gui-win32/connectdlg.c:913
+#: client/gui-win32/connectdlg.c:915
msgid "Local Area Network"
msgstr "Xarxa d'Àrea Local"
-#: client/gui-win32/connectdlg.c:947
+#: client/gui-win32/connectdlg.c:949
msgid "Welcome to Freeciv"
msgstr "Benvingut a Freeciv"
-#: client/gui-win32/connectdlg.c:965
+#: client/gui-win32/connectdlg.c:967
msgid "Load Saved Game"
msgstr "Carregar Partida Desada"
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
msgid "Connect To Network Game"
msgstr "Connectar a Partida de Xarxa"
-#: client/gui-win32/connectdlg.c:977
+#: client/gui-win32/connectdlg.c:979
msgid "Choose a nation to play"
msgstr "Tria una nació per jugar "
-#: client/gui-win32/connectdlg.c:1012
+#: client/gui-win32/connectdlg.c:1014
msgid "Number of players (Including AI):"
msgstr "Nombre de jugadors (Inclosos IA):"
-#: client/gui-win32/connectdlg.c:1020
+#: client/gui-win32/connectdlg.c:1022
msgid "AI skill level:"
msgstr "nivell de l'IA:"
-#: client/gui-win32/connectdlg.c:1034 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
msgid "Game Options"
msgstr "Opcions de Partida"
-#: client/gui-win32/connectdlg.c:1038
+#: client/gui-win32/connectdlg.c:1040
msgid "Start Game"
msgstr "Iniciar la partida"
-#: client/gui-win32/connectdlg.c:1057
+#: client/gui-win32/connectdlg.c:1059
msgid "Login:"
msgstr "Login:"
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
msgid "Host:"
msgstr "Host:"
-#: client/gui-win32/connectdlg.c:1060
+#: client/gui-win32/connectdlg.c:1062
msgid "Port:"
msgstr "Port:"
@@ -15238,10 +15484,6 @@ msgid_plural "(idle %d turns)"
msgstr[0] "(aturat %d torn)"
msgstr[1] "(aturat %d torns)"
-#: client/gui-win32/plrdlg.c:337 data/Freeciv.in:88
-msgid "Host"
-msgstr "Host"
-
#: client/gui-win32/plrdlg.c:355 data/Freeciv.in:3230
msgid "Intelligence"
msgstr "Intel·ligència"
@@ -15293,7 +15535,7 @@ msgstr "Totals"
#: client/gui-win32/wldlg.c:362
msgid "Rename Worklist"
-msgstr "Renomenar llista de treball"
+msgstr "Reanomenar llista de treball"
#: client/gui-win32/wldlg.c:363 client/gui-xaw/wldlg.c:623
msgid "What should the new name be?"
@@ -16040,7 +16282,7 @@ msgstr "Tipus unitat Millorar Constr. Activa Escuts Menjar"
#: data/Freeciv.in:2006
msgid "Rename worklist"
-msgstr "Renomenar llista treball"
+msgstr "Reanomenar llista treball"
#: data/Freeciv.in:2075
msgid "Select new production"
@@ -16096,7 +16338,7 @@ msgstr " Vendre "
#: data/Freeciv.in:3058
msgid "Rename..."
-msgstr "Renomenar..."
+msgstr "Reanomenar..."
#: data/Freeciv.in:3064
msgid "Unit List..."
@@ -17043,19 +17285,18 @@ msgstr ""
#: data/helpdata.txt:781
msgid ""
-" To have a diplomatic relationship with another player, you must fist "
-"establish first contact with that player. To establish first contact, you "
-"have to move one of your units next to a city or unit belonging to that "
-"player, or vice versa. Unless you establish an embassy with that player, you "
-"may again lose contact with them after a set number of turns without direct "
-"physical contact."
+" To have a diplomatic relationship with another player, you must first "
+"establish contact with that player. To establish contact, you have to move "
+"one of your units next to a city or unit belonging to that player, or vice "
+"versa. Unless you establish an embassy with that player, you may again lose "
+"contact with them after a set number of turns without direct physical "
+"contact."
msgstr ""
" Per tenir una relació diplomà tica amb un altre jugador, primer has "
-"d'establir contacte amb aquest jugador. Per establir contacte per primer "
-"cop, has de moure una de les teves unitats al costat d'una ciutat o unitat "
-"que pertanyi a aquest jugador, o viceversa. Si no estableixes una ambaixada "
-"amb aquest jugador, pot ser que hi perdis el contacte al cap d'un nombre "
-"donat de torns sense contacte fÃsic directe."
+"d'establir-hi contacte. Per això, cal que moguis una de les teves unitats al "
+"costat d'una ciutat o unitat que pertanyi a aquest jugador, o viceversa. Si "
+"no estableixes una ambaixada amb aquest jugador, pot ser que hi perdis el "
+"contacte al cap d'un nombre donat de torns sense contacte fÃsic directe."
#: data/helpdata.txt:788
msgid ""
@@ -19945,7 +20186,7 @@ msgid "Communism"
msgstr "Comunisme"
#: data/default/governments.ruleset:121 data/civ2/governments.ruleset:118
-#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:26
+#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:27
msgid "Comrade"
msgstr "Camarada"
@@ -20931,6 +21172,10 @@ msgstr ""
"esforços, i un grup de Colons i/o Enginyers és molt vulnerable als atacs "
"enemics."
+#: data/default/units.ruleset:238
+msgid "?unit:Workers"
+msgstr "Treballadors"
+
#: data/default/units.ruleset:264
msgid ""
"Workers are one of the key units in the game. They can be used to irrigate "
@@ -21643,6 +21888,10 @@ msgstr "Explorador"
msgid "Explorers are very useful for mapping unknown territory."
msgstr "Els exploradors són molt útils per descobrir el territori."
+#: data/default/units.ruleset:1864
+msgid "?unit:Leader"
+msgstr "LÃder"
+
#: data/default/units.ruleset:1892
msgid "This is you. If you lose this unit, you lose the game. So don't."
msgstr ""
@@ -21927,7 +22176,7 @@ msgid "Emir"
msgstr "Emir"
#: data/nation/afghani.ruleset:25 data/nation/slovakian.ruleset:30
-#: data/nation/soviet.ruleset:27
+#: data/nation/soviet.ruleset:28
msgid "General Secretary"
msgstr "Secretari General"
@@ -22048,11 +22297,11 @@ msgstr "Armenis"
msgid ""
"According to legend, the Armenian people are the descendants of Haik - the "
"great-great-grandson of Noah. The modern Republic of Armenia gained "
-"independence from Soviet in 1991 AD"
+"independence from the Soviet Union in 1991."
msgstr ""
"Segons la llegenda, el poble armeni està format pels descendents de Haik - "
"el rebesnét de Noè. La república moderna d'Armènia va aconseguir la "
-"independència de la Unió Soviètica el 1991 d.C."
+"independència de la Unió Soviètica el 1991."
#: data/nation/assyrian.ruleset:3
msgid "Assyrian"
@@ -23129,18 +23378,17 @@ msgstr "Il·liris"
#: data/nation/illyrian.ruleset:6
msgid ""
-"Illyrians were Indo-European tribes who appeared in the western part of the "
-"Balkan Peninsula before 1000 BC, including the Dalmatians to the north, "
-"Corcyra island and Ambracia bay in prehistoric Epirus to the south, mixing "
-"with Thracians in Dardania to the east, and settling Messapia across the "
-"Adriatic Sea. Illyrian kingdoms were independent for centuries, until "
-"conquered by the Roman Republic."
+"Illyrians were Indo-European tribes who appeared in the western part of the "
+"Balkan Peninsula before 1000 BC, including Corcyra island and Ambracia bay "
+"in prehistoric Epirus to the south. They mixed with Thracians in Dardania to "
+"the east, and settled Messapia across the Adriatic Sea. Illyrian kingdoms "
+"were independent for centuries, until conquered by the Roman Republic."
msgstr ""
"Els il·liris eren tribus indoeuropees que van aparèixer a la part occidental "
-"de la penÃnsula dels Balcans abans de l'any 1000 a.C. Incloïen els dà lmates "
-"al nord, l'illa de Corcira i la badia d'Ambrà cia a l'Epir prehistòric al "
-"sud, barrejant-se amb tracis a Dardà nia cap a l'est, i colonitzant Messà pia "
-"a l'altra banda del Mar Adrià tic. Els regnes il·liris van ser independents "
+"de la penÃnsula dels Balcans abans de l'any 1000 a.C., incloent l'illa de "
+"Corcira i la badia d'Ambrà cia a l'Epir prehistòric cap al sud. Es van "
+"barrejar amb tracis a Dardà nia cap a l'est, i van colonitzar Messà pia a "
+"l'altra banda del Mar Adrià tic. Els regnes il·liris van ser independents "
"durant segles, fins que van ser conquerits per la República de Roma."
#: data/nation/inca.ruleset:3
@@ -23471,7 +23719,7 @@ msgstr ""
"dividida en dos estats, Corea del Nord i del Sud com a resultat de "
"l'armistici posterior a la guerra de Corea el 1953."
-#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:28
+#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:29
msgid "Great Leader"
msgstr "Gran LÃder"
@@ -23646,9 +23894,9 @@ msgstr "Malians"
msgid ""
"Sub-Saharan Africa has been a cultural and ethnical melting pot for "
"millennia. In medieval times, the region was home to a succession of empires "
-"called the Sahelian kingdoms. Of these, the Islamic Mali empire with it's "
+"called the Sahelian kingdoms. Of these, the Islamic Mali empire with its "
"capital in Timbuktu was the most influential. This empire reigned from the "
-"14th to the 17th century and was famed for it's wealth and benevolent kings. "
+"14th to the 17th century and was famed for its wealth and benevolent kings. "
"The modern Republic of Mali derives its name from this empire."
msgstr ""
"L'Àfrica subsahariana ha estat un gresol cultural i ètnic durant mil·lennis. "
@@ -23720,11 +23968,11 @@ msgstr "Maies"
#: data/nation/mayan.ruleset:6
msgid ""
-"The Mayans were a Mesoamerican civilization. Famous for building great "
-"pyramids and palaces in the jungle."
+"The Mayans were a Mesoamerican civilization. They are famous for building "
+"great pyramids and palaces in the jungle."
msgstr ""
-"Els Maies foren una civilització mesoamericana, actualment coneguda pels "
-"immensos palaus i pirà mides enmig de la jungla. "
+"Els Maies foren una civilització mesoamericana, Són famosos per haver "
+"construït grans palaus i pirà mides enmig de la jungla. "
#: data/nation/mayan.ruleset:19
msgid "Ajaw"
@@ -24280,6 +24528,14 @@ msgstr ""
"Eslovà quia és un paÃs situat al cor d'Europa. Antigament part de "
"Txecoslovà quia, fins el 1918 va ser part de l'imperi Austro-Hongarès."
+#: data/nation/slovakian.ruleset:26
+msgid "?male:Leader"
+msgstr "LÃder"
+
+#: data/nation/slovakian.ruleset:26
+msgid "?female:Leader"
+msgstr "LÃder"
+
#: data/nation/slovakian.ruleset:29
msgid "Pope"
msgstr "Papa"
@@ -24327,18 +24583,19 @@ msgstr "Soviètics"
#: data/nation/soviet.ruleset:6
msgid ""
-"Soviet Union's history starts in November 1917, when under Lenin's "
+"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 "
-"republics integrated into one country. Soviet Union became one of most "
-"powerful states in the 20th century. But by the end of 1991 due to many "
-"social shocks it disintegrated into fifteen independent countries"
+"republics integrated into one country. The Soviet Union became one of most "
+"powerful states in the 20th century, but by the end of 1991 it had "
+"disintegrated into fifteen independent countries due to social and economic "
+"problems."
msgstr ""
"La història de la Unió Soviètica comença el Novembre de 1917, quan Lenin "
"lidera una revolució bolxevic. El 31 de desembre de 1922, 4 repúbliques "
"soviètiques es van integrar en un paÃs. La Unió Soviètica es va convertir en "
-"un dels estats més poderosos del segle XX. Però cap a finals de 1991, degut "
-"a múltiples tensions socials, es va desintegrar en quinze països "
-"independents diferents."
+"un dels estats més poderosos del segle XX, però cap a finals de 1991 es va "
+"desintegrar en quinze països independents diferents degut a problemes "
+"socials i econòmics."
#: data/nation/spanish.ruleset:3
msgid "Spanish"
@@ -24774,8 +25031,8 @@ msgstr "Westfalians"
#: data/nation/westphalian.ruleset:6
msgid ""
-"Westphalia, before becoming a Prussian province, was the western region the "
-"duchy of Saxony. Present-day it consists of the Northern part of the largest "
+"Westphalia, before becoming a Prussian province, was the western region of "
+"the duchy of Saxony. Today it makes up the northern part of the largest "
"German federal state, North Rhine-Westphalia."
msgstr ""
"Westfà lia, abans de convertir-se en una provÃncia de Prússia, era la regió "
@@ -24971,21 +25228,21 @@ msgid ""
"The flag and background color indicate what civilization the city\n"
"belongs to (this will be useful when you meet other civilizations).\n"
"The top row of the bar also shows the name and size of the city, and\n"
-"will show one or more starts to indicate if there are units in the\n"
+"will show one or more stars to indicate if there are units in the\n"
"city. The bottom row shows what the city is building, and how long it\n"
"will take; it also shows how long the city will take to grow to the\n"
"next largest size."
msgstr ""
"Una altra ciutat! Ja ho comences a dominar. Segur que ara mateix\n"
-"ja saps que fer amb les ciutats recent creades. Fixat un moment \n"
+"ja saps què fer amb les ciutats acabades de crear. Fixa't un moment \n"
"en la barra que hi ha a sota de la ciutat en el mapa. Mostra \n"
"informació força útil de la ciutat. La bandera i el color de fons \n"
-"assenyalen a quina civilització pertany (et serà útil quan contactis\n"
-"amb altres civilitzacions). La primera lÃnia de la barra mostra el nom\n"
-"i la mida de la ciutat, i hi haurà estrelles indicant la presència "
-"d'unitats\n"
-"a dintre de la ciutat. La segona lÃnia mostra què s'està construint a la \n"
-"ciutat, quan trigarà a construir-ho i quan trigarà la ciutat a créixer."
+"indiquen a quina civilització pertany (et serà útil quan contactis amb\n"
+"d'altres civilitzacions). La primera lÃnia de la barra també mostra el nom\n"
+"i la mida de la ciutat, i hi haurà una o més estrelles que indiquen si hi\n"
+"ha unitats dins de la ciutat. La lÃnia de sota mostra què s'està construint\n"
+"a la ciutat, i quant trigarà a construir-ho; també mostra quant trigarà \n"
+"la ciutat a créixer."
#: data/scenario/tutorial.sav:96
msgid ""
@@ -25070,7 +25327,7 @@ msgid ""
"Now your city has grown to size five. As cities get larger unrest\n"
"becomes a problem. A city of this size will usually have one unhappy\n"
"citizen unless pacifying effects are used; meaning one entertainer\n"
-"specialist is required to keep your citzens content. This is basically\n"
+"specialist is required to keep your citizens content. This is basically\n"
"a wasted citizen.\n"
"\n"
"There are several things that can be done about this. One quick fix\n"
@@ -25192,19 +25449,19 @@ msgid ""
"existing cities. Generally when building new cities you want to make\n"
"sure that all tiles are covered by at least one city, but after that\n"
"it is best that your cities overlap as little as possible. Spreading\n"
-"out cities properly gives each city access to more resrouces, allowing\n"
+"out cities properly gives each city access to more resources, allowing\n"
"them to grow to larger sizes."
msgstr ""
-"Pots fer servir els teus segons Colons per fundar una nova ciutat.\n"
+"Els segons Colons també han de servir per fundar una nova ciutat.\n"
"Fixa't que quan mous els Colons lluny de les teves ciutats es\n"
"dibuixa un contorn al seu voltant. Això marca el tros de territori\n"
-"que agafaria la ciutat si la fundessis en aquesta posició; concorda\n"
+"que cobriria la ciutat si la fundessis en aquesta posició; concorda\n"
"amb el contorn que ja està dibuixat al mapa i que mostra quines\n"
"caselles estan cobertes per les ciutats que ja tens. Normalment,\n"
"quan fundes noves ciutats, vols assegurar-te que totes les\n"
"caselles estiguin cobertes per almenys una ciutat, però després\n"
"d'això, el millor és que les teves ciutats es cavalquin tan poc com\n"
-"sigui possible. Si s'escampen les ciutats de manera apropiada, cada\n"
+"sigui possible. Si es reparteixen les ciutats de manera apropiada, cada\n"
"ciutat tindrà accés a més recursos, permetent que creixin més."
#: data/scenario/tutorial.sav:245
diff --git a/po/cs.gmo b/po/cs.gmo
index 239537e..254c99d 100644
Binary files a/po/cs.gmo and b/po/cs.gmo differ
diff --git a/po/cs.po b/po/cs.po
index 66cb71f..dffb41c 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: freeciv 2.0.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 07:45+0900\n"
+"POT-Creation-Date: 2009-03-29 21:13+0900\n"
"PO-Revision-Date: 2008-01-21 15:42+0100\n"
"Last-Translator: Dusan Hokuv <dusan at mirc.cz>\n"
"Language-Team: Czech <cs at li.org>\n"
@@ -693,7 +693,7 @@ msgid "Road"
msgstr "Cesta"
#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
-#: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
+#: client/gui-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"
@@ -710,7 +710,7 @@ msgid "Mine"
msgstr "Důl"
#: common/terrain.c:396 common/unit.c:548 server/report.c:124
-#: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
+#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr "ZneÄiÅ¡tÄ›nÃ"
@@ -756,7 +756,7 @@ msgstr "Opevněný"
msgid "Sentry"
msgstr "Stráž"
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:851 client/gui-sdl/menu.c:648
+#: common/unit.c:566 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"
@@ -773,7 +773,7 @@ msgstr "Prozkoumat"
msgid "Transform"
msgstr "Transformovat"
-#: common/unit.c:584 client/text.c:106 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:584 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ý"
@@ -842,11 +842,11 @@ msgstr "Jaderná střela"
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1406
+#: common/unittype.c:349 client/helpdata.c:1404
msgid " and "
msgstr " a "
-#: common/unittype.c:355 client/helpdata.c:1392
+#: common/unittype.c:355 client/helpdata.c:1390
msgid "?and:, "
msgstr "?and:, "
@@ -1427,30 +1427,25 @@ msgstr ""
#: server/auth.c:281
#, fuzzy, c-format
-msgid "Auth config filename \"%s\" not allowed!"
-msgstr "Toto jméno nenà povoleno."
-
-#: server/auth.c:286
-#, fuzzy, c-format
msgid "Cannot load auth config file \"%s\"!"
msgstr "Nelze nalézt zvukový soubor %s"
-#: server/auth.c:397
+#: server/auth.c:392
#, c-format
msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
msgstr ""
"UpozornÄ›nÃ: jméno hosta '%s' je obsazené, pÅ™ejmenovánà na uživatele '%s'."
-#: server/auth.c:404
+#: server/auth.c:399
msgid "Guests are not allowed on this server. Sorry."
msgstr "Hosté nejsou povoleni na tomto serveru. Lituji."
-#: server/auth.c:406
+#: server/auth.c:401
#, fuzzy, c-format
msgid "%s was rejected: Guests not allowed."
msgstr "%s byl(a) odmÃtnut(a): NesouhlasÃcà vlastnosti."
-#: server/auth.c:425
+#: server/auth.c:420
#, c-format
msgid ""
"There was an error reading the user database, logging in as guest connection "
@@ -1459,7 +1454,7 @@ msgstr ""
"Objevila se chyba pÅ™i Ätenà databáze uživatelů, pÅ™ihlášenà jako pÅ™ipojenà "
"hosta '%s'."
-#: server/auth.c:431
+#: server/auth.c:426
msgid ""
"There was an error reading the user database and guest logins are not "
"allowed. Sorry"
@@ -1467,39 +1462,39 @@ msgstr ""
"Objevila se chyba pÅ™i Ätenà z databáze uživatelů a pÅ™ihlášenà hostů nenà "
"povoleno. Lituji"
-#: server/auth.c:434
+#: server/auth.c:429
#, c-format
msgid "%s was rejected: Database error and guests not allowed."
msgstr ""
-#: server/auth.c:441
+#: server/auth.c:436
#, c-format
msgid "Enter password for %s:"
msgstr "Zadejte heslo pro %s:"
-#: server/auth.c:450
+#: server/auth.c:445
msgid "Enter a new password (and remember it)."
msgstr "Zadejte nové heslo (a zapamatujte si ho)."
-#: server/auth.c:456
+#: server/auth.c:451
msgid "This server allows only preregistered users. Sorry."
msgstr "Tento server umožňuje jen předregistrované uživatele. Lituji."
-#: server/auth.c:459
+#: server/auth.c:454
#, fuzzy, c-format
msgid "%s was rejected: Only preregister users allowed."
msgstr "Tento server umožňuje jen předregistrované uživatele. Lituji."
-#: server/auth.c:488 server/auth.c:547
+#: server/auth.c:483 server/auth.c:542
msgid "Sorry, too many wrong tries..."
msgstr "Lituji, pÅ™ÃliÅ¡ mnoho Å¡patných pokusů..."
-#: server/auth.c:489
+#: server/auth.c:484
#, c-format
msgid "%s was rejected: Too many wrong password verifies for new user."
msgstr ""
-#: server/auth.c:505
+#: server/auth.c:500
msgid ""
"Warning: There was an error in saving to the database. Continuing, but your "
"stats will not be saved."
@@ -1507,32 +1502,32 @@ msgstr ""
"UpozornÄ›nÃ: Vyskytla se chyba pÅ™i ukládánà do databáze. PokraÄujeme, ale "
"vaše statistisky nebudou uloženy."
-#: server/auth.c:549
+#: server/auth.c:544
#, fuzzy, c-format
msgid "%s was rejected: Too many wrong password tries."
msgstr "%s byl(a) odmÃtnut(a): NesouhlasÃcà vlastnosti."
-#: server/auth.c:558
+#: server/auth.c:553
msgid "Your password is incorrect. Try again."
msgstr "Vaše heslo je nesprávné. Zkuste to znovu."
-#: server/auth.c:569
+#: server/auth.c:564
#, fuzzy
msgid "Sorry, your connection timed out..."
msgstr "Lituji, propojenà letectvem nenà ještě implementováno."
-#: server/auth.c:571
+#: server/auth.c:566
#, c-format
msgid "%s was rejected: Connection timeout waiting for password."
msgstr ""
-#: server/auth.c:636
+#: server/auth.c:631
#, c-format
msgid "Your password is too short, the minimum length is %d. Try again."
msgstr ""
"VaÅ¡e heslo je pÅ™ÃliÅ¡ krátké, minimálnà délka je %d znaků. Zkuste to znovu."
-#: server/auth.c:642
+#: server/auth.c:637
#, c-format
msgid ""
"The password must have at least %d capital letters, %d numbers, and be at "
@@ -2046,7 +2041,7 @@ msgstr "Toto je server pro %s"
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:237 manual/civmanual.c:380
+#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
@@ -2077,14 +2072,14 @@ msgstr ""
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:241
+#: server/civserver.c:217 client/civclient.c:242
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:245
+#: server/civserver.c:221 client/civclient.c:246
msgid " -d, --debug NUM\tSet debug log level (0 to 3)\n"
msgstr " -d, --debug ÄŒÃSLO\tNastav úroveň logovánà (0 až 3)\n"
@@ -2092,7 +2087,7 @@ msgstr " -d, --debug ÄŒÃSLO\tNastav úroveň logovánà (0 až 3)\n"
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:248 manual/civmanual.c:382
+#: server/civserver.c:225 client/civclient.c:249 manual/civmanual.c:382
msgid " -h, --help\t\tPrint a summary of the options\n"
msgstr " -h, --help\t\tVytiskne přehled voleb\n"
@@ -2143,11 +2138,11 @@ msgstr " -r, --read SOUBOR\tPÅ™eÄte spouÅ¡tÄ›c skript ze souboru SOUBOR\n"
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:267 manual/civmanual.c:383
+#: server/civserver.c:247 client/civclient.c:268 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:279
+#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, fuzzy, c-format
@@ -3387,7 +3382,7 @@ msgstr ""
"NámoÅ™nà jednotky pÅ™idÄ›lované na zaÄátku hry nejsou podporovány. Nikdo "
"nedostal jednotku %s."
-#: server/gamehand.c:310 client/text.c:632
+#: server/gamehand.c:310 client/text.c:691
#, c-format
msgid "Year: %s"
msgstr "Rok: %s"
@@ -3663,10 +3658,10 @@ 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
-#, c-format
+#, fuzzy, c-format
msgid ""
-"Your nation is thrust into civil war, %s is declared the leader of the "
-"rebel states."
+"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
@@ -3764,7 +3759,7 @@ msgstr "Rychlost výzkumu"
msgid "Literacy"
msgstr "Gramotnost"
-#: server/report.c:121 client/cityrepdata.c:526 client/cityrepdata.c:527
+#: server/report.c:121 client/cityrepdata.c:524 client/cityrepdata.c:525
#: client/gui-sdl/cityrep.c:174
msgid "Production"
msgstr "Produkce"
@@ -3918,7 +3913,7 @@ 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:766
+#: server/report.c:743 server/report.c:768
msgid "Demographics Report:"
msgstr "Demografický přehled"
@@ -3926,10 +3921,12 @@ msgstr "Demografický přehled"
msgid "Sorry, the Demographics report is unavailable."
msgstr "Lituji, ale demografický přehled nenà k dispozici."
-#: server/report.c:748
-#, c-format
-msgid "The %s of the %s (%s)"
-msgstr "%s %s (%s)"
+#. TRANS: <nation adjective> <government name> (<year>).
+#. * E.g. "Polish Despotism (200 AD)".
+#: server/report.c:750
+#, fuzzy, c-format
+msgid "%s %s (%s)"
+msgstr "%s ve městě %s (%s)\n"
#. TRANS: message about an installation error.
#: server/ruleset.c:163
@@ -3984,14 +3981,6 @@ msgstr ""
msgid "%s had invalid nation; changing to %s."
msgstr ""
-#. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4073
-#, fuzzy, c-format
-msgid ""
-"Illegal alliance structure detected: %s alliance to %s reduced to peace "
-"treaty."
-msgstr "Neplatná struktura aliance: Aliance %s s %s byla redukována na mÃr."
-
#: server/settings.c:32
msgid "Geological"
msgstr "Geologické"
@@ -5212,9 +5201,10 @@ msgid "Auto-save name prefix"
msgstr "Předpona automaticky ukládaných her"
#: server/settings.c:1016
+#, fuzzy
msgid ""
-"Automatically saved games will have name \"<prefix><year>.sav\". This "
-"setting sets the <prefix> part."
+"Automatically saved games will have name \"<prefix>-T<turn>-Y<year>.sav\". "
+"This setting sets the <prefix> part."
msgstr ""
"Automaticky ukládané hry budou mÃt jméno ve tvaru \"<pÅ™edpona><rok>.sav\". "
"Tato volba ovlivňuje Äást <pÅ™edpona>."
@@ -5233,11 +5223,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:147
+#: server/sernet.c:150
msgid "Server cannot read standard input. Ignoring input."
msgstr "Server nemůže ÄÃst ze standardnÃho vstupu. Ignorováno."
-#: server/sernet.c:922
+#: server/sernet.c:929
#, c-format
msgid "Server: bad address: [%s:%d]."
msgstr "Server: špatná adresa: [%s:%d]."
@@ -5359,112 +5349,112 @@ msgid ""
msgstr ""
"Váš týmový spoluhrÃ¡Ä %s vyhlásil válku %s. Jsme povinni zruÅ¡it alianci s %s."
-#: server/srv_main.c:928
+#: server/srv_main.c:961
#, c-format
msgid "Failed saving game as %s"
msgstr "Nepodařilo se uložit hru jako %s"
-#: server/srv_main.c:930
+#: server/srv_main.c:963
#, c-format
msgid "Game saved as %s"
msgstr "Hra uložena jako %s"
-#: server/srv_main.c:962
+#: server/srv_main.c:994
msgid "The game is already running."
msgstr "Hra již probÃhá."
-#: server/srv_main.c:970
+#: server/srv_main.c:1002
#, c-format
msgid "%s lost control cmdlevel on game start. Use voting from now on."
msgstr ""
-#: server/srv_main.c:977
+#: server/srv_main.c:1009
msgid "Starting game."
msgstr "Zahajuji hru."
-#: server/srv_main.c:1039
+#: server/srv_main.c:1071
#, c-format
msgid "request for unknown report (type %d)"
msgstr "požadavek pro neznámé hlášenà (typ %d)"
-#: server/srv_main.c:1104
+#: server/srv_main.c:1136
#, c-format
msgid "Warning: rejecting old client %s"
msgstr "UpozornÄ›nÃ: odmÃtnut starý klient %s"
-#: server/srv_main.c:1206
+#: server/srv_main.c:1238
#, 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:1306
+#: server/srv_main.c:1338
msgid "Please choose a non-blank name."
msgstr "ProsÃm zvolte si neprázdné jméno."
-#: server/srv_main.c:1322
+#: server/srv_main.c:1354
msgid "That nation is already in use."
msgstr "Tento národ je již použit."
-#: server/srv_main.c:1338
+#: server/srv_main.c:1370
#, 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:1359
+#: server/srv_main.c:1391
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:1458
+#: server/srv_main.c:1490
#, c-format
msgid "%s nation is not available in this scenario."
msgstr ""
-#: server/srv_main.c:1464
+#: server/srv_main.c:1496
#, c-format
msgid "%s nation is already in use."
msgstr "%s národ je již použit."
-#: server/srv_main.c:1482
+#: server/srv_main.c:1514
#, c-format
msgid "%s is the %s ruler %s."
msgstr "%s je %s vládce %s."
-#: server/srv_main.c:1538
+#: server/srv_main.c:1570
#, 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:1582 server/srv_main.c:1586
+#: server/srv_main.c:1614 server/srv_main.c:1618
#, 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:1728
+#: server/srv_main.c:1760
#, c-format
msgid "Player %d"
msgstr "HrÃ¡Ä %d"
-#: server/srv_main.c:1739 server/srv_main.c:1745
+#: server/srv_main.c:1771 server/srv_main.c:1777
#, c-format
msgid "%s rules the %s."
msgstr "%s vládne %s."
-#: server/srv_main.c:1910
+#: server/srv_main.c:1942
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
msgstr ""
-#: server/srv_main.c:1961
+#: server/srv_main.c:1993
#, c-format
msgid "Sending info to metaserver [%s]"
msgstr "PosÃlám info metaserveru [%s]"
-#: server/srv_main.c:1992
+#: server/srv_main.c:2024
msgid "The game is over..."
msgstr "Hra je u konce..."
-#: server/srv_main.c:2205
+#: server/srv_main.c:2237
msgid "Now accepting new client connections."
msgstr "Nynà pÅ™ijÃmám spojenà od klientů."
@@ -6275,24 +6265,24 @@ msgid "Barbarian"
msgstr "Barbar"
#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2030 client/gui-sdl/plrdlg.c:645
+#: client/gui-gtk-2.0/pages.c:2102 client/gui-sdl/plrdlg.c:645
#: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
msgid "AI"
msgstr "PoÄÃtaÄ"
#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
+#: 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
msgid "Human"
msgstr "Člověk"
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
-#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
+#: 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
msgid "Alive"
msgstr "AktivnÃ"
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
#: client/gui-win32/connectdlg.c:200
msgid "Dead"
msgstr "Mrtvý"
@@ -6560,9 +6550,9 @@ 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:242
-#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
-#: client/text.c:1201
+#: 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
#, c-format
msgid "?clistmore:, %s"
msgstr ", %s"
@@ -6817,7 +6807,7 @@ msgstr "Pouze %s může útoÄit z moÅ™e."
msgid "Cannot attack from sea."
msgstr "Nelze útoÄit z moÅ™e."
-#: server/unithand.c:996 server/unittools.c:2103
+#: server/unithand.c:996 server/unittools.c:2137
msgid "Cannot attack unless you declare war first."
msgstr "Nelze útoÄit dokud nevyhlásÃte válku."
@@ -6919,101 +6909,101 @@ msgid "%s was upgraded for free to %s."
msgstr "Jednotka %s vylepšena zdarma na %s."
#: server/unittools.c:297
-#, c-format
-msgid "Not enough gold. %s disbanded"
+#, fuzzy, c-format
+msgid "Not enough gold to pay upkeep for %s. Unit disbanded."
msgstr "Nedostatek zlata. %s zrušeni."
-#: server/unittools.c:342
+#: server/unittools.c:343
#, c-format
msgid "Your %s has run out of hit points."
msgstr "VaÅ¡Ã jednotce %s doÅ¡ly sÃly."
-#: server/unittools.c:358
+#: server/unittools.c:359
#, c-format
msgid "Your %s has been lost on the high seas."
msgstr "Jednotka %s se ztratila na moři."
-#: server/unittools.c:365
+#: server/unittools.c:366
#, c-format
msgid "Your %s survived on the high seas and became more experienced!"
msgstr "VaÅ¡e %s pÅ™ežila na moÅ™i a stala se zkuÅ¡enÄ›jÅ¡Ã!"
-#: server/unittools.c:376
+#: server/unittools.c:377
#, c-format
msgid "Your %s has been lost on unsafe terrain."
msgstr "Jednotka %s se ztratila v nebezpeÄném terénu."
-#: server/unittools.c:430
+#: server/unittools.c:431
#, c-format
msgid "Your %s has returned to refuel."
msgstr "Jednotka %s se vrátila dotankovat."
-#: server/unittools.c:454
+#: server/unittools.c:455
#, c-format
msgid "Your %s has run out of fuel."
msgstr "Jednotce %s došlo palivo."
-#. TRANS: And, <the unit> became ...
-#: server/unittools.c:616
-#, fuzzy
-msgid "And, became more experienced!"
-msgstr " a stala se vÃce zkuÅ¡enou!"
-
#. TRANS: Your <unit> became ...
-#: server/unittools.c:620
+#: server/unittools.c:619
#, c-format
msgid "Your %s became more experienced!"
msgstr "Váš %s se stal zkuÅ¡enÄ›jÅ¡Ã!"
-#: server/unittools.c:1011
+#: server/unittools.c:1009
#, c-format
msgid "Teleported your %s to %s."
msgstr "Teleportována jednotka %s do %s."
-#: server/unittools.c:1041
+#. TRANS: A unit is moved to resolve stack conflicts.
+#: server/unittools.c:1065
+#, fuzzy, c-format
+msgid "Moved your %s."
+msgstr "Rozpuštěn náš %s."
+
+#: server/unittools.c:1076
#, c-format
msgid "Disbanded your %s."
msgstr "Rozpuštěn náš %s."
-#: server/unittools.c:1363
+#: server/unittools.c:1397
#, c-format
msgid "Unable to defend %s, %s has lost the game."
msgstr "Nelze bránit %s, %s prohrál hru."
-#: server/unittools.c:1367
+#: server/unittools.c:1401
#, 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:1469
+#: server/unittools.c:1503
#, 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:1478
+#: server/unittools.c:1512
#, c-format
msgid "%s lost when %s was lost."
msgstr "Jednotka %s ztracena spolu s jednotkou %s."
-#: server/unittools.c:1527
+#: server/unittools.c:1561
#, 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:1545
+#: server/unittools.c:1579
#, 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:1554 server/unittools.c:1612
+#: server/unittools.c:1588 server/unittools.c:1646
#, 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:1588
+#: server/unittools.c:1622
#, fuzzy, c-format
msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
msgid_plural ""
@@ -7024,14 +7014,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:1621
+#: server/unittools.c:1655
#, 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:1636
+#: server/unittools.c:1670
#, fuzzy, c-format
msgid "%s (and %s) lost to an attack from the %s %s."
msgstr "%s (%s) ztracena při útoku %s %s."
@@ -7039,7 +7029,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:1646
+#: server/unittools.c:1680
#, 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."
@@ -7050,7 +7040,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:1660
+#: server/unittools.c:1694
#, 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."
@@ -7058,190 +7048,190 @@ 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:1928
+#: server/unittools.c:1962
#, c-format
msgid "Your %s was nuked by %s."
msgstr "Na náš %s podnikli %s jaderný útok!"
-#: server/unittools.c:1931 server/unittools.c:1947
+#: server/unittools.c:1965 server/unittools.c:1981
msgid "yourself"
msgstr "Vy"
-#: server/unittools.c:1935
+#: server/unittools.c:1969
#, fuzzy, c-format
msgid "The %s %s was nuked."
msgstr "Na %s %s byl proveden jaderný útok."
-#: server/unittools.c:1944
+#: server/unittools.c:1978
#, c-format
msgid "%s was nuked by %s."
msgstr "Na %s podnikli %s jaderný útok!"
-#: server/unittools.c:1952
+#: server/unittools.c:1986
#, c-format
msgid "You nuked %s."
msgstr "Při atomovém útoku jste ozářil(a) město %s."
-#: server/unittools.c:1993
+#: server/unittools.c:2027
#, fuzzy, c-format
msgid "The %s detonated a nuke!"
msgstr "%s odpálili atomovou zbraň."
-#: server/unittools.c:2017
+#: server/unittools.c:2051
#, c-format
msgid "%s transported successfully."
msgstr "Jednotka %s byla úspěšně transportována."
-#: server/unittools.c:2069
+#: server/unittools.c:2103
msgid "This unit type can not be paradropped."
msgstr "Tento typ jednotky nemůže provést výsadek."
-#: server/unittools.c:2079
+#: server/unittools.c:2113
#, fuzzy
msgid "You cannot paradrop a unit that is transporting other units."
msgstr "Nelze provést výsadek transportnà jednotky."
-#: server/unittools.c:2085
+#: server/unittools.c:2119
msgid "The destination location is not known."
msgstr "CÃlová oblast nenà prozkoumána."
-#: server/unittools.c:2092
+#: server/unittools.c:2126
#, c-format
msgid "This unit cannot paradrop into %s."
msgstr "Tato jednotka nemůže provést výsadek do %s."
-#: server/unittools.c:2112
+#: server/unittools.c:2146
#, 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:2123
+#: server/unittools.c:2157
#, c-format
msgid "Your %s paradropped into the %s and was lost."
msgstr "Jednotka %s vysazena do %s a ztracena."
-#: server/unittools.c:2136
+#: server/unittools.c:2170
#, 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:2158
+#: server/unittools.c:2192
#, c-format
msgid "You found %d gold."
msgstr "Nalezli jsme %d zlatých."
-#: server/unittools.c:2175
+#: server/unittools.c:2209
#, 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:2182
+#: server/unittools.c:2216
#, 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:2196
+#: server/unittools.c:2230
msgid "A band of friendly mercenaries joins your cause."
msgstr "Připojila se k vám skupina žoldáků."
-#: server/unittools.c:2214
+#: server/unittools.c:2248
msgid "An abandoned village is here."
msgstr "Nalezli jsme opuštěnou osadu."
-#: server/unittools.c:2224
+#: server/unittools.c:2258
msgid "You have unleashed a horde of barbarians!"
msgstr "Vyrušili jsme skupinu barbarů!"
-#: server/unittools.c:2227
+#: server/unittools.c:2261
#, c-format
msgid "Your %s has been killed by barbarians!"
msgstr "Jednotka %s byla zniÄena barbary!"
-#: server/unittools.c:2243
+#: server/unittools.c:2277
msgid "You found a friendly city."
msgstr "Nalezli jsme přátelské město."
-#: server/unittools.c:2257
+#: server/unittools.c:2291
#, 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:2282
+#: server/unittools.c:2316
#, 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:2540
+#: server/unittools.c:2574
#, 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:2989
+#: server/unittools.c:3023
#, 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:3041
+#: server/unittools.c:3075
#, 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:3054
+#: server/unittools.c:3088
#, 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:3068
+#: server/unittools.c:3102
#, 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:3078
+#: server/unittools.c:3112
#, 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:3104
+#: server/unittools.c:3138
#, 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:3145
+#: server/unittools.c:3179
#, 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:3156
+#: server/unittools.c:3190
#, c-format
msgid "Attempt to establish trade route for %s failed."
msgstr ""
-#: server/unittools.c:3168
+#: server/unittools.c:3202
#, c-format
msgid "Attempt to build wonder for %s failed."
msgstr ""
-#: server/unittools.c:3177
+#: server/unittools.c:3211
#, c-format
msgid "Your %s has invalid orders."
msgstr "Jednotka %s má neplatné rozkazy."
-#: server/generator/mapgen.c:1737
+#: 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."
-#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
+#: server/generator/mapgen.c:1969 server/generator/mapgen.c:2039
#, c-format
msgid "Falling back to generator %d."
msgstr "Návrat zpět ke generátoru %d."
-#: server/generator/mapgen.c:2025
+#: server/generator/mapgen.c:2059
msgid "Generator 3 didn't place all big islands."
msgstr "Generátoru 3 se nepodaÅ™ilo rozmÃstit vÅ¡echny velké ostrovy."
-#: server/generator/mapgen.c:2054
+#: server/generator/mapgen.c:2088
#, c-format
msgid "Generator 3 left %li landmass unplaced."
msgstr "Generátor 3 nezozmÃstil %li pevniny."
@@ -7352,7 +7342,7 @@ msgstr[0] "%3d tah"
msgstr[1] "%3d tahy"
msgstr[2] "%3d tahů"
-#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:631
#: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
@@ -7471,351 +7461,351 @@ msgstr "?city_state:MÃr"
msgid "(worklist)"
msgstr "(seznam pracÃ)"
-#: client/cityrepdata.c:447
-msgid "Special"
-msgstr "SpeciálnÃ"
-
-#: client/cityrepdata.c:448
-msgid "?entertainers/scientists/taxmen:E/S/T"
-msgstr "?entertainers/scientists/taxmen:B/V/D"
+#: client/cityrepdata.c:446
+msgid "?city:Name"
+msgstr "?city:Jméno"
-#: client/cityrepdata.c:449
-msgid "Entertainers, Scientists, Taxmen"
-msgstr "BaviÄi, VÄ›dci, VýbÄ›rÄà danÃ"
+#: client/cityrepdata.c:446 client/gui-sdl/cityrep.c:169
+msgid "City Name"
+msgstr "Jméno města"
-#: client/cityrepdata.c:452
+#: client/cityrepdata.c:448
#, fuzzy
-msgid "Concise + Rapture, - Disorder"
-msgstr "StruÄnÄ› + Oslavuje, - Nepokoj"
+msgid "?size [short]:Sz"
+msgstr "?size:Vel"
+
+#: client/cityrepdata.c:448
+msgid "Size"
+msgstr "Velikost"
-#: client/cityrepdata.c:454 client/plrdlg_common.c:261
+#: client/cityrepdata.c:450 client/plrdlg_common.c:261
#: client/gui-win32/plrdlg.c:337
msgid "State"
msgstr "Stav"
-#: client/cityrepdata.c:454
+#: client/cityrepdata.c:450
msgid "Rapture/Peace/Disorder"
msgstr "Oslavuje/Klid/Nepokoj"
+#: client/cityrepdata.c:452
+#, fuzzy
+msgid "Concise *=Rapture, X=Disorder"
+msgstr "StruÄnÄ› + Oslavuje, - Nepokoj"
+
+#: client/cityrepdata.c:456
+msgid "Special"
+msgstr "SpeciálnÃ"
+
#: client/cityrepdata.c:457
+msgid "?entertainers/scientists/taxmen:E/S/T"
+msgstr "?entertainers/scientists/taxmen:B/V/D"
+
+#: client/cityrepdata.c:458
+msgid "Entertainers, Scientists, Taxmen"
+msgstr "BaviÄi, VÄ›dci, VýbÄ›rÄà danÃ"
+
+#: client/cityrepdata.c:461
msgid "?Happy workers:H"
msgstr "?Happy workers:Å "
-#: client/cityrepdata.c:457
+#: client/cityrepdata.c:461
msgid "Workers: Happy"
msgstr "PracovnÃci: ŠťastnÃ"
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
#, fuzzy
msgid "?Content workers:C"
msgstr "?Content workers:S"
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
msgid "Workers: Content"
msgstr "PracovnÃci: SpokojenÃ"
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
msgid "?Unhappy workers:U"
msgstr "?Unhappy workers:N"
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
msgid "Workers: Unhappy"
msgstr "PracovnÃci: NeÅ¡Å¥astnÃ"
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
#, fuzzy
msgid "?Angry workers:A"
msgstr "?Angry workers:R"
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
msgid "Workers: Angry"
msgstr "PracovnÃci: RozlobenÃ"
-#: client/cityrepdata.c:465 client/gui-xaw/citydlg.c:2401
-#: data/default/units.ruleset:238
-msgid "Workers"
+#: client/cityrepdata.c:469 client/gui-xaw/citydlg.c:2402
+#, fuzzy
+msgid "?city:Workers"
msgstr "PracovnÃci"
-#: client/cityrepdata.c:466
+#: client/cityrepdata.c:470
msgid "?happy/content/unhappy/angry:H/C/U/A"
msgstr "?happy/content/unhappy/angry:Å /S/N/R"
-#: client/cityrepdata.c:467
+#: client/cityrepdata.c:471
msgid "Workers: Happy, Content, Unhappy, Angry"
msgstr "PracovnÃci: ŠťastnÃ, SpokojenÃ, NeÅ¡Å¥astnÃ, RozlobenÃ"
-#: client/cityrepdata.c:470 client/cityrepdata.c:472
+#: client/cityrepdata.c:474 client/cityrepdata.c:476
msgid "Best"
msgstr "NejlepÅ¡Ã"
-#: client/cityrepdata.c:470
+#: client/cityrepdata.c:474
msgid "attack"
msgstr "útok"
-#: client/cityrepdata.c:471
+#: client/cityrepdata.c:475
msgid "Best attacking units"
msgstr "Nejlepšà útoÄné jednotky"
-#: client/cityrepdata.c:472
+#: client/cityrepdata.c:476
msgid "defense"
msgstr "obrana"
-#: client/cityrepdata.c:473
+#: client/cityrepdata.c:477
msgid "Best defending units"
msgstr "Nejlepšà obranné jednotky"
-#: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
-#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
-#: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
-#: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
-#: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
-#: client/gui-win32/menu.c:351 client/gui-win32/repodlgs.c:616
-#: client/gui-win32/repodlgs.c:707 client/gui-win32/repodlgs.c:716
-#: client/gui-xaw/menu.c:157 client/gui-xaw/menu.c:219
-#: client/gui-xaw/menu.c:242 client/gui-xaw/repodlgs.c:881
-#: client/gui-xaw/repodlgs.c:1069 data/Freeciv.in:1895 data/helpdata.txt:909
+#: client/cityrepdata.c:478 client/cityrepdata.c:482
+#: client/gui-gtk-2.0/cityrep.c:1437 client/gui-gtk-2.0/cityrep.c:1456
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-gtk-2.0/cityrep.c:1494
+#: client/gui-gtk-2.0/cityrep.c:1514 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/repodlgs.c:960 client/gui-sdl/helpdlg.c:688
+#: client/gui-sdl/mapctrl.c:1605 client/gui-sdl/optiondlg.c:1827
+#: client/gui-sdl/repodlgs.c:356 client/gui-win32/menu.c:351
+#: client/gui-win32/repodlgs.c:616 client/gui-win32/repodlgs.c:707
+#: client/gui-win32/repodlgs.c:716 client/gui-xaw/menu.c:157
+#: client/gui-xaw/menu.c:219 client/gui-xaw/menu.c:242
+#: client/gui-xaw/repodlgs.c:881 client/gui-xaw/repodlgs.c:1069
+#: data/Freeciv.in:1895 data/helpdata.txt:909
msgid "Units"
msgstr "Jednotky"
#. TRANS: Header "Number of units inside city"
-#: client/cityrepdata.c:476
+#: client/cityrepdata.c:480
#, fuzzy
msgid "?Present (units):Here"
msgstr "?Present (units):PÅ™Ãt"
-#: client/cityrepdata.c:477
+#: client/cityrepdata.c:481
msgid "Number of units present"
msgstr "PoÄet pÅ™Ãtomných jednotek"
#. TRANS: Header "Number of units supported by given city"
-#: client/cityrepdata.c:480
+#: client/cityrepdata.c:484
#, fuzzy
msgid "?Supported (units):Owned"
msgstr "?Supported (units):Podp"
-#: client/cityrepdata.c:481
+#: client/cityrepdata.c:485
msgid "Number of units supported"
msgstr "PoÄet poporovaných jednotek"
#. TRANS: Header "It will take this many turns before city grows"
-#: client/cityrepdata.c:484
+#: client/cityrepdata.c:488
msgid "?food (population):Grow"
msgstr "Růst"
-#: client/cityrepdata.c:485 client/cityrepdata.c:530
+#: client/cityrepdata.c:489 client/cityrepdata.c:528
#, fuzzy
msgid "?Stock/Target:(Have/Need)"
msgstr "(Hotovo/Potřeba)"
-#: client/cityrepdata.c:486
+#: client/cityrepdata.c:490
msgid "Turns until growth/famine"
msgstr "PoÄet tahů do růstu/hladomoru"
-#: client/cityrepdata.c:488
-#, fuzzy
-msgid "?size [short]:Sz"
-msgstr "?size:Vel"
-
-#: client/cityrepdata.c:488
-msgid "Size"
-msgstr "Velikost"
-
-#: client/cityrepdata.c:492
-msgid "?city:Name"
-msgstr "?city:Jméno"
-
-#: client/cityrepdata.c:492 client/gui-sdl/cityrep.c:169
-msgid "City Name"
-msgstr "Jméno města"
-
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
msgid "Surplus"
msgstr "Přebytek"
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
msgid "?food/production/trade:F/P/T"
msgstr "?food/production/trade:J/P/O"
-#: client/cityrepdata.c:496
+#: client/cityrepdata.c:494
msgid "Surplus: Food, Production, Trade"
msgstr "PÅ™ebytek: JÃdlo, Produkce, Obchod"
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
#, fuzzy
msgid "?Food surplus [short]:+F"
msgstr "?Food surplus [short]:+J"
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
msgid "Surplus: Food"
msgstr "PÅ™ebytek: JÃdlo"
-#: client/cityrepdata.c:500
+#: client/cityrepdata.c:498
#, fuzzy
msgid "?Production surplus [short]:+P"
msgstr "?Production surplus [short]:+P"
-#: client/cityrepdata.c:501
+#: client/cityrepdata.c:499
msgid "Surplus: Production"
msgstr "Přebytek: Produkce"
-#: client/cityrepdata.c:502
+#: client/cityrepdata.c:500
#, fuzzy
msgid "?Production loss (waste) [short]:-P"
msgstr "-P"
-#: client/cityrepdata.c:503
+#: client/cityrepdata.c:501
msgid "Waste"
msgstr "Odpad"
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
#, fuzzy
msgid "?Trade surplus [short]:+T"
msgstr "?Trade surplus [short]:+O"
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
msgid "Surplus: Trade"
msgstr "Přebytek: Obchod"
-#: client/cityrepdata.c:506
+#: client/cityrepdata.c:504
msgid "?Trade loss (corruption) [short]:-T"
msgstr "-O"
-#: client/cityrepdata.c:507
+#: client/cityrepdata.c:505
msgid "Corruption"
msgstr "Korupce"
-#: client/cityrepdata.c:509 client/gui-gtk-2.0/repodlgs.c:654
+#: client/cityrepdata.c:507 client/gui-gtk-2.0/repodlgs.c:654
#: client/gui-sdl/mapctrl.c:1400 client/gui-win32/repodlgs.c:334
#: client/gui-xaw/menu.c:222 client/gui-xaw/repodlgs.c:644
#: client/gui-xaw/repodlgs.c:773 data/Freeciv.in:1819
msgid "Economy"
msgstr "Ekonomika"
-#: client/cityrepdata.c:509
+#: client/cityrepdata.c:507
msgid "?gold/luxury/science:G/L/S"
msgstr "?gold/luxury/science:Z/L/V"
-#: client/cityrepdata.c:510
+#: client/cityrepdata.c:508
msgid "Economy: Gold, Luxuries, Science"
msgstr "Ekonomika: Zlato, Luxus, Věda"
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
msgid "?Gold:G"
msgstr "?Gold:Z"
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
msgid "Economy: Gold"
msgstr "Ekonomika: Zlato"
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
msgid "?Luxury:L"
msgstr "?Luxury:L"
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
msgid "Economy: Luxury"
msgstr "Ekonomika: Luxus"
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
msgid "?Science:S"
msgstr "?Science:V"
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
msgid "Economy: Science"
msgstr "Ekonomika: Věda"
-#: client/cityrepdata.c:518
+#: client/cityrepdata.c:516
#, fuzzy
msgid "?number_trade_routes:n"
msgstr "?number_trade_routes:O"
-#: client/cityrepdata.c:518
+#: client/cityrepdata.c:516
#, fuzzy
msgid "?number_trade_routes:R"
msgstr "?number_trade_routes:c"
-#: client/cityrepdata.c:519
+#: client/cityrepdata.c:517
msgid "Number of Trade Routes"
msgstr "PoÄet obchodnÃch cest"
-#: client/cityrepdata.c:521
+#: client/cityrepdata.c:519
msgid "?pollution [short]:Pol"
msgstr "?pollution [short]:Zne"
-#: client/cityrepdata.c:523
+#: client/cityrepdata.c:521
msgid "?cma:Governor"
msgstr "?cma:Guvernér"
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
-#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
-#: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
-#: data/Freeciv.in:1459 data/helpdata.txt:820
+#: client/cityrepdata.c:521 client/gui-gtk-2.0/cityrep.c:1766
+#: client/gui-sdl/citydlg.c:3809 client/gui-sdl/cma_fe.c:858
+#: client/gui-win32/citydlg.c:726 data/Freeciv.in:1459 data/helpdata.txt:820
#, fuzzy
msgid "Citizen Governor"
msgstr "Guvernér"
-#: client/cityrepdata.c:526
+#: client/cityrepdata.c:524
#, fuzzy
msgid "Turns/Buy"
msgstr "Kol/Cena"
-#: client/cityrepdata.c:529 client/cityrepdata.c:531
+#: client/cityrepdata.c:527 client/cityrepdata.c:529
msgid "Currently Building"
msgstr "PrávÄ› stavÃ"
-#: client/cityrepdata.c:575
+#: client/cityrepdata.c:573
msgid "?specialist:S"
msgstr "?specialist:S"
-#: client/cityrepdata.c:578
+#: client/cityrepdata.c:576
#, fuzzy
msgid "Specialists"
msgstr "Specialisté"
-#: client/civclient.c:239
+#: client/civclient.c:240
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr " -a, --autoconnect\tVynechat připojovacà dialog\n"
-#: client/civclient.c:249
+#: client/civclient.c:250
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:251
+#: client/civclient.c:252
msgid " -m, --meta HOST\tConnect to the metaserver at HOST\n"
msgstr " -m, --meta HOST\tPřipojit k metaserveru HOST\n"
-#: client/civclient.c:253
+#: client/civclient.c:254
msgid " -n, --name NAME\tUse NAME as name\n"
msgstr " -n, --name JMÉNO\tPoužÃt jméno JMÉNO\n"
-#: client/civclient.c:255
+#: client/civclient.c:256
#, 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:257
+#: client/civclient.c:258
#, 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:259
+#: client/civclient.c:260
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:262
+#: client/civclient.c:263
#, 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:264
+#: client/civclient.c:265
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:265
+#: client/civclient.c:266
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:268
+#: client/civclient.c:269
#, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -7825,144 +7815,154 @@ msgstr ""
"\t\t\tZkuste \"%s -- --help\" pro dalšà informace.\n"
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:273
+#: client/civclient.c:274
#, fuzzy, c-format
msgid "Report bugs at %s\n"
msgstr "Chyby hlašte na <%s>.\n"
-#: client/civclient.c:297
+#: client/civclient.c:298
#, c-format
msgid "Invalid port \"%s\" specified with --port option.\n"
msgstr "Neplatný port \"%s\" urÄený s --port volbou.\n"
-#: client/civclient.c:299 client/civclient.c:314
+#: client/civclient.c:300 client/civclient.c:315
msgid "Try using --help.\n"
msgstr "Zkuste použÃt --help.\n"
-#: client/civclient.c:312
+#: client/civclient.c:313
#, 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:325
+#: client/civclient.c:326
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr "Neznámá volba: \"%s\"\n"
-#: client/civclient.c:539
+#: client/civclient.c:391
+#, fuzzy, c-format
+msgid "Updating old metaserver address \"%s\"."
+msgstr "metaserver <adresa>"
+
+#: client/civclient.c:394
+#, fuzzy, c-format
+msgid "Default metaserver has been set to \"%s\"."
+msgstr "Volba: %s byla nastavena na \"%s\"."
+
+#: client/civclient.c:550
msgid "Game started."
msgstr "Hra spuštěna."
-#: client/civclient.c:577
+#: client/civclient.c:588
msgid "There was an error while auto connecting; aborting."
msgstr "PÅ™i autoamtickém spojenà nastala chyba; konÄÃm."
-#: client/climisc.c:176
+#: client/climisc.c:177
#, fuzzy, c-format
msgid "Changing production of every %s into %s."
msgstr "MÄ›nÃm výrobu z %s na %s."
-#: client/climisc.c:214
+#: client/climisc.c:215
msgid "?embassy:Both"
msgstr "?embassy:ObÄ›"
-#: client/climisc.c:216
+#: client/climisc.c:217
msgid "?embassy:Yes"
msgstr "?embassy:Ano"
-#: client/climisc.c:219
+#: client/climisc.c:220
msgid "?embassy:With Us"
msgstr "?embassy:S námi"
-#: client/climisc.c:222
+#: client/climisc.c:223
msgid "?embassy:Contact"
msgstr "?embassy:Kontakt"
-#: client/climisc.c:224
+#: client/climisc.c:225
msgid "?embassy:No Contact"
msgstr "?embassy:Bez kontaktu"
-#: client/climisc.c:236
+#: client/climisc.c:237
msgid "?vision:Both"
msgstr "?vision:Oba"
-#: client/climisc.c:238
+#: client/climisc.c:239
msgid "?vision:To Them"
msgstr "?vision:Jim"
-#: client/climisc.c:241
+#: client/climisc.c:242
msgid "?vision:To Us"
msgstr "?vision:Nám"
-#: client/climisc.c:257 client/climisc.c:264
+#: client/climisc.c:258 client/climisc.c:265
#, c-format
msgid "The %s give %s"
msgstr "%s dajà %s"
-#: client/climisc.c:268
+#: client/climisc.c:269
#, c-format
msgid "The %s give unknown city."
msgstr "%s dajà neznámé město."
-#: client/climisc.c:273
+#: client/climisc.c:274
#, c-format
msgid "The %s give %d gold"
msgstr "%s dajà %d zlata"
-#: client/climisc.c:278
+#: client/climisc.c:279
#, c-format
msgid "The %s give their worldmap"
msgstr "%s dajà svojà mapu světa"
-#: client/climisc.c:282
+#: client/climisc.c:283
#, c-format
msgid "The %s give their seamap"
msgstr "%s dajà svojà mapu oceánů"
-#: client/climisc.c:286
+#: client/climisc.c:287
msgid "The parties agree on a cease-fire"
msgstr "JednajÃcà se dohodli na pÅ™ÃměřÃ"
-#: client/climisc.c:289
+#: client/climisc.c:290
msgid "The parties agree on a peace"
msgstr "JednajÃcà se dohodli na mÃru"
-#: client/climisc.c:292
+#: client/climisc.c:293
msgid "The parties create an alliance"
msgstr "JednajÃcà vytvoÅ™ili alianci"
-#: client/climisc.c:295
+#: client/climisc.c:296
#, c-format
msgid "The %s give shared vision"
msgstr "%s dovolà nahlÞet do svých map"
-#: client/climisc.c:299
+#: client/climisc.c:300
#, c-format
msgid "The %s give an embassy"
msgstr "%s dajà ambasádu"
-#: client/climisc.c:902
+#: client/climisc.c:906
msgid "Popup Request"
msgstr "Požadavek samostatně"
-#: client/climisc.c:932
+#: client/climisc.c:936
msgid "Exporting output window to civgame.log ..."
msgstr "Exportuji obsah výstupnÃho okna do civgame.log ..."
-#: client/climisc.c:936
+#: client/climisc.c:940
msgid "Export complete."
msgstr "Export dokonÄen."
-#: client/climisc.c:938
+#: client/climisc.c:942
msgid "Export failed, couldn't write to file."
msgstr "Export se nepovedl, nelze psát do souboru."
-#: client/climisc.c:1038
+#: client/climisc.c:1042
#, c-format
msgid "You don't buy %s in %s!"
msgstr "Nemůžete si koupit %s v %s!"
-#: client/climisc.c:1056
+#: client/climisc.c:1060
#, c-format
msgid "%s costs %d gold and you only have %d gold."
msgstr "%s stojà %d zlatých a vy máte pouze %d zlatých."
@@ -8011,19 +8011,19 @@ msgstr ""
"Auto-připojenà k serveru \"%s\" na portu %d jako \"%s\" každých %f sekund na "
"%d pokusů"
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1289
+#: client/connectdlg_common.c:79 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:1289
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1358
msgid "easy"
msgstr "lehká"
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1290
+#: client/connectdlg_common.c:81 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:1290
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
msgid "hard"
msgstr "těžká"
@@ -8052,38 +8052,42 @@ msgid "We probably couldn't start it from here."
msgstr "PravdÄ›podobnÄ› nebudeme moci odtud zaÄit."
#: client/connectdlg_common.c:470
-msgid "We have control of the server (command access level hack)"
+#, 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
-msgid "We can't take control of server, attempting to kill it."
-msgstr "Nelze pÅ™evzÃt kontrolu nad serverem, zkusÃme kill."
+msgid ""
+"Failed to obtain the required access level to take control of the server. "
+"The server will now be shutdown."
+msgstr ""
-#: client/control.c:1104
+#: client/control.c:1123
msgid "Only transporter units can be unloaded."
msgstr "Vyloženy mohou být pouze transportnà jednotky."
-#: client/control.c:1353
+#: client/control.c:1425
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:1444
+#: client/control.c:1516
msgid "Only nuclear units can do this."
msgstr "Toto může jen jaderná střela."
-#: client/control.c:1473
+#: client/control.c:1545
msgid "Only paratrooper units can do this."
msgstr "Toto mohou jen výsadkáři."
-#: client/control.c:1921
+#: client/control.c:2020
msgid "Too far for this unit."
msgstr "PÅ™ÃliÅ¡ daleko pro tuto jednotku."
-#: client/control.c:2131 client/control.c:2161 client/control.c:2177
+#: client/control.c:2230 client/control.c:2260 client/control.c:2276
msgid "Didn't find a route to the destination!"
msgstr "NepodaÅ™ilo se nalézt cestu k cÃli!"
-#: client/control.c:2221
+#: client/control.c:2320
msgid "Oh my! You seem to have no capital!"
msgstr "Sakra! Vypadá to, že nemáme hlavnà město!"
@@ -8151,16 +8155,16 @@ msgid "Allows %s (with %s)."
msgstr "Umožňuje %s (s %s)."
#. TRANS: preserve single space at beginning
-#: client/helpdata.c:418
+#: client/helpdata.c:416
msgid " Rivers"
msgstr " Řeky"
-#: client/helpdata.c:576
+#: client/helpdata.c:574
#, c-format
msgid "Sorry, no help topic for %s.\n"
msgstr "Lituji, pro téma %s nenà nápověda.\n"
-#: client/helpdata.c:580
+#: client/helpdata.c:578
#, c-format
msgid ""
"Sorry, no help topic for %s.\n"
@@ -8171,65 +8175,65 @@ msgstr ""
"Tato stránka byla vytvořena automaticky.\n"
"\n"
-#: client/helpdata.c:670
+#: client/helpdata.c:668
#, fuzzy
msgid ""
"Requires: Nothing\n"
"\n"
msgstr "* Vyžaduje %d populace pro stavbu.\n"
-#: client/helpdata.c:675
+#: client/helpdata.c:673
#, c-format
msgid "* The discovery of %s will make %s obsolete.\n"
msgstr "* Objev %s způsobÃ, že %s zastarajá.\n"
-#: client/helpdata.c:694
+#: client/helpdata.c:692
#, c-format
msgid "* Allows all players with knowledge of %s to build %s units.\n"
msgstr "* Umožnà vÅ¡em hráÄům s znalostà %s stavbu %s jednotek.\n"
-#: client/helpdata.c:706
+#: client/helpdata.c:704
#, c-format
msgid "* Allows %s (with %s).\n"
msgstr "* Umožňuje %s (s %s).\n"
-#: client/helpdata.c:710
+#: client/helpdata.c:708
#, c-format
msgid "* Allows %s.\n"
msgstr "* Umožňuje %s.\n"
-#: client/helpdata.c:780
+#: client/helpdata.c:778
#, c-format
msgid "* Can only be built if there is %s in the city.\n"
msgstr ""
-#: client/helpdata.c:786
+#: client/helpdata.c:784
#, c-format
msgid "* Can only be built with %s as government.\n"
msgstr ""
-#: client/helpdata.c:791
+#: client/helpdata.c:789
msgid "* May not be built in cities.\n"
msgstr "* Nemůže se stavět ve městech.\n"
-#: client/helpdata.c:794
+#: client/helpdata.c:792
msgid "* Never has a home city.\n"
msgstr "* Neměl nikdy domovské město.\n"
-#: client/helpdata.c:797
+#: client/helpdata.c:795
msgid "* Losing this unit will lose you the game!\n"
msgstr "* Ztracenà této jednotky znamená prohru!\n"
-#: client/helpdata.c:801
+#: client/helpdata.c:799
msgid "* Each player may only have one of this type of unit.\n"
msgstr "* Každý hrÃ¡Ä může mÃt pouze jednu jednotku tohoto typu.\n"
-#: client/helpdata.c:805
+#: client/helpdata.c:803
#, c-format
msgid "* Requires %d population to build.\n"
msgstr "* Vyžaduje %d populace pro stavbu.\n"
-#: client/helpdata.c:811
+#: client/helpdata.c:809
#, c-format
msgid "* Can carry and refuel %d air unit.\n"
msgid_plural "* Can carry and refuel %d air units.\n"
@@ -8237,7 +8241,7 @@ msgstr[0] "* Může vézt a doplňovat palivo %d jednotce letectva.\n"
msgstr[1] "* Může vézt a doplňovat palivo %d jednotky letectva.\n"
msgstr[2] "* Může vézt a doplňovat palivo %d jednotek letectva.\n"
-#: client/helpdata.c:816
+#: client/helpdata.c:814
#, c-format
msgid "* Can carry and refuel %d missile unit.\n"
msgid_plural "* Can carry and refuel %d missile units.\n"
@@ -8245,7 +8249,7 @@ msgstr[0] "Může nést a doplňovat palivo %d raketě.\n"
msgstr[1] "Může nést a doplňovat palivo %d raketám.\n"
msgstr[2] "Může nést a doplňovat palivo %d raketám.\n"
-#: client/helpdata.c:821
+#: client/helpdata.c:819
#, c-format
msgid "* Can carry %d ground unit across water.\n"
msgid_plural "* Can carry %d ground units across water.\n"
@@ -8253,7 +8257,7 @@ msgstr[0] "* Může vézt %d pozemnÃch jednotku pÅ™es vodu.\n"
msgstr[1] "* Může vézt %d pozemnà jednotky přes vodu.\n"
msgstr[2] "* Může vézt %d pozemnÃch jednotek pÅ™es vodu.\n"
-#: client/helpdata.c:830
+#: client/helpdata.c:828
msgid ""
"* Can establish trade routes (must travel to target city and must be at "
"least 9 tiles [in Manhattan distance] from this unit's home city).\n"
@@ -8261,166 +8265,166 @@ msgstr ""
"* Může zÅ™izovat obchodnà cesty (musà se pÅ™esunout do cÃlového mÄ›sta a musà "
"být minimálně 9 polà od svého domovského města).\n"
-#: client/helpdata.c:836
+#: client/helpdata.c:834
#, c-format
msgid "* Can help build wonders (adds %d production).\n"
msgstr "* Může pomoci se stavbou divů světa (přidá %d produkce).\n"
-#: client/helpdata.c:840
+#: client/helpdata.c:838
msgid "* May not be disbanded.\n"
msgstr "* Nemůže být rozpuštěna.\n"
-#: client/helpdata.c:842
+#: client/helpdata.c:840
#, c-format
msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
msgstr ""
"* Může být rozložen ve mÄ›stÄ›, za úÄelem zÃskánà 50%% surovin potÅ™ebných k "
"výrobě.\n"
-#: client/helpdata.c:846
+#: client/helpdata.c:844
msgid "* Can build new cities.\n"
msgstr "* Může stavět nová města.\n"
-#: client/helpdata.c:849
+#: client/helpdata.c:847
#, c-format
msgid "* Can add on %d population to cities of no more than size %d.\n"
msgstr "* Může zvýšit populaci o %d, pokud nenà město většà než %d.\n"
-#: client/helpdata.c:858
+#: client/helpdata.c:856
msgid "* Can build roads and railroads.\n"
msgstr "* Může stavět cesty a železnice.\n"
-#: client/helpdata.c:859
+#: client/helpdata.c:857
msgid "* Can build mines on tiles.\n"
msgstr "* Může stavět doly.\n"
-#: client/helpdata.c:860
+#: client/helpdata.c:858
msgid "* Can build irrigation on tiles.\n"
msgstr "* Může stavět závlahy.\n"
-#: client/helpdata.c:865
+#: client/helpdata.c:863
msgid "* Can build farmland.\n"
msgstr "* Může stavět farmy.\n"
-#: client/helpdata.c:869
+#: client/helpdata.c:867
#, c-format
msgid "* Can build farmland (if %s is known).\n"
msgstr "* Může stavět farmy (pokud je %s objeven).\n"
-#: client/helpdata.c:873
+#: client/helpdata.c:871
#, c-format
msgid "* Can build farmland (if any of the following are known: %s).\n"
msgstr "* Může postavit farmu (pokud je známo: %s).\n"
-#: client/helpdata.c:881
+#: client/helpdata.c:879
msgid "* Can build fortresses.\n"
msgstr "* Může stavět pevnosti.\n"
-#: client/helpdata.c:885
+#: client/helpdata.c:883
#, c-format
msgid "* Can build fortresses (if %s is known).\n"
msgstr "* Může postavit pevnosti (pokud je známa technologie %s).\n"
-#: client/helpdata.c:889
+#: client/helpdata.c:887
#, c-format
msgid "* Can build fortresses (if any of the following are known: %s).\n"
msgstr "* Může postavit pevnosti (pokud je známo: %s).\n"
-#: client/helpdata.c:895
+#: client/helpdata.c:893
msgid "* Can clean pollution from tiles.\n"
msgstr "* Může odstraňovat zneÄiÅ¡tÄ›nà z terénu.\n"
-#: client/helpdata.c:896
+#: client/helpdata.c:894
msgid "* Can clean nuclear fallout from tiles.\n"
msgstr "* Může odstranit radioaktivnà spad z terénu.\n"
-#: client/helpdata.c:899
+#: client/helpdata.c:897
msgid "* Can transform tiles.\n"
msgstr "* Může transformovat terén.\n"
-#: client/helpdata.c:902
+#: client/helpdata.c:900
msgid "* Can build airbases.\n"
msgstr "* Může stavět letiště.\n"
-#: client/helpdata.c:906
+#: client/helpdata.c:904
#, c-format
msgid "* May fortify, granting a 50%% defensive bonus.\n"
msgstr "* Může se opevnit, aby ziskal o 50%% vyÅ¡Å¡Ã obrannou sÃlu.\n"
-#: client/helpdata.c:909
+#: client/helpdata.c:907
msgid "* May pillage to destroy infrastructure from tiles.\n"
msgstr "* Může plenit, tj. niÄit intfrastrukturu.\n"
-#: client/helpdata.c:913
+#: client/helpdata.c:911
msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
msgstr "* Může provádÄ›t diplomatické a navÃc speciálnà špionážnà akce.\n"
-#: client/helpdata.c:916
+#: client/helpdata.c:914
msgid "* Can perform diplomatic actions.\n"
msgstr "* Může provádět diplomatické akce.\n"
-#: client/helpdata.c:920
+#: client/helpdata.c:918
msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
msgstr "* Nikdy neprohraje v boji Diplomat proti Diplomatu.\n"
-#: client/helpdata.c:923
+#: client/helpdata.c:921
msgid "* May not be bribed.\n"
msgstr "* Nemůže být podplacen.\n"
-#: client/helpdata.c:926
+#: client/helpdata.c:924
msgid "* Can attack enemy air units.\n"
msgstr "* Může útoÄit na nepřátelské letectvo.\n"
-#: client/helpdata.c:930
+#: client/helpdata.c:928
msgid "* Is invisible except when next to an enemy unit or city.\n"
msgstr "* Je neviditelný, pokud nenà u nepřátelského města nebo jednotky.\n"
-#: client/helpdata.c:934
+#: client/helpdata.c:932
msgid "* Can only attack units on ocean squares (no land attacks).\n"
msgstr "* Může útoÄit jen na jednotky na moÅ™i (nenà možný pozemnà útok)\n"
-#: client/helpdata.c:938
+#: client/helpdata.c:936
msgid ""
"* Can attack from aboard sea units: against enemy cities and onto land "
"squares.\n"
msgstr "* Může útoÄi pÅ™Ãmo z lodi na pozemnà jednotky a mÄ›sta.\n"
-#: client/helpdata.c:943
+#: client/helpdata.c:941
#, c-format
msgid "* Can be paradropped from a friendly city (Range: %d).\n"
msgstr "* Může být vysazen z přátelského města (dosah: %d).\n"
-#: client/helpdata.c:949
+#: client/helpdata.c:947
msgid "* Gets double defense against units specified as 'mounted'.\n"
msgstr ""
"* ZÃskává dvojnásobnou obranu proti jednotkám specifikovaným jako "
"'mounted' (jÃzda).\n"
-#: client/helpdata.c:953
+#: client/helpdata.c:951
msgid "* Counts as 'mounted' against certain defenders.\n"
msgstr "* PoÄÃtá se jako jÃzda (mounted) proti nÄ›kterým typům obránců.\n"
-#: client/helpdata.c:957
+#: client/helpdata.c:955
msgid "* A missile unit: gets used up in making an attack.\n"
msgstr "Raketa: Je použita(ztracena) při útoku.\n"
-#: client/helpdata.c:960
+#: client/helpdata.c:958
msgid "* Making an attack ends this unit's turn.\n"
msgstr "* Útokem tato jednotka ukonÄà tah.\n"
-#: client/helpdata.c:964
+#: client/helpdata.c:962
msgid "* This unit's attack causes a nuclear explosion!\n"
msgstr "* Útok této jednotky způsobà jaderný výbuch!\n"
-#: client/helpdata.c:968
+#: client/helpdata.c:966
msgid "* Gets double firepower when attacking cities.\n"
msgstr "* Má dvojnásobnou palebnou sÃlu, pokud útoÄà na mÄ›sta.\n"
-#: client/helpdata.c:971
+#: client/helpdata.c:969
msgid "* Ignores the effects of city walls.\n"
msgstr "* Ignoruje efekt městských hradeb.\n"
-#: client/helpdata.c:975
+#: client/helpdata.c:973
#, c-format
msgid ""
"* Does bombard attacks (%d per turn). These attacks will only damage (never "
@@ -8429,35 +8433,35 @@ msgstr ""
"* Provádà bombardovánà (%d za tah). Tento typ útoku jenom zranà obránce "
"(nikdy nezabije), ale nenà žádným rizikem pro útoÄnÃka.\n"
-#: client/helpdata.c:982
+#: client/helpdata.c:980
msgid "* Gets quintuple defense against missiles and aircraft.\n"
msgstr "* ZÃskává ÄtyÅ™násobnou obranu proti raketám a letadlům.\n"
-#: client/helpdata.c:986
+#: client/helpdata.c:984
msgid "* Ignores terrain effects (treats all squares as roads).\n"
msgstr "* Ignoruje rerén. (považuje se za cestu).\n"
-#: client/helpdata.c:989
+#: client/helpdata.c:987
msgid "* Ignores zones of control.\n"
msgstr "* Ignoruje ZOC (zony kontroly).\n"
-#: client/helpdata.c:993
+#: client/helpdata.c:991
msgid "* A non-military unit (cannot attack; no martial law).\n"
msgstr "* Nenà vojenskou jednotkou (nemůže utoÄit, neprosadà stanné právo).\n"
-#: client/helpdata.c:997
+#: client/helpdata.c:995
msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
msgstr "* Zlá jednotka: působà jednoho nespokojeného ikdyž nenà agresivnÃ.\n"
-#: client/helpdata.c:1000
+#: client/helpdata.c:998
msgid "* Will never achieve veteran status.\n"
msgstr "* Nemůže nikdy dosáhnout veterán stavu.\n"
-#: client/helpdata.c:1002
+#: client/helpdata.c:1000
msgid "* May become veteran through training or combat.\n"
msgstr "* Může se stát vetránem během tréninku nebo boje.\n"
-#: client/helpdata.c:1008
+#: client/helpdata.c:1006
#, c-format
msgid ""
"* Must end turn in a city or next to land, or has a 50%% risk of being lost "
@@ -8466,12 +8470,12 @@ msgstr ""
"* Musà konÄit kolo ve mÄ›stÄ› nebo u pevniny, nebo je 50%% pravdÄ›podobnost "
"ztráty v moři.\n"
-#: client/helpdata.c:1012
+#: client/helpdata.c:1010
#, c-format
msgid "* The discovery of %s reduces the risk to 25%%.\n"
msgstr "* Vynález %s snižuje riziko na 25%%.\n"
-#: client/helpdata.c:1017
+#: client/helpdata.c:1015
#, c-format
msgid "* %s reduces the risk to 12%%.\n"
msgstr "* %s rsnižuje riziko na 12%%.\n"
@@ -8480,15 +8484,15 @@ msgstr "* %s rsnižuje riziko na 12%%.\n"
#. * last two elements
#. TRANS: List of possible output types has this between
#. * last two elements
-#: client/helpdata.c:1068 client/helpdata.c:1402
+#: client/helpdata.c:1066 client/helpdata.c:1400
msgid " or "
msgstr " nebo "
-#: client/helpdata.c:1070 client/helpdata.c:1390
+#: client/helpdata.c:1068 client/helpdata.c:1388
msgid "?or:, "
msgstr "?or:, "
-#: client/helpdata.c:1082
+#: 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"
@@ -8496,14 +8500,14 @@ msgstr[0] "Musà se vrátit do města nebo na pole kde je %s po %d tahu.\n"
msgstr[1] "Musà se vrátit do mÄ›sta nebo na pole kde je %s po %d tazÃch.\n"
msgstr[2] "Musà se vrátit do mÄ›sta nebo na pole kde je %s po %d tazÃch.\n"
-#: client/helpdata.c:1124
+#: client/helpdata.c:1122
#, 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:1129
+#: client/helpdata.c:1127
#, c-format
msgid ""
"To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8512,90 +8516,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:1137
+#: client/helpdata.c:1135
msgid "You cannot research this technology."
msgstr "Nemůžeme zkoumat tuto technologii."
-#: client/helpdata.c:1141
+#: client/helpdata.c:1139
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:1153
+#: client/helpdata.c:1151
#, 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:1158
+#: client/helpdata.c:1156
#, 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:1161
+#: client/helpdata.c:1159
#, 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:1165
+#: client/helpdata.c:1163
msgid "* Increases the pollution generated by the population.\n"
msgstr "* Zvýšà zneÄiÅ¡tenà produkované populacÃ.\n"
-#: client/helpdata.c:1170
+#: client/helpdata.c:1168
#, 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:1177
+#: client/helpdata.c:1175
#, c-format
msgid "* Allows %s to build fortresses.\n"
msgstr "* Umožňuje %s stavbu pevnostÃ.\n"
-#: client/helpdata.c:1185
+#: client/helpdata.c:1183
#, c-format
msgid "* Allows %s to build airbases.\n"
msgstr "* Umožňuje %s stavbu letišť.\n"
-#: client/helpdata.c:1194
+#: client/helpdata.c:1192
#, c-format
msgid "* Allows %s to upgrade roads to railroads.\n"
msgstr "* Umožňuje %s vylepšit cesty na železnice.\n"
-#: client/helpdata.c:1202
+#: client/helpdata.c:1200
#, 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:1236
+#: client/helpdata.c:1234
msgid "* Pollution cannot be generated on this terrain."
msgstr "* Na tomto terénu nelze generovat zneÄiÅ¡tÄ›nÃ."
-#: client/helpdata.c:1241
+#: client/helpdata.c:1239
msgid "* You cannot build cities on this terrain."
msgstr "* Na tomto terénu nemůžete stavět města."
-#: client/helpdata.c:1247
+#: client/helpdata.c:1245
msgid "* The coastline of this terrain is unsafe."
msgstr "* PobÅ™ežà tohoto terénu je nebezpeÄné."
-#: client/helpdata.c:1252
+#: client/helpdata.c:1250
msgid "* This terrain is unsafe for units to travel on."
msgstr "* Tento terén je nebezpeÄný pro pÅ™esun jednotek."
-#: client/helpdata.c:1257
+#: client/helpdata.c:1255
msgid "* Land units cannot travel on oceanic terrains."
msgstr "* Pozemnà jednotky se nemohou pohybovat v oceánu."
-#: client/helpdata.c:1307
+#: client/helpdata.c:1305
msgid "Features:\n"
msgstr ""
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1413 client/helpdata.c:1414
+#: client/helpdata.c:1411 client/helpdata.c:1412
msgid "?outputlist: Nothing "
msgstr ""
-#: client/helpdata.c:1421
+#: client/helpdata.c:1419
#, fuzzy, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
@@ -8616,7 +8620,7 @@ msgstr[2] ""
"nespokojenost.\n"
" "
-#: client/helpdata.c:1431
+#: client/helpdata.c:1429
#, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8624,48 +8628,48 @@ msgid ""
msgstr ""
#. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1439
+#: client/helpdata.c:1437
#, c-format
msgid "* You pay %d times normal %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1444
+#: client/helpdata.c:1442
#, 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:1449
+#: client/helpdata.c:1447
#, c-format
msgid "* You pay no %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1453
+#: client/helpdata.c:1451
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:1462
+#: client/helpdata.c:1460
#, 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:1470
+#: client/helpdata.c:1468
#, c-format
msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
msgstr ""
-#: client/helpdata.c:1477
+#: client/helpdata.c:1475
#, 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:1484
+#: client/helpdata.c:1482
#, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -8673,23 +8677,23 @@ msgid ""
msgstr ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1491
+#: client/helpdata.c:1489
#, 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:1499
+#: client/helpdata.c:1497
#, c-format
msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
msgstr ""
-#: client/helpdata.c:1504
+#: client/helpdata.c:1502
msgid "Has unlimited science/gold/luxuries rates.\n"
msgstr ""
-#: client/helpdata.c:1509
+#: client/helpdata.c:1507
#, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
@@ -8701,7 +8705,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: client/helpdata.c:1521
+#: client/helpdata.c:1519
#, 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"
@@ -8710,64 +8714,64 @@ msgstr[1] ""
msgstr[2] ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1532
+#: client/helpdata.c:1530
#, 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:1538
+#: client/helpdata.c:1536
#, fuzzy
msgid "* Your units cannot be bribed.\n"
msgstr "Tato jednotka nemůže být uplacena!"
-#: client/helpdata.c:1541
+#: client/helpdata.c:1539
#, fuzzy
msgid "* Your cities cannot be incited.\n"
msgstr "Město nemůže být rozvráceno!"
-#: client/helpdata.c:1545
+#: client/helpdata.c:1543
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:1551
+#: client/helpdata.c:1549
msgid "* Has a senate that may prevent declaration of war.\n"
msgstr ""
-#: client/helpdata.c:1555
+#: client/helpdata.c:1553
msgid "* Allows partisans when cities are taken by the enemy.\n"
msgstr ""
-#: client/helpdata.c:1559
+#: client/helpdata.c:1557
msgid ""
"* Buildings that normally confer bonuses against unhappiness will instead "
"give gold.\n"
msgstr ""
-#: client/helpdata.c:1563
+#: client/helpdata.c:1561
msgid "* Pays no upkeep for fanatics.\n"
msgstr ""
-#: client/helpdata.c:1566
+#: client/helpdata.c:1564
#, fuzzy
msgid "* Has no unhappy citizens.\n"
msgstr "%d dalÅ¡Ãch nespokojených obyvatel."
-#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
+#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
#, c-format
msgid "* Veteran %s units.\n"
msgstr ""
-#: client/helpdata.c:1587
+#: client/helpdata.c:1585
#, fuzzy
msgid "* Veteran units.\n"
msgstr "Námořnà jednotky"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1593
+#: client/helpdata.c:1591
#, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8775,7 +8779,7 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1602
+#: client/helpdata.c:1600
#, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8783,451 +8787,499 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1610
+#: client/helpdata.c:1608
#, 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:1619
+#: client/helpdata.c:1617
#, c-format
msgid "* %s production is increased %d%%.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1627
+#: client/helpdata.c:1625
#, c-format
msgid "* %s production will suffer massive waste.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1632
+#: client/helpdata.c:1630
#, c-format
msgid "* %s production will suffer some waste.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1637
+#: client/helpdata.c:1635
#, 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:1645
+#: client/helpdata.c:1643
#, 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:1651
+#: client/helpdata.c:1649
#, 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:1657
+#: client/helpdata.c:1655
#, c-format
msgid "* %s waste will increase slowly with distance from capital.\n"
msgstr ""
-#: client/helpdata.c:1674
+#: client/helpdata.c:1672
#, c-format
msgid "* Allows you to build %s.\n"
msgstr "* Umožňuje stavbu %s.\n"
#. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1701
+#: client/helpdata.c:1699
#, c-format
msgid "%s%d %s"
msgstr "%s%d %s"
-#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1700 client/helpdata.c:1708 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:1709
+#: client/helpdata.c:1707
#, c-format
msgid "%s%d unhappy"
msgstr "%s%d nespokojených"
-#: client/mapctrl_common.c:382
+#: client/mapctrl_common.c:399
#, c-format
msgid "You don't know how to build %s!"
msgstr "NevÃte jak postavit %s!"
-#: client/mapctrl_common.c:392
+#: client/mapctrl_common.c:409
#, c-format
msgid "Copy %s to clipboard."
msgstr "KopÃrovat %s do schránky."
-#: client/mapctrl_common.c:408
+#: client/mapctrl_common.c:425
msgid "Clipboard is empty."
msgstr "Schránka je prázdná."
-#: client/options.c:98
+#: client/options.c:102
msgid "Graphics"
msgstr "Grafika"
-#: client/options.c:99
+#: client/options.c:103
msgid "Overview"
msgstr "Přehled"
-#: client/options.c:100
+#: client/options.c:104
msgid "Sound"
msgstr "Zvuk"
-#: client/options.c:101
+#: client/options.c:105
msgid "Interface"
msgstr "Interface"
-#: client/options.c:102
+#: client/options.c:106
msgid "Network"
msgstr "SÃÅ¥"
-#: client/options.c:107
+#: client/options.c:111
msgid "Login name"
msgstr "Přihlašovacà jméno"
-#: client/options.c:108
+#: client/options.c:112
msgid ""
"This is the default login username that will be used in the connection "
"dialogs or with the -a command-line parameter."
msgstr ""
-#: client/options.c:113
+#: client/options.c:117
msgid "Server"
msgstr "Server"
-#: client/options.c:114
+#: client/options.c:118
msgid ""
"This is the default server hostname that will be used in the connection "
"dialogs or with the -a command-line parameter."
msgstr ""
-#: client/options.c:119
+#: client/options.c:123
msgid "Server port"
msgstr "Port serveru"
-#: client/options.c:120
+#: client/options.c:124
msgid ""
"This is the default server port that will be used in the connection dialogs "
"or with the -a command-line parameter."
msgstr ""
-#: client/options.c:125 client/gui-win32/connectdlg.c:912 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
msgid "Metaserver"
msgstr "Metaserver"
-#: client/options.c:126
+#: client/options.c:130
msgid ""
"The metaserver is a host that the client contacts to find out about games on "
"the internet. Don't change this from its default value unless you know what "
"you're doing."
msgstr ""
-#: client/options.c:132
+#: client/options.c:136
msgid "Soundset"
msgstr "Sada zvuků"
-#: client/options.c:133
+#: client/options.c:137
msgid ""
"This is the soundset that will be used. Changing this is the same as using "
"the -S command-line parameter."
msgstr ""
-#: client/options.c:138
+#: client/options.c:142
msgid "Sound plugin"
msgstr "Zvukový zasuvný modul"
-#: client/options.c:139
+#: client/options.c:143
msgid ""
"If you have a problem with sound, try changing the sound plugin. The new "
"plugin won't take effect until you restart Freeciv. Changing this is the "
"same as using the -P command-line option."
msgstr ""
-#: client/options.c:144 client/gui-sdl/gui_main.c:162
+#: client/options.c:148 client/gui-sdl/gui_main.c:162
msgid "Theme"
msgstr "Motiv"
-#: client/options.c:145
+#: client/options.c:149
msgid "By changing this option you change the active theme."
msgstr ""
-#: client/options.c:148
+#: client/options.c:152
msgid "Tileset"
msgstr "Sada dlaždic"
-#: client/options.c:149
+#: client/options.c:153
msgid ""
"By changing this option you change the active tileset. This is the same as "
"using the -t command-line parameter."
msgstr ""
-#: client/options.c:156
+#: client/options.c:160
msgid "Solid unit background color"
msgstr "Neprůhledná barva pozadà jednotky"
-#: client/options.c:157
+#: client/options.c:161
msgid ""
"Setting this option will cause units on the map view to be drawn with a "
"solid background color instead of the flag backdrop."
msgstr ""
-#: client/options.c:161 client/gui-sdl/optiondlg.c:960
+#: client/options.c:165 client/gui-sdl/optiondlg.c:960
msgid "Sound bell at new turn"
msgstr "Zvukové znamenà na zaÄátku kola"
-#: client/options.c:162
+#: client/options.c:166
msgid ""
"Set this option to have a \"bell\" event be generated at the start of a new "
"turn. You can control the behavior of the \"bell\" event by editing the "
"message options."
msgstr ""
-#: client/options.c:168
+#: client/options.c:172
msgid "Unit movement animation time (milliseconds)"
msgstr "Čas na animaci jednotky při pohybu (milisekundy)"
-#: client/options.c:169
+#: client/options.c:173
msgid ""
"This option controls how long unit \"animation\" takes when a unit moves on "
"the map view. Set it to 0 to disable animation entirely."
msgstr ""
-#: client/options.c:174
+#: client/options.c:178
msgid "Mapview recentering time (milliseconds)"
msgstr "Nové vystředěnà mapy (milisekundy)"
-#: client/options.c:175
+#: client/options.c:179
msgid ""
"When the map view is recentered, it will slide smoothly over the map to its "
"new position. This option controls how long this slide lasts. Set it to 0 "
"to disable mapview sliding entirely."
msgstr ""
-#: client/options.c:180 client/gui-sdl/optiondlg.c:1014
+#: client/options.c:184 client/gui-sdl/optiondlg.c:1014
msgid "Show combat animation"
msgstr "Ukazovat animace boje"
-#: client/options.c:181
+#: client/options.c:185
msgid ""
"Disabling this option will turn off combat animation between units on the "
"mapview."
msgstr ""
-#: client/options.c:184
+#: client/options.c:188
msgid "Draw the citybar"
msgstr ""
-#: client/options.c:185
+#: client/options.c:189
msgid ""
"Setting this option will display a 'citybar' containing useful information "
"beneath each city. Disabling this option will display only the city's name "
"and optionally, production."
msgstr ""
-#: client/options.c:191
+#: client/options.c:195
msgid "Show icons in the technology tree"
msgstr ""
-#: client/options.c:192
+#: client/options.c:196
msgid ""
"Setting this option will display icons on the technology tree diagram. "
"Turning this option off makes the technology tree more compact."
msgstr ""
-#: client/options.c:197
+#: client/options.c:201
msgid "Draw shield graphics for units"
msgstr ""
-#: client/options.c:198
+#: client/options.c:202
msgid ""
"Setting this option will draw a shield icon as the flags on units. If "
"unset, the full flag will be drawn."
msgstr ""
-#: client/options.c:202
+#: client/options.c:206
msgid "Manual Turn Done in AI Mode"
msgstr "RuÄnà konec kola v AI módu"
-#: client/options.c:203
+#: client/options.c:207
msgid ""
"Disable this option if you do not want to press the Turn Done button "
"manually when watching an AI player."
msgstr ""
-#: client/options.c:207 client/gui-sdl/optiondlg.c:1121
+#: client/options.c:211 client/gui-sdl/optiondlg.c:1121
msgid "Auto Center on Units"
msgstr "Auto-centrovat na jednotkách"
-#: client/options.c:208
+#: client/options.c:212
msgid ""
"Set this option to have the active unit centered automatically when the unit "
"focus changes."
msgstr ""
-#: client/options.c:211 client/gui-sdl/optiondlg.c:1147
+#: client/options.c:215 client/gui-sdl/optiondlg.c:1147
msgid "Auto Center on Combat"
msgstr "Auto-centrovat při bitvě"
-#: client/options.c:212
+#: client/options.c:216
msgid ""
"Set this option to have any combat be centered automatically. Disabled this "
"will speed up the time between turns but may cause you to miss combat "
"entirely."
msgstr ""
-#: client/options.c:217 client/gui-sdl/optiondlg.c:1174
+#: client/options.c:221 client/gui-sdl/optiondlg.c:1174
msgid "Focus on Awakened Units"
msgstr "Zaměřit na probuzené jednotky"
-#: client/options.c:218
+#: client/options.c:222
msgid "Set this option to have newly awoken units be focused automatically."
msgstr ""
-#: client/options.c:221
+#: client/options.c:225
msgid "Allow goto into the unknown"
msgstr ""
-#: client/options.c:222
+#: client/options.c:226
msgid ""
"Setting this option will make the game consider moving into unknown tiles. "
"If not, then goto routes will detour around or be blocked by unknown tiles."
msgstr ""
-#: client/options.c:226
+#: client/options.c:230
msgid "Center map when Popup city"
msgstr "Centrovat mapu při zobrazenà města"
-#: client/options.c:227
+#: client/options.c:231
msgid ""
"Setting this option makes the mapview center on a city when its city dialog "
"is popped up."
msgstr ""
-#: client/options.c:230
+#: client/options.c:234
msgid "Concise City Production"
msgstr "Zvol produkci města"
-#: client/options.c:231
+#: client/options.c:235
msgid ""
"Set this option to make the city production (as shown in the city dialog) to "
"be more compact."
msgstr ""
-#: client/options.c:234 client/gui-sdl/optiondlg.c:1252
+#: client/options.c:238 client/gui-sdl/optiondlg.c:1252
msgid "End Turn when done moving"
msgstr "UkonÄit kolo po dokonÄenà pohybů"
-#: client/options.c:235
+#: client/options.c:239
msgid ""
"Setting this option makes your turn end automatically when all your units "
"are done moving."
msgstr ""
-#: client/options.c:238 client/gui-sdl/optiondlg.c:1226
+#: client/options.c:242 client/gui-sdl/optiondlg.c:1226
msgid "Prompt for city names"
msgstr "Dotazovat na názvy měst"
-#: client/options.c:239
+#: client/options.c:243
msgid ""
"Disabling this option will make the names of newly founded cities chosen "
"automatically by the server."
msgstr ""
-#: client/options.c:242 client/gui-sdl/optiondlg.c:1200
+#: client/options.c:246 client/gui-sdl/optiondlg.c:1200
msgid "Pop up city dialog for new cities"
msgstr "Zobrazit dialog pro nová města"
-#: client/options.c:243
+#: client/options.c:247
msgid ""
"Setting this option will pop up a newly-founded city's city dialog "
"automatically."
msgstr ""
-#: client/options.c:248
+#: client/options.c:250
+#, fuzzy
+msgid "Pop up caravan actions"
+msgstr "Karavana"
+
+#: client/options.c:251
+msgid ""
+"If this option is enabled, when caravans arrive at a city where they can "
+"establish a traderoute or help build a wonder, a window will popup asking "
+"which action should be performed. Disabling this option means you will have "
+"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 ""
+
+#: client/options.c:260
+#, fuzzy
+msgid "Enable cursor changing"
+msgstr "Povolit alfa blending"
+
+#: client/options.c:261
+msgid ""
+"This option controls whether the client should try to change the mouse "
+"cursor depending on what is being pointed at, as well as to indicate changes "
+"in the client or server state."
+msgstr ""
+
+#: client/options.c:266
+msgid "Select cities before units"
+msgstr ""
+
+#: 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 ""
+
+#: client/options.c:272
+msgid "Clear unit orders on selection"
+msgstr ""
+
+#: client/options.c:273
+msgid ""
+"Enabling this option will cause unit orders to be cleared whenever one or "
+"more units are selected. If this option is disabled, selecting units will "
+"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 ""
+
+#: client/options.c:282
msgid "Background layer"
msgstr ""
-#: client/options.c:249
+#: client/options.c:283
msgid "The background layer of the overview shows just ocean and land."
msgstr ""
-#: client/options.c:252
+#: client/options.c:286
msgid "Terrain relief map layer"
msgstr ""
-#: client/options.c:253
+#: client/options.c:287
msgid "The relief layer shows all terrains on the map."
msgstr ""
-#: client/options.c:256
+#: client/options.c:290
#, fuzzy
msgid "Borders layer"
msgstr "Hranice"
-#: client/options.c:257
+#: client/options.c:291
msgid ""
"The borders layer of the overview shows which tiles are owned by each player."
msgstr ""
-#: client/options.c:261
+#: client/options.c:295
#, fuzzy
msgid "Units layer"
msgstr "Jednotky"
-#: client/options.c:262
+#: client/options.c:296
#, fuzzy
msgid "Enabling this will draw units on the overview."
msgstr ""
"Pokud je povoleno, budou výchozà jména mÄ›st nabÃzena v závislosti na okolnÃm "
"terénu."
-#: client/options.c:265
+#: client/options.c:299
#, fuzzy
msgid "Cities layer"
msgstr "Města"
-#: client/options.c:266
+#: client/options.c:300
#, fuzzy
msgid "Enabling this will draw cities on the overview."
msgstr ""
"Pokud je povoleno, budou výchozà jména mÄ›st nabÃzena v závislosti na okolnÃm "
"terénu."
-#: client/options.c:269
+#: client/options.c:303
msgid "Overview fog of war"
msgstr "Přehled clony války"
-#: client/options.c:270
+#: client/options.c:304
#, fuzzy
msgid "Enabling this will show fog of war on the overview."
msgstr ""
"Pokud je povoleno, budou výchozà jména mÄ›st nabÃzena v závislosti na okolnÃm "
"terénu."
-#: client/options.c:488
+#: client/options.c:526
msgid "If you add a preset by hand, also update \"number_of_presets\""
msgstr ""
"Pokud pÅ™idáte pÅ™ednastavenà ruÄnÄ›, aktualizujte také \"number_of_presets\""
-#: client/options.c:516
+#: client/options.c:554
msgid "Cannot find your home directory"
msgstr "Nelze najÃt váš domovský adresář"
-#: client/options.c:665 client/options.c:796
+#: client/options.c:703 client/options.c:834
msgid "Save failed, cannot find a filename."
msgstr "Ukládánà selhalo, nelze nalézt název souboru."
-#: client/options.c:678 client/options.c:859
+#: client/options.c:716 client/options.c:897
#, c-format
msgid "Save failed, cannot write to file %s"
msgstr "Uloženà selhalo, nelze zapisovat do souboru %s"
-#: client/options.c:680 client/options.c:862
+#: client/options.c:718 client/options.c:900
#, c-format
msgid "Saved settings to file %s"
msgstr "Nastavenà uložena do souboru %s"
@@ -9252,16 +9304,16 @@ msgstr "String kapacity serveru: %s"
msgid "Start of turn %d"
msgstr "ZaÄátek kola %d"
-#: client/packhand.c:1590
+#: client/packhand.c:1591
#, c-format
msgid "AI Mode is now %s."
msgstr "AI Mód je nynà %s."
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "ON"
msgstr "ZAP"
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "OFF"
msgstr "VYP"
@@ -9293,14 +9345,15 @@ 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:2085
+#: client/gui-gtk-2.0/pages.c:2157
msgid "Flag"
msgstr "Vlajka"
#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
-#: client/gui-gtk-2.0/pages.c:1536 client/gui-gtk-2.0/pages.c:2087
-#: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
-#: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
+#: 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/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr "Národ"
@@ -9312,7 +9365,7 @@ msgstr "Hranice"
msgid "Score"
msgstr "Skóre"
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
msgid "Team"
msgstr "Tým"
@@ -9384,230 +9437,252 @@ msgstr "Žádný %s nebyl rozpuštěn."
msgid "Could not open temp file."
msgstr "Nemohu otevÅ™Ãt \"%s\"."
-#: client/servers.c:407
+#: client/servers.c:410
msgid "Invalid $http_proxy or metaserver value, must start with 'http://'"
msgstr "Neplatná $http_proxy nebo metaserver hodnota, musà zaÄÃnat 'http://'"
-#: client/servers.c:413
+#: client/servers.c:416
msgid "Failed looking up metaserver's host"
msgstr "Selhal dotaz na hostitele metaserveru"
-#: client/text.c:85 client/text.c:86 client/text.c:91
+#. TRANS: "AI <player name>"
+#: client/text.c:94
+#, c-format
+msgid "AI %s"
+msgstr ""
+
+#. TRANS: "<nation adjective>, team <team name>"
+#: client/text.c:118
+#, fuzzy, c-format
+msgid "%s, team %s"
+msgstr ", tým %s"
+
+#: client/text.c:135 client/text.c:136 client/text.c:141
#: client/gui-sdl/mapview.c:752
msgid "?nation:Neutral"
msgstr "?nation:NeutrálnÃ"
-#: client/text.c:85 client/gui-sdl/mapview.c:752
+#: client/text.c:135 client/gui-sdl/mapview.c:752
msgid "?nation:Hostile"
msgstr "?nation:Nepřátelský"
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Peaceful"
msgstr "?nation:MÃrumilovný"
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Friendly"
msgstr "?nation:PřátelÅ¡tÃ"
-#: client/text.c:88 client/gui-sdl/mapview.c:755
+#: client/text.c:138 client/gui-sdl/mapview.c:755
msgid "?nation:Mysterious"
msgstr "?nation:ZáhadnÃ"
-#: client/text.c:88
+#: client/text.c:138
msgid "?nation:Friendly(team)"
msgstr "?nation:PřátelÅ¡tÃ(tým)"
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
msgid "?city:Neutral"
msgstr "?city:NeutrálnÃ"
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
msgid "?city:Hostile"
msgstr "?city:Nepřátelské"
-#: client/text.c:92 client/gui-sdl/mapview.c:786
+#: client/text.c:142 client/gui-sdl/mapview.c:786
msgid "?city:Peaceful"
msgstr "?city_state:MÃrové"
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Friendly"
msgstr "?city:Přátelské"
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Mysterious"
msgstr "?nation:ZáhadnÃ"
-#: client/text.c:93
+#: client/text.c:143
msgid "?city:Friendly(team)"
msgstr "?nation:PřátelÅ¡tÃ(tým)"
-#: client/text.c:100
+#: client/text.c:151
#, c-format
msgid "Location: (%d, %d) [%d]"
msgstr "UmÃstÄ›nÃ: (%d, %d) [%d]"
-#: client/text.c:109
+#: client/text.c:153
+#, c-format
+msgid "Native coordinates: (%d, %d)"
+msgstr ""
+
+#: client/text.c:160
#, c-format
msgid "Terrain: %s"
msgstr "Terén: %s"
-#: client/text.c:110
+#: client/text.c:161
#, c-format
msgid "Food/Prod/Trade: %s"
msgstr "JÃdlo/Prod/Obch: %s"
-#: client/text.c:113
+#: client/text.c:164
msgid "Minor Tribe Village"
msgstr "Vesnice malého kmene"
-#: client/text.c:119
+#: client/text.c:173
#, fuzzy
msgid "Our territory"
msgstr "NaÅ¡e územÃ"
-#. TRANS: "Polish territory"
-#: client/text.c:122
+#. TRANS: "Territory of <username> (<nation + team>)"
+#: client/text.c:176
#, fuzzy, c-format
-msgid "%s territory"
-msgstr "Územà %s"
+msgid "Territory of %s (%s)"
+msgstr "Územà %s %s"
-#. TRANS: "Polish territory (5 turn cease-fire)"
-#: client/text.c:131
+#: client/text.c:186
#, fuzzy, c-format
-msgid "%s territory (%d turn cease-fire)"
-msgid_plural "%s territory (%d turn cease-fire)"
-msgstr[0] "%s územà (%d tah pÅ™ÃměřÃ)"
-msgstr[1] "%s územà (%d tahy pÅ™ÃměřÃ)"
-msgstr[2] "%s územà (%d tahů pÅ™ÃměřÃ)"
+msgid "Territory of %s (%s) (%d turn cease-fire)"
+msgid_plural "Territory of %s (%s) (%d turn cease-fire)"
+msgstr[0] "MÄ›sto: %s (%s, %d tah pÅ™ÃměřÃ)"
+msgstr[1] "MÄ›sto: %s (%s, %d tahy pÅ™ÃměřÃ)"
+msgstr[2] "MÄ›sto: %s (%s, %d tahů pÅ™ÃměřÃ)"
-#. TRANS: "Polish territory (friendly)"
-#: client/text.c:140
+#. TRANS: "Territory of <username>
+#. * (<nation + team> | <diplomatic state>)"
+#: client/text.c:195
#, fuzzy, c-format
-msgid "%s territory (%s)"
+msgid "Territory of %s (%s | %s)"
msgstr "Územà %s %s"
-#: client/text.c:145
+#: client/text.c:200
msgid "Unclaimed territory"
msgstr "NepÅ™ivlastnÄ›né územÃ"
-#. TRANS: "City: Warsaw (Polish)"
-#: client/text.c:156
-#, c-format
-msgid "City: %s (%s)"
-msgstr "Město: %s (%s)"
+#. TRANS: "City: <city name> | <username> (<nation + team>)"
+#: client/text.c:214
+#, fuzzy, c-format
+msgid "City: %s | %s (%s)"
+msgstr "Město: %s (%s,%s)"
-#. TRANS: "City: Warsaw (Polish, 5 turn cease-fire)"
-#: client/text.c:166
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <number> turn cease-fire)"
+#: client/text.c:224
#, fuzzy, c-format
-msgid "City: %s (%s, %d turn cease-fire)"
-msgid_plural "City: %s (%s, %d turn cease-fire)"
+msgid "City: %s | %s (%s, %d turn cease-fire)"
+msgid_plural "City: %s | %s (%s, %d turn cease-fire)"
msgstr[0] "MÄ›sto: %s (%s, %d tah pÅ™ÃměřÃ)"
msgstr[1] "MÄ›sto: %s (%s, %d tahy pÅ™ÃměřÃ)"
msgstr[2] "MÄ›sto: %s (%s, %d tahů pÅ™ÃměřÃ)"
-#. TRANS: "City: Warsaw (Polish,friendly)"
-#: client/text.c:174
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <diplomatic state>)"
+#: client/text.c:231
#, fuzzy, c-format
-msgid "City: %s (%s, %s)"
+msgid "City: %s | %s (%s, %s)"
msgstr "Město: %s (%s,%s)"
#. TRANS: previous lines gave other information about the city.
-#: client/text.c:189
+#: client/text.c:246
#, fuzzy, c-format
msgid "?clistbegin: with %s"
msgstr " s %s"
#. TRANS: "Trade from Warsaw: 5"
-#: client/text.c:202
+#: client/text.c:259
#, c-format
msgid "Trade from %s: %d"
msgstr "Obchod z %s: %d"
-#: client/text.c:210
+#: client/text.c:267
#, c-format
msgid "Infrastructure: %s"
msgstr "Infrastruktura: %s"
-#: client/text.c:215
+#: client/text.c:272
#, c-format
msgid "Activity: %s"
msgstr "Aktivita: %s"
-#. TRANS: "Unit: Musketeers (Polish, Warsaw)"
-#. TRANS: "Unit: Musketeers (Polish,friendly)"
-#: client/text.c:226 client/text.c:253
-#, c-format
-msgid "Unit: %s (%s, %s)"
+#. TRANS: "Unit: <unit type> | <username>
+#. * (<nation + team>, <homecity>)"
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <diplomatic state>)"
+#: client/text.c:287 client/text.c:313
+#, fuzzy, c-format
+msgid "Unit: %s | %s (%s, %s)"
msgstr "Jednotka: %s (%s, %s)"
-#. TRANS: "Unit: Musketeers (Polish)"
-#: client/text.c:232
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>)"
+#: client/text.c:292
#, fuzzy, c-format
-msgid "Unit: %s (%s)"
-msgstr "Jednotka: %s(%s)"
+msgid "Unit: %s | %s (%s)"
+msgstr "Jednotka: %s (%s, %s)"
-#. TRANS: "Unit: Musketeers (Polish, 5 turn cease-fire)"
-#: client/text.c:245
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <number> turn cease-fire)"
+#: client/text.c:305
#, fuzzy, c-format
-msgid "Unit: %s (%s, %d turn cease-fire)"
-msgid_plural "Unit: %s (%s, %d turn cease-fire)"
+msgid "Unit: %s | %s (%s, %d turn cease-fire)"
+msgid_plural "Unit: %s | %s (%s, %d turn cease-fire)"
msgstr[0] "Jednotka: %s (%s, %d tah pÅ™ÃměřÃ)"
msgstr[1] "Jednotka: %s (%s, %d tahy pÅ™ÃměřÃ)"
msgstr[2] "Jednotka: %s (%s, %d tahů pÅ™ÃměřÃ)"
#. TRANS: "Chance to win: A:95% D:46%"
-#: client/text.c:279
+#: client/text.c:338
#, c-format
msgid "Chance to win: A:%d%% D:%d%%"
msgstr "Å ance na vÃtÄ›zstvÃ: Ú:%d%% O:%d%%"
#. TRANS: A is attack power, D is defense power, FP is firepower,
#. * HP is hitpoints (current and max).
-#: client/text.c:286
+#: client/text.c:345
#, fuzzy, c-format
msgid "A:%d D:%d FP:%d HP:%d/%d (%s)"
msgstr "Ú:%d O:%d PS:%d HS:%d/%d%s"
#. TRANS: "5 more" units on this tile
-#: client/text.c:295
+#: client/text.c:354
#, c-format
msgid " (%d more)"
msgstr " (%d vÃce)"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:364
+#: client/text.c:423
#, c-format
msgid "far from %s"
msgstr "daleko od %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:367
+#: client/text.c:426
#, c-format
msgid "near %s"
msgstr "poblÞ %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:370
+#: client/text.c:429
#, c-format
msgid "in %s"
msgstr "v %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:403
+#: client/text.c:462
#, c-format
msgid "from %s"
msgstr "z %s"
-#: client/text.c:466
+#: client/text.c:525
msgid "Progress: no research"
msgstr "Průběh: bez výzkumu"
-#: client/text.c:470
+#: client/text.c:529
#, fuzzy
msgid "Progress: no research target"
msgstr "Průběh: bez výzkumu"
-#: client/text.c:475
+#: client/text.c:534
#, fuzzy, c-format
msgid "Progress: %d turn/advance"
msgid_plural "Progress: %d turns/advance"
@@ -9615,7 +9690,7 @@ msgstr[0] "Průběh: %d tah/objev (%d bodů/tah)"
msgstr[1] "Průběh: %d tahy/objev (%d bodů/tah)"
msgstr[2] "Průběh: %d tahů/objev (%d bodů/tah)"
-#: client/text.c:480
+#: client/text.c:539
#, fuzzy, c-format
msgid "%d bulb/turn"
msgid_plural "%d bulbs/turn"
@@ -9623,7 +9698,7 @@ msgstr[0] "%d tah"
msgstr[1] "%d tahy"
msgstr[2] "%d tahů"
-#: client/text.c:485
+#: client/text.c:544
#, c-format
msgid ", %d bulb/turn from team"
msgid_plural ", %d bulbs/turn from team"
@@ -9631,12 +9706,12 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: client/text.c:512
+#: client/text.c:571
#, fuzzy, c-format
msgid "%d/- (never)"
msgstr "(Nikdy)"
-#: client/text.c:524
+#: client/text.c:583
#, fuzzy, c-format
msgid "%d/%d (%d turn)"
msgid_plural "%d/%d (%d turns)"
@@ -9644,12 +9719,12 @@ msgstr[0] "%d/%d %d tahů"
msgstr[1] "%d/%d %d tahů"
msgstr[2] "%d/%d %d tahů"
-#: client/text.c:527
+#: client/text.c:586
#, fuzzy, c-format
msgid "%d/%d (never)"
msgstr "(Nikdy)"
-#: client/text.c:564
+#: client/text.c:623
#, c-format
msgid "%d step"
msgid_plural "%d steps"
@@ -9657,7 +9732,7 @@ msgstr[0] "%d krok"
msgstr[1] "%d kroky"
msgstr[2] "%d kroků"
-#: client/text.c:566
+#: client/text.c:625
#, c-format
msgid "%d bulb"
msgid_plural "%d bulbs"
@@ -9665,7 +9740,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: client/text.c:570 client/agents/cma_fec.c:269 client/agents/cma_fec.c:313
+#: 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
#, c-format
msgid "%d turn"
@@ -9674,89 +9749,89 @@ msgstr[0] "%d tah"
msgstr[1] "%d tahy"
msgstr[2] "%d tahů"
-#: client/text.c:592
+#: client/text.c:651
#, c-format
msgid "Population: %s"
msgstr "Populace: %s"
-#: client/text.c:595
+#: client/text.c:654
#, c-format
msgid "Year: %s (T%d)"
msgstr "Rok: %s (T%d)"
-#: client/text.c:598
+#: client/text.c:657
#, c-format
msgid "Gold: %d (%+d)"
msgstr "Zlato: %d (%+d)"
-#: client/text.c:600
+#: client/text.c:659
#, c-format
msgid "Tax: %d Lux: %d Sci: %d"
msgstr "Daně:%d Luxus:%d Věda:%d"
-#: client/text.c:607
+#: client/text.c:666
#, fuzzy
msgid "Moving: Nobody"
msgstr "v %s"
-#: client/text.c:609
+#: client/text.c:668
#, fuzzy, c-format
msgid "Moving: %s"
msgstr "v %s"
-#: client/text.c:613
+#: client/text.c:672
msgid "(Click for more info)"
msgstr "(KliknÄ›te pro vÃce informacÃ)"
-#: client/text.c:629
+#: client/text.c:688
#, c-format
msgid "%s People"
msgstr "%s LidÃ"
-#: client/text.c:633
+#: client/text.c:692
#, c-format
msgid "Turn: %d"
msgstr "Tah: %d"
-#: client/text.c:635 client/gui-win32/inteldlg.c:111
+#: client/text.c:694 client/gui-win32/inteldlg.c:111
#: client/gui-xaw/inteldlg.c:208
#, c-format
msgid "Gold: %d"
msgstr "Zlato: %d"
-#: client/text.c:636
+#: client/text.c:695
#, c-format
msgid "Net Income: %d"
msgstr ""
#. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:639
+#: client/text.c:698
#, fuzzy, c-format
msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
msgstr "Daně:%d Luxus:%d Věda:%d"
-#: client/text.c:643
+#: client/text.c:702
#, fuzzy, c-format
msgid "Researching %s: %s"
msgstr "Zkoumá se %s: %d/%d"
-#: client/text.c:650
+#: client/text.c:709
#, c-format
msgid "Global warming chance: %d%% (%+d%%/turn)"
msgstr ""
-#: client/text.c:653
+#: client/text.c:712
#, c-format
msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
msgstr ""
-#: client/text.c:658 client/gui-win32/inteldlg.c:104
+#: client/text.c:717 client/gui-win32/inteldlg.c:104
#: client/gui-xaw/inteldlg.c:200
#, c-format
msgid "Government: %s"
msgstr "ZÅ™ÃzenÃ: %s"
-#: client/text.c:682
+#: client/text.c:741
#, c-format
msgid "%d unit"
msgid_plural "%d units"
@@ -9765,21 +9840,21 @@ msgstr[1] "%d jednotky"
msgstr[2] "%d jednotek"
#. TRANS: Impossible to reach goto target tile
-#: client/text.c:715 client/gui-sdl/mapview.c:566
+#: client/text.c:774 client/gui-sdl/mapview.c:566
msgid "?goto:Unreachable"
msgstr ""
-#: client/text.c:717 client/gui-sdl/mapview.c:568
+#: client/text.c:776 client/gui-sdl/mapview.c:568
#, c-format
msgid "Turns to target: %d"
msgstr "Tahů k cÃli: %d"
-#: client/text.c:719 client/gui-sdl/mapview.c:570
+#: client/text.c:778 client/gui-sdl/mapview.c:570
#, fuzzy, c-format
msgid "Turns to target: %d to %d"
msgstr "Tahů k cÃli: %d"
-#: client/text.c:725 client/gui-sdl/mapview.c:576
+#: client/text.c:784 client/gui-sdl/mapview.c:576
#, c-format
msgid "%d unit selected"
msgid_plural "%d units selected"
@@ -9787,37 +9862,37 @@ msgstr[0] "%d jednotka vybrána"
msgstr[1] "%d jednotky vybrány"
msgstr[2] "%d jednotek vybráno"
-#: client/text.c:730 client/gui-sdl/mapview.c:581
+#: client/text.c:789 client/gui-sdl/mapview.c:581
#, fuzzy
msgid "No units selected."
msgstr "Výběr jednotek"
-#: client/text.c:804 client/gui-sdl/mapview.c:654
+#: client/text.c:863 client/gui-sdl/mapview.c:654
#, c-format
msgid "Others: %d civil; %d military"
msgstr ""
-#: client/text.c:806 client/gui-sdl/mapview.c:656
+#: client/text.c:865 client/gui-sdl/mapview.c:656
#, c-format
msgid "Others: %d civilian"
msgstr ""
-#: client/text.c:808 client/gui-sdl/mapview.c:658
+#: client/text.c:867 client/gui-sdl/mapview.c:658
#, c-format
msgid "Others: %d military"
msgstr ""
-#: client/text.c:839
+#: client/text.c:898
#, fuzzy
msgid "No units to upgrade!"
msgstr "Žádné jednotky nemohou být vylepšeny."
-#: client/text.c:864
+#: client/text.c:923
#, fuzzy
msgid "None of these units may be upgraded."
msgstr "Žádné jednotky nemohou být vylepšeny."
-#: client/text.c:870
+#: client/text.c:929
#, fuzzy, c-format
msgid ""
"Upgrade %d unit for %d gold?\n"
@@ -9835,14 +9910,14 @@ msgstr[2] ""
"Vylepšit %s na %s za %d zlatých?\n"
"V pokladně je %d zlatých."
-#: client/text.c:891
+#: client/text.c:950
#, fuzzy
msgid "Shows your progress in researching the current technology."
msgstr ""
"Zobrazà průbÄ›h výzkumu naÅ¡Ã souÄasné technologie.\n"
"%s: %d/%d."
-#: client/text.c:897
+#: client/text.c:956
#, fuzzy
msgid "no research target."
msgstr ""
@@ -9850,46 +9925,46 @@ msgstr ""
"(žádný výzkum)"
#. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:900
+#: client/text.c:959
#, c-format
msgid "%s: %d/%d."
msgstr "%s: %d/%d."
-#: client/text.c:920
+#: client/text.c:979
#, fuzzy
msgid "Shows the progress of global warming:"
msgstr ""
"Zobrazit průbÄ›h globálnÃho oteplovánÃ:\n"
"%d."
-#: client/text.c:921
+#: client/text.c:980
#, fuzzy, c-format
msgid "Pollution rate: %d%%"
msgstr "ZneÄiÅ¡tÄ›nÃ: %3d"
-#: client/text.c:923
+#: client/text.c:982
#, c-format
msgid "Chance of catastrophic warming each turn: %d%%"
msgstr ""
-#: client/text.c:939
+#: client/text.c:998
#, fuzzy
msgid "Shows the progress of nuclear winter:"
msgstr ""
"Zobrazit průběh nukleárnà zimy:\n"
"%d."
-#: client/text.c:940
+#: client/text.c:999
#, fuzzy, c-format
msgid "Fallout rate: %d%%"
msgstr "%s max úroveň: %d%%"
-#: client/text.c:942
+#: client/text.c:1001
#, c-format
msgid "Chance of catastrophic winter each turn: %d%%"
msgstr ""
-#: client/text.c:957
+#: client/text.c:1016
#, fuzzy
msgid "Shows your current government:"
msgstr ""
@@ -9897,25 +9972,25 @@ msgstr ""
"%s."
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:981
+#: client/text.c:1040
#, c-format
msgid "Population: %5d"
msgstr "Populace: %5d"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:1043
#, c-format
msgid "Support: %5d %%"
msgstr "Podpora: %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:1047
#, c-format
msgid "Energy: %5d %%"
msgstr "Energie: %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:992
+#: client/text.c:1051
#, c-format
msgid "Mass: %5d ton"
msgid_plural "Mass: %5d tons"
@@ -9924,96 +9999,97 @@ msgstr[1] "Hmotnost: %5d tuny"
msgstr[2] "Hmotnost: %5d tun"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1057
#, c-format
msgid "Travel time: %5.1f years"
msgstr "Doba letu: %5.1f roků"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1061
msgid "Travel time: N/A "
msgstr "Doba letu: nenà známa"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1065
#, c-format
msgid "Success prob.: %5d %%"
msgstr "Ǔspěšnost odhad.: %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1010
+#: client/text.c:1069
#, c-format
msgid "Year of arrival: %8s"
msgstr "Rok doletu: %8s"
-#: client/text.c:1030
+#: client/text.c:1089
msgid "?timeout:off"
msgstr "?timeout:vyp"
-#: client/text.c:1054
+#: client/text.c:1113
#, c-format
msgid "?seconds:%02ds"
msgstr "?seconds:%02ds"
-#: client/text.c:1056
+#: client/text.c:1115
#, c-format
msgid "?mins/secs:%02dm %02ds"
msgstr "?mins/secs:%02dm %02ds"
-#: client/text.c:1058
+#: client/text.c:1117
#, c-format
msgid "?hrs/mns:%02dh %02dm"
msgstr "?hrs/mns:%02dh %02dm"
-#: client/text.c:1060
+#: client/text.c:1119
#, c-format
msgid "?dys/hrs:%02dd %02dh"
msgstr "?dys/hrs:%02dd %02dh"
-#: client/text.c:1063
+#: client/text.c:1122
msgid "?duration:overflow"
msgstr "?duration:preteÄenÃ"
-#: client/text.c:1084
+#: client/text.c:1143
#, c-format
msgid "%6d.%02d ms"
msgstr "%6d.%02d ms"
-#. TRANS: "Republic of the Poles"
-#: client/text.c:1127
-#, c-format
-msgid "%s of the %s"
-msgstr "%s %s"
+#. TRANS: <nation adjective> <government name>.
+#. * E.g. "Polish Republic".
+#: client/text.c:1188
+#, fuzzy, c-format
+msgid "?nationgovernment:%s %s"
+msgstr "ZÅ™ÃzenÃ: %s"
#. TRANS: "Observer: 1985"
-#: client/text.c:1137
+#: client/text.c:1198
#, c-format
msgid "Observer: %s"
msgstr "Pozorovatel: %s"
-#: client/text.c:1155
+#: client/text.c:1216
msgid "Buildings: "
msgstr "Stavby: "
-#: client/text.c:1172 client/text.c:1211
+#: client/text.c:1233 client/text.c:1272
msgid "None. "
msgstr "Žádné. "
-#: client/text.c:1174 client/text.c:1213
+#: client/text.c:1235 client/text.c:1274
msgid "?clistend:."
msgstr "."
-#: client/text.c:1192
+#: client/text.c:1253
msgid "Wonders: "
msgstr "Divy: "
-#: client/text.c:1247
+#: client/text.c:1308
#, 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:1251
+#: client/text.c:1312
#, fuzzy, c-format
msgid "%d content before penalty."
msgid_plural "%d content before penalty."
@@ -10022,7 +10098,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:1257
+#: client/text.c:1318
#, fuzzy, c-format
msgid "%d additional unhappy citizen."
msgid_plural "%d additional unhappy citizens."
@@ -10030,39 +10106,42 @@ msgstr[0] "%d dalÅ¡Ãch nespokojených obyvatel."
msgstr[1] "%d dalÅ¡Ãch nespokojených obyvatel."
msgstr[2] "%d dalÅ¡Ãch nespokojených obyvatel."
-#. TRANS: Martial law opening parenthesis
-#: client/text.c:1279
-msgid "Martial law in effect ("
+#: client/text.c:1339
+#, fuzzy
+msgid "Unlimited martial law in effect."
msgstr "Stanné právo v efektu ("
-#. TRANS: no [unit] maximum
-#: client/text.c:1284
-msgid "no maximum, "
-msgstr "žádné maximum, "
-
-#: client/text.c:1287
-#, c-format
-msgid "%d unit maximum, "
-msgid_plural "%d units maximum, "
-msgstr[0] "%d jednotka max., "
-msgstr[1] "%d jednotky max., "
-msgstr[2] "%d jednotek max., "
+#: client/text.c:1341
+#, fuzzy, c-format
+msgid "%d military unit may impose martial law."
+msgid_plural "Up to %d military units may impose martial law."
+msgstr[0] ""
+"* Nenà vojenskou jednotkou (nemůže utoÄit, neprosadà stanné právo).\n"
+msgstr[1] ""
+"* Nenà vojenskou jednotkou (nemůže utoÄit, neprosadà stanné právo).\n"
+msgstr[2] ""
+"* Nenà vojenskou jednotkou (nemůže utoÄit, neprosadà stanné právo).\n"
-#. TRANS: Martial law closing parenthesis
-#: client/text.c:1294
-#, c-format
-msgid "%d per unit). "
-msgstr "%d na jednotku). "
+#: client/text.c:1345
+#, fuzzy, c-format
+msgid "Each military unit makes %d unhappy citizen content."
+msgid_plural "Each military unit makes %d unhappy citizens content."
+msgstr[0] ""
+"Obveselà obyvatele mÄ›sta natolik, že uÄinà 3 nespokojené lidi spokojenými."
+msgstr[1] ""
+"Obveselà obyvatele mÄ›sta natolik, že uÄinà 3 nespokojené lidi spokojenými."
+msgstr[2] ""
+"Obveselà obyvatele mÄ›sta natolik, že uÄinà 3 nespokojené lidi spokojenými."
-#: client/text.c:1298
+#: client/text.c:1352
msgid "Military units in the field may cause unhappiness. "
msgstr "Vojenské jednotky v poli mohou způsobit nespokojenost. "
-#: client/text.c:1301
+#: client/text.c:1355
msgid "Military units have no happiness effect. "
msgstr "Vojenské jednotky nemajà na spokojenost vliv. "
-#: client/text.c:1316
+#: client/text.c:1370
#, c-format
msgid "Luxury: %d total."
msgstr "Luxus: %d celkem."
@@ -10085,7 +10164,7 @@ msgid ""
msgstr ""
"Klient nepodporuje dlaždice z hornÃho pohledu. Použijà se mÃsto toho výchozÃ."
-#: client/tilespec.c:3968
+#: client/tilespec.c:3966
#, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
@@ -10109,12 +10188,12 @@ msgid ""
"have a look."
msgstr ""
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
-#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:599
+#: client/gui-gtk-2.0/cityrep.c:624 client/gui-sdl/citydlg.c:2009
msgid "none"
msgstr "žádný"
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:645
msgid "custom"
msgstr "vlastnÃ"
@@ -10423,7 +10502,7 @@ msgstr "ZÅ™Ãdit _Obchodnà trasu"
msgid "Enter Marketplace"
msgstr "Vstup na Tržiště"
-#: client/gui-gtk-2.0/chatline.c:144 client/gui-win32/chatline.c:134
+#: client/gui-gtk-2.0/chatline.c:218 client/gui-win32/chatline.c:134
#: client/gui-xaw/chatline.c:120
msgid "Cleared output window."
msgstr "Výstupnà okno smazáno."
@@ -10504,11 +10583,11 @@ msgid "%d/%d %d turns"
msgstr "%d/%d %d tahů"
#: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:821
+#: client/gui-gtk-2.0/cityrep.c:1027
msgid "_Buy"
msgstr "_Koupit"
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:869
#, fuzzy
msgid "_Production"
msgstr "P_rodukce"
@@ -10530,12 +10609,12 @@ msgid "Entertainers"
msgstr "BaviÄi"
#: client/gui-gtk-2.0/citydlg.c:1029 client/gui-win32/citydlg.c:1989
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2403
msgid "Scientists"
msgstr "Vědci"
#: client/gui-gtk-2.0/citydlg.c:1030 client/gui-win32/citydlg.c:1991
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2404
msgid "Taxmen"
msgstr "VýbÄ›rÄà danÃ"
@@ -10629,7 +10708,7 @@ msgstr "Podporovaných jednotek %d"
msgid "Present units %d"
msgstr "PÅ™Ãtomných jednotek %d"
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:1019
msgid "Cen_ter"
msgstr "Cen_trovat"
@@ -10718,32 +10797,62 @@ msgstr "Přejmenovat město"
msgid "What should we rename the city to?"
msgstr "Jak chcete přejmenovat město?"
-#: client/gui-gtk-2.0/cityrep.c:699
+#: client/gui-gtk-2.0/cityrep.c:794
+#, fuzzy
+msgid "(no worklists defined)"
+msgstr "(seznam pracÃ)"
+
+#: client/gui-gtk-2.0/cityrep.c:876
msgid "Chan_ge"
msgstr "Změ_nit"
-#: client/gui-gtk-2.0/cityrep.c:703
+#: client/gui-gtk-2.0/cityrep.c:880
msgid "Add _First"
msgstr "PÅ™idat _PrvnÃ"
-#: client/gui-gtk-2.0/cityrep.c:707
+#: client/gui-gtk-2.0/cityrep.c:884
msgid "Add _Next"
msgstr "PÅ™idat _DalÅ¡Ã"
-#: client/gui-gtk-2.0/cityrep.c:711
+#: client/gui-gtk-2.0/cityrep.c:888
+#, fuzzy
+msgid "Add _2nd Last"
+msgstr "PÅ™idat P_oslednÃ"
+
+#: client/gui-gtk-2.0/cityrep.c:892
msgid "Add _Last"
msgstr "PÅ™idat P_oslednÃ"
-#: client/gui-gtk-2.0/cityrep.c:715
+#: client/gui-gtk-2.0/cityrep.c:899
+#, fuzzy
+msgid "Set Worklist"
+msgstr "Seznam pracÃ"
+
+#: client/gui-gtk-2.0/cityrep.c:905
+#, fuzzy
+msgid "Append Worklist"
+msgstr "PÅ™ejmenovat seznam pracÃ"
+
+#: client/gui-gtk-2.0/cityrep.c:911
+#, fuzzy
+msgid "Clear _Worklist"
+msgstr "CÃlový _Seznam pracÃ:"
+
+#: client/gui-gtk-2.0/cityrep.c:916
+#, fuzzy
+msgid "Gover_nor"
+msgstr "Guvernér"
+
+#: client/gui-gtk-2.0/cityrep.c:921
msgid "_Select"
msgstr "_Vybrat"
-#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
+#: client/gui-gtk-2.0/cityrep.c:925 client/gui-gtk-2.0/plrdlg.c:521
#, fuzzy
msgid "_Display"
msgstr "_Zobrazit"
-#: client/gui-gtk-2.0/cityrep.c:800 client/gui-gtk-2.0/menu.c:808
+#: 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-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
#: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -10753,101 +10862,101 @@ msgstr "_Zobrazit"
msgid "Cities"
msgstr "Města"
-#: client/gui-gtk-2.0/cityrep.c:817
+#: client/gui-gtk-2.0/cityrep.c:1023
#, fuzzy
msgid "_Inspect"
msgstr "_Samostatné"
-#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
-#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-sdl/helpdlg.c:297 client/gui-win32/menu.c:342
-#: client/gui-xaw/menu.c:241
+#: 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
+#: client/gui-gtk-2.0/cityrep.c:1518 client/gui-gtk-2.0/menu.c:823
+#: client/gui-gtk-2.0/menu.c:825 client/gui-gtk-2.0/menu.c:827
+#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:831
+#: client/gui-gtk-2.0/menu.c:833 client/gui-sdl/helpdlg.c:297
+#: client/gui-win32/menu.c:342 client/gui-xaw/menu.c:241
msgid "Improvements"
msgstr "VylepÅ¡enÃ"
-#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
-#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
-#: client/gui-xaw/menu.c:247
+#: client/gui-gtk-2.0/cityrep.c:1441 client/gui-gtk-2.0/cityrep.c:1460
+#: client/gui-gtk-2.0/cityrep.c:1479 client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1522 client/gui-xaw/menu.c:247
msgid "Wonders"
msgstr "Divy světa"
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1662 client/gui-win32/cityrep.c:439
#: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
msgid "All Cities"
msgstr "Všechna města"
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1667 client/gui-win32/cityrep.c:440
msgid "No Cities"
msgstr "Žádná města"
-#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1672 client/gui-win32/cityrep.c:441
msgid "Invert Selection"
msgstr "Obrátit výběr"
-#: client/gui-gtk-2.0/cityrep.c:1420
+#: client/gui-gtk-2.0/cityrep.c:1682
msgid "Building Units"
msgstr "Stavba jednotek"
-#: client/gui-gtk-2.0/cityrep.c:1426
+#: client/gui-gtk-2.0/cityrep.c:1688
msgid "Building Improvements"
msgstr "Stavba vylepÅ¡enÃ"
-#: client/gui-gtk-2.0/cityrep.c:1432
+#: client/gui-gtk-2.0/cityrep.c:1694
msgid "Building Wonders"
msgstr "Stavba divů světa"
-#: client/gui-gtk-2.0/cityrep.c:1444
+#: client/gui-gtk-2.0/cityrep.c:1706
msgid "Building Unit"
msgstr "Stavà se jednotka"
-#: client/gui-gtk-2.0/cityrep.c:1448
+#: client/gui-gtk-2.0/cityrep.c:1710
msgid "Building Improvement"
msgstr "Stavà se vylepÅ¡enÃ"
-#: client/gui-gtk-2.0/cityrep.c:1452
+#: client/gui-gtk-2.0/cityrep.c:1714
msgid "Building Wonder"
msgstr "Stavà se div světa"
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1722 client/gui-win32/cityrep.c:443
msgid "Coastal Cities"
msgstr "Pobřežnà města"
-#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1727 client/gui-win32/cityrep.c:444
msgid "Same Island"
msgstr "Stejný ostrov"
-#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1737 client/gui-win32/cityrep.c:447
msgid "Supported Units"
msgstr "Podporované jednotky"
-#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1740 client/gui-win32/cityrep.c:454
msgid "Units Present"
msgstr "PÅ™Ãtomné jednotky"
-#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1744 client/gui-win32/cityrep.c:469
msgid "Improvements in City"
msgstr "Vylepšenà ve městě"
-#: client/gui-gtk-2.0/cityrep.c:1486
+#: client/gui-gtk-2.0/cityrep.c:1748
msgid "Wonders in City"
msgstr "Divy světa ve městě"
-#: client/gui-gtk-2.0/cityrep.c:1495
+#: client/gui-gtk-2.0/cityrep.c:1757
msgid "Available Units"
msgstr "Dostupné jednotky"
-#: client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1760
msgid "Available Improvements"
msgstr "Dostupná vylepÅ¡enÃ"
-#: client/gui-gtk-2.0/cityrep.c:1501
+#: client/gui-gtk-2.0/cityrep.c:1763
msgid "Available Wonders"
msgstr "Dostupné divy světa"
-#: client/gui-gtk-2.0/cityrep.c:1625
+#: client/gui-gtk-2.0/cityrep.c:1882
#, fuzzy, c-format
msgid "Total Buy Cost: %d"
msgstr "Celkem výdaje:"
@@ -10920,12 +11029,12 @@ 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:186
+#: client/gui-gtk-2.0/dialogs.c:196 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:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
#, fuzzy
msgid "Inspect _City"
msgstr "_Ukázat město"
@@ -10954,10 +11063,10 @@ msgstr "Vyberte co plenit:"
msgid "Unit"
msgstr "Jednotka"
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
-#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
-#: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
-#: manual/civmanual.c:302 data/Freeciv.in:80
+#: 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-win32/plrdlg.c:335 manual/civmanual.c:302 data/Freeciv.in:80
msgid "Name"
msgstr "Jméno"
@@ -10983,7 +11092,7 @@ 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:1036 data/Freeciv.in:3371
+#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
msgid "Pick Nation"
msgstr "Vyberte národ"
@@ -11065,7 +11174,7 @@ msgstr "_Mapy"
msgid "_Advances"
msgstr "_Objevy"
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:910
+#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr "_Města"
@@ -11171,108 +11280,178 @@ msgstr "Zvolte mÃsto urÄenÃ"
msgid "Show _All Cities"
msgstr "Zobrazit _Všechna města"
-#: client/gui-gtk-2.0/gui_main.c:150
+#: client/gui-gtk-2.0/gui_main.c:162
msgid "Show Map Scrollbars"
msgstr "Zobrazit posuvnÃky mapy"
-#: client/gui-gtk-2.0/gui_main.c:151
+#: client/gui-gtk-2.0/gui_main.c:163
msgid "Disable this option to hide the scrollbars on the map view."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:155
+#: client/gui-gtk-2.0/gui_main.c:167
msgid "Keyboardless goto"
msgstr "Pohyb bez klávesnice"
-#: client/gui-gtk-2.0/gui_main.c:156
+#: client/gui-gtk-2.0/gui_main.c:168
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:161
+#: client/gui-gtk-2.0/gui_main.c:173
msgid "Keep dialogs on top"
msgstr "Nechat dialogy navrchu"
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:174
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:166
+#: client/gui-gtk-2.0/gui_main.c:178
msgid "Show worklist task icons"
msgstr "Zobrazovat ikony v seznamu pracÃ"
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:179
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:171
+#: client/gui-gtk-2.0/gui_main.c:183
msgid "Enable status report tabs"
msgstr "Povolit záložky s hlášenÃm stavu"
-#: client/gui-gtk-2.0/gui_main.c:172
+#: client/gui-gtk-2.0/gui_main.c:184
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:177 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:189 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:178 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:190 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:277 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:195
+msgid "Show time for each chat message"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:196
+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
+msgid "Split bottom notebook area"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:202
+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
+msgid "New message events go to top of list"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:208
+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
+msgid "Show extra message window buttons"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:214
+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 "
+"is disabled, these buttons will not appear (you can still double-click with "
+"the left mouse button or right-click on a row to inspect or goto "
+"respectively). This option will only take effect once the message window is "
+"closed and reopened."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:224
+#, fuzzy
+msgid "Metaserver tab first in network page"
+msgstr "Topic string metaserveru nastaven na '%s'."
+
+#: client/gui-gtk-2.0/gui_main.c:225
+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
+msgid "Plain chat messages are sent to allies only"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:231
+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 "
+"messages will be sent as public chat messages. To send a public chat message "
+"with this option enabled, prefix the message with a single colon ':'. This "
+"option can also be set using a toggle button beside the chat entry (only "
+"visible in multiplayer games)."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:340 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:723 client/gui-gtk-2.0/gui_main.c:1345
+#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
msgid "Freeciv"
msgstr "Freeciv"
-#: client/gui-gtk-2.0/gui_main.c:1088 client/gui-gtk-2.0/gui_main.c:1095
+#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
#: 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:1095 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1232 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:1127 client/gui-gtk-2.0/menu.c:770
-#: client/gui-gtk-2.0/menu.c:772 client/gui-gtk-2.0/menu.c:774
-#: client/gui-gtk-2.0/menu.c:776 client/gui-gtk-2.0/menu.c:778
-#: client/gui-gtk-2.0/menu.c:780 client/gui-gtk-2.0/menu.c:782
-#: client/gui-gtk-2.0/menu.c:784 client/gui-gtk-2.0/menu.c:786
-#: client/gui-gtk-2.0/menu.c:788 client/gui-gtk-2.0/menu.c:790
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-gtk-2.0/menu.c:804 client/gui-gtk-2.0/menu.c:806
-#: client/gui-gtk-2.0/menu.c:808 client/gui-gtk-2.0/menu.c:810
-#: client/gui-gtk-2.0/menu.c:812 client/gui-gtk-2.0/menu.c:814
-#: client/gui-gtk-2.0/menu.c:816 client/gui-gtk-2.0/menu.c:818
-#: client/gui-gtk-2.0/menu.c:820 client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/gui_main.c:1266 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
+#: client/gui-gtk-2.0/menu.c:811 client/gui-gtk-2.0/menu.c:813
+#: client/gui-gtk-2.0/menu.c:815 client/gui-gtk-2.0/menu.c:817
+#: client/gui-gtk-2.0/menu.c:819 client/gui-gtk-2.0/menu.c:821
+#: client/gui-gtk-2.0/menu.c:823 client/gui-gtk-2.0/menu.c:825
+#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
+#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
+#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
+#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
+#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
+#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
#: data/Freeciv.in:2028
msgid "View"
msgstr "Zobrazit"
-#: client/gui-gtk-2.0/gui_main.c:1208
+#: client/gui-gtk-2.0/gui_main.c:1359
msgid "Chat"
msgstr "Chat"
-#: client/gui-gtk-2.0/gui_main.c:1224 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1377 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"
@@ -11284,74 +11463,78 @@ msgstr ""
"Nápovědy.\n"
"Tak.. Jdeme na to!"
-#: client/gui-gtk-2.0/gui_main.c:1491
+#: client/gui-gtk-2.0/gui_main.c:1392
+msgid "Allies Only"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:1657
#, fuzzy
msgid "Not _ready"
msgstr ", nepřipraven"
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
+#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
msgid "_Ready"
msgstr "_Připraven"
-#: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2132
+#: 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
msgid "_Start"
msgstr "_Start"
-#: client/gui-gtk-2.0/gui_main.c:1520
+#: client/gui-gtk-2.0/gui_main.c:1686
#, fuzzy
msgid "_Take Player"
msgstr "Města"
-#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
+#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
msgid "Pick _Nation"
msgstr "Vyberte _národ"
-#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
+#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
#, fuzzy
msgid "_Observe"
msgstr "_Pozorovatel"
-#: client/gui-gtk-2.0/gui_main.c:1532
+#: client/gui-gtk-2.0/gui_main.c:1698
#, fuzzy
msgid "Do not _observe"
msgstr "nynà _pozoruje"
-#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
msgid "<AI>"
msgstr "<PO>"
-#: client/gui-gtk-2.0/gui_main.c:1557
+#: client/gui-gtk-2.0/gui_main.c:1723
msgid "<Novice AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1560
+#: client/gui-gtk-2.0/gui_main.c:1726
msgid "<Easy AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1563
+#: client/gui-gtk-2.0/gui_main.c:1729
msgid "<Normal AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1732
msgid "<Hard AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1742 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:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
msgid "Observer"
msgstr "Pozorovatel"
-#: client/gui-gtk-2.0/gui_main.c:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
#, fuzzy
msgid "Detached"
msgstr "Mrtvý"
-#: client/gui-gtk-2.0/gui_main.c:1899
+#: client/gui-gtk-2.0/gui_main.c:2073
msgid "Are you sure you want to quit?"
msgstr "Opravdu to chcete ukonÄit?"
@@ -11583,474 +11766,511 @@ msgstr "_Technologie"
msgid "Foreign Intelligence: %s Empire"
msgstr "ZahraniÄnà pÅ™ehled: %s Impérium"
-#: client/gui-gtk-2.0/mapctrl.c:195 client/gui-sdl/mapctrl.c:2565
+#: client/gui-gtk-2.0/mapctrl.c:179 client/gui-sdl/mapctrl.c:2565
#: client/gui-sdl/menu.c:839 client/gui-sdl/menu.c:1021
#: client/gui-win32/mapctrl.c:353
msgid "Build New City"
msgstr "Založit nové město"
-#: client/gui-gtk-2.0/mapctrl.c:196 client/gui-sdl/mapctrl.c:2594
+#: client/gui-gtk-2.0/mapctrl.c:180 client/gui-sdl/mapctrl.c:2594
#: client/gui-win32/mapctrl.c:354 client/gui-xaw/mapctrl.c:89
msgid "What should we call our new city?"
msgstr "Jak budeme nazývat naše nové město?"
-#: client/gui-gtk-2.0/mapview.c:147
+#: client/gui-gtk-2.0/mapview.c:158
msgid "Shows your current luxury/science/tax rates;click to toggle them."
msgstr ""
"Zobrazà souÄasné hodnoty luxusu/vÄ›dy/danÃ; kliknÄ›te pro jejich pÅ™epnutÃ."
-#: client/gui-gtk-2.0/mapview.c:692 client/gui-win32/canvas.c:275
+#: client/gui-gtk-2.0/mapview.c:702 client/gui-win32/canvas.c:275
msgid "Better fog will only work in truecolor. Disabling it"
msgstr "LepÅ¡Ã clona funguje pouze v truecolor. VypÃná se"
-#: client/gui-gtk-2.0/menu.c:250
+#: client/gui-gtk-2.0/menu.c:256
msgid "Leaving a local game will end it!"
msgstr "OpuÅ¡tÄ›nà lokálnà hry ji ukonÄÃ!"
-#: client/gui-gtk-2.0/menu.c:700 client/gui-win32/menu.c:303
+#: client/gui-gtk-2.0/menu.c:727 client/gui-win32/menu.c:303
msgid "_Game"
msgstr "_Hra"
-#: client/gui-gtk-2.0/menu.c:702 client/gui-gtk-2.0/menu.c:704
-#: client/gui-gtk-2.0/menu.c:706 client/gui-gtk-2.0/menu.c:708
-#: client/gui-gtk-2.0/menu.c:710 client/gui-gtk-2.0/menu.c:712
-#: client/gui-gtk-2.0/menu.c:714 client/gui-gtk-2.0/menu.c:717
-#: client/gui-gtk-2.0/menu.c:720 client/gui-gtk-2.0/menu.c:722
-#: client/gui-gtk-2.0/menu.c:724 client/gui-gtk-2.0/menu.c:726
-#: client/gui-gtk-2.0/menu.c:728 client/gui-gtk-2.0/menu.c:730
-#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:736
-#: client/gui-gtk-2.0/menu.c:738 client/gui-gtk-2.0/menu.c:740
+#: client/gui-gtk-2.0/menu.c:729 client/gui-gtk-2.0/menu.c:731
+#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:735
+#: client/gui-gtk-2.0/menu.c:737 client/gui-gtk-2.0/menu.c:739
+#: client/gui-gtk-2.0/menu.c:741 client/gui-gtk-2.0/menu.c:744
+#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
+#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
+#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
+#: client/gui-gtk-2.0/menu.c:760 client/gui-gtk-2.0/menu.c:763
+#: client/gui-gtk-2.0/menu.c:765 client/gui-gtk-2.0/menu.c:767
#: data/Freeciv.in:2026
msgid "Game"
msgstr "Hra"
-#: client/gui-gtk-2.0/menu.c:704 client/gui-gtk-2.0/menu.c:706
-#: client/gui-gtk-2.0/menu.c:708
+#: client/gui-gtk-2.0/menu.c:731 client/gui-gtk-2.0/menu.c:733
+#: client/gui-gtk-2.0/menu.c:735
msgid "_Chat"
msgstr "_Chat"
-#: client/gui-gtk-2.0/menu.c:706 client/gui-win32/menu.c:314
+#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:314
msgid "_Clear Log"
msgstr "_Smazat Log"
-#: client/gui-gtk-2.0/menu.c:708 client/gui-win32/menu.c:313
+#: client/gui-gtk-2.0/menu.c:735 client/gui-win32/menu.c:313
#, fuzzy
msgid "_Write Log"
msgstr "E_xportovat log"
-#: client/gui-gtk-2.0/menu.c:710 client/gui-win32/menu.c:304
+#: client/gui-gtk-2.0/menu.c:737 client/gui-win32/menu.c:304
msgid "Local _Options"
msgstr "Lokálnà M_ožnosti"
-#: client/gui-gtk-2.0/menu.c:712 client/gui-win32/menu.c:305
+#: client/gui-gtk-2.0/menu.c:739 client/gui-win32/menu.c:305
msgid "_Message Options"
msgstr "_Možnosti zpráv"
-#: client/gui-gtk-2.0/menu.c:717
+#: client/gui-gtk-2.0/menu.c:744
#, fuzzy
msgid "_Reload Tileset"
msgstr "Sada dlaždic"
-#: client/gui-gtk-2.0/menu.c:720
+#: client/gui-gtk-2.0/menu.c:747
#, fuzzy
msgid "Save Options on _Exit"
msgstr "Volby serveru (stávajÃcÃ)"
-#: client/gui-gtk-2.0/menu.c:722
+#: client/gui-gtk-2.0/menu.c:749
#, fuzzy
msgid "Sa_ve Options"
msgstr "Možnosti hry"
-#: client/gui-gtk-2.0/menu.c:726 client/gui-win32/menu.c:308
+#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:308
msgid "Server O_ptions"
msgstr "Možnosti s_erveru."
-#: client/gui-gtk-2.0/menu.c:730 client/gui-win32/menu.c:310
+#: client/gui-gtk-2.0/menu.c:757 client/gui-win32/menu.c:310
msgid "_Save Game"
msgstr "_Uložit hru"
-#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:311
+#: client/gui-gtk-2.0/menu.c:760 client/gui-win32/menu.c:311
msgid "Save Game _As..."
msgstr "Uložit hru _jako..."
-#: client/gui-gtk-2.0/menu.c:738
+#: client/gui-gtk-2.0/menu.c:765
msgid "_Leave"
msgstr "Od_ejÃt"
-#: client/gui-gtk-2.0/menu.c:740 client/gui-win32/menu.c:317
+#: client/gui-gtk-2.0/menu.c:767 client/gui-win32/menu.c:317
msgid "_Quit"
msgstr "_Konec"
-#: client/gui-gtk-2.0/menu.c:745 client/gui-win32/menu.c:321
+#: client/gui-gtk-2.0/menu.c:772 client/gui-win32/menu.c:321
msgid "Gov_ernment"
msgstr "Státnà zÅ™Ãz_enÃ"
-#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
-#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
-#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:774 client/gui-gtk-2.0/menu.c:776
+#: client/gui-gtk-2.0/menu.c:778 client/gui-gtk-2.0/menu.c:780
+#: client/gui-gtk-2.0/menu.c:782 client/gui-gtk-2.0/menu.c:784
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
#: client/gui-xaw/menu.c:248 data/Freeciv.in:2027 data/helpdata.txt:1320
msgid "Government"
msgstr "Státnà zÅ™ÃzenÃ"
-#: client/gui-gtk-2.0/menu.c:749 client/gui-win32/menu.c:322
+#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:322
msgid "_Tax Rates"
msgstr "_DanÄ›"
-#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:324
+#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:324
msgid "_Find City"
msgstr "_NajÃt mÄ›sto"
-#: client/gui-gtk-2.0/menu.c:755 client/gui-win32/menu.c:325
+#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:325
msgid "_Worklists"
msgstr "Sezn_amy pracÃ"
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
-#: client/gui-gtk-2.0/menu.c:764 client/gui-win32/menu.c:327
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
+#: client/gui-gtk-2.0/menu.c:791 client/gui-win32/menu.c:327
msgid "_Change Government"
msgstr "_ZmÄ›na zÅ™ÃzenÃ"
-#: client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:788
msgid "_Revolution..."
msgstr "_Revoluce..."
-#: client/gui-gtk-2.0/menu.c:764 client/gui-gtk-2.0/menu.c:970
+#: client/gui-gtk-2.0/menu.c:791 client/gui-gtk-2.0/menu.c:1013
#: client/gui-win32/menu.c:431
msgid "_Government"
msgstr "_ZÅ™ÃzenÃ"
-#: client/gui-gtk-2.0/menu.c:768 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:795 client/gui-gtk-2.0/menu.c:959
#: client/gui-win32/menu.c:334
msgid "_View"
msgstr "_Zobrazit"
-#: client/gui-gtk-2.0/menu.c:772
+#: client/gui-gtk-2.0/menu.c:799
#, fuzzy
msgid "City Outlines"
msgstr "Možnosti města"
-#: client/gui-gtk-2.0/menu.c:774 client/gui-win32/menu.c:335
+#: client/gui-gtk-2.0/menu.c:801 client/gui-win32/menu.c:335
msgid "Map _Grid"
msgstr "_MřÞku na mapě"
-#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:336
+#: client/gui-gtk-2.0/menu.c:803 client/gui-win32/menu.c:336
msgid "National _Borders"
msgstr "Státnà _Hranice"
-#: client/gui-gtk-2.0/menu.c:778 client/gui-win32/menu.c:337
+#: client/gui-gtk-2.0/menu.c:805 client/gui-win32/menu.c:337
msgid "City _Names"
msgstr "_Jména měst"
-#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:338
+#: client/gui-gtk-2.0/menu.c:807 client/gui-win32/menu.c:338
msgid "City G_rowth"
msgstr "Růst mě_sta"
-#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:339
+#: client/gui-gtk-2.0/menu.c:809 client/gui-win32/menu.c:339
msgid "City _Productions"
msgstr "_Produkci měst"
-#: client/gui-gtk-2.0/menu.c:784 client/gui-sdl/optiondlg.c:1719
+#: client/gui-gtk-2.0/menu.c:811
+#, fuzzy
+msgid "City Buy Cost"
+msgstr "Celkem výdaje:"
+
+#: client/gui-gtk-2.0/menu.c:813
+#, fuzzy
+msgid "City Traderoutes"
+msgstr "Obchodnà cesty:"
+
+#: client/gui-gtk-2.0/menu.c:815 client/gui-sdl/optiondlg.c:1719
msgid "Draw city worker map grid"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:788 client/gui-sdl/optiondlg.c:1635
+#: client/gui-gtk-2.0/menu.c:819 client/gui-sdl/optiondlg.c:1635
#: client/gui-win32/menu.c:340 client/gui-xaw/menu.c:148
#: client/gui-xaw/menu.c:246 manual/civmanual.c:220 data/helpdata.txt:1220
msgid "Terrain"
msgstr "Terén"
-#: client/gui-gtk-2.0/menu.c:790 client/gui-win32/menu.c:341
+#: client/gui-gtk-2.0/menu.c:821 client/gui-win32/menu.c:341
#: client/gui-xaw/menu.c:149
msgid "Coastline"
msgstr "PobÅ™ežÃ"
-#: client/gui-gtk-2.0/menu.c:796 client/gui-win32/menu.c:343
+#: client/gui-gtk-2.0/menu.c:827 client/gui-win32/menu.c:343
msgid "Roads & Rails"
msgstr "Cesty a železnice"
-#: client/gui-gtk-2.0/menu.c:800 client/gui-sdl/optiondlg.c:1933
+#: client/gui-gtk-2.0/menu.c:831 client/gui-sdl/optiondlg.c:1933
#: client/gui-win32/menu.c:345 client/gui-xaw/menu.c:152
msgid "Mines"
msgstr "Doly"
-#: client/gui-gtk-2.0/menu.c:802 client/gui-win32/menu.c:346
+#: client/gui-gtk-2.0/menu.c:833 client/gui-win32/menu.c:346
msgid "Fortress & Airbase"
msgstr "Pevnosti a letiště"
-#: client/gui-gtk-2.0/menu.c:804 client/gui-win32/menu.c:348
+#: client/gui-gtk-2.0/menu.c:835 client/gui-win32/menu.c:348
#: client/gui-xaw/menu.c:154
msgid "Specials"
msgstr "Speciality"
-#: client/gui-gtk-2.0/menu.c:806 client/gui-win32/menu.c:349
+#: client/gui-gtk-2.0/menu.c:837 client/gui-win32/menu.c:349
#: client/gui-xaw/menu.c:155
msgid "Pollution & Fallout"
msgstr "ZneÄiÅ¡tÄ›nà a spad"
-#: client/gui-gtk-2.0/menu.c:812 client/gui-win32/menu.c:352
+#: client/gui-gtk-2.0/menu.c:843 client/gui-win32/menu.c:352
#: client/gui-xaw/menu.c:158
msgid "Focus Unit"
msgstr "Výběr jednotky"
-#: client/gui-gtk-2.0/menu.c:814 client/gui-sdl/optiondlg.c:1854
+#: client/gui-gtk-2.0/menu.c:845 client/gui-sdl/optiondlg.c:1854
#: client/gui-win32/menu.c:353 client/gui-xaw/menu.c:159
msgid "Fog of War"
msgstr "Clona války"
-#: client/gui-gtk-2.0/menu.c:818
+#: client/gui-gtk-2.0/menu.c:849
msgid "_Full Screen"
msgstr "_Fullscreen"
-#: client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/menu.c:853
msgid "_Center View"
msgstr "_Centrovat pohled"
-#: client/gui-gtk-2.0/menu.c:825 client/gui-win32/menu.c:358
+#: client/gui-gtk-2.0/menu.c:856 client/gui-win32/menu.c:358
msgid "_Orders"
msgstr "_PÅ™Ãkazy"
-#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
-#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
-#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
-#: client/gui-gtk-2.0/menu.c:855 client/gui-gtk-2.0/menu.c:857
-#: client/gui-gtk-2.0/menu.c:859 client/gui-gtk-2.0/menu.c:861
-#: client/gui-gtk-2.0/menu.c:863 client/gui-gtk-2.0/menu.c:865
-#: client/gui-gtk-2.0/menu.c:867 client/gui-gtk-2.0/menu.c:869
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875 client/gui-gtk-2.0/menu.c:877
-#: client/gui-gtk-2.0/menu.c:879 client/gui-gtk-2.0/menu.c:881
-#: client/gui-gtk-2.0/menu.c:883 client/gui-gtk-2.0/menu.c:885
-#: client/gui-gtk-2.0/menu.c:887 client/gui-gtk-2.0/menu.c:889
-#: client/gui-gtk-2.0/menu.c:891 client/gui-gtk-2.0/menu.c:893
-#: client/gui-gtk-2.0/menu.c:895 client/gui-gtk-2.0/menu.c:897
-#: client/gui-gtk-2.0/menu.c:899 client/gui-gtk-2.0/menu.c:901
-#: client/gui-gtk-2.0/menu.c:903 data/Freeciv.in:2029
+#: client/gui-gtk-2.0/menu.c:858 client/gui-gtk-2.0/menu.c:860
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:864
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:868
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:872
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:876
+#: client/gui-gtk-2.0/menu.c:878 client/gui-gtk-2.0/menu.c:880
+#: client/gui-gtk-2.0/menu.c:882 client/gui-gtk-2.0/menu.c:884
+#: client/gui-gtk-2.0/menu.c:886 client/gui-gtk-2.0/menu.c:888
+#: client/gui-gtk-2.0/menu.c:890 client/gui-gtk-2.0/menu.c:892
+#: client/gui-gtk-2.0/menu.c:894 client/gui-gtk-2.0/menu.c:896
+#: client/gui-gtk-2.0/menu.c:898 client/gui-gtk-2.0/menu.c:900
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906 client/gui-gtk-2.0/menu.c:908
+#: client/gui-gtk-2.0/menu.c:910 client/gui-gtk-2.0/menu.c:912
+#: client/gui-gtk-2.0/menu.c:914 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:918 client/gui-gtk-2.0/menu.c:920
+#: client/gui-gtk-2.0/menu.c:922 client/gui-gtk-2.0/menu.c:924
+#: client/gui-gtk-2.0/menu.c:926 client/gui-gtk-2.0/menu.c:928
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
+#: client/gui-gtk-2.0/menu.c:946 data/Freeciv.in:2029
msgid "Orders"
msgstr "PÅ™Ãkazy"
-#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:1444
+#: client/gui-gtk-2.0/menu.c:860 client/gui-gtk-2.0/menu.c:1489
#: client/gui-win32/menu.c:359
msgid "_Build City"
msgstr "Založit město (_B)"
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:1466
-#: client/gui-gtk-2.0/menu.c:1472 client/gui-win32/menu.c:360
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:1511
+#: client/gui-gtk-2.0/menu.c:1517 client/gui-win32/menu.c:360
msgid "Build _Road"
msgstr "Postavit cestu (_R)"
-#: client/gui-gtk-2.0/menu.c:833 client/gui-gtk-2.0/menu.c:1360
+#: 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 "Postavit zavlažovánà (_I)"
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:1361
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:1406
#: client/gui-win32/menu.c:362
msgid "Build _Mine"
msgstr "Postavit důl (_M)"
-#: client/gui-gtk-2.0/menu.c:837 client/gui-gtk-2.0/menu.c:1362
+#: client/gui-gtk-2.0/menu.c:868 client/gui-gtk-2.0/menu.c:1407
msgid "Transf_orm Terrain"
msgstr "Transf_ormovat terén"
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:1508
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:1553
#: client/gui-win32/menu.c:364
msgid "Build _Fortress"
msgstr "Postavit pevnost (_F)"
-#: client/gui-gtk-2.0/menu.c:841 client/gui-win32/menu.c:365
+#: client/gui-gtk-2.0/menu.c:872 client/gui-win32/menu.c:365
msgid "Build Airbas_e"
msgstr "Postavit letiště (_E)"
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:1514
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:1559
#: client/gui-win32/menu.c:366
msgid "Clean _Pollution"
msgstr "Odstranit zneÄiÅ¡tÄ›nà (_P)"
-#: client/gui-gtk-2.0/menu.c:845 client/gui-win32/menu.c:367
+#: client/gui-gtk-2.0/menu.c:876 client/gui-win32/menu.c:367
msgid "Clean _Nuclear Fallout"
msgstr "Odstranit radioaktivnà spad (_N)"
-#: client/gui-gtk-2.0/menu.c:849 client/gui-win32/menu.c:369
+#: client/gui-gtk-2.0/menu.c:880 client/gui-win32/menu.c:369
msgid "_Sentry"
msgstr "Strážit (_S)"
-#: client/gui-gtk-2.0/menu.c:855 client/gui-win32/menu.c:372
+#: client/gui-gtk-2.0/menu.c:886 client/gui-win32/menu.c:372
msgid "Make _Homecity"
msgstr "Vytvořit _Domovské město"
-#: client/gui-gtk-2.0/menu.c:857 client/gui-win32/menu.c:373
+#: client/gui-gtk-2.0/menu.c:888 client/gui-win32/menu.c:373
msgid "_Load"
msgstr "Na_ložit"
-#: client/gui-gtk-2.0/menu.c:859
+#: client/gui-gtk-2.0/menu.c:890
msgid "_Unload Transporter"
msgstr "_Vyložit transportér"
-#: client/gui-gtk-2.0/menu.c:861 client/gui-win32/menu.c:374
+#: client/gui-gtk-2.0/menu.c:892 client/gui-win32/menu.c:374
msgid "_Unload"
msgstr "_Vyložit"
-#: client/gui-gtk-2.0/menu.c:863 client/gui-win32/menu.c:375
+#: client/gui-gtk-2.0/menu.c:894 client/gui-win32/menu.c:375
msgid "Wake up o_thers"
msgstr "Probudit os_tatnÃ"
-#: client/gui-gtk-2.0/menu.c:867
+#: client/gui-gtk-2.0/menu.c:898
msgid "_Auto Settler"
msgstr "_Auto OsadnÃk"
-#: client/gui-gtk-2.0/menu.c:869 client/gui-win32/menu.c:378
+#: client/gui-gtk-2.0/menu.c:900 client/gui-win32/menu.c:378
msgid "Auto E_xplore"
msgstr "Auto Průzkum (_X)"
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906
msgid "_Connect"
msgstr "_Připojit"
-#: client/gui-gtk-2.0/menu.c:871 client/gui-win32/menu.c:380
+#: client/gui-gtk-2.0/menu.c:902 client/gui-win32/menu.c:380
msgid "_Road"
msgstr "Cesta (_R)"
-#: client/gui-gtk-2.0/menu.c:873 client/gui-win32/menu.c:381
+#: client/gui-gtk-2.0/menu.c:904 client/gui-win32/menu.c:381
msgid "Rai_l"
msgstr "Že_leznice"
-#: client/gui-gtk-2.0/menu.c:875 client/gui-win32/menu.c:382
+#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:382
msgid "_Irrigate"
msgstr "Závlaha (-I)"
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
#, fuzzy
msgid "Go _to"
msgstr "JÃt"
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
msgid "_Build city"
msgstr "Založit město (_B)"
-#: client/gui-gtk-2.0/menu.c:879
+#: client/gui-gtk-2.0/menu.c:910
msgid "Patrol (_Q)"
msgstr "HlÃdkovat (_Q)"
-#: client/gui-gtk-2.0/menu.c:881 client/gui-win32/menu.c:385
+#: client/gui-gtk-2.0/menu.c:912 client/gui-win32/menu.c:385
msgid "_Go to"
msgstr "Přesunout se (_G)"
-#: client/gui-gtk-2.0/menu.c:883
+#: client/gui-gtk-2.0/menu.c:914
msgid "Go\\/Airlift to City"
msgstr "Přesun\\/Letecký most do města"
-#: client/gui-gtk-2.0/menu.c:885 client/gui-sdl/menu.c:450
+#: client/gui-gtk-2.0/menu.c:916 client/gui-sdl/menu.c:450
#: client/gui-win32/menu.c:387 client/gui-xaw/menu.c:203
msgid "Return to nearest city"
msgstr "Návrat do nejbližšÃho mÄ›sta"
-#: client/gui-gtk-2.0/menu.c:889 client/gui-win32/menu.c:389
+#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:389
#: client/gui-xaw/menu.c:205
msgid "Disband Unit"
msgstr "Rozpustit jednotku"
-#: client/gui-gtk-2.0/menu.c:891 client/gui-sdl/citydlg.c:532
+#: client/gui-gtk-2.0/menu.c:922 client/gui-sdl/citydlg.c:532
#: data/Freeciv.in:1186
msgid "Upgrade unit"
msgstr "Vylepšit jednotku"
-#: client/gui-gtk-2.0/menu.c:893
+#: client/gui-gtk-2.0/menu.c:924
msgid "Diplomat\\/Spy Actions"
msgstr "Diplomatické\\/Špionážnà akce"
-#: client/gui-gtk-2.0/menu.c:895 client/gui-sdl/menu.c:399
+#: client/gui-gtk-2.0/menu.c:926 client/gui-sdl/menu.c:399
#: client/gui-win32/menu.c:391 client/gui-xaw/menu.c:209
msgid "Explode Nuclear"
msgstr "Odpálit jadernou střelu"
-#: client/gui-gtk-2.0/menu.c:899
-msgid "Select same type"
-msgstr "Vyberte stejný typ"
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/cityrep.c:882
+msgid "Select"
+msgstr "Výběr"
+
+#: client/gui-gtk-2.0/menu.c:934
+#, fuzzy
+msgid "Single"
+msgstr "Džungle"
+
+#: client/gui-gtk-2.0/menu.c:936
+msgid "Same Type On Tile"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:938
+msgid "All On Tile"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:940
+msgid "Same Type On Continent"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:942
+msgid "Same Type Everywhere"
+msgstr ""
-#: client/gui-gtk-2.0/menu.c:901 client/gui-win32/menu.c:393
+#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:393
msgid "_Wait"
msgstr "ÄŒekat (_W)"
-#: client/gui-gtk-2.0/menu.c:903 client/gui-win32/menu.c:394
+#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:394
#: client/gui-xaw/menu.c:213
msgid "Done"
msgstr "Hotovo"
-#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:398
+#: client/gui-gtk-2.0/menu.c:949 client/gui-win32/menu.c:398
msgid "_Reports"
msgstr "_Přehledy"
-#: client/gui-gtk-2.0/menu.c:908 client/gui-gtk-2.0/menu.c:910
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:914
-#: client/gui-gtk-2.0/menu.c:916 client/gui-gtk-2.0/menu.c:918
-#: client/gui-gtk-2.0/menu.c:920 client/gui-gtk-2.0/menu.c:922
-#: client/gui-gtk-2.0/menu.c:924 client/gui-gtk-2.0/menu.c:926
-#: client/gui-gtk-2.0/menu.c:928 client/gui-gtk-2.0/menu.c:930
-#: client/gui-gtk-2.0/menu.c:932 data/Freeciv.in:2030
+#: client/gui-gtk-2.0/menu.c:951 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:957
+#: client/gui-gtk-2.0/menu.c:959 client/gui-gtk-2.0/menu.c:961
+#: client/gui-gtk-2.0/menu.c:963 client/gui-gtk-2.0/menu.c:965
+#: client/gui-gtk-2.0/menu.c:967 client/gui-gtk-2.0/menu.c:969
+#: client/gui-gtk-2.0/menu.c:971 client/gui-gtk-2.0/menu.c:973
+#: client/gui-gtk-2.0/menu.c:975 data/Freeciv.in:2030
msgid "Reports"
msgstr "Přehledy"
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:958
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:1001
#: client/gui-win32/menu.c:400 client/gui-win32/menu.c:425
msgid "_Units"
msgstr "_Jednotky"
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/menu.c:914 client/gui-win32/menu.c:402
+#: client/gui-gtk-2.0/menu.c:957 client/gui-win32/menu.c:402
#, fuzzy
msgid "_Nations"
msgstr "_Národy"
-#: client/gui-gtk-2.0/menu.c:918 client/gui-win32/menu.c:403
+#: client/gui-gtk-2.0/menu.c:961 client/gui-win32/menu.c:403
msgid "_Economy"
msgstr "_Ekonomika"
#. TRANS: Research report action
-#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:405
+#: client/gui-gtk-2.0/menu.c:963 client/gui-win32/menu.c:405
msgid "_Research"
msgstr "_Výzkum"
-#: client/gui-gtk-2.0/menu.c:924 client/gui-win32/menu.c:407
+#: client/gui-gtk-2.0/menu.c:967 client/gui-win32/menu.c:407
msgid "_Wonders of the World"
msgstr "_Divy světa"
-#: client/gui-gtk-2.0/menu.c:926 client/gui-win32/menu.c:408
+#: client/gui-gtk-2.0/menu.c:969 client/gui-win32/menu.c:408
msgid "_Top Five Cities"
msgstr "_PÄ›t nejlepÅ¡Ãch mÄ›st"
-#: client/gui-gtk-2.0/menu.c:928 client/gui-win32/menu.c:409
+#: client/gui-gtk-2.0/menu.c:971 client/gui-win32/menu.c:409
msgid "_Messages"
msgstr "_Zprávy"
-#: client/gui-gtk-2.0/menu.c:930 client/gui-win32/menu.c:410
+#: client/gui-gtk-2.0/menu.c:973 client/gui-win32/menu.c:410
msgid "_Demographics"
msgstr "D_emografické údaje"
-#: client/gui-gtk-2.0/menu.c:932 client/gui-gtk-2.0/plrdlg.c:471
+#: client/gui-gtk-2.0/menu.c:975 client/gui-gtk-2.0/plrdlg.c:354
#: client/gui-win32/menu.c:411
msgid "_Spaceship"
msgstr "_Kosmická loÄ"
-#: client/gui-gtk-2.0/menu.c:936 client/gui-win32/menu.c:415
+#: client/gui-gtk-2.0/menu.c:979 client/gui-win32/menu.c:415
msgid "_Help"
msgstr "_Nápověda"
-#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
-#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
-#: client/gui-gtk-2.0/menu.c:946 client/gui-gtk-2.0/menu.c:948
-#: client/gui-gtk-2.0/menu.c:950 client/gui-gtk-2.0/menu.c:952
-#: client/gui-gtk-2.0/menu.c:954 client/gui-gtk-2.0/menu.c:956
-#: client/gui-gtk-2.0/menu.c:958 client/gui-gtk-2.0/menu.c:960
-#: client/gui-gtk-2.0/menu.c:962 client/gui-gtk-2.0/menu.c:964
-#: client/gui-gtk-2.0/menu.c:966 client/gui-gtk-2.0/menu.c:968
-#: client/gui-gtk-2.0/menu.c:970 client/gui-gtk-2.0/menu.c:972
-#: client/gui-gtk-2.0/menu.c:974 client/gui-gtk-2.0/menu.c:976
-#: client/gui-gtk-2.0/menu.c:978 client/gui-gtk-2.0/menu.c:980
+#: client/gui-gtk-2.0/menu.c:981 client/gui-gtk-2.0/menu.c:983
+#: client/gui-gtk-2.0/menu.c:985 client/gui-gtk-2.0/menu.c:987
+#: client/gui-gtk-2.0/menu.c:989 client/gui-gtk-2.0/menu.c:991
+#: client/gui-gtk-2.0/menu.c:993 client/gui-gtk-2.0/menu.c:995
+#: client/gui-gtk-2.0/menu.c:997 client/gui-gtk-2.0/menu.c:999
+#: client/gui-gtk-2.0/menu.c:1001 client/gui-gtk-2.0/menu.c:1003
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-gtk-2.0/menu.c:1007
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-gtk-2.0/menu.c:1011
+#: client/gui-gtk-2.0/menu.c:1013 client/gui-gtk-2.0/menu.c:1015
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-gtk-2.0/menu.c:1019
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-gtk-2.0/menu.c:1023
#: client/gui-gtk-2.0/repodlgs.c:313 client/gui-win32/citydlg.c:1077
#: client/gui-win32/repodlgs.c:289 client/gui-win32/wldlg.c:846
#: data/Freeciv.in:1466 data/Freeciv.in:2031 data/Freeciv.in:2101
@@ -12058,119 +12278,119 @@ msgstr "_Nápověda"
msgid "Help"
msgstr "Nápověda"
-#: client/gui-gtk-2.0/menu.c:940 client/gui-win32/menu.c:416
+#: client/gui-gtk-2.0/menu.c:983 client/gui-win32/menu.c:416
msgid "Language_s"
msgstr "Jazyk_y"
-#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/menu.c:417
+#: client/gui-gtk-2.0/menu.c:985 client/gui-win32/menu.c:417
msgid "Co_nnecting"
msgstr "PÅ™ipoj_ovánÃ"
-#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:418
+#: client/gui-gtk-2.0/menu.c:987 client/gui-win32/menu.c:418
msgid "C_ontrols"
msgstr "_OvládánÃ"
-#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:419
+#: client/gui-gtk-2.0/menu.c:989 client/gui-win32/menu.c:419
msgid "C_hatline"
msgstr "C_hatlinka"
-#: client/gui-gtk-2.0/menu.c:948 client/gui-win32/menu.c:420
+#: client/gui-gtk-2.0/menu.c:991 client/gui-win32/menu.c:420
msgid "_Worklist Editor"
msgstr "_Editor seznamu pracÃ"
-#: client/gui-gtk-2.0/menu.c:950 client/gui-win32/menu.c:421
+#: client/gui-gtk-2.0/menu.c:993 client/gui-win32/menu.c:421
msgid "Citizen _Management"
msgstr "Správce oby_vatelstva"
-#: client/gui-gtk-2.0/menu.c:952 client/gui-win32/menu.c:422
+#: client/gui-gtk-2.0/menu.c:995 client/gui-win32/menu.c:422
msgid "_Playing"
msgstr "_HranÃ"
-#: client/gui-gtk-2.0/menu.c:956 client/gui-win32/menu.c:424
+#: client/gui-gtk-2.0/menu.c:999 client/gui-win32/menu.c:424
msgid "City _Improvements"
msgstr "_Vylepšenà města"
-#: client/gui-gtk-2.0/menu.c:960 client/gui-win32/menu.c:426
+#: client/gui-gtk-2.0/menu.c:1003 client/gui-win32/menu.c:426
msgid "Com_bat"
msgstr "_Boj"
-#: client/gui-gtk-2.0/menu.c:962 client/gui-win32/menu.c:427
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-win32/menu.c:427
msgid "_ZOC"
msgstr "_ZK"
-#: client/gui-gtk-2.0/menu.c:964 client/gui-win32/menu.c:428
+#: client/gui-gtk-2.0/menu.c:1007 client/gui-win32/menu.c:428
msgid "Techno_logy"
msgstr "Techno_logie"
-#: client/gui-gtk-2.0/menu.c:966 client/gui-win32/menu.c:429
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-win32/menu.c:429
msgid "_Terrain"
msgstr "_Terén"
-#: client/gui-gtk-2.0/menu.c:968 client/gui-win32/menu.c:430
+#: client/gui-gtk-2.0/menu.c:1011 client/gui-win32/menu.c:430
msgid "Won_ders"
msgstr "_Divy světa"
-#: client/gui-gtk-2.0/menu.c:972 client/gui-win32/menu.c:432
+#: client/gui-gtk-2.0/menu.c:1015 client/gui-win32/menu.c:432
msgid "Happin_ess"
msgstr "Spokoj_enost"
-#: client/gui-gtk-2.0/menu.c:974 client/gui-win32/menu.c:433
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-win32/menu.c:433
msgid "Space _Race"
msgstr "VesmÃrný _závod"
-#: client/gui-gtk-2.0/menu.c:978 client/gui-win32/menu.c:435
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-win32/menu.c:435
msgid "_Copying"
msgstr "_LicenÄnà ujednánÃ"
-#: client/gui-gtk-2.0/menu.c:980 client/gui-win32/menu.c:436
+#: client/gui-gtk-2.0/menu.c:1023 client/gui-win32/menu.c:436
msgid "_About"
msgstr "_O programu"
-#: client/gui-gtk-2.0/menu.c:1264
+#: client/gui-gtk-2.0/menu.c:1307
#, c-format
msgid "%s..."
msgstr "%s..."
-#: client/gui-gtk-2.0/menu.c:1352
+#: client/gui-gtk-2.0/menu.c:1397
#, c-format
msgid "Change to %s (_I)"
msgstr "Změnit na %s (_I)"
-#: client/gui-gtk-2.0/menu.c:1353
+#: client/gui-gtk-2.0/menu.c:1398
#, c-format
msgid "Change to %s (_M)"
msgstr "Změnit na %s (_M)"
-#: client/gui-gtk-2.0/menu.c:1354
+#: client/gui-gtk-2.0/menu.c:1399
#, c-format
msgid "Transf_orm to %s"
msgstr "Transf_ormovat na %s"
-#: client/gui-gtk-2.0/menu.c:1427
+#: client/gui-gtk-2.0/menu.c:1472
msgid "Help _Build Wonder"
msgstr "Pomoci se stavbou _divu světa"
-#: client/gui-gtk-2.0/menu.c:1441
+#: client/gui-gtk-2.0/menu.c:1486
msgid "Add to City (_B)"
msgstr "Usadit se ve městě (_B)"
-#: client/gui-gtk-2.0/menu.c:1449
+#: client/gui-gtk-2.0/menu.c:1494
msgid "Make Trade _Route"
msgstr "ZÅ™Ãdit obchodnà t_rasu"
-#: client/gui-gtk-2.0/menu.c:1463
+#: client/gui-gtk-2.0/menu.c:1508
msgid "Build _Railroad"
msgstr "Stavět Žele_znici"
-#: client/gui-gtk-2.0/menu.c:1486
+#: client/gui-gtk-2.0/menu.c:1531
msgid "Bu_ild Farmland"
msgstr "Postav_it farmu"
-#: client/gui-gtk-2.0/menu.c:1506
+#: client/gui-gtk-2.0/menu.c:1551
msgid "_Fortify"
msgstr "_Opevnit"
-#: client/gui-gtk-2.0/menu.c:1512
+#: client/gui-gtk-2.0/menu.c:1557
msgid "_Paradrop"
msgstr "_Výsadek"
@@ -12207,13 +12427,32 @@ msgstr "Zpr"
msgid "Pop"
msgstr "Sam"
-#: client/gui-gtk-2.0/messagewin.c:155 client/gui-sdl/messagewin.c:247
+#: client/gui-gtk-2.0/messagewin.c:186 client/gui-sdl/messagewin.c:247
#: client/gui-win32/messagewin.c:132 client/gui-xaw/menu.c:228
#: data/Freeciv.in:3273 data/Freeciv.in:3274 data/Freeciv.in:3283
msgid "Messages"
msgstr "Zprávy"
-#: client/gui-gtk-2.0/plrdlg.c:330
+#: client/gui-gtk-2.0/plrdlg.c:317
+msgid "_Meet"
+msgstr "_Setkat se"
+
+#: client/gui-gtk-2.0/plrdlg.c:323
+#, fuzzy
+msgid "Cancel _Treaty"
+msgstr "_Zrušit dohodu"
+
+#: client/gui-gtk-2.0/plrdlg.c:329
+#, fuzzy
+msgid "_Withdraw Vision"
+msgstr "_ZruÅ¡it nahlÞenÃ"
+
+#: client/gui-gtk-2.0/plrdlg.c:348
+#, fuzzy
+msgid "_Report"
+msgstr "_Přehledy"
+
+#: client/gui-gtk-2.0/plrdlg.c:386
msgid "?show:Dead Players"
msgstr ""
@@ -12221,274 +12460,277 @@ msgstr ""
#. TRANS: Nations report action
#. TRANS: Nations report title
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/plrdlg.c:350 client/gui-sdl/mapctrl.c:1580
+#: client/gui-gtk-2.0/plrdlg.c:406 client/gui-sdl/mapctrl.c:1580
#: client/gui-sdl/plrdlg.c:608 client/gui-win32/plrdlg.c:344
#: client/gui-xaw/menu.c:221 data/Freeciv.in:3192 data/Freeciv.in:3193
msgid "Nations"
msgstr "Národy"
-#: client/gui-gtk-2.0/plrdlg.c:443
-msgid "_Intelligence"
-msgstr "_Výzvědná služba"
-
-#: client/gui-gtk-2.0/plrdlg.c:450
-msgid "_Meet"
-msgstr "_Setkat se"
-
-#: client/gui-gtk-2.0/plrdlg.c:457
+#: client/gui-gtk-2.0/plrdlg.c:511
#, fuzzy
-msgid "Cancel _Treaty"
-msgstr "_Zrušit dohodu"
+msgid "Di_plomacy"
+msgstr "Diplomacie"
-#: client/gui-gtk-2.0/plrdlg.c:464
-msgid "_Withdraw vision"
-msgstr "_ZruÅ¡it nahlÞenÃ"
+#: client/gui-gtk-2.0/plrdlg.c:516
+msgid "_Intelligence"
+msgstr "_Výzvědná služba"
-#: client/gui-gtk-2.0/plrdlg.c:495
+#: client/gui-gtk-2.0/plrdlg.c:526
msgid "_AI"
msgstr "_PoÄÃtaÄ"
-#: client/gui-gtk-2.0/plrdlg.c:501
+#: client/gui-gtk-2.0/plrdlg.c:532
msgid "_Toggle AI Mode"
msgstr "_Přepnout na PO mód"
-#: client/gui-gtk-2.0/pages.c:208
+#: client/gui-gtk-2.0/pages.c:221
msgid "Start _New Game"
msgstr "Start _nové hry"
-#: client/gui-gtk-2.0/pages.c:214
+#: client/gui-gtk-2.0/pages.c:227
msgid "Start _Scenario Game"
msgstr "Start s_cénáře"
-#: client/gui-gtk-2.0/pages.c:220
+#: client/gui-gtk-2.0/pages.c:233
msgid "_Load Saved Game"
msgstr "Nahrát u_loženou hru"
-#: client/gui-gtk-2.0/pages.c:229
+#: client/gui-gtk-2.0/pages.c:239
msgid "C_onnect to Network Game"
msgstr "PÅ™ip_ojit k sÃÅ¥ové hÅ™e"
-#: client/gui-gtk-2.0/pages.c:236
+#: client/gui-gtk-2.0/pages.c:247
msgid "Connect to Gaming _Zone"
msgstr "Připojit do Hernà _Zóny"
-#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:300
#: client/gui-xaw/connectdlg.c:326
msgid "Passwords don't match, enter password."
msgstr "Hesla nesouhlasÃ, zadejte heslo."
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:779 client/gui-gtk-2.0/pages.c:820
+#: client/gui-win32/connectdlg.c:916
msgid "Server Name"
msgstr "Jméno serveru"
-#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
+#: 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
+#: data/Freeciv.in:96
msgid "Port"
msgstr "Port"
-#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
+#: client/gui-win32/connectdlg.c:917
msgid "Version"
msgstr "Verze"
-#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
-#: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
+#: 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
msgid "Status"
msgstr "Stav"
-#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
-#: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
+#: 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
msgid "Players"
msgstr "HráÄi"
-#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
+#: client/gui-win32/connectdlg.c:918
msgid "Comment"
msgstr "Komentář"
-#: client/gui-gtk-2.0/pages.c:747
+#: client/gui-gtk-2.0/pages.c:786
msgid "Local _Area Network"
msgstr "Lo_kálnà sÃÅ¥"
-#: client/gui-gtk-2.0/pages.c:783
+#: client/gui-gtk-2.0/pages.c:827
msgid "Internet _Metaserver"
msgstr "Internet _Metaserver"
-#: client/gui-gtk-2.0/pages.c:817
+#: client/gui-gtk-2.0/pages.c:864
msgid "_Host:"
msgstr "_Host:"
-#: client/gui-gtk-2.0/pages.c:834
+#: client/gui-gtk-2.0/pages.c:881
msgid "_Port:"
msgstr "_Port:"
-#: client/gui-gtk-2.0/pages.c:851
+#: client/gui-gtk-2.0/pages.c:898
msgid "_Login:"
msgstr "_Login:"
-#: client/gui-gtk-2.0/pages.c:869
+#: client/gui-gtk-2.0/pages.c:916
msgid "Pass_word:"
msgstr "He_slo:"
-#: client/gui-gtk-2.0/pages.c:887
+#: client/gui-gtk-2.0/pages.c:934
msgid "Conf_irm Password:"
msgstr "Heslo z_novu:"
-#: client/gui-gtk-2.0/pages.c:912
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: 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/wldlg.c:800 client/gui-win32/wldlg.c:806
+msgid "Type"
+msgstr "Typ"
+
+#: client/gui-gtk-2.0/pages.c:952 client/gui-win32/plrdlg.c:337
+#: data/Freeciv.in:88
+msgid "Host"
+msgstr "Host"
+
+#: client/gui-gtk-2.0/pages.c:981
msgid "C_onnect"
msgstr "Přip_ojit"
-#: client/gui-gtk-2.0/pages.c:1142
+#: client/gui-gtk-2.0/pages.c:1211
#, c-format
msgid "Connection name: %s"
msgstr "Název pÅ™ipojenÃ: %s"
-#: client/gui-gtk-2.0/pages.c:1145
+#: client/gui-gtk-2.0/pages.c:1214
#, c-format
msgid "Player name: %s"
msgstr "Jméno hráÄe: %s"
-#: client/gui-gtk-2.0/pages.c:1150
+#: client/gui-gtk-2.0/pages.c:1219
#, c-format
msgid "Host: %s"
msgstr "Host: %s"
-#: client/gui-gtk-2.0/pages.c:1158
+#: client/gui-gtk-2.0/pages.c:1227
msgid "Player/conn info"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1185
+#: client/gui-gtk-2.0/pages.c:1254
#, c-format
msgid "%s info"
msgstr "%s info"
-#: client/gui-gtk-2.0/pages.c:1196
+#: client/gui-gtk-2.0/pages.c:1265
#, fuzzy
msgid "Toggle player ready"
msgstr "aitoggle <jméno-hráÄe>"
-#: client/gui-gtk-2.0/pages.c:1204
+#: client/gui-gtk-2.0/pages.c:1273
msgid "Pick nation"
msgstr "Vyberte národ"
-#: client/gui-gtk-2.0/pages.c:1214
+#: client/gui-gtk-2.0/pages.c:1283
msgid "Observe this player"
msgstr "Pozorovat tohoto hráÄe"
-#: client/gui-gtk-2.0/pages.c:1221
+#: client/gui-gtk-2.0/pages.c:1290
#, fuzzy
msgid "Take this player"
msgstr "Města"
-#: client/gui-gtk-2.0/pages.c:1238
+#: client/gui-gtk-2.0/pages.c:1307
#, fuzzy
msgid "Cut connection"
msgstr "RuÅ¡Ãm spojenà s %s."
-#: client/gui-gtk-2.0/pages.c:1248
+#: client/gui-gtk-2.0/pages.c:1317
#, fuzzy
msgid "Aitoggle player"
msgstr "aitoggle <jméno-hráÄe>"
-#: client/gui-gtk-2.0/pages.c:1257
+#: client/gui-gtk-2.0/pages.c:1326
#, fuzzy
msgid "Remove player"
msgstr "Odstraňuji hráÄe %s."
-#: client/gui-gtk-2.0/pages.c:1268
+#: client/gui-gtk-2.0/pages.c:1337
msgid "Give info access"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1276
+#: client/gui-gtk-2.0/pages.c:1345
msgid "Give ctrl access"
msgstr ""
#. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1338
+#: client/gui-gtk-2.0/pages.c:1407
#, fuzzy, c-format
msgid "Put on %s"
msgstr "Populace: %s"
-#: client/gui-gtk-2.0/pages.c:1442
+#: client/gui-gtk-2.0/pages.c:1511
#, fuzzy
msgid "Number of _Players (including AI):"
msgstr "_PoÄet hráÄů (vÄetnÄ› poÄÃtaÄových):"
-#: client/gui-gtk-2.0/pages.c:1465
+#: client/gui-gtk-2.0/pages.c:1534
#, fuzzy
msgid "AI Skill _Level:"
msgstr "Úroveň poÄÃtaÄem ovládaných hráÄů:"
-#: client/gui-gtk-2.0/pages.c:1481
+#: client/gui-gtk-2.0/pages.c:1550
#, fuzzy
msgid "Ruleset _Version:"
msgstr "Vládce:"
-#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
msgid "_More Game Options..."
msgstr "VÃce M_ožnostà Hry..."
-#: client/gui-gtk-2.0/pages.c:1514
+#: client/gui-gtk-2.0/pages.c:1583
msgid "Record"
msgstr "Záznam"
-#: client/gui-gtk-2.0/pages.c:1519
+#: client/gui-gtk-2.0/pages.c:1588
#, fuzzy
msgid "Rating"
msgstr "ÄekánÃ"
-#: client/gui-gtk-2.0/pages.c:1525
+#: client/gui-gtk-2.0/pages.c:1594
msgid "Ready"
msgstr "Připraven"
-#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
-#: data/nation/slovakian.ruleset:26
-msgid "Leader"
-msgstr "Vůdce"
+#: client/gui-gtk-2.0/pages.c:1601
+#, fuzzy
+msgid "?player:Leader"
+msgstr "?Player:Jméno"
-#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1732 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:1752
+#: client/gui-gtk-2.0/pages.c:1824
msgid "Choose Saved Game to _Load:"
msgstr "Vyberte uloženou hru pro _nahránÃ:"
-#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
-#: client/gui-gtk-2.0/pages.c:2375
+#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
+#: client/gui-gtk-2.0/pages.c:2451
msgid "_Browse..."
msgstr "_Procházet..."
-#: client/gui-gtk-2.0/pages.c:1839
+#: client/gui-gtk-2.0/pages.c:1911
msgid "Choose a Scenario"
msgstr "Vyberte scénář"
-#: client/gui-gtk-2.0/pages.c:1926
+#: client/gui-gtk-2.0/pages.c:1998
msgid "Choose a _Scenario:"
msgstr "Vyberte _scénář:"
-#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
-#: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
-#: client/gui-win32/wldlg.c:806
-msgid "Type"
-msgstr "Typ"
-
-#: client/gui-gtk-2.0/pages.c:2101
+#: client/gui-gtk-2.0/pages.c:2173
msgid "Choose a _nation to play:"
msgstr "Vyberte _národ pro hru:"
-#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2363 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:2372 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2448 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr "Uložit hru"
-#: client/gui-gtk-2.0/pages.c:2413
+#: client/gui-gtk-2.0/pages.c:2489
msgid "Saved _Games:"
msgstr "Uložené _hry:"
-#: client/gui-gtk-2.0/pages.c:2440
+#: client/gui-gtk-2.0/pages.c:2516
msgid "Save _Filename:"
msgstr "Uložit _soubor:"
@@ -12840,7 +13082,7 @@ msgstr ""
msgid "Total users logged in : %d"
msgstr ""
-#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1094
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
msgid "Back"
msgstr "Zpět"
@@ -12849,7 +13091,7 @@ msgid "Start"
msgstr "Start"
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:775
+#: client/gui-win32/connectdlg.c:777
msgid "Load Game"
msgstr "Nahrát hru"
@@ -12890,12 +13132,12 @@ msgid "Make new homecity"
msgstr "Nové domovské město"
#: client/gui-sdl/citydlg.c:546 client/gui-sdl/citydlg.c:1418
-#: client/gui-sdl/connectdlg.c:307 client/gui-sdl/connectdlg.c:616
-#: client/gui-sdl/connectdlg.c:802 client/gui-sdl/connectdlg.c:984
+#: 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/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1039
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
#: 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
@@ -12944,7 +13186,7 @@ msgstr "Koupit!"
#: client/gui-sdl/diplodlg.c:1335 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:2427
+#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
#: client/gui-xaw/cityrep.c:666 client/gui-xaw/cma_fe.c:327
#: client/gui-xaw/cma_fe.c:511 client/gui-xaw/cma_fe.c:765
#: client/gui-xaw/messagedlg.c:72 client/gui-xaw/optiondlg.c:76
@@ -12960,7 +13202,7 @@ msgstr "Ne"
#: client/gui-sdl/diplodlg.c:1345 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:2427 client/gui-xaw/cityrep.c:666
+#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
#: client/gui-xaw/cma_fe.c:327 client/gui-xaw/cma_fe.c:511
#: client/gui-xaw/cma_fe.c:765 client/gui-xaw/messagedlg.c:72
#: client/gui-xaw/optiondlg.c:76 client/gui-xaw/optiondlg.c:304
@@ -13251,37 +13493,37 @@ msgstr "PoužÃt jednou"
msgid "Release city"
msgstr "Uvolnit město"
-#: client/gui-sdl/connectdlg.c:238
+#: client/gui-sdl/connectdlg.c:239
msgid "Creating Server List..."
msgstr "VytvářÃm seznam serverů..."
-#: client/gui-sdl/connectdlg.c:279 client/gui-sdl/connectdlg.c:343
+#: client/gui-sdl/connectdlg.c:280 client/gui-sdl/connectdlg.c:344
#, fuzzy
msgid "No LAN servers found"
msgstr "LAN servery"
-#: client/gui-sdl/connectdlg.c:281 client/gui-sdl/connectdlg.c:345
+#: client/gui-sdl/connectdlg.c:282 client/gui-sdl/connectdlg.c:346
msgid "No public servers found"
msgstr ""
-#: client/gui-sdl/connectdlg.c:555
+#: client/gui-sdl/connectdlg.c:556
msgid "Player Name :"
msgstr "Jméno hráÄe:"
-#: client/gui-sdl/connectdlg.c:571
+#: client/gui-sdl/connectdlg.c:572
msgid "Freeciv Server :"
msgstr "Freeciv server:"
-#: client/gui-sdl/connectdlg.c:588
+#: client/gui-sdl/connectdlg.c:589
msgid "Port :"
msgstr "Port:"
-#: client/gui-sdl/connectdlg.c:608 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr "Připojit"
-#: client/gui-sdl/connectdlg.c:794 client/gui-sdl/connectdlg.c:977
+#: client/gui-sdl/connectdlg.c:795 client/gui-sdl/connectdlg.c:978
#: client/gui-xaw/connectdlg.c:145
msgid "Next"
msgstr "DalÅ¡Ã"
@@ -13559,7 +13801,7 @@ msgstr ""
#: client/gui-sdl/graphics.c:1021
#, c-format
-msgid "Unable to initialize SDL_ttf library: %s"
+msgid "Unable to initialize SDL_ttf library: %s"
msgstr ""
#: client/gui-sdl/graphics.c:1058
@@ -13647,12 +13889,6 @@ msgstr "Inicializace klienta"
msgid "Waiting for the beginning of the game"
msgstr ""
-#: client/gui-sdl/gui_string.c:608
-msgid ""
-"Couldn't find stdfont.ttf file. Please link/copy/move anyunicode ttf font to "
-"data dir as stdfont.ttf"
-msgstr ""
-
#. TRANS: Future Technology
#: client/gui-sdl/gui_tilespec.c:506
msgid "FT"
@@ -14259,12 +14495,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:1098 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1100 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:963
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
msgid "Start New Game"
msgstr "Start nové hry"
@@ -14385,8 +14621,8 @@ msgstr ""
msgid "%s max rate : %d%%"
msgstr "%s max úroveň: %d%%"
-#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1081
-#: client/gui-win32/connectdlg.c:1089 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
+#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
msgid "Update"
msgstr "Aktualizovat"
@@ -14837,10 +15073,6 @@ msgstr "Změnit vše"
msgid "Refresh"
msgstr "Obnovit"
-#: client/gui-win32/cityrep.c:882
-msgid "Select"
-msgstr "Výběr"
-
#: client/gui-win32/cityrep.c:883
msgid "Configure"
msgstr "Konfigurovat"
@@ -14890,55 +15122,55 @@ msgstr "Nelze nahrát uloženou hru"
msgid "Verify Password"
msgstr "Heslo znovu"
-#: client/gui-win32/connectdlg.c:912 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr "Freeciv výběr serveru"
-#: client/gui-win32/connectdlg.c:913
+#: client/gui-win32/connectdlg.c:915
msgid "Local Area Network"
msgstr "Lokálnà sÃÅ¥"
-#: client/gui-win32/connectdlg.c:947
+#: client/gui-win32/connectdlg.c:949
msgid "Welcome to Freeciv"
msgstr "VÃtejte ve Freeciv"
-#: client/gui-win32/connectdlg.c:965
+#: client/gui-win32/connectdlg.c:967
msgid "Load Saved Game"
msgstr "Nahrát uloženou hru"
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
msgid "Connect To Network Game"
msgstr "PÅ™ipojit k sÃÅ¥ové hÅ™e"
-#: client/gui-win32/connectdlg.c:977
+#: client/gui-win32/connectdlg.c:979
msgid "Choose a nation to play"
msgstr "Vyberte národ pro hru"
-#: client/gui-win32/connectdlg.c:1012
+#: client/gui-win32/connectdlg.c:1014
msgid "Number of players (Including AI):"
msgstr "PoÄet hráÄů (vÄetnÄ› poÄÃtaÄových):"
-#: client/gui-win32/connectdlg.c:1020
+#: client/gui-win32/connectdlg.c:1022
msgid "AI skill level:"
msgstr "Úroveň poÄÃtaÄem ovládaných hráÄů:"
-#: client/gui-win32/connectdlg.c:1034 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
msgid "Game Options"
msgstr "Možnosti hry"
-#: client/gui-win32/connectdlg.c:1038
+#: client/gui-win32/connectdlg.c:1040
msgid "Start Game"
msgstr "Start hry"
-#: client/gui-win32/connectdlg.c:1057
+#: client/gui-win32/connectdlg.c:1059
msgid "Login:"
msgstr "Login:"
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
msgid "Host:"
msgstr "Host:"
-#: client/gui-win32/connectdlg.c:1060
+#: client/gui-win32/connectdlg.c:1062
msgid "Port:"
msgstr "Port:"
@@ -15200,10 +15432,6 @@ msgstr[0] "(neÄinný %d tah)"
msgstr[1] "(neÄinný %d tahy)"
msgstr[2] "(neÄinný %d tahů)"
-#: client/gui-win32/plrdlg.c:337 data/Freeciv.in:88
-msgid "Host"
-msgstr "Host"
-
#: client/gui-win32/plrdlg.c:355 data/Freeciv.in:3230
msgid "Intelligence"
msgstr "Výzvědná služba"
@@ -16961,12 +17189,12 @@ msgstr ""
#: data/helpdata.txt:781
msgid ""
-" To have a diplomatic relationship with another player, you must fist "
-"establish first contact with that player. To establish first contact, you "
-"have to move one of your units next to a city or unit belonging to that "
-"player, or vice versa. Unless you establish an embassy with that player, you "
-"may again lose contact with them after a set number of turns without direct "
-"physical contact."
+" To have a diplomatic relationship with another player, you must first "
+"establish contact with that player. To establish contact, you have to move "
+"one of your units next to a city or unit belonging to that player, or vice "
+"versa. Unless you establish an embassy with that player, you may again lose "
+"contact with them after a set number of turns without direct physical "
+"contact."
msgstr ""
#: data/helpdata.txt:788
@@ -19677,7 +19905,7 @@ msgid "Communism"
msgstr "Socialismus"
#: data/default/governments.ruleset:121 data/civ2/governments.ruleset:118
-#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:26
+#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:27
msgid "Comrade"
msgstr "Soudruh"
@@ -20604,6 +20832,11 @@ msgstr ""
"mÃstÄ›, protože pÅ™ebyteÄná práce nebude využita. NavÃc mohou být lehce "
"ztraceni při nepřátelském útoku."
+#: data/default/units.ruleset:238
+#, fuzzy
+msgid "?unit:Workers"
+msgstr "PracovnÃci"
+
#: data/default/units.ruleset:264
msgid ""
"Workers are one of the key units in the game. They can be used to irrigate "
@@ -21256,6 +21489,11 @@ msgstr "PrůzkumnÃk"
msgid "Explorers are very useful for mapping unknown territory."
msgstr "PrůzkumnÃci jsou velice užiteÄnà pÅ™i mapovánà neznámého územÃ."
+#: data/default/units.ruleset:1864
+#, fuzzy
+msgid "?unit:Leader"
+msgstr "Vůdce"
+
#: data/default/units.ruleset:1892
msgid "This is you. If you lose this unit, you lose the game. So don't."
msgstr ""
@@ -21512,7 +21750,7 @@ msgid "Emir"
msgstr "EmÃr"
#: data/nation/afghani.ruleset:25 data/nation/slovakian.ruleset:30
-#: data/nation/soviet.ruleset:27
+#: data/nation/soviet.ruleset:28
#, fuzzy
msgid "General Secretary"
msgstr "Prvnà sekretář"
@@ -21630,7 +21868,7 @@ msgstr "?plural:Arméni"
msgid ""
"According to legend, the Armenian people are the descendants of Haik - the "
"great-great-grandson of Noah. The modern Republic of Armenia gained "
-"independence from Soviet in 1991 AD"
+"independence from the Soviet Union in 1991."
msgstr ""
#: data/nation/assyrian.ruleset:3
@@ -22657,12 +22895,11 @@ msgstr "?plural:Italové"
#: data/nation/illyrian.ruleset:6
msgid ""
-"Illyrians were Indo-European tribes who appeared in the western part of the "
-"Balkan Peninsula before 1000 BC, including the Dalmatians to the north, "
-"Corcyra island and Ambracia bay in prehistoric Epirus to the south, mixing "
-"with Thracians in Dardania to the east, and settling Messapia across the "
-"Adriatic Sea. Illyrian kingdoms were independent for centuries, until "
-"conquered by the Roman Republic."
+"Illyrians were Indo-European tribes who appeared in the western part of the "
+"Balkan Peninsula before 1000 BC, including Corcyra island and Ambracia bay "
+"in prehistoric Epirus to the south. They mixed with Thracians in Dardania to "
+"the east, and settled Messapia across the Adriatic Sea. Illyrian kingdoms "
+"were independent for centuries, until conquered by the Roman Republic."
msgstr ""
#: data/nation/inca.ruleset:3
@@ -22977,7 +23214,7 @@ msgid ""
"1953."
msgstr ""
-#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:28
+#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:29
msgid "Great Leader"
msgstr "Velký vůdce"
@@ -23150,9 +23387,9 @@ msgstr "?plural:Malajci"
msgid ""
"Sub-Saharan Africa has been a cultural and ethnical melting pot for "
"millennia. In medieval times, the region was home to a succession of empires "
-"called the Sahelian kingdoms. Of these, the Islamic Mali empire with it's "
+"called the Sahelian kingdoms. Of these, the Islamic Mali empire with its "
"capital in Timbuktu was the most influential. This empire reigned from the "
-"14th to the 17th century and was famed for it's wealth and benevolent kings. "
+"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 ""
@@ -23219,8 +23456,8 @@ msgstr "?plural:Malajci"
#: data/nation/mayan.ruleset:6
msgid ""
-"The Mayans were a Mesoamerican civilization. Famous for building great "
-"pyramids and palaces in the jungle."
+"The Mayans were a Mesoamerican civilization. They are famous for building "
+"great pyramids and palaces in the jungle."
msgstr ""
#: data/nation/mayan.ruleset:19
@@ -23749,6 +23986,16 @@ msgstr ""
"Slovensko je zemÄ› v srdci Evropy. Bylo souÄástà Československa, pred tÃm do "
"roku 1918 souÄástà Rakousko-Uherské monarchie."
+#: data/nation/slovakian.ruleset:26
+#, fuzzy
+msgid "?male:Leader"
+msgstr "Vůdce"
+
+#: data/nation/slovakian.ruleset:26
+#, fuzzy
+msgid "?female:Leader"
+msgstr "?female:Soudružka"
+
#: data/nation/slovakian.ruleset:29
#, fuzzy
msgid "Pope"
@@ -23788,11 +24035,12 @@ msgstr "?plural:Sověté"
#: data/nation/soviet.ruleset:6
msgid ""
-"Soviet Union's history starts in November 1917, when under Lenin's "
+"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 "
-"republics integrated into one country. Soviet Union became one of most "
-"powerful states in the 20th century. But by the end of 1991 due to many "
-"social shocks it disintegrated into fifteen independent countries"
+"republics integrated into one country. The Soviet Union became one of most "
+"powerful states in the 20th century, but by the end of 1991 it had "
+"disintegrated into fifteen independent countries due to social and economic "
+"problems."
msgstr ""
#: data/nation/spanish.ruleset:3
@@ -24190,8 +24438,8 @@ msgstr "?plural:Italové"
#: data/nation/westphalian.ruleset:6
msgid ""
-"Westphalia, before becoming a Prussian province, was the western region the "
-"duchy of Saxony. Present-day it consists of the Northern part of the largest "
+"Westphalia, before becoming a Prussian province, was the western region of "
+"the duchy of Saxony. Today it makes up the northern part of the largest "
"German federal state, North Rhine-Westphalia."
msgstr ""
@@ -24339,7 +24587,7 @@ msgid ""
"The flag and background color indicate what civilization the city\n"
"belongs to (this will be useful when you meet other civilizations).\n"
"The top row of the bar also shows the name and size of the city, and\n"
-"will show one or more starts to indicate if there are units in the\n"
+"will show one or more stars to indicate if there are units in the\n"
"city. The bottom row shows what the city is building, and how long it\n"
"will take; it also shows how long the city will take to grow to the\n"
"next largest size."
@@ -24395,7 +24643,7 @@ msgid ""
"Now your city has grown to size five. As cities get larger unrest\n"
"becomes a problem. A city of this size will usually have one unhappy\n"
"citizen unless pacifying effects are used; meaning one entertainer\n"
-"specialist is required to keep your citzens content. This is basically\n"
+"specialist is required to keep your citizens content. This is basically\n"
"a wasted citizen.\n"
"\n"
"There are several things that can be done about this. One quick fix\n"
@@ -24467,7 +24715,7 @@ msgid ""
"existing cities. Generally when building new cities you want to make\n"
"sure that all tiles are covered by at least one city, but after that\n"
"it is best that your cities overlap as little as possible. Spreading\n"
-"out cities properly gives each city access to more resrouces, allowing\n"
+"out cities properly gives each city access to more resources, allowing\n"
"them to grow to larger sizes."
msgstr ""
@@ -24749,6 +24997,66 @@ msgstr "Tým 30"
msgid "Team 31"
msgstr "Tým 31"
+#, fuzzy
+#~ msgid "Auth config filename \"%s\" not allowed!"
+#~ msgstr "Toto jméno nenà povoleno."
+
+#~ msgid "The %s of the %s (%s)"
+#~ msgstr "%s %s (%s)"
+
+#, fuzzy
+#~ msgid ""
+#~ "Illegal alliance structure detected: %s alliance to %s reduced to peace "
+#~ "treaty."
+#~ msgstr "Neplatná struktura aliance: Aliance %s s %s byla redukována na mÃr."
+
+#, fuzzy
+#~ msgid "And, became more experienced!"
+#~ msgstr " a stala se vÃce zkuÅ¡enou!"
+
+#~ msgid "We can't take control of server, attempting to kill it."
+#~ msgstr "Nelze pÅ™evzÃt kontrolu nad serverem, zkusÃme kill."
+
+#, fuzzy
+#~ msgid "%s territory"
+#~ msgstr "Územà %s"
+
+#, fuzzy
+#~ msgid "%s territory (%d turn cease-fire)"
+#~ msgid_plural "%s territory (%d turn cease-fire)"
+#~ msgstr[0] "%s územà (%d tah pÅ™ÃměřÃ)"
+#~ msgstr[1] "%s územà (%d tahy pÅ™ÃměřÃ)"
+#~ msgstr[2] "%s územà (%d tahů pÅ™ÃměřÃ)"
+
+#, fuzzy
+#~ msgid "%s territory (%s)"
+#~ msgstr "Územà %s %s"
+
+#~ msgid "City: %s (%s)"
+#~ msgstr "Město: %s (%s)"
+
+#, fuzzy
+#~ msgid "Unit: %s (%s)"
+#~ msgstr "Jednotka: %s(%s)"
+
+#~ msgid "%s of the %s"
+#~ msgstr "%s %s"
+
+#~ msgid "no maximum, "
+#~ msgstr "žádné maximum, "
+
+#~ msgid "%d unit maximum, "
+#~ msgid_plural "%d units maximum, "
+#~ msgstr[0] "%d jednotka max., "
+#~ msgstr[1] "%d jednotky max., "
+#~ msgstr[2] "%d jednotek max., "
+
+#~ msgid "%d per unit). "
+#~ msgstr "%d na jednotku). "
+
+#~ msgid "Select same type"
+#~ msgstr "Vyberte stejný typ"
+
#~ msgid "Units: "
#~ msgstr "Jednotek: "
@@ -24864,9 +25172,6 @@ msgstr "Tým 31"
#~ msgid ", nation %s"
#~ msgstr ", národ %s"
-#~ msgid ", team %s"
-#~ msgstr ", tým %s"
-
#~ msgid "_Map"
#~ msgstr "_Mapa"
@@ -26682,9 +26987,6 @@ msgstr "Tým 31"
#~ msgid "Nation %s (used by %s) isn't available."
#~ msgstr "Národ %s (použit %s) nenà dostupný."
-#~ msgid "Metaserver topic string set to '%s'."
-#~ msgstr "Topic string metaserveru nastaven na '%s'."
-
#~ msgid "Metaserver topic string set to '%s', not reporting to metaserver."
#~ msgstr ""
#~ "Topic string metaserveru nastaven na '%s', nebude se posÃlat metaserveru."
diff --git a/po/da.gmo b/po/da.gmo
index 91db54d..60f2a0b 100644
Binary files a/po/da.gmo and b/po/da.gmo differ
diff --git a/po/da.po b/po/da.po
index 431ba79..e346a36 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,5 +1,5 @@
# Danish translation of Freeciv.
-# Copyright (C) 1999-2008 The Freeciv Team, Joe Hansen.
+# Copyright (C) 1999-2009 The Freeciv Team, Joe Hansen.
# This translation is covered by the GNU General Public License Version 2.
#
# Konventioner:
@@ -10,7 +10,7 @@
# ' ' og /" /" følger den engelske tekst.
# Keld Simonsen <keld at dkuug.dk>, 2001-2002, 2004.
# Ole Laursen <olau at hardworking.dk>, 2004.
-# Joe Hansen <joedalton2 at yahoo.dk>, 2006, 2007, 2008.
+# Joe Hansen <joedalton2 at yahoo.dk>, 2006, 2007, 2008, 2009.
# Herudover har Dansk-Gruppen været behjælpelig med teknik og diverse sprogspørgsmål.
# Også en tak til Elmo som har lagt da.po filer på plads i svn.
#
@@ -18,8 +18,8 @@ msgid ""
msgstr ""
"Project-Id-Version: da\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 07:45+0900\n"
-"PO-Revision-Date: 2008-11-05 18:43+0300\n"
+"POT-Creation-Date: 2009-03-29 21:13+0900\n"
+"PO-Revision-Date: 2009-03-07 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"
@@ -646,7 +646,7 @@ msgid "Road"
msgstr "Vej"
#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
-#: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
+#: client/gui-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"
@@ -663,7 +663,7 @@ msgid "Mine"
msgstr "Mine"
#: common/terrain.c:396 common/unit.c:548 server/report.c:124
-#: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
+#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr "Forurening"
@@ -709,7 +709,7 @@ msgstr "Befæstet"
msgid "Sentry"
msgstr "Hold stand"
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:851 client/gui-sdl/menu.c:648
+#: common/unit.c:566 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"
@@ -726,7 +726,7 @@ msgstr "Udforsk"
msgid "Transform"
msgstr "Transformér"
-#: common/unit.c:584 client/text.c:106 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:584 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"
@@ -795,11 +795,11 @@ msgstr "Atombombe"
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1406
+#: common/unittype.c:349 client/helpdata.c:1404
msgid " and "
msgstr " og "
-#: common/unittype.c:355 client/helpdata.c:1392
+#: common/unittype.c:355 client/helpdata.c:1390
msgid "?and:, "
msgstr "?og:, "
@@ -1410,29 +1410,24 @@ msgstr "Ugyldig værdi for auth-port: \"%s\""
#: server/auth.c:281
#, c-format
-msgid "Auth config filename \"%s\" not allowed!"
-msgstr "Auth indstillingsfilnavn \"%s\" er ikke tilladt!"
-
-#: server/auth.c:286
-#, c-format
msgid "Cannot load auth config file \"%s\"!"
msgstr "Kan ikke hente auth indstillingsfil \"%s\"!"
-#: server/auth.c:397
+#: server/auth.c:392
#, c-format
msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
msgstr "Advarsel: Gæstenavnet '%s' er blevet taget, omdøber til bruger '%s'."
-#: server/auth.c:404
+#: server/auth.c:399
msgid "Guests are not allowed on this server. Sorry."
msgstr "Gæster er ikke tilladt på denne server. Beklager."
-#: server/auth.c:406
+#: server/auth.c:401
#, c-format
msgid "%s was rejected: Guests not allowed."
msgstr "%s blev afvist: Gæster er ikke tilladt."
-#: server/auth.c:425
+#: server/auth.c:420
#, c-format
msgid ""
"There was an error reading the user database, logging in as guest connection "
@@ -1441,7 +1436,7 @@ msgstr ""
"Der opstod en fejl ved læsning af brugerdatabasen, logger ind som "
"gæsteforbindelsen '%s'."
-#: server/auth.c:431
+#: server/auth.c:426
msgid ""
"There was an error reading the user database and guest logins are not "
"allowed. Sorry"
@@ -1449,39 +1444,39 @@ msgstr ""
"Der opstod en fejl ved læsning af brugerdatabasen og gæstetilslutninger er "
"ikke tilladt. Beklager"
-#: server/auth.c:434
+#: server/auth.c:429
#, c-format
msgid "%s was rejected: Database error and guests not allowed."
msgstr "%s blev afvist: Database fejl og gæster er ikke tilladt."
-#: server/auth.c:441
+#: server/auth.c:436
#, c-format
msgid "Enter password for %s:"
msgstr "Indtast adgangskode for %s:"
-#: server/auth.c:450
+#: server/auth.c:445
msgid "Enter a new password (and remember it)."
msgstr "Indtast en ny adgangskode (og husk den)."
-#: server/auth.c:456
+#: server/auth.c:451
msgid "This server allows only preregistered users. Sorry."
msgstr "Denne server tillader kun præregistrerede brugere. Beklager."
-#: server/auth.c:459
+#: server/auth.c:454
#, c-format
msgid "%s was rejected: Only preregister users allowed."
msgstr "%s blev afvist: Denne server tillader kun præregistrerede brugere."
-#: server/auth.c:488 server/auth.c:547
+#: server/auth.c:483 server/auth.c:542
msgid "Sorry, too many wrong tries..."
msgstr "Beklager, for mange forkerte forsøg..."
-#: server/auth.c:489
+#: server/auth.c:484
#, c-format
msgid "%s was rejected: Too many wrong password verifies for new user."
msgstr "%s blev afvist: For mange forkerte kodeordstjek for ny bruger."
-#: server/auth.c:505
+#: server/auth.c:500
msgid ""
"Warning: There was an error in saving to the database. Continuing, but your "
"stats will not be saved."
@@ -1489,30 +1484,30 @@ msgstr ""
"Advarsel: Der opstod en fejl ved gemning i databasen. Fortsætter, men dine "
"statistiskker bliver ikke gemt."
-#: server/auth.c:549
+#: server/auth.c:544
#, c-format
msgid "%s was rejected: Too many wrong password tries."
msgstr "%s blev afvist: For mange forkerte kodeords indtastninger."
-#: server/auth.c:558
+#: server/auth.c:553
msgid "Your password is incorrect. Try again."
msgstr "Din adgangskode er forkert. Prøv igen."
-#: server/auth.c:569
+#: server/auth.c:564
msgid "Sorry, your connection timed out..."
msgstr "Beklager, din forbindelse løb ud af tid..."
-#: server/auth.c:571
+#: server/auth.c:566
#, c-format
msgid "%s was rejected: Connection timeout waiting for password."
msgstr "%s blev afvist: Forbindelse løb ud mens den ventede for adgangskode."
-#: server/auth.c:636
+#: server/auth.c:631
#, c-format
msgid "Your password is too short, the minimum length is %d. Try again."
msgstr "Din adgangskode er for kort, den mindste længde er %d. Prøv igen."
-#: server/auth.c:642
+#: server/auth.c:637
#, c-format
msgid ""
"The password must have at least %d capital letters, %d numbers, and be at "
@@ -2020,7 +2015,7 @@ msgstr "Dette er serveren for %s"
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:237 manual/civmanual.c:380
+#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
@@ -2053,14 +2048,14 @@ msgstr ""
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:241
+#: server/civserver.c:217 client/civclient.c:242
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:245
+#: server/civserver.c:221 client/civclient.c:246
msgid " -d, --debug NUM\tSet debug log level (0 to 3)\n"
msgstr " -d, --debug NUM\tSæt debug-logniveau (0-3)\n"
@@ -2068,7 +2063,7 @@ msgstr " -d, --debug NUM\tSæt debug-logniveau (0-3)\n"
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:248 manual/civmanual.c:382
+#: server/civserver.c:225 client/civclient.c:249 manual/civmanual.c:382
msgid " -h, --help\t\tPrint a summary of the options\n"
msgstr " -h, --help\t\tUdskriv resume af tilvalg\n"
@@ -2117,11 +2112,11 @@ msgstr " -r, --read FIL\tIndlæs startkommandoer fra FIL\n"
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:267 manual/civmanual.c:383
+#: server/civserver.c:247 client/civclient.c:268 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:279
+#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, c-format
@@ -3382,7 +3377,7 @@ msgstr "%s har forårsaget en skandale ved at anspore til oprør i %s."
msgid "Sea moving start units are not yet supported. Nobody gets %s."
msgstr "Start flådeenheder er ikke understøttet. Ingen får %s."
-#: server/gamehand.c:310 client/text.c:632
+#: server/gamehand.c:310 client/text.c:691
#, c-format
msgid "Year: %s"
msgstr "Ã…r: %s"
@@ -3667,8 +3662,8 @@ msgstr "Kunne ikke kaste %s ind i borgerkrig - ingen tilgængelige nationer"
#: server/plrhand.c:1686
#, c-format
msgid ""
-"Your nation is thrust into civil war, %s is declared the leader of the "
-"rebel states."
+"Your nation is thrust into civil war! %s is declared the leader of the rebel "
+"states."
msgstr ""
"Din nation er splittet i en borgerkrig. %s er proklameret leder for de "
"oprørske landsdele."
@@ -3769,7 +3764,7 @@ msgstr "Forskningstempo"
msgid "Literacy"
msgstr "Uddannelse"
-#: server/report.c:121 client/cityrepdata.c:526 client/cityrepdata.c:527
+#: server/report.c:121 client/cityrepdata.c:524 client/cityrepdata.c:525
#: client/gui-sdl/cityrep.c:174
msgid "Production"
msgstr "Produktion"
@@ -3921,7 +3916,7 @@ msgstr ""
"Demografi-tekststrengen indeholder ugyldige bogstaver. Prøv \"help demography"
"\"."
-#: server/report.c:743 server/report.c:766
+#: server/report.c:743 server/report.c:768
msgid "Demographics Report:"
msgstr "Demografirapport:"
@@ -3929,10 +3924,12 @@ msgstr "Demografirapport:"
msgid "Sorry, the Demographics report is unavailable."
msgstr "Beklager, demografirapporten er ikke tilgængelig."
-#: server/report.c:748
+#. TRANS: <nation adjective> <government name> (<year>).
+#. * E.g. "Polish Despotism (200 AD)".
+#: server/report.c:750
#, c-format
-msgid "The %s of the %s (%s)"
-msgstr "%s af %s (%s)"
+msgid "%s %s (%s)"
+msgstr "%s %s (%s)"
#. TRANS: message about an installation error.
#: server/ruleset.c:163
@@ -3986,16 +3983,6 @@ msgstr ""
msgid "%s had invalid nation; changing to %s."
msgstr "%s havde ugyldit nation; ændrer til %s."
-#. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4073
-#, c-format
-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."
-
#: server/settings.c:32
msgid "Geological"
msgstr "Geologi"
@@ -5232,11 +5219,11 @@ msgstr "Autogemnings præfiks"
#: server/settings.c:1016
msgid ""
-"Automatically saved games will have name \"<prefix><year>.sav\". This "
-"setting sets the <prefix> part."
+"Automatically saved games will have name \"<prefix>-T<turn>-Y<year>.sav\". "
+"This setting sets the <prefix> part."
msgstr ""
-"Automatisk lagrede spil vil have navnet \"<forstavelse><Ã¥r>.sav\"\n"
-"Denne indstilling ændrer <forstavelse> delen."
+"Automatisk lagrede spil vil have navnet \"<forstavelse>-T<runde>-Y<Ã¥r>.sav"
+"\". Denne indstilling ændrer <forstavelse> delen."
#: server/settings.c:1023
msgid "Whether to log player statistics"
@@ -5252,11 +5239,11 @@ msgstr ""
"log\" hver runde. Disse statistikker kan benyttes til atlave \"power graphs"
"\" efter spillet er forbi."
-#: server/sernet.c:147
+#: server/sernet.c:150
msgid "Server cannot read standard input. Ignoring input."
msgstr "Serveren kan ikke læse fra tastaturet. Ignorerer det."
-#: server/sernet.c:922
+#: server/sernet.c:929
#, c-format
msgid "Server: bad address: [%s:%d]."
msgstr "Server: Ugyldig adresse: [%s:%d]."
@@ -5379,98 +5366,98 @@ msgstr ""
"VÃ¥benhvilen mellem %s og %s er brudt. De er i krig. Du annullerer alliancen "
"med begge."
-#: server/srv_main.c:928
+#: server/srv_main.c:961
#, c-format
msgid "Failed saving game as %s"
msgstr "Kunne ikke gemme spil som %s"
-#: server/srv_main.c:930
+#: server/srv_main.c:963
#, c-format
msgid "Game saved as %s"
msgstr "Spil gemt som %s"
-#: server/srv_main.c:962
+#: server/srv_main.c:994
msgid "The game is already running."
msgstr "Spillet er allerede i gang."
-#: server/srv_main.c:970
+#: server/srv_main.c:1002
#, 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:977
+#: server/srv_main.c:1009
msgid "Starting game."
msgstr "Starter spil."
-#: server/srv_main.c:1039
+#: server/srv_main.c:1071
#, c-format
msgid "request for unknown report (type %d)"
msgstr "Ukendt rapport (type %d)"
-#: server/srv_main.c:1104
+#: server/srv_main.c:1136
#, c-format
msgid "Warning: rejecting old client %s"
msgstr "Advarsel: Afviser ældre klient %s"
-#: server/srv_main.c:1206
+#: server/srv_main.c:1238
#, 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:1306
+#: server/srv_main.c:1338
msgid "Please choose a non-blank name."
msgstr "Vælg venligst et navn der ikke er blankt."
-#: server/srv_main.c:1322
+#: server/srv_main.c:1354
msgid "That nation is already in use."
msgstr "Denne nation er allerede i brug."
-#: server/srv_main.c:1338
+#: server/srv_main.c:1370
#, 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:1359
+#: server/srv_main.c:1391
msgid "Please choose a name containing only ASCII characters."
msgstr "Vælg venligst et navn der kun indeholder ASCII karakterer."
-#: server/srv_main.c:1458
+#: server/srv_main.c:1490
#, 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:1464
+#: server/srv_main.c:1496
#, c-format
msgid "%s nation is already in use."
msgstr "Nation %s er allerede i brug."
-#: server/srv_main.c:1482
+#: server/srv_main.c:1514
#, c-format
msgid "%s is the %s ruler %s."
msgstr "%s er %s hersker %s."
-#: server/srv_main.c:1538
+#: server/srv_main.c:1570
#, 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:1582 server/srv_main.c:1586
+#: server/srv_main.c:1614 server/srv_main.c:1618
#, 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:1728
+#: server/srv_main.c:1760
#, c-format
msgid "Player %d"
msgstr "Spiller %d"
-#: server/srv_main.c:1739 server/srv_main.c:1745
+#: server/srv_main.c:1771 server/srv_main.c:1777
#, c-format
msgid "%s rules the %s."
msgstr "%s styrer %s."
-#: server/srv_main.c:1910
+#: server/srv_main.c:1942
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
@@ -5478,16 +5465,16 @@ msgstr ""
"Dette civserver program har spillerbekræftelseunderstøttelse, men det er for "
"nuværende ikke i brug."
-#: server/srv_main.c:1961
+#: server/srv_main.c:1993
#, c-format
msgid "Sending info to metaserver [%s]"
msgstr "Sender info til metaserver [%s]"
-#: server/srv_main.c:1992
+#: server/srv_main.c:2024
msgid "The game is over..."
msgstr "Spillet er forbi..."
-#: server/srv_main.c:2205
+#: server/srv_main.c:2237
msgid "Now accepting new client connections."
msgstr "Accepterer nu nye klient-tilslutninger."
@@ -6157,9 +6144,8 @@ msgstr ""
"Beklager, du kan ikke overtage en global observatør. Observer i stedet."
#: server/stdinhand.c:2671
-#, fuzzy
msgid "You cannot take a new player at this time."
-msgstr "Beklager, man kan ikke overtage spiller i dette spil."
+msgstr "Du kan ikke overtage en ny spiller på dette tidspunkt."
#. TRANS: Do not translate "maxplayers".
#: server/stdinhand.c:2679
@@ -6171,11 +6157,15 @@ msgid_plural ""
"You cannot take a new player because the maximum of %d players has already "
"been reached (maxplayers setting)."
msgstr[0] ""
+"Du kan ikke overtage en ny spiller da det maksimale antal på %d spiller "
+"allerede er nået (indstillingen maksspillere)."
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
msgid "You cannot take a new player because there are no free player slots."
-msgstr ""
+msgstr "Du kan ikke overtage en ny spiller, da der ingen ledige pladser er."
#: server/stdinhand.c:2702
msgid "Sorry, one can't observe barbarians in this game."
@@ -6267,14 +6257,14 @@ msgid "Usage: take [connection-name] <player-name>"
msgstr "Brug: tag [forbindelsesnavn] <spillernavn>"
#: server/stdinhand.c:3010
-#, fuzzy, c-format
+#, c-format
msgid "%s already controls %s."
-msgstr "%s kontrollerer allerede %s"
+msgstr "%s kontrollerer allerede %s."
#: server/stdinhand.c:3024
-#, fuzzy, c-format
+#, c-format
msgid "There is no free player slot for %s."
-msgstr "Der er ingen ledige spillerpladser til %s"
+msgstr "Der er ingen ledige spillerpladser til %s."
#: server/stdinhand.c:3059
#, c-format
@@ -6282,9 +6272,9 @@ msgid "being detached from %s."
msgstr "Løsnes fra %s."
#: server/stdinhand.c:3135
-#, fuzzy, c-format
+#, c-format
msgid "%s now controls %s (%s, %s)."
-msgstr "%s kontrollerer nu %s (%s, %s)"
+msgstr "%s kontrollerer nu %s (%s, %s)."
#: server/stdinhand.c:3139 server/stdinhand.c:4260
#: data/nation/barbarian.ruleset:3
@@ -6292,32 +6282,32 @@ msgid "Barbarian"
msgstr "Barbar"
#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2030 client/gui-sdl/plrdlg.c:645
+#: client/gui-gtk-2.0/pages.c:2102 client/gui-sdl/plrdlg.c:645
#: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
msgid "AI"
msgstr "AI"
#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
+#: 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
msgid "Human"
msgstr "Menneske"
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
-#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
+#: 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
msgid "Alive"
msgstr "I live"
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
#: client/gui-win32/connectdlg.c:200
msgid "Dead"
msgstr "Død"
#: server/stdinhand.c:3147
-#, fuzzy, c-format
+#, c-format
msgid "%s failed to attach to any player."
-msgstr "%s er ikke knyttet til nogen spiller"
+msgstr "%s er ikke knyttet til nogen spiller."
#: server/stdinhand.c:3182
msgid "Usage: detach <connection-name>"
@@ -6572,9 +6562,9 @@ 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:242
-#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
-#: client/text.c:1201
+#: 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
#, c-format
msgid "?clistmore:, %s"
msgstr ", %s"
@@ -6826,7 +6816,7 @@ msgstr "Kun %s kan angribe fra havet."
msgid "Cannot attack from sea."
msgstr "Kan ikke angribe fra havet."
-#: server/unithand.c:996 server/unittools.c:2103
+#: server/unithand.c:996 server/unittools.c:2137
msgid "Cannot attack unless you declare war first."
msgstr "Kan ikke angribe hvis du ikke erklærer krig først."
@@ -6928,100 +6918,101 @@ msgstr "%s blev opgraderet uden omkostning til %s."
#: server/unittools.c:297
#, c-format
-msgid "Not enough gold. %s disbanded"
-msgstr "Ikke nok guld. %s opløst"
+msgid "Not enough gold to pay upkeep for %s. Unit disbanded."
+msgstr "Ikke nok guld til at betale for vedligeholdelse af %s. Enhed opløst."
-#: server/unittools.c:342
+#: server/unittools.c:343
#, c-format
msgid "Your %s has run out of hit points."
msgstr "Din %s er løbet tør for træfkapacitet."
-#: server/unittools.c:358
+#: server/unittools.c:359
#, c-format
msgid "Your %s has been lost on the high seas."
msgstr "Din %s er gået tabt på havet."
-#: server/unittools.c:365
+#: server/unittools.c:366
#, c-format
msgid "Your %s survived on the high seas and became more experienced!"
msgstr "Din %s overlevede på havet og blev mere erfaren!"
-#: server/unittools.c:376
+#: server/unittools.c:377
#, c-format
msgid "Your %s has been lost on unsafe terrain."
msgstr "Din %s er gået tabt på usikkert terræn."
-#: server/unittools.c:430
+#: server/unittools.c:431
#, c-format
msgid "Your %s has returned to refuel."
msgstr "Din %s er returneret for brændstofpåfyldning."
-#: server/unittools.c:454
+#: server/unittools.c:455
#, c-format
msgid "Your %s has run out of fuel."
msgstr "Din %s er løbet tør for brændstof."
-#. TRANS: And, <the unit> became ...
-#: server/unittools.c:616
-msgid "And, became more experienced!"
-msgstr " og blev mere erfaren!"
-
#. TRANS: Your <unit> became ...
-#: server/unittools.c:620
+#: server/unittools.c:619
#, c-format
msgid "Your %s became more experienced!"
msgstr "Din %s blev mere erfaren!"
-#: server/unittools.c:1011
+#: server/unittools.c:1009
#, c-format
msgid "Teleported your %s to %s."
msgstr "Teleporterede din %s til %s."
-#: server/unittools.c:1041
+#. TRANS: A unit is moved to resolve stack conflicts.
+#: server/unittools.c:1065
+#, c-format
+msgid "Moved your %s."
+msgstr "Flyttede din %s."
+
+#: server/unittools.c:1076
#, c-format
msgid "Disbanded your %s."
msgstr "Opløste din %s."
-#: server/unittools.c:1363
+#: server/unittools.c:1397
#, c-format
msgid "Unable to defend %s, %s has lost the game."
msgstr "Kunne ikke forsvare %s, %s har tabt spillet."
-#: server/unittools.c:1367
+#: server/unittools.c:1401
#, 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:1469
+#: server/unittools.c:1503
#, 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:1478
+#: server/unittools.c:1512
#, c-format
msgid "%s lost when %s was lost."
msgstr "%s gik tabt da %s gik tabt."
-#: server/unittools.c:1527
+#: server/unittools.c:1561
#, 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:1545
+#: server/unittools.c:1579
#, c-format
msgid "Your attacking %s succeeded against the %s %s!"
msgstr "Din %s lykkedes i angrebet mod %s %s!"
#. TRANS: "Cannon ... the Polish Destroyer."
-#: server/unittools.c:1554 server/unittools.c:1612
+#: server/unittools.c:1588 server/unittools.c:1646
#, c-format
msgid "%s lost to an attack by the %s %s."
msgstr "%s gik tabt i et angreb fra %s %s."
#. TRANS: "... Cannon ... the Polish Destroyer ...."
-#: server/unittools.c:1588
+#: server/unittools.c:1622
#, c-format
msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
msgid_plural ""
@@ -7032,7 +7023,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:1621
+#: server/unittools.c:1655
#, c-format
msgid "%s lost when the %s %s attacked the %s %s."
msgstr "%s gik tabt da %ss %s angreb %ss %s."
@@ -7040,7 +7031,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:1636
+#: server/unittools.c:1670
#, 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."
@@ -7049,7 +7040,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:1646
+#: server/unittools.c:1680
#, 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."
@@ -7059,195 +7050,195 @@ 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:1660
+#: server/unittools.c:1694
#, 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:1928
+#: server/unittools.c:1962
#, c-format
msgid "Your %s was nuked by %s."
msgstr "Din %s blev udsat for atomangreb fra %s."
-#: server/unittools.c:1931 server/unittools.c:1947
+#: server/unittools.c:1965 server/unittools.c:1981
msgid "yourself"
msgstr "dig selv"
# problem
-#: server/unittools.c:1935
+#: server/unittools.c:1969
#, c-format
msgid "The %s %s was nuked."
msgstr "%ss %s blev udsat for atomangreb."
-#: server/unittools.c:1944
+#: server/unittools.c:1978
#, c-format
msgid "%s was nuked by %s."
msgstr "%s blev udsat for atomangreb fra %s."
-#: server/unittools.c:1952
+#: server/unittools.c:1986
#, c-format
msgid "You nuked %s."
msgstr "Du udførte et atomangreb mod %s."
-#: server/unittools.c:1993
+#: server/unittools.c:2027
#, c-format
msgid "The %s detonated a nuke!"
msgstr "%s detonerede en atombombe!"
-#: server/unittools.c:2017
+#: server/unittools.c:2051
#, c-format
msgid "%s transported successfully."
msgstr "%s blev transporteret uskadt frem."
-#: server/unittools.c:2069
+#: server/unittools.c:2103
msgid "This unit type can not be paradropped."
msgstr "Denne enhed kan ikke lave faldskærmsudspring."
-#: server/unittools.c:2079
+#: server/unittools.c:2113
msgid "You cannot paradrop a unit that is transporting other units."
msgstr "Du kan ikke foretage faldskærmudspring med en transportenhed."
-#: server/unittools.c:2085
+#: server/unittools.c:2119
msgid "The destination location is not known."
msgstr "Bestemmelsesstedet er ukendt."
-#: server/unittools.c:2092
+#: server/unittools.c:2126
#, c-format
msgid "This unit cannot paradrop into %s."
msgstr "Denne enhed kan ikke foretage faldskærmudspring i %s."
-#: server/unittools.c:2112
+#: server/unittools.c:2146
#, 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:2123
+#: server/unittools.c:2157
#, 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:2136
+#: server/unittools.c:2170
#, 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:2158
+#: server/unittools.c:2192
#, c-format
msgid "You found %d gold."
msgstr "Du fandt %d guld."
-#: server/unittools.c:2175
+#: server/unittools.c:2209
#, c-format
msgid "You found %s in ancient scrolls of wisdom."
msgstr "Du fandt %s i ældgamle skriftruller med viden."
-#: server/unittools.c:2182
+#: server/unittools.c:2216
#, 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:2196
+#: server/unittools.c:2230
msgid "A band of friendly mercenaries joins your cause."
msgstr "En gruppe venligtsindede lejesoldater slutter sig til dig."
-#: server/unittools.c:2214
+#: server/unittools.c:2248
msgid "An abandoned village is here."
msgstr "En forladt landsby er her."
-#: server/unittools.c:2224
+#: server/unittools.c:2258
msgid "You have unleashed a horde of barbarians!"
msgstr "Du er blevet overrasket af fjendtlige barbarer!"
-#: server/unittools.c:2227
+#: server/unittools.c:2261
#, c-format
msgid "Your %s has been killed by barbarians!"
msgstr "Dine %s er blevet dræbt af barbarer."
-#: server/unittools.c:2243
+#: server/unittools.c:2277
msgid "You found a friendly city."
msgstr "Du fandt en venligtsindet by."
-#: server/unittools.c:2257
+#: server/unittools.c:2291
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:2282
+#: server/unittools.c:2316
msgid "Your overflight frightens the tribe; they scatter in terror."
msgstr "Din overflyvning skræmmer stammen; de spreder sig i frygt."
-#: server/unittools.c:2540
+#: server/unittools.c:2574
#, 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:2989
+#: server/unittools.c:3023
#, 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:3041
+#: server/unittools.c:3075
#, 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:3054
+#: server/unittools.c:3088
#, 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:3068
+#: server/unittools.c:3102
#, 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:3078
+#: server/unittools.c:3112
#, 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:3104
+#: server/unittools.c:3138
#, 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:3145
+#: server/unittools.c:3179
#, c-format
msgid "Attempt to change homecity for %s failed."
msgstr "Forsøg på at ændre hjembyen for %s mislykkedes."
-#: server/unittools.c:3156
+#: server/unittools.c:3190
#, c-format
msgid "Attempt to establish trade route for %s failed."
msgstr "Forsøg på at etablere handelsrute for %s mislykkedes."
-#: server/unittools.c:3168
+#: server/unittools.c:3202
#, c-format
msgid "Attempt to build wonder for %s failed."
msgstr "Forsøg på at bygge vidunder for %s mislykkedes."
-#: server/unittools.c:3177
+#: server/unittools.c:3211
#, c-format
msgid "Your %s has invalid orders."
msgstr "Din %s har ugyldige ordre."
-#: server/generator/mapgen.c:1737
+#: server/generator/mapgen.c:1771
msgid "High landmass - this may take a few seconds."
msgstr "Stor landmasse - dette kan tage nogen sekunder."
-#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
+#: server/generator/mapgen.c:1969 server/generator/mapgen.c:2039
#, c-format
msgid "Falling back to generator %d."
msgstr "Falder tilbage på generator %d."
-#: server/generator/mapgen.c:2025
+#: server/generator/mapgen.c:2059
msgid "Generator 3 didn't place all big islands."
msgstr "Generator 3 placerede ikke alle de store øer."
-#: server/generator/mapgen.c:2054
+#: server/generator/mapgen.c:2088
#, c-format
msgid "Generator 3 left %li landmass unplaced."
msgstr "Generator 3 efterlod %li landmasse uplaceret."
@@ -7355,7 +7346,7 @@ msgid_plural "%3d turns"
msgstr[0] "%3d/runde"
msgstr[1] "%3d/runde"
-#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:631
#: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
@@ -7473,336 +7464,335 @@ msgstr "?city_state:Fred"
msgid "(worklist)"
msgstr "(arbejdsliste)"
-#: client/cityrepdata.c:447
-msgid "Special"
-msgstr "Speciel"
+#: client/cityrepdata.c:446
+msgid "?city:Name"
+msgstr "?city:Navn"
-#: client/cityrepdata.c:448
-msgid "?entertainers/scientists/taxmen:E/S/T"
-msgstr "?underholdere/forskere/skatteopkrævere:U/F/S"
+#: client/cityrepdata.c:446 client/gui-sdl/cityrep.c:169
+msgid "City Name"
+msgstr "Bynavn"
-#: client/cityrepdata.c:449
-msgid "Entertainers, Scientists, Taxmen"
-msgstr "Underholdere, forskere, skatteopkrævere"
+#: client/cityrepdata.c:448
+msgid "?size [short]:Sz"
+msgstr "St"
-#: client/cityrepdata.c:452
-msgid "Concise + Rapture, - Disorder"
-msgstr "Kort + fest, - uroligheder"
+#: client/cityrepdata.c:448
+msgid "Size"
+msgstr "Størrelse"
-#: client/cityrepdata.c:454 client/plrdlg_common.c:261
+#: client/cityrepdata.c:450 client/plrdlg_common.c:261
#: client/gui-win32/plrdlg.c:337
msgid "State"
msgstr "Status"
-#: client/cityrepdata.c:454
+#: client/cityrepdata.c:450
msgid "Rapture/Peace/Disorder"
msgstr "Fest/fred/uroligheder"
+#: client/cityrepdata.c:452
+msgid "Concise *=Rapture, X=Disorder"
+msgstr "Kort *=fest, X=uroligheder"
+
+#: client/cityrepdata.c:456
+msgid "Special"
+msgstr "Speciel"
+
#: client/cityrepdata.c:457
+msgid "?entertainers/scientists/taxmen:E/S/T"
+msgstr "?underholdere/forskere/skatteopkrævere:U/F/S"
+
+#: client/cityrepdata.c:458
+msgid "Entertainers, Scientists, Taxmen"
+msgstr "Underholdere, forskere, skatteopkrævere"
+
+#: client/cityrepdata.c:461
msgid "?Happy workers:H"
msgstr "?Happy workers:L"
-#: client/cityrepdata.c:457
+#: client/cityrepdata.c:461
msgid "Workers: Happy"
msgstr "Arbejdere: Lykkelige"
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
msgid "?Content workers:C"
msgstr "?Content workers:T"
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
msgid "Workers: Content"
msgstr "Arbejdere: Tilfredse"
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
msgid "?Unhappy workers:U"
msgstr "?Unhappy workers:U"
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
msgid "Workers: Unhappy"
msgstr "Arbejdere: Ulykkelige"
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
msgid "?Angry workers:A"
msgstr "?Angry workers:V"
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
msgid "Workers: Angry"
msgstr "Arbejdere: Vrede"
-#: client/cityrepdata.c:465 client/gui-xaw/citydlg.c:2401
-#: data/default/units.ruleset:238
-msgid "Workers"
-msgstr "Arbejdere"
+#: client/cityrepdata.c:469 client/gui-xaw/citydlg.c:2402
+msgid "?city:Workers"
+msgstr "?city:Arbejdere"
-#: client/cityrepdata.c:466
+#: client/cityrepdata.c:470
msgid "?happy/content/unhappy/angry:H/C/U/A"
msgstr "?happy/content/unhappy/angry:L/T/U/V"
-#: client/cityrepdata.c:467
+#: client/cityrepdata.c:471
msgid "Workers: Happy, Content, Unhappy, Angry"
msgstr "Arbejdere: Lykkelige, tilfredse, ulykkelige, vrede"
-#: client/cityrepdata.c:470 client/cityrepdata.c:472
+#: client/cityrepdata.c:474 client/cityrepdata.c:476
msgid "Best"
msgstr "Bedst"
-#: client/cityrepdata.c:470
+#: client/cityrepdata.c:474
msgid "attack"
msgstr "angreb"
-#: client/cityrepdata.c:471
+#: client/cityrepdata.c:475
msgid "Best attacking units"
msgstr "Bedste angrebsenheder"
-#: client/cityrepdata.c:472
+#: client/cityrepdata.c:476
msgid "defense"
msgstr "forsvar"
-#: client/cityrepdata.c:473
+#: client/cityrepdata.c:477
msgid "Best defending units"
msgstr "Bedste forsvarsenheder"
-#: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
-#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
-#: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
-#: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
-#: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
-#: client/gui-win32/menu.c:351 client/gui-win32/repodlgs.c:616
-#: client/gui-win32/repodlgs.c:707 client/gui-win32/repodlgs.c:716
-#: client/gui-xaw/menu.c:157 client/gui-xaw/menu.c:219
-#: client/gui-xaw/menu.c:242 client/gui-xaw/repodlgs.c:881
-#: client/gui-xaw/repodlgs.c:1069 data/Freeciv.in:1895 data/helpdata.txt:909
+#: client/cityrepdata.c:478 client/cityrepdata.c:482
+#: client/gui-gtk-2.0/cityrep.c:1437 client/gui-gtk-2.0/cityrep.c:1456
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-gtk-2.0/cityrep.c:1494
+#: client/gui-gtk-2.0/cityrep.c:1514 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/repodlgs.c:960 client/gui-sdl/helpdlg.c:688
+#: client/gui-sdl/mapctrl.c:1605 client/gui-sdl/optiondlg.c:1827
+#: client/gui-sdl/repodlgs.c:356 client/gui-win32/menu.c:351
+#: client/gui-win32/repodlgs.c:616 client/gui-win32/repodlgs.c:707
+#: client/gui-win32/repodlgs.c:716 client/gui-xaw/menu.c:157
+#: client/gui-xaw/menu.c:219 client/gui-xaw/menu.c:242
+#: client/gui-xaw/repodlgs.c:881 client/gui-xaw/repodlgs.c:1069
+#: data/Freeciv.in:1895 data/helpdata.txt:909
msgid "Units"
msgstr "Enheder"
#. TRANS: Header "Number of units inside city"
-#: client/cityrepdata.c:476
+#: client/cityrepdata.c:480
msgid "?Present (units):Here"
msgstr "?Present (units):Her"
-#: client/cityrepdata.c:477
+#: client/cityrepdata.c:481
msgid "Number of units present"
msgstr "Antal enheder til stede"
#. TRANS: Header "Number of units supported by given city"
-#: client/cityrepdata.c:480
+#: client/cityrepdata.c:484
msgid "?Supported (units):Owned"
msgstr "?Supported (enheder):Ejet"
-#: client/cityrepdata.c:481
+#: client/cityrepdata.c:485
msgid "Number of units supported"
msgstr "Antal enheder understøttet"
#. TRANS: Header "It will take this many turns before city grows"
-#: client/cityrepdata.c:484
+#: client/cityrepdata.c:488
msgid "?food (population):Grow"
msgstr "Voks"
-#: client/cityrepdata.c:485 client/cityrepdata.c:530
+#: client/cityrepdata.c:489 client/cityrepdata.c:528
msgid "?Stock/Target:(Have/Need)"
msgstr "(opsamlet/mål)"
-#: client/cityrepdata.c:486
+#: client/cityrepdata.c:490
msgid "Turns until growth/famine"
msgstr "Runder til vækst/hungersnød"
-#: client/cityrepdata.c:488
-msgid "?size [short]:Sz"
-msgstr "St"
-
-#: client/cityrepdata.c:488
-msgid "Size"
-msgstr "Størrelse"
-
-#: client/cityrepdata.c:492
-msgid "?city:Name"
-msgstr "?city:Navn"
-
-#: client/cityrepdata.c:492 client/gui-sdl/cityrep.c:169
-msgid "City Name"
-msgstr "Bynavn"
-
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
msgid "Surplus"
msgstr "Overskud"
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
msgid "?food/production/trade:F/P/T"
msgstr "?mad/prod/handel:M/P/H"
-#: client/cityrepdata.c:496
+#: client/cityrepdata.c:494
msgid "Surplus: Food, Production, Trade"
msgstr "Overskud: Mad, produktion, handel"
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
msgid "?Food surplus [short]:+F"
msgstr "?Food surplus [short]:+M"
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
msgid "Surplus: Food"
msgstr "Overskud: Mad"
-#: client/cityrepdata.c:500
+#: client/cityrepdata.c:498
msgid "?Production surplus [short]:+P"
msgstr "?Production surplus [short]:+P"
-#: client/cityrepdata.c:501
+#: client/cityrepdata.c:499
msgid "Surplus: Production"
msgstr "Overskud: Produktion"
-#: client/cityrepdata.c:502
+#: client/cityrepdata.c:500
msgid "?Production loss (waste) [short]:-P"
msgstr "-P"
-#: client/cityrepdata.c:503
+#: client/cityrepdata.c:501
msgid "Waste"
msgstr "Affald"
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
msgid "?Trade surplus [short]:+T"
msgstr "?Trade surplus [short]:+H"
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
msgid "Surplus: Trade"
msgstr "Overskud: Handel"
-#: client/cityrepdata.c:506
+#: client/cityrepdata.c:504
msgid "?Trade loss (corruption) [short]:-T"
msgstr "-H"
-#: client/cityrepdata.c:507
+#: client/cityrepdata.c:505
msgid "Corruption"
msgstr "Korruption"
-#: client/cityrepdata.c:509 client/gui-gtk-2.0/repodlgs.c:654
+#: client/cityrepdata.c:507 client/gui-gtk-2.0/repodlgs.c:654
#: client/gui-sdl/mapctrl.c:1400 client/gui-win32/repodlgs.c:334
#: client/gui-xaw/menu.c:222 client/gui-xaw/repodlgs.c:644
#: client/gui-xaw/repodlgs.c:773 data/Freeciv.in:1819
msgid "Economy"
msgstr "Økonomi"
-#: client/cityrepdata.c:509
+#: client/cityrepdata.c:507
msgid "?gold/luxury/science:G/L/S"
msgstr "?gold/luxury/science:G/L/F"
-#: client/cityrepdata.c:510
+#: client/cityrepdata.c:508
msgid "Economy: Gold, Luxuries, Science"
msgstr "Økonomi: Guld, luksus, forskning"
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
msgid "?Gold:G"
msgstr "?Gold:G"
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
msgid "Economy: Gold"
msgstr "Økonomi: Guld"
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
msgid "?Luxury:L"
msgstr "?Luxury:L"
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
msgid "Economy: Luxury"
msgstr "Økonomi: Luksus"
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
msgid "?Science:S"
msgstr "?Science:F"
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
msgid "Economy: Science"
msgstr "Økonomi: Forskning"
-#: client/cityrepdata.c:518
+#: client/cityrepdata.c:516
msgid "?number_trade_routes:n"
msgstr "?number_trade_routes:a"
-#: client/cityrepdata.c:518
+#: client/cityrepdata.c:516
msgid "?number_trade_routes:R"
msgstr "?number_trade_routes:H"
-#: client/cityrepdata.c:519
+#: client/cityrepdata.c:517
msgid "Number of Trade Routes"
msgstr "Antal handelsruter"
-#: client/cityrepdata.c:521
+#: client/cityrepdata.c:519
msgid "?pollution [short]:Pol"
msgstr "?pollution [short]:For"
-#: client/cityrepdata.c:523
+#: client/cityrepdata.c:521
msgid "?cma:Governor"
msgstr "?cma:Leder"
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
-#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
-#: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
-#: data/Freeciv.in:1459 data/helpdata.txt:820
+#: client/cityrepdata.c:521 client/gui-gtk-2.0/cityrep.c:1766
+#: client/gui-sdl/citydlg.c:3809 client/gui-sdl/cma_fe.c:858
+#: client/gui-win32/citydlg.c:726 data/Freeciv.in:1459 data/helpdata.txt:820
msgid "Citizen Governor"
msgstr "Byleder"
-#: client/cityrepdata.c:526
+#: client/cityrepdata.c:524
msgid "Turns/Buy"
msgstr "Runder/Køb"
-#: client/cityrepdata.c:529 client/cityrepdata.c:531
+#: client/cityrepdata.c:527 client/cityrepdata.c:529
msgid "Currently Building"
msgstr "Bygger i øjeblikket"
-#: client/cityrepdata.c:575
+#: client/cityrepdata.c:573
msgid "?specialist:S"
msgstr "?specialist:S"
-#: client/cityrepdata.c:578
+#: client/cityrepdata.c:576
msgid "Specialists"
msgstr "Specialister"
-#: client/civclient.c:239
+#: client/civclient.c:240
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr " -a, --autoconnect\tSpring over tilslutningsvinduet\n"
-#: client/civclient.c:249
+#: client/civclient.c:250
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:251
+#: client/civclient.c:252
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:253
+#: client/civclient.c:254
msgid " -n, --name NAME\tUse NAME as name\n"
msgstr " -n, --name NAVN\\tBrug NAVN som navn\n"
-#: client/civclient.c:255
+#: client/civclient.c:256
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:257
+#: client/civclient.c:258
#, 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:259
+#: client/civclient.c:260
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:262
+#: client/civclient.c:263
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:264
+#: client/civclient.c:265
msgid " -S, --Sound FILE\tRead sound tags from FILE\n"
msgstr " -S, --Sound FIL\tLæs lyd-info fra FIL\n"
-#: client/civclient.c:265
+#: client/civclient.c:266
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:268
+#: client/civclient.c:269
#, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -7812,144 +7802,154 @@ msgstr ""
"\t\t\tPrøv \"%s -- --help\" for mere information.\n"
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:273
+#: client/civclient.c:274
#, c-format
msgid "Report bugs at %s\n"
msgstr "Rapportér fejl til %s\n"
-#: client/civclient.c:297
+#: client/civclient.c:298
#, c-format
msgid "Invalid port \"%s\" specified with --port option.\n"
msgstr "Ugyldig port \"%s\" angivet med --port option.\n"
-#: client/civclient.c:299 client/civclient.c:314
+#: client/civclient.c:300 client/civclient.c:315
msgid "Try using --help.\n"
msgstr "Prøv at bruge --help.\n"
-#: client/civclient.c:312
+#: client/civclient.c:313
#, 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:325
+#: client/civclient.c:326
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr "Ukendt indstilling: \"%s\"\n"
-#: client/civclient.c:539
+#: client/civclient.c:391
+#, fuzzy, c-format
+msgid "Updating old metaserver address \"%s\"."
+msgstr "metaserver <adresse>"
+
+#: client/civclient.c:394
+#, fuzzy, c-format
+msgid "Default metaserver has been set to \"%s\"."
+msgstr "Indstilling: %s er blevet sat til \"%s\"."
+
+#: client/civclient.c:550
msgid "Game started."
msgstr "Spil startet."
-#: client/civclient.c:577
+#: client/civclient.c:588
msgid "There was an error while auto connecting; aborting."
msgstr "Der opstod en fejl under automatisk tilslutning, afbryder."
-#: client/climisc.c:176
+#: client/climisc.c:177
#, c-format
msgid "Changing production of every %s into %s."
msgstr "Ændrer produktion for alle %s til %s."
-#: client/climisc.c:214
+#: client/climisc.c:215
msgid "?embassy:Both"
msgstr "?embassy:Begge"
-#: client/climisc.c:216
+#: client/climisc.c:217
msgid "?embassy:Yes"
msgstr "?embassy:Ja"
-#: client/climisc.c:219
+#: client/climisc.c:220
msgid "?embassy:With Us"
msgstr "?embassy:Hos os"
-#: client/climisc.c:222
+#: client/climisc.c:223
msgid "?embassy:Contact"
msgstr "?embassy:Kontakt"
-#: client/climisc.c:224
+#: client/climisc.c:225
msgid "?embassy:No Contact"
msgstr "?embassy:Ingen kontakt"
-#: client/climisc.c:236
+#: client/climisc.c:237
msgid "?vision:Both"
msgstr "?vision:Begge"
-#: client/climisc.c:238
+#: client/climisc.c:239
msgid "?vision:To Them"
msgstr "?vision:For dem"
-#: client/climisc.c:241
+#: client/climisc.c:242
msgid "?vision:To Us"
msgstr "?vision:For os"
-#: client/climisc.c:257 client/climisc.c:264
+#: client/climisc.c:258 client/climisc.c:265
#, c-format
msgid "The %s give %s"
msgstr "%s giver %s"
-#: client/climisc.c:268
+#: client/climisc.c:269
#, c-format
msgid "The %s give unknown city."
msgstr "%s giver ukendt by bort."
-#: client/climisc.c:273
+#: client/climisc.c:274
#, c-format
msgid "The %s give %d gold"
msgstr "%s giver %d guld"
-#: client/climisc.c:278
+#: client/climisc.c:279
#, c-format
msgid "The %s give their worldmap"
msgstr "%s giver sine verdenskort"
-#: client/climisc.c:282
+#: client/climisc.c:283
#, c-format
msgid "The %s give their seamap"
msgstr "%s giver sine søkort"
-#: client/climisc.c:286
+#: client/climisc.c:287
msgid "The parties agree on a cease-fire"
msgstr "Parterne bliver enige om en våbenhvile"
-#: client/climisc.c:289
+#: client/climisc.c:290
msgid "The parties agree on a peace"
msgstr "Parterne slutter fred"
-#: client/climisc.c:292
+#: client/climisc.c:293
msgid "The parties create an alliance"
msgstr "Parterne allierer sig"
-#: client/climisc.c:295
+#: client/climisc.c:296
#, c-format
msgid "The %s give shared vision"
msgstr "%s giver dig udsyn"
-#: client/climisc.c:299
+#: client/climisc.c:300
#, c-format
msgid "The %s give an embassy"
msgstr "%s giver ambassade"
-#: client/climisc.c:902
+#: client/climisc.c:906
msgid "Popup Request"
msgstr "Pop op-spørgsmål"
-#: client/climisc.c:932
+#: client/climisc.c:936
msgid "Exporting output window to civgame.log ..."
msgstr "Eksporterer udskriftsvindue til civgame.log ..."
-#: client/climisc.c:936
+#: client/climisc.c:940
msgid "Export complete."
msgstr "Eksport fuldført."
-#: client/climisc.c:938
+#: client/climisc.c:942
msgid "Export failed, couldn't write to file."
msgstr "Eksport fejlede, kunne ikke skrive til fil."
-#: client/climisc.c:1038
+#: client/climisc.c:1042
#, c-format
msgid "You don't buy %s in %s!"
msgstr "Du køber ikke %s i %s!"
-#: client/climisc.c:1056
+#: client/climisc.c:1060
#, c-format
msgid "%s costs %d gold and you only have %d gold."
msgstr "%s koster %d guld og du har kun %d guld."
@@ -7999,19 +7999,19 @@ msgstr ""
"Auto-tilslutter til serveren \"%s\" på port %d som \"%s\" hvert %f sekund"
"(er) for %d gange"
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1289
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
msgid "novice"
msgstr "begynder"
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1289
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1358
msgid "easy"
msgstr "let"
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1290
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
msgid "normal"
msgstr "normal"
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1290
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
msgid "hard"
msgstr "vanskelig"
@@ -8040,38 +8040,44 @@ msgid "We probably couldn't start it from here."
msgstr "Vi kunne højst sandsynlig ikke starte herfra."
#: client/connectdlg_common.c:470
-msgid "We have control of the server (command access level hack)"
-msgstr "Vi har kontrol med serveren (kommandoniveau adgang)"
+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
-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 ""
+"Failed to obtain the required access level to take control of the server. "
+"The server will now be shutdown."
+msgstr ""
+"Fik ikke det krævede adgangsniveau til at kunne tage kontrol med serveren. "
+"Serveren vil ikke blive lukket ned."
-#: client/control.c:1104
+#: client/control.c:1123
msgid "Only transporter units can be unloaded."
msgstr "Kun transportenheder kan aflastes."
-#: client/control.c:1353
+#: client/control.c:1425
msgid "Only settler units can be put into auto mode."
msgstr "Kun nybyggere kan placeres i autotilstand."
-#: client/control.c:1444
+#: client/control.c:1516
msgid "Only nuclear units can do this."
msgstr "Kun atombombe-enheder kan gøre dette."
-#: client/control.c:1473
+#: client/control.c:1545
msgid "Only paratrooper units can do this."
msgstr "Kun faldskærmsjægere kan gøre dette."
-#: client/control.c:1921
+#: client/control.c:2020
msgid "Too far for this unit."
msgstr "For langt for denne enhed."
-#: client/control.c:2131 client/control.c:2161 client/control.c:2177
+#: client/control.c:2230 client/control.c:2260 client/control.c:2276
msgid "Didn't find a route to the destination!"
msgstr "Fandt ingen rute til målet."
-#: client/control.c:2221
+#: client/control.c:2320
msgid "Oh my! You seem to have no capital!"
msgstr "Jamen dog! Det ser ud til at du ikke har nogen hovedstad!"
@@ -8139,16 +8145,16 @@ msgid "Allows %s (with %s)."
msgstr "Tillader %s (med %s)."
#. TRANS: preserve single space at beginning
-#: client/helpdata.c:418
+#: client/helpdata.c:416
msgid " Rivers"
msgstr " Floder"
-#: client/helpdata.c:576
+#: client/helpdata.c:574
#, c-format
msgid "Sorry, no help topic for %s.\n"
msgstr "Beklager, ikke noget hjælpeemne for %s.\n"
-#: client/helpdata.c:580
+#: client/helpdata.c:578
#, c-format
msgid ""
"Sorry, no help topic for %s.\n"
@@ -8159,7 +8165,7 @@ msgstr ""
"Denne side blev auto-genereret.\n"
"\n"
-#: client/helpdata.c:670
+#: client/helpdata.c:668
msgid ""
"Requires: Nothing\n"
"\n"
@@ -8167,79 +8173,79 @@ msgstr ""
"Kræver: Intet\n"
"\n"
-#: client/helpdata.c:675
+#: client/helpdata.c:673
#, c-format
msgid "* The discovery of %s will make %s obsolete.\n"
msgstr "* Opdagelsen af %s vil forælde %s.\n"
-#: client/helpdata.c:694
+#: client/helpdata.c:692
#, c-format
msgid "* Allows all players with knowledge of %s to build %s units.\n"
msgstr "* Tillader alle spillere med kundskab om %s at bygge %s enheder.\n"
-#: client/helpdata.c:706
+#: client/helpdata.c:704
#, c-format
msgid "* Allows %s (with %s).\n"
msgstr "* Tillader %s (med %s).\n"
-#: client/helpdata.c:710
+#: client/helpdata.c:708
#, c-format
msgid "* Allows %s.\n"
msgstr "* Tillader %s.\n"
-#: client/helpdata.c:780
+#: client/helpdata.c:778
#, c-format
msgid "* Can only be built if there is %s in the city.\n"
msgstr "* Kan kun bygges hvis der er %s i byen.\n"
-#: client/helpdata.c:786
+#: client/helpdata.c:784
#, c-format
msgid "* Can only be built with %s as government.\n"
msgstr "* Kan kun bygges med %s som styreform.\n"
-#: client/helpdata.c:791
+#: client/helpdata.c:789
msgid "* May not be built in cities.\n"
msgstr "* Kan ikke bygges i byer.\n"
-#: client/helpdata.c:794
+#: client/helpdata.c:792
msgid "* Never has a home city.\n"
msgstr "* Har aldrig en hjemby.\n"
-#: client/helpdata.c:797
+#: client/helpdata.c:795
msgid "* Losing this unit will lose you the game!\n"
msgstr "* Tab af denne enhed betyder at spillet tabes!\n"
-#: client/helpdata.c:801
+#: client/helpdata.c:799
msgid "* Each player may only have one of this type of unit.\n"
msgstr "* Hver spiller kan kun have en af denne type enhed.\n"
-#: client/helpdata.c:805
+#: client/helpdata.c:803
#, c-format
msgid "* Requires %d population to build.\n"
msgstr "* Kræver %d befolkning for at du kan bygge.\n"
-#: client/helpdata.c:811
+#: client/helpdata.c:809
#, c-format
msgid "* Can carry and refuel %d air unit.\n"
msgid_plural "* Can carry and refuel %d air units.\n"
msgstr[0] "* Kan transportere og tanke %d luftenheder.\n"
msgstr[1] "* Kan transportere og tanke %d luftenheder.\n"
-#: client/helpdata.c:816
+#: client/helpdata.c:814
#, c-format
msgid "* Can carry and refuel %d missile unit.\n"
msgid_plural "* Can carry and refuel %d missile units.\n"
msgstr[0] "* Kan transportere og tanke %d missilenheder.\n"
msgstr[1] "* Kan transportere og tanke %d missilenheder.\n"
-#: client/helpdata.c:821
+#: client/helpdata.c:819
#, c-format
msgid "* Can carry %d ground unit across water.\n"
msgid_plural "* Can carry %d ground units across water.\n"
msgstr[0] "* Kan transportere %d landenheder over vand.\n"
msgstr[1] "* Kan transportere %d landenheder over vand.\n"
-#: client/helpdata.c:830
+#: client/helpdata.c:828
msgid ""
"* Can establish trade routes (must travel to target city and must be at "
"least 9 tiles [in Manhattan distance] from this unit's home city).\n"
@@ -8247,168 +8253,168 @@ msgstr ""
"* Kan etablere handelsruter (må flytte til den ønskede by der skal være "
"mindst 9 felter fra enhedens hjemby).\n"
-#: client/helpdata.c:836
+#: client/helpdata.c:834
#, c-format
msgid "* Can help build wonders (adds %d production).\n"
msgstr "* Kan hjælpe med at bygge vidundere (tilfører %d produktion).\n"
-#: client/helpdata.c:840
+#: client/helpdata.c:838
msgid "* May not be disbanded.\n"
msgstr "* Kan ikke opløses.\n"
-#: client/helpdata.c:842
+#: client/helpdata.c:840
#, c-format
msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
msgstr ""
"* Kan opløses i en by og du opnår derved at få 50%% af "
"produktionsomkostningen tilbage.\n"
-#: client/helpdata.c:846
+#: client/helpdata.c:844
msgid "* Can build new cities.\n"
msgstr "* Kan bygge nye byer.\n"
-#: client/helpdata.c:849
+#: client/helpdata.c:847
#, c-format
msgid "* Can add on %d population to cities of no more than size %d.\n"
msgstr "* Kan tilføje %d befolkning til byer ikke størrelse end %d.\n"
-#: client/helpdata.c:858
+#: client/helpdata.c:856
msgid "* Can build roads and railroads.\n"
msgstr "* Kan bygge veje og jernbaner.\n"
-#: client/helpdata.c:859
+#: client/helpdata.c:857
msgid "* Can build mines on tiles.\n"
msgstr "* Kan bygge miner på felter.\n"
-#: client/helpdata.c:860
+#: client/helpdata.c:858
msgid "* Can build irrigation on tiles.\n"
msgstr "* Kan foretage overrisling på felter.\n"
-#: client/helpdata.c:865
+#: client/helpdata.c:863
msgid "* Can build farmland.\n"
msgstr "* Kan omdanne til landbrug.\n"
-#: client/helpdata.c:869
+#: client/helpdata.c:867
#, c-format
msgid "* Can build farmland (if %s is known).\n"
msgstr "* Kan omdanne til landbrug (hvis %s er kendt).\n"
-#: client/helpdata.c:873
+#: client/helpdata.c:871
#, c-format
msgid "* Can build farmland (if any of the following are known: %s).\n"
msgstr "* Kan bygge landbrug (hvis en af de følgende er kendt: %s).\n"
-#: client/helpdata.c:881
+#: client/helpdata.c:879
msgid "* Can build fortresses.\n"
msgstr "* Kan bygge fæstningsværker.\n"
-#: client/helpdata.c:885
+#: client/helpdata.c:883
#, c-format
msgid "* Can build fortresses (if %s is known).\n"
msgstr "* Kan bygge fæstningsværker (hvis %s er kendt).\n"
-#: client/helpdata.c:889
+#: client/helpdata.c:887
#, c-format
msgid "* Can build fortresses (if any of the following are known: %s).\n"
msgstr "* Kan bygge fæstningsværker (hvis en af de følgende er kendt: %s).\n"
-#: client/helpdata.c:895
+#: client/helpdata.c:893
msgid "* Can clean pollution from tiles.\n"
msgstr "* Kan rense for forurening på felter.\n"
-#: client/helpdata.c:896
+#: client/helpdata.c:894
msgid "* Can clean nuclear fallout from tiles.\n"
msgstr "* Kan fjerne atomaffald fra felter.\n"
-#: client/helpdata.c:899
+#: client/helpdata.c:897
msgid "* Can transform tiles.\n"
msgstr "* Kan ændre felter.\n"
-#: client/helpdata.c:902
+#: client/helpdata.c:900
msgid "* Can build airbases.\n"
msgstr "* Kan bygge lufthavne.\n"
-#: client/helpdata.c:906
+#: 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"
-#: client/helpdata.c:909
+#: client/helpdata.c:907
msgid "* May pillage to destroy infrastructure from tiles.\n"
msgstr "* Kan ødelægge infrastruktur på felter.\n"
-#: client/helpdata.c:913
+#: client/helpdata.c:911
msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
msgstr ""
"* Kan udføre diplomatiske handlinger, samt specielle spion-egenskaber.\n"
-#: client/helpdata.c:916
+#: client/helpdata.c:914
msgid "* Can perform diplomatic actions.\n"
msgstr "* Kan udføre diplomatiske handlinger.\n"
-#: client/helpdata.c:920
+#: client/helpdata.c:918
msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
msgstr "* Vil aldrig tabe en diplomat-mod-diplomat kamp.\n"
-#: client/helpdata.c:923
+#: client/helpdata.c:921
msgid "* May not be bribed.\n"
msgstr "* Denne enhed kan ikke bestikkes.\n"
-#: client/helpdata.c:926
+#: client/helpdata.c:924
msgid "* Can attack enemy air units.\n"
msgstr "* Kan angribe fjendtlige luftenheder.\n"
-#: client/helpdata.c:930
+#: client/helpdata.c:928
msgid "* Is invisible except when next to an enemy unit or city.\n"
msgstr ""
"* Er usynlig undtaget når den er ved siden af en fremmed enhed eller by.\n"
-#: client/helpdata.c:934
+#: client/helpdata.c:932
msgid "* Can only attack units on ocean squares (no land attacks).\n"
msgstr "* Kan kun angribe enheder på havet (ingen angreb mod land).\n"
# dumbo translation
-#: client/helpdata.c:938
+#: client/helpdata.c:936
msgid ""
"* Can attack from aboard sea units: against enemy cities and onto land "
"squares.\n"
msgstr ""
"* Kan fra søenheder angribe fjendens byer og landenheder på felter på land.\n"
-#: client/helpdata.c:943
+#: client/helpdata.c:941
#, c-format
msgid "* Can be paradropped from a friendly city (Range: %d).\n"
msgstr "* Kan lave faldskærmsudspring fra venlig by (Rækkevidde: %d).\n"
-#: client/helpdata.c:949
+#: client/helpdata.c:947
msgid "* Gets double defense against units specified as 'mounted'.\n"
msgstr "* FÃ¥r dobbelt forsvar mod enheder som er 'til hest'.\n"
-#: client/helpdata.c:953
+#: client/helpdata.c:951
msgid "* Counts as 'mounted' against certain defenders.\n"
msgstr "* Tæller som 'til hest' mod enkelte forsvarere.\n"
-#: client/helpdata.c:957
+#: client/helpdata.c:955
msgid "* A missile unit: gets used up in making an attack.\n"
msgstr "* En raketenhed: bliver brugt op idet den angriber.\n"
-#: client/helpdata.c:960
+#: client/helpdata.c:958
msgid "* Making an attack ends this unit's turn.\n"
msgstr "* Et angreb afslutter denne enheds runde.\n"
-#: client/helpdata.c:964
+#: client/helpdata.c:962
msgid "* This unit's attack causes a nuclear explosion!\n"
msgstr "* Denne enheds angreb skaber en atomeksplosion!\n"
-#: client/helpdata.c:968
+#: client/helpdata.c:966
msgid "* Gets double firepower when attacking cities.\n"
msgstr "* Får dobbelt angrebsstyrke når byer angribes.\n"
-#: client/helpdata.c:971
+#: client/helpdata.c:969
msgid "* Ignores the effects of city walls.\n"
msgstr "* Ignorerer effekten af bymure.\n"
-#: client/helpdata.c:975
+#: client/helpdata.c:973
#, c-format
msgid ""
"* Does bombard attacks (%d per turn). These attacks will only damage (never "
@@ -8417,36 +8423,36 @@ msgstr ""
"* Foretager bombardement (%d per runde). Disse angreb vil kun skade (aldrig "
"dræbe) forsvareren men udgør til gengæld ingen risiko for angriberen.\n"
-#: client/helpdata.c:982
+#: client/helpdata.c:980
msgid "* Gets quintuple defense against missiles and aircraft.\n"
msgstr "* FÃ¥r femdoblet forsvar mod raketter og fly.\n"
-#: client/helpdata.c:986
+#: client/helpdata.c:984
msgid "* Ignores terrain effects (treats all squares as roads).\n"
msgstr "* Ignorerer effekten af terræn (alle felter svarer til veje).\n"
-#: client/helpdata.c:989
+#: client/helpdata.c:987
msgid "* Ignores zones of control.\n"
msgstr "* Ignorerer kontrolzoner.\n"
-#: client/helpdata.c:993
+#: client/helpdata.c:991
msgid "* A non-military unit (cannot attack; no martial law).\n"
msgstr ""
"* En ikke-militær enhed (kan ikke angribe; ingen undtagelsestilstand).\n"
-#: client/helpdata.c:997
+#: client/helpdata.c:995
msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
msgstr "* En kampenhed: medfører 1 ulykkelig selv når den er ikke-aggressiv.\n"
-#: client/helpdata.c:1000
+#: client/helpdata.c:998
msgid "* Will never achieve veteran status.\n"
msgstr "* Kan ikke opnå veteran status.\n"
-#: client/helpdata.c:1002
+#: client/helpdata.c:1000
msgid "* May become veteran through training or combat.\n"
msgstr "* Kan blive veteran igennem træning eller kamp.\n"
-#: client/helpdata.c:1008
+#: client/helpdata.c:1006
#, c-format
msgid ""
"* Must end turn in a city or next to land, or has a 50%% risk of being lost "
@@ -8455,12 +8461,12 @@ msgstr ""
"* Skal afslutte runden i en by eller ved kysten, ellers har den en 50%% "
"risiko for at gå tabt på havet.\n"
-#: client/helpdata.c:1012
+#: 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"
-#: client/helpdata.c:1017
+#: client/helpdata.c:1015
#, c-format
msgid "* %s reduces the risk to 12%%.\n"
msgstr "* %s reducerer risikoen til 12%%.\n"
@@ -8469,27 +8475,27 @@ msgstr "* %s reducerer risikoen til 12%%.\n"
#. * last two elements
#. TRANS: List of possible output types has this between
#. * last two elements
-#: client/helpdata.c:1068 client/helpdata.c:1402
+#: client/helpdata.c:1066 client/helpdata.c:1400
msgid " or "
msgstr " eller "
-#: client/helpdata.c:1070 client/helpdata.c:1390
+#: client/helpdata.c:1068 client/helpdata.c:1388
msgid "?or:, "
msgstr "?eller:, "
-#: client/helpdata.c:1082
+#: 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"
msgstr[0] "* Enhed skal være i en by, eller på en %s efter %d runder.\n"
msgstr[1] "* Enhed skal være i en by, eller på en %s efter %d runder.\n"
-#: client/helpdata.c:1124
+#: client/helpdata.c:1122
#, 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:1129
+#: client/helpdata.c:1127
#, c-format
msgid ""
"To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8498,91 +8504,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:1137
+#: client/helpdata.c:1135
msgid "You cannot research this technology."
msgstr "Du kan ikke forske i denne teknologi."
-#: client/helpdata.c:1141
+#: client/helpdata.c:1139
msgid " This number may vary depending on what other players will research.\n"
msgstr ""
-"* Dette nummer kan variere afhængigt af til hvad andre spillere forsker "
-"på. \n"
+" Dette nummer kan variere afhængigt af hvad andre spillere forsker i.\n"
-#: client/helpdata.c:1153
+#: client/helpdata.c:1151
#, 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:1158
+#: client/helpdata.c:1156
#, c-format
msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
msgstr "* Reducerer risikoen for at miste skibe på det dybe ocean til 25%%.\n"
-#: client/helpdata.c:1161
+#: client/helpdata.c:1159
#, c-format
msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
msgstr "* Reducerer risikoen for at miste skibe på det dybe ocean til 12%%.\n"
-#: client/helpdata.c:1165
+#: client/helpdata.c:1163
msgid "* Increases the pollution generated by the population.\n"
msgstr "* Øger forureningen skabt af befolkningen.\n"
-#: client/helpdata.c:1170
+#: client/helpdata.c:1168
#, c-format
msgid "* Allows %s to build roads on river squares.\n"
msgstr "* Tillader %s at bygge veje på flodfelter.\n"
-#: client/helpdata.c:1177
+#: client/helpdata.c:1175
#, c-format
msgid "* Allows %s to build fortresses.\n"
msgstr "* Tillader %s at bygge forter.\n"
-#: client/helpdata.c:1185
+#: client/helpdata.c:1183
#, c-format
msgid "* Allows %s to build airbases.\n"
msgstr "* Tillader %s at bygge flybaser.\n"
-#: client/helpdata.c:1194
+#: client/helpdata.c:1192
#, c-format
msgid "* Allows %s to upgrade roads to railroads.\n"
msgstr "* Tillader %s at opgradere veje til jernbaner.\n"
-#: client/helpdata.c:1202
+#: client/helpdata.c:1200
#, c-format
msgid "* Allows %s to upgrade irrigation to farmland.\n"
msgstr "* Tillader %s at opgradere overrislet land til landbrugsland.\n"
-#: client/helpdata.c:1236
+#: client/helpdata.c:1234
msgid "* Pollution cannot be generated on this terrain."
msgstr "* Forurening opstår ikke på denne type terræn."
-#: client/helpdata.c:1241
+#: client/helpdata.c:1239
msgid "* You cannot build cities on this terrain."
msgstr "* Du kan ikke bygge byer på dette terræn."
-#: client/helpdata.c:1247
+#: client/helpdata.c:1245
msgid "* The coastline of this terrain is unsafe."
msgstr "* Kystlinjen på dette terræn er usikker."
-#: client/helpdata.c:1252
+#: client/helpdata.c:1250
msgid "* This terrain is unsafe for units to travel on."
msgstr "* Dette terræn er usikkert for enheder."
-#: client/helpdata.c:1257
+#: client/helpdata.c:1255
msgid "* Land units cannot travel on oceanic terrains."
msgstr "* Landenheder kan ikke rejse på havterræn."
-#: client/helpdata.c:1307
+#: client/helpdata.c:1305
msgid "Features:\n"
msgstr "Fordele:\n"
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1413 client/helpdata.c:1414
+#: client/helpdata.c:1411 client/helpdata.c:1412
msgid "?outputlist: Nothing "
msgstr "?outputlist: Intet "
-#: client/helpdata.c:1421
+#: client/helpdata.c:1419
#, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
@@ -8595,7 +8600,7 @@ msgstr[0] ""
msgstr[1] ""
"Militære enheder i felten og feltenheder gør %d indbyggere ulykkelige.\n"
-#: client/helpdata.c:1431
+#: client/helpdata.c:1429
#, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8604,30 +8609,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:1439
+#: client/helpdata.c:1437
#, 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:1444
+#: client/helpdata.c:1442
#, 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:1449
+#: client/helpdata.c:1447
#, 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:1453
+#: client/helpdata.c:1451
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:1462
+#: client/helpdata.c:1460
#, c-format
msgid "* Each of your cities will avoid paying %d %s towards unit upkeep.\n"
msgstr ""
@@ -8635,19 +8640,19 @@ msgstr ""
#. TRANS: Amount is subtracted from upkeep cost
#. * for each upkeep type.
-#: client/helpdata.c:1470
+#: client/helpdata.c:1468
#, 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:1477
+#: client/helpdata.c:1475
#, 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:1484
+#: client/helpdata.c:1482
#, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -8657,7 +8662,7 @@ msgstr ""
"størrelse vil opstå når du har %d byer.\n"
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1491
+#: client/helpdata.c:1489
#, c-format
msgid ""
"* After the first unhappy citizen due to city size, for each %d additional "
@@ -8666,17 +8671,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:1499
+#: client/helpdata.c:1497
#, 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:1504
+#: client/helpdata.c:1502
msgid "Has unlimited science/gold/luxuries rates.\n"
msgstr "Har ubegrænset videnskab/guld/luksus procenter.\n"
-#: client/helpdata.c:1509
+#: client/helpdata.c:1507
#, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
@@ -8691,7 +8696,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:1521
+#: client/helpdata.c:1519
#, 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"
@@ -8701,7 +8706,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:1532
+#: client/helpdata.c:1530
#, c-format
msgid ""
"* You may grow your cities by means of celebrations. Your cities must be at "
@@ -8710,15 +8715,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:1538
+#: client/helpdata.c:1536
msgid "* Your units cannot be bribed.\n"
msgstr "* Dine enheder kan ikke bestikkes.\n"
-#: client/helpdata.c:1541
+#: client/helpdata.c:1539
msgid "* Your cities cannot be incited.\n"
msgstr "* Dine byer kan ikke overtales til oprør.\n"
-#: client/helpdata.c:1545
+#: client/helpdata.c:1543
msgid ""
"* Government will fall into anarchy if any city is in disorder for more than "
"two turns in a row.\n"
@@ -8726,15 +8731,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:1551
+#: client/helpdata.c:1549
msgid "* Has a senate that may prevent declaration of war.\n"
msgstr "* Har et senat som kan forhindre krigserklæring.\n"
-#: client/helpdata.c:1555
+#: client/helpdata.c:1553
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:1559
+#: client/helpdata.c:1557
msgid ""
"* Buildings that normally confer bonuses against unhappiness will instead "
"give gold.\n"
@@ -8742,25 +8747,25 @@ msgstr ""
"* Bygninger som normalt giver bonus mod ulykkelighed vil i stedet generere "
"guld.\n"
-#: client/helpdata.c:1563
+#: client/helpdata.c:1561
msgid "* Pays no upkeep for fanatics.\n"
msgstr "* Betaler ikke vedligeholdelse for fanatikere.\n"
-#: client/helpdata.c:1566
+#: client/helpdata.c:1564
msgid "* Has no unhappy citizens.\n"
msgstr "* Har ingen ulykkelige indbyggere.\n"
-#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
+#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
#, c-format
msgid "* Veteran %s units.\n"
msgstr "* Veteran %s enheder.\n"
-#: client/helpdata.c:1587
+#: client/helpdata.c:1585
msgid "* Veteran units.\n"
msgstr "* Veteran enheder.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1593
+#: client/helpdata.c:1591
#, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8770,7 +8775,7 @@ msgstr ""
"der ikke er jubel i byen.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1602
+#: client/helpdata.c:1600
#, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8779,114 +8784,114 @@ msgstr ""
"* Hvert anvendt felt med mindst 1 %s vil medføre %d ekstra når der festes.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1610
+#: client/helpdata.c:1608
#, 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:1619
+#: client/helpdata.c:1617
#, 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:1627
+#: client/helpdata.c:1625
#, 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:1632
+#: client/helpdata.c:1630
#, 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:1637
+#: client/helpdata.c:1635
#, 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:1645
+#: client/helpdata.c:1643
#, 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:1651
+#: client/helpdata.c:1649
#, 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:1657
+#: client/helpdata.c:1655
#, 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:1674
+#: client/helpdata.c:1672
#, 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:1701
+#: client/helpdata.c:1699
#, c-format
msgid "%s%d %s"
msgstr "%s%d %s"
-#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1700 client/helpdata.c:1708 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:1709
+#: client/helpdata.c:1707
#, c-format
msgid "%s%d unhappy"
msgstr "%s%d ulykkelig"
-#: client/mapctrl_common.c:382
+#: client/mapctrl_common.c:399
#, c-format
msgid "You don't know how to build %s!"
msgstr "Du ved ikke hvordan %s bygges!"
-#: client/mapctrl_common.c:392
+#: client/mapctrl_common.c:409
#, c-format
msgid "Copy %s to clipboard."
msgstr "Kopier %s til udklipsholder."
-#: client/mapctrl_common.c:408
+#: client/mapctrl_common.c:425
msgid "Clipboard is empty."
msgstr "Udklipsholder er tom."
-#: client/options.c:98
+#: client/options.c:102
msgid "Graphics"
msgstr "Grafik"
-#: client/options.c:99
+#: client/options.c:103
msgid "Overview"
msgstr "Oversigt"
-#: client/options.c:100
+#: client/options.c:104
msgid "Sound"
msgstr "Lyd"
-#: client/options.c:101
+#: client/options.c:105
msgid "Interface"
msgstr "Interface"
-#: client/options.c:102
+#: client/options.c:106
msgid "Network"
msgstr "Netværk"
-#: client/options.c:107
+#: client/options.c:111
msgid "Login name"
msgstr "Opkoblingsnavn"
-#: client/options.c:108
+#: client/options.c:112
msgid ""
"This is the default login username that will be used in the connection "
"dialogs or with the -a command-line parameter."
@@ -8894,11 +8899,11 @@ msgstr ""
"Dette er standard brugernavnet som vil blive brugt på forbindelsens dialoger "
"eller med -a kommandolinje parametre."
-#: client/options.c:113
+#: client/options.c:117
msgid "Server"
msgstr "Server"
-#: client/options.c:114
+#: client/options.c:118
msgid ""
"This is the default server hostname that will be used in the connection "
"dialogs or with the -a command-line parameter."
@@ -8906,11 +8911,11 @@ msgstr ""
"Dette er standard servernavnet som vil blive brugt på forbindelsens dialoger "
"eller med -a kommandolinje parametre."
-#: client/options.c:119
+#: client/options.c:123
msgid "Server port"
msgstr "Server port"
-#: client/options.c:120
+#: client/options.c:124
msgid ""
"This is the default server port that will be used in the connection dialogs "
"or with the -a command-line parameter."
@@ -8918,11 +8923,11 @@ msgstr ""
"Dette er standard serverporten som vil blive brugt på forbindelsens dialoger "
"eller med -a kommandolinje parametre."
-#: client/options.c:125 client/gui-win32/connectdlg.c:912 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
msgid "Metaserver"
msgstr "Metaserver"
-#: client/options.c:126
+#: client/options.c:130
msgid ""
"The metaserver is a host that the client contacts to find out about games on "
"the internet. Don't change this from its default value unless you know what "
@@ -8931,11 +8936,11 @@ msgstr ""
"Metaserveren er en vært som klienterne kontakter for at kunne spille på "
"internettet. Skift ikke denne med mindre du ved hvad du laver."
-#: client/options.c:132
+#: client/options.c:136
msgid "Soundset"
msgstr "Lydsæt"
-#: client/options.c:133
+#: client/options.c:137
msgid ""
"This is the soundset that will be used. Changing this is the same as using "
"the -S command-line parameter."
@@ -8943,11 +8948,11 @@ msgstr ""
"Dette bestemmer lyden som anvendes. At skifte denne svarer til at anvende -S "
"kommandolinje parametre."
-#: client/options.c:138
+#: client/options.c:142
msgid "Sound plugin"
msgstr "Lyd plugin"
-#: client/options.c:139
+#: client/options.c:143
msgid ""
"If you have a problem with sound, try changing the sound plugin. The new "
"plugin won't take effect until you restart Freeciv. Changing this is the "
@@ -8957,19 +8962,19 @@ msgstr ""
"plugin vil ikke virke før efter en genstart af Freeciv. At skifte svarer "
"til at anvende -P kommandolinje indstillinger."
-#: client/options.c:144 client/gui-sdl/gui_main.c:162
+#: client/options.c:148 client/gui-sdl/gui_main.c:162
msgid "Theme"
msgstr "Tema"
-#: client/options.c:145
+#: client/options.c:149
msgid "By changing this option you change the active theme."
msgstr "Ved at skifte denne indstilling ændrer du det aktive feltsæt."
-#: client/options.c:148
+#: client/options.c:152
msgid "Tileset"
msgstr "Feltsæt"
-#: client/options.c:149
+#: client/options.c:153
msgid ""
"By changing this option you change the active tileset. This is the same as "
"using the -t command-line parameter."
@@ -8977,11 +8982,11 @@ msgstr ""
"Ved at skifte denne indstilling ændrer du det aktive feltsæt. Det svarer til "
"at anvende -t kommandolinje parametre."
-#: client/options.c:156
+#: client/options.c:160
msgid "Solid unit background color"
msgstr "Helfarvet baggrund for enheder"
-#: client/options.c:157
+#: client/options.c:161
msgid ""
"Setting this option will cause units on the map view to be drawn with a "
"solid background color instead of the flag backdrop."
@@ -8989,11 +8994,11 @@ msgstr ""
"Ved at sætte denne indstilling vil enhederne på kortet blive tegnet med en "
"fast baggrundsfarve i steden for en gennemsigtig."
-#: client/options.c:161 client/gui-sdl/optiondlg.c:960
+#: client/options.c:165 client/gui-sdl/optiondlg.c:960
msgid "Sound bell at new turn"
-msgstr "Ring en klokke ved ny runde "
+msgstr "Ring en klokke ved ny runde"
-#: client/options.c:162
+#: client/options.c:166
msgid ""
"Set this option to have a \"bell\" event be generated at the start of a new "
"turn. You can control the behavior of the \"bell\" event by editing the "
@@ -9003,11 +9008,11 @@ msgstr ""
"start på en ny runde. Du kan kontrollere hvordan \"bell\" opfører sig ved at "
"ændre på beskedsindstillingerne."
-#: client/options.c:168
+#: client/options.c:172
msgid "Unit movement animation time (milliseconds)"
msgstr "Enheders bevægelsesanimationstid (millisekunder)"
-#: client/options.c:169
+#: client/options.c:173
msgid ""
"This option controls how long unit \"animation\" takes when a unit moves on "
"the map view. Set it to 0 to disable animation entirely."
@@ -9016,11 +9021,11 @@ msgstr ""
"en enhed bevæger sig på kortet. Sættes den til 0 forsvinder animationen "
"fuldstændig."
-#: client/options.c:174
+#: client/options.c:178
msgid "Mapview recentering time (milliseconds)"
msgstr "Indstilling af kort i centrum (millisekunder)"
-#: client/options.c:175
+#: client/options.c:179
msgid ""
"When the map view is recentered, it will slide smoothly over the map to its "
"new position. This option controls how long this slide lasts. Set it to 0 "
@@ -9030,11 +9035,11 @@ msgstr ""
"indstilling kontrollerer hvor lang tid denne bevægelse tager. Hvis den "
"sættes til 0 forsvinder glidningen fuldstændig."
-#: client/options.c:180 client/gui-sdl/optiondlg.c:1014
+#: client/options.c:184 client/gui-sdl/optiondlg.c:1014
msgid "Show combat animation"
msgstr "Vis kampanimation"
-#: client/options.c:181
+#: client/options.c:185
msgid ""
"Disabling this option will turn off combat animation between units on the "
"mapview."
@@ -9042,11 +9047,11 @@ msgstr ""
"Ved at slå denne indstilling fra vil der ikke blive vist kampanimation "
"mellem enheder på kortet."
-#: client/options.c:184
+#: client/options.c:188
msgid "Draw the citybar"
msgstr "Tegn bybaren"
-#: client/options.c:185
+#: client/options.c:189
msgid ""
"Setting this option will display a 'citybar' containing useful information "
"beneath each city. Disabling this option will display only the city's name "
@@ -9055,11 +9060,11 @@ msgstr ""
"Ved at vælge denne indstilling vises en 'bybar' med brugbar information "
"under byen. Ved at slå den fra vises kun byens navn og valgfrit produktionen."
-#: client/options.c:191
+#: client/options.c:195
msgid "Show icons in the technology tree"
msgstr "Vis ikoner i teknologi træet"
-#: client/options.c:192
+#: client/options.c:196
msgid ""
"Setting this option will display icons on the technology tree diagram. "
"Turning this option off makes the technology tree more compact."
@@ -9067,11 +9072,11 @@ msgstr ""
"Ved at slå denne indstilling til vises der ikoner i teknologitræet. Ved at "
"slå denne indstilling fra gøres teknologitræet mere kompakt."
-#: client/options.c:197
+#: client/options.c:201
msgid "Draw shield graphics for units"
msgstr "Tegn skjold grafik for enheder"
-#: client/options.c:198
+#: client/options.c:202
msgid ""
"Setting this option will draw a shield icon as the flags on units. If "
"unset, the full flag will be drawn."
@@ -9079,11 +9084,11 @@ msgstr ""
"Ved at sætte denne indstilling tegnes et skjold ikon som markering for "
"enheder. Hvis den ikke sættes, vil den fulde markering tegnes."
-#: client/options.c:202
+#: client/options.c:206
msgid "Manual Turn Done in AI Mode"
msgstr "Manuel 'runde afsluttet' i AI-tilstand"
-#: client/options.c:203
+#: client/options.c:207
msgid ""
"Disable this option if you do not want to press the Turn Done button "
"manually when watching an AI player."
@@ -9091,11 +9096,11 @@ msgstr ""
"Slå denne indstilling fra hvis du ikke ønsker at anvende Runde Slut knappen "
"manuelt når du kigger på en AI spiller."
-#: client/options.c:207 client/gui-sdl/optiondlg.c:1121
+#: client/options.c:211 client/gui-sdl/optiondlg.c:1121
msgid "Auto Center on Units"
msgstr "Autocentrér på enheder"
-#: client/options.c:208
+#: client/options.c:212
msgid ""
"Set this option to have the active unit centered automatically when the unit "
"focus changes."
@@ -9103,11 +9108,11 @@ msgstr ""
"Sæt denne indstilling så den aktive enhed automatisk centreres når enheds "
"'fokus ændres."
-#: client/options.c:211 client/gui-sdl/optiondlg.c:1147
+#: client/options.c:215 client/gui-sdl/optiondlg.c:1147
msgid "Auto Center on Combat"
msgstr "Autocentrér på kamp"
-#: client/options.c:212
+#: client/options.c:216
msgid ""
"Set this option to have any combat be centered automatically. Disabled this "
"will speed up the time between turns but may cause you to miss combat "
@@ -9117,19 +9122,19 @@ msgstr ""
"at slå denne indstililng fra mindskes tidsforbruget mellem hver runde, men "
"du risikerer at overse en kamp eller flere fuldstændig."
-#: client/options.c:217 client/gui-sdl/optiondlg.c:1174
+#: client/options.c:221 client/gui-sdl/optiondlg.c:1174
msgid "Focus on Awakened Units"
msgstr "Fokus på nye enheder"
-#: client/options.c:218
+#: client/options.c:222
msgid "Set this option to have newly awoken units be focused automatically."
msgstr "Sæt denne indstilling så nye enheder automatisk vil blive centreret."
-#: client/options.c:221
+#: client/options.c:225
msgid "Allow goto into the unknown"
msgstr "Tillade at du kan gå ind i det ukendte"
-#: client/options.c:222
+#: client/options.c:226
msgid ""
"Setting this option will make the game consider moving into unknown tiles. "
"If not, then goto routes will detour around or be blocked by unknown tiles."
@@ -9138,11 +9143,11 @@ msgstr ""
"ukendte områder, hvis ikke, vil gå-til ruter undgå eller blive blokeret af "
"ukendte områder."
-#: client/options.c:226
+#: client/options.c:230
msgid "Center map when Popup city"
msgstr "Centrér kort ved visning af by"
-#: client/options.c:227
+#: client/options.c:231
msgid ""
"Setting this option makes the mapview center on a city when its city dialog "
"is popped up."
@@ -9150,22 +9155,22 @@ msgstr ""
"Ved at sætte denne indstilling centreres kortet på en by når byens dialog "
"vindue åbnes."
-#: client/options.c:230
+#: client/options.c:234
msgid "Concise City Production"
msgstr "Sammenfattet byproduktion"
-#: client/options.c:231
+#: client/options.c:235
msgid ""
"Set this option to make the city production (as shown in the city dialog) to "
"be more compact."
msgstr ""
-"Sæt denne indstilling for at gøre byens produktions vindue mere kompakt. "
+"Sæt denne indstilling for at gøre byens produktions vindue mere kompakt."
-#: client/options.c:234 client/gui-sdl/optiondlg.c:1252
+#: client/options.c:238 client/gui-sdl/optiondlg.c:1252
msgid "End Turn when done moving"
msgstr "Afslut runde efter træk"
-#: client/options.c:235
+#: client/options.c:239
msgid ""
"Setting this option makes your turn end automatically when all your units "
"are done moving."
@@ -9173,11 +9178,11 @@ msgstr ""
"Ved at sætte denne indstilling slutter din runde automatisk når alle dine "
"enheder er færdig med at flytte."
-#: client/options.c:238 client/gui-sdl/optiondlg.c:1226
+#: client/options.c:242 client/gui-sdl/optiondlg.c:1226
msgid "Prompt for city names"
msgstr "Spørg om bynavne"
-#: client/options.c:239
+#: client/options.c:243
msgid ""
"Disabling this option will make the names of newly founded cities chosen "
"automatically by the server."
@@ -9185,11 +9190,11 @@ msgstr ""
"Ved at slå denne indstilling fra vil alle nye byers navne blive valgt "
"automatisk af serveren."
-#: client/options.c:242 client/gui-sdl/optiondlg.c:1200
+#: client/options.c:246 client/gui-sdl/optiondlg.c:1200
msgid "Pop up city dialog for new cities"
msgstr "Pop-op bydialog for nye byer"
-#: client/options.c:243
+#: client/options.c:247
msgid ""
"Setting this option will pop up a newly-founded city's city dialog "
"automatically."
@@ -9197,77 +9202,139 @@ msgstr ""
"Ved at sætte denne indstilling vil en ny bys dialog vindue automatisk komme "
"frem."
-#: client/options.c:248
+#: client/options.c:250
+msgid "Pop up caravan actions"
+msgstr "Pop op karavanehandlinger"
+
+#: client/options.c:251
+msgid ""
+"If this option is enabled, when caravans arrive at a city where they can "
+"establish a traderoute or help build a wonder, a window will popup asking "
+"which action should be performed. Disabling this option means you will have "
+"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 ""
+"Hvis denne indstilling er slået til, vil et vindue åbne sig, når en karavane "
+"ankommer til en by, hvor den kan etablere en handelsrute eller hjælpe med at "
+"bygge et vidunder, der spørger hvilken handling der skal udføres. Hvis denne "
+"indstilling slås fra, skal du udføre handlingen manuelt ved at trykke på "
+"enten 'r' (for en handelsrute) eller 'b' (for at bygge et vidunder), når "
+"karavanen er i byen."
+
+#: client/options.c:260
+msgid "Enable cursor changing"
+msgstr "Slå markørændring til"
+
+#: client/options.c:261
+msgid ""
+"This option controls whether the client should try to change the mouse "
+"cursor depending on what is being pointed at, as well as to indicate changes "
+"in the client or server state."
+msgstr ""
+"Denne indstiling kontrollerer om klienten bør forsøge at ændre musemarkøren "
+"afhængig af hvad den peger på, samt indikere ændringer i klienten eller "
+"serveren."
+
+#: client/options.c:266
+msgid "Select cities before units"
+msgstr "Vælg byer før enheder"
+
+#: 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 ""
+"Hvis denne indstilling er slået til, så vil kun byer blive valgt, såfremt "
+"der er både byer og enheder til stede i udvælgelsesrektangelet."
+
+#: client/options.c:272
+msgid "Clear unit orders on selection"
+msgstr "Ryd enhedsordrer ved valg"
+
+#: client/options.c:273
+msgid ""
+"Enabling this option will cause unit orders to be cleared whenever one or "
+"more units are selected. If this option is disabled, selecting units will "
+"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 ""
+"Ved at slå denne indstilling til vil enhedsordrer blive ryddet når en eller "
+"flere enheder vælges. Hvis indstillingen er slået fra, vil det at vælge "
+"enheder ikke få dem til at stoppe med deres nuværende aktivitet. I steden "
+"for vil deres ordre kun blive ryddet når nye ordre bliver givet eller hvis "
+"du trykker <mellemrum>."
+
+#: client/options.c:282
msgid "Background layer"
msgstr "Baggrundslag"
-#: client/options.c:249
+#: client/options.c:283
msgid "The background layer of the overview shows just ocean and land."
msgstr "Baggrundslaget på overblikket viser kun hav og land."
-#: client/options.c:252
+#: client/options.c:286
msgid "Terrain relief map layer"
msgstr "Terrænreliefkortlag"
-#: client/options.c:253
+#: client/options.c:287
msgid "The relief layer shows all terrains on the map."
msgstr "Relieflaget viser alle terræn på kortet."
-#: client/options.c:256
+#: client/options.c:290
msgid "Borders layer"
msgstr "Grænselag"
-#: client/options.c:257
+#: client/options.c:291
msgid ""
"The borders layer of the overview shows which tiles are owned by each player."
msgstr ""
"Grænselagene på overblikket viser hvilke felter der er under kontrol af hver "
"spiller."
-#: client/options.c:261
+#: client/options.c:295
msgid "Units layer"
msgstr "Enhedslag"
-#: client/options.c:262
+#: client/options.c:296
msgid "Enabling this will draw units on the overview."
msgstr "Hvis denne er valgt vil enheder tegnes på overblikket."
-#: client/options.c:265
+#: client/options.c:299
msgid "Cities layer"
msgstr "Bylag"
-#: client/options.c:266
+#: client/options.c:300
msgid "Enabling this will draw cities on the overview."
msgstr "Hvis denne er valgt tegnes byer på overblikket."
-#: client/options.c:269
+#: client/options.c:303
msgid "Overview fog of war"
msgstr "Oversigtsside fog of war"
-#: client/options.c:270
+#: client/options.c:304
msgid "Enabling this will show fog of war on the overview."
msgstr "Hvis denne er valgt vises fog of war på overblikket."
-#: client/options.c:488
+#: client/options.c:526
msgid "If you add a preset by hand, also update \"number_of_presets\""
msgstr ""
"Hvis en forvalgt værdi tilføjes manuelt, så opdatér også \"number_of_presets"
"\""
-#: client/options.c:516
+#: client/options.c:554
msgid "Cannot find your home directory"
msgstr "Kan ikke finde dit hjemmekatalog"
-#: client/options.c:665 client/options.c:796
+#: client/options.c:703 client/options.c:834
msgid "Save failed, cannot find a filename."
msgstr "Gemning af spillet mislykkedes, kan ikke finde et filnavn."
-#: client/options.c:678 client/options.c:859
+#: client/options.c:716 client/options.c:897
#, c-format
msgid "Save failed, cannot write to file %s"
msgstr "Gemning mislykkedes, kan ikke skrive til fil %s"
-#: client/options.c:680 client/options.c:862
+#: client/options.c:718 client/options.c:900
#, c-format
msgid "Saved settings to file %s"
msgstr "Gemte opsætning i filen %s"
@@ -9291,16 +9358,16 @@ msgstr "Egenskabsstreng for server: %s"
msgid "Start of turn %d"
msgstr "Runde %d begynder"
-#: client/packhand.c:1590
+#: client/packhand.c:1591
#, c-format
msgid "AI Mode is now %s."
msgstr "AI-tilstand er nu %s."
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "ON"
msgstr "TIL"
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "OFF"
msgstr "FRA"
@@ -9332,14 +9399,15 @@ msgid "Username"
msgstr "Brugernavn"
#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
-#: client/gui-gtk-2.0/pages.c:2085
+#: client/gui-gtk-2.0/pages.c:2157
msgid "Flag"
msgstr "Flag"
#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
-#: client/gui-gtk-2.0/pages.c:1536 client/gui-gtk-2.0/pages.c:2087
-#: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
-#: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
+#: 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/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr "Nation"
@@ -9351,7 +9419,7 @@ msgstr "Grænse"
msgid "Score"
msgstr "Point"
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
msgid "Team"
msgstr "Hold"
@@ -9422,279 +9490,300 @@ msgstr "Ingen %s kunne opløses."
msgid "Could not open temp file."
msgstr "Kunne ikke åbne midlertidig fil."
-#: client/servers.c:407
+#: client/servers.c:410
msgid "Invalid $http_proxy or metaserver value, must start with 'http://'"
msgstr "Ugyldig $http_proxy eller metaserver værdi, skal starte med 'http://'"
-#: client/servers.c:413
+#: client/servers.c:416
msgid "Failed looking up metaserver's host"
msgstr "Mislykkedes i forsøg på at finde server"
-#: client/text.c:85 client/text.c:86 client/text.c:91
+#. TRANS: "AI <player name>"
+#: client/text.c:94
+#, c-format
+msgid "AI %s"
+msgstr "AI %s"
+
+# problem
+#. TRANS: "<nation adjective>, team <team name>"
+#: client/text.c:118
+#, c-format
+msgid "%s, team %s"
+msgstr "%s, hold %s"
+
+#: client/text.c:135 client/text.c:136 client/text.c:141
#: client/gui-sdl/mapview.c:752
msgid "?nation:Neutral"
msgstr "?nation:Neutral"
-#: client/text.c:85 client/gui-sdl/mapview.c:752
+#: client/text.c:135 client/gui-sdl/mapview.c:752
msgid "?nation:Hostile"
msgstr "?nation:Fjendtlig"
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Peaceful"
msgstr "?nation:Fredelig"
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Friendly"
msgstr "?nation:Venlig"
-#: client/text.c:88 client/gui-sdl/mapview.c:755
+#: client/text.c:138 client/gui-sdl/mapview.c:755
msgid "?nation:Mysterious"
msgstr "?nation:Mystisk"
-#: client/text.c:88
+#: client/text.c:138
msgid "?nation:Friendly(team)"
msgstr "?nation:Venligt(hold)"
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
msgid "?city:Neutral"
msgstr "?city:Neutral"
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
msgid "?city:Hostile"
msgstr "?city:Fjendtlig"
-#: client/text.c:92 client/gui-sdl/mapview.c:786
+#: client/text.c:142 client/gui-sdl/mapview.c:786
msgid "?city:Peaceful"
msgstr "?city:Fredelig"
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Friendly"
msgstr "?city:Venlig"
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Mysterious"
msgstr "?city:Mystisk"
-#: client/text.c:93
+#: client/text.c:143
msgid "?city:Friendly(team)"
msgstr "?city:Venligt(hold)"
-#: client/text.c:100
+#: client/text.c:151
#, c-format
msgid "Location: (%d, %d) [%d]"
msgstr "Position: (%d, %d) [%d]"
-#: client/text.c:109
+#: client/text.c:153
+#, c-format
+msgid "Native coordinates: (%d, %d)"
+msgstr "Nationale koordinater: (%d, %d)"
+
+#: client/text.c:160
#, c-format
msgid "Terrain: %s"
msgstr "Terræn: %s"
-#: client/text.c:110
+#: client/text.c:161
#, c-format
msgid "Food/Prod/Trade: %s"
msgstr "Mad/prod./handel: %s"
-#: client/text.c:113
+#: client/text.c:164
msgid "Minor Tribe Village"
msgstr "Mindre stammelandsby"
-#: client/text.c:119
+#: client/text.c:173
msgid "Our territory"
msgstr "Vores territorium"
-# bedre bliver det vist ikke
-#. TRANS: "Polish territory"
-#: client/text.c:122
+#. TRANS: "Territory of <username> (<nation + team>)"
+#: client/text.c:176
#, c-format
-msgid "%s territory"
-msgstr "Territorium tilhørende %s"
+msgid "Territory of %s (%s)"
+msgstr "Territorium for %s (%s)"
-#. TRANS: "Polish territory (5 turn cease-fire)"
-#: client/text.c:131
+#: client/text.c:186
#, c-format
-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)"
+msgid "Territory of %s (%s) (%d turn cease-fire)"
+msgid_plural "Territory of %s (%s) (%d turn cease-fire)"
+msgstr[0] "Territorium for %s (%s) (%d runde våbenhvile)"
+msgstr[1] "Territorium for %s (%s) (%d runder våbenhvile)"
-# bedre bliver det vist ikke
-#. TRANS: "Polish territory (friendly)"
-#: client/text.c:140
+#. TRANS: "Territory of <username>
+#. * (<nation + team> | <diplomatic state>)"
+#: client/text.c:195
#, c-format
-msgid "%s territory (%s)"
-msgstr "Territorium tilhørende %s (%s)"
+msgid "Territory of %s (%s | %s)"
+msgstr "Territorium for %s (%s | %s)"
-#: client/text.c:145
+#: client/text.c:200
msgid "Unclaimed territory"
msgstr "Ingenmandsland"
-#. TRANS: "City: Warsaw (Polish)"
-#: client/text.c:156
+#. TRANS: "City: <city name> | <username> (<nation + team>)"
+#: client/text.c:214
#, c-format
-msgid "City: %s (%s)"
-msgstr "By: %s (%s)"
+msgid "City: %s | %s (%s)"
+msgstr "By: %s | %s (%s)"
-#. TRANS: "City: Warsaw (Polish, 5 turn cease-fire)"
-#: client/text.c:166
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <number> turn cease-fire)"
+#: client/text.c:224
#, c-format
-msgid "City: %s (%s, %d turn cease-fire)"
-msgid_plural "City: %s (%s, %d turn cease-fire)"
-msgstr[0] "By: %s (%s, %d runde våbenhvile)"
-msgstr[1] "By: %s (%s, %d runde våbenhvile)"
+msgid "City: %s | %s (%s, %d turn cease-fire)"
+msgid_plural "City: %s | %s (%s, %d turn cease-fire)"
+msgstr[0] "By: %s | %s (%s, %d runde våbenhvile)"
+msgstr[1] "By: %s | %s (%s, %d runder våbenhvile)"
-#. TRANS: "City: Warsaw (Polish,friendly)"
-#: client/text.c:174
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <diplomatic state>)"
+#: client/text.c:231
#, c-format
-msgid "City: %s (%s, %s)"
-msgstr "By: %s (%s, %s)"
+msgid "City: %s | %s (%s, %s)"
+msgstr "By: %s | %s (%s, %s)"
#. TRANS: previous lines gave other information about the city.
-#: client/text.c:189
+#: client/text.c:246
#, c-format
msgid "?clistbegin: with %s"
msgstr "?clistbegin: med %s"
#. TRANS: "Trade from Warsaw: 5"
-#: client/text.c:202
+#: client/text.c:259
#, c-format
msgid "Trade from %s: %d"
msgstr "Handel fra %s: %d"
-#: client/text.c:210
+#: client/text.c:267
#, c-format
msgid "Infrastructure: %s"
msgstr "Infrastruktur: %s"
-#: client/text.c:215
+#: client/text.c:272
#, c-format
msgid "Activity: %s"
msgstr "Aktivitet: %s"
-#. TRANS: "Unit: Musketeers (Polish, Warsaw)"
-#. TRANS: "Unit: Musketeers (Polish,friendly)"
-#: client/text.c:226 client/text.c:253
+#. TRANS: "Unit: <unit type> | <username>
+#. * (<nation + team>, <homecity>)"
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <diplomatic state>)"
+#: client/text.c:287 client/text.c:313
#, c-format
-msgid "Unit: %s (%s, %s)"
-msgstr "Enhed: %s (%s, %s)"
+msgid "Unit: %s | %s (%s, %s)"
+msgstr "Enhed: %s | %s (%s, %s)"
-#. TRANS: "Unit: Musketeers (Polish)"
-#: client/text.c:232
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>)"
+#: client/text.c:292
#, c-format
-msgid "Unit: %s (%s)"
-msgstr "Enhed: %s (%s)"
+msgid "Unit: %s | %s (%s)"
+msgstr "Enhed: %s | %s (%s)"
-#. TRANS: "Unit: Musketeers (Polish, 5 turn cease-fire)"
-#: client/text.c:245
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <number> turn cease-fire)"
+#: client/text.c:305
#, c-format
-msgid "Unit: %s (%s, %d turn cease-fire)"
-msgid_plural "Unit: %s (%s, %d turn cease-fire)"
-msgstr[0] "By: %s (%s, %d runde våbenhvile)"
-msgstr[1] "By: %s (%s, %d runde våbenhvile)"
+msgid "Unit: %s | %s (%s, %d turn cease-fire)"
+msgid_plural "Unit: %s | %s (%s, %d turn cease-fire)"
+msgstr[0] "By: %s | %s (%s, %d runde våbenhvile)"
+msgstr[1] "By: %s | %s (%s, %d runder våbenhvile)"
#. TRANS: "Chance to win: A:95% D:46%"
-#: client/text.c:279
+#: client/text.c:338
#, c-format
msgid "Chance to win: A:%d%% D:%d%%"
msgstr "Sejrschance: A:%d%% F:%d%%"
#. TRANS: A is attack power, D is defense power, FP is firepower,
#. * HP is hitpoints (current and max).
-#: client/text.c:286
+#: client/text.c:345
#, c-format
msgid "A:%d D:%d FP:%d HP:%d/%d (%s)"
msgstr "A:%d F:%d FP:%d TK:%d/%d (%s)"
#. TRANS: "5 more" units on this tile
-#: client/text.c:295
+#: client/text.c:354
#, c-format
msgid " (%d more)"
msgstr " (%d flere)"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:364
+#: client/text.c:423
#, c-format
msgid "far from %s"
msgstr "langt fra %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:367
+#: client/text.c:426
#, c-format
msgid "near %s"
msgstr "nær %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:370
+#: client/text.c:429
#, c-format
msgid "in %s"
msgstr "i %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:403
+#: client/text.c:462
#, c-format
msgid "from %s"
msgstr "fra %s"
-#: client/text.c:466
+#: client/text.c:525
msgid "Progress: no research"
msgstr "Fremskridt: ingen forskning"
-#: client/text.c:470
+#: client/text.c:529
msgid "Progress: no research target"
msgstr "Fremskridt: intet forskningsmål"
-#: client/text.c:475
+#: client/text.c:534
#, c-format
msgid "Progress: %d turn/advance"
msgid_plural "Progress: %d turns/advance"
msgstr[0] "Fremskridt: %d runde/fremskridt"
msgstr[1] "Fremskridt: %d runder/fremskridt"
-#: client/text.c:480
+#: client/text.c:539
#, c-format
msgid "%d bulb/turn"
msgid_plural "%d bulbs/turn"
msgstr[0] "%d bulb/runde"
msgstr[1] "%d bulb/runde"
-#: client/text.c:485
+#: 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"
-#: client/text.c:512
+#: client/text.c:571
#, c-format
msgid "%d/- (never)"
msgstr "%d/- (aldrig)"
-#: client/text.c:524
+#: client/text.c:583
#, c-format
msgid "%d/%d (%d turn)"
msgid_plural "%d/%d (%d turns)"
msgstr[0] "%d/%d (%d runde)"
msgstr[1] "%d/%d (%d runder)"
-#: client/text.c:527
+#: client/text.c:586
#, c-format
msgid "%d/%d (never)"
msgstr "%d/%d (aldrig)"
-#: client/text.c:564
+#: client/text.c:623
#, c-format
msgid "%d step"
msgid_plural "%d steps"
msgstr[0] "(%d trin)"
msgstr[1] "(%d trin)"
-#: client/text.c:566
+#: client/text.c:625
#, c-format
msgid "%d bulb"
msgid_plural "%d bulbs"
msgstr[0] "%d bulb"
msgstr[1] "%d bulb"
-#: client/text.c:570 client/agents/cma_fec.c:269 client/agents/cma_fec.c:313
+#: 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
#, c-format
msgid "%d turn"
@@ -9702,88 +9791,88 @@ msgid_plural "%d turns"
msgstr[0] "%d runde"
msgstr[1] "%d runder"
-#: client/text.c:592
+#: client/text.c:651
#, c-format
msgid "Population: %s"
msgstr "Befolkning: %s"
-#: client/text.c:595
+#: client/text.c:654
#, c-format
msgid "Year: %s (T%d)"
msgstr "Ã…r: %s (T%d)"
-#: client/text.c:598
+#: client/text.c:657
#, c-format
msgid "Gold: %d (%+d)"
msgstr "Guld: %d (% +d)"
-#: client/text.c:600
+#: client/text.c:659
#, c-format
msgid "Tax: %d Lux: %d Sci: %d"
msgstr "Skat:%d Luks: %d Forsk: %d"
-#: client/text.c:607
+#: client/text.c:666
msgid "Moving: Nobody"
msgstr "Bevæger: Ingen"
-#: client/text.c:609
+#: client/text.c:668
#, c-format
msgid "Moving: %s"
msgstr "Bevægelse: %s"
-#: client/text.c:613
+#: client/text.c:672
msgid "(Click for more info)"
msgstr "(Klik for mere information)"
-#: client/text.c:629
+#: client/text.c:688
#, c-format
msgid "%s People"
msgstr "%s folk"
-#: client/text.c:633
+#: client/text.c:692
#, c-format
msgid "Turn: %d"
msgstr "Runde: %d"
-#: client/text.c:635 client/gui-win32/inteldlg.c:111
+#: client/text.c:694 client/gui-win32/inteldlg.c:111
#: client/gui-xaw/inteldlg.c:208
#, c-format
msgid "Gold: %d"
msgstr "Guld: %d"
-#: client/text.c:636
+#: client/text.c:695
#, c-format
msgid "Net Income: %d"
msgstr "Indtægt: %d"
#. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:639
+#: client/text.c:698
#, c-format
msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
msgstr "Skattesatser: Guld:%d%% Luks: %d%% Forsk: %d%%"
-#: client/text.c:643
+#: client/text.c:702
#, c-format
msgid "Researching %s: %s"
msgstr "Forsker på %s: %s"
-#: client/text.c:650
+#: client/text.c:709
#, c-format
msgid "Global warming chance: %d%% (%+d%%/turn)"
msgstr "Risiko for global opvarmning: %d%% (%+d%%/runde)"
-#: client/text.c:653
+#: client/text.c:712
#, c-format
msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
msgstr "Sandsynlighed for atomvinter: %d%% (%+d%%/runde)"
-#: client/text.c:658 client/gui-win32/inteldlg.c:104
+#: client/text.c:717 client/gui-win32/inteldlg.c:104
#: client/gui-xaw/inteldlg.c:200
#, c-format
msgid "Government: %s"
msgstr "Styreform: %s"
-#: client/text.c:682
+#: client/text.c:741
#, c-format
msgid "%d unit"
msgid_plural "%d units"
@@ -9791,55 +9880,55 @@ msgstr[0] "%d enhed"
msgstr[1] "%d enheder"
#. TRANS: Impossible to reach goto target tile
-#: client/text.c:715 client/gui-sdl/mapview.c:566
+#: client/text.c:774 client/gui-sdl/mapview.c:566
msgid "?goto:Unreachable"
msgstr "?goto:Ikke tilgængelig"
-#: client/text.c:717 client/gui-sdl/mapview.c:568
+#: client/text.c:776 client/gui-sdl/mapview.c:568
#, c-format
msgid "Turns to target: %d"
msgstr "Runder til mål: %d"
-#: client/text.c:719 client/gui-sdl/mapview.c:570
+#: client/text.c:778 client/gui-sdl/mapview.c:570
#, c-format
msgid "Turns to target: %d to %d"
msgstr "Runder til mål: %d til %d"
-#: client/text.c:725 client/gui-sdl/mapview.c:576
+#: client/text.c:784 client/gui-sdl/mapview.c:576
#, c-format
msgid "%d unit selected"
msgid_plural "%d units selected"
msgstr[0] "%d enhed valgt"
msgstr[1] "%d enheder valgt"
-#: client/text.c:730 client/gui-sdl/mapview.c:581
+#: client/text.c:789 client/gui-sdl/mapview.c:581
msgid "No units selected."
msgstr "Ingen enheder valgt."
-#: client/text.c:804 client/gui-sdl/mapview.c:654
+#: client/text.c:863 client/gui-sdl/mapview.c:654
#, c-format
msgid "Others: %d civil; %d military"
msgstr "Andre: %d civil; %d militær"
-#: client/text.c:806 client/gui-sdl/mapview.c:656
+#: client/text.c:865 client/gui-sdl/mapview.c:656
#, c-format
msgid "Others: %d civilian"
msgstr "Andre: %d civile"
-#: client/text.c:808 client/gui-sdl/mapview.c:658
+#: client/text.c:867 client/gui-sdl/mapview.c:658
#, c-format
msgid "Others: %d military"
msgstr "Andre: %d militær"
-#: client/text.c:839
+#: client/text.c:898
msgid "No units to upgrade!"
msgstr "Ingen enheder kunne opgraderes!"
-#: client/text.c:864
+#: client/text.c:923
msgid "None of these units may be upgraded."
msgstr "Ingen enheder kan opgraderes."
-#: client/text.c:870
+#: client/text.c:929
#, c-format
msgid ""
"Upgrade %d unit for %d gold?\n"
@@ -9854,72 +9943,72 @@ msgstr[1] ""
"Opgradér %d for %d guld?\n"
"Skatkammeret har %d guld."
-#: client/text.c:891
+#: client/text.c:950
msgid "Shows your progress in researching the current technology."
msgstr "Viser dit fremskridt i forskningen af ny teknologi."
-#: client/text.c:897
+#: client/text.c:956
msgid "no research target."
msgstr "ingen forskning"
#. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:900
+#: client/text.c:959
#, c-format
msgid "%s: %d/%d."
msgstr "%s: %d/%d."
-#: client/text.c:920
+#: client/text.c:979
msgid "Shows the progress of global warming:"
msgstr "Viser hvor fremskreden global opvarmning er:"
-#: client/text.c:921
+#: client/text.c:980
#, c-format
msgid "Pollution rate: %d%%"
msgstr "Forureningsgrad: %d%%"
-#: client/text.c:923
+#: client/text.c:982
#, c-format
msgid "Chance of catastrophic warming each turn: %d%%"
msgstr "Risiko for global opvarmning hver runde: %d%%"
-#: client/text.c:939
+#: client/text.c:998
msgid "Shows the progress of nuclear winter:"
msgstr "Viser hvor fremskreden en atomvinter er:"
-#: client/text.c:940
+#: client/text.c:999
#, c-format
msgid "Fallout rate: %d%%"
msgstr "Strålingsrate: %d%%"
-#: client/text.c:942
+#: client/text.c:1001
#, c-format
msgid "Chance of catastrophic winter each turn: %d%%"
msgstr "Risiko for en katastrofal vinter hver runde: %d%%"
-#: client/text.c:957
+#: client/text.c:1016
msgid "Shows your current government:"
msgstr "Viser din aktuelle styreform:"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:981
+#: client/text.c:1040
#, c-format
msgid "Population: %5d"
msgstr "Befolkning: %5d"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:1043
#, c-format
msgid "Support: %5d %%"
msgstr "Understøttelse: %5d%%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:1047
#, c-format
msgid "Energy: %5d %%"
msgstr "Energi: %5d%%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:992
+#: client/text.c:1051
#, c-format
msgid "Mass: %5d ton"
msgid_plural "Mass: %5d tons"
@@ -9927,96 +10016,97 @@ msgstr[0] "Masse: %5d ton"
msgstr[1] "Masse: %5d ton"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1057
#, c-format
msgid "Travel time: %5.1f years"
msgstr "Rejsetid: %5.1f år"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1061
msgid "Travel time: N/A "
msgstr "Rejsetid: - "
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1065
#, c-format
msgid "Success prob.: %5d %%"
msgstr "Succeschance: %5d%%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1010
+#: client/text.c:1069
#, c-format
msgid "Year of arrival: %8s"
msgstr "Ankomstår: %8s"
-#: client/text.c:1030
+#: client/text.c:1089
msgid "?timeout:off"
msgstr "?timeout:off"
-#: client/text.c:1054
+#: client/text.c:1113
#, c-format
msgid "?seconds:%02ds"
msgstr "?seconds:%02ds"
-#: client/text.c:1056
+#: client/text.c:1115
#, c-format
msgid "?mins/secs:%02dm %02ds"
msgstr "?mins/Secs:%02dm %02ds"
-#: client/text.c:1058
+#: client/text.c:1117
#, c-format
msgid "?hrs/mns:%02dh %02dm"
msgstr "?hrs/mns:%02dh %02dm"
-#: client/text.c:1060
+#: client/text.c:1119
#, c-format
msgid "?dys/hrs:%02dd %02dh"
msgstr "?dys/hrs:%02dd %02dh"
-#: client/text.c:1063
+#: client/text.c:1122
msgid "?duration:overflow"
msgstr "?duration:overflow"
-#: client/text.c:1084
+#: client/text.c:1143
#, c-format
msgid "%6d.%02d ms"
msgstr "%6d.%02d ms"
-#. TRANS: "Republic of the Poles"
-#: client/text.c:1127
+#. TRANS: <nation adjective> <government name>.
+#. * E.g. "Polish Republic".
+#: client/text.c:1188
#, c-format
-msgid "%s of the %s"
-msgstr "%s af %s"
+msgid "?nationgovernment:%s %s"
+msgstr "?nationgovernment:%s %s"
#. TRANS: "Observer: 1985"
-#: client/text.c:1137
+#: client/text.c:1198
#, c-format
msgid "Observer: %s"
msgstr "Observatør: %s"
-#: client/text.c:1155
+#: client/text.c:1216
msgid "Buildings: "
msgstr "Bygninger: "
-#: client/text.c:1172 client/text.c:1211
+#: client/text.c:1233 client/text.c:1272
msgid "None. "
msgstr "Ingen. "
-#: client/text.c:1174 client/text.c:1213
+#: client/text.c:1235 client/text.c:1274
msgid "?clistend:."
msgstr "."
-#: client/text.c:1192
+#: client/text.c:1253
msgid "Wonders: "
msgstr "Vidundere: "
-#: client/text.c:1247
+#: client/text.c:1308
#, 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:1251
+#: client/text.c:1312
#, c-format
msgid "%d content before penalty."
msgid_plural "%d content before penalty."
@@ -10024,45 +10114,40 @@ msgstr[0] "%d tilfreds før minuspoint."
msgstr[1] "%d tilfredse før minuspoint."
#. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1257
+#: client/text.c:1318
#, 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."
-#. TRANS: Martial law opening parenthesis
-#: client/text.c:1279
-msgid "Martial law in effect ("
-msgstr "Undtagelsestilstand ("
-
-#. TRANS: no [unit] maximum
-#: client/text.c:1284
-msgid "no maximum, "
-msgstr "intet maksimum, "
+#: client/text.c:1339
+msgid "Unlimited martial law in effect."
+msgstr "Ubegrænset undtagelsestilstand trådt i kraft."
-#: client/text.c:1287
+#: client/text.c:1341
#, c-format
-msgid "%d unit maximum, "
-msgid_plural "%d units maximum, "
-msgstr[0] "%d enhed maksimum, "
-msgstr[1] "%d enheder maksimum, "
+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."
-#. TRANS: Martial law closing parenthesis
-#: client/text.c:1294
+#: client/text.c:1345
#, c-format
-msgid "%d per unit). "
-msgstr "%d per enhed). "
+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:1298
+#: client/text.c:1352
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:1301
+#: client/text.c:1355
msgid "Military units have no happiness effect. "
msgstr "Militære enheder har ingen indvirkning på lyksaligheden. "
-#: client/text.c:1316
+#: client/text.c:1370
#, c-format
msgid "Luxury: %d total."
msgstr "Luksus: %d totalt."
@@ -10084,7 +10169,7 @@ msgid ""
msgstr ""
"Klienten understøtter ikke grafik sæt ovenfra. Benytter standard grafik."
-#: client/tilespec.c:3968
+#: client/tilespec.c:3966
#, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
@@ -10109,12 +10194,12 @@ msgid ""
"have a look."
msgstr "Byforvaltning: %s har gjort os forvirret. Du bør selv kigge på sagen."
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
-#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:599
+#: client/gui-gtk-2.0/cityrep.c:624 client/gui-sdl/citydlg.c:2009
msgid "none"
msgstr "ingen"
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:645
msgid "custom"
msgstr "egendefineret"
@@ -10421,7 +10506,7 @@ msgstr "Etablér _handelsrute"
msgid "Enter Marketplace"
msgstr "Indtræd på markedsplads"
-#: client/gui-gtk-2.0/chatline.c:144 client/gui-win32/chatline.c:134
+#: client/gui-gtk-2.0/chatline.c:218 client/gui-win32/chatline.c:134
#: client/gui-xaw/chatline.c:120
msgid "Cleared output window."
msgstr "Rensede udskriftsvindue."
@@ -10502,11 +10587,11 @@ msgid "%d/%d %d turns"
msgstr "%d/%d %d runder"
#: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:821
+#: client/gui-gtk-2.0/cityrep.c:1027
msgid "_Buy"
msgstr "_Køb"
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:869
msgid "_Production"
msgstr "_Produktion"
@@ -10527,12 +10612,12 @@ msgid "Entertainers"
msgstr "Underholdere"
#: client/gui-gtk-2.0/citydlg.c:1029 client/gui-win32/citydlg.c:1989
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2403
msgid "Scientists"
msgstr "Forskere"
#: client/gui-gtk-2.0/citydlg.c:1030 client/gui-win32/citydlg.c:1991
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2404
msgid "Taxmen"
msgstr "Skatteopkrævere"
@@ -10625,7 +10710,7 @@ msgstr "Støttede enheder %d"
msgid "Present units %d"
msgstr "Enheder tilstede %d"
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:1019
msgid "Cen_ter"
msgstr "Cen_trér"
@@ -10650,7 +10735,7 @@ msgstr "_Læs enhed"
#: client/gui-gtk-2.0/citydlg.c:2062
msgid "_Unload unit"
-msgstr "Los enhed "
+msgstr "Los enhed"
#: client/gui-gtk-2.0/citydlg.c:2073 client/gui-win32/citydlg.c:1514
msgid "_Sentry unit"
@@ -10714,31 +10799,55 @@ msgstr "Omdøb by"
msgid "What should we rename the city to?"
msgstr "Hvad skal vi omdøbe byen til?"
-#: client/gui-gtk-2.0/cityrep.c:699
+#: client/gui-gtk-2.0/cityrep.c:794
+msgid "(no worklists defined)"
+msgstr "(ingen definerede arbejdslister)"
+
+#: client/gui-gtk-2.0/cityrep.c:876
msgid "Chan_ge"
msgstr "Ændr"
-#: client/gui-gtk-2.0/cityrep.c:703
+#: client/gui-gtk-2.0/cityrep.c:880
msgid "Add _First"
msgstr "Tilføj _først"
-#: client/gui-gtk-2.0/cityrep.c:707
+#: client/gui-gtk-2.0/cityrep.c:884
msgid "Add _Next"
msgstr "Tilføj _næste"
-#: client/gui-gtk-2.0/cityrep.c:711
+#: client/gui-gtk-2.0/cityrep.c:888
+msgid "Add _2nd Last"
+msgstr "Tilføj _2. sidste"
+
+#: client/gui-gtk-2.0/cityrep.c:892
msgid "Add _Last"
-msgstr "Tilføj _last"
+msgstr "Tilføj s_idste"
+
+#: client/gui-gtk-2.0/cityrep.c:899
+msgid "Set Worklist"
+msgstr "Indstil arbejdsliste"
-#: client/gui-gtk-2.0/cityrep.c:715
+#: client/gui-gtk-2.0/cityrep.c:905
+msgid "Append Worklist"
+msgstr "Tilføj arbejdsliste"
+
+#: client/gui-gtk-2.0/cityrep.c:911
+msgid "Clear _Worklist"
+msgstr "Ryd _arbejdsliste"
+
+#: client/gui-gtk-2.0/cityrep.c:916
+msgid "Gover_nor"
+msgstr "Guver_nør"
+
+#: client/gui-gtk-2.0/cityrep.c:921
msgid "_Select"
msgstr "Vælg _S"
-#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
+#: client/gui-gtk-2.0/cityrep.c:925 client/gui-gtk-2.0/plrdlg.c:521
msgid "_Display"
msgstr "Vis _h"
-#: client/gui-gtk-2.0/cityrep.c:800 client/gui-gtk-2.0/menu.c:808
+#: 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-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
#: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -10748,100 +10857,100 @@ msgstr "Vis _h"
msgid "Cities"
msgstr "Byer"
-#: client/gui-gtk-2.0/cityrep.c:817
+#: client/gui-gtk-2.0/cityrep.c:1023
msgid "_Inspect"
msgstr "_Inspeksér"
-#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
-#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-sdl/helpdlg.c:297 client/gui-win32/menu.c:342
-#: client/gui-xaw/menu.c:241
+#: 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
+#: client/gui-gtk-2.0/cityrep.c:1518 client/gui-gtk-2.0/menu.c:823
+#: client/gui-gtk-2.0/menu.c:825 client/gui-gtk-2.0/menu.c:827
+#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:831
+#: client/gui-gtk-2.0/menu.c:833 client/gui-sdl/helpdlg.c:297
+#: client/gui-win32/menu.c:342 client/gui-xaw/menu.c:241
msgid "Improvements"
msgstr "Forbedringer"
-#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
-#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
-#: client/gui-xaw/menu.c:247
+#: client/gui-gtk-2.0/cityrep.c:1441 client/gui-gtk-2.0/cityrep.c:1460
+#: client/gui-gtk-2.0/cityrep.c:1479 client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1522 client/gui-xaw/menu.c:247
msgid "Wonders"
msgstr "Vidundere"
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1662 client/gui-win32/cityrep.c:439
#: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
msgid "All Cities"
msgstr "Alle byer"
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1667 client/gui-win32/cityrep.c:440
msgid "No Cities"
msgstr "Ingen byer"
-#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1672 client/gui-win32/cityrep.c:441
msgid "Invert Selection"
msgstr "Vend valg om"
-#: client/gui-gtk-2.0/cityrep.c:1420
+#: client/gui-gtk-2.0/cityrep.c:1682
msgid "Building Units"
msgstr "Bygger enheder"
-#: client/gui-gtk-2.0/cityrep.c:1426
+#: client/gui-gtk-2.0/cityrep.c:1688
msgid "Building Improvements"
msgstr "Bygningsforbedringer"
-#: client/gui-gtk-2.0/cityrep.c:1432
+#: client/gui-gtk-2.0/cityrep.c:1694
msgid "Building Wonders"
msgstr "Bygning af vidunder"
-#: client/gui-gtk-2.0/cityrep.c:1444
+#: client/gui-gtk-2.0/cityrep.c:1706
msgid "Building Unit"
msgstr "Bygger enhed"
-#: client/gui-gtk-2.0/cityrep.c:1448
+#: client/gui-gtk-2.0/cityrep.c:1710
msgid "Building Improvement"
msgstr "Bygningsforbedring"
-#: client/gui-gtk-2.0/cityrep.c:1452
+#: client/gui-gtk-2.0/cityrep.c:1714
msgid "Building Wonder"
msgstr "Bygning af vidunder"
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1722 client/gui-win32/cityrep.c:443
msgid "Coastal Cities"
msgstr "Byer ved kysten"
-#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1727 client/gui-win32/cityrep.c:444
msgid "Same Island"
msgstr "Samme ø"
-#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1737 client/gui-win32/cityrep.c:447
msgid "Supported Units"
msgstr "Støttede enheder"
-#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1740 client/gui-win32/cityrep.c:454
msgid "Units Present"
msgstr "Enheder tilstede"
-#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1744 client/gui-win32/cityrep.c:469
msgid "Improvements in City"
msgstr "Forbedringer i by"
-#: client/gui-gtk-2.0/cityrep.c:1486
+#: client/gui-gtk-2.0/cityrep.c:1748
msgid "Wonders in City"
msgstr "Vidundere i byen"
-#: client/gui-gtk-2.0/cityrep.c:1495
+#: client/gui-gtk-2.0/cityrep.c:1757
msgid "Available Units"
msgstr "Tilgængelige enheder"
-#: client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1760
msgid "Available Improvements"
msgstr "Tilgængelige Forbedringer"
-#: client/gui-gtk-2.0/cityrep.c:1501
+#: client/gui-gtk-2.0/cityrep.c:1763
msgid "Available Wonders"
msgstr "Tilgængelige vidundere"
-#: client/gui-gtk-2.0/cityrep.c:1625
+#: client/gui-gtk-2.0/cityrep.c:1882
#, c-format
msgid "Total Buy Cost: %d"
msgstr "Total købspris: %d"
@@ -10860,7 +10969,7 @@ msgstr ""
#: client/gui-gtk-2.0/cma_fe.c:269
msgid "_Presets:"
-msgstr "Forhåndsvalg:"
+msgstr "Forhåndsval_g:"
#: client/gui-gtk-2.0/cma_fe.c:302 client/gui-win32/cma_fe.c:482
#: client/gui-win32/repodlgs.c:380 client/gui-xaw/repodlgs.c:755
@@ -10895,7 +11004,7 @@ msgstr "Leder inaktiveret"
#: client/gui-sdl/cma_fe.c:308 client/gui-win32/cma_fe.c:385
#: client/gui-xaw/cma_fe.c:432
msgid "new preset"
-msgstr "Nyt forhåndsvalg"
+msgstr "nyt forhåndsvalg"
#: client/gui-gtk-2.0/cma_fe.c:540 client/gui-sdl/cma_fe.c:281
#: client/gui-win32/cma_fe.c:383
@@ -10911,11 +11020,11 @@ 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:186
+#: client/gui-gtk-2.0/dialogs.c:196 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:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
msgid "Inspect _City"
msgstr "_Vis by"
@@ -10943,10 +11052,10 @@ msgstr "Vælg hvad der skal plyndres:"
msgid "Unit"
msgstr "Enhed"
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
-#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
-#: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
-#: manual/civmanual.c:302 data/Freeciv.in:80
+#: 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-win32/plrdlg.c:335 manual/civmanual.c:302 data/Freeciv.in:80
msgid "Name"
msgstr "Navn"
@@ -10971,7 +11080,7 @@ 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:1036 data/Freeciv.in:3371
+#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
msgid "Pick Nation"
msgstr "Vælg nation"
@@ -11051,7 +11160,7 @@ msgstr "_Kort"
msgid "_Advances"
msgstr "_Fremskridt"
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:910
+#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr "_Byer"
@@ -11156,19 +11265,19 @@ msgstr "Vælg destination"
msgid "Show _All Cities"
msgstr "Vis _alle byer"
-#: client/gui-gtk-2.0/gui_main.c:150
+#: client/gui-gtk-2.0/gui_main.c:162
msgid "Show Map Scrollbars"
msgstr "Vis rulleskakter på kort"
-#: client/gui-gtk-2.0/gui_main.c:151
+#: client/gui-gtk-2.0/gui_main.c:163
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:155
+#: client/gui-gtk-2.0/gui_main.c:167
msgid "Keyboardless goto"
msgstr "GÃ¥-til uden tastatur"
-#: client/gui-gtk-2.0/gui_main.c:156
+#: client/gui-gtk-2.0/gui_main.c:168
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."
@@ -11176,11 +11285,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:161
+#: client/gui-gtk-2.0/gui_main.c:173
msgid "Keep dialogs on top"
msgstr "Vis vinduer øverst"
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:174
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."
@@ -11188,11 +11297,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:166
+#: client/gui-gtk-2.0/gui_main.c:178
msgid "Show worklist task icons"
msgstr "Vis arbejdslisteikoner"
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:179
msgid ""
"Disabling this will turn off the unit and building icons in the worklist "
"dialog and the production tab of the city dialog."
@@ -11200,11 +11309,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:171
+#: client/gui-gtk-2.0/gui_main.c:183
msgid "Enable status report tabs"
msgstr "Slå statusrapportvinduet til"
-#: client/gui-gtk-2.0/gui_main.c:172
+#: client/gui-gtk-2.0/gui_main.c:184
msgid ""
"If this option is enabled then report dialogs will be shown as separate tabs "
"rather than in popup dialogs."
@@ -11212,11 +11321,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:177 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:189 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:178 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:190 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."
@@ -11225,52 +11334,142 @@ msgstr ""
"Valget er ikke langsommere, men vil anvende cirka dobbelt så meget "
"hukommelse."
-#: client/gui-gtk-2.0/gui_main.c:277 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:195
+msgid "Show time for each chat message"
+msgstr "Vis tid for hver enkel snakbesked"
+
+#: client/gui-gtk-2.0/gui_main.c:196
+msgid ""
+"If this option is enabled then all chat messages will be prefixed by a time "
+"string of the form [hour:minute:second]."
+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
+msgid "Split bottom notebook area"
+msgstr "Opdel notebogsområdets bund"
+
+#: client/gui-gtk-2.0/gui_main.c:202
+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 ""
+"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
+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
+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 ""
+"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
+msgid "Show extra message window buttons"
+msgstr "Vis ekstra knapper for beskedvindue"
+
+#: client/gui-gtk-2.0/gui_main.c:214
+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 "
+"is disabled, these buttons will not appear (you can still double-click with "
+"the left mouse button or right-click on a row to inspect or goto "
+"respectively). This option will only take effect once the message window is "
+"closed and reopened."
+msgstr ""
+"Hvis denne indstilling er slået til vil to knapper blive vist i "
+"beskedvinduet. Den ene viser inspektion af en by og den anden kan gå til en "
+"placering på kortet. Hvis denne indstilling slås fra vil disse knapper ikke "
+"blive vist (du kan stadig dobbeltklikke med venstre museknap eller "
+"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
+msgid "Metaserver tab first in network page"
+msgstr "Metaserverfaneblad først på netværksside"
+
+#: client/gui-gtk-2.0/gui_main.c:225
+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 ""
+"Hvis denne indstilling er slået til, vil fanebladet for metaserveren være "
+"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
+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
+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 "
+"messages will be sent as public chat messages. To send a public chat message "
+"with this option enabled, prefix the message with a single colon ':'. This "
+"option can also be set using a toggle button beside the chat entry (only "
+"visible in multiplayer games)."
+msgstr ""
+"Hvis denne indstilling er slået til så vil enkle beskeder indtastet mens "
+"spillet kører kun blive sendt til allierede. Ellers vil enkle beskeder blive "
+"sendt som offentlige snakkebeskeder. For at sende en offentlig besked når "
+"denne indstilling er slået til skrives der et enkelt kolon ':' først i "
+"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
msgid ""
"This client has no special command line options\n"
"\n"
msgstr ""
-"Denne klient har ingen speciel kommandolinje-indstillinger\n"
+"Denne klient har ingen specielle indstillinger for kommandolinje\n"
"\n"
-#: client/gui-gtk-2.0/gui_main.c:723 client/gui-gtk-2.0/gui_main.c:1345
+#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
msgid "Freeciv"
msgstr "Freeciv"
-#: client/gui-gtk-2.0/gui_main.c:1088 client/gui-gtk-2.0/gui_main.c:1095
+#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
#: 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:1095 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1232 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:1127 client/gui-gtk-2.0/menu.c:770
-#: client/gui-gtk-2.0/menu.c:772 client/gui-gtk-2.0/menu.c:774
-#: client/gui-gtk-2.0/menu.c:776 client/gui-gtk-2.0/menu.c:778
-#: client/gui-gtk-2.0/menu.c:780 client/gui-gtk-2.0/menu.c:782
-#: client/gui-gtk-2.0/menu.c:784 client/gui-gtk-2.0/menu.c:786
-#: client/gui-gtk-2.0/menu.c:788 client/gui-gtk-2.0/menu.c:790
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-gtk-2.0/menu.c:804 client/gui-gtk-2.0/menu.c:806
-#: client/gui-gtk-2.0/menu.c:808 client/gui-gtk-2.0/menu.c:810
-#: client/gui-gtk-2.0/menu.c:812 client/gui-gtk-2.0/menu.c:814
-#: client/gui-gtk-2.0/menu.c:816 client/gui-gtk-2.0/menu.c:818
-#: client/gui-gtk-2.0/menu.c:820 client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/gui_main.c:1266 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
+#: client/gui-gtk-2.0/menu.c:811 client/gui-gtk-2.0/menu.c:813
+#: client/gui-gtk-2.0/menu.c:815 client/gui-gtk-2.0/menu.c:817
+#: client/gui-gtk-2.0/menu.c:819 client/gui-gtk-2.0/menu.c:821
+#: client/gui-gtk-2.0/menu.c:823 client/gui-gtk-2.0/menu.c:825
+#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
+#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
+#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
+#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
+#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
+#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
#: data/Freeciv.in:2028
msgid "View"
msgstr "Kortvindue"
-#: client/gui-gtk-2.0/gui_main.c:1208
+#: client/gui-gtk-2.0/gui_main.c:1359
msgid "Chat"
msgstr "Snak"
-#: client/gui-gtk-2.0/gui_main.c:1224 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1377 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"
@@ -11284,69 +11483,73 @@ msgstr ""
"\n"
"Og giv dem så tørt på!"
-#: client/gui-gtk-2.0/gui_main.c:1491
+#: client/gui-gtk-2.0/gui_main.c:1392
+msgid "Allies Only"
+msgstr "Kun allierede"
+
+#: client/gui-gtk-2.0/gui_main.c:1657
msgid "Not _ready"
msgstr "Ikke kla_r"
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
+#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
msgid "_Ready"
msgstr "_Klargør alle"
-#: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2132
+#: 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
msgid "_Start"
msgstr "_Start"
-#: client/gui-gtk-2.0/gui_main.c:1520
+#: client/gui-gtk-2.0/gui_main.c:1686
msgid "_Take Player"
msgstr "_Benyt denne spiller"
-#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
+#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
msgid "Pick _Nation"
msgstr "Vælg _nation"
-#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
+#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
msgid "_Observe"
msgstr "_Observer"
-#: client/gui-gtk-2.0/gui_main.c:1532
+#: client/gui-gtk-2.0/gui_main.c:1698
msgid "Do not _observe"
msgstr "Undlad at _observere"
-#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
msgid "<AI>"
msgstr "<AI>"
-#: client/gui-gtk-2.0/gui_main.c:1557
+#: client/gui-gtk-2.0/gui_main.c:1723
msgid "<Novice AI>"
msgstr "<Novice AI>"
-#: client/gui-gtk-2.0/gui_main.c:1560
+#: client/gui-gtk-2.0/gui_main.c:1726
msgid "<Easy AI>"
msgstr "<Nem AI>"
-#: client/gui-gtk-2.0/gui_main.c:1563
+#: client/gui-gtk-2.0/gui_main.c:1729
msgid "<Normal AI>"
msgstr "<Normal AI>"
-#: client/gui-gtk-2.0/gui_main.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1732
msgid "<Hard AI>"
msgstr "<Dygtig AI>"
-#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1742 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:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
msgid "Observer"
msgstr "Observatør"
-#: client/gui-gtk-2.0/gui_main.c:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
msgid "Detached"
msgstr "Aftaget"
-#: client/gui-gtk-2.0/gui_main.c:1899
+#: client/gui-gtk-2.0/gui_main.c:2073
msgid "Are you sure you want to quit?"
msgstr "Er du sikker på at du vil slutte?"
@@ -11578,57 +11781,57 @@ msgstr "_Teknologier"
msgid "Foreign Intelligence: %s Empire"
msgstr "Efterretningsrapport: %s Imperium"
-#: client/gui-gtk-2.0/mapctrl.c:195 client/gui-sdl/mapctrl.c:2565
+#: client/gui-gtk-2.0/mapctrl.c:179 client/gui-sdl/mapctrl.c:2565
#: client/gui-sdl/menu.c:839 client/gui-sdl/menu.c:1021
#: client/gui-win32/mapctrl.c:353
msgid "Build New City"
msgstr "Byg ny by"
-#: client/gui-gtk-2.0/mapctrl.c:196 client/gui-sdl/mapctrl.c:2594
+#: client/gui-gtk-2.0/mapctrl.c:180 client/gui-sdl/mapctrl.c:2594
#: client/gui-win32/mapctrl.c:354 client/gui-xaw/mapctrl.c:89
msgid "What should we call our new city?"
msgstr "Hvad skal vi kalde vor nye by?"
-#: client/gui-gtk-2.0/mapview.c:147
+#: client/gui-gtk-2.0/mapview.c:158
msgid "Shows your current luxury/science/tax rates;click to toggle them."
msgstr ""
"Viser dine nuværende luksus/videnskab/skatte procenter;klik for at ændre dem."
-#: client/gui-gtk-2.0/mapview.c:692 client/gui-win32/canvas.c:275
+#: client/gui-gtk-2.0/mapview.c:702 client/gui-win32/canvas.c:275
msgid "Better fog will only work in truecolor. Disabling it"
msgstr "Bedre tåge virker kun i truecolor. Slår det fra"
-#: client/gui-gtk-2.0/menu.c:250
+#: client/gui-gtk-2.0/menu.c:256
msgid "Leaving a local game will end it!"
msgstr "Ved at forlade et lokalt spil standser det!"
-#: client/gui-gtk-2.0/menu.c:700 client/gui-win32/menu.c:303
+#: client/gui-gtk-2.0/menu.c:727 client/gui-win32/menu.c:303
msgid "_Game"
msgstr "_Spil"
-#: client/gui-gtk-2.0/menu.c:702 client/gui-gtk-2.0/menu.c:704
-#: client/gui-gtk-2.0/menu.c:706 client/gui-gtk-2.0/menu.c:708
-#: client/gui-gtk-2.0/menu.c:710 client/gui-gtk-2.0/menu.c:712
-#: client/gui-gtk-2.0/menu.c:714 client/gui-gtk-2.0/menu.c:717
-#: client/gui-gtk-2.0/menu.c:720 client/gui-gtk-2.0/menu.c:722
-#: client/gui-gtk-2.0/menu.c:724 client/gui-gtk-2.0/menu.c:726
-#: client/gui-gtk-2.0/menu.c:728 client/gui-gtk-2.0/menu.c:730
-#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:736
-#: client/gui-gtk-2.0/menu.c:738 client/gui-gtk-2.0/menu.c:740
+#: client/gui-gtk-2.0/menu.c:729 client/gui-gtk-2.0/menu.c:731
+#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:735
+#: client/gui-gtk-2.0/menu.c:737 client/gui-gtk-2.0/menu.c:739
+#: client/gui-gtk-2.0/menu.c:741 client/gui-gtk-2.0/menu.c:744
+#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
+#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
+#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
+#: client/gui-gtk-2.0/menu.c:760 client/gui-gtk-2.0/menu.c:763
+#: client/gui-gtk-2.0/menu.c:765 client/gui-gtk-2.0/menu.c:767
#: data/Freeciv.in:2026
msgid "Game"
msgstr "Spil"
-#: client/gui-gtk-2.0/menu.c:704 client/gui-gtk-2.0/menu.c:706
-#: client/gui-gtk-2.0/menu.c:708
+#: client/gui-gtk-2.0/menu.c:731 client/gui-gtk-2.0/menu.c:733
+#: client/gui-gtk-2.0/menu.c:735
msgid "_Chat"
msgstr "_Snak"
-#: client/gui-gtk-2.0/menu.c:706 client/gui-win32/menu.c:314
+#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:314
msgid "_Clear Log"
msgstr "_Ryd log"
-#: client/gui-gtk-2.0/menu.c:708 client/gui-win32/menu.c:313
+#: client/gui-gtk-2.0/menu.c:735 client/gui-win32/menu.c:313
msgid "_Write Log"
msgstr "_Eksportér log"
@@ -11640,413 +11843,447 @@ msgstr "_Eksportér log"
# german translation.
#
# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-#: client/gui-gtk-2.0/menu.c:710 client/gui-win32/menu.c:304
+#: client/gui-gtk-2.0/menu.c:737 client/gui-win32/menu.c:304
msgid "Local _Options"
msgstr "L_okale indstillinger"
-#: client/gui-gtk-2.0/menu.c:712 client/gui-win32/menu.c:305
+#: client/gui-gtk-2.0/menu.c:739 client/gui-win32/menu.c:305
msgid "_Message Options"
msgstr "_Beskeds indstillinger"
-#: client/gui-gtk-2.0/menu.c:717
+#: client/gui-gtk-2.0/menu.c:744
msgid "_Reload Tileset"
-msgstr "Genindlæs feltsæt"
+msgstr "_Genindlæs feltsæt"
-#: client/gui-gtk-2.0/menu.c:720
+#: client/gui-gtk-2.0/menu.c:747
msgid "Save Options on _Exit"
-msgstr "Gem indstillinger ved exit"
+msgstr "Gem indstillinger ved _afslutning"
-#: client/gui-gtk-2.0/menu.c:722
+#: client/gui-gtk-2.0/menu.c:749
msgid "Sa_ve Options"
msgstr "Gem indstillinger"
-#: client/gui-gtk-2.0/menu.c:726 client/gui-win32/menu.c:308
+#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:308
msgid "Server O_ptions"
msgstr "Server indstillinger"
-#: client/gui-gtk-2.0/menu.c:730 client/gui-win32/menu.c:310
+#: client/gui-gtk-2.0/menu.c:757 client/gui-win32/menu.c:310
msgid "_Save Game"
msgstr "Gem _spil"
-#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:311
+#: client/gui-gtk-2.0/menu.c:760 client/gui-win32/menu.c:311
msgid "Save Game _As..."
msgstr "Gem spil som..."
-#: client/gui-gtk-2.0/menu.c:738
+#: client/gui-gtk-2.0/menu.c:765
msgid "_Leave"
msgstr "Forlad"
-#: client/gui-gtk-2.0/menu.c:740 client/gui-win32/menu.c:317
+#: client/gui-gtk-2.0/menu.c:767 client/gui-win32/menu.c:317
msgid "_Quit"
msgstr "_Afslut"
-#: client/gui-gtk-2.0/menu.c:745 client/gui-win32/menu.c:321
+#: client/gui-gtk-2.0/menu.c:772 client/gui-win32/menu.c:321
msgid "Gov_ernment"
msgstr "Styreform"
-#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
-#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
-#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:774 client/gui-gtk-2.0/menu.c:776
+#: client/gui-gtk-2.0/menu.c:778 client/gui-gtk-2.0/menu.c:780
+#: client/gui-gtk-2.0/menu.c:782 client/gui-gtk-2.0/menu.c:784
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
#: client/gui-xaw/menu.c:248 data/Freeciv.in:2027 data/helpdata.txt:1320
msgid "Government"
msgstr "Styreform"
-#: client/gui-gtk-2.0/menu.c:749 client/gui-win32/menu.c:322
+#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:322
msgid "_Tax Rates"
msgstr "_Skatteniveau"
-#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:324
+#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:324
msgid "_Find City"
msgstr "_Find by"
-#: client/gui-gtk-2.0/menu.c:755 client/gui-win32/menu.c:325
+#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:325
msgid "_Worklists"
msgstr "_Arbejdsliste"
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
-#: client/gui-gtk-2.0/menu.c:764 client/gui-win32/menu.c:327
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
+#: client/gui-gtk-2.0/menu.c:791 client/gui-win32/menu.c:327
msgid "_Change Government"
msgstr "Ændre styreform"
-#: client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:788
msgid "_Revolution..."
msgstr "_Revolution..."
-#: client/gui-gtk-2.0/menu.c:764 client/gui-gtk-2.0/menu.c:970
+#: client/gui-gtk-2.0/menu.c:791 client/gui-gtk-2.0/menu.c:1013
#: client/gui-win32/menu.c:431
msgid "_Government"
msgstr "_Styreform"
-#: client/gui-gtk-2.0/menu.c:768 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:795 client/gui-gtk-2.0/menu.c:959
#: client/gui-win32/menu.c:334
msgid "_View"
msgstr "_Kortvindue"
-#: client/gui-gtk-2.0/menu.c:772
+#: client/gui-gtk-2.0/menu.c:799
msgid "City Outlines"
msgstr "Byomrids"
-#: client/gui-gtk-2.0/menu.c:774 client/gui-win32/menu.c:335
+#: client/gui-gtk-2.0/menu.c:801 client/gui-win32/menu.c:335
msgid "Map _Grid"
msgstr "Kort_gitter"
-#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:336
+#: client/gui-gtk-2.0/menu.c:803 client/gui-win32/menu.c:336
msgid "National _Borders"
msgstr "Landegrænser"
-#: client/gui-gtk-2.0/menu.c:778 client/gui-win32/menu.c:337
+#: client/gui-gtk-2.0/menu.c:805 client/gui-win32/menu.c:337
msgid "City _Names"
msgstr "By_navne"
-#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:338
+#: client/gui-gtk-2.0/menu.c:807 client/gui-win32/menu.c:338
msgid "City G_rowth"
msgstr "By_vækst"
-#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:339
+#: client/gui-gtk-2.0/menu.c:809 client/gui-win32/menu.c:339
msgid "City _Productions"
msgstr "By_produktioner"
-#: client/gui-gtk-2.0/menu.c:784 client/gui-sdl/optiondlg.c:1719
+#: client/gui-gtk-2.0/menu.c:811
+msgid "City Buy Cost"
+msgstr "By købspris"
+
+#: client/gui-gtk-2.0/menu.c:813
+msgid "City Traderoutes"
+msgstr "Byhandelsruter"
+
+#: client/gui-gtk-2.0/menu.c:815 client/gui-sdl/optiondlg.c:1719
msgid "Draw city worker map grid"
msgstr "Tegn arbejders kortomrids"
-#: client/gui-gtk-2.0/menu.c:788 client/gui-sdl/optiondlg.c:1635
+#: client/gui-gtk-2.0/menu.c:819 client/gui-sdl/optiondlg.c:1635
#: client/gui-win32/menu.c:340 client/gui-xaw/menu.c:148
#: client/gui-xaw/menu.c:246 manual/civmanual.c:220 data/helpdata.txt:1220
msgid "Terrain"
msgstr "Terræn"
-#: client/gui-gtk-2.0/menu.c:790 client/gui-win32/menu.c:341
+#: client/gui-gtk-2.0/menu.c:821 client/gui-win32/menu.c:341
#: client/gui-xaw/menu.c:149
msgid "Coastline"
msgstr "Kystlinje"
-#: client/gui-gtk-2.0/menu.c:796 client/gui-win32/menu.c:343
+#: client/gui-gtk-2.0/menu.c:827 client/gui-win32/menu.c:343
msgid "Roads & Rails"
msgstr "Veje og togskinner"
-#: client/gui-gtk-2.0/menu.c:800 client/gui-sdl/optiondlg.c:1933
+#: client/gui-gtk-2.0/menu.c:831 client/gui-sdl/optiondlg.c:1933
#: client/gui-win32/menu.c:345 client/gui-xaw/menu.c:152
msgid "Mines"
msgstr "Miner"
-#: client/gui-gtk-2.0/menu.c:802 client/gui-win32/menu.c:346
+#: client/gui-gtk-2.0/menu.c:833 client/gui-win32/menu.c:346
msgid "Fortress & Airbase"
msgstr "Fæstning & Flybase"
-#: client/gui-gtk-2.0/menu.c:804 client/gui-win32/menu.c:348
+#: client/gui-gtk-2.0/menu.c:835 client/gui-win32/menu.c:348
#: client/gui-xaw/menu.c:154
msgid "Specials"
msgstr "Specielle"
-#: client/gui-gtk-2.0/menu.c:806 client/gui-win32/menu.c:349
+#: client/gui-gtk-2.0/menu.c:837 client/gui-win32/menu.c:349
#: client/gui-xaw/menu.c:155
msgid "Pollution & Fallout"
msgstr "Forurening & Atomaffald"
-#: client/gui-gtk-2.0/menu.c:812 client/gui-win32/menu.c:352
+#: client/gui-gtk-2.0/menu.c:843 client/gui-win32/menu.c:352
#: client/gui-xaw/menu.c:158
msgid "Focus Unit"
msgstr "Fokus på enhed"
-#: client/gui-gtk-2.0/menu.c:814 client/gui-sdl/optiondlg.c:1854
+#: client/gui-gtk-2.0/menu.c:845 client/gui-sdl/optiondlg.c:1854
#: client/gui-win32/menu.c:353 client/gui-xaw/menu.c:159
msgid "Fog of War"
msgstr "Krigståge"
-#: client/gui-gtk-2.0/menu.c:818
+#: client/gui-gtk-2.0/menu.c:849
msgid "_Full Screen"
msgstr "_Fuldskærmstilstand"
-#: client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/menu.c:853
msgid "_Center View"
msgstr "_Centrér vindue"
-#: client/gui-gtk-2.0/menu.c:825 client/gui-win32/menu.c:358
+#: client/gui-gtk-2.0/menu.c:856 client/gui-win32/menu.c:358
msgid "_Orders"
msgstr "_Ordrer"
-#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
-#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
-#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
-#: client/gui-gtk-2.0/menu.c:855 client/gui-gtk-2.0/menu.c:857
-#: client/gui-gtk-2.0/menu.c:859 client/gui-gtk-2.0/menu.c:861
-#: client/gui-gtk-2.0/menu.c:863 client/gui-gtk-2.0/menu.c:865
-#: client/gui-gtk-2.0/menu.c:867 client/gui-gtk-2.0/menu.c:869
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875 client/gui-gtk-2.0/menu.c:877
-#: client/gui-gtk-2.0/menu.c:879 client/gui-gtk-2.0/menu.c:881
-#: client/gui-gtk-2.0/menu.c:883 client/gui-gtk-2.0/menu.c:885
-#: client/gui-gtk-2.0/menu.c:887 client/gui-gtk-2.0/menu.c:889
-#: client/gui-gtk-2.0/menu.c:891 client/gui-gtk-2.0/menu.c:893
-#: client/gui-gtk-2.0/menu.c:895 client/gui-gtk-2.0/menu.c:897
-#: client/gui-gtk-2.0/menu.c:899 client/gui-gtk-2.0/menu.c:901
-#: client/gui-gtk-2.0/menu.c:903 data/Freeciv.in:2029
+#: client/gui-gtk-2.0/menu.c:858 client/gui-gtk-2.0/menu.c:860
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:864
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:868
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:872
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:876
+#: client/gui-gtk-2.0/menu.c:878 client/gui-gtk-2.0/menu.c:880
+#: client/gui-gtk-2.0/menu.c:882 client/gui-gtk-2.0/menu.c:884
+#: client/gui-gtk-2.0/menu.c:886 client/gui-gtk-2.0/menu.c:888
+#: client/gui-gtk-2.0/menu.c:890 client/gui-gtk-2.0/menu.c:892
+#: client/gui-gtk-2.0/menu.c:894 client/gui-gtk-2.0/menu.c:896
+#: client/gui-gtk-2.0/menu.c:898 client/gui-gtk-2.0/menu.c:900
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906 client/gui-gtk-2.0/menu.c:908
+#: client/gui-gtk-2.0/menu.c:910 client/gui-gtk-2.0/menu.c:912
+#: client/gui-gtk-2.0/menu.c:914 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:918 client/gui-gtk-2.0/menu.c:920
+#: client/gui-gtk-2.0/menu.c:922 client/gui-gtk-2.0/menu.c:924
+#: client/gui-gtk-2.0/menu.c:926 client/gui-gtk-2.0/menu.c:928
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
+#: client/gui-gtk-2.0/menu.c:946 data/Freeciv.in:2029
msgid "Orders"
msgstr "Ordrer"
-#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:1444
+#: client/gui-gtk-2.0/menu.c:860 client/gui-gtk-2.0/menu.c:1489
#: client/gui-win32/menu.c:359
msgid "_Build City"
msgstr "_Byg by"
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:1466
-#: client/gui-gtk-2.0/menu.c:1472 client/gui-win32/menu.c:360
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:1511
+#: client/gui-gtk-2.0/menu.c:1517 client/gui-win32/menu.c:360
msgid "Build _Road"
msgstr "Byg vej"
-#: client/gui-gtk-2.0/menu.c:833 client/gui-gtk-2.0/menu.c:1360
+#: 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 "Lav kunstig vanding"
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:1361
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:1406
#: client/gui-win32/menu.c:362
msgid "Build _Mine"
msgstr "Byg _mine"
-#: client/gui-gtk-2.0/menu.c:837 client/gui-gtk-2.0/menu.c:1362
+#: client/gui-gtk-2.0/menu.c:868 client/gui-gtk-2.0/menu.c:1407
msgid "Transf_orm Terrain"
msgstr "Ændr terræn"
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:1508
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:1553
#: client/gui-win32/menu.c:364
msgid "Build _Fortress"
msgstr "Byg _Fæstning"
-#: client/gui-gtk-2.0/menu.c:841 client/gui-win32/menu.c:365
+#: client/gui-gtk-2.0/menu.c:872 client/gui-win32/menu.c:365
msgid "Build Airbas_e"
msgstr "Byg fly_base"
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:1514
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:1559
#: client/gui-win32/menu.c:366
msgid "Clean _Pollution"
msgstr "Fjern forurening"
-#: client/gui-gtk-2.0/menu.c:845 client/gui-win32/menu.c:367
+#: client/gui-gtk-2.0/menu.c:876 client/gui-win32/menu.c:367
msgid "Clean _Nuclear Fallout"
msgstr "Fjern atomaffald"
-#: client/gui-gtk-2.0/menu.c:849 client/gui-win32/menu.c:369
+#: client/gui-gtk-2.0/menu.c:880 client/gui-win32/menu.c:369
msgid "_Sentry"
msgstr "Hold _stand"
-#: client/gui-gtk-2.0/menu.c:855 client/gui-win32/menu.c:372
+#: client/gui-gtk-2.0/menu.c:886 client/gui-win32/menu.c:372
msgid "Make _Homecity"
msgstr "Gør til _hjemby"
-#: client/gui-gtk-2.0/menu.c:857 client/gui-win32/menu.c:373
+#: client/gui-gtk-2.0/menu.c:888 client/gui-win32/menu.c:373
msgid "_Load"
msgstr "_Last"
-#: client/gui-gtk-2.0/menu.c:859
+#: client/gui-gtk-2.0/menu.c:890
msgid "_Unload Transporter"
msgstr "Aflast transport"
-#: client/gui-gtk-2.0/menu.c:861 client/gui-win32/menu.c:374
+#: client/gui-gtk-2.0/menu.c:892 client/gui-win32/menu.c:374
msgid "_Unload"
msgstr "Aflast"
-#: client/gui-gtk-2.0/menu.c:863 client/gui-win32/menu.c:375
+#: client/gui-gtk-2.0/menu.c:894 client/gui-win32/menu.c:375
msgid "Wake up o_thers"
msgstr "Væk _andre"
-#: client/gui-gtk-2.0/menu.c:867
+#: client/gui-gtk-2.0/menu.c:898
msgid "_Auto Settler"
msgstr "_Autonybygger"
-#: client/gui-gtk-2.0/menu.c:869 client/gui-win32/menu.c:378
+#: client/gui-gtk-2.0/menu.c:900 client/gui-win32/menu.c:378
msgid "Auto E_xplore"
msgstr "Auto udforsk"
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906
msgid "_Connect"
msgstr "_Tilslut"
-#: client/gui-gtk-2.0/menu.c:871 client/gui-win32/menu.c:380
+#: client/gui-gtk-2.0/menu.c:902 client/gui-win32/menu.c:380
msgid "_Road"
msgstr "Vej"
-#: client/gui-gtk-2.0/menu.c:873 client/gui-win32/menu.c:381
+#: client/gui-gtk-2.0/menu.c:904 client/gui-win32/menu.c:381
msgid "Rai_l"
msgstr "Jernbane"
-#: client/gui-gtk-2.0/menu.c:875 client/gui-win32/menu.c:382
+#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:382
msgid "_Irrigate"
msgstr "Overr_isle"
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
msgid "Go _to"
msgstr "GÃ¥ _til"
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
msgid "_Build city"
msgstr "_Byg by"
-#: client/gui-gtk-2.0/menu.c:879
+#: client/gui-gtk-2.0/menu.c:910
msgid "Patrol (_Q)"
msgstr "Patruljer (_Q)"
-#: client/gui-gtk-2.0/menu.c:881 client/gui-win32/menu.c:385
+#: client/gui-gtk-2.0/menu.c:912 client/gui-win32/menu.c:385
msgid "_Go to"
msgstr "_GÃ¥ til"
-#: client/gui-gtk-2.0/menu.c:883
+#: client/gui-gtk-2.0/menu.c:914
msgid "Go\\/Airlift to City"
msgstr "GÃ¥\\/Helikopter til by"
-#: client/gui-gtk-2.0/menu.c:885 client/gui-sdl/menu.c:450
+#: client/gui-gtk-2.0/menu.c:916 client/gui-sdl/menu.c:450
#: client/gui-win32/menu.c:387 client/gui-xaw/menu.c:203
msgid "Return to nearest city"
msgstr "Returner til nærmeste by"
-#: client/gui-gtk-2.0/menu.c:889 client/gui-win32/menu.c:389
+#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:389
#: client/gui-xaw/menu.c:205
msgid "Disband Unit"
msgstr "Opløs enhed"
-#: client/gui-gtk-2.0/menu.c:891 client/gui-sdl/citydlg.c:532
+#: client/gui-gtk-2.0/menu.c:922 client/gui-sdl/citydlg.c:532
#: data/Freeciv.in:1186
msgid "Upgrade unit"
msgstr "Opgradér enhed"
-#: client/gui-gtk-2.0/menu.c:893
+#: client/gui-gtk-2.0/menu.c:924
msgid "Diplomat\\/Spy Actions"
msgstr "Diplomat\\/Spion-handlinger"
-#: client/gui-gtk-2.0/menu.c:895 client/gui-sdl/menu.c:399
+#: client/gui-gtk-2.0/menu.c:926 client/gui-sdl/menu.c:399
#: client/gui-win32/menu.c:391 client/gui-xaw/menu.c:209
msgid "Explode Nuclear"
msgstr "Udløs atomeksplosion"
-#: client/gui-gtk-2.0/menu.c:899
-msgid "Select same type"
-msgstr "Vælg samme type"
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/cityrep.c:882
+msgid "Select"
+msgstr "Vælg"
+
+#: client/gui-gtk-2.0/menu.c:934
+msgid "Single"
+msgstr "Enlig"
+
+#: client/gui-gtk-2.0/menu.c:936
+msgid "Same Type On Tile"
+msgstr "Samme type på felt"
-#: client/gui-gtk-2.0/menu.c:901 client/gui-win32/menu.c:393
+#: client/gui-gtk-2.0/menu.c:938
+msgid "All On Tile"
+msgstr "Alt på felt"
+
+#: client/gui-gtk-2.0/menu.c:940
+msgid "Same Type On Continent"
+msgstr "Samme type på kontinent"
+
+#: client/gui-gtk-2.0/menu.c:942
+msgid "Same Type Everywhere"
+msgstr "Samme type overalt"
+
+#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:393
msgid "_Wait"
msgstr "Vent"
-#: client/gui-gtk-2.0/menu.c:903 client/gui-win32/menu.c:394
+#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:394
#: client/gui-xaw/menu.c:213
msgid "Done"
msgstr "Fuldført"
-#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:398
+#: client/gui-gtk-2.0/menu.c:949 client/gui-win32/menu.c:398
msgid "_Reports"
msgstr "_Rapporter"
-#: client/gui-gtk-2.0/menu.c:908 client/gui-gtk-2.0/menu.c:910
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:914
-#: client/gui-gtk-2.0/menu.c:916 client/gui-gtk-2.0/menu.c:918
-#: client/gui-gtk-2.0/menu.c:920 client/gui-gtk-2.0/menu.c:922
-#: client/gui-gtk-2.0/menu.c:924 client/gui-gtk-2.0/menu.c:926
-#: client/gui-gtk-2.0/menu.c:928 client/gui-gtk-2.0/menu.c:930
-#: client/gui-gtk-2.0/menu.c:932 data/Freeciv.in:2030
+#: client/gui-gtk-2.0/menu.c:951 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:957
+#: client/gui-gtk-2.0/menu.c:959 client/gui-gtk-2.0/menu.c:961
+#: client/gui-gtk-2.0/menu.c:963 client/gui-gtk-2.0/menu.c:965
+#: client/gui-gtk-2.0/menu.c:967 client/gui-gtk-2.0/menu.c:969
+#: client/gui-gtk-2.0/menu.c:971 client/gui-gtk-2.0/menu.c:973
+#: client/gui-gtk-2.0/menu.c:975 data/Freeciv.in:2030
msgid "Reports"
msgstr "Rapporter"
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:958
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:1001
#: client/gui-win32/menu.c:400 client/gui-win32/menu.c:425
msgid "_Units"
msgstr "_Enheder"
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/menu.c:914 client/gui-win32/menu.c:402
+#: client/gui-gtk-2.0/menu.c:957 client/gui-win32/menu.c:402
msgid "_Nations"
msgstr "_Nationer"
-#: client/gui-gtk-2.0/menu.c:918 client/gui-win32/menu.c:403
+#: client/gui-gtk-2.0/menu.c:961 client/gui-win32/menu.c:403
msgid "_Economy"
msgstr "_Økonomi"
#. TRANS: Research report action
-#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:405
+#: client/gui-gtk-2.0/menu.c:963 client/gui-win32/menu.c:405
msgid "_Research"
msgstr "_Forskning"
-#: client/gui-gtk-2.0/menu.c:924 client/gui-win32/menu.c:407
+#: client/gui-gtk-2.0/menu.c:967 client/gui-win32/menu.c:407
msgid "_Wonders of the World"
msgstr "_Verdens vidundere"
-#: client/gui-gtk-2.0/menu.c:926 client/gui-win32/menu.c:408
+#: client/gui-gtk-2.0/menu.c:969 client/gui-win32/menu.c:408
msgid "_Top Five Cities"
msgstr "_Top-fem byer"
-#: client/gui-gtk-2.0/menu.c:928 client/gui-win32/menu.c:409
+#: client/gui-gtk-2.0/menu.c:971 client/gui-win32/menu.c:409
msgid "_Messages"
msgstr "_Beskeder"
-#: client/gui-gtk-2.0/menu.c:930 client/gui-win32/menu.c:410
+#: client/gui-gtk-2.0/menu.c:973 client/gui-win32/menu.c:410
msgid "_Demographics"
msgstr "_Demografi"
-#: client/gui-gtk-2.0/menu.c:932 client/gui-gtk-2.0/plrdlg.c:471
+#: client/gui-gtk-2.0/menu.c:975 client/gui-gtk-2.0/plrdlg.c:354
#: client/gui-win32/menu.c:411
msgid "_Spaceship"
msgstr "_Rumskib"
-#: client/gui-gtk-2.0/menu.c:936 client/gui-win32/menu.c:415
+#: client/gui-gtk-2.0/menu.c:979 client/gui-win32/menu.c:415
msgid "_Help"
msgstr "_Hjælp"
-#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
-#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
-#: client/gui-gtk-2.0/menu.c:946 client/gui-gtk-2.0/menu.c:948
-#: client/gui-gtk-2.0/menu.c:950 client/gui-gtk-2.0/menu.c:952
-#: client/gui-gtk-2.0/menu.c:954 client/gui-gtk-2.0/menu.c:956
-#: client/gui-gtk-2.0/menu.c:958 client/gui-gtk-2.0/menu.c:960
-#: client/gui-gtk-2.0/menu.c:962 client/gui-gtk-2.0/menu.c:964
-#: client/gui-gtk-2.0/menu.c:966 client/gui-gtk-2.0/menu.c:968
-#: client/gui-gtk-2.0/menu.c:970 client/gui-gtk-2.0/menu.c:972
-#: client/gui-gtk-2.0/menu.c:974 client/gui-gtk-2.0/menu.c:976
-#: client/gui-gtk-2.0/menu.c:978 client/gui-gtk-2.0/menu.c:980
+#: client/gui-gtk-2.0/menu.c:981 client/gui-gtk-2.0/menu.c:983
+#: client/gui-gtk-2.0/menu.c:985 client/gui-gtk-2.0/menu.c:987
+#: client/gui-gtk-2.0/menu.c:989 client/gui-gtk-2.0/menu.c:991
+#: client/gui-gtk-2.0/menu.c:993 client/gui-gtk-2.0/menu.c:995
+#: client/gui-gtk-2.0/menu.c:997 client/gui-gtk-2.0/menu.c:999
+#: client/gui-gtk-2.0/menu.c:1001 client/gui-gtk-2.0/menu.c:1003
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-gtk-2.0/menu.c:1007
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-gtk-2.0/menu.c:1011
+#: client/gui-gtk-2.0/menu.c:1013 client/gui-gtk-2.0/menu.c:1015
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-gtk-2.0/menu.c:1019
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-gtk-2.0/menu.c:1023
#: client/gui-gtk-2.0/repodlgs.c:313 client/gui-win32/citydlg.c:1077
#: client/gui-win32/repodlgs.c:289 client/gui-win32/wldlg.c:846
#: data/Freeciv.in:1466 data/Freeciv.in:2031 data/Freeciv.in:2101
@@ -12054,119 +12291,119 @@ msgstr "_Hjælp"
msgid "Help"
msgstr "Hjælp"
-#: client/gui-gtk-2.0/menu.c:940 client/gui-win32/menu.c:416
+#: client/gui-gtk-2.0/menu.c:983 client/gui-win32/menu.c:416
msgid "Language_s"
msgstr "_Sprog"
-#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/menu.c:417
+#: client/gui-gtk-2.0/menu.c:985 client/gui-win32/menu.c:417
msgid "Co_nnecting"
msgstr "_Tilslutning"
-#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:418
+#: client/gui-gtk-2.0/menu.c:987 client/gui-win32/menu.c:418
msgid "C_ontrols"
msgstr "_Kontroller"
-#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:419
+#: client/gui-gtk-2.0/menu.c:989 client/gui-win32/menu.c:419
msgid "C_hatline"
msgstr "_Samtalelinje"
-#: client/gui-gtk-2.0/menu.c:948 client/gui-win32/menu.c:420
+#: client/gui-gtk-2.0/menu.c:991 client/gui-win32/menu.c:420
msgid "_Worklist Editor"
msgstr "_Arbejdslister"
-#: client/gui-gtk-2.0/menu.c:950 client/gui-win32/menu.c:421
+#: client/gui-gtk-2.0/menu.c:993 client/gui-win32/menu.c:421
msgid "Citizen _Management"
msgstr "_Byforvaltning"
-#: client/gui-gtk-2.0/menu.c:952 client/gui-win32/menu.c:422
+#: client/gui-gtk-2.0/menu.c:995 client/gui-win32/menu.c:422
msgid "_Playing"
msgstr "_Spil"
-#: client/gui-gtk-2.0/menu.c:956 client/gui-win32/menu.c:424
+#: client/gui-gtk-2.0/menu.c:999 client/gui-win32/menu.c:424
msgid "City _Improvements"
msgstr "By_forbedringer"
-#: client/gui-gtk-2.0/menu.c:960 client/gui-win32/menu.c:426
+#: client/gui-gtk-2.0/menu.c:1003 client/gui-win32/menu.c:426
msgid "Com_bat"
msgstr "K_amp"
-#: client/gui-gtk-2.0/menu.c:962 client/gui-win32/menu.c:427
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-win32/menu.c:427
msgid "_ZOC"
msgstr "Kontrol_zone"
-#: client/gui-gtk-2.0/menu.c:964 client/gui-win32/menu.c:428
+#: client/gui-gtk-2.0/menu.c:1007 client/gui-win32/menu.c:428
msgid "Techno_logy"
msgstr "Tekno_logi"
-#: client/gui-gtk-2.0/menu.c:966 client/gui-win32/menu.c:429
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-win32/menu.c:429
msgid "_Terrain"
msgstr "_Terræn"
-#: client/gui-gtk-2.0/menu.c:968 client/gui-win32/menu.c:430
+#: client/gui-gtk-2.0/menu.c:1011 client/gui-win32/menu.c:430
msgid "Won_ders"
msgstr "_Vidundere"
-#: client/gui-gtk-2.0/menu.c:972 client/gui-win32/menu.c:432
+#: client/gui-gtk-2.0/menu.c:1015 client/gui-win32/menu.c:432
msgid "Happin_ess"
msgstr "_Lykke"
-#: client/gui-gtk-2.0/menu.c:974 client/gui-win32/menu.c:433
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-win32/menu.c:433
msgid "Space _Race"
msgstr "_Rumkapløb"
-#: client/gui-gtk-2.0/menu.c:978 client/gui-win32/menu.c:435
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-win32/menu.c:435
msgid "_Copying"
msgstr "_Kopiering"
-#: client/gui-gtk-2.0/menu.c:980 client/gui-win32/menu.c:436
+#: client/gui-gtk-2.0/menu.c:1023 client/gui-win32/menu.c:436
msgid "_About"
msgstr "_Om"
-#: client/gui-gtk-2.0/menu.c:1264
+#: client/gui-gtk-2.0/menu.c:1307
#, c-format
msgid "%s..."
msgstr "%s..."
-#: client/gui-gtk-2.0/menu.c:1352
+#: client/gui-gtk-2.0/menu.c:1397
#, c-format
msgid "Change to %s (_I)"
msgstr "Ændr til %s (_I)"
-#: client/gui-gtk-2.0/menu.c:1353
+#: client/gui-gtk-2.0/menu.c:1398
#, c-format
msgid "Change to %s (_M)"
msgstr "Ændr til %s (_M)"
-#: client/gui-gtk-2.0/menu.c:1354
+#: client/gui-gtk-2.0/menu.c:1399
#, c-format
msgid "Transf_orm to %s"
msgstr "Ændr til %s"
-#: client/gui-gtk-2.0/menu.c:1427
+#: client/gui-gtk-2.0/menu.c:1472
msgid "Help _Build Wonder"
msgstr "Hjælp med _bygning af vidunder"
-#: client/gui-gtk-2.0/menu.c:1441
+#: client/gui-gtk-2.0/menu.c:1486
msgid "Add to City (_B)"
msgstr "Tilføj by (_B)"
-#: client/gui-gtk-2.0/menu.c:1449
+#: client/gui-gtk-2.0/menu.c:1494
msgid "Make Trade _Route"
msgstr "Lav handels_rute"
-#: client/gui-gtk-2.0/menu.c:1463
+#: client/gui-gtk-2.0/menu.c:1508
msgid "Build _Railroad"
msgstr "Byg je_rnbane"
-#: client/gui-gtk-2.0/menu.c:1486
+#: client/gui-gtk-2.0/menu.c:1531
msgid "Bu_ild Farmland"
msgstr "Opdyrk landet"
-#: client/gui-gtk-2.0/menu.c:1506
+#: client/gui-gtk-2.0/menu.c:1551
msgid "_Fortify"
msgstr "Be_fæst position"
-#: client/gui-gtk-2.0/menu.c:1512
+#: client/gui-gtk-2.0/menu.c:1557
msgid "_Paradrop"
msgstr "Faldskærmsudspring"
@@ -12200,13 +12437,29 @@ msgstr "B"
msgid "Pop"
msgstr "E"
-#: client/gui-gtk-2.0/messagewin.c:155 client/gui-sdl/messagewin.c:247
+#: client/gui-gtk-2.0/messagewin.c:186 client/gui-sdl/messagewin.c:247
#: client/gui-win32/messagewin.c:132 client/gui-xaw/menu.c:228
#: data/Freeciv.in:3273 data/Freeciv.in:3274 data/Freeciv.in:3283
msgid "Messages"
msgstr "Beskeder"
-#: client/gui-gtk-2.0/plrdlg.c:330
+#: client/gui-gtk-2.0/plrdlg.c:317
+msgid "_Meet"
+msgstr "_Møde"
+
+#: client/gui-gtk-2.0/plrdlg.c:323
+msgid "Cancel _Treaty"
+msgstr "_Afbryd traktat"
+
+#: client/gui-gtk-2.0/plrdlg.c:329
+msgid "_Withdraw Vision"
+msgstr "_Tilbagetræk delt synsfelt"
+
+#: client/gui-gtk-2.0/plrdlg.c:348
+msgid "_Report"
+msgstr "_Rapporter"
+
+#: client/gui-gtk-2.0/plrdlg.c:386
msgid "?show:Dead Players"
msgstr "?show:Døde spillere"
@@ -12214,264 +12467,266 @@ msgstr "?show:Døde spillere"
#. TRANS: Nations report action
#. TRANS: Nations report title
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/plrdlg.c:350 client/gui-sdl/mapctrl.c:1580
+#: client/gui-gtk-2.0/plrdlg.c:406 client/gui-sdl/mapctrl.c:1580
#: client/gui-sdl/plrdlg.c:608 client/gui-win32/plrdlg.c:344
#: client/gui-xaw/menu.c:221 data/Freeciv.in:3192 data/Freeciv.in:3193
msgid "Nations"
msgstr "Nationer"
-#: client/gui-gtk-2.0/plrdlg.c:443
+#: client/gui-gtk-2.0/plrdlg.c:511
+msgid "Di_plomacy"
+msgstr "Di_plomati"
+
+#: client/gui-gtk-2.0/plrdlg.c:516
msgid "_Intelligence"
msgstr "_Efterretning"
-#: client/gui-gtk-2.0/plrdlg.c:450
-msgid "_Meet"
-msgstr "_Møde"
-
-#: client/gui-gtk-2.0/plrdlg.c:457
-msgid "Cancel _Treaty"
-msgstr "_Afbryd traktat"
-
-#: client/gui-gtk-2.0/plrdlg.c:464
-msgid "_Withdraw vision"
-msgstr "Tilbagetræk delt synsfelt"
-
-#: client/gui-gtk-2.0/plrdlg.c:495
+#: client/gui-gtk-2.0/plrdlg.c:526
msgid "_AI"
msgstr "_AI"
-#: client/gui-gtk-2.0/plrdlg.c:501
+#: client/gui-gtk-2.0/plrdlg.c:532
msgid "_Toggle AI Mode"
msgstr "Slå AI _til/fra"
-#: client/gui-gtk-2.0/pages.c:208
+#: client/gui-gtk-2.0/pages.c:221
msgid "Start _New Game"
msgstr "Start _nyt spil"
-#: client/gui-gtk-2.0/pages.c:214
+#: client/gui-gtk-2.0/pages.c:227
msgid "Start _Scenario Game"
msgstr "Start nyt _scenarie"
-#: client/gui-gtk-2.0/pages.c:220
+#: client/gui-gtk-2.0/pages.c:233
msgid "_Load Saved Game"
msgstr "_Indlæs gemt spil"
-#: client/gui-gtk-2.0/pages.c:229
+#: client/gui-gtk-2.0/pages.c:239
msgid "C_onnect to Network Game"
msgstr "_Tilslut til netværksspil"
-#: client/gui-gtk-2.0/pages.c:236
+#: client/gui-gtk-2.0/pages.c:247
msgid "Connect to Gaming _Zone"
msgstr "Tilslut til netværksspil"
-#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:300
#: client/gui-xaw/connectdlg.c:326
msgid "Passwords don't match, enter password."
msgstr "Adgangskoder passer ikke, indtast adgangskode."
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:779 client/gui-gtk-2.0/pages.c:820
+#: client/gui-win32/connectdlg.c:916
msgid "Server Name"
msgstr "Servernavn"
-#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
+#: 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
+#: data/Freeciv.in:96
msgid "Port"
msgstr "Port"
-#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
+#: client/gui-win32/connectdlg.c:917
msgid "Version"
msgstr "Version"
-#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
-#: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
+#: 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
msgid "Status"
msgstr "Status"
-#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
-#: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
+#: 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
msgid "Players"
msgstr "Spillere"
-#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
+#: client/gui-win32/connectdlg.c:918
msgid "Comment"
msgstr "Kommentar"
-#: client/gui-gtk-2.0/pages.c:747
+#: client/gui-gtk-2.0/pages.c:786
msgid "Local _Area Network"
msgstr "Lokalnetværk"
-#: client/gui-gtk-2.0/pages.c:783
+#: client/gui-gtk-2.0/pages.c:827
msgid "Internet _Metaserver"
msgstr "Internet _Metaserver"
-#: client/gui-gtk-2.0/pages.c:817
+#: client/gui-gtk-2.0/pages.c:864
msgid "_Host:"
msgstr "_Vært:"
-#: client/gui-gtk-2.0/pages.c:834
+#: client/gui-gtk-2.0/pages.c:881
msgid "_Port:"
msgstr "_Port:"
-#: client/gui-gtk-2.0/pages.c:851
+#: client/gui-gtk-2.0/pages.c:898
msgid "_Login:"
msgstr "_Bruger:"
-#: client/gui-gtk-2.0/pages.c:869
+#: client/gui-gtk-2.0/pages.c:916
msgid "Pass_word:"
msgstr "Adgangskode:"
-#: client/gui-gtk-2.0/pages.c:887
+#: client/gui-gtk-2.0/pages.c:934
msgid "Conf_irm Password:"
msgstr "Bekræft adgangskode:"
-#: client/gui-gtk-2.0/pages.c:912
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: 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/wldlg.c:800 client/gui-win32/wldlg.c:806
+msgid "Type"
+msgstr "Type"
+
+#: client/gui-gtk-2.0/pages.c:952 client/gui-win32/plrdlg.c:337
+#: data/Freeciv.in:88
+msgid "Host"
+msgstr "Vært"
+
+#: client/gui-gtk-2.0/pages.c:981
msgid "C_onnect"
msgstr "Tilslut"
-#: client/gui-gtk-2.0/pages.c:1142
+#: client/gui-gtk-2.0/pages.c:1211
#, c-format
msgid "Connection name: %s"
msgstr "Forbindelsesnavn: %s"
-#: client/gui-gtk-2.0/pages.c:1145
+#: client/gui-gtk-2.0/pages.c:1214
#, c-format
msgid "Player name: %s"
msgstr "Spillernavn: %s"
-#: client/gui-gtk-2.0/pages.c:1150
+#: client/gui-gtk-2.0/pages.c:1219
#, c-format
msgid "Host: %s"
msgstr "Server: %s"
-#: client/gui-gtk-2.0/pages.c:1158
+#: client/gui-gtk-2.0/pages.c:1227
msgid "Player/conn info"
msgstr "Spiller/forb info"
-#: client/gui-gtk-2.0/pages.c:1185
+#: client/gui-gtk-2.0/pages.c:1254
#, c-format
msgid "%s info"
msgstr "%s info"
-#: client/gui-gtk-2.0/pages.c:1196
+#: client/gui-gtk-2.0/pages.c:1265
msgid "Toggle player ready"
msgstr "Toggle spiller klar"
-#: client/gui-gtk-2.0/pages.c:1204
+#: client/gui-gtk-2.0/pages.c:1273
msgid "Pick nation"
msgstr "Vælg nation"
-#: client/gui-gtk-2.0/pages.c:1214
+#: client/gui-gtk-2.0/pages.c:1283
msgid "Observe this player"
msgstr "Observer denne spiller"
-#: client/gui-gtk-2.0/pages.c:1221
+#: client/gui-gtk-2.0/pages.c:1290
msgid "Take this player"
msgstr "Benyt denne spiller"
-#: client/gui-gtk-2.0/pages.c:1238
+#: client/gui-gtk-2.0/pages.c:1307
msgid "Cut connection"
msgstr "Afbryd tilslutning"
-#: client/gui-gtk-2.0/pages.c:1248
+#: client/gui-gtk-2.0/pages.c:1317
msgid "Aitoggle player"
msgstr "Aitoggle spiller"
-#: client/gui-gtk-2.0/pages.c:1257
+#: client/gui-gtk-2.0/pages.c:1326
msgid "Remove player"
msgstr "Fjern spiller"
-#: client/gui-gtk-2.0/pages.c:1268
+#: client/gui-gtk-2.0/pages.c:1337
msgid "Give info access"
msgstr "Giv info adgang"
-#: client/gui-gtk-2.0/pages.c:1276
+#: client/gui-gtk-2.0/pages.c:1345
msgid "Give ctrl access"
msgstr "Giv ctrl adgang"
#. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1338
+#: client/gui-gtk-2.0/pages.c:1407
#, c-format
msgid "Put on %s"
msgstr "Brug %s"
-#: client/gui-gtk-2.0/pages.c:1442
+#: client/gui-gtk-2.0/pages.c:1511
msgid "Number of _Players (including AI):"
msgstr "_Antal spillere (inklusiv AI):"
-#: client/gui-gtk-2.0/pages.c:1465
+#: client/gui-gtk-2.0/pages.c:1534
msgid "AI Skill _Level:"
msgstr "_AI niveau:"
-#: client/gui-gtk-2.0/pages.c:1481
+#: client/gui-gtk-2.0/pages.c:1550
msgid "Ruleset _Version:"
msgstr "_Regelsæt:"
-#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
msgid "_More Game Options..."
msgstr "Flere spil indstillinger..."
-#: client/gui-gtk-2.0/pages.c:1514
+#: client/gui-gtk-2.0/pages.c:1583
msgid "Record"
msgstr "Optag"
-#: client/gui-gtk-2.0/pages.c:1519
+#: client/gui-gtk-2.0/pages.c:1588
msgid "Rating"
msgstr "Rater"
-#: client/gui-gtk-2.0/pages.c:1525
+#: client/gui-gtk-2.0/pages.c:1594
msgid "Ready"
msgstr "Klar"
-#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
-#: data/nation/slovakian.ruleset:26
-msgid "Leader"
-msgstr "Leder"
+#: client/gui-gtk-2.0/pages.c:1601
+msgid "?player:Leader"
+msgstr "?player:leder"
-#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1732 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:1752
+#: client/gui-gtk-2.0/pages.c:1824
msgid "Choose Saved Game to _Load:"
msgstr "Vælg gemt spil til ind_læsning"
-#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
-#: client/gui-gtk-2.0/pages.c:2375
+#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
+#: client/gui-gtk-2.0/pages.c:2451
msgid "_Browse..."
msgstr "Gennemse"
-#: client/gui-gtk-2.0/pages.c:1839
+#: client/gui-gtk-2.0/pages.c:1911
msgid "Choose a Scenario"
msgstr "Vælg et scenarie"
-#: client/gui-gtk-2.0/pages.c:1926
+#: client/gui-gtk-2.0/pages.c:1998
msgid "Choose a _Scenario:"
msgstr "Vælg et scenarie"
-#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
-#: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
-#: client/gui-win32/wldlg.c:806
-msgid "Type"
-msgstr "Type"
-
-#: client/gui-gtk-2.0/pages.c:2101
+#: client/gui-gtk-2.0/pages.c:2173
msgid "Choose a _nation to play:"
msgstr "Vælg et folkeslag du ønsker at spille som:"
-#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2363 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:2372 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2448 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr "Gem spil"
-#: client/gui-gtk-2.0/pages.c:2413
+#: client/gui-gtk-2.0/pages.c:2489
msgid "Saved _Games:"
msgstr "Gemte spil"
-#: client/gui-gtk-2.0/pages.c:2440
+#: client/gui-gtk-2.0/pages.c:2516
msgid "Save _Filename:"
msgstr "Filnavn:"
@@ -12823,7 +13078,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:1094
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
msgid "Back"
msgstr "Tilbage"
@@ -12832,7 +13087,7 @@ msgid "Start"
msgstr "Start"
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:775
+#: client/gui-win32/connectdlg.c:777
msgid "Load Game"
msgstr "Fortsæt et spil"
@@ -12869,12 +13124,12 @@ msgid "Make new homecity"
msgstr "Lav ny hjemby"
#: client/gui-sdl/citydlg.c:546 client/gui-sdl/citydlg.c:1418
-#: client/gui-sdl/connectdlg.c:307 client/gui-sdl/connectdlg.c:616
-#: client/gui-sdl/connectdlg.c:802 client/gui-sdl/connectdlg.c:984
+#: 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/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1039
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
#: 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
@@ -12921,7 +13176,7 @@ msgstr "Køb det?"
#: client/gui-sdl/diplodlg.c:1335 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:2427
+#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
#: client/gui-xaw/cityrep.c:666 client/gui-xaw/cma_fe.c:327
#: client/gui-xaw/cma_fe.c:511 client/gui-xaw/cma_fe.c:765
#: client/gui-xaw/messagedlg.c:72 client/gui-xaw/optiondlg.c:76
@@ -12937,7 +13192,7 @@ msgstr "Nej"
#: client/gui-sdl/diplodlg.c:1345 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:2427 client/gui-xaw/cityrep.c:666
+#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
#: client/gui-xaw/cma_fe.c:327 client/gui-xaw/cma_fe.c:511
#: client/gui-xaw/cma_fe.c:765 client/gui-xaw/messagedlg.c:72
#: client/gui-xaw/optiondlg.c:76 client/gui-xaw/optiondlg.c:304
@@ -13214,36 +13469,36 @@ msgstr "Benyt en gang"
msgid "Release city"
msgstr "Frigiv byen"
-#: client/gui-sdl/connectdlg.c:238
+#: client/gui-sdl/connectdlg.c:239
msgid "Creating Server List..."
msgstr "Skaber server liste..."
-#: client/gui-sdl/connectdlg.c:279 client/gui-sdl/connectdlg.c:343
+#: client/gui-sdl/connectdlg.c:280 client/gui-sdl/connectdlg.c:344
msgid "No LAN servers found"
msgstr "Ingen LAN-servere fundet"
-#: client/gui-sdl/connectdlg.c:281 client/gui-sdl/connectdlg.c:345
+#: client/gui-sdl/connectdlg.c:282 client/gui-sdl/connectdlg.c:346
msgid "No public servers found"
msgstr "Ingen offentlige servere fundet"
-#: client/gui-sdl/connectdlg.c:555
+#: client/gui-sdl/connectdlg.c:556
msgid "Player Name :"
msgstr "Spillernavn :"
-#: client/gui-sdl/connectdlg.c:571
+#: client/gui-sdl/connectdlg.c:572
msgid "Freeciv Server :"
msgstr "Freeciv server :"
-#: client/gui-sdl/connectdlg.c:588
+#: client/gui-sdl/connectdlg.c:589
msgid "Port :"
msgstr "Port :"
-#: client/gui-sdl/connectdlg.c:608 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr "Tilslut"
-#: client/gui-sdl/connectdlg.c:794 client/gui-sdl/connectdlg.c:977
+#: client/gui-sdl/connectdlg.c:795 client/gui-sdl/connectdlg.c:978
#: client/gui-xaw/connectdlg.c:145
msgid "Next"
msgstr "Næste"
@@ -13524,7 +13779,7 @@ msgstr "Ikke i stand til at initialisere SDL library: %s"
#: client/gui-sdl/graphics.c:1021
#, c-format
-msgid "Unable to initialize SDL_ttf library: %s"
+msgid "Unable to initialize SDL_ttf library: %s"
msgstr "Ikke muligt at initialisere SDL_ttf bibliotek: %s"
#: client/gui-sdl/graphics.c:1058
@@ -13615,14 +13870,6 @@ msgstr "Initialisere klient"
msgid "Waiting for the beginning of the game"
msgstr "Venter på opstart af spillet"
-#: client/gui-sdl/gui_string.c:608
-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"
-
#. TRANS: Future Technology
#: client/gui-sdl/gui_tilespec.c:506
msgid "FT"
@@ -14213,12 +14460,12 @@ msgid "Leave Game"
msgstr "Forlad spil"
#: client/gui-sdl/optiondlg.c:2302 client/gui-sdl/pages.c:255
-#: client/gui-win32/connectdlg.c:1098 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1100 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:963
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
msgid "Start New Game"
msgstr "Start nyt spil"
@@ -14335,8 +14582,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:1081
-#: client/gui-win32/connectdlg.c:1089 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
+#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
msgid "Update"
msgstr "Opdatér"
@@ -14792,10 +15039,6 @@ msgstr "Ændr alt"
msgid "Refresh"
msgstr "Opfrisk"
-#: client/gui-win32/cityrep.c:882
-msgid "Select"
-msgstr "Vælg"
-
#: client/gui-win32/cityrep.c:883
msgid "Configure"
msgstr "Indstillinger"
@@ -14845,55 +15088,55 @@ msgstr "Kunne ikke indlæse det gemte spil"
msgid "Verify Password"
msgstr "Bekræft adgangskode"
-#: client/gui-win32/connectdlg.c:912 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr "Freeciv-servervalg"
-#: client/gui-win32/connectdlg.c:913
+#: client/gui-win32/connectdlg.c:915
msgid "Local Area Network"
msgstr "Lokalnetværk"
-#: client/gui-win32/connectdlg.c:947
+#: client/gui-win32/connectdlg.c:949
msgid "Welcome to Freeciv"
msgstr "Velkommen til Freeciv"
-#: client/gui-win32/connectdlg.c:965
+#: client/gui-win32/connectdlg.c:967
msgid "Load Saved Game"
msgstr "Indlæs gemt spil"
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
msgid "Connect To Network Game"
msgstr "Tilslut til netværksspil"
-#: client/gui-win32/connectdlg.c:977
+#: client/gui-win32/connectdlg.c:979
msgid "Choose a nation to play"
msgstr "Vælg et folkeslag at spille:"
-#: client/gui-win32/connectdlg.c:1012
+#: client/gui-win32/connectdlg.c:1014
msgid "Number of players (Including AI):"
msgstr "Antal spillere (inklusiv AI):"
-#: client/gui-win32/connectdlg.c:1020
+#: client/gui-win32/connectdlg.c:1022
msgid "AI skill level:"
msgstr "AI-niveau:"
-#: client/gui-win32/connectdlg.c:1034 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
msgid "Game Options"
msgstr "Spilindstillinger"
-#: client/gui-win32/connectdlg.c:1038
+#: client/gui-win32/connectdlg.c:1040
msgid "Start Game"
msgstr "Start spil"
-#: client/gui-win32/connectdlg.c:1057
+#: client/gui-win32/connectdlg.c:1059
msgid "Login:"
msgstr "Bruger:"
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
msgid "Host:"
msgstr "Server:"
-#: client/gui-win32/connectdlg.c:1060
+#: client/gui-win32/connectdlg.c:1062
msgid "Port:"
msgstr "Port:"
@@ -15156,10 +15399,6 @@ msgid_plural "(idle %d turns)"
msgstr[0] "(ledig %d runde)"
msgstr[1] "(ledig %d runder)"
-#: client/gui-win32/plrdlg.c:337 data/Freeciv.in:88
-msgid "Host"
-msgstr "Vært"
-
#: client/gui-win32/plrdlg.c:355 data/Freeciv.in:3230
msgid "Intelligence"
msgstr "Efterretning"
@@ -16964,16 +17203,16 @@ msgstr ""
#: data/helpdata.txt:781
msgid ""
-" To have a diplomatic relationship with another player, you must fist "
-"establish first contact with that player. To establish first contact, you "
-"have to move one of your units next to a city or unit belonging to that "
-"player, or vice versa. Unless you establish an embassy with that player, you "
-"may again lose contact with them after a set number of turns without direct "
-"physical contact."
+" To have a diplomatic relationship with another player, you must first "
+"establish contact with that player. To establish contact, you have to move "
+"one of your units next to a city or unit belonging to that player, or vice "
+"versa. Unless you establish an embassy with that player, you may again lose "
+"contact with them after a set number of turns without direct physical "
+"contact."
msgstr ""
-" For at indgå diplomatiske forbindelser med en anden spiller må du først "
-"etablere kontakt med den ønskede spiller. Du kan etablere kontakt ved at "
-"flytte en af dine enheder hen ved siden af en by eller enhed der tilhører "
+" For at indgå diplomatiske forbindelser, med en anden spiller, må du "
+"først etablere kontakt med den ønskede spiller. Du kan etablere kontakt ved "
+"at flytte en af dine enheder hen ved siden af en by eller enhed der tilhører "
"denne spiller eller omvendt. Med mindre du etablerer en ambassade med denne "
"spiller kan du miste kontakt med spilleren igen efter en antal runder uden "
"direkte fysisk kontakt."
@@ -19770,7 +20009,7 @@ msgid "Communism"
msgstr "Kommunisme"
#: data/default/governments.ruleset:121 data/civ2/governments.ruleset:118
-#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:26
+#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:27
msgid "Comrade"
msgstr "Kammerat"
@@ -20743,6 +20982,10 @@ msgstr ""
"opgave, for da kan indsatsen sløses bort, og en stor gruppe nybyggere og "
"eller ingeniører er meget udsat for angreb."
+#: data/default/units.ruleset:238
+msgid "?unit:Workers"
+msgstr "?unit:Arbejdere"
+
#: data/default/units.ruleset:264
msgid ""
"Workers are one of the key units in the game. They can be used to irrigate "
@@ -21441,10 +21684,14 @@ msgstr "Udforsker"
msgid "Explorers are very useful for mapping unknown territory."
msgstr "Udforskere er nyttige til at kortlægge ukendt territorium."
+#: data/default/units.ruleset:1864
+msgid "?unit:Leader"
+msgstr "?unit:leder"
+
#: data/default/units.ruleset:1892
msgid "This is you. If you lose this unit, you lose the game. So don't."
msgstr ""
-"Dette er dig. hvis du mister denne enhed taber du spillet. Så undgå det."
+"Dette er dig. hvis du mister denne enhed, taber du spillet. Så undgå det."
#: data/default/units.ruleset:1897 data/civ2/units.ruleset:1815
#: data/civ1/units.ruleset:1054
@@ -21715,7 +21962,7 @@ msgid "Emir"
msgstr "Emir"
#: data/nation/afghani.ruleset:25 data/nation/slovakian.ruleset:30
-#: data/nation/soviet.ruleset:27
+#: data/nation/soviet.ruleset:28
msgid "General Secretary"
msgstr "Generalsekretær"
@@ -21836,11 +22083,11 @@ msgstr "?plural:Armenierne"
msgid ""
"According to legend, the Armenian people are the descendants of Haik - the "
"great-great-grandson of Noah. The modern Republic of Armenia gained "
-"independence from Soviet in 1991 AD"
+"independence from the Soviet Union in 1991."
msgstr ""
-"Ifølge en legende er det armenske folk efterfølgere af Haik - en søn "
-"efterkommer til en sønnesøn af Noah. Den moderne republik Armenien opnåede "
-"uafhængighed fra Sovjetunionen i 1991."
+"Ifølge en legende er det armenske folk efterkommere af Haik - et barnebarn "
+"af Noah. Den moderne republik Armenien opnåede uafhængighed fra "
+"Sovjetunionen i 1991."
#: data/nation/assyrian.ruleset:3
msgid "Assyrian"
@@ -22908,14 +23155,13 @@ msgstr "?plural:Illyrierne"
#: data/nation/illyrian.ruleset:6
msgid ""
-"Illyrians were Indo-European tribes who appeared in the western part of the "
-"Balkan Peninsula before 1000 BC, including the Dalmatians to the north, "
-"Corcyra island and Ambracia bay in prehistoric Epirus to the south, mixing "
-"with Thracians in Dardania to the east, and settling Messapia across the "
-"Adriatic Sea. Illyrian kingdoms were independent for centuries, until "
-"conquered by the Roman Republic."
+"Illyrians were Indo-European tribes who appeared in the western part of the "
+"Balkan Peninsula before 1000 BC, including Corcyra island and Ambracia bay "
+"in prehistoric Epirus to the south. They mixed with Thracians in Dardania to "
+"the east, and settled Messapia across the Adriatic Sea. Illyrian kingdoms "
+"were independent for centuries, until conquered by the Roman Republic."
msgstr ""
-"Illyrierne var en indo-europæisk stamme som fremkom i den vestlige del af "
+"Illyrierne var en indoeuropæisk stamme som fremkom i den vestlige del af "
"Balkan før år 1000 f.Kr. De inkluderede dalmatinerne i nord, Corcyra Øen og "
"Ambraciabugten i det førhistoriske Epirus i syd, Thracianere i Dardania i "
"øst, Messapia langs Adriaterhavet. De illyriske kongedømmer var uafhængige i "
@@ -23248,7 +23494,7 @@ msgstr ""
"opdelt i to stater. Det diktatoriske Nordkorea og et demokratisk Sydkorea. "
"Opdelingen var et resultat af krigsslutningen i 1953."
-#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:28
+#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:29
msgid "Great Leader"
msgstr "Store leder"
@@ -23422,9 +23668,9 @@ msgstr "?plural:Malianerne"
msgid ""
"Sub-Saharan Africa has been a cultural and ethnical melting pot for "
"millennia. In medieval times, the region was home to a succession of empires "
-"called the Sahelian kingdoms. Of these, the Islamic Mali empire with it's "
+"called the Sahelian kingdoms. Of these, the Islamic Mali empire with its "
"capital in Timbuktu was the most influential. This empire reigned from the "
-"14th to the 17th century and was famed for it's wealth and benevolent kings. "
+"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 ""
"Ørkenområdet Sahara i Afrika har været en kulturel og etnisk smeltedigel i "
@@ -23496,11 +23742,11 @@ msgstr "?plural:Mayaerne"
#: data/nation/mayan.ruleset:6
msgid ""
-"The Mayans were a Mesoamerican civilization. Famous for building great "
-"pyramids and palaces in the jungle."
+"The Mayans were a Mesoamerican civilization. They are famous for building "
+"great pyramids and palaces in the jungle."
msgstr ""
"Mayaerne var en mesoamerikansk civilization. De var kendt for at bygge "
-"pyramider og palacer i junglen."
+"pyramider og paladser i junglen."
#: data/nation/mayan.ruleset:19
msgid "Ajaw"
@@ -23964,7 +24210,7 @@ msgid ""
msgstr ""
"Serbien er er en del af det område som blev erobret af Det Ottomanske Rige "
"efter tilbagegangen for Det Østromerske Rige. Igennem hovedparten af det 20. "
-"Ã¥rhundrede var det en del af Jugoslavien. "
+"Ã¥rhundrede var det en del af Jugoslavien."
#: data/nation/silesian.ruleset:3
msgid "Silesian"
@@ -24016,7 +24262,7 @@ msgid ""
"the Lakota, the Dakota and the Nakota."
msgstr ""
"Siouxerne var en Nordamerikansk stat som udkæmpede flere afgørende kampe "
-"imod USA. De bestod af tre stammer: Lakota, Dakota og Nakota. "
+"imod USA. De bestod af tre stammer: Lakota, Dakota og Nakota."
#: data/nation/slovenian.ruleset:3
msgid "Slovenian"
@@ -24050,6 +24296,14 @@ msgstr ""
"Slovakiet er et land i midten af Europa. Tidligere en del af "
"Tjekkoslovakiet, indtil 1918 var det en del af Østrig-ungarn."
+#: data/nation/slovakian.ruleset:26
+msgid "?male:Leader"
+msgstr "?male:leder"
+
+#: data/nation/slovakian.ruleset:26
+msgid "?female:Leader"
+msgstr "?female:leder"
+
#: data/nation/slovakian.ruleset:29
msgid "Pope"
msgstr "Pope"
@@ -24095,11 +24349,12 @@ msgstr "?plural:Kommunisterne"
#: data/nation/soviet.ruleset:6
msgid ""
-"Soviet Union's history starts in November 1917, when under Lenin's "
+"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 "
-"republics integrated into one country. Soviet Union became one of most "
-"powerful states in the 20th century. But by the end of 1991 due to many "
-"social shocks it disintegrated into fifteen independent countries"
+"republics integrated into one country. The Soviet Union became one of most "
+"powerful states in the 20th century, but by the end of 1991 it had "
+"disintegrated into fifteen independent countries due to social and economic "
+"problems."
msgstr ""
"Sovjetunionens historie starter i november 1917, da en revolution under "
"Lenins ledelse fremtvinges. Den 31. december 1922 bliver 4 sovjetiske "
@@ -24192,7 +24447,7 @@ msgid ""
msgstr ""
"Swazierne er et bantu folk fra det sydlige Afrika. Under ledelse af Mswati "
"2. (1820-1868) ekspanderede de deres territorium og stabiliserede den "
-"sydlige front med zuluerne. "
+"sydlige front med zuluerne."
#: data/nation/swazi.ruleset:23
msgid "Ngwenyama"
@@ -24285,7 +24540,7 @@ msgid ""
"where they formed the Republic of China."
msgstr ""
"Da de kinesiske nationalister tabte den væbnede konflikt med de kinesiske "
-"kommunister, flygtede de til øen Taiwan og skabte der Republikken Kina. "
+"kommunister, flygtede de til øen Taiwan og skabte der Republikken Kina."
#: data/nation/texan.ruleset:3
msgid "Texan"
@@ -24530,8 +24785,8 @@ msgstr "?plural:Vestfalerne"
#: data/nation/westphalian.ruleset:6
msgid ""
-"Westphalia, before becoming a Prussian province, was the western region the "
-"duchy of Saxony. Present-day it consists of the Northern part of the largest "
+"Westphalia, before becoming a Prussian province, was the western region of "
+"the duchy of Saxony. Today it makes up the northern part of the largest "
"German federal state, North Rhine-Westphalia."
msgstr ""
"Vestfalen var før det blev en preussisk provins, den vestlige region i "
@@ -24722,14 +24977,14 @@ msgid ""
"The flag and background color indicate what civilization the city\n"
"belongs to (this will be useful when you meet other civilizations).\n"
"The top row of the bar also shows the name and size of the city, and\n"
-"will show one or more starts to indicate if there are units in the\n"
+"will show one or more stars to indicate if there are units in the\n"
"city. The bottom row shows what the city is building, and how long it\n"
"will take; it also shows how long the city will take to grow to the\n"
"next largest size."
msgstr ""
"Endnu en by! Du er ved at have fundet melodien. Du har sikkert nu\n"
"en god opfattelse af hvad du skal anvende nye byer til. Brug et øjeblik\n"
-"på at kigge på bjælken under byen på kortet. Denne viser nogle nogle\n"
+"på at kigge på bjælken under byen på kortet. Denne viser nogle nogle\n"
"brugbare informationer om byen. Flaget og baggrundsfarven viser hvilken\n"
"civilisation byen tilhører (dette vil være brugbart når du møder andre\n"
"civilisationer). Den øverste del af bjælken viser navnet og størrelsen på\n"
@@ -24821,7 +25076,7 @@ msgid ""
"Now your city has grown to size five. As cities get larger unrest\n"
"becomes a problem. A city of this size will usually have one unhappy\n"
"citizen unless pacifying effects are used; meaning one entertainer\n"
-"specialist is required to keep your citzens content. This is basically\n"
+"specialist is required to keep your citizens content. This is basically\n"
"a wasted citizen.\n"
"\n"
"There are several things that can be done about this. One quick fix\n"
@@ -24835,7 +25090,8 @@ msgid ""
msgstr ""
"Nu er din by vokset til størrelse fem. Efterhånden som byer bliver større\n"
"bliver uroligheder et problem. En by på størrelse fem vil normalt have 1\n"
-"utilfreds indbygger med mindre at der bruges underholdere som kan forhindre\n"
+"utilfreds indbygger med mindre at der bruges underholdere som kan forhindre "
+"dette;\n"
"hvilket betyder at 1 underholder kræves for at holde dine indbyggere "
"tilfredse. \n"
"Dette er i princippet en spildt indbygger.\n"
@@ -24945,7 +25201,7 @@ msgid ""
"existing cities. Generally when building new cities you want to make\n"
"sure that all tiles are covered by at least one city, but after that\n"
"it is best that your cities overlap as little as possible. Spreading\n"
-"out cities properly gives each city access to more resrouces, allowing\n"
+"out cities properly gives each city access to more resources, allowing\n"
"them to grow to larger sizes."
msgstr ""
"Din anden bosætter bør også bygge en ny by. Bemærk at når du flytter din\n"
@@ -25319,6 +25575,68 @@ msgstr "Hold 30"
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: "
@@ -25443,10 +25761,6 @@ msgstr "Hold 31"
#~ msgid ", nation %s"
#~ msgstr ", nation: %s"
-# problem
-#~ msgid ", team %s"
-#~ msgstr " hold %s"
-
#~ msgid "_Map"
#~ msgstr "_Kort"
@@ -26214,9 +26528,6 @@ msgstr "Hold 31"
#~ msgid "Unknown unit type '%s' in player%d section"
#~ msgstr "Forkert enhedstype '%s' i spiller%d sektion"
-#~ msgid "Savegame error: invalid unit orders."
-#~ msgstr "Fejl på gemt spil: Ugyldig enhedsordre."
-
#~ msgid "Unsupported government found (%s)"
#~ msgstr "Usupporteret ledelsesform fundet (%s)"
@@ -26720,9 +27031,6 @@ msgstr "Hold 31"
#~ msgid "?female:Encik"
#~ msgstr "?female:Encik"
-#~ msgid "?female:Leader"
-#~ msgstr "?female:leder"
-
#~ msgid "?female:General Secretary"
#~ msgstr "?female: Generalsekretær"
diff --git a/po/de.gmo b/po/de.gmo
index 3908e48..23121af 100644
Binary files a/po/de.gmo and b/po/de.gmo differ
diff --git a/po/de.po b/po/de.po
index 0a5ad62..837e918 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,7 +1,7 @@
# German Translation for Freeciv
-# Copyright (C) 1999-2008 Free Software Foundation, Inc.
+# Copyright (C) 1999-2009 Free Software Foundation, Inc.
# Egbert Hinzen <egbert at hinzen-koeln.de>, 1999-2002.
-# Christian Knoke <chrisk at cknoke.de>, 2003-2008.
+# Christian Knoke <chrisk at cknoke.de>, 2003-2009.
#
# +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
# + '# ?' markiert Stellen, die noch nicht übersetzt wurden. +
@@ -14,13 +14,13 @@
#
# Sollten Sie Rechtschreibfehler oder andere offensichtliche Fehler in der
# Ãœbersetzung finden, senden Sie bitte einen mit 'diff -u' erstellten Patch
-# an den Ãœbersetzer. Sollten Ihnen "bessere" Ãœbersetzungen einfallen,
+# an den Ãœbersetzer. Sollten Ihnen "bessere" Ãœbersetzungen einfallen,
# senden Sie bitte keinen Patch, sondern mailen Sie Ihre Vorschläge als Text
# an Christian Knoke <chrisk at cknoke.de>".
#
-# Wenn Sie an der Verbesserung der deutschen Übersetzung mitarbeiten möchten,
-# abonnieren Sie doch unsere Mailingliste mit einer E-Mail mit dem
-# Subject: subscribe an: <freeciv.de-request at freelists.org>. Achtung: Mails
+# Wenn Sie an der Verbesserung der deutschen Übersetzung mitarbeiten möchten,
+# abonnieren Sie doch unsere Mailingliste mit einer E-Mail mit dem
+# Subject: subscribe an: <freeciv.de-request at freelists.org>. Achtung: Mails
# von Nichtabonnenten werden von dieser Liste nicht angenommen (Spamschutz)!
#
# Einige Texte sind aus unterschiedlichen Gründen nicht übersetzt:
@@ -29,25 +29,27 @@
# Dort findet sich ein Ãœbersetzerkommentar (EH: oder CK:).
#
# - Technische Fehlermeldungen sind nicht übersetzt. Diese Meldungen
-# sind in erster Linie für Entwickler bestimmt, und die können in der
+# sind in erster Linie für Entwickler bestimmt, und die können in der
# Regel kein Deutsch. Soweit diesen Meldungen nicht bereits ein
# Entwicklerkommentar (TRANS:) migegeben wurde, findet sich dort ein
# Ãœbersetzerkomentar (CK: TECHNICAL oder EH:).
#
#
-# EH: I don't use emacs, so PO-Revision-Date is only a dummy.
msgid ""
msgstr ""
"Project-Id-Version: 1.15\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 07:45+0900\n"
-"PO-Revision-Date: 2007-08-11 01:23+0300\n"
+"POT-Creation-Date: 2009-03-29 21:13+0900\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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Poedit-Language: German\n"
+"X-Poedit-Country: GERMANY\n"
+"X-Poedit-Basepath: ../\n"
#: common/city.c:56 client/gui-gtk-2.0/repodlgs.c:938
#: client/gui-win32/repodlgs.c:700
@@ -667,7 +669,7 @@ msgid "Road"
msgstr "Straße"
#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
-#: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
+#: client/gui-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"
@@ -684,7 +686,7 @@ msgid "Mine"
msgstr "Bergwerk"
#: common/terrain.c:396 common/unit.c:548 server/report.c:124
-#: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
+#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr "Verschmutzung"
@@ -730,7 +732,7 @@ msgstr "Befestigt"
msgid "Sentry"
msgstr "Bewachen"
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:851 client/gui-sdl/menu.c:648
+#: common/unit.c:566 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"
@@ -747,7 +749,7 @@ msgstr "Erkunde"
msgid "Transform"
msgstr "Verändern"
-#: common/unit.c:584 client/text.c:106 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:584 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"
@@ -816,11 +818,11 @@ msgstr "Atomrakete"
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1406
+#: common/unittype.c:349 client/helpdata.c:1404
msgid " and "
msgstr " und "
-#: common/unittype.c:355 client/helpdata.c:1392
+#: common/unittype.c:355 client/helpdata.c:1390
msgid "?and:, "
msgstr "?and:, "
@@ -1446,30 +1448,24 @@ msgstr "Unzulässiger Wert für den Auth-Port: '%s'"
#: server/auth.c:281
#, c-format
-msgid "Auth config filename \"%s\" not allowed!"
-msgstr ""
-"Konfigurationsdatei für Authentifizierung: Dateiname '%s' ist nicht erlaubt!"
-
-#: server/auth.c:286
-#, c-format
msgid "Cannot load auth config file \"%s\"!"
msgstr "Kann Konfigurationsdatei '%s' für Authentifizierung nicht laden!"
-#: server/auth.c:397
+#: server/auth.c:392
#, c-format
msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
msgstr "Achtung, der Name '%s' ist vergeben, Gast in '%s' umbenannt."
-#: server/auth.c:404
+#: server/auth.c:399
msgid "Guests are not allowed on this server. Sorry."
msgstr "Tut mir leid, auf diesem Server sind keine Gäste zugelassen."
-#: server/auth.c:406
+#: server/auth.c:401
#, c-format
msgid "%s was rejected: Guests not allowed."
msgstr "%s wurde abgewiesen: keine Gäste zugelassen."
-#: server/auth.c:425
+#: server/auth.c:420
#, c-format
msgid ""
"There was an error reading the user database, logging in as guest connection "
@@ -1478,7 +1474,7 @@ msgstr ""
"Fehler beim Lesen der Spielerdatenbank, Verbindung als Gast '%s' "
"eingerichtet."
-#: server/auth.c:431
+#: server/auth.c:426
msgid ""
"There was an error reading the user database and guest logins are not "
"allowed. Sorry"
@@ -1486,43 +1482,43 @@ msgstr ""
"Fehler beim Lesen der Spielerdatenbank, und Gäste sind nicht zugelassen. Tut "
"mir leid."
-#: server/auth.c:434
+#: server/auth.c:429
#, c-format
msgid "%s was rejected: Database error and guests not allowed."
msgstr "%s wurde abgewiesen: Datenbankfehler und Gäste nicht erlaubt."
-#: server/auth.c:441
+#: server/auth.c:436
#, c-format
msgid "Enter password for %s:"
msgstr "Paßwort für %s eingeben:"
-#: server/auth.c:450
+#: server/auth.c:445
msgid "Enter a new password (and remember it)."
msgstr "Neues Paßwort eingeben (und merken)."
-#: server/auth.c:456
+#: server/auth.c:451
msgid "This server allows only preregistered users. Sorry."
msgstr ""
"Tut mir leid, auf diesem Server sind nur bereits registrierte Spieler "
"zugelassen."
-#: server/auth.c:459
+#: server/auth.c:454
#, c-format
msgid "%s was rejected: Only preregister users allowed."
msgstr "%s wurde abgewiesen: Nur registrierte Spieler erlaubt."
-#: server/auth.c:488 server/auth.c:547
+#: server/auth.c:483 server/auth.c:542
msgid "Sorry, too many wrong tries..."
msgstr "Tut mit leid, zu viele Versuche..."
-#: server/auth.c:489
+#: server/auth.c:484
#, c-format
msgid "%s was rejected: Too many wrong password verifies for new user."
msgstr ""
"%s wurde abgewiesen: Zu viele fehlgeschlagene Paßwortüberprüfungen für neuen "
"Spieler."
-#: server/auth.c:505
+#: server/auth.c:500
msgid ""
"Warning: There was an error in saving to the database. Continuing, but your "
"stats will not be saved."
@@ -1530,32 +1526,32 @@ msgstr ""
"Achtung: Fehler beim Schreiben der Datenbank. Spielen ohne Statistik ist "
"möglich."
-#: server/auth.c:549
+#: server/auth.c:544
#, c-format
msgid "%s was rejected: Too many wrong password tries."
msgstr "%s abgewiesen: zu viele falsche Paßworteingaben."
-#: server/auth.c:558
+#: server/auth.c:553
msgid "Your password is incorrect. Try again."
msgstr "Dein Paßwort ist falsch. Versuche es nochmals."
-#: server/auth.c:569
+#: server/auth.c:564
msgid "Sorry, your connection timed out..."
msgstr "Tut mir leid, deine Verbindungszeit ist abgelaufen..."
-#: server/auth.c:571
+#: server/auth.c:566
#, c-format
msgid "%s was rejected: Connection timeout waiting for password."
msgstr "%s wurde abgewiesen: Verbindungszeitablauf bei der Paßworteingabe."
-#: server/auth.c:636
+#: server/auth.c:631
#, c-format
msgid "Your password is too short, the minimum length is %d. Try again."
msgstr ""
"Dein Paßwort ist zu kurz, mindestens %d Zeichen erforderlich. Versuche es "
"nochmals."
-#: server/auth.c:642
+#: server/auth.c:637
#, c-format
msgid ""
"The password must have at least %d capital letters, %d numbers, and be at "
@@ -2078,7 +2074,7 @@ msgstr "%s Server"
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:237 manual/civmanual.c:380
+#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
@@ -2107,13 +2103,13 @@ msgstr " -N --Newusers\tNeue Benutzer bei Authentifizierung erlauben.\n"
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:241
+#: server/civserver.c:217 client/civclient.c:242
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:245
+#: server/civserver.c:221 client/civclient.c:246
msgid " -d, --debug NUM\tSet debug log level (0 to 3)\n"
msgstr " -d, --debug NUM\tSetze Debugloglevel (0-3)\n"
@@ -2121,7 +2117,7 @@ msgstr " -d, --debug NUM\tSetze Debugloglevel (0-3)\n"
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:248 manual/civmanual.c:382
+#: server/civserver.c:225 client/civclient.c:249 manual/civmanual.c:382
msgid " -h, --help\t\tPrint a summary of the options\n"
msgstr " -h, --help\t\tZeige diesen Text\n"
@@ -2170,11 +2166,11 @@ msgstr " -r, --read DATEI\tStartskript DATEI laden\n"
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:267 manual/civmanual.c:383
+#: server/civserver.c:247 client/civclient.c:268 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:279
+#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, c-format
@@ -3451,7 +3447,7 @@ msgstr ""
"Marineeinheiten sind als Starteinheiten noch nicht möglich, niemand erhält %"
"s."
-#: server/gamehand.c:310 client/text.c:632
+#: server/gamehand.c:310 client/text.c:691
#, c-format
msgid "Year: %s"
msgstr "Jahr: %s"
@@ -3742,8 +3738,8 @@ msgstr "Bürgerkrieg der %s ist nicht möglich - keine Nationen verfügbar"
#: server/plrhand.c:1686
#, c-format
msgid ""
-"Your nation is thrust into civil war, %s is declared the leader of the "
-"rebel states."
+"Your nation is thrust into civil war! %s is declared the leader of the rebel "
+"states."
msgstr ""
"Die Nation wird vom Bürgerkrieg gespalten. %s ist der Anführer der "
"revoltierenden Provinzen."
@@ -3844,7 +3840,7 @@ msgstr "Forschungstempo"
msgid "Literacy"
msgstr "Bildung"
-#: server/report.c:121 client/cityrepdata.c:526 client/cityrepdata.c:527
+#: server/report.c:121 client/cityrepdata.c:524 client/cityrepdata.c:525
#: client/gui-sdl/cityrep.c:174
msgid "Production"
msgstr "Produktion"
@@ -3996,7 +3992,7 @@ 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:766
+#: server/report.c:743 server/report.c:768
msgid "Demographics Report:"
msgstr "Bericht zur Lage der Nation:"
@@ -4004,10 +4000,12 @@ msgstr "Bericht zur Lage der Nation:"
msgid "Sorry, the Demographics report is unavailable."
msgstr "Der Bericht zur Lage der Nation ist leider nicht verfügbar."
-#: server/report.c:748
+#. TRANS: <nation adjective> <government name> (<year>).
+#. * E.g. "Polish Despotism (200 AD)".
+#: server/report.c:750
#, c-format
-msgid "The %s of the %s (%s)"
-msgstr "Die %s der %s (%s)"
+msgid "%s %s (%s)"
+msgstr "%s %s (%s)"
#. TRANS: message about an installation error.
#: server/ruleset.c:163
@@ -4061,17 +4059,6 @@ msgstr ""
msgid "%s had invalid nation; changing to %s."
msgstr "%s ist eine ungültige Nation und wird geändert auf %s."
-# CK: TECHNICAL
-#. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4073
-#, c-format
-msgid ""
-"Illegal alliance structure detected: %s alliance to %s reduced to peace "
-"treaty."
-msgstr ""
-"Illegal alliance structure detected: %s alliance to %s reduced to peace "
-"treaty."
-
#: server/settings.c:32
msgid "Geological"
msgstr "Geologie"
@@ -5304,11 +5291,11 @@ msgstr "Namenvorsatz für das automatische Speichern"
#: server/settings.c:1016
msgid ""
-"Automatically saved games will have name \"<prefix><year>.sav\". This "
-"setting sets the <prefix> part."
+"Automatically saved games will have name \"<prefix>-T<turn>-Y<year>.sav\". "
+"This setting sets the <prefix> part."
msgstr ""
-"Automatisch gespeicherte Spiele heißen '<Präfix><Jahr>.sav'. Mit dieser "
-"Option kann das <Präfix> festgelegt werden."
+"Automatisch gespeicherte Spiele heißen '<Präfix>-T<Runde>-Y<Jahr>.sav'. Mit "
+"dieser Option kann das <Präfix> festgelegt werden."
#: server/settings.c:1023
msgid "Whether to log player statistics"
@@ -5325,11 +5312,11 @@ msgstr ""
"benutzt werden, nach Spielende Grafiken anzuzeigen."
# EH: Diese Fehlermeldung sollte mE nicht übersetzt werden.
-#: server/sernet.c:147
+#: server/sernet.c:150
msgid "Server cannot read standard input. Ignoring input."
msgstr "Server cannot read standard input. Ignoring input."
-#: server/sernet.c:922
+#: server/sernet.c:929
#, c-format
msgid "Server: bad address: [%s:%d]."
msgstr "Server: Die Adresse [%s:%d] ist ungültig."
@@ -5457,103 +5444,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:928
+#: server/srv_main.c:961
#, c-format
msgid "Failed saving game as %s"
msgstr "Konnte das Spiel nicht in der Datei '%s' speichern"
-#: server/srv_main.c:930
+#: server/srv_main.c:963
#, c-format
msgid "Game saved as %s"
msgstr "Spiel gespeichert als '%s'"
-#: server/srv_main.c:962
+#: server/srv_main.c:994
msgid "The game is already running."
msgstr "Das Spiel hat bereits angefangen."
-#: server/srv_main.c:970
+#: server/srv_main.c:1002
#, 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:977
+#: server/srv_main.c:1009
msgid "Starting game."
msgstr "Spiel begonnen."
# EH: Diese Fehlermeldung sollte mE nicht übersetzt werden.
-#: server/srv_main.c:1039
+#: server/srv_main.c:1071
#, c-format
msgid "request for unknown report (type %d)"
msgstr "request for unknown report (type %d)"
-#: server/srv_main.c:1104
+#: server/srv_main.c:1136
#, 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:1206
+#: server/srv_main.c:1238
#, 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:1306
+#: server/srv_main.c:1338
msgid "Please choose a non-blank name."
msgstr "Es muß ein Name gewählt werden."
-#: server/srv_main.c:1322
+#: server/srv_main.c:1354
msgid "That nation is already in use."
msgstr "Diese Nation ist bereits vergeben."
-#: server/srv_main.c:1338
+#: server/srv_main.c:1370
#, 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:1359
+#: server/srv_main.c:1391
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:1458
+#: server/srv_main.c:1490
#, 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:1464
+#: server/srv_main.c:1496
#, c-format
msgid "%s nation is already in use."
msgstr "Die Nation der %s ist bereits vergeben."
-#: server/srv_main.c:1482
+#: server/srv_main.c:1514
#, c-format
msgid "%s is the %s ruler %s."
msgstr "%s ist der %se Herrscher %s."
-#: server/srv_main.c:1538
+#: server/srv_main.c:1570
#, 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:1582 server/srv_main.c:1586
+#: server/srv_main.c:1614 server/srv_main.c:1618
#, 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:1728
+#: server/srv_main.c:1760
#, c-format
msgid "Player %d"
msgstr "Spieler %d"
-#: server/srv_main.c:1739 server/srv_main.c:1745
+#: server/srv_main.c:1771 server/srv_main.c:1777
#, c-format
msgid "%s rules the %s."
msgstr "%s beherrscht die %s."
-#: server/srv_main.c:1910
+#: server/srv_main.c:1942
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
@@ -5561,16 +5548,16 @@ msgstr ""
"Unterstützung für Spieler-Authentifizierung verfügbar, wird aber nicht "
"verwendet."
-#: server/srv_main.c:1961
+#: server/srv_main.c:1993
#, c-format
msgid "Sending info to metaserver [%s]"
msgstr "Sende Informationen an den Metaserver [%s]"
-#: server/srv_main.c:1992
+#: server/srv_main.c:2024
msgid "The game is over..."
msgstr "Das Spiel ist vorbei..."
-#: server/srv_main.c:2205
+#: server/srv_main.c:2237
msgid "Now accepting new client connections."
msgstr "Warte auf Spieler..."
@@ -6399,24 +6386,24 @@ msgid "Barbarian"
msgstr "barbarisch"
#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2030 client/gui-sdl/plrdlg.c:645
+#: client/gui-gtk-2.0/pages.c:2102 client/gui-sdl/plrdlg.c:645
#: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
msgid "AI"
msgstr "KI"
#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
+#: 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
msgid "Human"
msgstr "menschlich"
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
-#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
+#: 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
msgid "Alive"
msgstr "Lebend"
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
#: client/gui-win32/connectdlg.c:200
msgid "Dead"
msgstr "Tot"
@@ -6683,9 +6670,9 @@ 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:242
-#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
-#: client/text.c:1201
+#: 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
#, c-format
msgid "?clistmore:, %s"
msgstr ", %s"
@@ -6946,7 +6933,7 @@ msgstr "Nur %s können von See aus angreifen."
msgid "Cannot attack from sea."
msgstr "Kann nicht von See aus angreifen."
-#: server/unithand.c:996 server/unittools.c:2103
+#: server/unithand.c:996 server/unittools.c:2137
msgid "Cannot attack unless you declare war first."
msgstr "Kann erst nach Kriegserklärung angreifen."
@@ -7048,101 +7035,102 @@ msgstr "%s wurde kostenlos zu %s modernisiert."
#: server/unittools.c:297
#, c-format
-msgid "Not enough gold. %s disbanded"
-msgstr "Zu wenig Gold. %s wurde aufgelöst."
+msgid "Not enough gold to pay upkeep for %s. Unit disbanded."
+msgstr "Zu wenig Gold für den Unterhalt von %s. Einheit wurde aufgelöst."
-#: server/unittools.c:342
+#: server/unittools.c:343
#, c-format
msgid "Your %s has run out of hit points."
msgstr "%s hat keine Trefferpunkte mehr."
-#: server/unittools.c:358
+#: server/unittools.c:359
#, c-format
msgid "Your %s has been lost on the high seas."
msgstr "%s ist auf hoher See gesunken."
-#: server/unittools.c:365
+#: server/unittools.c:366
#, c-format
msgid "Your %s survived on the high seas and became more experienced!"
msgstr "%s überlebte auf hoher See und sammelte Erfahrung!"
-#: server/unittools.c:376
+#: server/unittools.c:377
#, c-format
msgid "Your %s has been lost on unsafe terrain."
msgstr "%s ging auf unsicherem Gelände verloren."
-#: server/unittools.c:430
+#: server/unittools.c:431
#, c-format
msgid "Your %s has returned to refuel."
msgstr "%s ist zum Tanken zurück gekommen."
-#: server/unittools.c:454
+#: server/unittools.c:455
#, c-format
msgid "Your %s has run out of fuel."
msgstr "%s hat keinen Treibstoff mehr."
-#. TRANS: And, <the unit> became ...
-#: server/unittools.c:616
-msgid "And, became more experienced!"
-msgstr "Und sie sammelten Erfahrung!"
-
#. TRANS: Your <unit> became ...
-#: server/unittools.c:620
+#: server/unittools.c:619
#, c-format
msgid "Your %s became more experienced!"
msgstr "Dein %s sammelte Erfahrung!"
-#: server/unittools.c:1011
+#: server/unittools.c:1009
#, c-format
msgid "Teleported your %s to %s."
msgstr "Habe %s nach %s teleportiert."
-#: server/unittools.c:1041
+#. TRANS: A unit is moved to resolve stack conflicts.
+#: server/unittools.c:1065
+#, c-format
+msgid "Moved your %s."
+msgstr "%s wurde verschoben."
+
+#: server/unittools.c:1076
#, c-format
msgid "Disbanded your %s."
msgstr "Einheit %s aufgelöst."
-#: server/unittools.c:1363
+#: server/unittools.c:1397
#, 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:1367
+#: server/unittools.c:1401
#, 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:1469
+#: server/unittools.c:1503
#, 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:1478
+#: server/unittools.c:1512
#, c-format
msgid "%s lost when %s was lost."
msgstr "%s beim Verlust von %s verloren."
-#: server/unittools.c:1527
+#: server/unittools.c:1561
#, 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:1545
+#: server/unittools.c:1579
#, 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:1554 server/unittools.c:1612
+#: server/unittools.c:1588 server/unittools.c:1646
#, 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:1588
+#: server/unittools.c:1622
#, c-format
msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
msgid_plural ""
@@ -7156,14 +7144,14 @@ msgstr[1] ""
#. TRANS: "Cannon lost when the Polish Destroyer
#. * attacked the German Musketeers."
-#: server/unittools.c:1621
+#: server/unittools.c:1655
#, 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:1636
+#: server/unittools.c:1670
#, c-format
msgid "%s (and %s) lost to an attack from the %s %s."
msgstr "%s (und %s) beim Angriff der %sen %s verloren."
@@ -7171,7 +7159,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:1646
+#: server/unittools.c:1680
#, 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."
@@ -7181,198 +7169,198 @@ 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:1660
+#: server/unittools.c:1694
#, 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:1928
+#: server/unittools.c:1962
#, c-format
msgid "Your %s was nuked by %s."
msgstr "%s wurde von %s atomar angegriffen."
-#: server/unittools.c:1931 server/unittools.c:1947
+#: server/unittools.c:1965 server/unittools.c:1981
msgid "yourself"
msgstr "selbst"
-#: server/unittools.c:1935
+#: server/unittools.c:1969
#, c-format
msgid "The %s %s was nuked."
msgstr "Die %sen %s wurden atomar angegriffen."
-#: server/unittools.c:1944
+#: server/unittools.c:1978
#, c-format
msgid "%s was nuked by %s."
msgstr "%s wurde von %s atomar angegriffen."
-#: server/unittools.c:1952
+#: server/unittools.c:1986
#, c-format
msgid "You nuked %s."
msgstr "%s atomar angegriffen."
-#: server/unittools.c:1993
+#: server/unittools.c:2027
#, c-format
msgid "The %s detonated a nuke!"
msgstr "Die %s haben eine Atombombe gezündet!"
-#: server/unittools.c:2017
+#: server/unittools.c:2051
#, c-format
msgid "%s transported successfully."
msgstr "%s transportiert."
-#: server/unittools.c:2069
+#: server/unittools.c:2103
msgid "This unit type can not be paradropped."
msgstr "Diese Einheit kann nicht fallschirmspringen."
-#: server/unittools.c:2079
+#: server/unittools.c:2113
msgid "You cannot paradrop a unit that is transporting other units."
msgstr "Ein Transporter kann nicht fallschirmspringen."
-#: server/unittools.c:2085
+#: server/unittools.c:2119
msgid "The destination location is not known."
msgstr "Der Zielort ist nicht bekannt."
-#: server/unittools.c:2092
+#: server/unittools.c:2126
#, c-format
msgid "This unit cannot paradrop into %s."
msgstr "Diese Einheit kann nicht über %s abspringen."
-#: server/unittools.c:2112
+#: server/unittools.c:2146
#, 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:2123
+#: server/unittools.c:2157
#, 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:2136
+#: server/unittools.c:2170
#, 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:2158
+#: server/unittools.c:2192
#, c-format
msgid "You found %d gold."
msgstr "%d Goldstücke erhalten."
-#: server/unittools.c:2175
+#: server/unittools.c:2209
#, c-format
msgid "You found %s in ancient scrolls of wisdom."
msgstr "%s aus überlieferten Texten gelernt."
-#: server/unittools.c:2182
+#: server/unittools.c:2216
#, 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:2196
+#: server/unittools.c:2230
msgid "A band of friendly mercenaries joins your cause."
msgstr "Eine Gruppe Söldner stellt sich zur Verfügung."
-#: server/unittools.c:2214
+#: server/unittools.c:2248
msgid "An abandoned village is here."
msgstr "Hier ist eine verlassene Ortschaft."
-#: server/unittools.c:2224
+#: server/unittools.c:2258
msgid "You have unleashed a horde of barbarians!"
msgstr "Barbarenhorde freigesetzt."
-#: server/unittools.c:2227
+#: server/unittools.c:2261
#, c-format
msgid "Your %s has been killed by barbarians!"
msgstr "Barbaren haben %s vernichtet."
-#: server/unittools.c:2243
+#: server/unittools.c:2277
msgid "You found a friendly city."
msgstr "Eine unabhängige Stadt schließt sich an."
-#: server/unittools.c:2257
+#: server/unittools.c:2291
msgid "Friendly nomads are impressed by you, and join you."
msgstr "Eine Gruppe Nomaden stellt sich zur Verfügung."
-#: server/unittools.c:2282
+#: server/unittools.c:2316
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:2540
+#: server/unittools.c:2574
#, 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:2989
+#: server/unittools.c:3023
#, 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:3041
+#: server/unittools.c:3075
#, 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:3054
+#: server/unittools.c:3088
#, 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:3068
+#: server/unittools.c:3102
#, 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:3078
+#: server/unittools.c:3112
#, 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:3104
+#: server/unittools.c:3138
#, 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:3145
+#: server/unittools.c:3179
#, c-format
msgid "Attempt to change homecity for %s failed."
msgstr "Der Versuch, die Heimatstadt der %s zu ändern, schlug fehl."
-#: server/unittools.c:3156
+#: server/unittools.c:3190
#, c-format
msgid "Attempt to establish trade route for %s failed."
msgstr "Der Versuch, eine Handelsroute nach %s einzurichten, mißlang."
-#: server/unittools.c:3168
+#: server/unittools.c:3202
#, c-format
msgid "Attempt to build wonder for %s failed."
msgstr "Der Versuch, ein Weltwunder in %s zu errichten, mißlang."
-#: server/unittools.c:3177
+#: server/unittools.c:3211
#, c-format
msgid "Your %s has invalid orders."
msgstr "Befehle für %s sind ungültig."
-#: server/generator/mapgen.c:1737
+#: server/generator/mapgen.c:1771
msgid "High landmass - this may take a few seconds."
msgstr "Große Landfläche - bitte warten..."
-#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
+#: server/generator/mapgen.c:1969 server/generator/mapgen.c:2039
#, c-format
msgid "Falling back to generator %d."
msgstr "Benutze Kartengenerator %d."
-#: server/generator/mapgen.c:2025
+#: server/generator/mapgen.c:2059
msgid "Generator 3 didn't place all big islands."
msgstr "Kartengenerator 3 hat nicht alle großen Inseln erzeugt."
-#: server/generator/mapgen.c:2054
+#: server/generator/mapgen.c:2088
#, c-format
msgid "Generator 3 left %li landmass unplaced."
msgstr "Kartengenerator 3 hat %li Land nicht plaziert."
@@ -7484,7 +7472,7 @@ msgid_plural "%3d turns"
msgstr[0] "1 Runde"
msgstr[1] "%3d Runden"
-#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:631
#: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
@@ -7565,7 +7553,7 @@ msgstr "%+4d : Bonus von %s (%+d%%)\n"
#: client/citydlg_common.c:462
#, c-format
msgid "%+4d : Waste\n"
-msgstr "%+4d : Müll\n"
+msgstr "%+4d : Verschwendung\n"
#: client/citydlg_common.c:468
#, c-format
@@ -7602,340 +7590,339 @@ msgstr "?city_state:normal"
msgid "(worklist)"
msgstr "(Arbeitsliste)"
-#: client/cityrepdata.c:447
-msgid "Special"
-msgstr "Andere"
+#: client/cityrepdata.c:446
+msgid "?city:Name"
+msgstr "Name"
-#: client/cityrepdata.c:448
-msgid "?entertainers/scientists/taxmen:E/S/T"
-msgstr "?entertainers/scientists/taxmen:U/F/St"
+#: client/cityrepdata.c:446 client/gui-sdl/cityrep.c:169
+msgid "City Name"
+msgstr "Name der Stadt"
-#: client/cityrepdata.c:449
-msgid "Entertainers, Scientists, Taxmen"
-msgstr "Unterhalter, Forscher, Steuerfahnder"
+#: client/cityrepdata.c:448
+msgid "?size [short]:Sz"
+msgstr "Gr"
-#: client/cityrepdata.c:452
-msgid "Concise + Rapture, - Disorder"
-msgstr "einspaltige Statusanzeige: + begeistert, - in Aufruhr"
+#: client/cityrepdata.c:448
+msgid "Size"
+msgstr "Größe"
-#: client/cityrepdata.c:454 client/plrdlg_common.c:261
+#: client/cityrepdata.c:450 client/plrdlg_common.c:261
#: client/gui-win32/plrdlg.c:337
msgid "State"
msgstr "Status"
-#: client/cityrepdata.c:454
+#: client/cityrepdata.c:450
msgid "Rapture/Peace/Disorder"
-msgstr "begeistert/normal/in Aufruhr"
+msgstr "Status: begeistert/normal/in Aufruhr"
+
+#: client/cityrepdata.c:452
+msgid "Concise *=Rapture, X=Disorder"
+msgstr "Kurzer Status: *=begeistert, X=in Aufruhr"
+
+#: client/cityrepdata.c:456
+msgid "Special"
+msgstr "Andere"
#: client/cityrepdata.c:457
+msgid "?entertainers/scientists/taxmen:E/S/T"
+msgstr "?entertainers/scientists/taxmen:U/F/St"
+
+#: client/cityrepdata.c:458
+msgid "Entertainers, Scientists, Taxmen"
+msgstr "Unterhalter, Forscher, Steuerfahnder"
+
+#: client/cityrepdata.c:461
msgid "?Happy workers:H"
msgstr "?Happy workers:G"
-#: client/cityrepdata.c:457
+#: client/cityrepdata.c:461
msgid "Workers: Happy"
msgstr "Arbeiter: Glücklich"
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
msgid "?Content workers:C"
msgstr "?Content workers:Z"
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
msgid "Workers: Content"
msgstr "Arbeiter: Zufrieden"
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
msgid "?Unhappy workers:U"
msgstr "?Unhappy workers:U"
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
msgid "Workers: Unhappy"
msgstr "Arbeiter: Unzufrieden"
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
msgid "?Angry workers:A"
msgstr "?Angry workers:W"
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
msgid "Workers: Angry"
msgstr "Arbeiter: Wütend"
-#: client/cityrepdata.c:465 client/gui-xaw/citydlg.c:2401
-#: data/default/units.ruleset:238
-msgid "Workers"
+#: client/cityrepdata.c:469 client/gui-xaw/citydlg.c:2402
+msgid "?city:Workers"
msgstr "Arbeiter"
-#: client/cityrepdata.c:466
+#: client/cityrepdata.c:470
msgid "?happy/content/unhappy/angry:H/C/U/A"
msgstr "?happy/content/unhappy/angry:G/Z/U/W"
-#: client/cityrepdata.c:467
+#: client/cityrepdata.c:471
msgid "Workers: Happy, Content, Unhappy, Angry"
msgstr "Arbeiter: Glücklich, Zufrieden, Unzufrieden, Wütend"
-#: client/cityrepdata.c:470 client/cityrepdata.c:472
+#: client/cityrepdata.c:474 client/cityrepdata.c:476
msgid "Best"
msgstr "Bester"
-#: client/cityrepdata.c:470
+#: client/cityrepdata.c:474
msgid "attack"
-msgstr "Angr."
+msgstr "Angr"
-#: client/cityrepdata.c:471
+#: client/cityrepdata.c:475
msgid "Best attacking units"
msgstr "Bester Angreifer"
-#: client/cityrepdata.c:472
+#: client/cityrepdata.c:476
msgid "defense"
-msgstr "Vert."
+msgstr "Vertd"
-#: client/cityrepdata.c:473
+#: client/cityrepdata.c:477
msgid "Best defending units"
msgstr "Bester Verteidiger"
-#: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
-#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
-#: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
-#: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
-#: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
-#: client/gui-win32/menu.c:351 client/gui-win32/repodlgs.c:616
-#: client/gui-win32/repodlgs.c:707 client/gui-win32/repodlgs.c:716
-#: client/gui-xaw/menu.c:157 client/gui-xaw/menu.c:219
-#: client/gui-xaw/menu.c:242 client/gui-xaw/repodlgs.c:881
-#: client/gui-xaw/repodlgs.c:1069 data/Freeciv.in:1895 data/helpdata.txt:909
+#: client/cityrepdata.c:478 client/cityrepdata.c:482
+#: client/gui-gtk-2.0/cityrep.c:1437 client/gui-gtk-2.0/cityrep.c:1456
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-gtk-2.0/cityrep.c:1494
+#: client/gui-gtk-2.0/cityrep.c:1514 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/repodlgs.c:960 client/gui-sdl/helpdlg.c:688
+#: client/gui-sdl/mapctrl.c:1605 client/gui-sdl/optiondlg.c:1827
+#: client/gui-sdl/repodlgs.c:356 client/gui-win32/menu.c:351
+#: client/gui-win32/repodlgs.c:616 client/gui-win32/repodlgs.c:707
+#: client/gui-win32/repodlgs.c:716 client/gui-xaw/menu.c:157
+#: client/gui-xaw/menu.c:219 client/gui-xaw/menu.c:242
+#: client/gui-xaw/repodlgs.c:881 client/gui-xaw/repodlgs.c:1069
+#: data/Freeciv.in:1895 data/helpdata.txt:909
msgid "Units"
msgstr "Einheiten"
#. TRANS: Header "Number of units inside city"
-#: client/cityrepdata.c:476
+#: client/cityrepdata.c:480
msgid "?Present (units):Here"
-msgstr "station."
+msgstr "stat"
-#: client/cityrepdata.c:477
+#: client/cityrepdata.c:481
msgid "Number of units present"
msgstr "Stationierte Einheiten"
#. TRANS: Header "Number of units supported by given city"
-#: client/cityrepdata.c:480
+#: client/cityrepdata.c:484
msgid "?Supported (units):Owned"
-msgstr "unterh."
+msgstr "unth"
-#: client/cityrepdata.c:481
+#: client/cityrepdata.c:485
msgid "Number of units supported"
msgstr "Unterstützte Einheiten"
#. TRANS: Header "It will take this many turns before city grows"
-#: client/cityrepdata.c:484
+#: client/cityrepdata.c:488
msgid "?food (population):Grow"
-msgstr "Wachstum"
+msgstr "Wächst in"
-#: client/cityrepdata.c:485 client/cityrepdata.c:530
+#: client/cityrepdata.c:489 client/cityrepdata.c:528
msgid "?Stock/Target:(Have/Need)"
-msgstr "(aktuell/benötigt)"
+msgstr "(vorh/ben)"
-#: client/cityrepdata.c:486
+#: client/cityrepdata.c:490
msgid "Turns until growth/famine"
msgstr "Runden bis Wachstum/Hungersnot"
-#: client/cityrepdata.c:488
-msgid "?size [short]:Sz"
-msgstr "Gr"
-
-#: client/cityrepdata.c:488
-msgid "Size"
-msgstr "Größe"
-
-#: client/cityrepdata.c:492
-msgid "?city:Name"
-msgstr "Name"
-
-#: client/cityrepdata.c:492 client/gui-sdl/cityrep.c:169
-msgid "City Name"
-msgstr "Name der Stadt"
-
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
msgid "Surplus"
-msgstr "Überschuß"
+msgstr "Ãœbersch"
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
msgid "?food/production/trade:F/P/T"
msgstr "?food/production/trade:N/P/H"
-#: client/cityrepdata.c:496
+#: client/cityrepdata.c:494
msgid "Surplus: Food, Production, Trade"
msgstr "Überschuß: Nahrung, Produktion, Handel"
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
msgid "?Food surplus [short]:+F"
msgstr "+N"
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
msgid "Surplus: Food"
msgstr "Überschuß: Nahrung"
-#: client/cityrepdata.c:500
+#: client/cityrepdata.c:498
msgid "?Production surplus [short]:+P"
msgstr "+P"
-#: client/cityrepdata.c:501
+#: client/cityrepdata.c:499
msgid "Surplus: Production"
msgstr "Überschuß: Produktion"
-#: client/cityrepdata.c:502
+#: client/cityrepdata.c:500
msgid "?Production loss (waste) [short]:-P"
msgstr "-P"
-#: client/cityrepdata.c:503
+#: client/cityrepdata.c:501
msgid "Waste"
-msgstr "Müll"
+msgstr "Verschwendung"
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
msgid "?Trade surplus [short]:+T"
msgstr "+H"
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
msgid "Surplus: Trade"
msgstr "Überschuß: Handel"
-#: client/cityrepdata.c:506
+#: client/cityrepdata.c:504
msgid "?Trade loss (corruption) [short]:-T"
msgstr "-H"
-#: client/cityrepdata.c:507
+#: client/cityrepdata.c:505
msgid "Corruption"
msgstr "Korruption"
-#: client/cityrepdata.c:509 client/gui-gtk-2.0/repodlgs.c:654
+#: client/cityrepdata.c:507 client/gui-gtk-2.0/repodlgs.c:654
#: client/gui-sdl/mapctrl.c:1400 client/gui-win32/repodlgs.c:334
#: client/gui-xaw/menu.c:222 client/gui-xaw/repodlgs.c:644
#: client/gui-xaw/repodlgs.c:773 data/Freeciv.in:1819
msgid "Economy"
msgstr "Wirtschaft"
-#: client/cityrepdata.c:509
+#: client/cityrepdata.c:507
msgid "?gold/luxury/science:G/L/S"
msgstr "?gold/luxury/science:G/L/F"
-#: client/cityrepdata.c:510
+#: client/cityrepdata.c:508
msgid "Economy: Gold, Luxuries, Science"
msgstr "Wirtschaft: Gold, Luxus, Forschung"
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
msgid "?Gold:G"
msgstr "?Gold:G"
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
msgid "Economy: Gold"
msgstr "Wirtschaft: Gold"
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
msgid "?Luxury:L"
msgstr "?Luxury:L"
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
msgid "Economy: Luxury"
msgstr "Wirtschaft: Luxus"
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
msgid "?Science:S"
msgstr "?Science:F"
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
msgid "Economy: Science"
msgstr "Wirtschaft: Forschung"
-#: client/cityrepdata.c:518
+#: client/cityrepdata.c:516
msgid "?number_trade_routes:n"
-msgstr "#"
+msgstr "Anz"
-#: client/cityrepdata.c:518
+#: client/cityrepdata.c:516
msgid "?number_trade_routes:R"
-msgstr "HW"
+msgstr "HaW"
-#: client/cityrepdata.c:519
+#: client/cityrepdata.c:517
msgid "Number of Trade Routes"
msgstr "Anzahl der Handelswege"
-#: client/cityrepdata.c:521
+#: client/cityrepdata.c:519
msgid "?pollution [short]:Pol"
msgstr "UV"
-#: client/cityrepdata.c:523
+#: client/cityrepdata.c:521
msgid "?cma:Governor"
-msgstr "Bürgermeister"
+msgstr "Bürgerm"
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
-#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
-#: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
-#: data/Freeciv.in:1459 data/helpdata.txt:820
+#: client/cityrepdata.c:521 client/gui-gtk-2.0/cityrep.c:1766
+#: client/gui-sdl/citydlg.c:3809 client/gui-sdl/cma_fe.c:858
+#: client/gui-win32/citydlg.c:726 data/Freeciv.in:1459 data/helpdata.txt:820
msgid "Citizen Governor"
msgstr "Bürgermeister"
-#: client/cityrepdata.c:526
+#: client/cityrepdata.c:524
msgid "Turns/Buy"
-msgstr "Runden/Preis"
+msgstr "Ru/Preis"
-#: client/cityrepdata.c:529 client/cityrepdata.c:531
+#: client/cityrepdata.c:527 client/cityrepdata.c:529
msgid "Currently Building"
-msgstr "derzeitiges Projekt"
+msgstr "Derzeit in Bau"
-#: client/cityrepdata.c:575
+#: client/cityrepdata.c:573
msgid "?specialist:S"
-msgstr "F"
+msgstr "Sp"
-#: client/cityrepdata.c:578
+#: client/cityrepdata.c:576
msgid "Specialists"
msgstr "Spezialisten"
-#: client/civclient.c:239
+#: client/civclient.c:240
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr " -a, --autoconnect\tAuswahlmenü zur Serverwahl unterdrücken\n"
-#: client/civclient.c:249
+#: client/civclient.c:250
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:251
+#: client/civclient.c:252
msgid " -m, --meta HOST\tConnect to the metaserver at HOST\n"
msgstr " -m, --metaserver HOST\tMit Metaserver auf HOST verbinden\n"
-#: client/civclient.c:253
+#: client/civclient.c:254
msgid " -n, --name NAME\tUse NAME as name\n"
msgstr " -n, --name NAME\tBenutze NAME als Alias\n"
-#: client/civclient.c:255
+#: client/civclient.c:256
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:257
+#: client/civclient.c:258
#, 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:259
+#: client/civclient.c:260
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:262
+#: client/civclient.c:263
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:264
+#: client/civclient.c:265
msgid " -S, --Sound FILE\tRead sound tags from FILE\n"
msgstr " -S, --Sound DATEI\tSounds aus DATEI laden\n"
-#: client/civclient.c:265
+#: client/civclient.c:266
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:268
+#: client/civclient.c:269
#, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -7945,7 +7932,7 @@ msgstr ""
"\t\t\tFür mehr Hilfe: \"%s -- --help\"\n"
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:273
+#: client/civclient.c:274
#, c-format
msgid "Report bugs at %s\n"
msgstr ""
@@ -7955,139 +7942,149 @@ msgstr ""
"- über Probleme mit der deutschen Übersetzung mit einer E-Mail an "
"<chrisk at cknoke.de>\n"
-#: client/civclient.c:297
+#: client/civclient.c:298
#, 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:299 client/civclient.c:314
+#: client/civclient.c:300 client/civclient.c:315
msgid "Try using --help.\n"
msgstr "Hilfe erhalten Sie mit der Option --help.\n"
-#: client/civclient.c:312
+#: client/civclient.c:313
#, 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:325
+#: client/civclient.c:326
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr "Unbekannte Option: '%s'\n"
-#: client/civclient.c:539
+#: client/civclient.c:391
+#, c-format
+msgid "Updating old metaserver address \"%s\"."
+msgstr "Veraltete Metaserver-Adresse '%s' wird ersetzt."
+
+#: client/civclient.c:394
+#, c-format
+msgid "Default metaserver has been set to \"%s\"."
+msgstr "Die Adresse des Standard-Metaservers wurde auf '%s' gesetzt."
+
+#: client/civclient.c:550
msgid "Game started."
msgstr "Spiel begonnen."
-#: client/civclient.c:577
+#: client/civclient.c:588
msgid "There was an error while auto connecting; aborting."
msgstr "Fehler bei automatischem Verbindungsaufbau: Abbruch."
-#: client/climisc.c:176
+#: client/climisc.c:177
#, c-format
msgid "Changing production of every %s into %s."
msgstr "Anstatt %s werden jetzt überall %s (auf)gebaut."
-#: client/climisc.c:214
+#: client/climisc.c:215
msgid "?embassy:Both"
msgstr "?embassy:beide"
-#: client/climisc.c:216
+#: client/climisc.c:217
msgid "?embassy:Yes"
msgstr "?embassy:ja"
-#: client/climisc.c:219
+#: client/climisc.c:220
msgid "?embassy:With Us"
msgstr "?embassy:bei uns"
-#: client/climisc.c:222
+#: client/climisc.c:223
msgid "?embassy:Contact"
msgstr "?embassy:Kontakt"
-#: client/climisc.c:224
+#: client/climisc.c:225
msgid "?embassy:No Contact"
msgstr "Kein Kontakt"
-#: client/climisc.c:236
+#: client/climisc.c:237
msgid "?vision:Both"
msgstr "?vision:beide"
-#: client/climisc.c:238
+#: client/climisc.c:239
msgid "?vision:To Them"
msgstr "?vision:sie"
-#: client/climisc.c:241
+#: client/climisc.c:242
msgid "?vision:To Us"
msgstr "?vision:wir"
-#: client/climisc.c:257 client/climisc.c:264
+#: client/climisc.c:258 client/climisc.c:265
#, c-format
msgid "The %s give %s"
msgstr "Die %s geben %s"
-#: client/climisc.c:268
+#: client/climisc.c:269
#, c-format
msgid "The %s give unknown city."
msgstr "Die %s geben eine unbekannte Stadt."
-#: client/climisc.c:273
+#: client/climisc.c:274
#, c-format
msgid "The %s give %d gold"
msgstr "Die %s geben %d Goldstücke"
-#: client/climisc.c:278
+#: client/climisc.c:279
#, c-format
msgid "The %s give their worldmap"
msgstr "Die %s geben ihre Weltkarte"
-#: client/climisc.c:282
+#: client/climisc.c:283
#, c-format
msgid "The %s give their seamap"
msgstr "Die %s geben ihre Seekarte"
-#: client/climisc.c:286
+#: client/climisc.c:287
msgid "The parties agree on a cease-fire"
msgstr "Die Verhandlungspartner vereinbaren eine Feuerpause"
-#: client/climisc.c:289
+#: client/climisc.c:290
msgid "The parties agree on a peace"
msgstr "Die Verhandlungspartner vereinbaren Frieden"
-#: client/climisc.c:292
+#: client/climisc.c:293
msgid "The parties create an alliance"
msgstr "Die Verhandlungspartner schließen eine Allianz"
-#: client/climisc.c:295
+#: client/climisc.c:296
#, c-format
msgid "The %s give shared vision"
msgstr "Die %s erlauben uns ihre Karte einzusehen"
-#: client/climisc.c:299
+#: client/climisc.c:300
#, c-format
msgid "The %s give an embassy"
msgstr "Die %s gestatten, eine Botschaft zu eröffnen"
-#: client/climisc.c:902
+#: client/climisc.c:906
msgid "Popup Request"
msgstr "Sondermeldung"
-#: client/climisc.c:932
+#: client/climisc.c:936
msgid "Exporting output window to civgame.log ..."
msgstr "Speichere Textfenster in 'civgame.log'..."
-#: client/climisc.c:936
+#: client/climisc.c:940
msgid "Export complete."
msgstr "Fertig."
-#: client/climisc.c:938
+#: client/climisc.c:942
msgid "Export failed, couldn't write to file."
msgstr "NICHT GESPEICHERT: Datei konnte nicht geschrieben werden."
-#: client/climisc.c:1038
+#: client/climisc.c:1042
#, c-format
msgid "You don't buy %s in %s!"
msgstr "%s kann in %s nicht gekauft werden!"
-#: client/climisc.c:1056
+#: client/climisc.c:1060
#, c-format
msgid "%s costs %d gold and you only have %d gold."
msgstr "%s kosten %d Goldstücke. Vorhanden sind nur %d Goldstücke."
@@ -8137,19 +8134,19 @@ msgstr ""
"Versuche als '%3$s' bis zu %5$dmal alle %4$f Sekunden eine Verbindung zu "
"Server '%1$s' an Port %2$d herzustellen..."
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1289
+#: client/connectdlg_common.c:79 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:1289
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1358
msgid "easy"
msgstr "Leicht"
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1290
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
msgid "normal"
msgstr "Normal"
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1290
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
msgid "hard"
msgstr "Fortgeschritten"
@@ -8178,38 +8175,43 @@ msgid "We probably couldn't start it from here."
msgstr "Kann vermutlich nicht hier gestartet werden."
#: client/connectdlg_common.c:470
-msgid "We have control of the server (command access level hack)"
-msgstr "Wir kontrollieren den Server (Zugriffsberechtigung 'hack')"
+msgid ""
+"Established control over the server. You have command access level 'hack'."
+msgstr "Wir kontrollieren den Server (Zugriffsberechtigung 'hack')."
#: client/connectdlg_common.c:475
-msgid "We can't take control of server, attempting to kill it."
-msgstr "Kann Server nicht kontrollieren, versuche zu beenden."
+msgid ""
+"Failed to obtain the required access level to take control of the server. "
+"The server will now be shutdown."
+msgstr ""
+"Konnte keinen ausreichenden Kommandolevel für den Zugriff auf den Server "
+"erhalten. Der Server wird jetzt beendet."
-#: client/control.c:1104
+#: client/control.c:1123
msgid "Only transporter units can be unloaded."
msgstr "Nur Schiffe können entladen werden."
-#: client/control.c:1353
+#: client/control.c:1425
msgid "Only settler units can be put into auto mode."
msgstr "Nur Siedler können automatisch agieren."
-#: client/control.c:1444
+#: client/control.c:1516
msgid "Only nuclear units can do this."
msgstr "Das können nur Nuklear-Einheiten."
-#: client/control.c:1473
+#: client/control.c:1545
msgid "Only paratrooper units can do this."
msgstr "Das können nur Fallschirmspringer."
-#: client/control.c:1921
+#: client/control.c:2020
msgid "Too far for this unit."
msgstr "Zu weit für diese Einheit."
-#: client/control.c:2131 client/control.c:2161 client/control.c:2177
+#: client/control.c:2230 client/control.c:2260 client/control.c:2276
msgid "Didn't find a route to the destination!"
msgstr "Es gibt keinen Weg zu diesem Ziel!"
-#: client/control.c:2221
+#: client/control.c:2320
msgid "Oh my! You seem to have no capital!"
msgstr "Oh je! Es scheint keine Hauptstadt zu geben!"
@@ -8279,16 +8281,16 @@ msgid "Allows %s (with %s)."
msgstr "Ermöglicht %s (mit %s)."
#. TRANS: preserve single space at beginning
-#: client/helpdata.c:418
+#: client/helpdata.c:416
msgid " Rivers"
msgstr " Flüsse"
-#: client/helpdata.c:576
+#: client/helpdata.c:574
#, c-format
msgid "Sorry, no help topic for %s.\n"
msgstr "Zum Thema %s ist leider keine Hilfe verfügbar.\n"
-#: client/helpdata.c:580
+#: client/helpdata.c:578
#, c-format
msgid ""
"Sorry, no help topic for %s.\n"
@@ -8299,7 +8301,7 @@ msgstr ""
"Diese Meldung wurde automatisch erzeugt.\n"
"\n"
-#: client/helpdata.c:670
+#: client/helpdata.c:668
msgid ""
"Requires: Nothing\n"
"\n"
@@ -8307,79 +8309,79 @@ msgstr ""
"Erfordert: nichts\n"
"\n"
-#: client/helpdata.c:675
+#: client/helpdata.c:673
#, c-format
msgid "* The discovery of %s will make %s obsolete.\n"
msgstr "* Die Entdeckung von %s wird %s überflüssig machen.\n"
-#: client/helpdata.c:694
+#: client/helpdata.c:692
#, c-format
msgid "* Allows all players with knowledge of %s to build %s units.\n"
msgstr "* Ermöglicht allen Spielern mit Kenntnis von %s den Bau von %s.\n"
-#: client/helpdata.c:706
+#: client/helpdata.c:704
#, c-format
msgid "* Allows %s (with %s).\n"
msgstr "* Ermöglicht %s (mit %s).\n"
-#: client/helpdata.c:710
+#: client/helpdata.c:708
#, c-format
msgid "* Allows %s.\n"
msgstr "* Ermöglicht %s.\n"
-#: client/helpdata.c:780
+#: client/helpdata.c:778
#, c-format
msgid "* Can only be built if there is %s in the city.\n"
msgstr "* Kann nur gebaut werden, wenn %s in der Stadt vorhanden ist.\n"
-#: client/helpdata.c:786
+#: client/helpdata.c:784
#, c-format
msgid "* Can only be built with %s as government.\n"
msgstr "* Kann nur gebaut werden, wenn die Regierungsform %s ist.\n"
-#: client/helpdata.c:791
+#: client/helpdata.c:789
msgid "* May not be built in cities.\n"
msgstr "* Kann nicht in Städten gebaut werden.\n"
-#: client/helpdata.c:794
+#: client/helpdata.c:792
msgid "* Never has a home city.\n"
msgstr "* hat niemals eine Heimatstadt.\n"
-#: client/helpdata.c:797
+#: client/helpdata.c:795
msgid "* Losing this unit will lose you the game!\n"
msgstr "* Der Verlust dieser Einheit bedeutet den Verlust des Spieles!\n"
-#: client/helpdata.c:801
+#: client/helpdata.c:799
msgid "* Each player may only have one of this type of unit.\n"
msgstr "* Jeder Spieler kann nur eine Einheit dieses Typs besitzen.\n"
-#: client/helpdata.c:805
+#: client/helpdata.c:803
#, c-format
msgid "* Requires %d population to build.\n"
msgstr "* Benötigt %d Bürger zur Herstellung.\n"
-#: client/helpdata.c:811
+#: client/helpdata.c:809
#, c-format
msgid "* Can carry and refuel %d air unit.\n"
msgid_plural "* Can carry and refuel %d air units.\n"
msgstr[0] "* Kann %d Lufteinheit transportieren und betanken.\n"
msgstr[1] "* Kann %d Lufteinheiten transportieren und betanken.\n"
-#: client/helpdata.c:816
+#: client/helpdata.c:814
#, c-format
msgid "* Can carry and refuel %d missile unit.\n"
msgid_plural "* Can carry and refuel %d missile units.\n"
msgstr[0] "* Kann %d Raketeneinheit transportieren und betanken.\n"
msgstr[1] "* Kann %d Raketeneinheiten transportieren und betanken.\n"
-#: client/helpdata.c:821
+#: client/helpdata.c:819
#, c-format
msgid "* Can carry %d ground unit across water.\n"
msgid_plural "* Can carry %d ground units across water.\n"
msgstr[0] "* Kann 1 Bodeneinheit transportieren.\n"
msgstr[1] "* Kann %d Bodeneinheiten transportieren.\n"
-#: client/helpdata.c:830
+#: client/helpdata.c:828
msgid ""
"* Can establish trade routes (must travel to target city and must be at "
"least 9 tiles [in Manhattan distance] from this unit's home city).\n"
@@ -8388,131 +8390,131 @@ msgstr ""
"mindestens 9 Felder (in rechtwinkliger Entfernung) von seiner Heimatstadt "
"entfernt ist.\n"
-#: client/helpdata.c:836
+#: client/helpdata.c:834
#, c-format
msgid "* Can help build wonders (adds %d production).\n"
msgstr "* Kann beim Bau von Weltwundern helfen (liefert %d Schilder).\n"
-#: client/helpdata.c:840
+#: client/helpdata.c:838
msgid "* May not be disbanded.\n"
msgstr "* Kann nicht aufgelöst werden.\n"
-#: client/helpdata.c:842
+#: client/helpdata.c:840
#, c-format
msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
msgstr ""
"* Kann in einer Stadt aufgelöst werden, um die Hälfte der Produktionskosten "
"zu erhalten.\n"
-#: client/helpdata.c:846
+#: client/helpdata.c:844
msgid "* Can build new cities.\n"
msgstr "* Kann neue Städte gründen.\n"
-#: client/helpdata.c:849
+#: client/helpdata.c:847
#, c-format
msgid "* Can add on %d population to cities of no more than size %d.\n"
msgstr ""
"* Kann einer Stadt %d Bürger hinzufügen, wenn die Stadtgröße %d nicht "
"überschreitet.\n"
-#: client/helpdata.c:858
+#: client/helpdata.c:856
msgid "* Can build roads and railroads.\n"
msgstr "* Kann Straßen und Eisenbahnen bauen.\n"
-#: client/helpdata.c:859
+#: client/helpdata.c:857
msgid "* Can build mines on tiles.\n"
msgstr "* Kann Bergwerke errichten.\n"
-#: client/helpdata.c:860
+#: client/helpdata.c:858
msgid "* Can build irrigation on tiles.\n"
msgstr "* Kann Bewässerung anlegen.\n"
-#: client/helpdata.c:865
+#: client/helpdata.c:863
msgid "* Can build farmland.\n"
msgstr "* Kann Ackerland erzeugen.\n"
-#: client/helpdata.c:869
+#: client/helpdata.c:867
#, c-format
msgid "* Can build farmland (if %s is known).\n"
msgstr "* Kann Ackerland erzeugen (falls %s bekannt).\n"
-#: client/helpdata.c:873
+#: client/helpdata.c:871
#, c-format
msgid "* Can build farmland (if any of the following are known: %s).\n"
msgstr ""
"* Kann Ackerland erzeugen (wenn eine der folgenden Technologien bekannt ist: "
"%s).\n"
-#: client/helpdata.c:881
+#: client/helpdata.c:879
msgid "* Can build fortresses.\n"
msgstr "* Kann befestigte Stellungen bauen.\n"
-#: client/helpdata.c:885
+#: client/helpdata.c:883
#, c-format
msgid "* Can build fortresses (if %s is known).\n"
msgstr "* Kann Festungen errichten (falls %s bekannt).\n"
-#: client/helpdata.c:889
+#: client/helpdata.c:887
#, c-format
msgid "* Can build fortresses (if any of the following are known: %s).\n"
msgstr "* Kann Festungen errichten (falls eines von %s bekannt).\n"
-#: client/helpdata.c:895
+#: client/helpdata.c:893
msgid "* Can clean pollution from tiles.\n"
msgstr "* Kann Umweltverschmutzung beseitigen.\n"
-#: client/helpdata.c:896
+#: client/helpdata.c:894
msgid "* Can clean nuclear fallout from tiles.\n"
msgstr "* Kann nuklearen Fallout beseitigen.\n"
-#: client/helpdata.c:899
+#: client/helpdata.c:897
msgid "* Can transform tiles.\n"
msgstr "* Kann Geländeveränderungen ausführen.\n"
-#: client/helpdata.c:902
+#: client/helpdata.c:900
msgid "* Can build airbases.\n"
msgstr "* Kann Fliegerhorste errichten.\n"
-#: client/helpdata.c:906
+#: client/helpdata.c:904
#, c-format
msgid "* May fortify, granting a 50%% defensive bonus.\n"
msgstr "* Kann sich eingraben, ergibt 50%% Verteidigungsbonus.\n"
-#: client/helpdata.c:909
+#: client/helpdata.c:907
msgid "* May pillage to destroy infrastructure from tiles.\n"
msgstr "* Kann brandschatzen, um Infrastruktur zu zerstören.\n"
-#: client/helpdata.c:913
+#: client/helpdata.c:911
msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
msgstr "* Kann sowohl diplomatische als auch Spionagetätigkeiten erledigen.\n"
-#: client/helpdata.c:916
+#: client/helpdata.c:914
msgid "* Can perform diplomatic actions.\n"
msgstr "* Kann diplomatische Tätigkeiten erledigen.\n"
-#: client/helpdata.c:920
+#: client/helpdata.c:918
msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
msgstr "* Gewinnt jeden Kampf gegen einen Diplomaten.\n"
-#: client/helpdata.c:923
+#: client/helpdata.c:921
msgid "* May not be bribed.\n"
msgstr "* Ist unbestechlich.\n"
-#: client/helpdata.c:926
+#: client/helpdata.c:924
msgid "* Can attack enemy air units.\n"
msgstr "* Kann feindliche Lufteinheiten angreifen.\n"
-#: client/helpdata.c:930
+#: client/helpdata.c:928
msgid "* Is invisible except when next to an enemy unit or city.\n"
msgstr ""
"* Unsichtbar, falls nicht direkt neben einer Feindeinheit oder Stadt.\n"
-#: client/helpdata.c:934
+#: client/helpdata.c:932
msgid "* Can only attack units on ocean squares (no land attacks).\n"
msgstr ""
"* Kann nur Einheiten auf Ozeanfeldern angreifen (keine Landangriffe).\n"
-#: client/helpdata.c:938
+#: client/helpdata.c:936
msgid ""
"* Can attack from aboard sea units: against enemy cities and onto land "
"squares.\n"
@@ -8520,40 +8522,40 @@ msgstr ""
"* Kann gegnerische Städte und Landfelder von Marine-Einheiten aus "
"angreifen.\n"
-#: client/helpdata.c:943
+#: client/helpdata.c:941
#, c-format
msgid "* Can be paradropped from a friendly city (Range: %d).\n"
msgstr "* Kann von einer befreundeten Stadt aus abspringen (Reichweite: %d).\n"
-#: client/helpdata.c:949
+#: client/helpdata.c:947
msgid "* Gets double defense against units specified as 'mounted'.\n"
msgstr "* 2fache Verteidigung gegen 'berittene' Einheiten.\n"
-#: client/helpdata.c:953
+#: client/helpdata.c:951
msgid "* Counts as 'mounted' against certain defenders.\n"
msgstr "* Wird als 'beritten' gewertet.\n"
-#: client/helpdata.c:957
+#: client/helpdata.c:955
msgid "* A missile unit: gets used up in making an attack.\n"
msgstr "* Raketeneinheiten zerstören sich beim Angriff.\n"
-#: client/helpdata.c:960
+#: client/helpdata.c:958
msgid "* Making an attack ends this unit's turn.\n"
msgstr "* Ein Angriff beendet die Runde für diese Einheit.\n"
-#: client/helpdata.c:964
+#: client/helpdata.c:962
msgid "* This unit's attack causes a nuclear explosion!\n"
msgstr "* Die Attacke dieser Einheit bewirkt eine nukleare Explosion!\n"
-#: client/helpdata.c:968
+#: client/helpdata.c:966
msgid "* Gets double firepower when attacking cities.\n"
msgstr "* Hat doppelte Feuerkraft beim Angriff auf Städte.\n"
-#: client/helpdata.c:971
+#: client/helpdata.c:969
msgid "* Ignores the effects of city walls.\n"
msgstr "* Ignoriert den Effekt von Stadtmauern.\n"
-#: client/helpdata.c:975
+#: client/helpdata.c:973
#, c-format
msgid ""
"* Does bombard attacks (%d per turn). These attacks will only damage (never "
@@ -8563,48 +8565,48 @@ msgstr ""
"Verteidiger nur beschädigen, nicht töten, sind aber ohne Risiko für den "
"Angreifer.\n"
-#: client/helpdata.c:982
+#: client/helpdata.c:980
msgid "* Gets quintuple defense against missiles and aircraft.\n"
msgstr "* 5fache Verteidigung gegen Raketen und Lufteinheiten.\n"
-#: client/helpdata.c:986
+#: client/helpdata.c:984
msgid "* Ignores terrain effects (treats all squares as roads).\n"
msgstr "* Ignoriert das Gelände (behandelt alle Felder wie Straßen).\n"
-#: client/helpdata.c:989
+#: client/helpdata.c:987
msgid "* Ignores zones of control.\n"
msgstr "* Ignoriert Kontrollzonen.\n"
-#: client/helpdata.c:993
+#: client/helpdata.c:991
msgid "* A non-military unit (cannot attack; no martial law).\n"
msgstr "* Nicht-militärische Einheit (Kein Angriff; kein Kriegsrecht).\n"
# CK: 'field unit' refers to bombers and rocketry inside of cities
-#: client/helpdata.c:997
+#: client/helpdata.c:995
msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
msgstr "* Luftangriffseinheit: min. +1 Unzufriedener in einer Demokratie.\n"
-#: client/helpdata.c:1000
+#: client/helpdata.c:998
msgid "* Will never achieve veteran status.\n"
msgstr "* Kann keinen Veteranenstatus erhalten.\n"
-#: client/helpdata.c:1002
+#: client/helpdata.c:1000
msgid "* May become veteran through training or combat.\n"
msgstr "* Kann durch Training oder Kampf zum Veteran werden.\n"
-#: client/helpdata.c:1008
+#: client/helpdata.c:1006
#, c-format
msgid ""
"* Must end turn in a city or next to land, or has a 50%% risk of being lost "
"at sea.\n"
msgstr "* 50%% Verlustrisiko, falls am Rundenende auf hoher See.\n"
-#: client/helpdata.c:1012
+#: client/helpdata.c:1010
#, c-format
msgid "* The discovery of %s reduces the risk to 25%%.\n"
msgstr "* Die Entdeckung von %s reduziert das Risiko auf 25%%.\n"
-#: client/helpdata.c:1017
+#: client/helpdata.c:1015
#, c-format
msgid "* %s reduces the risk to 12%%.\n"
msgstr "* %s reduziert das Risiko auf 12%%.\n"
@@ -8613,15 +8615,15 @@ msgstr "* %s reduziert das Risiko auf 12%%.\n"
#. * last two elements
#. TRANS: List of possible output types has this between
#. * last two elements
-#: client/helpdata.c:1068 client/helpdata.c:1402
+#: client/helpdata.c:1066 client/helpdata.c:1400
msgid " or "
msgstr " oder "
-#: client/helpdata.c:1070 client/helpdata.c:1390
+#: client/helpdata.c:1068 client/helpdata.c:1388
msgid "?or:, "
msgstr "?or:, "
-#: client/helpdata.c:1082
+#: 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"
@@ -8630,12 +8632,12 @@ msgstr[0] ""
msgstr[1] ""
"* Einheit muß nach %2$d Runden in einer Stadt oder auf einem %1$s sein.\n"
-#: client/helpdata.c:1124
+#: client/helpdata.c:1122
#, 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:1129
+#: client/helpdata.c:1127
#, c-format
msgid ""
"To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8644,94 +8646,94 @@ msgstr ""
"Die Erforschung von %s erfordert zunächst den Abschluß von %d anderen "
"Forschungsprojekten. Insgesamt werden %d Punkte benötigt."
-#: client/helpdata.c:1137
+#: client/helpdata.c:1135
msgid "You cannot research this technology."
msgstr "Sie können diese Technologie nicht erforschen."
-#: client/helpdata.c:1141
+#: client/helpdata.c:1139
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:1153
+#: client/helpdata.c:1151
#, 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:1158
+#: client/helpdata.c:1156
#, 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:1161
+#: client/helpdata.c:1159
#, 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:1165
+#: client/helpdata.c:1163
msgid "* Increases the pollution generated by the population.\n"
msgstr ""
"* Vergrößert die durch die Bevölkerung verursachte Umweltverschmutzung\n"
-#: client/helpdata.c:1170
+#: client/helpdata.c:1168
#, 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:1177
+#: client/helpdata.c:1175
#, c-format
msgid "* Allows %s to build fortresses.\n"
msgstr "* %s mit diesem Wissen können befestigte Stellungen bauen.\n"
-#: client/helpdata.c:1185
+#: client/helpdata.c:1183
#, c-format
msgid "* Allows %s to build airbases.\n"
msgstr "* %s mit diesem Wissen können Fliegerhorste bauen.\n"
-#: client/helpdata.c:1194
+#: client/helpdata.c:1192
#, 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:1202
+#: client/helpdata.c:1200
#, 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:1236
+#: client/helpdata.c:1234
msgid "* Pollution cannot be generated on this terrain."
msgstr "* Auf diesem Geländetyp gibt es keine Umweltverschmutzung."
-#: client/helpdata.c:1241
+#: client/helpdata.c:1239
msgid "* You cannot build cities on this terrain."
msgstr "* Auf diesem Gelände können keine Städte gegründet werden."
-#: client/helpdata.c:1247
+#: client/helpdata.c:1245
msgid "* The coastline of this terrain is unsafe."
msgstr "* Die Küstenlinie dieses Geländetyps ist unsicher."
-#: client/helpdata.c:1252
+#: client/helpdata.c:1250
msgid "* This terrain is unsafe for units to travel on."
msgstr "* Bewegung auf diesem Geländetyp ist unsicher."
-#: client/helpdata.c:1257
+#: client/helpdata.c:1255
msgid "* Land units cannot travel on oceanic terrains."
msgstr "* Landeinheiten können sich nicht auf dem Ozean bewegen."
-#: client/helpdata.c:1307
+#: client/helpdata.c:1305
msgid "Features:\n"
msgstr "Besonderheiten:\n"
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1413 client/helpdata.c:1414
+#: client/helpdata.c:1411 client/helpdata.c:1412
msgid "?outputlist: Nothing "
msgstr "Nichts"
# CK: field units refer to bombers and rocketry inside of cities
-#: client/helpdata.c:1421
+#: client/helpdata.c:1419
#, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
@@ -8746,7 +8748,7 @@ msgstr[1] ""
"* Kampfeinheiten im Einsatz und Luftangriffseinheiten machen %d Bürger "
"unzufrieden.\n"
-#: client/helpdata.c:1431
+#: client/helpdata.c:1429
#, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8756,48 +8758,48 @@ msgstr ""
"Bürger.\n"
#. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1439
+#: client/helpdata.c:1437
#, 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:1444
+#: client/helpdata.c:1442
#, 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:1449
+#: client/helpdata.c:1447
#, 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:1453
+#: client/helpdata.c:1451
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:1462
+#: client/helpdata.c:1460
#, 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:1470
+#: client/helpdata.c:1468
#, 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:1477
+#: client/helpdata.c:1475
#, 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:1484
+#: client/helpdata.c:1482
#, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -8807,7 +8809,7 @@ msgstr ""
"%d Städten.\n"
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1491
+#: client/helpdata.c:1489
#, c-format
msgid ""
"* After the first unhappy citizen due to city size, for each %d additional "
@@ -8816,16 +8818,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:1499
+#: client/helpdata.c:1497
#, 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:1504
+#: client/helpdata.c:1502
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:1509
+#: client/helpdata.c:1507
#, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
@@ -8840,7 +8842,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:1521
+#: client/helpdata.c:1519
#, 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"
@@ -8849,7 +8851,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:1532
+#: client/helpdata.c:1530
#, c-format
msgid ""
"* You may grow your cities by means of celebrations. Your cities must be at "
@@ -8858,15 +8860,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:1538
+#: client/helpdata.c:1536
msgid "* Your units cannot be bribed.\n"
msgstr "* Deine Einheiten sind unbestechlich.\n"
-#: client/helpdata.c:1541
+#: client/helpdata.c:1539
msgid "* Your cities cannot be incited.\n"
msgstr "* In deinen Städten kann es keine Revolte geben.\n"
-#: client/helpdata.c:1545
+#: client/helpdata.c:1543
msgid ""
"* Government will fall into anarchy if any city is in disorder for more than "
"two turns in a row.\n"
@@ -8874,15 +8876,15 @@ msgstr ""
"* Die Regierung fällt in Anarchie, wenn irgendeine Stadt sich mehr als zwei "
"Runden nacheinander in Aufruhr befindet.\n"
-#: client/helpdata.c:1551
+#: client/helpdata.c:1549
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:1555
+#: client/helpdata.c:1553
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:1559
+#: client/helpdata.c:1557
msgid ""
"* Buildings that normally confer bonuses against unhappiness will instead "
"give gold.\n"
@@ -8890,25 +8892,25 @@ msgstr ""
"* Stadterweiterungen, die normalerweise die Zahl der unzufriedenen Bürger "
"verringern, liefern stattdessen Goldstücke.\n"
-#: client/helpdata.c:1563
+#: client/helpdata.c:1561
msgid "* Pays no upkeep for fanatics.\n"
msgstr "* Fanatiker benötigen keinen Unterhalt.\n"
-#: client/helpdata.c:1566
+#: client/helpdata.c:1564
msgid "* Has no unhappy citizens.\n"
msgstr "* Es gibt keine unzufriedenen Bürger.\n"
-#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
+#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
#, c-format
msgid "* Veteran %s units.\n"
msgstr "* %s sind Veteranen.\n"
-#: client/helpdata.c:1587
+#: client/helpdata.c:1585
msgid "* Veteran units.\n"
msgstr "* Veteranen.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1593
+#: client/helpdata.c:1591
#, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8918,7 +8920,7 @@ msgstr ""
"von 1, wenn die Stadt nicht feiert.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1602
+#: client/helpdata.c:1600
#, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8928,145 +8930,147 @@ msgstr ""
"wenn die Stadt feiert.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1610
+#: client/helpdata.c:1608
#, 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:1619
+#: client/helpdata.c:1617
#, 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:1627
+#: client/helpdata.c:1625
#, c-format
msgid "* %s production will suffer massive waste.\n"
-msgstr "* Der Ertrag von %s verursacht große Mengen Müll.\n"
+msgstr "* Die Produktion von %s leidet unter großer Verschwendung.\n"
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1632
+#: client/helpdata.c:1630
#, c-format
msgid "* %s production will suffer some waste.\n"
-msgstr "* Der Ertrag von %s verursacht einigen Müll.\n"
+msgstr "* Die Produktion von %s leidet unter Verschwendung.\n"
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1637
+#: client/helpdata.c:1635
#, c-format
msgid "* %s production will suffer a small amount of waste.\n"
-msgstr "* Der Ertrag von %s verursacht geringe Mengen von Müll.\n"
+msgstr "* Die Produktion von %s leidet unter einer geringen Verschwendung.\n"
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1645
+#: client/helpdata.c:1643
#, c-format
msgid "* %s waste will increase quickly with distance from capital.\n"
-msgstr "* %s-Müll nimmt mit der Entfernung von der Hauptstadt schnell zu.\n"
+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:1651
+#: client/helpdata.c:1649
#, c-format
msgid "* %s waste will increase with distance from capital.\n"
-msgstr "* %s-Müll nimmt mit der Entfernung von der Hauptstadt zu.\n"
+msgstr "* %s-Verschwendung nimmt mit der Entfernung von der Hauptstadt zu.\n"
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1657
+#: client/helpdata.c:1655
#, c-format
msgid "* %s waste will increase slowly with distance from capital.\n"
-msgstr "* %s-Müll nimmt mit der Entfernung von der Hauptstadt langsam zu.\n"
+msgstr ""
+"* %s-Verschwendung nimmt mit der Entfernung von der Hauptstadt langsam zu.\n"
-#: client/helpdata.c:1674
+#: client/helpdata.c:1672
#, 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:1701
+#: client/helpdata.c:1699
#, c-format
msgid "%s%d %s"
msgstr "%s%d %s"
-#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1700 client/helpdata.c:1708 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:1709
+#: client/helpdata.c:1707
#, c-format
msgid "%s%d unhappy"
msgstr "%s%d Unzufriedene(r)"
-#: client/mapctrl_common.c:382
+#: client/mapctrl_common.c:399
#, c-format
msgid "You don't know how to build %s!"
msgstr "Sie können keine %s bauen!"
-#: client/mapctrl_common.c:392
+#: client/mapctrl_common.c:409
#, c-format
msgid "Copy %s to clipboard."
msgstr "Kopiere %s in die Zwischenablage."
-#: client/mapctrl_common.c:408
+#: client/mapctrl_common.c:425
msgid "Clipboard is empty."
msgstr "Zwischenablage ist leer."
-#: client/options.c:98
+#: client/options.c:102
msgid "Graphics"
msgstr "Grafik"
-#: client/options.c:99
+#: client/options.c:103
msgid "Overview"
msgstr "Ãœbersicht"
-#: client/options.c:100
+#: client/options.c:104
msgid "Sound"
msgstr "Sound"
-#: client/options.c:101
+#: client/options.c:105
msgid "Interface"
msgstr "Bedienung"
-#: client/options.c:102
+#: client/options.c:106
msgid "Network"
msgstr "Netzwerk"
-#: client/options.c:107
+#: client/options.c:111
msgid "Login name"
msgstr "Login-Name"
-#: client/options.c:108
+#: client/options.c:112
msgid ""
"This is the default login username that will be used in the connection "
"dialogs or with the -a command-line parameter."
msgstr "Dies ist der Standard-Benutzername, der für Verbindungen genutzt wird."
-#: client/options.c:113
+#: client/options.c:117
msgid "Server"
msgstr "Server"
-#: client/options.c:114
+#: client/options.c:118
msgid ""
"This is the default server hostname that will be used in the connection "
"dialogs or with the -a command-line parameter."
msgstr "Dies ist der Standard-Servername, der für Verbindungen genutzt wird."
-#: client/options.c:119
+#: client/options.c:123
msgid "Server port"
msgstr "Server-Port"
-#: client/options.c:120
+#: client/options.c:124
msgid ""
"This is the default server port that will be used in the connection dialogs "
"or with the -a command-line parameter."
msgstr "Dies ist der Standard-Serverport, der für Verbindungen genutzt wird."
-#: client/options.c:125 client/gui-win32/connectdlg.c:912 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
msgid "Metaserver"
msgstr "Metaserver"
-#: client/options.c:126
+#: client/options.c:130
msgid ""
"The metaserver is a host that the client contacts to find out about games on "
"the internet. Don't change this from its default value unless you know what "
@@ -9076,11 +9080,11 @@ msgstr ""
"können, die gerade im Internet laufen. Ändern Sie diesen Eintrag nicht, es "
"sei denn, Sie wissen, was Sie tun."
-#: client/options.c:132
+#: client/options.c:136
msgid "Soundset"
msgstr "Klangset"
-#: client/options.c:133
+#: client/options.c:137
msgid ""
"This is the soundset that will be used. Changing this is the same as using "
"the -S command-line parameter."
@@ -9088,11 +9092,11 @@ msgstr ""
"Das verwendete Klangset. Kann auch über den Kommandozeilenparameter -S "
"gesetzt werden."
-#: client/options.c:138
+#: client/options.c:142
msgid "Sound plugin"
msgstr "Sound-Plugin"
-#: client/options.c:139
+#: client/options.c:143
msgid ""
"If you have a problem with sound, try changing the sound plugin. The new "
"plugin won't take effect until you restart Freeciv. Changing this is the "
@@ -9102,19 +9106,19 @@ msgstr ""
"ändern. Danach müssen Sie Freeciv neu starten. Sie können auch den "
"Kommandozeilenparameter -P verwenden."
-#: client/options.c:144 client/gui-sdl/gui_main.c:162
+#: client/options.c:148 client/gui-sdl/gui_main.c:162
msgid "Theme"
msgstr "Thema"
-#: client/options.c:145
+#: client/options.c:149
msgid "By changing this option you change the active theme."
msgstr "Hiermit kann das aktive Thema geändert werden."
-#: client/options.c:148
+#: client/options.c:152
msgid "Tileset"
msgstr "Geländegrafik"
-#: client/options.c:149
+#: client/options.c:153
msgid ""
"By changing this option you change the active tileset. This is the same as "
"using the -t command-line parameter."
@@ -9122,11 +9126,11 @@ msgstr ""
"Die verwendete Feldergrafik. Kann auch über den Kommandozeilenparameter -t "
"gesetzt werden."
-#: client/options.c:156
+#: client/options.c:160
msgid "Solid unit background color"
msgstr "Einheiten haben undurchsichtige Hintergrundfarbe"
-#: client/options.c:157
+#: client/options.c:161
msgid ""
"Setting this option will cause units on the map view to be drawn with a "
"solid background color instead of the flag backdrop."
@@ -9134,11 +9138,11 @@ msgstr ""
"Hiermit erhalten die auf der Karte dargestellten Einheiten einen einfarbigen "
"Hintergrund, anstelle der Flagge als Hintergrund."
-#: client/options.c:161 client/gui-sdl/optiondlg.c:960
+#: client/options.c:165 client/gui-sdl/optiondlg.c:960
msgid "Sound bell at new turn"
msgstr "Akustisches Zeichen zu Beginn einer neuen Runde"
-#: client/options.c:162
+#: client/options.c:166
msgid ""
"Set this option to have a \"bell\" event be generated at the start of a new "
"turn. You can control the behavior of the \"bell\" event by editing the "
@@ -9147,11 +9151,11 @@ msgstr ""
"Hiermit erhalten Sie ein Glockensignal zu Beginn einer neuen Runde. "
"Einzelheiten können Sie in den Nachrichtenoptionen einstellen."
-#: client/options.c:168
+#: client/options.c:172
msgid "Unit movement animation time (milliseconds)"
msgstr "Zeitdauer für Animation der Einheiten (Millisekunden)"
-#: client/options.c:169
+#: client/options.c:173
msgid ""
"This option controls how long unit \"animation\" takes when a unit moves on "
"the map view. Set it to 0 to disable animation entirely."
@@ -9159,11 +9163,11 @@ msgstr ""
"Hier stellen Sie ein, wie lange die Einheiten-Animation dauert, wenn "
"Einheiten auf der Karte bewegt werden. Mit 0 schalten Sie die Animation ab."
-#: client/options.c:174
+#: client/options.c:178
msgid "Mapview recentering time (milliseconds)"
msgstr "Zeitdauer für Zentrieren der Karte (Millisekunden)"
-#: client/options.c:175
+#: client/options.c:179
msgid ""
"When the map view is recentered, it will slide smoothly over the map to its "
"new position. This option controls how long this slide lasts. Set it to 0 "
@@ -9172,21 +9176,21 @@ msgstr ""
"Wenn die Karte zentriert wird, gleitet sie sanft in die neue Position. Sie "
"können die Zeitdauer einstellen. Mit 0 wird das Gleiten abgeschaltet."
-#: client/options.c:180 client/gui-sdl/optiondlg.c:1014
+#: client/options.c:184 client/gui-sdl/optiondlg.c:1014
msgid "Show combat animation"
msgstr "Kampfanimationen zeigen"
-#: client/options.c:181
+#: client/options.c:185
msgid ""
"Disabling this option will turn off combat animation between units on the "
"mapview."
msgstr "Hiermit können Sie die Kampfanimation von Einheiten einschalten."
-#: client/options.c:184
+#: client/options.c:188
msgid "Draw the citybar"
msgstr "Größere Stadtanzeige"
-#: client/options.c:185
+#: client/options.c:189
msgid ""
"Setting this option will display a 'citybar' containing useful information "
"beneath each city. Disabling this option will display only the city's name "
@@ -9196,11 +9200,11 @@ msgstr ""
"angezeigt. Anderenfalls wird nur der Stadtname und optional die Produktion "
"angezeigt."
-#: client/options.c:191
+#: client/options.c:195
msgid "Show icons in the technology tree"
msgstr "Zeige Icons im Technologiebaum"
-#: client/options.c:192
+#: client/options.c:196
msgid ""
"Setting this option will display icons on the technology tree diagram. "
"Turning this option off makes the technology tree more compact."
@@ -9208,11 +9212,11 @@ msgstr ""
"Im Baumdiagramm für die Technologien werden Icons für jeden Fortschritt "
"eingezeichnet."
-#: client/options.c:197
+#: client/options.c:201
msgid "Draw shield graphics for units"
msgstr "Schildergrafik für Einheiten"
-#: client/options.c:198
+#: client/options.c:202
msgid ""
"Setting this option will draw a shield icon as the flags on units. If "
"unset, the full flag will be drawn."
@@ -9220,11 +9224,11 @@ msgstr ""
"Mit dieser Option wird eine spezielle Schild-Graphik für die Flagge "
"verwendet. Ohne die Option wird die ganze Flagge gezeichnet."
-#: client/options.c:202
+#: client/options.c:206
msgid "Manual Turn Done in AI Mode"
msgstr "Rundenende auch im KI-Modus manuell bestätigen"
-#: client/options.c:203
+#: client/options.c:207
msgid ""
"Disable this option if you do not want to press the Turn Done button "
"manually when watching an AI player."
@@ -9232,21 +9236,21 @@ msgstr ""
"Sie können einstellen, ob Sie bei Beobachtung eines KI-Spielers den "
"'Fertig!' Knopf am Rundenende betätigen müssen."
-#: client/options.c:207 client/gui-sdl/optiondlg.c:1121
+#: client/options.c:211 client/gui-sdl/optiondlg.c:1121
msgid "Auto Center on Units"
msgstr "Ansicht automatisch auf die aktive Einheit zentrieren"
-#: client/options.c:208
+#: client/options.c:212
msgid ""
"Set this option to have the active unit centered automatically when the unit "
"focus changes."
msgstr "Wenn die aktive Einheit wechselt, wird die Karte darauf zentriert."
-#: client/options.c:211 client/gui-sdl/optiondlg.c:1147
+#: client/options.c:215 client/gui-sdl/optiondlg.c:1147
msgid "Auto Center on Combat"
msgstr "Ansicht automatisch auf Kämpfe zentrieren"
-#: client/options.c:212
+#: client/options.c:216
msgid ""
"Set this option to have any combat be centered automatically. Disabled this "
"will speed up the time between turns but may cause you to miss combat "
@@ -9255,19 +9259,19 @@ msgstr ""
"Die Karte wird automatisch auf Kämpfe zentriert. Abschalten beschleunigt das "
"Spiel, aber kann dazu führen, daß Sie Kämpfe übersehen."
-#: client/options.c:217 client/gui-sdl/optiondlg.c:1174
+#: client/options.c:221 client/gui-sdl/optiondlg.c:1174
msgid "Focus on Awakened Units"
msgstr "Ansicht auf alarmierte Einheiten zentrieren"
-#: client/options.c:218
+#: client/options.c:222
msgid "Set this option to have newly awoken units be focused automatically."
msgstr "Neu aktivierte Einheiten werden automatisch auf der Karte zentriert."
-#: client/options.c:221
+#: client/options.c:225
msgid "Allow goto into the unknown"
msgstr "Erlauben, auch in unbekannte Gebiete zu gehen"
-#: client/options.c:222
+#: client/options.c:226
msgid ""
"Setting this option will make the game consider moving into unknown tiles. "
"If not, then goto routes will detour around or be blocked by unknown tiles."
@@ -9275,11 +9279,11 @@ msgstr ""
"Hiermit kann der Gehe-nach-Befehl Einheiten auch in unentdeckte Gebiete "
"führen. Anderenfalls werden unentdeckte Gebiete umgangen."
-#: client/options.c:226
+#: client/options.c:230
msgid "Center map when Popup city"
msgstr "Ansicht auf die Stadt im Stadtfenster zentrieren"
-#: client/options.c:227
+#: client/options.c:231
msgid ""
"Setting this option makes the mapview center on a city when its city dialog "
"is popped up."
@@ -9287,118 +9291,176 @@ msgstr ""
"Wenn ein Stadtfenster geöffnet wird, wird die Karte automatisch auf die "
"Stadt zentriert."
-#: client/options.c:230
+#: client/options.c:234
msgid "Concise City Production"
msgstr "Kurzdarstellung der Stadtproduktion"
-#: client/options.c:231
+#: client/options.c:235
msgid ""
"Set this option to make the city production (as shown in the city dialog) to "
"be more compact."
msgstr "Im Stadtfenster wird die Produktion kompakter dargestellt."
-#: client/options.c:234 client/gui-sdl/optiondlg.c:1252
+#: client/options.c:238 client/gui-sdl/optiondlg.c:1252
msgid "End Turn when done moving"
msgstr "Automatisches Rundenende"
-#: client/options.c:235
+#: client/options.c:239
msgid ""
"Setting this option makes your turn end automatically when all your units "
"are done moving."
msgstr "Hiermit endet dein Zug automatisch, wenn alle Einheiten gezogen haben."
-#: client/options.c:238 client/gui-sdl/optiondlg.c:1226
+#: client/options.c:242 client/gui-sdl/optiondlg.c:1226
msgid "Prompt for city names"
msgstr "Nach Stadtnamen fragen"
-#: client/options.c:239
+#: client/options.c:243
msgid ""
"Disabling this option will make the names of newly founded cities chosen "
"automatically by the server."
msgstr "Sie können bei der Stadtgründung den Stadtnamen auswählen."
-#: client/options.c:242 client/gui-sdl/optiondlg.c:1200
+#: client/options.c:246 client/gui-sdl/optiondlg.c:1200
msgid "Pop up city dialog for new cities"
msgstr "Stadtfenster bei Stadtgründung öffnen"
-#: client/options.c:243
+#: client/options.c:247
msgid ""
"Setting this option will pop up a newly-founded city's city dialog "
"automatically."
msgstr "Bei einer Stadtgründung wird das Stadtfenster automatisch geöffnet."
-#: client/options.c:248
+#: client/options.c:250
+msgid "Pop up caravan actions"
+msgstr "Befehle für Karawane"
+
+#: client/options.c:251
+msgid ""
+"If this option is enabled, when caravans arrive at a city where they can "
+"establish a traderoute or help build a wonder, a window will popup asking "
+"which action should be performed. Disabling this option means you will have "
+"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 ""
+"Mit dieser Option erscheint jedes Mal ein Popup-Fenster, wenn eine Karawane "
+"eine Stadt erreicht und eine Handelsroute einrichten oder zum Bau eines "
+"Weltwunders beitragen kann. Ohne diese Option muss der Befehl von Hand "
+"gegeben werden, durch drücken von 'r' (für eine Handelsroute) oder 'b' (zum "
+"Bau eines Wunders), wenn die Karawane in der Stadt ist."
+
+#: client/options.c:260
+msgid "Enable cursor changing"
+msgstr "Mauszeigeranpassung einschalten"
+
+#: client/options.c:261
+msgid ""
+"This option controls whether the client should try to change the mouse "
+"cursor depending on what is being pointed at, as well as to indicate changes "
+"in the client or server state."
+msgstr ""
+"Mit dieser Option versucht der Client, den Mauszeiger daran anzupassen, "
+"worauf gezeigt wird, und in welchem Zustand sich Client und Server befinden."
+
+#: client/options.c:266
+msgid "Select cities before units"
+msgstr "Städte auswählen, keine Einheiten"
+
+#: 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 ""
+"Wenn sich in dem Auswahlrechteck sowohl Städte als auch Einheiten befinden, "
+"werden nur Städte ausgewählt."
+
+#: client/options.c:272
+msgid "Clear unit orders on selection"
+msgstr "Auswahl löscht aktuelle Einheitenbefehle"
+
+#: client/options.c:273
+msgid ""
+"Enabling this option will cause unit orders to be cleared whenever one or "
+"more units are selected. If this option is disabled, selecting units will "
+"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 ""
+"Mit dieser Option löscht die Auswahl von Einheiten den aktuellen Befehl. "
+"Ohne diese Option wird der Befehl nur aufgehoben, wenn neue Befehle erteilt "
+"werden oder die Leertaste gedrückt wird."
+
+#: client/options.c:282
msgid "Background layer"
msgstr "Hintergrundanzeige"
-#: client/options.c:249
+#: client/options.c:283
msgid "The background layer of the overview shows just ocean and land."
msgstr "Die Hintergrundanzeige der Ãœbersicht zeigt nur Land und Ozean."
-#: client/options.c:252
+#: client/options.c:286
msgid "Terrain relief map layer"
msgstr "Anzeige der Geländestruktur"
-#: client/options.c:253
+#: client/options.c:287
msgid "The relief layer shows all terrains on the map."
msgstr "Alle Geländeformen der Karte werden angezeigt."
-#: client/options.c:256
+#: client/options.c:290
msgid "Borders layer"
msgstr "Anzeige der Grenzen"
-#: client/options.c:257
+#: client/options.c:291
msgid ""
"The borders layer of the overview shows which tiles are owned by each player."
msgstr ""
"Die Grenzanzeige in der Ãœbersicht zeigt, welche Felder welchen Spielern "
"gehören."
-#: client/options.c:261
+#: client/options.c:295
msgid "Units layer"
msgstr "Anzeige der Einheiten"
-#: client/options.c:262
+#: client/options.c:296
msgid "Enabling this will draw units on the overview."
msgstr "In der Ãœbersicht werden die Einheiten angezeigt."
-#: client/options.c:265
+#: client/options.c:299
msgid "Cities layer"
msgstr "Anzeige der Städte"
-#: client/options.c:266
+#: client/options.c:300
msgid "Enabling this will draw cities on the overview."
msgstr "In der Übersicht werden die Städte angezeigt."
-#: client/options.c:269
+#: client/options.c:303
msgid "Overview fog of war"
msgstr "Ãœbersicht mit Nebel des Krieges"
-#: client/options.c:270
+#: client/options.c:304
msgid "Enabling this will show fog of war on the overview."
msgstr "In der Ãœbersicht wird der Nebel des Krieges angezeigt."
-#: client/options.c:488
+#: client/options.c:526
msgid "If you add a preset by hand, also update \"number_of_presets\""
msgstr ""
"Wenn manuell eine Vorgabe hinzugefügt wird, muß auch 'number_of_presets' "
"geändert werden."
# EH: Diese Fehlermeldung sollte mE nicht übersetzt werden.
-#: client/options.c:516
+#: client/options.c:554
msgid "Cannot find your home directory"
msgstr "Cannot find your home directory"
-#: client/options.c:665 client/options.c:796
+#: client/options.c:703 client/options.c:834
msgid "Save failed, cannot find a filename."
msgstr "NICHT GESPEICHERT: Kein Dateiname."
-#: client/options.c:678 client/options.c:859
+#: client/options.c:716 client/options.c:897
#, c-format
msgid "Save failed, cannot write to file %s"
msgstr "NICHT GESPEICHERT: Kann nicht in Datei '%s' schreiben."
-#: client/options.c:680 client/options.c:862
+#: client/options.c:718 client/options.c:900
#, c-format
msgid "Saved settings to file %s"
msgstr "Einstellungen in Datei %s gespeichert."
@@ -9424,16 +9486,16 @@ msgstr "Server capability string: %s"
msgid "Start of turn %d"
msgstr "Beginn des %d. Zugs"
-#: client/packhand.c:1590
+#: client/packhand.c:1591
#, c-format
msgid "AI Mode is now %s."
msgstr "KI Modus: %s."
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "ON"
msgstr "AN"
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "OFF"
msgstr "AUS"
@@ -9465,14 +9527,15 @@ msgid "Username"
msgstr "Benutzername"
#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
-#: client/gui-gtk-2.0/pages.c:2085
+#: client/gui-gtk-2.0/pages.c:2157
msgid "Flag"
msgstr "Flagge"
#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
-#: client/gui-gtk-2.0/pages.c:1536 client/gui-gtk-2.0/pages.c:2087
-#: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
-#: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
+#: 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/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr "Nation"
@@ -9484,7 +9547,7 @@ msgstr "Grenze"
msgid "Score"
msgstr "Punkte"
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
msgid "Team"
msgstr "Team"
@@ -9556,279 +9619,301 @@ msgstr "Es konnten keine %s aufgelöst werden."
msgid "Could not open temp file."
msgstr "Could not open temp file."
-#: client/servers.c:407
+#: client/servers.c:410
msgid "Invalid $http_proxy or metaserver value, must start with 'http://'"
msgstr ""
"Ungültiger Eintrag in $http_proxy oder metaserver: Muß mit 'http://' "
"beginnen."
-#: client/servers.c:413
+#: client/servers.c:416
msgid "Failed looking up metaserver's host"
msgstr "Metaserver nicht gefunden"
-#: client/text.c:85 client/text.c:86 client/text.c:91
+#. TRANS: "AI <player name>"
+#: client/text.c:94
+#, c-format
+msgid "AI %s"
+msgstr "KI %s"
+
+#. TRANS: "<nation adjective>, team <team name>"
+#: client/text.c:118
+#, c-format
+msgid "%s, team %s"
+msgstr "%s, Team %s"
+
+#: client/text.c:135 client/text.c:136 client/text.c:141
#: client/gui-sdl/mapview.c:752
msgid "?nation:Neutral"
msgstr "neutral"
-#: client/text.c:85 client/gui-sdl/mapview.c:752
+#: client/text.c:135 client/gui-sdl/mapview.c:752
msgid "?nation:Hostile"
msgstr "feindselig"
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Peaceful"
msgstr "friedlich"
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Friendly"
msgstr "befreundet"
-#: client/text.c:88 client/gui-sdl/mapview.c:755
+#: client/text.c:138 client/gui-sdl/mapview.c:755
msgid "?nation:Mysterious"
msgstr "unbekannt"
-#: client/text.c:88
+#: client/text.c:138
msgid "?nation:Friendly(team)"
msgstr "befreundet (Team)"
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
msgid "?city:Neutral"
msgstr "neutral"
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
msgid "?city:Hostile"
msgstr "feindselig"
-#: client/text.c:92 client/gui-sdl/mapview.c:786
+#: client/text.c:142 client/gui-sdl/mapview.c:786
msgid "?city:Peaceful"
msgstr "friedlich"
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Friendly"
msgstr "befreundet"
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Mysterious"
msgstr "unbekannt"
-#: client/text.c:93
+#: client/text.c:143
msgid "?city:Friendly(team)"
msgstr "befreundet (Team)"
-#: client/text.c:100
+#: client/text.c:151
#, c-format
msgid "Location: (%d, %d) [%d]"
msgstr "Standort: (%d, %d) [%d]"
-#: client/text.c:109
+#: client/text.c:153
+#, c-format
+msgid "Native coordinates: (%d, %d)"
+msgstr "Ursprung: (%d, %d)"
+
+#: client/text.c:160
#, c-format
msgid "Terrain: %s"
msgstr "Gelände: %s"
-#: client/text.c:110
+#: client/text.c:161
#, c-format
msgid "Food/Prod/Trade: %s"
msgstr "Nahrung/Produktion/Handel: %s"
-#: client/text.c:113
+#: client/text.c:164
msgid "Minor Tribe Village"
msgstr "Kleine Siedlung"
-#: client/text.c:119
+#: client/text.c:173
msgid "Our territory"
msgstr "Unser Gebiet"
-#. TRANS: "Polish territory"
-#: client/text.c:122
+#. TRANS: "Territory of <username> (<nation + team>)"
+#: client/text.c:176
#, c-format
-msgid "%s territory"
-msgstr "%ses Gebiet"
+msgid "Territory of %s (%s)"
+msgstr "Gebiet von %s (die %s)"
-#. TRANS: "Polish territory (5 turn cease-fire)"
-#: client/text.c:131
+#: client/text.c:186
#, c-format
-msgid "%s territory (%d turn cease-fire)"
-msgid_plural "%s territory (%d turn cease-fire)"
-msgstr[0] "%ses Gebiet (%d Runde Feuerpause)"
-msgstr[1] "%ses Gebiet (%d Runden Feuerpause)"
+msgid "Territory of %s (%s) (%d turn cease-fire)"
+msgid_plural "Territory of %s (%s) (%d turn cease-fire)"
+msgstr[0] "Gebiet von %s (die %s) (%d Runde Feuerpause)"
+msgstr[1] "Gebiet von %s (die %s) (%d Runden Feuerpause)"
-#. TRANS: "Polish territory (friendly)"
-#: client/text.c:140
+#. TRANS: "Territory of <username>
+#. * (<nation + team> | <diplomatic state>)"
+#: client/text.c:195
#, c-format
-msgid "%s territory (%s)"
-msgstr "%ses Gebiet (%s)"
+msgid "Territory of %s (%s | %s)"
+msgstr "Gebiet von %s (die %s | %s)"
-#: client/text.c:145
+#: client/text.c:200
msgid "Unclaimed territory"
msgstr "Neutrales Gebiet"
-#. TRANS: "City: Warsaw (Polish)"
-#: client/text.c:156
+#. TRANS: "City: <city name> | <username> (<nation + team>)"
+#: client/text.c:214
#, c-format
-msgid "City: %s (%s)"
-msgstr "Stadt: %s (%s)"
+msgid "City: %s | %s (%s)"
+msgstr "Stadt: %s | %s (%s)"
-#. TRANS: "City: Warsaw (Polish, 5 turn cease-fire)"
-#: client/text.c:166
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <number> turn cease-fire)"
+#: client/text.c:224
#, c-format
-msgid "City: %s (%s, %d turn cease-fire)"
-msgid_plural "City: %s (%s, %d turn cease-fire)"
-msgstr[0] "Stadt: %s (%s, %d Runde Feuerpause)"
-msgstr[1] "Stadt: %s (%s, %d Runden Feuerpause)"
+msgid "City: %s | %s (%s, %d turn cease-fire)"
+msgid_plural "City: %s | %s (%s, %d turn cease-fire)"
+msgstr[0] "Stadt: %s | %s (%s, %d Runde Feuerpause)"
+msgstr[1] "Stadt: %s | %s (%s, %d Runden Feuerpause)"
-#. TRANS: "City: Warsaw (Polish,friendly)"
-#: client/text.c:174
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <diplomatic state>)"
+#: client/text.c:231
#, c-format
-msgid "City: %s (%s, %s)"
-msgstr "Stadt: %s (%s, %s)"
+msgid "City: %s | %s (%s, %s)"
+msgstr "Stadt: %s | %s (%s, %s)"
#. TRANS: previous lines gave other information about the city.
-#: client/text.c:189
+#: client/text.c:246
#, c-format
msgid "?clistbegin: with %s"
msgstr " mit %s"
#. TRANS: "Trade from Warsaw: 5"
-#: client/text.c:202
+#: client/text.c:259
#, c-format
msgid "Trade from %s: %d"
msgstr "Handel von %s: %d"
-#: client/text.c:210
+#: client/text.c:267
#, c-format
msgid "Infrastructure: %s"
msgstr "Infrastruktur: %s"
-#: client/text.c:215
+#: client/text.c:272
#, c-format
msgid "Activity: %s"
msgstr "Tätigkeit: %s"
-#. TRANS: "Unit: Musketeers (Polish, Warsaw)"
-#. TRANS: "Unit: Musketeers (Polish,friendly)"
-#: client/text.c:226 client/text.c:253
+#. TRANS: "Unit: <unit type> | <username>
+#. * (<nation + team>, <homecity>)"
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <diplomatic state>)"
+#: client/text.c:287 client/text.c:313
#, c-format
-msgid "Unit: %s (%s, %s)"
-msgstr "Einheit: %s (%s, %s)"
+msgid "Unit: %s | %s (%s, %s)"
+msgstr "Einheit: %s | %s (%s, %s)"
-#. TRANS: "Unit: Musketeers (Polish)"
-#: client/text.c:232
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>)"
+#: client/text.c:292
#, c-format
-msgid "Unit: %s (%s)"
-msgstr "Einheit: %s (%s)"
+msgid "Unit: %s | %s (%s)"
+msgstr "Einheit: %s | %s (%s)"
-#. TRANS: "Unit: Musketeers (Polish, 5 turn cease-fire)"
-#: client/text.c:245
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <number> turn cease-fire)"
+#: client/text.c:305
#, c-format
-msgid "Unit: %s (%s, %d turn cease-fire)"
-msgid_plural "Unit: %s (%s, %d turn cease-fire)"
-msgstr[0] "Einheit: %s (%s, %d Runde Feuerpause)"
-msgstr[1] "Einheit: %s (%s, %d Runden Feuerpause)"
+msgid "Unit: %s | %s (%s, %d turn cease-fire)"
+msgid_plural "Unit: %s | %s (%s, %d turn cease-fire)"
+msgstr[0] "Einheit: %s | %s (%s, %d Runde Feuerpause)"
+msgstr[1] "Einheit: %s | %s (%s, %d Runden Feuerpause)"
#. TRANS: "Chance to win: A:95% D:46%"
-#: client/text.c:279
+#: client/text.c:338
#, c-format
msgid "Chance to win: A:%d%% D:%d%%"
msgstr "Siegchance: A:%d%% V:%d%%"
#. TRANS: A is attack power, D is defense power, FP is firepower,
#. * HP is hitpoints (current and max).
-#: client/text.c:286
+#: client/text.c:345
#, c-format
msgid "A:%d D:%d FP:%d HP:%d/%d (%s)"
msgstr "A:%d V:%d FK:%d TP:%d/%d (%s)"
#. TRANS: "5 more" units on this tile
-#: client/text.c:295
+#: client/text.c:354
#, c-format
msgid " (%d more)"
msgstr " (und %d weitere)"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:364
+#: client/text.c:423
#, c-format
msgid "far from %s"
msgstr "entfernt von %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:367
+#: client/text.c:426
#, c-format
msgid "near %s"
msgstr "nahe %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:370
+#: client/text.c:429
#, c-format
msgid "in %s"
msgstr "in %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:403
+#: client/text.c:462
#, c-format
msgid "from %s"
msgstr "aus %s"
-#: client/text.c:466
+#: client/text.c:525
msgid "Progress: no research"
msgstr "Tempo: keine Forschung"
-#: client/text.c:470
+#: client/text.c:529
msgid "Progress: no research target"
msgstr "Tempo: kein Forschungsziel"
-#: client/text.c:475
+#: client/text.c:534
#, c-format
msgid "Progress: %d turn/advance"
msgid_plural "Progress: %d turns/advance"
msgstr[0] "Tempo: %d Runde pro Fortschritt"
msgstr[1] "Tempo: %d Runden pro Fortschritt"
-#: client/text.c:480
+#: client/text.c:539
#, c-format
msgid "%d bulb/turn"
msgid_plural "%d bulbs/turn"
msgstr[0] "%d Punkt/Runde"
msgstr[1] "%d Punkte/Runde"
-#: client/text.c:485
+#: client/text.c:544
#, c-format
msgid ", %d bulb/turn from team"
msgid_plural ", %d bulbs/turn from team"
msgstr[0] ", %d Punkt/Runde im Team"
msgstr[1] ", %d Punkte/Runde im Team"
-#: client/text.c:512
+#: client/text.c:571
#, c-format
msgid "%d/- (never)"
msgstr "%d/- (Nie)"
-#: client/text.c:524
+#: client/text.c:583
#, c-format
msgid "%d/%d (%d turn)"
msgid_plural "%d/%d (%d turns)"
msgstr[0] "%d/%d (%d Runde)"
msgstr[1] "%d/%d (%d Runden)"
-#: client/text.c:527
+#: client/text.c:586
#, c-format
msgid "%d/%d (never)"
msgstr "%d/%d (Nie)"
-#: client/text.c:564
+#: client/text.c:623
#, c-format
msgid "%d step"
msgid_plural "%d steps"
msgstr[0] "%d Schritt"
msgstr[1] "%d Schritte"
-#: client/text.c:566
+#: client/text.c:625
#, c-format
msgid "%d bulb"
msgid_plural "%d bulbs"
msgstr[0] "%d Punkt"
msgstr[1] "%d Punkte"
-#: client/text.c:570 client/agents/cma_fec.c:269 client/agents/cma_fec.c:313
+#: 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
#, c-format
msgid "%d turn"
@@ -9836,88 +9921,88 @@ msgid_plural "%d turns"
msgstr[0] "1 Runde"
msgstr[1] "%d Runden"
-#: client/text.c:592
+#: client/text.c:651
#, c-format
msgid "Population: %s"
msgstr "Bevölkerung: %s"
-#: client/text.c:595
+#: client/text.c:654
#, c-format
msgid "Year: %s (T%d)"
msgstr "Jahr: %s (Ru. %d)"
-#: client/text.c:598
+#: client/text.c:657
#, c-format
msgid "Gold: %d (%+d)"
msgstr "Gold: %d (%+d)"
-#: client/text.c:600
+#: client/text.c:659
#, c-format
msgid "Tax: %d Lux: %d Sci: %d"
msgstr "Ste: %d Lux: %d For: %d"
-#: client/text.c:607
+#: client/text.c:666
msgid "Moving: Nobody"
msgstr "Am Zug: niemand"
-#: client/text.c:609
+#: client/text.c:668
#, c-format
msgid "Moving: %s"
msgstr "Am Zug: %s"
-#: client/text.c:613
+#: client/text.c:672
msgid "(Click for more info)"
msgstr "(Klicken für mehr Inf.)"
-#: client/text.c:629
+#: client/text.c:688
#, c-format
msgid "%s People"
msgstr "%s Einwohner"
-#: client/text.c:633
+#: client/text.c:692
#, c-format
msgid "Turn: %d"
msgstr "Zug: %d"
-#: client/text.c:635 client/gui-win32/inteldlg.c:111
+#: client/text.c:694 client/gui-win32/inteldlg.c:111
#: client/gui-xaw/inteldlg.c:208
#, c-format
msgid "Gold: %d"
msgstr "Gold: %d"
-#: client/text.c:636
+#: client/text.c:695
#, c-format
msgid "Net Income: %d"
msgstr "Nettoeinkommen: %d"
#. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:639
+#: client/text.c:698
#, c-format
msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
msgstr "Steuerquoten: Steuern: %d%% Luxus: %d%% Forschung: %d%%"
-#: client/text.c:643
+#: client/text.c:702
#, c-format
msgid "Researching %s: %s"
msgstr "Erforsche %s: %s"
-#: client/text.c:650
+#: client/text.c:709
#, c-format
msgid "Global warming chance: %d%% (%+d%%/turn)"
msgstr "Gefahr der Globalen Erwärmung: %d%% (%+d%%/Runde)"
-#: client/text.c:653
+#: client/text.c:712
#, c-format
msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
msgstr "Gefahr des Nuklearen Winters: %d%% (%+d%%/Runde)"
-#: client/text.c:658 client/gui-win32/inteldlg.c:104
+#: client/text.c:717 client/gui-win32/inteldlg.c:104
#: client/gui-xaw/inteldlg.c:200
#, c-format
msgid "Government: %s"
msgstr "Regierungsform: %s"
-#: client/text.c:682
+#: client/text.c:741
#, c-format
msgid "%d unit"
msgid_plural "%d units"
@@ -9925,55 +10010,55 @@ msgstr[0] "%d Einheit"
msgstr[1] "%d Einheiten"
#. TRANS: Impossible to reach goto target tile
-#: client/text.c:715 client/gui-sdl/mapview.c:566
+#: client/text.c:774 client/gui-sdl/mapview.c:566
msgid "?goto:Unreachable"
msgstr "Nicht erreichbar"
-#: client/text.c:717 client/gui-sdl/mapview.c:568
+#: client/text.c:776 client/gui-sdl/mapview.c:568
#, c-format
msgid "Turns to target: %d"
msgstr "Runden zum Ziel: %d"
-#: client/text.c:719 client/gui-sdl/mapview.c:570
+#: client/text.c:778 client/gui-sdl/mapview.c:570
#, c-format
msgid "Turns to target: %d to %d"
msgstr "Runden zum Ziel: %d bis %d"
-#: client/text.c:725 client/gui-sdl/mapview.c:576
+#: client/text.c:784 client/gui-sdl/mapview.c:576
#, c-format
msgid "%d unit selected"
msgid_plural "%d units selected"
msgstr[0] "%d Einheit ausgewählt"
msgstr[1] "%d Einheiten ausgewählt"
-#: client/text.c:730 client/gui-sdl/mapview.c:581
+#: client/text.c:789 client/gui-sdl/mapview.c:581
msgid "No units selected."
msgstr "Keine ausgewählt"
-#: client/text.c:804 client/gui-sdl/mapview.c:654
+#: client/text.c:863 client/gui-sdl/mapview.c:654
#, c-format
msgid "Others: %d civil; %d military"
msgstr "Andere: %d zivil, %d militärisch"
-#: client/text.c:806 client/gui-sdl/mapview.c:656
+#: client/text.c:865 client/gui-sdl/mapview.c:656
#, c-format
msgid "Others: %d civilian"
msgstr "Andere: %d zivil"
-#: client/text.c:808 client/gui-sdl/mapview.c:658
+#: client/text.c:867 client/gui-sdl/mapview.c:658
#, c-format
msgid "Others: %d military"
msgstr "Andere: %d militärisch"
-#: client/text.c:839
+#: client/text.c:898
msgid "No units to upgrade!"
msgstr "Es konnten keine Einheiten erneuert werden."
-#: client/text.c:864
+#: client/text.c:923
msgid "None of these units may be upgraded."
msgstr "Keine dieser Einheiten können erneuert werden."
-#: client/text.c:870
+#: client/text.c:929
#, c-format
msgid ""
"Upgrade %d unit for %d gold?\n"
@@ -9988,72 +10073,72 @@ msgstr[1] ""
"%d Einheiten für %d Goldstücke modernisieren?\n"
"Die Schatzkammer enthält %d Goldstücke."
-#: client/text.c:891
+#: client/text.c:950
msgid "Shows your progress in researching the current technology."
msgstr "Zeigt den Stand der Erforschung der aktuellen Technologie."
-#: client/text.c:897
+#: client/text.c:956
msgid "no research target."
msgstr "kein Forschungsziel"
#. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:900
+#: client/text.c:959
#, c-format
msgid "%s: %d/%d."
msgstr "%s: %d/%d."
-#: client/text.c:920
+#: client/text.c:979
msgid "Shows the progress of global warming:"
msgstr "Zeigt das Fortschreiten der Globalen Erwärmung an:"
-#: client/text.c:921
+#: client/text.c:980
#, c-format
msgid "Pollution rate: %d%%"
msgstr "Umweltverschmutzung: %d %%"
-#: client/text.c:923
+#: client/text.c:982
#, c-format
msgid "Chance of catastrophic warming each turn: %d%%"
msgstr "Risiko einer katastrophalen Erwärmung pro Runde: %d %%"
-#: client/text.c:939
+#: client/text.c:998
msgid "Shows the progress of nuclear winter:"
msgstr "Zeigt das Fortschreiten des Nuklearen Winters an:"
-#: client/text.c:940
+#: client/text.c:999
#, c-format
msgid "Fallout rate: %d%%"
msgstr "Fallout-Rate: %d %%"
-#: client/text.c:942
+#: client/text.c:1001
#, c-format
msgid "Chance of catastrophic winter each turn: %d%%"
msgstr "Risiko eines katastrophalen nuklearen Winters pro Runde: %d %%"
-#: client/text.c:957
+#: client/text.c:1016
msgid "Shows your current government:"
msgstr "Gegenwärtige Regierungsform:"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:981
+#: client/text.c:1040
#, c-format
msgid "Population: %5d"
msgstr "Bevölkerung: %5d"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:1043
#, c-format
msgid "Support: %5d %%"
msgstr "Lebenshaltung: %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:1047
#, c-format
msgid "Energy: %5d %%"
msgstr "Energie: %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:992
+#: client/text.c:1051
#, c-format
msgid "Mass: %5d ton"
msgid_plural "Mass: %5d tons"
@@ -10061,96 +10146,97 @@ msgstr[0] "Gewicht: %5d t"
msgstr[1] "Gewicht: %5d t"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1057
#, c-format
msgid "Travel time: %5.1f years"
msgstr "Reisezeit: %5.1f Jahre"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1061
msgid "Travel time: N/A "
msgstr "Reisezeit: ? "
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1065
#, c-format
msgid "Success prob.: %5d %%"
msgstr "Erfolgschance: %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1010
+#: client/text.c:1069
#, c-format
msgid "Year of arrival: %8s"
msgstr "Ankunftsjahr: %8s"
-#: client/text.c:1030
+#: client/text.c:1089
msgid "?timeout:off"
msgstr "?timeout:aus"
-#: client/text.c:1054
+#: client/text.c:1113
#, c-format
msgid "?seconds:%02ds"
msgstr "?seconds:%02dSek"
-#: client/text.c:1056
+#: client/text.c:1115
#, c-format
msgid "?mins/secs:%02dm %02ds"
msgstr "?mins/secs:%02dMin %02dSek"
-#: client/text.c:1058
+#: client/text.c:1117
#, c-format
msgid "?hrs/mns:%02dh %02dm"
msgstr "?hrs/mns:%02dStd %02dMin"
-#: client/text.c:1060
+#: client/text.c:1119
#, c-format
msgid "?dys/hrs:%02dd %02dh"
msgstr "?dys/hrs:%02dTge %02dStd"
-#: client/text.c:1063
+#: client/text.c:1122
msgid "?duration:overflow"
msgstr "?duration:überschritten"
-#: client/text.c:1084
+#: client/text.c:1143
#, c-format
msgid "%6d.%02d ms"
msgstr "%6d.%02d ms"
-#. TRANS: "Republic of the Poles"
-#: client/text.c:1127
+#. TRANS: <nation adjective> <government name>.
+#. * E.g. "Polish Republic".
+#: client/text.c:1188
#, c-format
-msgid "%s of the %s"
-msgstr "Die %s der %s"
+msgid "?nationgovernment:%s %s"
+msgstr "%s %s"
#. TRANS: "Observer: 1985"
-#: client/text.c:1137
+#: client/text.c:1198
#, c-format
msgid "Observer: %s"
msgstr "Beobachter: %s"
-#: client/text.c:1155
+#: client/text.c:1216
msgid "Buildings: "
msgstr "Gebäude: "
-#: client/text.c:1172 client/text.c:1211
+#: client/text.c:1233 client/text.c:1272
msgid "None. "
msgstr "Keine."
-#: client/text.c:1174 client/text.c:1213
+#: client/text.c:1235 client/text.c:1274
msgid "?clistend:."
msgstr "."
-#: client/text.c:1192
+#: client/text.c:1253
msgid "Wonders: "
msgstr "Weltwunder: "
-#: client/text.c:1247
+#: client/text.c:1308
#, 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:1251
+#: client/text.c:1312
#, c-format
msgid "%d content before penalty."
msgid_plural "%d content before penalty."
@@ -10158,45 +10244,40 @@ msgstr[0] "%d zufrieden; "
msgstr[1] "%d zufrieden; "
#. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1257
+#: client/text.c:1318
#, 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."
-#. TRANS: Martial law opening parenthesis
-#: client/text.c:1279
-msgid "Martial law in effect ("
-msgstr "Kriegsrecht in Kraft ("
+#: client/text.c:1339
+msgid "Unlimited martial law in effect."
+msgstr "Unbegrenztes Kriegsrecht in Kraft."
-#. TRANS: no [unit] maximum
-#: client/text.c:1284
-msgid "no maximum, "
-msgstr "Keine Obergrenze, "
-
-#: client/text.c:1287
+#: client/text.c:1341
#, c-format
-msgid "%d unit maximum, "
-msgid_plural "%d units maximum, "
-msgstr[0] "Maximal 1 Einheit, "
-msgstr[1] "Maximal %d Einheiten, "
+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."
-#. TRANS: Martial law closing parenthesis
-#: client/text.c:1294
+#: client/text.c:1345
#, c-format
-msgid "%d per unit). "
-msgstr "%d pro Einheit)."
+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:1298
+#: client/text.c:1352
msgid "Military units in the field may cause unhappiness. "
msgstr "Kampfeinheiten im Einsatz können zu Unzufriedenheit führen. "
-#: client/text.c:1301
+#: client/text.c:1355
msgid "Military units have no happiness effect. "
msgstr "Kampfeinheiten wirken sich nicht auf die Zufriedenheit aus. "
-#: client/text.c:1316
+#: client/text.c:1370
#, c-format
msgid "Luxury: %d total."
msgstr "Luxus: %d gesamt."
@@ -10221,7 +10302,7 @@ msgstr ""
"Client does not support overhead view tilesets. Using default tileset "
"instead."
-#: client/tilespec.c:3968
+#: client/tilespec.c:3966
#, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
@@ -10247,12 +10328,12 @@ msgid ""
msgstr ""
"Der Bürgermeister von %s ist überfordert. Schau dir die Stadt einmal an."
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
-#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:599
+#: client/gui-gtk-2.0/cityrep.c:624 client/gui-sdl/citydlg.c:2009
msgid "none"
msgstr "Nichts"
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:645
msgid "custom"
msgstr "individuell"
@@ -10557,7 +10638,7 @@ msgstr "_Handelsweg gründen"
msgid "Enter Marketplace"
msgstr "Marktplatz betreten"
-#: client/gui-gtk-2.0/chatline.c:144 client/gui-win32/chatline.c:134
+#: client/gui-gtk-2.0/chatline.c:218 client/gui-win32/chatline.c:134
#: client/gui-xaw/chatline.c:120
msgid "Cleared output window."
msgstr "Textfenster gelöscht."
@@ -10599,11 +10680,11 @@ msgstr "Änderung in:"
#: client/gui-gtk-2.0/citydlg.c:586 client/gui-win32/citydlg.c:670
msgid "Corruption:"
-msgstr "Korruption"
+msgstr "Korruption:"
#: client/gui-gtk-2.0/citydlg.c:587 client/gui-win32/citydlg.c:671
msgid "Waste:"
-msgstr "Müll:"
+msgstr "Verschwendung:"
#: client/gui-gtk-2.0/citydlg.c:588 client/gui-win32/citydlg.c:672
msgid "Pollution:"
@@ -10638,11 +10719,11 @@ msgid "%d/%d %d turns"
msgstr "%d/%d %d Runden"
#: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:821
+#: client/gui-gtk-2.0/cityrep.c:1027
msgid "_Buy"
msgstr "_Kaufen"
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:869
msgid "_Production"
msgstr "_Produktion"
@@ -10663,12 +10744,12 @@ msgid "Entertainers"
msgstr "Unterhalter"
#: client/gui-gtk-2.0/citydlg.c:1029 client/gui-win32/citydlg.c:1989
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2403
msgid "Scientists"
msgstr "Forscher"
#: client/gui-gtk-2.0/citydlg.c:1030 client/gui-win32/citydlg.c:1991
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2404
msgid "Taxmen"
msgstr "Steuerfahnder"
@@ -10761,7 +10842,7 @@ msgstr "Unterstützte Einheiten: %d"
msgid "Present units %d"
msgstr "Stationierte Einheiten: %d"
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:1019
msgid "Cen_ter"
msgstr "_Zentrieren"
@@ -10850,31 +10931,55 @@ msgstr "Stadt umbenennen"
msgid "What should we rename the city to?"
msgstr "Wie soll die Stadt heißen?"
-#: client/gui-gtk-2.0/cityrep.c:699
+#: client/gui-gtk-2.0/cityrep.c:794
+msgid "(no worklists defined)"
+msgstr "(keine Arbeitslisten vorhanden)"
+
+#: client/gui-gtk-2.0/cityrep.c:876
msgid "Chan_ge"
msgstr "_Ändern"
-#: client/gui-gtk-2.0/cityrep.c:703
+#: client/gui-gtk-2.0/cityrep.c:880
msgid "Add _First"
msgstr "_Vorne einfügen"
-#: client/gui-gtk-2.0/cityrep.c:707
+#: client/gui-gtk-2.0/cityrep.c:884
msgid "Add _Next"
msgstr "_Einfügen"
-#: client/gui-gtk-2.0/cityrep.c:711
+#: client/gui-gtk-2.0/cityrep.c:888
+msgid "Add _2nd Last"
+msgstr "Als _Vorletzten anhängen"
+
+#: client/gui-gtk-2.0/cityrep.c:892
msgid "Add _Last"
msgstr "_Hinten anhängen"
-#: client/gui-gtk-2.0/cityrep.c:715
+#: client/gui-gtk-2.0/cityrep.c:899
+msgid "Set Worklist"
+msgstr "Arbeitsliste anwenden"
+
+#: client/gui-gtk-2.0/cityrep.c:905
+msgid "Append Worklist"
+msgstr "Arbeitsliste anhängen"
+
+#: client/gui-gtk-2.0/cityrep.c:911
+msgid "Clear _Worklist"
+msgstr "Arbeitsliste löschen"
+
+#: client/gui-gtk-2.0/cityrep.c:916
+msgid "Gover_nor"
+msgstr "Bürger_meister"
+
+#: client/gui-gtk-2.0/cityrep.c:921
msgid "_Select"
-msgstr "_Auswählen"
+msgstr "Aus_wählen"
-#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
+#: client/gui-gtk-2.0/cityrep.c:925 client/gui-gtk-2.0/plrdlg.c:521
msgid "_Display"
-msgstr "_Anzeige"
+msgstr "A_nzeige"
-#: client/gui-gtk-2.0/cityrep.c:800 client/gui-gtk-2.0/menu.c:808
+#: 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-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
#: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -10884,100 +10989,100 @@ msgstr "_Anzeige"
msgid "Cities"
msgstr "Städte"
-#: client/gui-gtk-2.0/cityrep.c:817
+#: client/gui-gtk-2.0/cityrep.c:1023
msgid "_Inspect"
-msgstr "_Stadt ansehen"
-
-#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
-#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-sdl/helpdlg.c:297 client/gui-win32/menu.c:342
-#: client/gui-xaw/menu.c:241
+msgstr "S_tadt ansehen"
+
+#: 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
+#: client/gui-gtk-2.0/cityrep.c:1518 client/gui-gtk-2.0/menu.c:823
+#: client/gui-gtk-2.0/menu.c:825 client/gui-gtk-2.0/menu.c:827
+#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:831
+#: client/gui-gtk-2.0/menu.c:833 client/gui-sdl/helpdlg.c:297
+#: client/gui-win32/menu.c:342 client/gui-xaw/menu.c:241
msgid "Improvements"
msgstr "Stadterweiterungen"
-#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
-#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
-#: client/gui-xaw/menu.c:247
+#: client/gui-gtk-2.0/cityrep.c:1441 client/gui-gtk-2.0/cityrep.c:1460
+#: client/gui-gtk-2.0/cityrep.c:1479 client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1522 client/gui-xaw/menu.c:247
msgid "Wonders"
msgstr "Weltwunder"
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1662 client/gui-win32/cityrep.c:439
#: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
msgid "All Cities"
msgstr "Alle Städte"
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1667 client/gui-win32/cityrep.c:440
msgid "No Cities"
msgstr "Keine Städte"
-#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1672 client/gui-win32/cityrep.c:441
msgid "Invert Selection"
msgstr "Auswahl umkehren"
-#: client/gui-gtk-2.0/cityrep.c:1420
+#: client/gui-gtk-2.0/cityrep.c:1682
msgid "Building Units"
msgstr "Einheiten im Bau "
-#: client/gui-gtk-2.0/cityrep.c:1426
+#: client/gui-gtk-2.0/cityrep.c:1688
msgid "Building Improvements"
msgstr "Stadterweiterungen im Bau"
-#: client/gui-gtk-2.0/cityrep.c:1432
+#: client/gui-gtk-2.0/cityrep.c:1694
msgid "Building Wonders"
msgstr "Weltwunder im Bau"
-#: client/gui-gtk-2.0/cityrep.c:1444
+#: client/gui-gtk-2.0/cityrep.c:1706
msgid "Building Unit"
msgstr "Einheit im Bau "
-#: client/gui-gtk-2.0/cityrep.c:1448
+#: client/gui-gtk-2.0/cityrep.c:1710
msgid "Building Improvement"
msgstr "Stadterweiterung im Bau"
-#: client/gui-gtk-2.0/cityrep.c:1452
+#: client/gui-gtk-2.0/cityrep.c:1714
msgid "Building Wonder"
msgstr "Weltwunder im Bau"
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1722 client/gui-win32/cityrep.c:443
msgid "Coastal Cities"
msgstr "Küstenstädte"
-#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1727 client/gui-win32/cityrep.c:444
msgid "Same Island"
msgstr "Gleiche Insel"
-#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1737 client/gui-win32/cityrep.c:447
msgid "Supported Units"
msgstr "zu unterhaltende Einheiten"
-#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1740 client/gui-win32/cityrep.c:454
msgid "Units Present"
msgstr "stationierte Einheiten"
-#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1744 client/gui-win32/cityrep.c:469
msgid "Improvements in City"
msgstr "Stadterweiterungen"
-#: client/gui-gtk-2.0/cityrep.c:1486
+#: client/gui-gtk-2.0/cityrep.c:1748
msgid "Wonders in City"
msgstr "Weltwunder"
-#: client/gui-gtk-2.0/cityrep.c:1495
+#: client/gui-gtk-2.0/cityrep.c:1757
msgid "Available Units"
msgstr "Mögliche Einheiten"
-#: client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1760
msgid "Available Improvements"
msgstr "Mögliche Stadterweiterungen"
-#: client/gui-gtk-2.0/cityrep.c:1501
+#: client/gui-gtk-2.0/cityrep.c:1763
msgid "Available Wonders"
msgstr "Mögliche Weltwunder"
-#: client/gui-gtk-2.0/cityrep.c:1625
+#: client/gui-gtk-2.0/cityrep.c:1882
#, c-format
msgid "Total Buy Cost: %d"
msgstr "Gesamtkosten: %d"
@@ -11051,11 +11156,11 @@ 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:186
+#: client/gui-gtk-2.0/dialogs.c:196 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:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
msgid "Inspect _City"
msgstr "_Stadt ansehen"
@@ -11083,10 +11188,10 @@ msgstr "Wähle aus, was gebrandschatzt werden soll:"
msgid "Unit"
msgstr "Einheit"
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
-#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
-#: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
-#: manual/civmanual.c:302 data/Freeciv.in:80
+#: 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-win32/plrdlg.c:335 manual/civmanual.c:302 data/Freeciv.in:80
msgid "Name"
msgstr "Name"
@@ -11111,7 +11216,7 @@ 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:1036 data/Freeciv.in:3371
+#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
msgid "Pick Nation"
msgstr "Wähle Nation"
@@ -11190,7 +11295,7 @@ msgstr "_Karten"
msgid "_Advances"
msgstr "_Forschungsergebnisse:"
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:910
+#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr "_Städte"
@@ -11295,19 +11400,19 @@ msgstr "Bestimmungsort wählen"
msgid "Show _All Cities"
msgstr "_Zeige Alle Städte"
-#: client/gui-gtk-2.0/gui_main.c:150
+#: client/gui-gtk-2.0/gui_main.c:162
msgid "Show Map Scrollbars"
msgstr "Rollbalken für Karte anzeigen"
-#: client/gui-gtk-2.0/gui_main.c:151
+#: client/gui-gtk-2.0/gui_main.c:163
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:155
+#: client/gui-gtk-2.0/gui_main.c:167
msgid "Keyboardless goto"
msgstr "Mausgesteuerte Gehe-nach-Funktion"
-#: client/gui-gtk-2.0/gui_main.c:156
+#: client/gui-gtk-2.0/gui_main.c:168
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."
@@ -11315,11 +11420,11 @@ msgstr ""
"Die Gehe-nach-Funktion kann mittels Klicken und Ziehen der Maus ausgelöst "
"werden."
-#: client/gui-gtk-2.0/gui_main.c:161
+#: client/gui-gtk-2.0/gui_main.c:173
msgid "Keep dialogs on top"
msgstr "Dialoge immer sichtbar"
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:174
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."
@@ -11327,11 +11432,11 @@ msgstr ""
"Dialogfenster bleiben immer vor dem Hauptfenster sichtbar. Im Vollbildmodus "
"nicht abschaltbar."
-#: client/gui-gtk-2.0/gui_main.c:166
+#: client/gui-gtk-2.0/gui_main.c:178
msgid "Show worklist task icons"
msgstr "Zeige Icons in der Arbeitsliste"
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:179
msgid ""
"Disabling this will turn off the unit and building icons in the worklist "
"dialog and the production tab of the city dialog."
@@ -11339,11 +11444,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:171
+#: client/gui-gtk-2.0/gui_main.c:183
msgid "Enable status report tabs"
msgstr "Kartenreiteranzeige für Berichte"
-#: client/gui-gtk-2.0/gui_main.c:172
+#: client/gui-gtk-2.0/gui_main.c:184
msgid ""
"If this option is enabled then report dialogs will be shown as separate tabs "
"rather than in popup dialogs."
@@ -11351,11 +11456,11 @@ msgstr ""
"Hiermit werden Berichte als Kartenreiter dargestellt, und nicht als separate "
"Fenster."
-#: client/gui-gtk-2.0/gui_main.c:177 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:189 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:178 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:190 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."
@@ -11363,7 +11468,95 @@ 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:277 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:195
+msgid "Show time for each chat message"
+msgstr "Zeige Uhrzeit für Chat-Nachrichten"
+
+#: client/gui-gtk-2.0/gui_main.c:196
+msgid ""
+"If this option is enabled then all chat messages will be prefixed by a time "
+"string of the form [hour:minute:second]."
+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
+msgid "Split bottom notebook area"
+msgstr "Unteres Fenster zweiteilen"
+
+#: client/gui-gtk-2.0/gui_main.c:202
+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 ""
+"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
+msgid "New message events go to top of list"
+msgstr "Neue Ereignisse erscheinen oben"
+
+#: client/gui-gtk-2.0/gui_main.c:208
+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 ""
+"Neue Ereignisse im Nachrichtenfenster erscheinen oben in der Liste, anstatt "
+"sie unten anzuhängen."
+
+#: client/gui-gtk-2.0/gui_main.c:213
+msgid "Show extra message window buttons"
+msgstr "Zeige Schaltflächen zu Nachrichten"
+
+#: client/gui-gtk-2.0/gui_main.c:214
+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 "
+"is disabled, these buttons will not appear (you can still double-click with "
+"the left mouse button or right-click on a row to inspect or goto "
+"respectively). This option will only take effect once the message window is "
+"closed and reopened."
+msgstr ""
+"Mit dieser Option werden im Nachrichtenfenster zwei Schaltflächen angezeigt, "
+"um das Stadtfenster zu öffnen, und um den Ort auf der Karte zu zentrieren. "
+"Ohne diese Option können diese Funktionen mit Doppelklick links und Rechts-"
+"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
+msgid "Metaserver tab first in network page"
+msgstr "Metaserver ist erster Reiter auf der Netzwerkseite"
+
+#: client/gui-gtk-2.0/gui_main.c:225
+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 ""
+"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
+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
+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 "
+"messages will be sent as public chat messages. To send a public chat message "
+"with this option enabled, prefix the message with a single colon ':'. This "
+"option can also be set using a toggle button beside the chat entry (only "
+"visible in multiplayer games)."
+msgstr ""
+"Mit dieser Option werden allgemeine Mitteilungen, die während des laufenden "
+"Spiels im Chatfenster geschrieben werden, nur an die eigenen Verbündeten "
+"übermittelt. Ohne die Option gehen sie an alle Mitspieler. Um öffentliche "
+"Mitteilungen zu schicken, wenn diese Option eingeschaltet ist, kann ihnen "
+"ein Doppelpunkt ':' vorangestellt werden. Diese Option kann ebenfalls mit "
+"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
msgid ""
"This client has no special command line options\n"
"\n"
@@ -11371,44 +11564,45 @@ msgstr ""
"Es gibt keine GUI-bezogenen Kommandozeilenoptionen.\n"
"\n"
-#: client/gui-gtk-2.0/gui_main.c:723 client/gui-gtk-2.0/gui_main.c:1345
+#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
msgid "Freeciv"
msgstr "Freeciv"
-#: client/gui-gtk-2.0/gui_main.c:1088 client/gui-gtk-2.0/gui_main.c:1095
+#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
#: 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:1095 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1232 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:1127 client/gui-gtk-2.0/menu.c:770
-#: client/gui-gtk-2.0/menu.c:772 client/gui-gtk-2.0/menu.c:774
-#: client/gui-gtk-2.0/menu.c:776 client/gui-gtk-2.0/menu.c:778
-#: client/gui-gtk-2.0/menu.c:780 client/gui-gtk-2.0/menu.c:782
-#: client/gui-gtk-2.0/menu.c:784 client/gui-gtk-2.0/menu.c:786
-#: client/gui-gtk-2.0/menu.c:788 client/gui-gtk-2.0/menu.c:790
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-gtk-2.0/menu.c:804 client/gui-gtk-2.0/menu.c:806
-#: client/gui-gtk-2.0/menu.c:808 client/gui-gtk-2.0/menu.c:810
-#: client/gui-gtk-2.0/menu.c:812 client/gui-gtk-2.0/menu.c:814
-#: client/gui-gtk-2.0/menu.c:816 client/gui-gtk-2.0/menu.c:818
-#: client/gui-gtk-2.0/menu.c:820 client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/gui_main.c:1266 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
+#: client/gui-gtk-2.0/menu.c:811 client/gui-gtk-2.0/menu.c:813
+#: client/gui-gtk-2.0/menu.c:815 client/gui-gtk-2.0/menu.c:817
+#: client/gui-gtk-2.0/menu.c:819 client/gui-gtk-2.0/menu.c:821
+#: client/gui-gtk-2.0/menu.c:823 client/gui-gtk-2.0/menu.c:825
+#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
+#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
+#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
+#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
+#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
+#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
#: data/Freeciv.in:2028
msgid "View"
msgstr "Ansicht"
-#: client/gui-gtk-2.0/gui_main.c:1208
+#: client/gui-gtk-2.0/gui_main.c:1359
msgid "Chat"
msgstr "Chat"
-#: client/gui-gtk-2.0/gui_main.c:1224 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1377 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"
@@ -11420,69 +11614,73 @@ msgstr ""
"Siehe unter 'Lizenz' im Hilfemenü.\n"
"Und nun ... mach' ihnen die Hölle heiß!"
-#: client/gui-gtk-2.0/gui_main.c:1491
+#: client/gui-gtk-2.0/gui_main.c:1392
+msgid "Allies Only"
+msgstr "Nur Verbündete"
+
+#: client/gui-gtk-2.0/gui_main.c:1657
msgid "Not _ready"
msgstr "Nicht _bereit"
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
+#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
msgid "_Ready"
msgstr "_Bereit"
-#: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2132
+#: 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
msgid "_Start"
msgstr "_Start"
-#: client/gui-gtk-2.0/gui_main.c:1520
+#: client/gui-gtk-2.0/gui_main.c:1686
msgid "_Take Player"
msgstr "Spieler übernehmen"
-#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
+#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
msgid "Pick _Nation"
msgstr "Wähle _Nation"
-#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
+#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
msgid "_Observe"
msgstr "Be_obachten"
-#: client/gui-gtk-2.0/gui_main.c:1532
+#: client/gui-gtk-2.0/gui_main.c:1698
msgid "Do not _observe"
msgstr "Nicht be_obachten"
-#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
msgid "<AI>"
msgstr "<KI>"
-#: client/gui-gtk-2.0/gui_main.c:1557
+#: client/gui-gtk-2.0/gui_main.c:1723
msgid "<Novice AI>"
msgstr "<Anfänger-KI>"
-#: client/gui-gtk-2.0/gui_main.c:1560
+#: client/gui-gtk-2.0/gui_main.c:1726
msgid "<Easy AI>"
msgstr "<Leichte KI>"
-#: client/gui-gtk-2.0/gui_main.c:1563
+#: client/gui-gtk-2.0/gui_main.c:1729
msgid "<Normal AI>"
msgstr "<Normale KI>"
-#: client/gui-gtk-2.0/gui_main.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1732
msgid "<Hard AI>"
msgstr "<Schwere KI>"
-#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1742 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:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
msgid "Observer"
msgstr "Beobachter"
-#: client/gui-gtk-2.0/gui_main.c:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
msgid "Detached"
msgstr "Nicht verbunden"
-#: client/gui-gtk-2.0/gui_main.c:1899
+#: client/gui-gtk-2.0/gui_main.c:2073
msgid "Are you sure you want to quit?"
msgstr "Wollen Sie das Programm wirklich beenden?"
@@ -11714,469 +11912,503 @@ msgstr "_Fortschritte"
msgid "Foreign Intelligence: %s Empire"
msgstr "Nachrichtendienst: Das %se Imperium"
-#: client/gui-gtk-2.0/mapctrl.c:195 client/gui-sdl/mapctrl.c:2565
+#: client/gui-gtk-2.0/mapctrl.c:179 client/gui-sdl/mapctrl.c:2565
#: client/gui-sdl/menu.c:839 client/gui-sdl/menu.c:1021
#: client/gui-win32/mapctrl.c:353
msgid "Build New City"
msgstr "Neue Stadt gründen"
-#: client/gui-gtk-2.0/mapctrl.c:196 client/gui-sdl/mapctrl.c:2594
+#: client/gui-gtk-2.0/mapctrl.c:180 client/gui-sdl/mapctrl.c:2594
#: client/gui-win32/mapctrl.c:354 client/gui-xaw/mapctrl.c:89
msgid "What should we call our new city?"
msgstr "Wie soll die neue Stadt heißen?"
-#: client/gui-gtk-2.0/mapview.c:147
+#: client/gui-gtk-2.0/mapview.c:158
msgid "Shows your current luxury/science/tax rates;click to toggle them."
msgstr ""
"Zeigt aktuelle Luxus-, Forschungs- und Steuerraten; durch Klicken "
"verstellbar."
-#: client/gui-gtk-2.0/mapview.c:692 client/gui-win32/canvas.c:275
+#: client/gui-gtk-2.0/mapview.c:702 client/gui-win32/canvas.c:275
msgid "Better fog will only work in truecolor. Disabling it"
msgstr ""
"Bessere Nebeldarstellung kann nur in Echtfarben erfolgen. Wird abgeschaltet."
-#: client/gui-gtk-2.0/menu.c:250
+#: client/gui-gtk-2.0/menu.c:256
msgid "Leaving a local game will end it!"
msgstr "Wenn Sie das lokale Spiel verlassen, wird es beendet!"
-#: client/gui-gtk-2.0/menu.c:700 client/gui-win32/menu.c:303
+#: client/gui-gtk-2.0/menu.c:727 client/gui-win32/menu.c:303
msgid "_Game"
msgstr "_Spiel"
-#: client/gui-gtk-2.0/menu.c:702 client/gui-gtk-2.0/menu.c:704
-#: client/gui-gtk-2.0/menu.c:706 client/gui-gtk-2.0/menu.c:708
-#: client/gui-gtk-2.0/menu.c:710 client/gui-gtk-2.0/menu.c:712
-#: client/gui-gtk-2.0/menu.c:714 client/gui-gtk-2.0/menu.c:717
-#: client/gui-gtk-2.0/menu.c:720 client/gui-gtk-2.0/menu.c:722
-#: client/gui-gtk-2.0/menu.c:724 client/gui-gtk-2.0/menu.c:726
-#: client/gui-gtk-2.0/menu.c:728 client/gui-gtk-2.0/menu.c:730
-#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:736
-#: client/gui-gtk-2.0/menu.c:738 client/gui-gtk-2.0/menu.c:740
+#: client/gui-gtk-2.0/menu.c:729 client/gui-gtk-2.0/menu.c:731
+#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:735
+#: client/gui-gtk-2.0/menu.c:737 client/gui-gtk-2.0/menu.c:739
+#: client/gui-gtk-2.0/menu.c:741 client/gui-gtk-2.0/menu.c:744
+#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
+#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
+#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
+#: client/gui-gtk-2.0/menu.c:760 client/gui-gtk-2.0/menu.c:763
+#: client/gui-gtk-2.0/menu.c:765 client/gui-gtk-2.0/menu.c:767
#: data/Freeciv.in:2026
msgid "Game"
msgstr "Spiel"
-#: client/gui-gtk-2.0/menu.c:704 client/gui-gtk-2.0/menu.c:706
-#: client/gui-gtk-2.0/menu.c:708
+#: client/gui-gtk-2.0/menu.c:731 client/gui-gtk-2.0/menu.c:733
+#: client/gui-gtk-2.0/menu.c:735
msgid "_Chat"
msgstr "_Chat"
-#: client/gui-gtk-2.0/menu.c:706 client/gui-win32/menu.c:314
+#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:314
msgid "_Clear Log"
msgstr "Textfenster _löschen"
-#: client/gui-gtk-2.0/menu.c:708 client/gui-win32/menu.c:313
+#: client/gui-gtk-2.0/menu.c:735 client/gui-win32/menu.c:313
msgid "_Write Log"
msgstr "_Textfenster speichern"
-#: client/gui-gtk-2.0/menu.c:710 client/gui-win32/menu.c:304
+#: client/gui-gtk-2.0/menu.c:737 client/gui-win32/menu.c:304
msgid "Local _Options"
msgstr "_Lokale Optionen"
-#: client/gui-gtk-2.0/menu.c:712 client/gui-win32/menu.c:305
+#: client/gui-gtk-2.0/menu.c:739 client/gui-win32/menu.c:305
msgid "_Message Options"
msgstr "_Nachrichtendarstellung"
-#: client/gui-gtk-2.0/menu.c:717
+#: client/gui-gtk-2.0/menu.c:744
msgid "_Reload Tileset"
msgstr "_Feldergrafik neu laden"
-#: client/gui-gtk-2.0/menu.c:720
+#: client/gui-gtk-2.0/menu.c:747
msgid "Save Options on _Exit"
-msgstr "Option_en beim Verlassen speichern"
+msgstr "_Optionen beim Verlassen speichern"
-#: client/gui-gtk-2.0/menu.c:722
+#: client/gui-gtk-2.0/menu.c:749
msgid "Sa_ve Options"
-msgstr "Opt_ionen sichern"
+msgstr "O_ptionen sichern"
-#: client/gui-gtk-2.0/menu.c:726 client/gui-win32/menu.c:308
+#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:308
msgid "Server O_ptions"
-msgstr "Server_optionen"
+msgstr "Serverop_tionen"
-#: client/gui-gtk-2.0/menu.c:730 client/gui-win32/menu.c:310
+#: client/gui-gtk-2.0/menu.c:757 client/gui-win32/menu.c:310
msgid "_Save Game"
msgstr "_Spiel speichern"
-#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:311
+#: client/gui-gtk-2.0/menu.c:760 client/gui-win32/menu.c:311
msgid "Save Game _As..."
msgstr "Spiel speichern _als..."
-#: client/gui-gtk-2.0/menu.c:738
+#: client/gui-gtk-2.0/menu.c:765
msgid "_Leave"
msgstr "Spiel _verlassen"
-#: client/gui-gtk-2.0/menu.c:740 client/gui-win32/menu.c:317
+#: client/gui-gtk-2.0/menu.c:767 client/gui-win32/menu.c:317
msgid "_Quit"
msgstr "_Beenden"
-#: client/gui-gtk-2.0/menu.c:745 client/gui-win32/menu.c:321
+#: client/gui-gtk-2.0/menu.c:772 client/gui-win32/menu.c:321
msgid "Gov_ernment"
msgstr "_Regierungsformen"
-#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
-#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
-#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:774 client/gui-gtk-2.0/menu.c:776
+#: client/gui-gtk-2.0/menu.c:778 client/gui-gtk-2.0/menu.c:780
+#: client/gui-gtk-2.0/menu.c:782 client/gui-gtk-2.0/menu.c:784
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
#: client/gui-xaw/menu.c:248 data/Freeciv.in:2027 data/helpdata.txt:1320
msgid "Government"
msgstr "Regierungsformen"
-#: client/gui-gtk-2.0/menu.c:749 client/gui-win32/menu.c:322
+#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:322
msgid "_Tax Rates"
msgstr "Steuer_quote"
-#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:324
+#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:324
msgid "_Find City"
msgstr "Stadt _suchen"
-#: client/gui-gtk-2.0/menu.c:755 client/gui-win32/menu.c:325
+#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:325
msgid "_Worklists"
msgstr "_Arbeitslisten"
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
-#: client/gui-gtk-2.0/menu.c:764 client/gui-win32/menu.c:327
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
+#: client/gui-gtk-2.0/menu.c:791 client/gui-win32/menu.c:327
msgid "_Change Government"
msgstr "_Regierung ändern"
-#: client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:788
msgid "_Revolution..."
msgstr "_Revolution..."
-#: client/gui-gtk-2.0/menu.c:764 client/gui-gtk-2.0/menu.c:970
+#: client/gui-gtk-2.0/menu.c:791 client/gui-gtk-2.0/menu.c:1013
#: client/gui-win32/menu.c:431
msgid "_Government"
msgstr "_Regierungsformen"
-#: client/gui-gtk-2.0/menu.c:768 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:795 client/gui-gtk-2.0/menu.c:959
#: client/gui-win32/menu.c:334
msgid "_View"
msgstr "_Ansicht"
-#: client/gui-gtk-2.0/menu.c:772
+#: client/gui-gtk-2.0/menu.c:799
msgid "City Outlines"
-msgstr "Stadtgrenzen"
+msgstr "_Stadtgrenzen"
-#: client/gui-gtk-2.0/menu.c:774 client/gui-win32/menu.c:335
+#: client/gui-gtk-2.0/menu.c:801 client/gui-win32/menu.c:335
msgid "Map _Grid"
msgstr "_Gitterlinien"
-#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:336
+#: client/gui-gtk-2.0/menu.c:803 client/gui-win32/menu.c:336
msgid "National _Borders"
-msgstr "Nationale _Grenzen"
+msgstr "Nationale Gren_zen"
-#: client/gui-gtk-2.0/menu.c:778 client/gui-win32/menu.c:337
+#: client/gui-gtk-2.0/menu.c:805 client/gui-win32/menu.c:337
msgid "City _Names"
msgstr "Städte_namen"
-#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:338
+#: client/gui-gtk-2.0/menu.c:807 client/gui-win32/menu.c:338
msgid "City G_rowth"
msgstr "Städte_wachstum"
-#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:339
+#: client/gui-gtk-2.0/menu.c:809 client/gui-win32/menu.c:339
msgid "City _Productions"
-msgstr "städtische _Erzeugnisse"
+msgstr "Stadt_produktion"
-#: client/gui-gtk-2.0/menu.c:784 client/gui-sdl/optiondlg.c:1719
+#: client/gui-gtk-2.0/menu.c:811
+msgid "City Buy Cost"
+msgstr "_Kaufpreis"
+
+#: client/gui-gtk-2.0/menu.c:813
+msgid "City Traderoutes"
+msgstr "_Handelswege"
+
+#: client/gui-gtk-2.0/menu.c:815 client/gui-sdl/optiondlg.c:1719
msgid "Draw city worker map grid"
-msgstr "Zeige Kartengitter für Stadtarbeiter"
+msgstr "Zeige Kar_tengitter für Stadtarbeiter"
-#: client/gui-gtk-2.0/menu.c:788 client/gui-sdl/optiondlg.c:1635
+#: client/gui-gtk-2.0/menu.c:819 client/gui-sdl/optiondlg.c:1635
#: client/gui-win32/menu.c:340 client/gui-xaw/menu.c:148
#: client/gui-xaw/menu.c:246 manual/civmanual.c:220 data/helpdata.txt:1220
msgid "Terrain"
msgstr "Geländeformen"
-#: client/gui-gtk-2.0/menu.c:790 client/gui-win32/menu.c:341
+#: client/gui-gtk-2.0/menu.c:821 client/gui-win32/menu.c:341
#: client/gui-xaw/menu.c:149
msgid "Coastline"
msgstr "Küstenverlauf"
-#: client/gui-gtk-2.0/menu.c:796 client/gui-win32/menu.c:343
+#: client/gui-gtk-2.0/menu.c:827 client/gui-win32/menu.c:343
msgid "Roads & Rails"
msgstr "Straßen & Eisenbahnen"
-#: client/gui-gtk-2.0/menu.c:800 client/gui-sdl/optiondlg.c:1933
+#: client/gui-gtk-2.0/menu.c:831 client/gui-sdl/optiondlg.c:1933
#: client/gui-win32/menu.c:345 client/gui-xaw/menu.c:152
msgid "Mines"
msgstr "Bergwerke"
-#: client/gui-gtk-2.0/menu.c:802 client/gui-win32/menu.c:346
+#: client/gui-gtk-2.0/menu.c:833 client/gui-win32/menu.c:346
msgid "Fortress & Airbase"
msgstr "Befestigungen und Fliegerhorste"
-#: client/gui-gtk-2.0/menu.c:804 client/gui-win32/menu.c:348
+#: client/gui-gtk-2.0/menu.c:835 client/gui-win32/menu.c:348
#: client/gui-xaw/menu.c:154
msgid "Specials"
msgstr "Extras"
-#: client/gui-gtk-2.0/menu.c:806 client/gui-win32/menu.c:349
+#: client/gui-gtk-2.0/menu.c:837 client/gui-win32/menu.c:349
#: client/gui-xaw/menu.c:155
msgid "Pollution & Fallout"
msgstr "Verschmutzung & Fallout"
-#: client/gui-gtk-2.0/menu.c:812 client/gui-win32/menu.c:352
+#: client/gui-gtk-2.0/menu.c:843 client/gui-win32/menu.c:352
#: client/gui-xaw/menu.c:158
msgid "Focus Unit"
msgstr "auf Einheit zentrieren"
-#: client/gui-gtk-2.0/menu.c:814 client/gui-sdl/optiondlg.c:1854
+#: client/gui-gtk-2.0/menu.c:845 client/gui-sdl/optiondlg.c:1854
#: client/gui-win32/menu.c:353 client/gui-xaw/menu.c:159
msgid "Fog of War"
msgstr "Nebel des Krieges"
-#: client/gui-gtk-2.0/menu.c:818
+#: client/gui-gtk-2.0/menu.c:849
msgid "_Full Screen"
msgstr "_Vollbildmodus"
-#: client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/menu.c:853
msgid "_Center View"
msgstr "_Zentrieren"
-#: client/gui-gtk-2.0/menu.c:825 client/gui-win32/menu.c:358
+#: client/gui-gtk-2.0/menu.c:856 client/gui-win32/menu.c:358
msgid "_Orders"
msgstr "_Befehle"
-#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
-#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
-#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
-#: client/gui-gtk-2.0/menu.c:855 client/gui-gtk-2.0/menu.c:857
-#: client/gui-gtk-2.0/menu.c:859 client/gui-gtk-2.0/menu.c:861
-#: client/gui-gtk-2.0/menu.c:863 client/gui-gtk-2.0/menu.c:865
-#: client/gui-gtk-2.0/menu.c:867 client/gui-gtk-2.0/menu.c:869
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875 client/gui-gtk-2.0/menu.c:877
-#: client/gui-gtk-2.0/menu.c:879 client/gui-gtk-2.0/menu.c:881
-#: client/gui-gtk-2.0/menu.c:883 client/gui-gtk-2.0/menu.c:885
-#: client/gui-gtk-2.0/menu.c:887 client/gui-gtk-2.0/menu.c:889
-#: client/gui-gtk-2.0/menu.c:891 client/gui-gtk-2.0/menu.c:893
-#: client/gui-gtk-2.0/menu.c:895 client/gui-gtk-2.0/menu.c:897
-#: client/gui-gtk-2.0/menu.c:899 client/gui-gtk-2.0/menu.c:901
-#: client/gui-gtk-2.0/menu.c:903 data/Freeciv.in:2029
+#: client/gui-gtk-2.0/menu.c:858 client/gui-gtk-2.0/menu.c:860
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:864
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:868
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:872
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:876
+#: client/gui-gtk-2.0/menu.c:878 client/gui-gtk-2.0/menu.c:880
+#: client/gui-gtk-2.0/menu.c:882 client/gui-gtk-2.0/menu.c:884
+#: client/gui-gtk-2.0/menu.c:886 client/gui-gtk-2.0/menu.c:888
+#: client/gui-gtk-2.0/menu.c:890 client/gui-gtk-2.0/menu.c:892
+#: client/gui-gtk-2.0/menu.c:894 client/gui-gtk-2.0/menu.c:896
+#: client/gui-gtk-2.0/menu.c:898 client/gui-gtk-2.0/menu.c:900
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906 client/gui-gtk-2.0/menu.c:908
+#: client/gui-gtk-2.0/menu.c:910 client/gui-gtk-2.0/menu.c:912
+#: client/gui-gtk-2.0/menu.c:914 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:918 client/gui-gtk-2.0/menu.c:920
+#: client/gui-gtk-2.0/menu.c:922 client/gui-gtk-2.0/menu.c:924
+#: client/gui-gtk-2.0/menu.c:926 client/gui-gtk-2.0/menu.c:928
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
+#: client/gui-gtk-2.0/menu.c:946 data/Freeciv.in:2029
msgid "Orders"
msgstr "Befehle"
-#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:1444
+#: client/gui-gtk-2.0/menu.c:860 client/gui-gtk-2.0/menu.c:1489
#: client/gui-win32/menu.c:359
msgid "_Build City"
msgstr "Stadt gründen (_B)"
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:1466
-#: client/gui-gtk-2.0/menu.c:1472 client/gui-win32/menu.c:360
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:1511
+#: client/gui-gtk-2.0/menu.c:1517 client/gui-win32/menu.c:360
msgid "Build _Road"
msgstr "St_raße bauen"
-#: client/gui-gtk-2.0/menu.c:833 client/gui-gtk-2.0/menu.c:1360
+#: 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 "Bewässerungssystem anlegen (_I)"
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:1361
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:1406
#: client/gui-win32/menu.c:362
msgid "Build _Mine"
msgstr "Bergwerk bauen (_M)"
-#: client/gui-gtk-2.0/menu.c:837 client/gui-gtk-2.0/menu.c:1362
+#: client/gui-gtk-2.0/menu.c:868 client/gui-gtk-2.0/menu.c:1407
msgid "Transf_orm Terrain"
msgstr "Landschaft verändern (_O)"
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:1508
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:1553
#: client/gui-win32/menu.c:364
msgid "Build _Fortress"
msgstr "Be_festigung errichten"
-#: client/gui-gtk-2.0/menu.c:841 client/gui-win32/menu.c:365
+#: client/gui-gtk-2.0/menu.c:872 client/gui-win32/menu.c:365
msgid "Build Airbas_e"
msgstr "Fli_egerhorst bauen"
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:1514
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:1559
#: client/gui-win32/menu.c:366
msgid "Clean _Pollution"
msgstr "Umweltverschmutzung beseitigen (_P)"
-#: client/gui-gtk-2.0/menu.c:845 client/gui-win32/menu.c:367
+#: client/gui-gtk-2.0/menu.c:876 client/gui-win32/menu.c:367
msgid "Clean _Nuclear Fallout"
msgstr "Fallout beseitige_n"
-#: client/gui-gtk-2.0/menu.c:849 client/gui-win32/menu.c:369
+#: client/gui-gtk-2.0/menu.c:880 client/gui-win32/menu.c:369
msgid "_Sentry"
msgstr "Bewachen (_S)"
-#: client/gui-gtk-2.0/menu.c:855 client/gui-win32/menu.c:372
+#: client/gui-gtk-2.0/menu.c:886 client/gui-win32/menu.c:372
msgid "Make _Homecity"
msgstr "Standort zur neuen _Heimatstadt machen"
-#: client/gui-gtk-2.0/menu.c:857 client/gui-win32/menu.c:373
+#: client/gui-gtk-2.0/menu.c:888 client/gui-win32/menu.c:373
msgid "_Load"
msgstr "Einschiffen (_L)"
-#: client/gui-gtk-2.0/menu.c:859
+#: client/gui-gtk-2.0/menu.c:890
msgid "_Unload Transporter"
msgstr "Schiff entladen (_U)"
-#: client/gui-gtk-2.0/menu.c:861 client/gui-win32/menu.c:374
+#: client/gui-gtk-2.0/menu.c:892 client/gui-win32/menu.c:374
msgid "_Unload"
msgstr "A_usschiffen"
-#: client/gui-gtk-2.0/menu.c:863 client/gui-win32/menu.c:375
+#: client/gui-gtk-2.0/menu.c:894 client/gui-win32/menu.c:375
msgid "Wake up o_thers"
msgstr "Andere alarmieren (_T)"
-#: client/gui-gtk-2.0/menu.c:867
+#: client/gui-gtk-2.0/menu.c:898
msgid "_Auto Settler"
msgstr "Siedler _automatisieren"
-#: client/gui-gtk-2.0/menu.c:869 client/gui-win32/menu.c:378
+#: client/gui-gtk-2.0/menu.c:900 client/gui-win32/menu.c:378
msgid "Auto E_xplore"
msgstr "Automatisch erkunden (_X)"
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906
msgid "_Connect"
msgstr "_Verbinden"
-#: client/gui-gtk-2.0/menu.c:871 client/gui-win32/menu.c:380
+#: client/gui-gtk-2.0/menu.c:902 client/gui-win32/menu.c:380
msgid "_Road"
msgstr "_Straße"
-#: client/gui-gtk-2.0/menu.c:873 client/gui-win32/menu.c:381
+#: client/gui-gtk-2.0/menu.c:904 client/gui-win32/menu.c:381
msgid "Rai_l"
msgstr "_Eisenbahn"
-#: client/gui-gtk-2.0/menu.c:875 client/gui-win32/menu.c:382
+#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:382
msgid "_Irrigate"
msgstr "_Bewässern"
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
msgid "Go _to"
msgstr "_Gehe nach"
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
msgid "_Build city"
msgstr "Stadt gründen (_B)"
-#: client/gui-gtk-2.0/menu.c:879
+#: client/gui-gtk-2.0/menu.c:910
msgid "Patrol (_Q)"
msgstr "Patrouillieren (_Q)"
-#: client/gui-gtk-2.0/menu.c:881 client/gui-win32/menu.c:385
+#: client/gui-gtk-2.0/menu.c:912 client/gui-win32/menu.c:385
msgid "_Go to"
msgstr "_Gehe nach"
-#: client/gui-gtk-2.0/menu.c:883
+#: client/gui-gtk-2.0/menu.c:914
msgid "Go\\/Airlift to City"
msgstr "Gehe\\/fliege nach Stadt"
-#: client/gui-gtk-2.0/menu.c:885 client/gui-sdl/menu.c:450
+#: client/gui-gtk-2.0/menu.c:916 client/gui-sdl/menu.c:450
#: client/gui-win32/menu.c:387 client/gui-xaw/menu.c:203
msgid "Return to nearest city"
msgstr "Rückkehr zur nächsten Stadt"
-#: client/gui-gtk-2.0/menu.c:889 client/gui-win32/menu.c:389
+#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:389
#: client/gui-xaw/menu.c:205
msgid "Disband Unit"
msgstr "Einheit auflösen"
-#: client/gui-gtk-2.0/menu.c:891 client/gui-sdl/citydlg.c:532
+#: client/gui-gtk-2.0/menu.c:922 client/gui-sdl/citydlg.c:532
#: data/Freeciv.in:1186
msgid "Upgrade unit"
msgstr "Einheit modernisieren"
-#: client/gui-gtk-2.0/menu.c:893
+#: client/gui-gtk-2.0/menu.c:924
msgid "Diplomat\\/Spy Actions"
msgstr "Aktionen für Diplomaten\\/Spione"
-#: client/gui-gtk-2.0/menu.c:895 client/gui-sdl/menu.c:399
+#: client/gui-gtk-2.0/menu.c:926 client/gui-sdl/menu.c:399
#: client/gui-win32/menu.c:391 client/gui-xaw/menu.c:209
msgid "Explode Nuclear"
msgstr "Atombombe zünden"
-#: client/gui-gtk-2.0/menu.c:899
-msgid "Select same type"
-msgstr "Einheiten gleichen Typs auswählen"
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/cityrep.c:882
+msgid "Select"
+msgstr "Auswählen"
+
+#: client/gui-gtk-2.0/menu.c:934
+msgid "Single"
+msgstr "Einzeln"
-#: client/gui-gtk-2.0/menu.c:901 client/gui-win32/menu.c:393
+#: client/gui-gtk-2.0/menu.c:936
+msgid "Same Type On Tile"
+msgstr "Alle dieses Typs auf dem Feld"
+
+#: client/gui-gtk-2.0/menu.c:938
+msgid "All On Tile"
+msgstr "Alle auf diesem Feld"
+
+#: client/gui-gtk-2.0/menu.c:940
+msgid "Same Type On Continent"
+msgstr "Alle dieses Typs auf dem Kontinent"
+
+#: client/gui-gtk-2.0/menu.c:942
+msgid "Same Type Everywhere"
+msgstr "Alle dieses Typs überall"
+
+#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:393
msgid "_Wait"
msgstr "_Warten"
-#: client/gui-gtk-2.0/menu.c:903 client/gui-win32/menu.c:394
+#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:394
#: client/gui-xaw/menu.c:213
msgid "Done"
msgstr "Fertig"
-#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:398
+#: client/gui-gtk-2.0/menu.c:949 client/gui-win32/menu.c:398
msgid "_Reports"
msgstr "Ber_ichte"
-#: client/gui-gtk-2.0/menu.c:908 client/gui-gtk-2.0/menu.c:910
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:914
-#: client/gui-gtk-2.0/menu.c:916 client/gui-gtk-2.0/menu.c:918
-#: client/gui-gtk-2.0/menu.c:920 client/gui-gtk-2.0/menu.c:922
-#: client/gui-gtk-2.0/menu.c:924 client/gui-gtk-2.0/menu.c:926
-#: client/gui-gtk-2.0/menu.c:928 client/gui-gtk-2.0/menu.c:930
-#: client/gui-gtk-2.0/menu.c:932 data/Freeciv.in:2030
+#: client/gui-gtk-2.0/menu.c:951 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:957
+#: client/gui-gtk-2.0/menu.c:959 client/gui-gtk-2.0/menu.c:961
+#: client/gui-gtk-2.0/menu.c:963 client/gui-gtk-2.0/menu.c:965
+#: client/gui-gtk-2.0/menu.c:967 client/gui-gtk-2.0/menu.c:969
+#: client/gui-gtk-2.0/menu.c:971 client/gui-gtk-2.0/menu.c:973
+#: client/gui-gtk-2.0/menu.c:975 data/Freeciv.in:2030
msgid "Reports"
msgstr "Berichte"
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:958
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:1001
#: client/gui-win32/menu.c:400 client/gui-win32/menu.c:425
msgid "_Units"
msgstr "_Einheiten"
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/menu.c:914 client/gui-win32/menu.c:402
+#: client/gui-gtk-2.0/menu.c:957 client/gui-win32/menu.c:402
msgid "_Nations"
msgstr "_Nationen"
-#: client/gui-gtk-2.0/menu.c:918 client/gui-win32/menu.c:403
+#: client/gui-gtk-2.0/menu.c:961 client/gui-win32/menu.c:403
msgid "_Economy"
msgstr "_Wirtschaft"
#. TRANS: Research report action
-#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:405
+#: client/gui-gtk-2.0/menu.c:963 client/gui-win32/menu.c:405
msgid "_Research"
msgstr "_Forschung"
-#: client/gui-gtk-2.0/menu.c:924 client/gui-win32/menu.c:407
+#: client/gui-gtk-2.0/menu.c:967 client/gui-win32/menu.c:407
msgid "_Wonders of the World"
msgstr "Weltw_under"
-#: client/gui-gtk-2.0/menu.c:926 client/gui-win32/menu.c:408
+#: client/gui-gtk-2.0/menu.c:969 client/gui-win32/menu.c:408
msgid "_Top Five Cities"
msgstr "_Die besten 5 Städte"
-#: client/gui-gtk-2.0/menu.c:928 client/gui-win32/menu.c:409
+#: client/gui-gtk-2.0/menu.c:971 client/gui-win32/menu.c:409
msgid "_Messages"
-msgstr "_Nachrichten"
+msgstr "Na_chrichten"
-#: client/gui-gtk-2.0/menu.c:930 client/gui-win32/menu.c:410
+#: client/gui-gtk-2.0/menu.c:973 client/gui-win32/menu.c:410
msgid "_Demographics"
msgstr "_Bericht zur Lage der Nation"
-#: client/gui-gtk-2.0/menu.c:932 client/gui-gtk-2.0/plrdlg.c:471
+#: client/gui-gtk-2.0/menu.c:975 client/gui-gtk-2.0/plrdlg.c:354
#: client/gui-win32/menu.c:411
msgid "_Spaceship"
msgstr "_Raumschiff"
-#: client/gui-gtk-2.0/menu.c:936 client/gui-win32/menu.c:415
+#: client/gui-gtk-2.0/menu.c:979 client/gui-win32/menu.c:415
msgid "_Help"
msgstr "_Hilfe"
-#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
-#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
-#: client/gui-gtk-2.0/menu.c:946 client/gui-gtk-2.0/menu.c:948
-#: client/gui-gtk-2.0/menu.c:950 client/gui-gtk-2.0/menu.c:952
-#: client/gui-gtk-2.0/menu.c:954 client/gui-gtk-2.0/menu.c:956
-#: client/gui-gtk-2.0/menu.c:958 client/gui-gtk-2.0/menu.c:960
-#: client/gui-gtk-2.0/menu.c:962 client/gui-gtk-2.0/menu.c:964
-#: client/gui-gtk-2.0/menu.c:966 client/gui-gtk-2.0/menu.c:968
-#: client/gui-gtk-2.0/menu.c:970 client/gui-gtk-2.0/menu.c:972
-#: client/gui-gtk-2.0/menu.c:974 client/gui-gtk-2.0/menu.c:976
-#: client/gui-gtk-2.0/menu.c:978 client/gui-gtk-2.0/menu.c:980
+#: client/gui-gtk-2.0/menu.c:981 client/gui-gtk-2.0/menu.c:983
+#: client/gui-gtk-2.0/menu.c:985 client/gui-gtk-2.0/menu.c:987
+#: client/gui-gtk-2.0/menu.c:989 client/gui-gtk-2.0/menu.c:991
+#: client/gui-gtk-2.0/menu.c:993 client/gui-gtk-2.0/menu.c:995
+#: client/gui-gtk-2.0/menu.c:997 client/gui-gtk-2.0/menu.c:999
+#: client/gui-gtk-2.0/menu.c:1001 client/gui-gtk-2.0/menu.c:1003
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-gtk-2.0/menu.c:1007
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-gtk-2.0/menu.c:1011
+#: client/gui-gtk-2.0/menu.c:1013 client/gui-gtk-2.0/menu.c:1015
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-gtk-2.0/menu.c:1019
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-gtk-2.0/menu.c:1023
#: client/gui-gtk-2.0/repodlgs.c:313 client/gui-win32/citydlg.c:1077
#: client/gui-win32/repodlgs.c:289 client/gui-win32/wldlg.c:846
#: data/Freeciv.in:1466 data/Freeciv.in:2031 data/Freeciv.in:2101
@@ -12184,119 +12416,119 @@ msgstr "_Hilfe"
msgid "Help"
msgstr "Hilfe"
-#: client/gui-gtk-2.0/menu.c:940 client/gui-win32/menu.c:416
+#: client/gui-gtk-2.0/menu.c:983 client/gui-win32/menu.c:416
msgid "Language_s"
msgstr "_Deutsche Ãœbersetzung"
-#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/menu.c:417
+#: client/gui-gtk-2.0/menu.c:985 client/gui-win32/menu.c:417
msgid "Co_nnecting"
msgstr "_Verbindungsaufbau"
-#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:418
+#: client/gui-gtk-2.0/menu.c:987 client/gui-win32/menu.c:418
msgid "C_ontrols"
msgstr "_Bedienungselemente"
-#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:419
+#: client/gui-gtk-2.0/menu.c:989 client/gui-win32/menu.c:419
msgid "C_hatline"
msgstr "_Chatten"
-#: client/gui-gtk-2.0/menu.c:948 client/gui-win32/menu.c:420
+#: client/gui-gtk-2.0/menu.c:991 client/gui-win32/menu.c:420
msgid "_Worklist Editor"
msgstr "_Arbeitsliste bearbeiten"
-#: client/gui-gtk-2.0/menu.c:950 client/gui-win32/menu.c:421
+#: client/gui-gtk-2.0/menu.c:993 client/gui-win32/menu.c:421
msgid "Citizen _Management"
-msgstr "_Bürgermeister"
+msgstr "Bürger_meister"
-#: client/gui-gtk-2.0/menu.c:952 client/gui-win32/menu.c:422
+#: client/gui-gtk-2.0/menu.c:995 client/gui-win32/menu.c:422
msgid "_Playing"
msgstr "_Spiel"
-#: client/gui-gtk-2.0/menu.c:956 client/gui-win32/menu.c:424
+#: client/gui-gtk-2.0/menu.c:999 client/gui-win32/menu.c:424
msgid "City _Improvements"
-msgstr "_Stadterweiterungen"
+msgstr "S_tadterweiterungen"
-#: client/gui-gtk-2.0/menu.c:960 client/gui-win32/menu.c:426
+#: client/gui-gtk-2.0/menu.c:1003 client/gui-win32/menu.c:426
msgid "Com_bat"
msgstr "_Kampf"
-#: client/gui-gtk-2.0/menu.c:962 client/gui-win32/menu.c:427
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-win32/menu.c:427
msgid "_ZOC"
-msgstr "_Kontrollzonen"
+msgstr "K_ontrollzonen"
-#: client/gui-gtk-2.0/menu.c:964 client/gui-win32/menu.c:428
+#: client/gui-gtk-2.0/menu.c:1007 client/gui-win32/menu.c:428
msgid "Techno_logy"
msgstr "_Forschung"
-#: client/gui-gtk-2.0/menu.c:966 client/gui-win32/menu.c:429
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-win32/menu.c:429
msgid "_Terrain"
msgstr "_Geländeformen"
-#: client/gui-gtk-2.0/menu.c:968 client/gui-win32/menu.c:430
+#: client/gui-gtk-2.0/menu.c:1011 client/gui-win32/menu.c:430
msgid "Won_ders"
msgstr "_Weltwunder"
-#: client/gui-gtk-2.0/menu.c:972 client/gui-win32/menu.c:432
+#: client/gui-gtk-2.0/menu.c:1015 client/gui-win32/menu.c:432
msgid "Happin_ess"
msgstr "_Zufriedenheit"
-#: client/gui-gtk-2.0/menu.c:974 client/gui-win32/menu.c:433
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-win32/menu.c:433
msgid "Space _Race"
-msgstr "_Weltraum"
+msgstr "Weltra_um"
-#: client/gui-gtk-2.0/menu.c:978 client/gui-win32/menu.c:435
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-win32/menu.c:435
msgid "_Copying"
msgstr "_Lizenz"
-#: client/gui-gtk-2.0/menu.c:980 client/gui-win32/menu.c:436
+#: client/gui-gtk-2.0/menu.c:1023 client/gui-win32/menu.c:436
msgid "_About"
msgstr "_Ãœber"
-#: client/gui-gtk-2.0/menu.c:1264
+#: client/gui-gtk-2.0/menu.c:1307
#, c-format
msgid "%s..."
msgstr "%s..."
-#: client/gui-gtk-2.0/menu.c:1352
+#: client/gui-gtk-2.0/menu.c:1397
#, c-format
msgid "Change to %s (_I)"
msgstr "Zu %s verändern (_I)"
-#: client/gui-gtk-2.0/menu.c:1353
+#: client/gui-gtk-2.0/menu.c:1398
#, c-format
msgid "Change to %s (_M)"
msgstr "Zu %s verändern (_M)"
-#: client/gui-gtk-2.0/menu.c:1354
+#: client/gui-gtk-2.0/menu.c:1399
#, c-format
msgid "Transf_orm to %s"
msgstr "Zu %s verändern (_O)"
-#: client/gui-gtk-2.0/menu.c:1427
+#: client/gui-gtk-2.0/menu.c:1472
msgid "Help _Build Wonder"
msgstr "Zum _Bau eines Weltwunder beitragen"
-#: client/gui-gtk-2.0/menu.c:1441
+#: client/gui-gtk-2.0/menu.c:1486
msgid "Add to City (_B)"
msgstr "Zur Stadt hinzufügen (_B)"
-#: client/gui-gtk-2.0/menu.c:1449
+#: client/gui-gtk-2.0/menu.c:1494
msgid "Make Trade _Route"
msgstr "Handelsweg ein_richten"
-#: client/gui-gtk-2.0/menu.c:1463
+#: client/gui-gtk-2.0/menu.c:1508
msgid "Build _Railroad"
msgstr "Schienen verlegen (_R)"
-#: client/gui-gtk-2.0/menu.c:1486
+#: client/gui-gtk-2.0/menu.c:1531
msgid "Bu_ild Farmland"
msgstr "Erzeuge Ackerland (_I)"
-#: client/gui-gtk-2.0/menu.c:1506
+#: client/gui-gtk-2.0/menu.c:1551
msgid "_Fortify"
msgstr "Eingraben (_F)"
-#: client/gui-gtk-2.0/menu.c:1512
+#: client/gui-gtk-2.0/menu.c:1557
msgid "_Paradrop"
msgstr "Fallschirms_pringen"
@@ -12330,13 +12562,29 @@ msgstr "Nach:"
msgid "Pop"
msgstr "Eig:"
-#: client/gui-gtk-2.0/messagewin.c:155 client/gui-sdl/messagewin.c:247
+#: client/gui-gtk-2.0/messagewin.c:186 client/gui-sdl/messagewin.c:247
#: client/gui-win32/messagewin.c:132 client/gui-xaw/menu.c:228
#: data/Freeciv.in:3273 data/Freeciv.in:3274 data/Freeciv.in:3283
msgid "Messages"
msgstr "Nachrichtenfenster"
-#: client/gui-gtk-2.0/plrdlg.c:330
+#: client/gui-gtk-2.0/plrdlg.c:317
+msgid "_Meet"
+msgstr "_Konferenz"
+
+#: client/gui-gtk-2.0/plrdlg.c:323
+msgid "Cancel _Treaty"
+msgstr "_Abkommen aufkündigen"
+
+#: client/gui-gtk-2.0/plrdlg.c:329
+msgid "_Withdraw Vision"
+msgstr "Karteneinsicht _verbieten"
+
+#: client/gui-gtk-2.0/plrdlg.c:348
+msgid "_Report"
+msgstr "_Berichte"
+
+#: client/gui-gtk-2.0/plrdlg.c:386
msgid "?show:Dead Players"
msgstr "Tote Spieler"
@@ -12344,264 +12592,266 @@ msgstr "Tote Spieler"
#. TRANS: Nations report action
#. TRANS: Nations report title
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/plrdlg.c:350 client/gui-sdl/mapctrl.c:1580
+#: client/gui-gtk-2.0/plrdlg.c:406 client/gui-sdl/mapctrl.c:1580
#: client/gui-sdl/plrdlg.c:608 client/gui-win32/plrdlg.c:344
#: client/gui-xaw/menu.c:221 data/Freeciv.in:3192 data/Freeciv.in:3193
msgid "Nations"
msgstr "Nationen"
-#: client/gui-gtk-2.0/plrdlg.c:443
+#: client/gui-gtk-2.0/plrdlg.c:511
+msgid "Di_plomacy"
+msgstr "_Diplomatie"
+
+#: client/gui-gtk-2.0/plrdlg.c:516
msgid "_Intelligence"
msgstr "_Geheimdienst"
-#: client/gui-gtk-2.0/plrdlg.c:450
-msgid "_Meet"
-msgstr "_Konferenz"
-
-#: client/gui-gtk-2.0/plrdlg.c:457
-msgid "Cancel _Treaty"
-msgstr "_Abkommen aufkündigen"
-
-#: client/gui-gtk-2.0/plrdlg.c:464
-msgid "_Withdraw vision"
-msgstr "Karteneinsicht _verbieten"
-
-#: client/gui-gtk-2.0/plrdlg.c:495
+#: client/gui-gtk-2.0/plrdlg.c:526
msgid "_AI"
msgstr "_KI"
-#: client/gui-gtk-2.0/plrdlg.c:501
+#: client/gui-gtk-2.0/plrdlg.c:532
msgid "_Toggle AI Mode"
msgstr "_KI-Modus umschalten"
-#: client/gui-gtk-2.0/pages.c:208
+#: client/gui-gtk-2.0/pages.c:221
msgid "Start _New Game"
msgstr "_Neues Spiel beginnen"
-#: client/gui-gtk-2.0/pages.c:214
+#: client/gui-gtk-2.0/pages.c:227
msgid "Start _Scenario Game"
msgstr "_Szenariospiel beginnen"
-#: client/gui-gtk-2.0/pages.c:220
+#: client/gui-gtk-2.0/pages.c:233
msgid "_Load Saved Game"
msgstr "Gespeichertes Spiel _laden"
-#: client/gui-gtk-2.0/pages.c:229
+#: client/gui-gtk-2.0/pages.c:239
msgid "C_onnect to Network Game"
msgstr "Mit Netzwerkspiel _verbinden"
-#: client/gui-gtk-2.0/pages.c:236
+#: client/gui-gtk-2.0/pages.c:247
msgid "Connect to Gaming _Zone"
msgstr "Mit Gaming _Zone verbinden"
-#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:300
#: client/gui-xaw/connectdlg.c:326
msgid "Passwords don't match, enter password."
msgstr "Keine Übereinstimmung, Paßwort eingeben."
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:779 client/gui-gtk-2.0/pages.c:820
+#: client/gui-win32/connectdlg.c:916
msgid "Server Name"
msgstr "Server"
-#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
+#: 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
+#: data/Freeciv.in:96
msgid "Port"
msgstr "Port"
-#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
+#: client/gui-win32/connectdlg.c:917
msgid "Version"
msgstr "Version"
-#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
-#: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
+#: 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
msgid "Status"
msgstr "Status"
-#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
-#: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
+#: 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
msgid "Players"
msgstr "Spieler"
-#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
+#: client/gui-win32/connectdlg.c:918
msgid "Comment"
msgstr "Kommentar"
-#: client/gui-gtk-2.0/pages.c:747
+#: client/gui-gtk-2.0/pages.c:786
msgid "Local _Area Network"
msgstr "Lokales _Netzwerk"
-#: client/gui-gtk-2.0/pages.c:783
+#: client/gui-gtk-2.0/pages.c:827
msgid "Internet _Metaserver"
msgstr "Internet _Metaserver"
-#: client/gui-gtk-2.0/pages.c:817
+#: client/gui-gtk-2.0/pages.c:864
msgid "_Host:"
msgstr "_Server:"
-#: client/gui-gtk-2.0/pages.c:834
+#: client/gui-gtk-2.0/pages.c:881
msgid "_Port:"
msgstr "_Port:"
-#: client/gui-gtk-2.0/pages.c:851
+#: client/gui-gtk-2.0/pages.c:898
msgid "_Login:"
msgstr "_Name:"
-#: client/gui-gtk-2.0/pages.c:869
+#: client/gui-gtk-2.0/pages.c:916
msgid "Pass_word:"
msgstr "_Paßwort:"
-#: client/gui-gtk-2.0/pages.c:887
+#: client/gui-gtk-2.0/pages.c:934
msgid "Conf_irm Password:"
msgstr "Paßwort _wiederholen:"
-#: client/gui-gtk-2.0/pages.c:912
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: 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/wldlg.c:800 client/gui-win32/wldlg.c:806
+msgid "Type"
+msgstr "Bild"
+
+#: client/gui-gtk-2.0/pages.c:952 client/gui-win32/plrdlg.c:337
+#: data/Freeciv.in:88
+msgid "Host"
+msgstr "Server"
+
+#: client/gui-gtk-2.0/pages.c:981
msgid "C_onnect"
msgstr "_Verbinden"
-#: client/gui-gtk-2.0/pages.c:1142
+#: client/gui-gtk-2.0/pages.c:1211
#, c-format
msgid "Connection name: %s"
msgstr "Verbindungsname: %s"
-#: client/gui-gtk-2.0/pages.c:1145
+#: client/gui-gtk-2.0/pages.c:1214
#, c-format
msgid "Player name: %s"
msgstr "Spielername: %s"
-#: client/gui-gtk-2.0/pages.c:1150
+#: client/gui-gtk-2.0/pages.c:1219
#, c-format
msgid "Host: %s"
msgstr "Server: %s"
-#: client/gui-gtk-2.0/pages.c:1158
+#: client/gui-gtk-2.0/pages.c:1227
msgid "Player/conn info"
msgstr "Spieler/Verbindungsinfo"
-#: client/gui-gtk-2.0/pages.c:1185
+#: client/gui-gtk-2.0/pages.c:1254
#, c-format
msgid "%s info"
msgstr "%s Info"
-#: client/gui-gtk-2.0/pages.c:1196
+#: client/gui-gtk-2.0/pages.c:1265
msgid "Toggle player ready"
msgstr "Spieler bereit / nicht bereit"
-#: client/gui-gtk-2.0/pages.c:1204
+#: client/gui-gtk-2.0/pages.c:1273
msgid "Pick nation"
msgstr "Wähle Nation"
-#: client/gui-gtk-2.0/pages.c:1214
+#: client/gui-gtk-2.0/pages.c:1283
msgid "Observe this player"
msgstr "Diesen Spieler beobachten"
-#: client/gui-gtk-2.0/pages.c:1221
+#: client/gui-gtk-2.0/pages.c:1290
msgid "Take this player"
msgstr "Spieler übernehmen"
-#: client/gui-gtk-2.0/pages.c:1238
+#: client/gui-gtk-2.0/pages.c:1307
msgid "Cut connection"
msgstr "Verbindung trennen"
-#: client/gui-gtk-2.0/pages.c:1248
+#: client/gui-gtk-2.0/pages.c:1317
msgid "Aitoggle player"
msgstr "KI ein/ausschalten"
-#: client/gui-gtk-2.0/pages.c:1257
+#: client/gui-gtk-2.0/pages.c:1326
msgid "Remove player"
msgstr "Spieler entfernen"
-#: client/gui-gtk-2.0/pages.c:1268
+#: client/gui-gtk-2.0/pages.c:1337
msgid "Give info access"
msgstr "Zugriffsberechtigung Info"
-#: client/gui-gtk-2.0/pages.c:1276
+#: client/gui-gtk-2.0/pages.c:1345
msgid "Give ctrl access"
msgstr "Zugriffsberechtigung Ctrl"
#. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1338
+#: client/gui-gtk-2.0/pages.c:1407
#, c-format
msgid "Put on %s"
msgstr "Zu %s hinzugefügt"
-#: client/gui-gtk-2.0/pages.c:1442
+#: client/gui-gtk-2.0/pages.c:1511
msgid "Number of _Players (including AI):"
msgstr "An_zahl der Spieler (einschließlich KI):"
-#: client/gui-gtk-2.0/pages.c:1465
+#: client/gui-gtk-2.0/pages.c:1534
msgid "AI Skill _Level:"
msgstr "_KI Stärke:"
-#: client/gui-gtk-2.0/pages.c:1481
+#: client/gui-gtk-2.0/pages.c:1550
msgid "Ruleset _Version:"
msgstr "_Regelsatz:"
-#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
msgid "_More Game Options..."
msgstr "Weitere Spiel_optionen..."
-#: client/gui-gtk-2.0/pages.c:1514
+#: client/gui-gtk-2.0/pages.c:1583
msgid "Record"
msgstr "Rekord"
-#: client/gui-gtk-2.0/pages.c:1519
+#: client/gui-gtk-2.0/pages.c:1588
msgid "Rating"
msgstr "Bewertung"
-#: client/gui-gtk-2.0/pages.c:1525
+#: client/gui-gtk-2.0/pages.c:1594
msgid "Ready"
msgstr "Bereit"
-#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
-#: data/nation/slovakian.ruleset:26
-msgid "Leader"
-msgstr "Anführer"
+#: client/gui-gtk-2.0/pages.c:1601
+msgid "?player:Leader"
+msgstr "Spieler"
-#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1732 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:1752
+#: client/gui-gtk-2.0/pages.c:1824
msgid "Choose Saved Game to _Load:"
msgstr "Wähle zu _ladendes Spiel:"
-#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
-#: client/gui-gtk-2.0/pages.c:2375
+#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
+#: client/gui-gtk-2.0/pages.c:2451
msgid "_Browse..."
msgstr "_Durchsuchen..."
-#: client/gui-gtk-2.0/pages.c:1839
+#: client/gui-gtk-2.0/pages.c:1911
msgid "Choose a Scenario"
msgstr "Szenario laden"
-#: client/gui-gtk-2.0/pages.c:1926
+#: client/gui-gtk-2.0/pages.c:1998
msgid "Choose a _Scenario:"
msgstr "_Szenario laden:"
-#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
-#: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
-#: client/gui-win32/wldlg.c:806
-msgid "Type"
-msgstr "Bild"
-
-#: client/gui-gtk-2.0/pages.c:2101
+#: client/gui-gtk-2.0/pages.c:2173
msgid "Choose a _nation to play:"
msgstr "Wählen Sie Ihre _Nation:"
-#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2363 client/gui-win32/menu.c:581
msgid "Select Location to Save"
msgstr "Verzeichnis auswählen zum Speichern"
-#: client/gui-gtk-2.0/pages.c:2372 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2448 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr "Spiel speichern"
-#: client/gui-gtk-2.0/pages.c:2413
+#: client/gui-gtk-2.0/pages.c:2489
msgid "Saved _Games:"
msgstr "_Gespeicherte Spiele:"
-#: client/gui-gtk-2.0/pages.c:2440
+#: client/gui-gtk-2.0/pages.c:2516
msgid "Save _Filename:"
msgstr "_Speichere Datei:"
@@ -12654,16 +12904,16 @@ msgstr "Gesamtausgaben:"
#: client/gui-gtk-2.0/repodlgs.c:714
msgid "Sell _Obsolete"
-msgstr "_Verkaufe Veraltetes"
+msgstr "_Veraltete verkaufen"
#: client/gui-gtk-2.0/repodlgs.c:719
msgid "Sell _All"
-msgstr "_Alles verkaufen"
+msgstr "A_lles verkaufen"
#: client/gui-gtk-2.0/repodlgs.c:797
#, c-format
msgid "Do you really wish to sell your %s?\n"
-msgstr "Soll %s wirklich verkauft werden?\n"
+msgstr "Soll %s wirklich in allen Städten verkauft werden?\n"
#: client/gui-gtk-2.0/repodlgs.c:800
msgid "Sell Improvements"
@@ -12879,7 +13129,7 @@ msgstr "_Arbeitslisten:"
#: client/gui-gtk-2.0/wldlg.c:543
msgid "Edit Global _Worklists"
-msgstr "Bearbeite _generelle Arbeitsliste"
+msgstr "_Bearbeite globale Arbeitsliste"
#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1092
#: client/gui-win32/wldlg.c:809
@@ -12892,7 +13142,7 @@ msgstr "_Mögliche Aufgaben:"
#: client/gui-gtk-2.0/wldlg.c:1156
msgid "Show _Future Targets"
-msgstr "_Zeige alle Aufträge"
+msgstr "Zei_ge alle Aufträge"
#: client/gui-gtk-2.0/wldlg.c:1243
msgid "Target _Worklist:"
@@ -12900,7 +13150,7 @@ msgstr "Arbeits_liste:"
#: client/gui-gtk-2.0/wldlg.c:1261
msgid "_Add Global Worklist"
-msgstr "Neue _generelle Arbeitsliste"
+msgstr "Neue globale _Arbeitsliste"
#: client/gui-gtk-2.0/wldlg.c:1277
msgid "Chan_ge Production"
@@ -12953,7 +13203,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:1094
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
msgid "Back"
msgstr "Zurück"
@@ -12962,7 +13212,7 @@ msgid "Start"
msgstr "Start"
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:775
+#: client/gui-win32/connectdlg.c:777
msgid "Load Game"
msgstr "Spiel laden"
@@ -12999,12 +13249,12 @@ msgid "Make new homecity"
msgstr "Standort als neue Heimatstadt wählen"
#: client/gui-sdl/citydlg.c:546 client/gui-sdl/citydlg.c:1418
-#: client/gui-sdl/connectdlg.c:307 client/gui-sdl/connectdlg.c:616
-#: client/gui-sdl/connectdlg.c:802 client/gui-sdl/connectdlg.c:984
+#: 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/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1039
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
#: 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
@@ -13051,7 +13301,7 @@ msgstr "Kaufen?"
#: client/gui-sdl/diplodlg.c:1335 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:2427
+#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
#: client/gui-xaw/cityrep.c:666 client/gui-xaw/cma_fe.c:327
#: client/gui-xaw/cma_fe.c:511 client/gui-xaw/cma_fe.c:765
#: client/gui-xaw/messagedlg.c:72 client/gui-xaw/optiondlg.c:76
@@ -13067,7 +13317,7 @@ msgstr "Nein"
#: client/gui-sdl/diplodlg.c:1345 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:2427 client/gui-xaw/cityrep.c:666
+#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
#: client/gui-xaw/cma_fe.c:327 client/gui-xaw/cma_fe.c:511
#: client/gui-xaw/cma_fe.c:765 client/gui-xaw/messagedlg.c:72
#: client/gui-xaw/optiondlg.c:76 client/gui-xaw/optiondlg.c:304
@@ -13346,36 +13596,36 @@ msgstr "Testen"
msgid "Release city"
msgstr "Deaktivieren"
-#: client/gui-sdl/connectdlg.c:238
+#: client/gui-sdl/connectdlg.c:239
msgid "Creating Server List..."
msgstr "Erzeuge Serverliste..."
-#: client/gui-sdl/connectdlg.c:279 client/gui-sdl/connectdlg.c:343
+#: client/gui-sdl/connectdlg.c:280 client/gui-sdl/connectdlg.c:344
msgid "No LAN servers found"
msgstr "Keine LAN-Server gefunden"
-#: client/gui-sdl/connectdlg.c:281 client/gui-sdl/connectdlg.c:345
+#: client/gui-sdl/connectdlg.c:282 client/gui-sdl/connectdlg.c:346
msgid "No public servers found"
msgstr "Keine öffentlichen Server gefunden"
-#: client/gui-sdl/connectdlg.c:555
+#: client/gui-sdl/connectdlg.c:556
msgid "Player Name :"
msgstr "Spielername :"
-#: client/gui-sdl/connectdlg.c:571
+#: client/gui-sdl/connectdlg.c:572
msgid "Freeciv Server :"
msgstr "Freeciv-Server :"
-#: client/gui-sdl/connectdlg.c:588
+#: client/gui-sdl/connectdlg.c:589
msgid "Port :"
msgstr "Port :"
-#: client/gui-sdl/connectdlg.c:608 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr "Verbinden"
-#: client/gui-sdl/connectdlg.c:794 client/gui-sdl/connectdlg.c:977
+#: client/gui-sdl/connectdlg.c:795 client/gui-sdl/connectdlg.c:978
#: client/gui-xaw/connectdlg.c:145
msgid "Next"
msgstr "Nächste"
@@ -13661,8 +13911,8 @@ msgstr "Unable to initialize SDL library: %s"
# CK: TECHNICAL
#: client/gui-sdl/graphics.c:1021
#, c-format
-msgid "Unable to initialize SDL_ttf library: %s"
-msgstr "Unable to initialize SDL_ttf library: %s"
+msgid "Unable to initialize SDL_ttf library: %s"
+msgstr "Unable to initialize SDL_ttf library: %s"
#: client/gui-sdl/graphics.c:1058
#, c-format
@@ -13752,15 +14002,6 @@ msgstr "Initialisiere Client"
msgid "Waiting for the beginning of the game"
msgstr "Waiting for the beginning of the game"
-# CK: TECHNICAL
-#: client/gui-sdl/gui_string.c:608
-msgid ""
-"Couldn't find stdfont.ttf file. Please link/copy/move anyunicode ttf font to "
-"data dir as stdfont.ttf"
-msgstr ""
-"Couldn't find stdfont.ttf file. Please link/copy/move anyunicode ttf font to "
-"data dir as stdfont.ttf"
-
#. TRANS: Future Technology
#: client/gui-sdl/gui_tilespec.c:506
msgid "FT"
@@ -14353,12 +14594,12 @@ msgid "Leave Game"
msgstr "Spiel verlassen"
#: client/gui-sdl/optiondlg.c:2302 client/gui-sdl/pages.c:255
-#: client/gui-win32/connectdlg.c:1098 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1100 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:963
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
msgid "Start New Game"
msgstr "Neues Spiel beginnen"
@@ -14471,8 +14712,8 @@ msgstr "Nettoeinkommen: "
msgid "%s max rate : %d%%"
msgstr "%s Maximum : %d%%"
-#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1081
-#: client/gui-win32/connectdlg.c:1089 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
+#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
msgid "Update"
msgstr "Aktualisieren"
@@ -14936,10 +15177,6 @@ msgstr "Alles ändern"
msgid "Refresh"
msgstr "Neu laden"
-#: client/gui-win32/cityrep.c:882
-msgid "Select"
-msgstr "Auswählen"
-
#: client/gui-win32/cityrep.c:883
msgid "Configure"
msgstr "Einstellen"
@@ -14989,55 +15226,55 @@ msgstr "Konnte den Spielstand nicht laden"
msgid "Verify Password"
msgstr "Wiederhole Paßwort"
-#: client/gui-win32/connectdlg.c:912 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr "Freeciv-Server wählen"
-#: client/gui-win32/connectdlg.c:913
+#: client/gui-win32/connectdlg.c:915
msgid "Local Area Network"
msgstr "Lokales Netzwerk"
-#: client/gui-win32/connectdlg.c:947
+#: client/gui-win32/connectdlg.c:949
msgid "Welcome to Freeciv"
msgstr "Willkommen bei Freeciv"
-#: client/gui-win32/connectdlg.c:965
+#: client/gui-win32/connectdlg.c:967
msgid "Load Saved Game"
msgstr "Spiel laden"
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
msgid "Connect To Network Game"
msgstr "Mit Netzwerkspiel verbinden"
-#: client/gui-win32/connectdlg.c:977
+#: client/gui-win32/connectdlg.c:979
msgid "Choose a nation to play"
msgstr "Wählen Sie Ihre Nation"
-#: client/gui-win32/connectdlg.c:1012
+#: client/gui-win32/connectdlg.c:1014
msgid "Number of players (Including AI):"
msgstr "Anzahl der Spieler (einschließlich KI):"
-#: client/gui-win32/connectdlg.c:1020
+#: client/gui-win32/connectdlg.c:1022
msgid "AI skill level:"
msgstr "KI Stärke:"
-#: client/gui-win32/connectdlg.c:1034 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
msgid "Game Options"
msgstr "Spieloptionen"
-#: client/gui-win32/connectdlg.c:1038
+#: client/gui-win32/connectdlg.c:1040
msgid "Start Game"
msgstr "Spiel beginnen"
-#: client/gui-win32/connectdlg.c:1057
+#: client/gui-win32/connectdlg.c:1059
msgid "Login:"
msgstr "Name:"
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
msgid "Host:"
msgstr "Server:"
-#: client/gui-win32/connectdlg.c:1060
+#: client/gui-win32/connectdlg.c:1062
msgid "Port:"
msgstr "Port:"
@@ -15299,10 +15536,6 @@ msgid_plural "(idle %d turns)"
msgstr[0] "(unverändert seit 1 Runde)"
msgstr[1] "(unverändert seit %d Runden)"
-#: client/gui-win32/plrdlg.c:337 data/Freeciv.in:88
-msgid "Host"
-msgstr "Server"
-
#: client/gui-win32/plrdlg.c:355 data/Freeciv.in:3230
msgid "Intelligence"
msgstr "Geheimdienst"
@@ -16675,7 +16908,7 @@ msgid ""
"specifying what to build in the turns to come."
msgstr ""
"Mit diesem Editor können sowohl die Arbeitslisten der einzelnen Städte als "
-"auch generelle Arbeitslisten bearbeitet werden."
+"auch globale Arbeitslisten bearbeitet werden."
#: data/helpdata.txt:572
msgid ""
@@ -17114,18 +17347,18 @@ msgstr ""
#: data/helpdata.txt:781
msgid ""
-" To have a diplomatic relationship with another player, you must fist "
-"establish first contact with that player. To establish first contact, you "
-"have to move one of your units next to a city or unit belonging to that "
-"player, or vice versa. Unless you establish an embassy with that player, you "
-"may again lose contact with them after a set number of turns without direct "
-"physical contact."
+" To have a diplomatic relationship with another player, you must first "
+"establish contact with that player. To establish contact, you have to move "
+"one of your units next to a city or unit belonging to that player, or vice "
+"versa. Unless you establish an embassy with that player, you may again lose "
+"contact with them after a set number of turns without direct physical "
+"contact."
msgstr ""
-" Um eine diplomatische Beziehung zu einem Spieler aufzunehmen, mußt du "
+" Um eine diplomatische Beziehung zu einem Spieler aufzunehmen, musst du "
"zunächst den Kontakt herstellen. Dazu muss eine Einheit neben die des "
"anderen Spielers oder eine Stadt gezogen werden. Wenn du bei dem Spieler "
-"keine Botschaft gründest, wirst du nach einer Anzahl von Zügen den Kontakt "
-"wieder verlieren."
+"keine Botschaft gründest, wirst du nach einer einstellbaren Anzahl von Zügen "
+"den Kontakt wieder verlieren."
#: data/helpdata.txt:788
msgid ""
@@ -18161,12 +18394,12 @@ msgid ""
"suffer extremely high levels of waste.) A Courthouse will reduce the level "
"of waste in a city. Waste can result in your cities not building anything."
msgstr ""
-"Unter Müll sind die Produktionsverluste durch Ineffizienz und Gier zu "
-"verstehen. Unter den meisten Regierungsformen nimmt er um so mehr zu, je "
+"Unter Verschwendung sind die Produktionsverluste durch Ineffizienz und Gier "
+"zu verstehen. Unter den meisten Regierungsformen nimmt er um so mehr zu, je "
"weiter eine Stadt von der Hauptstadt entfernt ist. (Ohne Hauptstadt nehmen "
"die Produktionsverluste in den Städten ein riesiges Ausmaß an.) Ein "
-"Gerichtsgebäude hilft, das Müllaufkommen einer Stadt zu verringern. Müll "
-"kann dazu führen, daß ihre Städte nichts mehr produzieren."
+"Gerichtsgebäude hilft, die Verschwendung einer Stadt zu verringern. "
+"Verschwendung kann dazu führen, dass ihre Städte nichts mehr produzieren."
#: data/helpdata.txt:1345
msgid ""
@@ -18583,7 +18816,7 @@ msgid ""
"Courthouse makes 1 unhappy citizen content. Also makes the revolt cost of "
"the city 4 times bigger."
msgstr ""
-"Halbiert die Korruption und das Müllaufkommen. In einer Demokratie macht es "
+"Halbiert die Korruption und die Verschwendung. In einer Demokratie macht es "
"einen Unzufriedenen zufrieden. Außerdem werden die Kosten einer Revolte "
"vervierfacht."
@@ -19437,7 +19670,7 @@ msgid ""
"Courthouse makes 1 unhappy citizen content. Also halves the effective "
"distance to the capital, for the purpose of calculating revolt cost."
msgstr ""
-"Halbiert die Korruption und das Müllaufkommen. In einer Demokratie macht es "
+"Halbiert die Korruption und die Verschwendung. In einer Demokratie macht es "
"einen Unzufriedenen zufrieden. Erhöht die Kosten einer Revolte, indem der "
"Entfernungseffekt zur Hauptstadt halbiert wird."
@@ -19787,7 +20020,7 @@ msgstr "Steuereintreiber"
#: data/default/cities.ruleset:46 data/civ2/cities.ruleset:46
msgid "?Taxman:T"
-msgstr "S"
+msgstr "St"
#: data/default/cities.ruleset:74 data/civ2/cities.ruleset:74
msgid "?citystyle:European"
@@ -19931,7 +20164,7 @@ msgid "Communism"
msgstr "Kommunismus"
#: data/default/governments.ruleset:121 data/civ2/governments.ruleset:118
-#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:26
+#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:27
msgid "Comrade"
msgstr "Genosse"
@@ -20039,8 +20272,8 @@ msgstr ""
"sind unorganisiert und unproduktiv, und geben alles Einkommen so schnell wie "
"möglich aus, anstatt Steuern zu zahlen und Forschung zu betreiben.\n"
"\n"
-"In der Anarchie gibt es etwas weniger Korruption und Müll, aber etwas mehr "
-"Unzufriedenheit als in der Diktatur."
+"In der Anarchie gibt es etwas weniger Korruption und Verschwendung, aber "
+"etwas mehr Unzufriedenheit als in der Diktatur."
#: data/civ2/governments.ruleset:78
msgid ""
@@ -20053,8 +20286,8 @@ msgstr ""
"In der Diktatur bist du der unumschränkte Herrscher deines Volkes. Du "
"kontrollierst deine Bürger hauptsächlich mit Hilfe des Kriegsrechts.\n"
"\n"
-"In der Diktatur gibt es von allen Regierungsformen die höchste Korruption "
-"und den meisten Müll."
+"In der Diktatur gibt es von allen Regierungsformen die größte Korruption und "
+"Verschwendung."
#: data/civ2/governments.ruleset:100
msgid ""
@@ -20067,8 +20300,8 @@ msgstr ""
"In der Monarchie dient ein König oder eine Königin als Aushängeschild deiner "
"Regierung.\n"
"\n"
-"Die Monarchie leidet wie die Republik unter geringer Korruption und geringem "
-"Müll."
+"Die Monarchie leidet wie die Republik wenig unter Korruption und "
+"Verschwendung."
#: data/civ2/governments.ruleset:121
msgid ""
@@ -20086,7 +20319,8 @@ msgstr ""
"wirtschaftlich orientierter Staatsführung.\n"
"\n"
"Es gibt eine mäßige Korruption, die nicht von der Entfernung zur Hauptstadt "
-"abhängig ist. Auch der Müll hängt nicht von der Hauptstadtentfernung ab."
+"abhängig ist. Auch die Verschwendung hängt nicht von der "
+"Hauptstadtentfernung ab."
#: data/civ2/governments.ruleset:135 data/default/techs.ruleset:297
#: data/civ2/techs.ruleset:284 data/civ1/techs.ruleset:282
@@ -20139,8 +20373,8 @@ msgid ""
msgstr ""
"In der Demokratie regieren die Bürger direkt durch Abstimmungen und Wahlen. "
"Demokratie erlaubt den größtmöglichen Handel, aber auch das größte Potential "
-"für Unzufriedenheit. Es gibt keine Korruption oder Müll, aber Bürger werden "
-"durch Kriege sehr unruhig.\n"
+"für Unzufriedenheit. Es gibt keine Korruption oder Verschwendung, aber "
+"Bürger werden durch Kriege sehr unruhig.\n"
"\n"
"Weil zufriedene Bürger fest an die Regierung glauben, ist ihre Loyalität "
"unerschütterlich. Truppen können nicht bestochen werden, und feindliche "
@@ -20905,6 +21139,10 @@ msgstr ""
"'Arbeitskraft' zu verschwenden. Außerdem können solche Gruppen leicht das "
"Ziel von Angriffen werden."
+#: data/default/units.ruleset:238
+msgid "?unit:Workers"
+msgstr "Arbeiter"
+
#: data/default/units.ruleset:264
msgid ""
"Workers are one of the key units in the game. They can be used to irrigate "
@@ -21619,6 +21857,10 @@ msgid "Explorers are very useful for mapping unknown territory."
msgstr ""
"Kundschafter sind sehr nützlich bei der Erkundung von unbekanntem Gelände."
+#: data/default/units.ruleset:1864
+msgid "?unit:Leader"
+msgstr "Anführer"
+
#: data/default/units.ruleset:1892
msgid "This is you. If you lose this unit, you lose the game. So don't."
msgstr ""
@@ -21900,7 +22142,7 @@ msgid "Emir"
msgstr "Emir"
#: data/nation/afghani.ruleset:25 data/nation/slovakian.ruleset:30
-#: data/nation/soviet.ruleset:27
+#: data/nation/soviet.ruleset:28
msgid "General Secretary"
msgstr "Generalsekretär"
@@ -22020,7 +22262,7 @@ msgstr "Armenier"
msgid ""
"According to legend, the Armenian people are the descendants of Haik - the "
"great-great-grandson of Noah. The modern Republic of Armenia gained "
-"independence from Soviet in 1991 AD"
+"independence from the Soviet Union in 1991."
msgstr ""
"Nach der Legende sind die Armenier die Nachfahren von Haik - dem Ururenkel "
"von Noah. Die moderne Republik Armenien erlangte 1991 die Unabhängigkeit von "
@@ -23111,16 +23353,15 @@ msgstr "Illyrier"
#: data/nation/illyrian.ruleset:6
msgid ""
-"Illyrians were Indo-European tribes who appeared in the western part of the "
-"Balkan Peninsula before 1000 BC, including the Dalmatians to the north, "
-"Corcyra island and Ambracia bay in prehistoric Epirus to the south, mixing "
-"with Thracians in Dardania to the east, and settling Messapia across the "
-"Adriatic Sea. Illyrian kingdoms were independent for centuries, until "
-"conquered by the Roman Republic."
+"Illyrians were Indo-European tribes who appeared in the western part of the "
+"Balkan Peninsula before 1000 BC, including Corcyra island and Ambracia bay "
+"in prehistoric Epirus to the south. They mixed with Thracians in Dardania to "
+"the east, and settled Messapia across the Adriatic Sea. Illyrian kingdoms "
+"were independent for centuries, until conquered by the Roman Republic."
msgstr ""
"Die Illyrer waren indoeuropäische Stämme, die vor 1000 v. Chr. im westlichen "
-"Balkan auftauchten, einschließlich der Dalmatier im Norden, Korfu und dem "
-"Ambrakischen Golf im prähistorischen Epirus im Süden, den Thrakern in "
+"Balkan auftauchten, einschließlich der Insel Korfu und dem Ambrakischen Golf "
+"im prähistorischen Epirus im Süden. Sie vermischten sich mit den Thrakern in "
"Daldanien im Osten und siedelnden Messapiern jenseits der Adria. Die "
"illyrischen Königreiche waren jahrhundertelang unabhängig, bis sie von der "
"Römischen Republik erobert wurden."
@@ -23455,7 +23696,7 @@ msgstr ""
"die koreanische Halbinsel in zwei Staaten geteilt, Nord- und Südkorea "
"entstanden als ein Ergebnis des militärischen Patts nach dem Koreakrieg 1953."
-#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:28
+#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:29
msgid "Great Leader"
msgstr "Großer Führer"
@@ -23631,17 +23872,17 @@ msgstr "Mali"
msgid ""
"Sub-Saharan Africa has been a cultural and ethnical melting pot for "
"millennia. In medieval times, the region was home to a succession of empires "
-"called the Sahelian kingdoms. Of these, the Islamic Mali empire with it's "
+"called the Sahelian kingdoms. Of these, the Islamic Mali empire with its "
"capital in Timbuktu was the most influential. This empire reigned from the "
-"14th to the 17th century and was famed for it's wealth and benevolent kings. "
+"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 ""
"Das Afrika südlich der Sahara ist seit Jahrtausenden ein kultureller und "
-"ethnischer Schmelztiegel. Im Mittelalter gab es dort verschiedene "
-"Königreiche. Eines davon, das islamische Großreich Mali mit der Hauptstadt "
-"Timbuktu, war das einflußreichste. Es herrschte vom 14. bis 17. Jahrhundert "
-"und war berühmt für seine wohlhabenden und wohlwollenden Könige. Die heutige "
-"Republik Mali hat hiervon seinen Namen abgeleitet."
+"ethnischer Schmelztiegel. Im Mittelalter gab es dort eine Folge so genannter "
+"Sahelischer Königreiche. Eines davon, das islamische Großreich Mali mit der "
+"Hauptstadt Timbuktu, war das Einflussreichste. Es herrschte vom 14. bis 17. "
+"Jahrhundert und war berühmt für seine wohlhabenden und wohlwollenden Könige. "
+"Die heutige Republik Mali hat hiervon seinen Namen erhalten."
#: data/nation/malian.ruleset:27
msgid "Mansa"
@@ -23705,8 +23946,8 @@ msgstr "Maya"
#: data/nation/mayan.ruleset:6
msgid ""
-"The Mayans were a Mesoamerican civilization. Famous for building great "
-"pyramids and palaces in the jungle."
+"The Mayans were a Mesoamerican civilization. They are famous for building "
+"great pyramids and palaces in the jungle."
msgstr ""
"Die Maya waren eine mesoamerikanische Zivilisation. Bekannt sind die großen "
"Pyramiden und Paläste, die sie im Dschungel errichteten."
@@ -24264,6 +24505,14 @@ msgstr ""
"Teil der Tschechoslowakei, die bis 1918 zum österreich-ungarischen "
"Kaiserreich gehörte."
+#: data/nation/slovakian.ruleset:26
+msgid "?male:Leader"
+msgstr "Anführer"
+
+#: data/nation/slovakian.ruleset:26
+msgid "?female:Leader"
+msgstr "Anführerin"
+
#: data/nation/slovakian.ruleset:29
msgid "Pope"
msgstr "Papst"
@@ -24310,17 +24559,19 @@ msgstr "Sowjets"
#: data/nation/soviet.ruleset:6
msgid ""
-"Soviet Union's history starts in November 1917, when under Lenin's "
+"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 "
-"republics integrated into one country. Soviet Union became one of most "
-"powerful states in the 20th century. But by the end of 1991 due to many "
-"social shocks it disintegrated into fifteen independent countries"
+"republics integrated into one country. The Soviet Union became one of most "
+"powerful states in the 20th century, but by the end of 1991 it had "
+"disintegrated into fifteen independent countries due to social and economic "
+"problems."
msgstr ""
"Die sowjetische Geschichte begann im November 1917 mit der bolschewistischen "
"Revolution unter der Führerschaft Lenins. Am 31. Dezember 1922 wurden vier "
"Sowjetrepubliken zu einem Land integriert. Die Sowjetunion wurde einer der "
-"mächtigsten Staaten im 20. Jahrhundert. Aufgrund zahlreicher sozialer "
-"Umbrüche zerfiel jedoch Ende 1991 in 15 unabhängige Länder."
+"mächtigsten Staaten im 20. Jahrhundert. Aufgrund sozialer und "
+"wirtschaftlicher Probleme zerfiel sie jedoch Ende 1991 in 15 unabhängige "
+"Länder."
#: data/nation/spanish.ruleset:3
msgid "Spanish"
@@ -24755,8 +25006,8 @@ msgstr "Westfalen"
#: data/nation/westphalian.ruleset:6
msgid ""
-"Westphalia, before becoming a Prussian province, was the western region the "
-"duchy of Saxony. Present-day it consists of the Northern part of the largest "
+"Westphalia, before becoming a Prussian province, was the western region of "
+"the duchy of Saxony. Today it makes up the northern part of the largest "
"German federal state, North Rhine-Westphalia."
msgstr ""
"Westfalen bildete den Westen des Herzogtums Sachsen, bevor es eine "
@@ -24950,7 +25201,7 @@ msgid ""
"The flag and background color indicate what civilization the city\n"
"belongs to (this will be useful when you meet other civilizations).\n"
"The top row of the bar also shows the name and size of the city, and\n"
-"will show one or more starts to indicate if there are units in the\n"
+"will show one or more stars to indicate if there are units in the\n"
"city. The bottom row shows what the city is building, and how long it\n"
"will take; it also shows how long the city will take to grow to the\n"
"next largest size."
@@ -24964,8 +25215,8 @@ msgstr ""
"du auf andere Zivilisationen triffst). Die oberste Zeile zeigt\n"
"den Namen und die Größe der Stadt, sowie einen oder mehrere\n"
"Sterne, sobald sich Einheiten in der Stadt befinden. Die unterste\n"
-"Zeile zeigt an, was die Stadt produziert und wann sie damit\n"
-"fertig ist; dort steht auch, wann sie auf die nächste Größenstufe\n"
+"Zeile zeigt an, was die Stadt produziert und wieviele Runden es\n"
+"dauert; dort steht auch, wann sie auf die nächste Größenstufe\n"
"wachsen wird."
#: data/scenario/tutorial.sav:96
@@ -25049,7 +25300,7 @@ msgid ""
"Now your city has grown to size five. As cities get larger unrest\n"
"becomes a problem. A city of this size will usually have one unhappy\n"
"citizen unless pacifying effects are used; meaning one entertainer\n"
-"specialist is required to keep your citzens content. This is basically\n"
+"specialist is required to keep your citizens content. This is basically\n"
"a wasted citizen.\n"
"\n"
"There are several things that can be done about this. One quick fix\n"
@@ -25070,11 +25321,11 @@ msgstr ""
"\n"
"Dagegen kannst du verschiedene Dinge unternehmen. Recht einfach\n"
"kann ein Tempel (oder eine andere kulturelle Stadterweiterung)\n"
-"errichtet werden (in der Hilfe für Stadterweiterungen steht mehr).\n"
-"Hast du weitere große Städte, kann es sich lohnen, die Steuerrate\n"
-"anzupassen, um mehr Luxus zu erhalten (je 2 Luxus stellen einen\n"
-"Bürger zufrieden). Ein Marktplatz in der Stadt erhöht diesen Nutzen,\n"
-"indem der Luxus um 50%% gesteigert wird."
+"errichtet werden, der einen Bürger zufrieden macht (in der Hilfe für\n"
+"Stadterweiterungen steht mehr). Hast du weitere große Städte, kann\n"
+"es sich lohnen, die Steuerrate anzupassen, um mehr Luxus zu erhalten\n"
+"(je 2 Luxus stellen einen Bürger zufrieden). Ein Marktplatz in der Stadt\n"
+"erhöht diesen Nutzen, indem der Luxus um 50%% gesteigert wird."
#: data/scenario/tutorial.sav:162
msgid ""
@@ -25169,12 +25420,12 @@ msgid ""
"existing cities. Generally when building new cities you want to make\n"
"sure that all tiles are covered by at least one city, but after that\n"
"it is best that your cities overlap as little as possible. Spreading\n"
-"out cities properly gives each city access to more resrouces, allowing\n"
+"out cities properly gives each city access to more resources, allowing\n"
"them to grow to larger sizes."
msgstr ""
"Deine zweiten Siedler sollten ebenfalls eine neue Stadt gründen.\n"
"Wenn du den Siedler bewegst, wird das Gebiet angezeigt, das eine\n"
-"Stadt an diesem Platz nutzen könnte. Außredem zeigt eine weiße\n"
+"Stadt an diesem Platz nutzen könnte. Außerdem zeigt eine weiße\n"
"Linie, welche Felder bereits von deiner Zivilisation genutzt werden.\n"
"Es ist empfehlenswert, das alle Felder abgedeckt werden, aber auch,\n"
"dass sich die Städte so wenig wie möglich überlappen. Dann haben\n"
diff --git a/po/el.gmo b/po/el.gmo
index 7a5c509..d47a7a8 100644
Binary files a/po/el.gmo and b/po/el.gmo differ
diff --git a/po/el.po b/po/el.po
index b3b0148..8eb7306 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: freeciv 2.1.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 07:45+0900\n"
+"POT-Creation-Date: 2009-03-29 21:13+0900\n"
"PO-Revision-Date: 2008-05-23 17:41+0200\n"
"Last-Translator: Prekates Alexandros <aprekates at yahoo.gr>\n"
"Language-Team: Greek translation team <gr at li.org>\n"
@@ -693,7 +693,7 @@ msgid "Road"
msgstr "Äñüìïò"
#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
-#: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
+#: client/gui-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"
@@ -710,7 +710,7 @@ msgid "Mine"
msgstr "Ïñõ÷åßï"
#: common/terrain.c:396 common/unit.c:548 server/report.c:124
-#: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
+#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr "Ìüëõíóç"
@@ -757,7 +757,7 @@ msgstr "
msgid "Sentry"
msgstr "Öñïõñüò"
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:851 client/gui-sdl/menu.c:648
+#: common/unit.c:566 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 "ËåçëÜôçóå"
@@ -774,7 +774,7 @@ msgstr "
msgid "Transform"
msgstr "Ìåôáó÷çìÜôéóå"
-#: common/unit.c:584 client/text.c:106 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:584 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 "¶ãíùóôï"
@@ -843,11 +843,11 @@ msgstr "
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1406
+#: common/unittype.c:349 client/helpdata.c:1404
msgid " and "
msgstr " êáé "
-#: common/unittype.c:355 client/helpdata.c:1392
+#: common/unittype.c:355 client/helpdata.c:1390
msgid "?and:, "
msgstr "?êáé:, "
@@ -1466,32 +1466,27 @@ msgid "Illegal value for auth port: \"%s\""
msgstr ""
#: server/auth.c:281
-#, c-format
-msgid "Auth config filename \"%s\" not allowed!"
-msgstr "¼íïìá áñ÷åßï äéáìüñöùóçò ðñüóâáóéìüôçôáò \"%s\" äåí åðéôñÝðåôáé!"
-
-#: server/auth.c:286
#, fuzzy, c-format
msgid "Cannot load auth config file \"%s\"!"
msgstr "Äåí ìðüñåóá íá öïñôþóù áñ÷åßï óåíáñßïõ óõíüëïõ-êáíüíùí \"%s\"."
-#: server/auth.c:397
+#: server/auth.c:392
#, c-format
msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
msgstr ""
"Ðñïåéäïðïßçóç: ôï üíïìá åðéóêÝðôç '%s' Ý÷åé ðáñèåß, ìåôïíïìáóßá óå ÷ñÞóôç '%"
"s'."
-#: server/auth.c:404
+#: server/auth.c:399
msgid "Guests are not allowed on this server. Sorry."
msgstr "Äåí åðéôñÝðïíôáé åðéóêåðôåò óå áõôüí ôïí åîõðçñåôçôÞ. Óõãíþìç."
-#: server/auth.c:406
+#: server/auth.c:401
#, c-format
msgid "%s was rejected: Guests not allowed."
msgstr "%s áðïññßöèçêå: Äåí åðéôñÝðïíôáé ïé åðéóêÝðôåò."
-#: server/auth.c:425
+#: server/auth.c:420
#, c-format
msgid ""
"There was an error reading the user database, logging in as guest connection "
@@ -1500,7 +1495,7 @@ msgstr ""
"ÕðÞñ÷å Ýíá ëÜèïò êáôÜ ôçí áíÜãíùóç ôçò âÜóçò äåäïìÝíùí, óýíäåóç óáí "
"åðéóêÝðôçò '%s'."
-#: server/auth.c:431
+#: server/auth.c:426
msgid ""
"There was an error reading the user database and guest logins are not "
"allowed. Sorry"
@@ -1508,41 +1503,41 @@ msgstr ""
"ÕðÞñ÷å Ýíá ëÜèïò êáôÜ ôçí áíÜãíùóç ôçò âÜóçò äåäïìÝíùí ÷ñçóôþí êáé äåí "
"åðéôñÝðïíôáé óõíäÝóåéò åðéóêåðôþí. Óõãíþìç."
-#: server/auth.c:434
+#: server/auth.c:429
#, c-format
msgid "%s was rejected: Database error and guests not allowed."
msgstr "%s áðïññßöèçêå: ËÜèïò âÜóçòäåäïìÝíùí êáé äåí åðéôñÝðïíôáé åðéóêÝðôåò."
-#: server/auth.c:441
+#: server/auth.c:436
#, c-format
msgid "Enter password for %s:"
msgstr "ÅéóÞãáãå óõíèçìáôéêü ãéá %s:"
-#: server/auth.c:450
+#: server/auth.c:445
msgid "Enter a new password (and remember it)."
msgstr "ÅéóÞãáãå êáéíïýñãéï óõíèçìáôéêü (êáé áðïìíçìüíåõóÝ ôï)."
-#: server/auth.c:456
+#: server/auth.c:451
msgid "This server allows only preregistered users. Sorry."
msgstr ""
"Áõôüò ï åîõðçñåôçôÞò åðéôñÝðåé ìüíï ðñïêáèïñéóìÝíïõò ÷ñÞóôåò. Óõãíþìç. "
-#: server/auth.c:459
+#: server/auth.c:454
#, fuzzy, c-format
msgid "%s was rejected: Only preregister users allowed."
msgstr "%s áðïññßöèçêå: Ìüíï ðñïêáèïñéóìÝíïé ÷ñÞóôåò åðéôñÝðïíôáé."
-#: server/auth.c:488 server/auth.c:547
+#: server/auth.c:483 server/auth.c:542
msgid "Sorry, too many wrong tries..."
msgstr "Óõãíþìç, ðïëëÝò ëáíèáóìÝíåò ðñïóðÜèåéåò..."
-#: server/auth.c:489
+#: server/auth.c:484
#, c-format
msgid "%s was rejected: Too many wrong password verifies for new user."
msgstr ""
"%s áðïññßöèçêå: ÐïëëÝò ëáíèáóìÝíåò åðáëçèåýóåéò óõíèçìáôéêþí ãéá íÝï ÷ñÞóôç."
-#: server/auth.c:505
+#: server/auth.c:500
msgid ""
"Warning: There was an error in saving to the database. Continuing, but your "
"stats will not be saved."
@@ -1550,32 +1545,32 @@ msgstr ""
"Ðñïåéäïðïßçóç: ÕðÞñ÷å Ýíá ëÜèïò óôï óþóéìï ôçò âéâëéïèÞêçò. Óõíå÷ßæïõìå, "
"áëëÜ ôá óôáôéóôéêÜ óïõ äåí èá óùèïýí."
-#: server/auth.c:549
+#: server/auth.c:544
#, c-format
msgid "%s was rejected: Too many wrong password tries."
msgstr "%s äåí Ýãéíå äåêôü: ÐïëëÝò áðïôõ÷çìÝíåò ðñïóðÜèåéåò óõíèçìáôéêïý."
-#: server/auth.c:558
+#: server/auth.c:553
msgid "Your password is incorrect. Try again."
msgstr "Ôï óõíèçìáôéêü óïõ åßíáé ëáíèáóìÝíï. ÎáíáðñïóðÜèçóå."
-#: server/auth.c:569
+#: server/auth.c:564
msgid "Sorry, your connection timed out..."
msgstr "Óõãíþìç, ç óýíäåóÞ óïõ Ýëëåéîå..."
-#: server/auth.c:571
+#: server/auth.c:566
#, c-format
msgid "%s was rejected: Connection timeout waiting for password."
msgstr "%s áðïññßöèçêå: ÐÝñáóå ï ÷ñüíïò áíáìïíÞò ãéá óõíèçìáôéêü. "
-#: server/auth.c:636
+#: server/auth.c:631
#, c-format
msgid "Your password is too short, the minimum length is %d. Try again."
msgstr ""
"Ôï óõíèçìáôéêü óïõ åßíáé ðïëý ìéêñü, ôï åëÜ÷éóôï ìÞêïò åßíáé %d. "
"ÎáíáðñïóðÜèçóå."
-#: server/auth.c:642
+#: server/auth.c:637
#, c-format
msgid ""
"The password must have at least %d capital letters, %d numbers, and be at "
@@ -2099,7 +2094,7 @@ msgstr "
msgid "You can learn a lot about Freeciv at %s"
msgstr "Ìðïñåßò íá ìÜèåéò ðïëëÜ ãéá ôï Freeciv óôï %s"
-#: server/civserver.c:206 client/civclient.c:237 manual/civmanual.c:380
+#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
@@ -2131,14 +2126,14 @@ msgstr ""
msgid " -b --bind ADDR\tListen for clients on ADDR\n"
msgstr "-b --bind ÄÉÅÕÈ\t¶êïõóå ãéá ðåëÜôåò óôçí äéåýèõíóç ÄÉÅÕÈ\n"
-#: server/civserver.c:217 client/civclient.c:241
+#: server/civserver.c:217 client/civclient.c:242
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:245
+#: server/civserver.c:221 client/civclient.c:246
msgid " -d, --debug NUM\tSet debug log level (0 to 3)\n"
msgstr "-d, --debug ÁÑÉÈÌ\tÈÝóå åðßðåäï áðïóöáëìÜôùóçò çìåñïëßïõ (0 åþò 3)\n"
@@ -2146,7 +2141,7 @@ msgstr "-d, --debug
msgid " -f, --file FILE\tLoad saved game FILE\n"
msgstr "-f, --file ÁÑ×ÅÉÏ\tÖüñôùóå óùóìÝíï ðáé÷íßäé ÁÑ×ÅÉÏ\n"
-#: server/civserver.c:225 client/civclient.c:248 manual/civmanual.c:382
+#: server/civserver.c:225 client/civclient.c:249 manual/civmanual.c:382
msgid " -h, --help\t\tPrint a summary of the options\n"
msgstr "-h, --help\t\tÔýðùóå ìéá óýíïøç ôùí åðéëïãþí\n"
@@ -2204,11 +2199,11 @@ msgstr ""
" -R, --Ranklog ÁÑ×ÅÉÏ\t×ñçóéìïðïßçóå ÁÑ×ÅÉÏ óáí áñ÷åßï çìåñïëïãßï "
"êáôÜôáîçò\n"
-#: server/civserver.c:247 client/civclient.c:267 manual/civmanual.c:383
+#: server/civserver.c:247 client/civclient.c:268 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:279
+#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, fuzzy, c-format
@@ -3467,7 +3462,7 @@ msgstr ""
msgid "Sea moving start units are not yet supported. Nobody gets %s."
msgstr ""
-#: server/gamehand.c:310 client/text.c:632
+#: server/gamehand.c:310 client/text.c:691
#, c-format
msgid "Year: %s"
msgstr ""
@@ -3749,8 +3744,8 @@ msgstr "
#: server/plrhand.c:1686
#, fuzzy, c-format
msgid ""
-"Your nation is thrust into civil war, %s is declared the leader of the "
-"rebel states."
+"Your nation is thrust into civil war! %s is declared the leader of the rebel "
+"states."
msgstr ""
"Óôï Ýèíïò óïõ îÝóðáóå åìöýëéïò ðüëåìïò, o %s áíáêõñçñß÷ôçêå çãÝôçò ôùí "
"åðáíáóôáôçìÝíùí êñáôþí."
@@ -3861,7 +3856,7 @@ msgstr "
msgid "Literacy"
msgstr "ÂáóéêÞ åêðáßäåõóç"
-#: server/report.c:121 client/cityrepdata.c:526 client/cityrepdata.c:527
+#: server/report.c:121 client/cityrepdata.c:524 client/cityrepdata.c:525
#: client/gui-sdl/cityrep.c:174
msgid "Production"
msgstr "ÐáñáãùãÞ"
@@ -4014,7 +4009,7 @@ msgstr ""
"Ôï äçìïãñáöéêü áëöáñéèìçôéêü ðåñéÝ÷åé Üêõñïõò ÷áñáêôÞñåò. Äþóå åíôïëÞ \"help "
"demography\"."
-#: server/report.c:743 server/report.c:766
+#: server/report.c:743 server/report.c:768
msgid "Demographics Report:"
msgstr "ÄçìïãñáöéêÞ ÁíáöïñÜ:"
@@ -4022,10 +4017,12 @@ msgstr "
msgid "Sorry, the Demographics report is unavailable."
msgstr "Óõãíþìç, áëëÜ ç ÄçìïãñáöéêÞ áíáöïñÜ äåí åßíáé äéáèÝóéìç"
-#: server/report.c:748
-#, c-format
-msgid "The %s of the %s (%s)"
-msgstr "Ï %s ôïõ %s (%s)"
+#. TRANS: <nation adjective> <government name> (<year>).
+#. * E.g. "Polish Despotism (200 AD)".
+#: server/report.c:750
+#, fuzzy, c-format
+msgid "%s %s (%s)"
+msgstr "Ðüëç: %s (%s)"
#. TRANS: message about an installation error.
#: server/ruleset.c:163
@@ -4072,14 +4069,6 @@ msgstr ""
msgid "%s had invalid nation; changing to %s."
msgstr ""
-#. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4073
-#, c-format
-msgid ""
-"Illegal alliance structure detected: %s alliance to %s reduced to peace "
-"treaty."
-msgstr ""
-
#: server/settings.c:32
msgid "Geological"
msgstr "ÃåùëïãéêÜ"
@@ -5339,9 +5328,10 @@ msgid "Auto-save name prefix"
msgstr "Ðñüèåìá ïíüìáôïò áõôüìáôçò áðïèÞêåõóçò"
#: server/settings.c:1016
+#, fuzzy
msgid ""
-"Automatically saved games will have name \"<prefix><year>.sav\". This "
-"setting sets the <prefix> part."
+"Automatically saved games will have name \"<prefix>-T<turn>-Y<year>.sav\". "
+"This setting sets the <prefix> part."
msgstr ""
"Áõôüìáôá áðïèçêåõìÝíá ðáé÷íßäéá èá Ý÷ïõí ôï üíïìá \"<ðñüèåìá><Ýôïò>.sav\". Ç "
"åðéëïãÞ áõôÞ êáèïñßæåé ôï ôìÞìá <ðñüèåìá>."
@@ -5360,11 +5350,11 @@ msgstr ""
"\"civscore.log\" êÜèå ãýñï. ÁõôÜ ôá óôáôéóôéêÜ ìðïñïýí íá ÷ñçóéìïðïéçèïýí "
"ãéá ôç äçìéïõñãßá ãñáöçìÜôùí óôï ôÝëïò ôïõ ðáé÷íéäßïõ."
-#: server/sernet.c:147
+#: server/sernet.c:150
msgid "Server cannot read standard input. Ignoring input."
msgstr ""
-#: server/sernet.c:922
+#: server/sernet.c:929
#, c-format
msgid "Server: bad address: [%s:%d]."
msgstr ""
@@ -5485,116 +5475,116 @@ msgstr ""
"Ç êáôÜðáõóç ðõñüò ìåôáîý %s êáé %s Ý÷åé ëÞîåé. Åßíáé óå ðüëåìï. Áêõñþíåéò "
"óõììá÷ßá ìå %s. "
-#: server/srv_main.c:928
+#: server/srv_main.c:961
#, c-format
msgid "Failed saving game as %s"
msgstr "Áðïôõ÷ßá áðïèÞêåõóçò ðáé÷íéäßïõ óáí %s"
-#: server/srv_main.c:930
+#: server/srv_main.c:963
#, c-format
msgid "Game saved as %s"
msgstr "Ôï ðáé÷íßäé óþèçêå óáí %s"
-#: server/srv_main.c:962
+#: server/srv_main.c:994
msgid "The game is already running."
msgstr "Ôï ðáé÷íßäé ôñÝ÷åé Þäç."
-#: server/srv_main.c:970
+#: server/srv_main.c:1002
#, c-format
msgid "%s lost control cmdlevel on game start. Use voting from now on."
msgstr ""
"%s Ý÷áóå Ýëåã÷ï cmdlevel êáôÜ ôçí åêêßíçóç ôïõ ðáé÷íéäßïõ. ×ñçóéìïðïßçóå "
"øçöïöïñßá áðü äþ êáé ðÝñá."
-#: server/srv_main.c:977
+#: server/srv_main.c:1009
msgid "Starting game."
msgstr "Áñ÷ßæåé ôï ðáé÷íßäé. "
-#: server/srv_main.c:1039
+#: server/srv_main.c:1071
#, c-format
msgid "request for unknown report (type %d)"
msgstr "áßôçóç ãéá áãíþóôç áíáöïñÜ (ôýðïõ %d)"
-#: server/srv_main.c:1104
+#: server/srv_main.c:1136
#, c-format
msgid "Warning: rejecting old client %s"
msgstr "Ðñïåéäïðïßçóç: áðïññßðôåôáé ï ðáëéüò ðåëÜôçò %s"
-#: server/srv_main.c:1206
+#: server/srv_main.c:1238
#, c-format
msgid "Got a packet of type %d from a dead or observer player"
msgstr "¸ëáâá ðáêÝôï ôýðïõ %d áðü íåêñü Þ ðáñáêïëïõèçôÝï ðáß÷ôç"
-#: server/srv_main.c:1306
+#: server/srv_main.c:1338
msgid "Please choose a non-blank name."
msgstr "[áñáêáëþ åðéëÝîôå Ýíá ìç êåíü üíïìá"
-#: server/srv_main.c:1322
+#: server/srv_main.c:1354
msgid "That nation is already in use."
msgstr "Áõôü ôï Ýèíïò ÷ñçóéìïðïéåßôáé Þäç."
-#: server/srv_main.c:1338
+#: server/srv_main.c:1370
#, c-format
msgid "Another player already has the name '%s'. Please choose another name."
msgstr "¶ëëïò ðáß÷ôçò Ý÷åé ôï üíïìá '%s'.Ðáñáêáëþ åðéëÝîôå Üëëï üíïìá."
-#: server/srv_main.c:1359
+#: server/srv_main.c:1391
msgid "Please choose a name containing only ASCII characters."
msgstr "Ðáñáêáëþ åðéëÝîôå Ýíá üíïìá ðïõ íá ðåñéÝ÷åé ìüíï ASCII ÷áñáêôÞñåò."
-#: server/srv_main.c:1458
+#: server/srv_main.c:1490
#, c-format
msgid "%s nation is not available in this scenario."
msgstr "ôï %s Ýèíïò äåí åßíáé äéáèÝóéìï óå áõôü ôï óåíÜñéï."
-#: server/srv_main.c:1464
+#: server/srv_main.c:1496
#, c-format
msgid "%s nation is already in use."
msgstr "ôï %s Ýèíïò ÷ñçóéìïðïéåßôáé Þäç."
-#: server/srv_main.c:1482
+#: server/srv_main.c:1514
#, c-format
msgid "%s is the %s ruler %s."
msgstr "%s åßíáé ï %s çãÝôçò %s"
-#: server/srv_main.c:1538
+#: server/srv_main.c:1570
#, c-format
msgid "Waiting to start game: %d out of %d players are ready to start."
msgstr ""
"ÐåñéìÝíïíôáò íá áñ÷ßóåé ôï ðáé÷íßäé: %d áðü ôïõò %d ðáß÷ôåò åßíáé Ýôïéìïé íá "
"áñ÷ßóïõí. "
-#: server/srv_main.c:1582 server/srv_main.c:1586
+#: server/srv_main.c:1614 server/srv_main.c:1618
#, c-format
msgid "%s has been added as %s level AI-controlled player."
msgstr "%s ðñïóôÝèçêå óáí %s åðéðÝäïõ ðáß÷ôçò åëåã÷üìåíïò áðü ÔÍ."
-#: server/srv_main.c:1728
+#: server/srv_main.c:1760
#, c-format
msgid "Player %d"
msgstr "Ðáß÷ôçò %d"
-#: server/srv_main.c:1739 server/srv_main.c:1745
+#: server/srv_main.c:1771 server/srv_main.c:1777
#, c-format
msgid "%s rules the %s."
msgstr "%s êõâåñíÜåé ôïõò %s."
-#: server/srv_main.c:1910
+#: server/srv_main.c:1942
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
msgstr ""
-#: server/srv_main.c:1961
+#: server/srv_main.c:1993
#, c-format
msgid "Sending info to metaserver [%s]"
msgstr ""
-#: server/srv_main.c:1992
+#: server/srv_main.c:2024
msgid "The game is over..."
msgstr "Ôï ðáé÷íßäé ôåëåßùóå..."
-#: server/srv_main.c:2205
+#: server/srv_main.c:2237
msgid "Now accepting new client connections."
msgstr "Ôþñá áðïäÝ÷ïìáé óõíäÝóåéò ðåëÜôç."
@@ -6394,24 +6384,24 @@ msgid "Barbarian"
msgstr ""
#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2030 client/gui-sdl/plrdlg.c:645
+#: client/gui-gtk-2.0/pages.c:2102 client/gui-sdl/plrdlg.c:645
#: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
msgid "AI"
msgstr ""
#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
+#: client/gui-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
msgid "Human"
msgstr ""
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
-#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
+#: 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
msgid "Alive"
msgstr ""
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
#: client/gui-win32/connectdlg.c:200
msgid "Dead"
msgstr ""
@@ -6675,9 +6665,9 @@ 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:242
-#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
-#: client/text.c:1201
+#: 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
#, fuzzy, c-format
msgid "?clistmore:, %s"
msgstr "Åéäéêïß ðüñïé"
@@ -6926,7 +6916,7 @@ msgstr ""
msgid "Cannot attack from sea."
msgstr ""
-#: server/unithand.c:996 server/unittools.c:2103
+#: server/unithand.c:996 server/unittools.c:2137
msgid "Cannot attack unless you declare war first."
msgstr ""
@@ -7022,100 +7012,101 @@ msgid "%s was upgraded for free to %s."
msgstr ""
#: server/unittools.c:297
-#, c-format
-msgid "Not enough gold. %s disbanded"
-msgstr ""
+#, fuzzy, c-format
+msgid "Not enough gold to pay upkeep for %s. Unit disbanded."
+msgstr "%s äåí ìðïñåé'íá óõíôçñçèåß %s, ç ìïíÜäá äéáëýåôáé."
-#: server/unittools.c:342
+#: server/unittools.c:343
#, c-format
msgid "Your %s has run out of hit points."
msgstr ""
-#: server/unittools.c:358
+#: server/unittools.c:359
#, fuzzy, c-format
msgid "Your %s has been lost on the high seas."
msgstr "%s áðïìáêñýíèçêå áðü ôï ðáé÷íßäé."
-#: server/unittools.c:365
+#: server/unittools.c:366
#, c-format
msgid "Your %s survived on the high seas and became more experienced!"
msgstr ""
-#: server/unittools.c:376
+#: server/unittools.c:377
#, c-format
msgid "Your %s has been lost on unsafe terrain."
msgstr ""
-#: server/unittools.c:430
+#: server/unittools.c:431
#, c-format
msgid "Your %s has returned to refuel."
msgstr ""
-#: server/unittools.c:454
+#: server/unittools.c:455
#, c-format
msgid "Your %s has run out of fuel."
msgstr ""
-#. TRANS: And, <the unit> became ...
-#: server/unittools.c:616
-msgid "And, became more experienced!"
-msgstr ""
-
#. TRANS: Your <unit> became ...
-#: server/unittools.c:620
+#: server/unittools.c:619
#, c-format
msgid "Your %s became more experienced!"
msgstr ""
-#: server/unittools.c:1011
+#: server/unittools.c:1009
#, c-format
msgid "Teleported your %s to %s."
msgstr ""
-#: server/unittools.c:1041
+#. TRANS: A unit is moved to resolve stack conflicts.
+#: server/unittools.c:1065
+#, c-format
+msgid "Moved your %s."
+msgstr ""
+
+#: server/unittools.c:1076
#, c-format
msgid "Disbanded your %s."
msgstr ""
-#: server/unittools.c:1363
+#: server/unittools.c:1397
#, c-format
msgid "Unable to defend %s, %s has lost the game."
msgstr ""
-#: server/unittools.c:1367
+#: server/unittools.c:1401
#, c-format
msgid "Losing %s meant losing the game! Be more careful next time!"
msgstr ""
-#: server/unittools.c:1469
+#: server/unittools.c:1503
#, c-format
msgid "%s escaped the destruction of %s, and fled to %s."
msgstr ""
-#: server/unittools.c:1478
+#: server/unittools.c:1512
#, c-format
msgid "%s lost when %s was lost."
msgstr ""
-#: server/unittools.c:1527
+#: server/unittools.c:1561
#, c-format
msgid "Barbarian leader captured, %d gold ransom paid."
msgstr ""
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unittools.c:1545
+#: server/unittools.c:1579
#, c-format
msgid "Your attacking %s succeeded against the %s %s!"
msgstr ""
#. TRANS: "Cannon ... the Polish Destroyer."
-#: server/unittools.c:1554 server/unittools.c:1612
+#: server/unittools.c:1588 server/unittools.c:1646
#, c-format
msgid "%s lost to an attack by the %s %s."
msgstr ""
#. TRANS: "... Cannon ... the Polish Destroyer ...."
-#: server/unittools.c:1588
+#: server/unittools.c:1622
#, c-format
msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
msgid_plural ""
@@ -7125,14 +7116,14 @@ msgstr[1] ""
#. TRANS: "Cannon lost when the Polish Destroyer
#. * attacked the German Musketeers."
-#: server/unittools.c:1621
+#: server/unittools.c:1655
#, 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:1636
+#: server/unittools.c:1670
#, fuzzy, c-format
msgid "%s (and %s) lost to an attack from the %s %s."
msgstr "%s áðü %s ÷Üèçêáí óôçí ìåôáöïñÜ ðñïò ôïõ %s ôçí %s"
@@ -7140,7 +7131,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:1646
+#: server/unittools.c:1680
#, 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."
@@ -7150,192 +7141,192 @@ 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:1660
+#: server/unittools.c:1694
#, 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:1928
+#: server/unittools.c:1962
#, c-format
msgid "Your %s was nuked by %s."
msgstr ""
-#: server/unittools.c:1931 server/unittools.c:1947
+#: server/unittools.c:1965 server/unittools.c:1981
msgid "yourself"
msgstr ""
-#: server/unittools.c:1935
+#: server/unittools.c:1969
#, c-format
msgid "The %s %s was nuked."
msgstr ""
-#: server/unittools.c:1944
+#: server/unittools.c:1978
#, c-format
msgid "%s was nuked by %s."
msgstr ""
-#: server/unittools.c:1952
+#: server/unittools.c:1986
#, c-format
msgid "You nuked %s."
msgstr ""
-#: server/unittools.c:1993
+#: server/unittools.c:2027
#, c-format
msgid "The %s detonated a nuke!"
msgstr ""
-#: server/unittools.c:2017
+#: server/unittools.c:2051
#, c-format
msgid "%s transported successfully."
msgstr ""
-#: server/unittools.c:2069
+#: server/unittools.c:2103
msgid "This unit type can not be paradropped."
msgstr ""
-#: server/unittools.c:2079
+#: server/unittools.c:2113
msgid "You cannot paradrop a unit that is transporting other units."
msgstr ""
-#: server/unittools.c:2085
+#: server/unittools.c:2119
msgid "The destination location is not known."
msgstr ""
-#: server/unittools.c:2092
+#: server/unittools.c:2126
#, c-format
msgid "This unit cannot paradrop into %s."
msgstr ""
-#: server/unittools.c:2112
+#: server/unittools.c:2146
#, c-format
msgid "The distance to the target (%i) is greater than the unit's range (%i)."
msgstr ""
-#: server/unittools.c:2123
+#: server/unittools.c:2157
#, c-format
msgid "Your %s paradropped into the %s and was lost."
msgstr ""
-#: server/unittools.c:2136
+#: server/unittools.c:2170
#, c-format
msgid "Your %s was killed by enemy units at the paradrop destination."
msgstr ""
-#: server/unittools.c:2158
+#: server/unittools.c:2192
#, c-format
msgid "You found %d gold."
msgstr ""
-#: server/unittools.c:2175
+#: server/unittools.c:2209
#, c-format
msgid "You found %s in ancient scrolls of wisdom."
msgstr ""
-#: server/unittools.c:2182
+#: server/unittools.c:2216
#, fuzzy, c-format
msgid "The %s have acquired %s from ancient scrolls of wisdom."
msgstr "Ïé %s áðÝêôçóáí %s áðü %s."
-#: server/unittools.c:2196
+#: server/unittools.c:2230
msgid "A band of friendly mercenaries joins your cause."
msgstr ""
-#: server/unittools.c:2214
+#: server/unittools.c:2248
msgid "An abandoned village is here."
msgstr ""
-#: server/unittools.c:2224
+#: server/unittools.c:2258
msgid "You have unleashed a horde of barbarians!"
msgstr ""
-#: server/unittools.c:2227
+#: server/unittools.c:2261
#, c-format
msgid "Your %s has been killed by barbarians!"
msgstr ""
-#: server/unittools.c:2243
+#: server/unittools.c:2277
msgid "You found a friendly city."
msgstr ""
-#: server/unittools.c:2257
+#: server/unittools.c:2291
msgid "Friendly nomads are impressed by you, and join you."
msgstr ""
-#: server/unittools.c:2282
+#: server/unittools.c:2316
msgid "Your overflight frightens the tribe; they scatter in terror."
msgstr ""
-#: server/unittools.c:2540
+#: server/unittools.c:2574
#, c-format
msgid "Orders for %s aborted after enemy movement was spotted."
msgstr ""
-#: server/unittools.c:2989
+#: server/unittools.c:3023
#, c-format
msgid "Orders for %s aborted as there are units nearby."
msgstr ""
-#: server/unittools.c:3041
+#: server/unittools.c:3075
#, c-format
msgid "Orders for %s aborted because building of city failed."
msgstr ""
-#: server/unittools.c:3054
+#: server/unittools.c:3088
#, c-format
msgid "Orders for %s aborted since they give an invalid activity."
msgstr ""
-#: server/unittools.c:3068
+#: server/unittools.c:3102
#, c-format
msgid "Orders for %s aborted since they give an invalid location."
msgstr ""
-#: server/unittools.c:3078
+#: server/unittools.c:3112
#, c-format
msgid "Orders for %s aborted as there are units in the way."
msgstr ""
-#: server/unittools.c:3104
+#: server/unittools.c:3138
#, c-format
msgid "Orders for %s aborted because of failed move."
msgstr ""
-#: server/unittools.c:3145
+#: server/unittools.c:3179
#, c-format
msgid "Attempt to change homecity for %s failed."
msgstr ""
-#: server/unittools.c:3156
+#: server/unittools.c:3190
#, c-format
msgid "Attempt to establish trade route for %s failed."
msgstr ""
-#: server/unittools.c:3168
+#: server/unittools.c:3202
#, c-format
msgid "Attempt to build wonder for %s failed."
msgstr ""
-#: server/unittools.c:3177
+#: server/unittools.c:3211
#, c-format
msgid "Your %s has invalid orders."
msgstr ""
-#: server/generator/mapgen.c:1737
+#: server/generator/mapgen.c:1771
msgid "High landmass - this may take a few seconds."
msgstr ""
-#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
+#: server/generator/mapgen.c:1969 server/generator/mapgen.c:2039
#, c-format
msgid "Falling back to generator %d."
msgstr ""
-#: server/generator/mapgen.c:2025
+#: server/generator/mapgen.c:2059
msgid "Generator 3 didn't place all big islands."
msgstr ""
-#: server/generator/mapgen.c:2054
+#: server/generator/mapgen.c:2088
#, c-format
msgid "Generator 3 left %li landmass unplaced."
msgstr ""
@@ -7438,7 +7429,7 @@ msgid_plural "%3d turns"
msgstr[0] "%3d ãýñïò"
msgstr[1] "%3d ãýñïé"
-#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:631
#: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
@@ -7556,343 +7547,343 @@ msgstr "?
msgid "(worklist)"
msgstr "(ëßóôá åñãáóéþí)"
-#: client/cityrepdata.c:447
-msgid "Special"
-msgstr "Åéäéêüò"
+#: client/cityrepdata.c:446
+msgid "?city:Name"
+msgstr "?ðüëç:¼íïìá"
-#: client/cityrepdata.c:448
-msgid "?entertainers/scientists/taxmen:E/S/T"
-msgstr "?øõ÷áãùãåßò/åðéóôÞìïíåò/öïñïåéóðñÜêôïñåò:Ø/Å/Ö"
+#: client/cityrepdata.c:446 client/gui-sdl/cityrep.c:169
+msgid "City Name"
+msgstr "¼íïìá ðüëçò"
-#: client/cityrepdata.c:449
-msgid "Entertainers, Scientists, Taxmen"
-msgstr "Øõ÷áãùãåßò, ÅðéóôÞìïíåò, ÖïñïåéóðñÜ÷ôïñáò"
+#: client/cityrepdata.c:448
+msgid "?size [short]:Sz"
+msgstr "?ìÝãåèïò [óõíôüìåõóç]:Ìãò"
-#: client/cityrepdata.c:452
-msgid "Concise + Rapture, - Disorder"
-msgstr ""
+#: client/cityrepdata.c:448
+msgid "Size"
+msgstr "ÌÝãåèïò"
-#: client/cityrepdata.c:454 client/plrdlg_common.c:261
+#: client/cityrepdata.c:450 client/plrdlg_common.c:261
#: client/gui-win32/plrdlg.c:337
msgid "State"
msgstr ""
-#: client/cityrepdata.c:454
+#: client/cityrepdata.c:450
msgid "Rapture/Peace/Disorder"
msgstr ""
+#: client/cityrepdata.c:452
+msgid "Concise *=Rapture, X=Disorder"
+msgstr ""
+
+#: client/cityrepdata.c:456
+msgid "Special"
+msgstr "Åéäéêüò"
+
#: client/cityrepdata.c:457
+msgid "?entertainers/scientists/taxmen:E/S/T"
+msgstr "?øõ÷áãùãåßò/åðéóôÞìïíåò/öïñïåéóðñÜêôïñåò:Ø/Å/Ö"
+
+#: client/cityrepdata.c:458
+msgid "Entertainers, Scientists, Taxmen"
+msgstr "Øõ÷áãùãåßò, ÅðéóôÞìïíåò, ÖïñïåéóðñÜ÷ôïñáò"
+
+#: client/cityrepdata.c:461
msgid "?Happy workers:H"
msgstr "?Åõôõ÷éóìÝíïé åñãÜôåò:Å"
-#: client/cityrepdata.c:457
+#: client/cityrepdata.c:461
msgid "Workers: Happy"
msgstr "ÅñãÜôåò: ×áñïýìåíïé"
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
msgid "?Content workers:C"
msgstr "?ÉêáíïðïéçìÝíïé åñãÜôåò:É"
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
msgid "Workers: Content"
msgstr "ÅñãÜôåò: ÉêáíïðïéçìÝíïé"
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
msgid "?Unhappy workers:U"
msgstr "?Äõóôõ÷éóìÝíïé åñãÜôåò:Ä"
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
msgid "Workers: Unhappy"
msgstr "ÅñãÜôåò:Äõóôõ÷éóìÝíïé"
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
msgid "?Angry workers:A"
msgstr "?ÈõìùìÝíïé åñãÜôåò:È"
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
msgid "Workers: Angry"
msgstr "ÅñãÜôåò:ÈõìùìÝíïé"
-#: client/cityrepdata.c:465 client/gui-xaw/citydlg.c:2401
-#: data/default/units.ruleset:238
-msgid "Workers"
+#: client/cityrepdata.c:469 client/gui-xaw/citydlg.c:2402
+#, fuzzy
+msgid "?city:Workers"
msgstr "ÅñãÜôåò"
-#: client/cityrepdata.c:466
+#: client/cityrepdata.c:470
msgid "?happy/content/unhappy/angry:H/C/U/A"
msgstr "?åõôõ÷éóìÝíïé/éêáíïðïéçìÝíïé/äõóôõ÷éóìÝíïé/èõìùìÝíïé:Å/É/Ä/È"
-#: client/cityrepdata.c:467
+#: client/cityrepdata.c:471
msgid "Workers: Happy, Content, Unhappy, Angry"
msgstr "ÅñãÜôåò: Åõôõ÷éóìÝíïé, ÉêáíïðïéçìÝíïé, Äõóôõ÷éóìÝíïé, ÈõìùìÝíïé"
-#: client/cityrepdata.c:470 client/cityrepdata.c:472
+#: client/cityrepdata.c:474 client/cityrepdata.c:476
msgid "Best"
msgstr "Êáëýôåñï"
-#: client/cityrepdata.c:470
+#: client/cityrepdata.c:474
msgid "attack"
msgstr "åðßèåóç"
-#: client/cityrepdata.c:471
+#: client/cityrepdata.c:475
msgid "Best attacking units"
msgstr "Êáëýôåñåò åðéèåôéêÝò ìïíÜäåò"
-#: client/cityrepdata.c:472
+#: client/cityrepdata.c:476
msgid "defense"
msgstr "Üìõíá"
-#: client/cityrepdata.c:473
+#: client/cityrepdata.c:477
msgid "Best defending units"
msgstr "Êáëýôåñåò áìõíôéêÝò ìïíÜäåò"
-#: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
-#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
-#: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
-#: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
-#: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
-#: client/gui-win32/menu.c:351 client/gui-win32/repodlgs.c:616
-#: client/gui-win32/repodlgs.c:707 client/gui-win32/repodlgs.c:716
-#: client/gui-xaw/menu.c:157 client/gui-xaw/menu.c:219
-#: client/gui-xaw/menu.c:242 client/gui-xaw/repodlgs.c:881
-#: client/gui-xaw/repodlgs.c:1069 data/Freeciv.in:1895 data/helpdata.txt:909
+#: client/cityrepdata.c:478 client/cityrepdata.c:482
+#: client/gui-gtk-2.0/cityrep.c:1437 client/gui-gtk-2.0/cityrep.c:1456
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-gtk-2.0/cityrep.c:1494
+#: client/gui-gtk-2.0/cityrep.c:1514 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/repodlgs.c:960 client/gui-sdl/helpdlg.c:688
+#: client/gui-sdl/mapctrl.c:1605 client/gui-sdl/optiondlg.c:1827
+#: client/gui-sdl/repodlgs.c:356 client/gui-win32/menu.c:351
+#: client/gui-win32/repodlgs.c:616 client/gui-win32/repodlgs.c:707
+#: client/gui-win32/repodlgs.c:716 client/gui-xaw/menu.c:157
+#: client/gui-xaw/menu.c:219 client/gui-xaw/menu.c:242
+#: client/gui-xaw/repodlgs.c:881 client/gui-xaw/repodlgs.c:1069
+#: data/Freeciv.in:1895 data/helpdata.txt:909
msgid "Units"
msgstr "ÌïíÜäåò"
#. TRANS: Header "Number of units inside city"
-#: client/cityrepdata.c:476
+#: client/cityrepdata.c:480
#, fuzzy
msgid "?Present (units):Here"
msgstr "?Present (units):Ðñò"
-#: client/cityrepdata.c:477
+#: client/cityrepdata.c:481
msgid "Number of units present"
msgstr "Áñéèìüò ðáñüíôùí ìïíÜäùí"
#. TRANS: Header "Number of units supported by given city"
-#: client/cityrepdata.c:480
+#: client/cityrepdata.c:484
#, fuzzy
msgid "?Supported (units):Owned"
msgstr "?Supported (units):Õð"
-#: client/cityrepdata.c:481
+#: client/cityrepdata.c:485
msgid "Number of units supported"
msgstr "Áñéèìüò õðïóôçñéæüìåíùí ìïíÜäùí"
#. TRANS: Header "It will take this many turns before city grows"
-#: client/cityrepdata.c:484
+#: client/cityrepdata.c:488
msgid "?food (population):Grow"
msgstr "?öáãçôü (ðëçèõóìüò):Áýîçóç"
-#: client/cityrepdata.c:485 client/cityrepdata.c:530
+#: client/cityrepdata.c:489 client/cityrepdata.c:528
#, fuzzy
msgid "?Stock/Target:(Have/Need)"
msgstr "Áðüèåìá"
-#: client/cityrepdata.c:486
+#: client/cityrepdata.c:490
msgid "Turns until growth/famine"
msgstr "Ãýñïé ìÝ÷ñé áýîçóç/ëéìü"
-#: client/cityrepdata.c:488
-msgid "?size [short]:Sz"
-msgstr "?ìÝãåèïò [óõíôüìåõóç]:Ìãò"
-
-#: client/cityrepdata.c:488
-msgid "Size"
-msgstr "ÌÝãåèïò"
-
-#: client/cityrepdata.c:492
-msgid "?city:Name"
-msgstr "?ðüëç:¼íïìá"
-
-#: client/cityrepdata.c:492 client/gui-sdl/cityrep.c:169
-msgid "City Name"
-msgstr "¼íïìá ðüëçò"
-
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
msgid "Surplus"
msgstr "Ðëåüíáóìá"
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
msgid "?food/production/trade:F/P/T"
msgstr "?food/production/trade:Ö/Ð/Å"
-#: client/cityrepdata.c:496
+#: client/cityrepdata.c:494
msgid "Surplus: Food, Production, Trade"
msgstr "Ðëåüíáóìá: Öáãçôü, ÐáñáãùãÞ, Åìðüñéï"
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
msgid "?Food surplus [short]:+F"
msgstr "?Öáãçôü ðëåüíáóìá [óõíôüìåõóç]:+Ö"
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
msgid "Surplus: Food"
msgstr "Ðëåüíáóìá: Öáãçôü"
-#: client/cityrepdata.c:500
+#: client/cityrepdata.c:498
msgid "?Production surplus [short]:+P"
msgstr "?ÐáñáãùãÞ ðëåüíáóìá [óõíôüìåõóç]:+Ð"
-#: client/cityrepdata.c:501
+#: client/cityrepdata.c:499
msgid "Surplus: Production"
msgstr "Ðëåüíáóìá: ÐáñáãùãÞ"
-#: client/cityrepdata.c:502
+#: client/cityrepdata.c:500
#, fuzzy
msgid "?Production loss (waste) [short]:-P"
msgstr "-Ð"
-#: client/cityrepdata.c:503
+#: client/cityrepdata.c:501
msgid "Waste"
msgstr "ÓðáôÜëç"
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
msgid "?Trade surplus [short]:+T"
msgstr "?Åìðüñéï ðëåüíáóìá [óýíôïìåõóç]:+Å"
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
msgid "Surplus: Trade"
msgstr "Ðëåüíáóìá: Åìðüñéï"
-#: client/cityrepdata.c:506
+#: client/cityrepdata.c:504
#, fuzzy
msgid "?Trade loss (corruption) [short]:-T"
msgstr "-Å"
-#: client/cityrepdata.c:507
+#: client/cityrepdata.c:505
msgid "Corruption"
msgstr "ÄéáöèïñÜ"
-#: client/cityrepdata.c:509 client/gui-gtk-2.0/repodlgs.c:654
+#: client/cityrepdata.c:507 client/gui-gtk-2.0/repodlgs.c:654
#: client/gui-sdl/mapctrl.c:1400 client/gui-win32/repodlgs.c:334
#: client/gui-xaw/menu.c:222 client/gui-xaw/repodlgs.c:644
#: client/gui-xaw/repodlgs.c:773 data/Freeciv.in:1819
msgid "Economy"
msgstr "Ïéêïíïìßá"
-#: client/cityrepdata.c:509
+#: client/cityrepdata.c:507
msgid "?gold/luxury/science:G/L/S"
msgstr "?gold/luxury/science:X/A/E"
-#: client/cityrepdata.c:510
+#: client/cityrepdata.c:508
msgid "Economy: Gold, Luxuries, Science"
msgstr "Ïéêïíïìßá: ×ñõóüò, ÁíÝóåéò, ÅðéóôÞìç"
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
msgid "?Gold:G"
msgstr "?Gold:×"
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
msgid "Economy: Gold"
msgstr "Ïéêïíïìßá: ×ñõóüò"
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
msgid "?Luxury:L"
msgstr "?Luxury:Á"
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
msgid "Economy: Luxury"
msgstr "Ïéêïíïìßá: ÁíÝóåéò"
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
msgid "?Science:S"
msgstr "?Science:Å"
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
msgid "Economy: Science"
msgstr "Ïéêïíïìßá: ÅðéóôÞìç"
-#: client/cityrepdata.c:518
+#: client/cityrepdata.c:516
#, fuzzy
msgid "?number_trade_routes:n"
msgstr "?number_trade_routes:n"
-#: client/cityrepdata.c:518
+#: client/cityrepdata.c:516
#, fuzzy
msgid "?number_trade_routes:R"
msgstr "?number_trade_routes:Å"
-#: client/cityrepdata.c:519
+#: client/cityrepdata.c:517
msgid "Number of Trade Routes"
msgstr "Áñéèìüò åìðïñéêþí äéáäñïìÝò"
-#: client/cityrepdata.c:521
+#: client/cityrepdata.c:519
#, fuzzy
msgid "?pollution [short]:Pol"
msgstr "?pollution [short]:Ìëí"
-#: client/cityrepdata.c:523
+#: client/cityrepdata.c:521
msgid "?cma:Governor"
msgstr "?cma:ÊõâåñíÞôçò"
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
-#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
-#: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
-#: data/Freeciv.in:1459 data/helpdata.txt:820
+#: client/cityrepdata.c:521 client/gui-gtk-2.0/cityrep.c:1766
+#: client/gui-sdl/citydlg.c:3809 client/gui-sdl/cma_fe.c:858
+#: client/gui-win32/citydlg.c:726 data/Freeciv.in:1459 data/helpdata.txt:820
msgid "Citizen Governor"
msgstr "ÊõâåñíÞôçò Ðüëçò"
-#: client/cityrepdata.c:526
+#: client/cityrepdata.c:524
msgid "Turns/Buy"
msgstr "Ãýñïé/ÁãïñÜ"
-#: client/cityrepdata.c:529 client/cityrepdata.c:531
+#: client/cityrepdata.c:527 client/cityrepdata.c:529
#, fuzzy
msgid "Currently Building"
msgstr "õðü ðáñáãùãÞ"
-#: client/cityrepdata.c:575
+#: client/cityrepdata.c:573
msgid "?specialist:S"
msgstr "?åéäéêüò:Å"
-#: client/cityrepdata.c:578
+#: client/cityrepdata.c:576
#, fuzzy
msgid "Specialists"
msgstr "Åéäéêïß ðüñïé"
-#: client/civclient.c:239
+#: client/civclient.c:240
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr ""
-#: client/civclient.c:249
+#: client/civclient.c:250
msgid " -l, --log FILE\tUse FILE as logfile (spawned server also uses this)\n"
msgstr ""
-#: client/civclient.c:251
+#: client/civclient.c:252
msgid " -m, --meta HOST\tConnect to the metaserver at HOST\n"
msgstr ""
-#: client/civclient.c:253
+#: client/civclient.c:254
msgid " -n, --name NAME\tUse NAME as name\n"
msgstr ""
-#: client/civclient.c:255
+#: client/civclient.c:256
msgid " -p, --port PORT\tConnect to server port PORT (usually with -a)\n"
msgstr ""
-#: client/civclient.c:257
+#: client/civclient.c:258
#, c-format
msgid " -P, --Plugin PLUGIN\tUse PLUGIN for sound output %s\n"
msgstr ""
-#: client/civclient.c:259
+#: client/civclient.c:260
msgid " -r, --read FILE\tRead startup script FILE (for spawned server only)\n"
msgstr ""
-#: client/civclient.c:262
+#: client/civclient.c:263
msgid " -s, --server HOST\tConnect to the server at HOST (usually with -a)\n"
msgstr ""
-#: client/civclient.c:264
+#: client/civclient.c:265
msgid " -S, --Sound FILE\tRead sound tags from FILE\n"
msgstr ""
-#: client/civclient.c:265
+#: client/civclient.c:266
msgid " -t, --tiles FILE\tUse data file FILE.tilespec for tiles\n"
msgstr ""
-#: client/civclient.c:268
+#: client/civclient.c:269
#, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -7900,146 +7891,156 @@ msgid ""
msgstr ""
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:273
+#: client/civclient.c:274
#, fuzzy, c-format
msgid "Report bugs at %s\n"
msgstr "ÁíÝöåñå ëÜèç óå <%s>.\n"
-#: client/civclient.c:297
+#: client/civclient.c:298
#, c-format
msgid "Invalid port \"%s\" specified with --port option.\n"
msgstr ""
-#: client/civclient.c:299 client/civclient.c:314
+#: client/civclient.c:300 client/civclient.c:315
msgid "Try using --help.\n"
msgstr ""
-#: client/civclient.c:312
+#: client/civclient.c:313
#, c-format
msgid "Invalid debug level \"%s\" specified with --debug option.\n"
msgstr ""
-#: client/civclient.c:325
+#: client/civclient.c:326
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr ""
-#: client/civclient.c:539
+#: client/civclient.c:391
+#, fuzzy, c-format
+msgid "Updating old metaserver address \"%s\"."
+msgstr "metaserver <äéåýèõíóç>"
+
+#: client/civclient.c:394
+#, c-format
+msgid "Default metaserver has been set to \"%s\"."
+msgstr ""
+
+#: client/civclient.c:550
msgid "Game started."
msgstr ""
-#: client/civclient.c:577
+#: client/civclient.c:588
msgid "There was an error while auto connecting; aborting."
msgstr ""
-#: client/climisc.c:176
+#: client/climisc.c:177
#, c-format
msgid "Changing production of every %s into %s."
msgstr ""
-#: client/climisc.c:214
+#: client/climisc.c:215
#, fuzzy
msgid "?embassy:Both"
msgstr "Ðñåóâåßá"
-#: client/climisc.c:216
+#: client/climisc.c:217
#, fuzzy
msgid "?embassy:Yes"
msgstr "Ðñåóâåßá"
-#: client/climisc.c:219
+#: client/climisc.c:220
msgid "?embassy:With Us"
msgstr ""
-#: client/climisc.c:222
+#: client/climisc.c:223
msgid "?embassy:Contact"
msgstr ""
-#: client/climisc.c:224
+#: client/climisc.c:225
msgid "?embassy:No Contact"
msgstr ""
-#: client/climisc.c:236
+#: client/climisc.c:237
msgid "?vision:Both"
msgstr ""
-#: client/climisc.c:238
+#: client/climisc.c:239
msgid "?vision:To Them"
msgstr ""
-#: client/climisc.c:241
+#: client/climisc.c:242
msgid "?vision:To Us"
msgstr ""
-#: client/climisc.c:257 client/climisc.c:264
+#: client/climisc.c:258 client/climisc.c:265
#, c-format
msgid "The %s give %s"
msgstr ""
-#: client/climisc.c:268
+#: client/climisc.c:269
#, c-format
msgid "The %s give unknown city."
msgstr ""
-#: client/climisc.c:273
+#: client/climisc.c:274
#, c-format
msgid "The %s give %d gold"
msgstr ""
-#: client/climisc.c:278
+#: client/climisc.c:279
#, c-format
msgid "The %s give their worldmap"
msgstr ""
-#: client/climisc.c:282
+#: client/climisc.c:283
#, c-format
msgid "The %s give their seamap"
msgstr ""
-#: client/climisc.c:286
+#: client/climisc.c:287
msgid "The parties agree on a cease-fire"
msgstr ""
-#: client/climisc.c:289
+#: client/climisc.c:290
msgid "The parties agree on a peace"
msgstr ""
-#: client/climisc.c:292
+#: client/climisc.c:293
msgid "The parties create an alliance"
msgstr ""
-#: client/climisc.c:295
+#: client/climisc.c:296
#, fuzzy, c-format
msgid "The %s give shared vision"
msgstr "_Äþóå êïéíÞ ïñáôüôçôá"
-#: client/climisc.c:299
+#: client/climisc.c:300
#, fuzzy, c-format
msgid "The %s give an embassy"
msgstr "_Äþóå êïéíÞ ïñáôüôçôá"
-#: client/climisc.c:902
+#: client/climisc.c:906
msgid "Popup Request"
msgstr ""
-#: client/climisc.c:932
+#: client/climisc.c:936
msgid "Exporting output window to civgame.log ..."
msgstr ""
-#: client/climisc.c:936
+#: client/climisc.c:940
msgid "Export complete."
msgstr ""
-#: client/climisc.c:938
+#: client/climisc.c:942
msgid "Export failed, couldn't write to file."
msgstr ""
-#: client/climisc.c:1038
+#: client/climisc.c:1042
#, c-format
msgid "You don't buy %s in %s!"
msgstr ""
-#: client/climisc.c:1056
+#: client/climisc.c:1060
#, c-format
msgid "%s costs %d gold and you only have %d gold."
msgstr ""
@@ -8083,22 +8084,22 @@ msgid ""
"%d times"
msgstr ""
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1289
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
#, fuzzy
msgid "novice"
msgstr "áñ÷Üñéï"
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1289
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1358
#, fuzzy
msgid "easy"
msgstr "åýêïëï"
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1290
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
#, fuzzy
msgid "normal"
msgstr "êáíïíéêü"
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1290
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
#, fuzzy
msgid "hard"
msgstr "äýóêïëï"
@@ -8129,40 +8130,43 @@ msgid "We probably couldn't start it from here."
msgstr "Ðéèáíþò äåí ìðïñïýìå íá ôï îåêéíÞóïõìå áðü åäþ."
#: client/connectdlg_common.c:470
-msgid "We have control of the server (command access level hack)"
+#, fuzzy
+msgid ""
+"Established control over the server. You have command access level 'hack'."
msgstr ""
"¸÷ïõìå ôïí Ýëåã÷ï ôïõ åîõðçñåôçôÞ (ðåßñáãìá åðéðÝäïõ ðñüóâáóçò åíôïëþí)"
#: client/connectdlg_common.c:475
-msgid "We can't take control of server, attempting to kill it."
+msgid ""
+"Failed to obtain the required access level to take control of the server. "
+"The server will now be shutdown."
msgstr ""
-"Äåí ìðïñïýìå íá ðÜñïõìå ôïí Ýëåã÷ï ôïõ åîõðçñåôçôÞ, ðñïóðÜèåéá åêôÝëåóÞò ôïõ."
-#: client/control.c:1104
+#: client/control.c:1123
msgid "Only transporter units can be unloaded."
msgstr "Ìüíï ìïíÜäåò ìåôáöïñéêÝò ìðïñïýí íá îåöïñôùèïýí."
-#: client/control.c:1353
+#: client/control.c:1425
msgid "Only settler units can be put into auto mode."
msgstr "Ìüíï ìïíÜäåò áðïéêéóìïý ìðïñïýí íá ôåèïýí óå áõôüìáôç ëåéôïõñãßá."
-#: client/control.c:1444
+#: client/control.c:1516
msgid "Only nuclear units can do this."
msgstr "Ìüíï ðõñçíéêÝò ìïíÜäåò ìðïñïýí íá ôï êÜíïõí áõôü."
-#: client/control.c:1473
+#: client/control.c:1545
msgid "Only paratrooper units can do this."
msgstr "Ìüíï ìïíÜäåò áëåîéðôùôéóôþí ìðïñïýí íá ôï êÜíïõí áõôü."
-#: client/control.c:1921
+#: client/control.c:2020
msgid "Too far for this unit."
msgstr "Ðïëý ìáêñßá ãéá áõôÞ ôç ìïíÜäá"
-#: client/control.c:2131 client/control.c:2161 client/control.c:2177
+#: client/control.c:2230 client/control.c:2260 client/control.c:2276
msgid "Didn't find a route to the destination!"
msgstr "Äåí âñÞêá äéáäñïìÞ ãéá ðñïïñéóìü!"
-#: client/control.c:2221
+#: client/control.c:2320
msgid "Oh my! You seem to have no capital!"
msgstr "Á! Öáßíåôáé üôé äåí Ý÷åéò ðñùôåýïõóá!"
@@ -8248,16 +8252,16 @@ msgid "Allows %s (with %s)."
msgstr "ÅðéôñÝðåé %s (ìå %s)."
#. TRANS: preserve single space at beginning
-#: client/helpdata.c:418
+#: client/helpdata.c:416
msgid " Rivers"
msgstr " Ðïôáìïß"
-#: client/helpdata.c:576
+#: client/helpdata.c:574
#, c-format
msgid "Sorry, no help topic for %s.\n"
msgstr "Óõãíþìç, äåí õðÜñ÷åé èÝìá âïÞèåéáò ãéá %s.\n"
-#: client/helpdata.c:580
+#: client/helpdata.c:578
#, c-format
msgid ""
"Sorry, no help topic for %s.\n"
@@ -8268,7 +8272,7 @@ msgstr ""
"ÁõôÞ ç óåëßäá äçìéïõñãÞèçêå áõôüìáôá.\n"
"\n"
-#: client/helpdata.c:670
+#: client/helpdata.c:668
#, fuzzy
msgid ""
"Requires: Nothing\n"
@@ -8277,59 +8281,59 @@ msgstr ""
"Áðáéôåß ôï êôßñéï %s .\n"
"\n"
-#: client/helpdata.c:675
+#: client/helpdata.c:673
#, c-format
msgid "* The discovery of %s will make %s obsolete.\n"
msgstr "* Ç áíáêÜëõøç ôïõ %s èá êÜíåé áðáñ÷áéùìÝíï ôï %s .\n"
-#: client/helpdata.c:694
+#: client/helpdata.c:692
#, c-format
msgid "* Allows all players with knowledge of %s to build %s units.\n"
msgstr ""
"* ÅðéôñÝðåé óå üëïõò ôïõò ðáß÷ôåò ìå ãíþóç %s íá ÷ôßóïõí ìïíÜäåò %s .\n"
-#: client/helpdata.c:706
+#: client/helpdata.c:704
#, c-format
msgid "* Allows %s (with %s).\n"
msgstr "* ÅðéôñÝðåé %s (ìå %s).\n"
-#: client/helpdata.c:710
+#: client/helpdata.c:708
#, c-format
msgid "* Allows %s.\n"
msgstr "* ÅðéôñÝðåé %s.\n"
-#: client/helpdata.c:780
+#: client/helpdata.c:778
#, fuzzy, c-format
msgid "* Can only be built if there is %s in the city.\n"
msgstr "* Ìðïñåß íá ÷ôéóôåß ìüíï ìå êõâÝñíçóç %s.\n"
-#: client/helpdata.c:786
+#: client/helpdata.c:784
#, c-format
msgid "* Can only be built with %s as government.\n"
msgstr "* Ìðïñåß íá ÷ôéóôåß ìüíï ìå êõâÝñíçóç %s.\n"
-#: client/helpdata.c:791
+#: client/helpdata.c:789
msgid "* May not be built in cities.\n"
msgstr "* Äåí ìðïñåß íá ÷ôéóôåß óå ðüëåéò.\n"
-#: client/helpdata.c:794
+#: client/helpdata.c:792
msgid "* Never has a home city.\n"
msgstr "* Äåí Ý÷åé ðüëç áíáöïñÜò.\n"
-#: client/helpdata.c:797
+#: client/helpdata.c:795
msgid "* Losing this unit will lose you the game!\n"
msgstr "* Áí ÷áèåß áõôÞ ç ìïíÜäá èá ÷áèåß ôï ðáé÷íßäé!\n"
-#: client/helpdata.c:801
+#: client/helpdata.c:799
msgid "* Each player may only have one of this type of unit.\n"
msgstr "* ÊÜèå ðáß÷ôçò ìðïñåß íá Ý÷åé ìüíï ìéá ìïíÜäá áõôïý ôïõ ôýðïõ.\n"
-#: client/helpdata.c:805
+#: client/helpdata.c:803
#, c-format
msgid "* Requires %d population to build.\n"
msgstr "* Áðáéôåß %d ðëçèõóìü ãéá íá ÷ôéóôåß.\n"
-#: client/helpdata.c:811
+#: client/helpdata.c:809
#, fuzzy, c-format
msgid "* Can carry and refuel %d air unit.\n"
msgid_plural "* Can carry and refuel %d air units.\n"
@@ -8338,7 +8342,7 @@ msgstr[0] ""
msgstr[1] ""
"* Äåí ìðïñåß íá ìåôáöÝñåé êáé íá áíåöïäéÜóåé %d ìïíÜäåò áðü ôéò êëÜóåéò:\n"
-#: client/helpdata.c:816
+#: client/helpdata.c:814
#, fuzzy, c-format
msgid "* Can carry and refuel %d missile unit.\n"
msgid_plural "* Can carry and refuel %d missile units.\n"
@@ -8347,7 +8351,7 @@ msgstr[0] ""
msgstr[1] ""
"* Äåí ìðïñåß íá ìåôáöÝñåé êáé íá áíåöïäéÜóåé %d ìïíÜäåò áðü ôéò êëÜóåéò:\n"
-#: client/helpdata.c:821
+#: client/helpdata.c:819
#, fuzzy, c-format
msgid "* Can carry %d ground unit across water.\n"
msgid_plural "* Can carry %d ground units across water.\n"
@@ -8356,7 +8360,7 @@ msgstr[0] ""
msgstr[1] ""
"* Äåí ìðïñåß íá ìåôáöÝñåé êáé íá áíåöïäéÜóåé %d ìïíÜäåò áðü ôéò êëÜóåéò:\n"
-#: client/helpdata.c:830
+#: client/helpdata.c:828
msgid ""
"* Can establish trade routes (must travel to target city and must be at "
"least 9 tiles [in Manhattan distance] from this unit's home city).\n"
@@ -8365,211 +8369,211 @@ msgstr ""
"óôü÷ï êáé ðñÝðåé íá åßíáé 9 ôåôñÜãùíá [óå áðüóôáóç Ìáí÷Üôáí] áðü ôçí ðüëç "
"áíáöïñÜò ôçò ìïíÜäáò)\n"
-#: client/helpdata.c:836
+#: client/helpdata.c:834
#, c-format
msgid "* Can help build wonders (adds %d production).\n"
msgstr ""
-#: client/helpdata.c:840
+#: client/helpdata.c:838
msgid "* May not be disbanded.\n"
msgstr ""
-#: client/helpdata.c:842
+#: client/helpdata.c:840
#, c-format
msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
msgstr ""
-#: client/helpdata.c:846
+#: client/helpdata.c:844
msgid "* Can build new cities.\n"
msgstr ""
-#: client/helpdata.c:849
+#: client/helpdata.c:847
#, c-format
msgid "* Can add on %d population to cities of no more than size %d.\n"
msgstr ""
-#: client/helpdata.c:858
+#: client/helpdata.c:856
msgid "* Can build roads and railroads.\n"
msgstr "* Äåí ìðïñïýí íá ÷ôéóôïýí äñüìïé êáé óéäçñüäñïìïé .\n"
-#: client/helpdata.c:859
+#: client/helpdata.c:857
msgid "* Can build mines on tiles.\n"
msgstr "* Ìðïñåßò íá ÷ôßóåéò ïñõ÷åßá óôï ôåôñÜãùíï.\n"
-#: client/helpdata.c:860
+#: client/helpdata.c:858
msgid "* Can build irrigation on tiles.\n"
msgstr "* Ìðïñåßò íá ÷ôßóåéò ýäñåõóç óå ôåôñÜãùíá .\n"
-#: client/helpdata.c:865
+#: client/helpdata.c:863
msgid "* Can build farmland.\n"
msgstr ""
-#: client/helpdata.c:869
+#: client/helpdata.c:867
#, c-format
msgid "* Can build farmland (if %s is known).\n"
msgstr ""
-#: client/helpdata.c:873
+#: client/helpdata.c:871
#, c-format
msgid "* Can build farmland (if any of the following are known: %s).\n"
msgstr ""
-#: client/helpdata.c:881
+#: client/helpdata.c:879
msgid "* Can build fortresses.\n"
msgstr ""
-#: client/helpdata.c:885
+#: client/helpdata.c:883
#, c-format
msgid "* Can build fortresses (if %s is known).\n"
msgstr ""
-#: client/helpdata.c:889
+#: client/helpdata.c:887
#, c-format
msgid "* Can build fortresses (if any of the following are known: %s).\n"
msgstr ""
-#: client/helpdata.c:895
+#: client/helpdata.c:893
msgid "* Can clean pollution from tiles.\n"
msgstr ""
-#: client/helpdata.c:896
+#: client/helpdata.c:894
msgid "* Can clean nuclear fallout from tiles.\n"
msgstr ""
-#: client/helpdata.c:899
+#: client/helpdata.c:897
msgid "* Can transform tiles.\n"
msgstr ""
-#: client/helpdata.c:902
+#: client/helpdata.c:900
#, fuzzy
msgid "* Can build airbases.\n"
msgstr "* Ìðïñåßò íá ÷ôßóåéò ïñõ÷åßá óôï ôåôñÜãùíï.\n"
-#: client/helpdata.c:906
+#: client/helpdata.c:904
#, c-format
msgid "* May fortify, granting a 50%% defensive bonus.\n"
msgstr ""
-#: client/helpdata.c:909
+#: client/helpdata.c:907
msgid "* May pillage to destroy infrastructure from tiles.\n"
msgstr ""
-#: client/helpdata.c:913
+#: client/helpdata.c:911
msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
msgstr ""
-#: client/helpdata.c:916
+#: client/helpdata.c:914
msgid "* Can perform diplomatic actions.\n"
msgstr ""
-#: client/helpdata.c:920
+#: client/helpdata.c:918
msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
msgstr ""
-#: client/helpdata.c:923
+#: client/helpdata.c:921
msgid "* May not be bribed.\n"
msgstr ""
-#: client/helpdata.c:926
+#: client/helpdata.c:924
msgid "* Can attack enemy air units.\n"
msgstr ""
-#: client/helpdata.c:930
+#: client/helpdata.c:928
msgid "* Is invisible except when next to an enemy unit or city.\n"
msgstr ""
-#: client/helpdata.c:934
+#: client/helpdata.c:932
msgid "* Can only attack units on ocean squares (no land attacks).\n"
msgstr ""
-#: client/helpdata.c:938
+#: client/helpdata.c:936
msgid ""
"* Can attack from aboard sea units: against enemy cities and onto land "
"squares.\n"
msgstr ""
-#: client/helpdata.c:943
+#: client/helpdata.c:941
#, c-format
msgid "* Can be paradropped from a friendly city (Range: %d).\n"
msgstr ""
-#: client/helpdata.c:949
+#: client/helpdata.c:947
msgid "* Gets double defense against units specified as 'mounted'.\n"
msgstr ""
-#: client/helpdata.c:953
+#: client/helpdata.c:951
msgid "* Counts as 'mounted' against certain defenders.\n"
msgstr ""
-#: client/helpdata.c:957
+#: client/helpdata.c:955
#, fuzzy
msgid "* A missile unit: gets used up in making an attack.\n"
msgstr " * Êáôáíáëþíåôáé óôçí åêôÝëåóç ôçò åðßèåóçò .\n"
-#: client/helpdata.c:960
+#: client/helpdata.c:958
msgid "* Making an attack ends this unit's turn.\n"
msgstr ""
-#: client/helpdata.c:964
+#: client/helpdata.c:962
msgid "* This unit's attack causes a nuclear explosion!\n"
msgstr ""
-#: client/helpdata.c:968
+#: client/helpdata.c:966
msgid "* Gets double firepower when attacking cities.\n"
msgstr ""
-#: client/helpdata.c:971
+#: client/helpdata.c:969
msgid "* Ignores the effects of city walls.\n"
msgstr ""
-#: client/helpdata.c:975
+#: client/helpdata.c:973
#, c-format
msgid ""
"* Does bombard attacks (%d per turn). These attacks will only damage (never "
"kill) the defender, but have no risk for the attacker.\n"
msgstr ""
-#: client/helpdata.c:982
+#: client/helpdata.c:980
msgid "* Gets quintuple defense against missiles and aircraft.\n"
msgstr ""
-#: client/helpdata.c:986
+#: client/helpdata.c:984
msgid "* Ignores terrain effects (treats all squares as roads).\n"
msgstr ""
-#: client/helpdata.c:989
+#: client/helpdata.c:987
msgid "* Ignores zones of control.\n"
msgstr ""
-#: client/helpdata.c:993
+#: client/helpdata.c:991
msgid "* A non-military unit (cannot attack; no martial law).\n"
msgstr ""
-#: client/helpdata.c:997
+#: client/helpdata.c:995
msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
msgstr ""
-#: client/helpdata.c:1000
+#: client/helpdata.c:998
msgid "* Will never achieve veteran status.\n"
msgstr ""
-#: client/helpdata.c:1002
+#: client/helpdata.c:1000
msgid "* May become veteran through training or combat.\n"
msgstr ""
-#: client/helpdata.c:1008
+#: client/helpdata.c:1006
#, c-format
msgid ""
"* Must end turn in a city or next to land, or has a 50%% risk of being lost "
"at sea.\n"
msgstr ""
-#: client/helpdata.c:1012
+#: client/helpdata.c:1010
#, fuzzy, c-format
msgid "* The discovery of %s reduces the risk to 25%%.\n"
msgstr "* Ç áíáêÜëõøç ôïõ %s èá êÜíåé áðáñ÷áéùìÝíï ôï %s .\n"
-#: client/helpdata.c:1017
+#: client/helpdata.c:1015
#, c-format
msgid "* %s reduces the risk to 12%%.\n"
msgstr ""
@@ -8578,115 +8582,115 @@ msgstr ""
#. * last two elements
#. TRANS: List of possible output types has this between
#. * last two elements
-#: client/helpdata.c:1068 client/helpdata.c:1402
+#: client/helpdata.c:1066 client/helpdata.c:1400
msgid " or "
msgstr ""
-#: client/helpdata.c:1070 client/helpdata.c:1390
+#: client/helpdata.c:1068 client/helpdata.c:1388
msgid "?or:, "
msgstr ""
-#: client/helpdata.c:1082
+#: 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"
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:1124
+#: client/helpdata.c:1122
#, c-format
msgid "If we would now start with %s we would need %d bulbs."
msgstr ""
-#: client/helpdata.c:1129
+#: client/helpdata.c:1127
#, 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:1137
+#: client/helpdata.c:1135
msgid "You cannot research this technology."
msgstr ""
-#: client/helpdata.c:1141
+#: client/helpdata.c:1139
msgid " This number may vary depending on what other players will research.\n"
msgstr ""
-#: client/helpdata.c:1153
+#: client/helpdata.c:1151
#, c-format
msgid "* The first player to research %s gets an immediate advance.\n"
msgstr ""
-#: client/helpdata.c:1158
+#: client/helpdata.c:1156
#, c-format
msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
msgstr ""
-#: client/helpdata.c:1161
+#: client/helpdata.c:1159
#, c-format
msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
msgstr ""
-#: client/helpdata.c:1165
+#: client/helpdata.c:1163
msgid "* Increases the pollution generated by the population.\n"
msgstr ""
-#: client/helpdata.c:1170
+#: client/helpdata.c:1168
#, c-format
msgid "* Allows %s to build roads on river squares.\n"
msgstr ""
-#: client/helpdata.c:1177
+#: client/helpdata.c:1175
#, fuzzy, c-format
msgid "* Allows %s to build fortresses.\n"
msgstr "* Óïõ åðéôñÝðåé íá ÷ôßóåéò %s.\n"
-#: client/helpdata.c:1185
+#: client/helpdata.c:1183
#, fuzzy, c-format
msgid "* Allows %s to build airbases.\n"
msgstr "* Óïõ åðéôñÝðåé íá ÷ôßóåéò %s.\n"
-#: client/helpdata.c:1194
+#: client/helpdata.c:1192
#, c-format
msgid "* Allows %s to upgrade roads to railroads.\n"
msgstr ""
-#: client/helpdata.c:1202
+#: client/helpdata.c:1200
#, c-format
msgid "* Allows %s to upgrade irrigation to farmland.\n"
msgstr ""
-#: client/helpdata.c:1236
+#: client/helpdata.c:1234
msgid "* Pollution cannot be generated on this terrain."
msgstr ""
-#: client/helpdata.c:1241
+#: client/helpdata.c:1239
msgid "* You cannot build cities on this terrain."
msgstr ""
-#: client/helpdata.c:1247
+#: client/helpdata.c:1245
msgid "* The coastline of this terrain is unsafe."
msgstr ""
-#: client/helpdata.c:1252
+#: client/helpdata.c:1250
msgid "* This terrain is unsafe for units to travel on."
msgstr ""
-#: client/helpdata.c:1257
+#: client/helpdata.c:1255
msgid "* Land units cannot travel on oceanic terrains."
msgstr ""
-#: client/helpdata.c:1307
+#: client/helpdata.c:1305
msgid "Features:\n"
msgstr ""
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1413 client/helpdata.c:1414
+#: client/helpdata.c:1411 client/helpdata.c:1412
msgid "?outputlist: Nothing "
msgstr ""
-#: client/helpdata.c:1421
+#: client/helpdata.c:1419
#, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
@@ -8697,7 +8701,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:1431
+#: client/helpdata.c:1429
#, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8705,48 +8709,48 @@ msgid ""
msgstr ""
#. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1439
+#: client/helpdata.c:1437
#, c-format
msgid "* You pay %d times normal %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1444
+#: client/helpdata.c:1442
#, 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:1449
+#: client/helpdata.c:1447
#, c-format
msgid "* You pay no %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1453
+#: client/helpdata.c:1451
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:1462
+#: client/helpdata.c:1460
#, 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:1470
+#: client/helpdata.c:1468
#, c-format
msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
msgstr ""
-#: client/helpdata.c:1477
+#: client/helpdata.c:1475
#, 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:1484
+#: client/helpdata.c:1482
#, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -8754,23 +8758,23 @@ msgid ""
msgstr ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1491
+#: client/helpdata.c:1489
#, 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:1499
+#: client/helpdata.c:1497
#, c-format
msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
msgstr ""
-#: client/helpdata.c:1504
+#: client/helpdata.c:1502
msgid "Has unlimited science/gold/luxuries rates.\n"
msgstr ""
-#: client/helpdata.c:1509
+#: client/helpdata.c:1507
#, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
@@ -8781,7 +8785,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:1521
+#: client/helpdata.c:1519
#, 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"
@@ -8789,60 +8793,60 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1532
+#: client/helpdata.c:1530
#, 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:1538
+#: client/helpdata.c:1536
msgid "* Your units cannot be bribed.\n"
msgstr ""
-#: client/helpdata.c:1541
+#: client/helpdata.c:1539
msgid "* Your cities cannot be incited.\n"
msgstr ""
-#: client/helpdata.c:1545
+#: client/helpdata.c:1543
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:1551
+#: client/helpdata.c:1549
msgid "* Has a senate that may prevent declaration of war.\n"
msgstr ""
-#: client/helpdata.c:1555
+#: client/helpdata.c:1553
msgid "* Allows partisans when cities are taken by the enemy.\n"
msgstr ""
-#: client/helpdata.c:1559
+#: client/helpdata.c:1557
msgid ""
"* Buildings that normally confer bonuses against unhappiness will instead "
"give gold.\n"
msgstr ""
-#: client/helpdata.c:1563
+#: client/helpdata.c:1561
msgid "* Pays no upkeep for fanatics.\n"
msgstr ""
-#: client/helpdata.c:1566
+#: client/helpdata.c:1564
msgid "* Has no unhappy citizens.\n"
msgstr ""
-#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
+#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
#, c-format
msgid "* Veteran %s units.\n"
msgstr ""
-#: client/helpdata.c:1587
+#: client/helpdata.c:1585
msgid "* Veteran units.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1593
+#: client/helpdata.c:1591
#, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8850,7 +8854,7 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1602
+#: client/helpdata.c:1600
#, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8858,37 +8862,37 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1610
+#: client/helpdata.c:1608
#, 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:1619
+#: client/helpdata.c:1617
#, 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:1627
+#: client/helpdata.c:1625
#, c-format
msgid "* %s production will suffer massive waste.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1632
+#: client/helpdata.c:1630
#, 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:1637
+#: client/helpdata.c:1635
#, 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:1645
+#: client/helpdata.c:1643
#, c-format
msgid "* %s waste will increase quickly with distance from capital.\n"
msgstr ""
@@ -8896,404 +8900,451 @@ msgstr ""
"ðñùôåýïõóá. \n"
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1651
+#: client/helpdata.c:1649
#, 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:1657
+#: client/helpdata.c:1655
#, c-format
msgid "* %s waste will increase slowly with distance from capital.\n"
msgstr ""
"* %s áðüâëçôá èá áõîçèïýí áñãÜ áíÜëïãá ìå ôçí áðüóôáóç áðü ôçí ðñùôåýïõóá. \n"
-#: client/helpdata.c:1674
+#: client/helpdata.c:1672
#, c-format
msgid "* Allows you to build %s.\n"
msgstr "* Óïõ åðéôñÝðåé íá ÷ôßóåéò %s.\n"
#. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1701
+#: client/helpdata.c:1699
#, c-format
msgid "%s%d %s"
msgstr ""
-#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1700 client/helpdata.c:1708 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:1709
+#: client/helpdata.c:1707
#, c-format
msgid "%s%d unhappy"
msgstr "%s%d äõóôõ÷éóìÝíïé"
-#: client/mapctrl_common.c:382
+#: client/mapctrl_common.c:399
#, c-format
msgid "You don't know how to build %s!"
msgstr "Äåí îÝñåéò ðùò íá ÷ôßóåéò ôï %s!"
-#: client/mapctrl_common.c:392
+#: client/mapctrl_common.c:409
#, c-format
msgid "Copy %s to clipboard."
msgstr "ÁíôéãñáöÞ %s óôï ðñü÷åéñï"
-#: client/mapctrl_common.c:408
+#: client/mapctrl_common.c:425
msgid "Clipboard is empty."
msgstr "Ôï ðñü÷åéñï åßíáé Üäåéï."
-#: client/options.c:98
+#: client/options.c:102
msgid "Graphics"
msgstr "ÃñáöéêÜ"
-#: client/options.c:99
+#: client/options.c:103
msgid "Overview"
msgstr "ÃåíéêÞ åéêüíá"
-#: client/options.c:100
+#: client/options.c:104
msgid "Sound"
msgstr "¹÷ïò"
-#: client/options.c:101
+#: client/options.c:105
msgid "Interface"
msgstr "Äéáóýíäåóç"
-#: client/options.c:102
+#: client/options.c:106
msgid "Network"
msgstr "Äßêôõï"
-#: client/options.c:107
+#: client/options.c:111
msgid "Login name"
msgstr ""
-#: client/options.c:108
+#: client/options.c:112
msgid ""
"This is the default login username that will be used in the connection "
"dialogs or with the -a command-line parameter."
msgstr ""
-#: client/options.c:113
+#: client/options.c:117
msgid "Server"
msgstr ""
-#: client/options.c:114
+#: client/options.c:118
msgid ""
"This is the default server hostname that will be used in the connection "
"dialogs or with the -a command-line parameter."
msgstr ""
-#: client/options.c:119
+#: client/options.c:123
msgid "Server port"
msgstr ""
-#: client/options.c:120
+#: client/options.c:124
msgid ""
"This is the default server port that will be used in the connection dialogs "
"or with the -a command-line parameter."
msgstr ""
-#: client/options.c:125 client/gui-win32/connectdlg.c:912 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
msgid "Metaserver"
msgstr ""
-#: client/options.c:126
+#: client/options.c:130
msgid ""
"The metaserver is a host that the client contacts to find out about games on "
"the internet. Don't change this from its default value unless you know what "
"you're doing."
msgstr ""
-#: client/options.c:132
+#: client/options.c:136
msgid "Soundset"
msgstr ""
-#: client/options.c:133
+#: client/options.c:137
msgid ""
"This is the soundset that will be used. Changing this is the same as using "
"the -S command-line parameter."
msgstr ""
-#: client/options.c:138
+#: client/options.c:142
msgid "Sound plugin"
msgstr ""
-#: client/options.c:139
+#: client/options.c:143
msgid ""
"If you have a problem with sound, try changing the sound plugin. The new "
"plugin won't take effect until you restart Freeciv. Changing this is the "
"same as using the -P command-line option."
msgstr ""
-#: client/options.c:144 client/gui-sdl/gui_main.c:162
+#: client/options.c:148 client/gui-sdl/gui_main.c:162
msgid "Theme"
msgstr ""
-#: client/options.c:145
+#: client/options.c:149
msgid "By changing this option you change the active theme."
msgstr ""
-#: client/options.c:148
+#: client/options.c:152
msgid "Tileset"
msgstr ""
-#: client/options.c:149
+#: client/options.c:153
msgid ""
"By changing this option you change the active tileset. This is the same as "
"using the -t command-line parameter."
msgstr ""
-#: client/options.c:156
+#: client/options.c:160
msgid "Solid unit background color"
msgstr ""
-#: client/options.c:157
+#: client/options.c:161
msgid ""
"Setting this option will cause units on the map view to be drawn with a "
"solid background color instead of the flag backdrop."
msgstr ""
-#: client/options.c:161 client/gui-sdl/optiondlg.c:960
+#: client/options.c:165 client/gui-sdl/optiondlg.c:960
msgid "Sound bell at new turn"
msgstr ""
-#: client/options.c:162
+#: client/options.c:166
msgid ""
"Set this option to have a \"bell\" event be generated at the start of a new "
"turn. You can control the behavior of the \"bell\" event by editing the "
"message options."
msgstr ""
-#: client/options.c:168
+#: client/options.c:172
msgid "Unit movement animation time (milliseconds)"
msgstr ""
-#: client/options.c:169
+#: client/options.c:173
msgid ""
"This option controls how long unit \"animation\" takes when a unit moves on "
"the map view. Set it to 0 to disable animation entirely."
msgstr ""
-#: client/options.c:174
+#: client/options.c:178
msgid "Mapview recentering time (milliseconds)"
msgstr ""
-#: client/options.c:175
+#: client/options.c:179
msgid ""
"When the map view is recentered, it will slide smoothly over the map to its "
"new position. This option controls how long this slide lasts. Set it to 0 "
"to disable mapview sliding entirely."
msgstr ""
-#: client/options.c:180 client/gui-sdl/optiondlg.c:1014
+#: client/options.c:184 client/gui-sdl/optiondlg.c:1014
msgid "Show combat animation"
msgstr ""
-#: client/options.c:181
+#: client/options.c:185
msgid ""
"Disabling this option will turn off combat animation between units on the "
"mapview."
msgstr ""
-#: client/options.c:184
+#: client/options.c:188
msgid "Draw the citybar"
msgstr ""
-#: client/options.c:185
+#: client/options.c:189
msgid ""
"Setting this option will display a 'citybar' containing useful information "
"beneath each city. Disabling this option will display only the city's name "
"and optionally, production."
msgstr ""
-#: client/options.c:191
+#: client/options.c:195
msgid "Show icons in the technology tree"
msgstr ""
-#: client/options.c:192
+#: client/options.c:196
msgid ""
"Setting this option will display icons on the technology tree diagram. "
"Turning this option off makes the technology tree more compact."
msgstr ""
-#: client/options.c:197
+#: client/options.c:201
msgid "Draw shield graphics for units"
msgstr ""
-#: client/options.c:198
+#: client/options.c:202
msgid ""
"Setting this option will draw a shield icon as the flags on units. If "
"unset, the full flag will be drawn."
msgstr ""
-#: client/options.c:202
+#: client/options.c:206
msgid "Manual Turn Done in AI Mode"
msgstr ""
-#: client/options.c:203
+#: client/options.c:207
msgid ""
"Disable this option if you do not want to press the Turn Done button "
"manually when watching an AI player."
msgstr ""
-#: client/options.c:207 client/gui-sdl/optiondlg.c:1121
+#: client/options.c:211 client/gui-sdl/optiondlg.c:1121
msgid "Auto Center on Units"
msgstr ""
-#: client/options.c:208
+#: client/options.c:212
msgid ""
"Set this option to have the active unit centered automatically when the unit "
"focus changes."
msgstr ""
-#: client/options.c:211 client/gui-sdl/optiondlg.c:1147
+#: client/options.c:215 client/gui-sdl/optiondlg.c:1147
msgid "Auto Center on Combat"
msgstr ""
-#: client/options.c:212
+#: client/options.c:216
msgid ""
"Set this option to have any combat be centered automatically. Disabled this "
"will speed up the time between turns but may cause you to miss combat "
"entirely."
msgstr ""
-#: client/options.c:217 client/gui-sdl/optiondlg.c:1174
+#: client/options.c:221 client/gui-sdl/optiondlg.c:1174
msgid "Focus on Awakened Units"
msgstr ""
-#: client/options.c:218
+#: client/options.c:222
msgid "Set this option to have newly awoken units be focused automatically."
msgstr ""
-#: client/options.c:221
+#: client/options.c:225
msgid "Allow goto into the unknown"
msgstr ""
-#: client/options.c:222
+#: client/options.c:226
msgid ""
"Setting this option will make the game consider moving into unknown tiles. "
"If not, then goto routes will detour around or be blocked by unknown tiles."
msgstr ""
-#: client/options.c:226
+#: client/options.c:230
msgid "Center map when Popup city"
msgstr ""
-#: client/options.c:227
+#: client/options.c:231
msgid ""
"Setting this option makes the mapview center on a city when its city dialog "
"is popped up."
msgstr ""
-#: client/options.c:230
+#: client/options.c:234
msgid "Concise City Production"
msgstr ""
-#: client/options.c:231
+#: client/options.c:235
msgid ""
"Set this option to make the city production (as shown in the city dialog) to "
"be more compact."
msgstr ""
-#: client/options.c:234 client/gui-sdl/optiondlg.c:1252
+#: client/options.c:238 client/gui-sdl/optiondlg.c:1252
msgid "End Turn when done moving"
msgstr ""
-#: client/options.c:235
+#: client/options.c:239
msgid ""
"Setting this option makes your turn end automatically when all your units "
"are done moving."
msgstr ""
-#: client/options.c:238 client/gui-sdl/optiondlg.c:1226
+#: client/options.c:242 client/gui-sdl/optiondlg.c:1226
msgid "Prompt for city names"
msgstr ""
-#: client/options.c:239
+#: client/options.c:243
msgid ""
"Disabling this option will make the names of newly founded cities chosen "
"automatically by the server."
msgstr ""
-#: client/options.c:242 client/gui-sdl/optiondlg.c:1200
+#: client/options.c:246 client/gui-sdl/optiondlg.c:1200
msgid "Pop up city dialog for new cities"
msgstr ""
-#: client/options.c:243
+#: client/options.c:247
msgid ""
"Setting this option will pop up a newly-founded city's city dialog "
"automatically."
msgstr ""
-#: client/options.c:248
+#: client/options.c:250
+#, fuzzy
+msgid "Pop up caravan actions"
+msgstr "ÅíÝñãåéåò êáñáâáíßïõ"
+
+#: client/options.c:251
+msgid ""
+"If this option is enabled, when caravans arrive at a city where they can "
+"establish a traderoute or help build a wonder, a window will popup asking "
+"which action should be performed. Disabling this option means you will have "
+"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 ""
+
+#: client/options.c:260
+msgid "Enable cursor changing"
+msgstr ""
+
+#: client/options.c:261
+msgid ""
+"This option controls whether the client should try to change the mouse "
+"cursor depending on what is being pointed at, as well as to indicate changes "
+"in the client or server state."
+msgstr ""
+
+#: client/options.c:266
+msgid "Select cities before units"
+msgstr ""
+
+#: 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 ""
+
+#: client/options.c:272
+msgid "Clear unit orders on selection"
+msgstr ""
+
+#: client/options.c:273
+msgid ""
+"Enabling this option will cause unit orders to be cleared whenever one or "
+"more units are selected. If this option is disabled, selecting units will "
+"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 ""
+
+#: client/options.c:282
msgid "Background layer"
msgstr ""
-#: client/options.c:249
+#: client/options.c:283
msgid "The background layer of the overview shows just ocean and land."
msgstr ""
-#: client/options.c:252
+#: client/options.c:286
msgid "Terrain relief map layer"
msgstr ""
-#: client/options.c:253
+#: client/options.c:287
msgid "The relief layer shows all terrains on the map."
msgstr ""
-#: client/options.c:256
+#: client/options.c:290
msgid "Borders layer"
msgstr ""
-#: client/options.c:257
+#: client/options.c:291
msgid ""
"The borders layer of the overview shows which tiles are owned by each player."
msgstr ""
-#: client/options.c:261
+#: client/options.c:295
msgid "Units layer"
msgstr ""
-#: client/options.c:262
+#: client/options.c:296
msgid "Enabling this will draw units on the overview."
msgstr ""
-#: client/options.c:265
+#: client/options.c:299
msgid "Cities layer"
msgstr "Óôñþìá ðüëåùí"
-#: client/options.c:266
+#: client/options.c:300
msgid "Enabling this will draw cities on the overview."
msgstr ""
-#: client/options.c:269
+#: client/options.c:303
msgid "Overview fog of war"
msgstr ""
-#: client/options.c:270
+#: client/options.c:304
msgid "Enabling this will show fog of war on the overview."
msgstr ""
-#: client/options.c:488
+#: client/options.c:526
msgid "If you add a preset by hand, also update \"number_of_presets\""
msgstr ""
-#: client/options.c:516
+#: client/options.c:554
msgid "Cannot find your home directory"
msgstr "äåí ìðïñþ íá âñù ðñïóùðéêü êáôÜëïãï"
-#: client/options.c:665 client/options.c:796
+#: client/options.c:703 client/options.c:834
msgid "Save failed, cannot find a filename."
msgstr "ÁðÝôõ÷å ç áðïèÞêåõóç, äåí ìðïñþ íá âñù üíïìá áñ÷åßïõ"
-#: client/options.c:678 client/options.c:859
+#: client/options.c:716 client/options.c:897
#, c-format
msgid "Save failed, cannot write to file %s"
msgstr "ÁðÝôõ÷å ç áðïèÞêåõóç, äåí ìðïñþ íá ãñÜøù óôï áñ÷åßï %s"
-#: client/options.c:680 client/options.c:862
+#: client/options.c:718 client/options.c:900
#, c-format
msgid "Saved settings to file %s"
msgstr "Áðïèçêåýôçêáí ïé ñõèìßóåéò óôï áñ÷åßï %s"
@@ -9318,16 +9369,16 @@ msgstr "
msgid "Start of turn %d"
msgstr "Áñ÷Þ %d ãýñïõ"
-#: client/packhand.c:1590
+#: client/packhand.c:1591
#, c-format
msgid "AI Mode is now %s."
msgstr "ÔÍ åßíáé ôþñá %s."
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "ON"
msgstr "Áíïé÷ôü"
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "OFF"
msgstr "Êëåéóôü"
@@ -9360,14 +9411,15 @@ msgid "Username"
msgstr "¼íïìá ÷ñÞóôç"
#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
-#: client/gui-gtk-2.0/pages.c:2085
+#: client/gui-gtk-2.0/pages.c:2157
msgid "Flag"
msgstr "Óçìáßá"
#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
-#: client/gui-gtk-2.0/pages.c:1536 client/gui-gtk-2.0/pages.c:2087
-#: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
-#: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
+#: 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/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr "¸èíïò"
@@ -9379,7 +9431,7 @@ msgstr "
msgid "Score"
msgstr "Âáèìïëïãßá"
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
msgid "Team"
msgstr "ÏìÜäá"
@@ -9450,279 +9502,301 @@ msgstr "
msgid "Could not open temp file."
msgstr "Äåí ìðüñåóá íá áíïßîù ôï ðñïóùñéíü áñ÷åßï"
-#: client/servers.c:407
+#: client/servers.c:410
msgid "Invalid $http_proxy or metaserver value, must start with 'http://'"
msgstr ""
"¶êõñïò $http_proxy Þ ôéìÞ ìåôÜÅîõðçñåôçôÞ, ðñÝðåé íá áñ÷ßæåé ìå'http://' "
-#: client/servers.c:413
+#: client/servers.c:416
msgid "Failed looking up metaserver's host"
msgstr "Áðïñõ÷ßá åýñåóçò õðïëïãéóôÞ ìåôÜÅîõðçñåôçôÞ "
-#: client/text.c:85 client/text.c:86 client/text.c:91
+#. TRANS: "AI <player name>"
+#: client/text.c:94
+#, c-format
+msgid "AI %s"
+msgstr ""
+
+#. TRANS: "<nation adjective>, team <team name>"
+#: client/text.c:118
+#, fuzzy, c-format
+msgid "%s, team %s"
+msgstr "%s ôùí %s"
+
+#: client/text.c:135 client/text.c:136 client/text.c:141
#: client/gui-sdl/mapview.c:752
msgid "?nation:Neutral"
msgstr "?nation:ÏõäÝôåñï"
-#: client/text.c:85 client/gui-sdl/mapview.c:752
+#: client/text.c:135 client/gui-sdl/mapview.c:752
msgid "?nation:Hostile"
msgstr "?nation:Å÷èñéêü"
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Peaceful"
msgstr "?nation:Åéñçíéêü"
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Friendly"
msgstr "?nation:Öéëéêü"
-#: client/text.c:88 client/gui-sdl/mapview.c:755
+#: client/text.c:138 client/gui-sdl/mapview.c:755
msgid "?nation:Mysterious"
msgstr "?nation:ÌõóôÞñéï"
-#: client/text.c:88
+#: client/text.c:138
msgid "?nation:Friendly(team)"
msgstr "?nation:Öéëéêü(ïìÜäá)"
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
msgid "?city:Neutral"
msgstr "?city:ÏõäÝôåñç"
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
msgid "?city:Hostile"
msgstr "?city:Å÷èñéêÞ"
-#: client/text.c:92 client/gui-sdl/mapview.c:786
+#: client/text.c:142 client/gui-sdl/mapview.c:786
msgid "?city:Peaceful"
msgstr "?city:ÅéñçíéêÞ"
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Friendly"
msgstr "?city:ÖéëéêÞ"
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Mysterious"
msgstr "?city:ÌõóôÞñéá"
-#: client/text.c:93
+#: client/text.c:143
msgid "?city:Friendly(team)"
msgstr "?city:ÖéëéêÞ(ïìÜäá)"
-#: client/text.c:100
+#: client/text.c:151
#, c-format
msgid "Location: (%d, %d) [%d]"
msgstr "Ôïðïèåóßá: (%d, %d) [%d]"
-#: client/text.c:109
+#: client/text.c:153
+#, c-format
+msgid "Native coordinates: (%d, %d)"
+msgstr ""
+
+#: client/text.c:160
#, c-format
msgid "Terrain: %s"
msgstr "¸äáöïò: %s"
-#: client/text.c:110
+#: client/text.c:161
#, c-format
msgid "Food/Prod/Trade: %s"
msgstr "Öáã/Ðáñ/Åìðñ: %s"
-#: client/text.c:113
+#: client/text.c:164
msgid "Minor Tribe Village"
msgstr "×ùñéü ìéêñÞò öõëÞò"
-#: client/text.c:119
+#: client/text.c:173
#, fuzzy
msgid "Our territory"
msgstr "Ç ðåñéï÷Þ ìáò"
-#. TRANS: "Polish territory"
-#: client/text.c:122
+#. TRANS: "Territory of <username> (<nation + team>)"
+#: client/text.c:176
#, fuzzy, c-format
-msgid "%s territory"
-msgstr "¸äáöüò"
+msgid "Territory of %s (%s)"
+msgstr "Ðåñéï÷Þ ôùí %s %s"
-#. TRANS: "Polish territory (5 turn cease-fire)"
-#: client/text.c:131
-#, c-format
-msgid "%s territory (%d turn cease-fire)"
-msgid_plural "%s territory (%d turn cease-fire)"
-msgstr[0] "%s ðåñéï÷Þ (êáôÜðáõóç ðõñüò %d ãýñïò)"
-msgstr[1] "%s ðåñéï÷Þ (êáôÜðáõóç ðõñüò %d ãýñïé)"
+#: client/text.c:186
+#, fuzzy, c-format
+msgid "Territory of %s (%s) (%d turn cease-fire)"
+msgid_plural "Territory of %s (%s) (%d turn cease-fire)"
+msgstr[0] "Ðüëç: %s (%s,êáôÜðáõóç ðõñüò %d ãýñïò) "
+msgstr[1] "Ðüëç: %s (%s,êáôÜðáõóç ðõñüò %d ãýñïé) "
-#. TRANS: "Polish territory (friendly)"
-#: client/text.c:140
+#. TRANS: "Territory of <username>
+#. * (<nation + team> | <diplomatic state>)"
+#: client/text.c:195
#, fuzzy, c-format
-msgid "%s territory (%s)"
-msgstr "%s ðåñéï÷Þ (êáôÜðáõóç ðõñüò %d ãýñïò)"
+msgid "Territory of %s (%s | %s)"
+msgstr "Ðåñéï÷Þ ôùí %s %s"
-#: client/text.c:145
+#: client/text.c:200
msgid "Unclaimed territory"
msgstr "ÄéåêäéêÞóçìç ðåñéï÷Þ"
-#. TRANS: "City: Warsaw (Polish)"
-#: client/text.c:156
-#, c-format
-msgid "City: %s (%s)"
-msgstr "Ðüëç: %s (%s)"
+#. TRANS: "City: <city name> | <username> (<nation + team>)"
+#: client/text.c:214
+#, fuzzy, c-format
+msgid "City: %s | %s (%s)"
+msgstr "Ðüëç: %s (%s, %s)"
-#. TRANS: "City: Warsaw (Polish, 5 turn cease-fire)"
-#: client/text.c:166
-#, c-format
-msgid "City: %s (%s, %d turn cease-fire)"
-msgid_plural "City: %s (%s, %d turn cease-fire)"
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <number> turn cease-fire)"
+#: client/text.c:224
+#, fuzzy, c-format
+msgid "City: %s | %s (%s, %d turn cease-fire)"
+msgid_plural "City: %s | %s (%s, %d turn cease-fire)"
msgstr[0] "Ðüëç: %s (%s,êáôÜðáõóç ðõñüò %d ãýñïò) "
msgstr[1] "Ðüëç: %s (%s,êáôÜðáõóç ðõñüò %d ãýñïé) "
-#. TRANS: "City: Warsaw (Polish,friendly)"
-#: client/text.c:174
-#, c-format
-msgid "City: %s (%s, %s)"
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <diplomatic state>)"
+#: client/text.c:231
+#, fuzzy, c-format
+msgid "City: %s | %s (%s, %s)"
msgstr "Ðüëç: %s (%s, %s)"
#. TRANS: previous lines gave other information about the city.
-#: client/text.c:189
+#: client/text.c:246
#, c-format
msgid "?clistbegin: with %s"
msgstr ""
#. TRANS: "Trade from Warsaw: 5"
-#: client/text.c:202
+#: client/text.c:259
#, c-format
msgid "Trade from %s: %d"
msgstr "Åìðïñåýìáôá áðü %s: %d "
-#: client/text.c:210
+#: client/text.c:267
#, c-format
msgid "Infrastructure: %s"
msgstr "ÕðïäïìÝò: %s"
-#: client/text.c:215
+#: client/text.c:272
#, c-format
msgid "Activity: %s"
msgstr "Äñáóôçñéüôçôá: %s"
-#. TRANS: "Unit: Musketeers (Polish, Warsaw)"
-#. TRANS: "Unit: Musketeers (Polish,friendly)"
-#: client/text.c:226 client/text.c:253
-#, c-format
-msgid "Unit: %s (%s, %s)"
+#. TRANS: "Unit: <unit type> | <username>
+#. * (<nation + team>, <homecity>)"
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <diplomatic state>)"
+#: client/text.c:287 client/text.c:313
+#, fuzzy, c-format
+msgid "Unit: %s | %s (%s, %s)"
msgstr "ÌïíÜäá: %s (%s, %s)"
-#. TRANS: "Unit: Musketeers (Polish)"
-#: client/text.c:232
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>)"
+#: client/text.c:292
#, fuzzy, c-format
-msgid "Unit: %s (%s)"
-msgstr "ÌïíÜäá:%s (%s%s) "
+msgid "Unit: %s | %s (%s)"
+msgstr "ÌïíÜäá: %s (%s, %s)"
-#. TRANS: "Unit: Musketeers (Polish, 5 turn cease-fire)"
-#: client/text.c:245
-#, c-format
-msgid "Unit: %s (%s, %d turn cease-fire)"
-msgid_plural "Unit: %s (%s, %d turn cease-fire)"
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <number> turn cease-fire)"
+#: client/text.c:305
+#, fuzzy, c-format
+msgid "Unit: %s | %s (%s, %d turn cease-fire)"
+msgid_plural "Unit: %s | %s (%s, %d turn cease-fire)"
msgstr[0] "ÌïíÜäá: %s (%s,êáôÜðáõóç ðõñüò %d ãýñïò)"
msgstr[1] "ÌïíÜäá: %s (%s,êáôÜðáõóç ðõñüò %d ãýñïé)"
#. TRANS: "Chance to win: A:95% D:46%"
-#: client/text.c:279
+#: client/text.c:338
#, c-format
msgid "Chance to win: A:%d%% D:%d%%"
msgstr "Ðéèáíüôçôá íßêçò: A:%d%% D:%d%% "
#. TRANS: A is attack power, D is defense power, FP is firepower,
#. * HP is hitpoints (current and max).
-#: client/text.c:286
+#: client/text.c:345
#, c-format
msgid "A:%d D:%d FP:%d HP:%d/%d (%s)"
msgstr "Å:%d Á:%d ÄÐ:%d ÌÁ:%d/%d (%s)"
#. TRANS: "5 more" units on this tile
-#: client/text.c:295
+#: client/text.c:354
#, c-format
msgid " (%d more)"
msgstr " (%d áêüìç)"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:364
+#: client/text.c:423
#, c-format
msgid "far from %s"
msgstr "ìáêñõÜ áðü %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:367
+#: client/text.c:426
#, c-format
msgid "near %s"
msgstr "êïíôÜ %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:370
+#: client/text.c:429
#, c-format
msgid "in %s"
msgstr "óôçí %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:403
+#: client/text.c:462
#, c-format
msgid "from %s"
msgstr "áðü %s"
-#: client/text.c:466
+#: client/text.c:525
msgid "Progress: no research"
msgstr "Ðñüïäïò: êáìßá Ýñåõíá"
-#: client/text.c:470
+#: client/text.c:529
msgid "Progress: no research target"
msgstr "Ðñüïäïò: êáíÝíáò åñåõíçôéêüò óôü÷ïò"
-#: client/text.c:475
+#: client/text.c:534
#, c-format
msgid "Progress: %d turn/advance"
msgid_plural "Progress: %d turns/advance"
msgstr[0] "Ðñüïäïò: %d ãýñïò/ôå÷íïëïãßá"
msgstr[1] "Ðñüïäïò: %d ãýñïé/ôå÷íïëïãßá"
-#: client/text.c:480
+#: client/text.c:539
#, c-format
msgid "%d bulb/turn"
msgid_plural "%d bulbs/turn"
msgstr[0] "%d ãëüìðïò/ãýñï"
msgstr[1] "%d ãëüìðïé/ãýñï"
-#: client/text.c:485
+#: client/text.c:544
#, c-format
msgid ", %d bulb/turn from team"
msgid_plural ", %d bulbs/turn from team"
msgstr[0] ", %d ãëüìðï/ãýñï áðü ïìÜäá"
msgstr[1] ", %d ãëüìðïé/ãýñï áðü ïìÜäá"
-#: client/text.c:512
+#: client/text.c:571
#, c-format
msgid "%d/- (never)"
msgstr "%d/- (ðïôÝ)"
-#: client/text.c:524
+#: client/text.c:583
#, c-format
msgid "%d/%d (%d turn)"
msgid_plural "%d/%d (%d turns)"
msgstr[0] "%d/%d (%d ãýñï)"
msgstr[1] "%d/%d (%d ãýñïõò)"
-#: client/text.c:527
+#: client/text.c:586
#, c-format
msgid "%d/%d (never)"
msgstr "%d/%d (ðïôÝ)"
-#: client/text.c:564
+#: client/text.c:623
#, c-format
msgid "%d step"
msgid_plural "%d steps"
msgstr[0] "%d âÞìáôá"
msgstr[1] "%d âÞìáôá"
-#: client/text.c:566
+#: client/text.c:625
#, c-format
msgid "%d bulb"
msgid_plural "%d bulbs"
msgstr[0] "%d ãëüìðïé"
msgstr[1] "%d ãëüìðïé"
-#: client/text.c:570 client/agents/cma_fec.c:269 client/agents/cma_fec.c:313
+#: 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
#, c-format
msgid "%d turn"
@@ -9730,89 +9804,89 @@ msgid_plural "%d turns"
msgstr[0] "%d ãýñïò"
msgstr[1] "%d ãýñïõò"
-#: client/text.c:592
+#: client/text.c:651
#, c-format
msgid "Population: %s"
msgstr "Ðëçèõóìüò: %s"
-#: client/text.c:595
+#: client/text.c:654
#, c-format
msgid "Year: %s (T%d)"
msgstr "×ñüíïò: %s (T%d)"
-#: client/text.c:598
+#: client/text.c:657
#, c-format
msgid "Gold: %d (%+d)"
msgstr "×ñõóüò: %d (%+d)"
-#: client/text.c:600
+#: client/text.c:659
#, c-format
msgid "Tax: %d Lux: %d Sci: %d"
msgstr "Öïñ: %d Áíó: %d Åðó: %d"
-#: client/text.c:607
+#: client/text.c:666
#, fuzzy
msgid "Moving: Nobody"
msgstr "Ìåôáêéíåßôáé: %s"
-#: client/text.c:609
+#: client/text.c:668
#, c-format
msgid "Moving: %s"
msgstr "Ìåôáêéíåßôáé: %s"
-#: client/text.c:613
+#: client/text.c:672
msgid "(Click for more info)"
msgstr "(Êëßê ãéá ðåñéóóüôåñåò ðëçñïöïñßåò)"
-#: client/text.c:629
+#: client/text.c:688
#, c-format
msgid "%s People"
msgstr "%s ¶íèñùðïé"
-#: client/text.c:633
+#: client/text.c:692
#, c-format
msgid "Turn: %d"
msgstr "Ãýñïò: %d"
-#: client/text.c:635 client/gui-win32/inteldlg.c:111
+#: client/text.c:694 client/gui-win32/inteldlg.c:111
#: client/gui-xaw/inteldlg.c:208
#, c-format
msgid "Gold: %d"
msgstr "×ñõóüò: %d"
-#: client/text.c:636
+#: client/text.c:695
#, c-format
msgid "Net Income: %d"
msgstr "Êáèáñü åéóüäçìá: %d"
#. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:639
+#: client/text.c:698
#, c-format
msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
msgstr "Tax rates: ×ñõóüò:%d%% ÁíÝóåéò:%d%% ÅðéóôÞìç:%d%%"
-#: client/text.c:643
+#: client/text.c:702
#, c-format
msgid "Researching %s: %s"
msgstr "ÅñåõíÜôáé %s: %s"
-#: client/text.c:650
+#: client/text.c:709
#, c-format
msgid "Global warming chance: %d%% (%+d%%/turn)"
msgstr "Ðéèáíüôçôá ðáãêüóìéáò õðåñèÝñìáíóçò: %d%% (%+d%%/ãýñï)"
-#: client/text.c:653
+#: client/text.c:712
#, c-format
msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
msgstr "Ðéèáíüôçôá ðõñçíéêïý ÷åéìþíá: %d%% (%+d%%/ãýñï)"
-#: client/text.c:658 client/gui-win32/inteldlg.c:104
+#: client/text.c:717 client/gui-win32/inteldlg.c:104
#: client/gui-xaw/inteldlg.c:200
#, c-format
msgid "Government: %s"
msgstr "Ðïëßôåõìá: %s"
-#: client/text.c:682
+#: client/text.c:741
#, c-format
msgid "%d unit"
msgid_plural "%d units"
@@ -9820,55 +9894,55 @@ msgstr[0] "%d
msgstr[1] "%d ìïíÜäåò"
#. TRANS: Impossible to reach goto target tile
-#: client/text.c:715 client/gui-sdl/mapview.c:566
+#: client/text.c:774 client/gui-sdl/mapview.c:566
msgid "?goto:Unreachable"
msgstr ""
-#: client/text.c:717 client/gui-sdl/mapview.c:568
+#: client/text.c:776 client/gui-sdl/mapview.c:568
#, c-format
msgid "Turns to target: %d"
msgstr "Ãýñïé ãéá óôü÷ï: %d"
-#: client/text.c:719 client/gui-sdl/mapview.c:570
+#: client/text.c:778 client/gui-sdl/mapview.c:570
#, c-format
msgid "Turns to target: %d to %d"
msgstr "Ãýñïé ãéá óôü÷ï: %d ìÝ÷ñé %d"
-#: client/text.c:725 client/gui-sdl/mapview.c:576
+#: client/text.c:784 client/gui-sdl/mapview.c:576
#, c-format
msgid "%d unit selected"
msgid_plural "%d units selected"
msgstr[0] "%d ìïíÜäá åðéëåãìÝíç"
msgstr[1] "%d ìïíÜäåò åðéëåãìÝíåò"
-#: client/text.c:730 client/gui-sdl/mapview.c:581
+#: client/text.c:789 client/gui-sdl/mapview.c:581
msgid "No units selected."
msgstr "Êáìßá ìïíÜäá åðéëåãìÝíç."
-#: client/text.c:804 client/gui-sdl/mapview.c:654
+#: client/text.c:863 client/gui-sdl/mapview.c:654
#, c-format
msgid "Others: %d civil; %d military"
msgstr "¶ëëïé: %d ðïëßôåò,%d óôñáôéùôéêïß"
-#: client/text.c:806 client/gui-sdl/mapview.c:656
+#: client/text.c:865 client/gui-sdl/mapview.c:656
#, c-format
msgid "Others: %d civilian"
msgstr "¶ëëïé: %d ðïëßôåò"
-#: client/text.c:808 client/gui-sdl/mapview.c:658
+#: client/text.c:867 client/gui-sdl/mapview.c:658
#, c-format
msgid "Others: %d military"
msgstr "¶ëëïé: %d óôñáôéùôéêïß"
-#: client/text.c:839
+#: client/text.c:898
msgid "No units to upgrade!"
msgstr "Êáìßá ìïíÜäá ãéá áíáâÜèìéóç!"
-#: client/text.c:864
+#: client/text.c:923
msgid "None of these units may be upgraded."
msgstr "Êáìßá áðï áõôÝò ôéò ìïíÜäåò äåí áíáâáèìßæåôáé."
-#: client/text.c:870
+#: client/text.c:929
#, c-format
msgid ""
"Upgrade %d unit for %d gold?\n"
@@ -9883,72 +9957,72 @@ msgstr[1] ""
"ÁíáâÜèìéóç %d ìïíÜäùí ãéá %d ÷ñõóÜ;\n"
"Ôï èçóáõñïöõëÜêéï ðåñéÝ÷åé %d ÷ñõóÜ."
-#: client/text.c:891
+#: client/text.c:950
msgid "Shows your progress in researching the current technology."
msgstr "Äåß÷íåé ôçí ðñïïäü óïõ óôçí áíáæÞôçóç ôçò ôñÝ÷ïõóáò ôå÷íïëïãßáò"
-#: client/text.c:897
+#: client/text.c:956
msgid "no research target."
msgstr "êáíÝíáò óôü÷ïò Ýñåõíáò"
#. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:900
+#: client/text.c:959
#, c-format
msgid "%s: %d/%d."
msgstr ""
-#: client/text.c:920
+#: client/text.c:979
msgid "Shows the progress of global warming:"
msgstr ""
-#: client/text.c:921
+#: client/text.c:980
#, c-format
msgid "Pollution rate: %d%%"
msgstr "Ðïóïóôü ìüëõíóçò: %d%%"
-#: client/text.c:923
+#: client/text.c:982
#, c-format
msgid "Chance of catastrophic warming each turn: %d%%"
msgstr "Ðéèáíüôçôá êáôáóôñïöéêÞò èÝñìáíóçò êÜèå ãýñï: %d%%"
-#: client/text.c:939
+#: client/text.c:998
msgid "Shows the progress of nuclear winter:"
msgstr "Äåß÷íåé ôçí ðñüïäï ôïõ ðõñçíéêïý ÷åéìþíá:"
-#: client/text.c:940
+#: client/text.c:999
#, c-format
msgid "Fallout rate: %d%%"
msgstr "Ðïóïóôü ðõñçí.êáôáë:%d%%"
-#: client/text.c:942
+#: client/text.c:1001
#, c-format
msgid "Chance of catastrophic winter each turn: %d%%"
msgstr "Ðéèáíüôçôá êáôáóôñïöéêïý ÷åéìþíá êÜèå ãýñïõ: %d%%"
-#: client/text.c:957
+#: client/text.c:1016
msgid "Shows your current government:"
msgstr "Äåß÷íåé ôçí ôùñéíÞ óïõ êõâÝñíçóç:"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:981
+#: client/text.c:1040
#, c-format
msgid "Population: %5d"
msgstr "Ðëçèõóìüò: %5d"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:1043
#, c-format
msgid "Support: %5d %%"
msgstr "ÓõíôÞñçóç: %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:1047
#, c-format
msgid "Energy: %5d %%"
msgstr "ÅíÝñãåéá: %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:992
+#: client/text.c:1051
#, c-format
msgid "Mass: %5d ton"
msgid_plural "Mass: %5d tons"
@@ -9956,96 +10030,97 @@ msgstr[0] "
msgstr[1] "ÌÜæá:\t\t%5d ôüíïé"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1057
#, c-format
msgid "Travel time: %5.1f years"
msgstr "×ñüíïò ôáîéäßïõ: %5.1f ÷ñüíéá"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1061
msgid "Travel time: N/A "
msgstr "×ñüíïò ôáîéäßïõ: ; "
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1065
#, c-format
msgid "Success prob.: %5d %%"
msgstr "Ðéèáíüôçôá åðéô.:%5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1010
+#: client/text.c:1069
#, c-format
msgid "Year of arrival: %8s"
msgstr "×ñüíïò Üöéîçò: %8s"
-#: client/text.c:1030
+#: client/text.c:1089
msgid "?timeout:off"
msgstr "?timeout:êëåéóôü"
-#: client/text.c:1054
+#: client/text.c:1113
#, c-format
msgid "?seconds:%02ds"
msgstr "?seconds:%02dä"
-#: client/text.c:1056
+#: client/text.c:1115
#, c-format
msgid "?mins/secs:%02dm %02ds"
msgstr "?mins/secs:%02dë %02dä"
-#: client/text.c:1058
+#: client/text.c:1117
#, c-format
msgid "?hrs/mns:%02dh %02dm"
msgstr "?þñåò/ëåðôÜ:%02dù %02dë"
-#: client/text.c:1060
+#: client/text.c:1119
#, c-format
msgid "?dys/hrs:%02dd %02dh"
msgstr ""
-#: client/text.c:1063
+#: client/text.c:1122
msgid "?duration:overflow"
msgstr ""
-#: client/text.c:1084
+#: client/text.c:1143
#, c-format
msgid "%6d.%02d ms"
msgstr ""
-#. TRANS: "Republic of the Poles"
-#: client/text.c:1127
-#, c-format
-msgid "%s of the %s"
-msgstr "%s ôùí %s"
+#. TRANS: <nation adjective> <government name>.
+#. * E.g. "Polish Republic".
+#: client/text.c:1188
+#, fuzzy, c-format
+msgid "?nationgovernment:%s %s"
+msgstr "Ðïëßôåõìá: %s"
#. TRANS: "Observer: 1985"
-#: client/text.c:1137
+#: client/text.c:1198
#, c-format
msgid "Observer: %s"
msgstr "ÐáñáôçñçôÞò: %s"
-#: client/text.c:1155
+#: client/text.c:1216
msgid "Buildings: "
msgstr "ÊôÞñéá: "
-#: client/text.c:1172 client/text.c:1211
+#: client/text.c:1233 client/text.c:1272
msgid "None. "
msgstr "ÊáíÝíá. "
-#: client/text.c:1174 client/text.c:1213
+#: client/text.c:1235 client/text.c:1274
msgid "?clistend:."
msgstr ""
-#: client/text.c:1192
+#: client/text.c:1253
msgid "Wonders: "
msgstr "Èáýìáôá: "
-#: client/text.c:1247
+#: client/text.c:1308
#, 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:1251
+#: client/text.c:1312
#, fuzzy, c-format
msgid "%d content before penalty."
msgid_plural "%d content before penalty."
@@ -10053,45 +10128,41 @@ msgstr[0] "%d
msgstr[1] "%d éêáíïðïéçìÝíïé ðñßí áðü ðïéíÞ áðü "
#. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1257
+#: client/text.c:1318
#, fuzzy, c-format
msgid "%d additional unhappy citizen."
msgid_plural "%d additional unhappy citizens."
msgstr[0] "%d åðéðñüóèåôïé äõóôõ÷éóìÝíïé ðïëßôåò."
msgstr[1] "%d åðéðñüóèåôïé äõóôõ÷éóìÝíïé ðïëßôåò."
-#. TRANS: Martial law opening parenthesis
-#: client/text.c:1279
-msgid "Martial law in effect ("
+#: client/text.c:1339
+#, fuzzy
+msgid "Unlimited martial law in effect."
msgstr "Óôñáôéùôéêüò íüìïò óå éó÷ý ("
-#. TRANS: no [unit] maximum
-#: client/text.c:1284
-msgid "no maximum, "
-msgstr "ü÷é ìÝãéóôï,"
-
-#: client/text.c:1287
+#: client/text.c:1341
#, c-format
-msgid "%d unit maximum, "
-msgid_plural "%d units maximum, "
-msgstr[0] "%d ìïíÜäá ìÝãéóôï, "
-msgstr[1] "%d ìïíÜäåò ìÝãéóôï,"
+msgid "%d military unit may impose martial law."
+msgid_plural "Up to %d military units may impose martial law."
+msgstr[0] ""
+msgstr[1] ""
-#. TRANS: Martial law closing parenthesis
-#: client/text.c:1294
+#: client/text.c:1345
#, c-format
-msgid "%d per unit). "
-msgstr "%d áíÜ ìïíÜäá). "
+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:1298
+#: client/text.c:1352
msgid "Military units in the field may cause unhappiness. "
msgstr "ÓôñáôéùôéêÝò ìïíÜäåò óôï ðåäßï ßóùò ðñïêáëÝóïõí äõóôõ÷ßá"
-#: client/text.c:1301
+#: client/text.c:1355
msgid "Military units have no happiness effect. "
msgstr "ÓôñáôéùôéêÝò ìïíÜäåò äåí Ý÷ïõí åðßäñáóç óôçí åõôõ÷ßá"
-#: client/text.c:1316
+#: client/text.c:1370
#, c-format
msgid "Luxury: %d total."
msgstr "ÁíÝóåéò: %d óýíïëï"
@@ -10111,7 +10182,7 @@ msgid ""
"instead."
msgstr ""
-#: client/tilespec.c:3968
+#: client/tilespec.c:3966
#, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
@@ -10136,12 +10207,12 @@ msgstr ""
"Ï êõâåñíÞôåò Ý÷åé ìðåñäåõôåß áó÷ïëïýìåíïò ìå %s. ºóùò èÝëåéò íá ôï ñßîåéò "
"ìéá ìáôéÜ."
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
-#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:599
+#: client/gui-gtk-2.0/cityrep.c:624 client/gui-sdl/citydlg.c:2009
msgid "none"
msgstr "êáìßá"
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:645
msgid "custom"
msgstr "ñõèìéæüìåíï"
@@ -10451,7 +10522,7 @@ msgstr "
msgid "Enter Marketplace"
msgstr "ÌðÝò óôçí áãïñÜ"
-#: client/gui-gtk-2.0/chatline.c:144 client/gui-win32/chatline.c:134
+#: client/gui-gtk-2.0/chatline.c:218 client/gui-win32/chatline.c:134
#: client/gui-xaw/chatline.c:120
msgid "Cleared output window."
msgstr "ÊáèáñéóìÝíï ðáñÜèõñï åîüäïõ."
@@ -10532,11 +10603,11 @@ msgid "%d/%d %d turns"
msgstr "%d/%d %d ãýñïé"
#: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:821
+#: client/gui-gtk-2.0/cityrep.c:1027
msgid "_Buy"
msgstr "_Áãüñáóå"
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:869
#, fuzzy
msgid "_Production"
msgstr "ÐáñáãùãÞ"
@@ -10558,12 +10629,12 @@ msgid "Entertainers"
msgstr "Øõ÷áãùãåßò"
#: client/gui-gtk-2.0/citydlg.c:1029 client/gui-win32/citydlg.c:1989
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2403
msgid "Scientists"
msgstr "ÅðéóôÞìïíåò"
#: client/gui-gtk-2.0/citydlg.c:1030 client/gui-win32/citydlg.c:1991
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2404
msgid "Taxmen"
msgstr "ÖïñïåéóðñÜêôïñåò"
@@ -10656,7 +10727,7 @@ msgstr "
msgid "Present units %d"
msgstr "Ðáñüíôåò %d"
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:1019
msgid "Cen_ter"
msgstr "_ÊÝíôñÜñéóå"
@@ -10745,32 +10816,62 @@ msgstr "
msgid "What should we rename the city to?"
msgstr "Ðïéü èá åßíáé ôï íÝï üíïìá ôçò ðüëçò;"
-#: client/gui-gtk-2.0/cityrep.c:699
+#: client/gui-gtk-2.0/cityrep.c:794
+#, fuzzy
+msgid "(no worklists defined)"
+msgstr "(ëßóôá åñãáóéþí)"
+
+#: client/gui-gtk-2.0/cityrep.c:876
msgid "Chan_ge"
msgstr "¶_ëëáîå"
-#: client/gui-gtk-2.0/cityrep.c:703
+#: client/gui-gtk-2.0/cityrep.c:880
msgid "Add _First"
msgstr "Ðñüóèåóå _Ðñþôç"
-#: client/gui-gtk-2.0/cityrep.c:707
+#: client/gui-gtk-2.0/cityrep.c:884
msgid "Add _Next"
msgstr "Ðñüóèåóå _Åðüìåíç"
-#: client/gui-gtk-2.0/cityrep.c:711
+#: client/gui-gtk-2.0/cityrep.c:888
+#, fuzzy
+msgid "Add _2nd Last"
+msgstr "Ðñüóèåóå _Ôåëåõôáßá"
+
+#: client/gui-gtk-2.0/cityrep.c:892
msgid "Add _Last"
msgstr "Ðñüóèåóå _Ôåëåõôáßá"
-#: client/gui-gtk-2.0/cityrep.c:715
+#: client/gui-gtk-2.0/cityrep.c:899
+#, fuzzy
+msgid "Set Worklist"
+msgstr "ËßóôåòÅñãáóéþí"
+
+#: client/gui-gtk-2.0/cityrep.c:905
+#, fuzzy
+msgid "Append Worklist"
+msgstr "ËßóôåòÅñãáóéþí"
+
+#: client/gui-gtk-2.0/cityrep.c:911
+#, fuzzy
+msgid "Clear _Worklist"
+msgstr "Åñãáóßåò óå áíáìïíÞ"
+
+#: client/gui-gtk-2.0/cityrep.c:916
+#, fuzzy
+msgid "Gover_nor"
+msgstr "_ÊõâÝñíÞôçò"
+
+#: client/gui-gtk-2.0/cityrep.c:921
msgid "_Select"
msgstr "ÅðÝëå_îå"
-#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
+#: client/gui-gtk-2.0/cityrep.c:925 client/gui-gtk-2.0/plrdlg.c:521
#, fuzzy
msgid "_Display"
msgstr "_Äéðëùìáôßá"
-#: client/gui-gtk-2.0/cityrep.c:800 client/gui-gtk-2.0/menu.c:808
+#: 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-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
#: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -10780,102 +10881,102 @@ msgstr "_
msgid "Cities"
msgstr "Ðüëåéò"
-#: client/gui-gtk-2.0/cityrep.c:817
+#: client/gui-gtk-2.0/cityrep.c:1023
#, fuzzy
msgid "_Inspect"
msgstr "_Óýíäåóå"
-#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
-#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-sdl/helpdlg.c:297 client/gui-win32/menu.c:342
-#: client/gui-xaw/menu.c:241
+#: 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
+#: client/gui-gtk-2.0/cityrep.c:1518 client/gui-gtk-2.0/menu.c:823
+#: client/gui-gtk-2.0/menu.c:825 client/gui-gtk-2.0/menu.c:827
+#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:831
+#: client/gui-gtk-2.0/menu.c:833 client/gui-sdl/helpdlg.c:297
+#: client/gui-win32/menu.c:342 client/gui-xaw/menu.c:241
msgid "Improvements"
msgstr "ÕðïäïìÝò"
-#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
-#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
-#: client/gui-xaw/menu.c:247
+#: client/gui-gtk-2.0/cityrep.c:1441 client/gui-gtk-2.0/cityrep.c:1460
+#: client/gui-gtk-2.0/cityrep.c:1479 client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1522 client/gui-xaw/menu.c:247
msgid "Wonders"
msgstr "Èáýìáôá"
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1662 client/gui-win32/cityrep.c:439
#: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
msgid "All Cities"
msgstr "¼ëåò ïé ðüëåéò"
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1667 client/gui-win32/cityrep.c:440
msgid "No Cities"
msgstr "Êáìßá ðüëç"
-#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1672 client/gui-win32/cityrep.c:441
msgid "Invert Selection"
msgstr "ÁíôÝóôñåøå åðéëïãÞ"
-#: client/gui-gtk-2.0/cityrep.c:1420
+#: client/gui-gtk-2.0/cityrep.c:1682
msgid "Building Units"
msgstr "ÌïíÜäåò õðü ðáñáãùãÞ"
-#: client/gui-gtk-2.0/cityrep.c:1426
+#: client/gui-gtk-2.0/cityrep.c:1688
msgid "Building Improvements"
msgstr "Õðïäïìþí õðü ðáñáãùãÞ"
-#: client/gui-gtk-2.0/cityrep.c:1432
+#: client/gui-gtk-2.0/cityrep.c:1694
msgid "Building Wonders"
msgstr "Èáýìáôá õðü ðáñáãùãÞ"
-#: client/gui-gtk-2.0/cityrep.c:1444
+#: client/gui-gtk-2.0/cityrep.c:1706
msgid "Building Unit"
msgstr "ÌïíÜäá õðü ðáñáãùãÞ"
-#: client/gui-gtk-2.0/cityrep.c:1448
+#: client/gui-gtk-2.0/cityrep.c:1710
msgid "Building Improvement"
msgstr "ÕðïäïìÞ õðü ðáñáãùãÞ"
-#: client/gui-gtk-2.0/cityrep.c:1452
+#: client/gui-gtk-2.0/cityrep.c:1714
msgid "Building Wonder"
msgstr "Èáýìá õðü ðáñáãùãÞ"
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1722 client/gui-win32/cityrep.c:443
msgid "Coastal Cities"
msgstr "ÐáñáëéáêÝò ðüëåéò"
-#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1727 client/gui-win32/cityrep.c:444
#, fuzzy
msgid "Same Island"
msgstr "ºäéï Íçóß"
-#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1737 client/gui-win32/cityrep.c:447
msgid "Supported Units"
msgstr "Óõíôçñïýìåíåò"
-#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1740 client/gui-win32/cityrep.c:454
msgid "Units Present"
msgstr "Ðáñüíôåò"
-#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1744 client/gui-win32/cityrep.c:469
msgid "Improvements in City"
msgstr "ÕðïäïìÝò óôçí ðüëç"
-#: client/gui-gtk-2.0/cityrep.c:1486
+#: client/gui-gtk-2.0/cityrep.c:1748
msgid "Wonders in City"
msgstr "Èáýìáôá óôçí ðüëç"
-#: client/gui-gtk-2.0/cityrep.c:1495
+#: client/gui-gtk-2.0/cityrep.c:1757
msgid "Available Units"
msgstr "ÄéáèÝóéìåò ìïíÜäåò"
-#: client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1760
msgid "Available Improvements"
msgstr "ÄéáèÝóéìåò õðïäïìÝò"
-#: client/gui-gtk-2.0/cityrep.c:1501
+#: client/gui-gtk-2.0/cityrep.c:1763
msgid "Available Wonders"
msgstr "ÄéáèÝóéìá èáýìáôá"
-#: client/gui-gtk-2.0/cityrep.c:1625
+#: client/gui-gtk-2.0/cityrep.c:1882
#, fuzzy, c-format
msgid "Total Buy Cost: %d"
msgstr "Óõíïëéêü êüóôïò: "
@@ -10945,12 +11046,12 @@ msgstr "
msgid "Remove this preset?"
msgstr "Íá áöáéñåèåß áõôüò ï êõâåñíçôéêüò óôü÷ïò;"
-#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:186
+#: client/gui-gtk-2.0/dialogs.c:196 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:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
#, fuzzy
msgid "Inspect _City"
msgstr "_Åñåýíçóå ôçí ðüëç"
@@ -10979,10 +11080,10 @@ msgstr "
msgid "Unit"
msgstr "ÌïíÜäá"
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
-#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
-#: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
-#: manual/civmanual.c:302 data/Freeciv.in:80
+#: 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-win32/plrdlg.c:335 manual/civmanual.c:302 data/Freeciv.in:80
msgid "Name"
msgstr "¼íïìá"
@@ -11008,7 +11109,7 @@ 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:1036 data/Freeciv.in:3371
+#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
msgid "Pick Nation"
msgstr "ÅðÝëåîå Ýèíïò"
@@ -11090,7 +11191,7 @@ msgstr "_
msgid "_Advances"
msgstr "_Ðñüïäïé"
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:910
+#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr "Ðü_ëåéò"
@@ -11197,20 +11298,20 @@ msgstr "
msgid "Show _All Cities"
msgstr "Äåßîå _¼ëåò ôéò ðüëåéò"
-#: client/gui-gtk-2.0/gui_main.c:150
+#: client/gui-gtk-2.0/gui_main.c:162
msgid "Show Map Scrollbars"
msgstr "Äåßîå ìðÜñåò êýëéóçò ÷Üñôç"
-#: client/gui-gtk-2.0/gui_main.c:151
+#: client/gui-gtk-2.0/gui_main.c:163
msgid "Disable this option to hide the scrollbars on the map view."
msgstr ""
"Áðåíåñãïðïßçóå áõôÞ ôçí åðéëïãÞ ãéá íá êñýøåéò ôéò ñÜâäïõò êýëéóçò ôïõ ÷Üñôç."
-#: client/gui-gtk-2.0/gui_main.c:155
+#: client/gui-gtk-2.0/gui_main.c:167
msgid "Keyboardless goto"
msgstr "Ìåôáêßíçóç ÷ùñßò ðëçêôñïëüãéï"
-#: client/gui-gtk-2.0/gui_main.c:156
+#: client/gui-gtk-2.0/gui_main.c:168
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."
@@ -11219,11 +11320,11 @@ msgstr ""
"áñéóôåñü êëßê êáé ìåôÜ êñáôþíôáò ðáôçìÝíï ôï ðïíôßêé ôïõ ðïíôéêéïý êáèþò "
"óÝñíïõìå ôï ðïíôßêé óå Ýíá äéáöïñåôéêü ôåôñÜãùíï"
-#: client/gui-gtk-2.0/gui_main.c:161
+#: client/gui-gtk-2.0/gui_main.c:173
msgid "Keep dialogs on top"
msgstr "ÄéáôÞñçóå ôïõò äéáëüãïõò óôï ðñïóêÞíéï"
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:174
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."
@@ -11232,12 +11333,12 @@ msgstr ""
"ìðñïóôÜ áðü ôï êåíôñéêü ðáñÜèõñï ôïõ Freeciv. ÁðåíåñãïðïßçóÞ ôçò äåí èá Ý÷åé "
"áðïôÝëåóìá óå åìöÜíéóç ðëÞñïõò ïèüíçò"
-#: client/gui-gtk-2.0/gui_main.c:166
+#: client/gui-gtk-2.0/gui_main.c:178
#, fuzzy
msgid "Show worklist task icons"
msgstr "Äåßîå åéêïíßäéá ëßóôáò åñãáóéþí"
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:179
msgid ""
"Disabling this will turn off the unit and building icons in the worklist "
"dialog and the production tab of the city dialog."
@@ -11245,11 +11346,11 @@ msgstr ""
"Áðåíåñãïðïéþíôáò áõôÞ ôçí åðéëïãÞ èá áðïìáêñõíèïýí ôá åéêïíßäéá ôùí ìïíÜäùí "
"êáé ôùí êôçñßùí áðü ôçí ëßóôá åñãáóßùí."
-#: client/gui-gtk-2.0/gui_main.c:171
+#: client/gui-gtk-2.0/gui_main.c:183
msgid "Enable status report tabs"
msgstr "Åíåñãïðïßçóå êáñôÝëåò áíáöïñÜò êáôÜóôáóçò"
-#: client/gui-gtk-2.0/gui_main.c:172
+#: client/gui-gtk-2.0/gui_main.c:184
msgid ""
"If this option is enabled then report dialogs will be shown as separate tabs "
"rather than in popup dialogs."
@@ -11257,12 +11358,12 @@ msgstr ""
"ÅÜí áõôÞ ç åðéëïãÞ åíåñãïðïéçèåß ôüôå ïé äéÜëïãïé áíáöïñÜò èá åìöáíßæïíôáé "
"óå îå÷ùñéóôÝò êáñôÝëåò êáé ü÷é óå áíáäõüìåíá ðáñÜèõñá."
-#: client/gui-gtk-2.0/gui_main.c:177 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:189 client/gui-win32/gui_main.c:110
#, fuzzy
msgid "Better fog-of-war drawing"
msgstr "Êáëýôåñç áðåéêüíéóç ôçò ïìß÷ëçò ôïõ ðïëÝìïõ"
-#: client/gui-gtk-2.0/gui_main.c:178 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:190 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."
@@ -11270,51 +11371,120 @@ msgstr ""
"ÅÜí áõôÞ ç åðéëïãÞ åíåñãïðïéçèåß ôüôå èá ÷ñçóéìïðïéçèåß ìéá êáëýôåñç ìÝèïäïò "
"ãéá ôï ó÷åäéáóìü ôçò ïìß÷ëçò ôïõ ðïëÝìïõ ðïõ ÷ñåéÜæåôáé üìùò äéðëÜóéá ìíÞìç."
-#: client/gui-gtk-2.0/gui_main.c:277 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:195
+msgid "Show time for each chat message"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:196
+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
+msgid "Split bottom notebook area"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:202
+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
+msgid "New message events go to top of list"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:208
+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
+msgid "Show extra message window buttons"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:214
+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 "
+"is disabled, these buttons will not appear (you can still double-click with "
+"the left mouse button or right-click on a row to inspect or goto "
+"respectively). This option will only take effect once the message window is "
+"closed and reopened."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:224
+msgid "Metaserver tab first in network page"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:225
+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
+msgid "Plain chat messages are sent to allies only"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:231
+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 "
+"messages will be sent as public chat messages. To send a public chat message "
+"with this option enabled, prefix the message with a single colon ':'. This "
+"option can also be set using a toggle button beside the chat entry (only "
+"visible in multiplayer games)."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:340 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:723 client/gui-gtk-2.0/gui_main.c:1345
+#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
msgid "Freeciv"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1088 client/gui-gtk-2.0/gui_main.c:1095
+#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
#: 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:1095 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1232 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:1127 client/gui-gtk-2.0/menu.c:770
-#: client/gui-gtk-2.0/menu.c:772 client/gui-gtk-2.0/menu.c:774
-#: client/gui-gtk-2.0/menu.c:776 client/gui-gtk-2.0/menu.c:778
-#: client/gui-gtk-2.0/menu.c:780 client/gui-gtk-2.0/menu.c:782
-#: client/gui-gtk-2.0/menu.c:784 client/gui-gtk-2.0/menu.c:786
-#: client/gui-gtk-2.0/menu.c:788 client/gui-gtk-2.0/menu.c:790
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-gtk-2.0/menu.c:804 client/gui-gtk-2.0/menu.c:806
-#: client/gui-gtk-2.0/menu.c:808 client/gui-gtk-2.0/menu.c:810
-#: client/gui-gtk-2.0/menu.c:812 client/gui-gtk-2.0/menu.c:814
-#: client/gui-gtk-2.0/menu.c:816 client/gui-gtk-2.0/menu.c:818
-#: client/gui-gtk-2.0/menu.c:820 client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/gui_main.c:1266 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
+#: client/gui-gtk-2.0/menu.c:811 client/gui-gtk-2.0/menu.c:813
+#: client/gui-gtk-2.0/menu.c:815 client/gui-gtk-2.0/menu.c:817
+#: client/gui-gtk-2.0/menu.c:819 client/gui-gtk-2.0/menu.c:821
+#: client/gui-gtk-2.0/menu.c:823 client/gui-gtk-2.0/menu.c:825
+#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
+#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
+#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
+#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
+#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
+#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
#: data/Freeciv.in:2028
msgid "View"
msgstr "ÐñïâïëÞ"
-#: client/gui-gtk-2.0/gui_main.c:1208
+#: client/gui-gtk-2.0/gui_main.c:1359
#, fuzzy
msgid "Chat"
msgstr "_Êïõâåíôïýëá"
-#: client/gui-gtk-2.0/gui_main.c:1224 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1377 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"
@@ -11325,72 +11495,76 @@ msgstr ""
"áíôéãñáöÜ ôïõ êÜôù áðü ïñéóìÝíåò ðñïõðïèÝóåéò. Äåò êáé ôçí êáôá÷þóçóç\n"
" \"ÁíôéãñáöÞ\" óôï ìåíïý ÂïÞèåéá. Tþñá... þñá ãéá áãþíá! "
-#: client/gui-gtk-2.0/gui_main.c:1491
+#: client/gui-gtk-2.0/gui_main.c:1392
+msgid "Allies Only"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:1657
msgid "Not _ready"
msgstr "¼÷é Ý_ôïéìïò"
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
+#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
msgid "_Ready"
msgstr "_¸ôïéìïò"
-#: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2132
+#: 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
msgid "_Start"
msgstr "_Åêêßíçóç"
-#: client/gui-gtk-2.0/gui_main.c:1520
+#: client/gui-gtk-2.0/gui_main.c:1686
#, fuzzy
msgid "_Take Player"
msgstr "ÅðÝëåîå áõôüí ôïí ðáß÷ôç"
-#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
+#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
msgid "Pick _Nation"
msgstr "ÄéÜëåîå _Åèíïò"
-#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
+#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
msgid "_Observe"
msgstr "_Ðáñáêïëoýèçóå"
-#: client/gui-gtk-2.0/gui_main.c:1532
+#: client/gui-gtk-2.0/gui_main.c:1698
#, fuzzy
msgid "Do not _observe"
msgstr "_Ìçí ðáñáêïëïõèåßò"
-#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
msgid "<AI>"
msgstr "<ÔÍ>"
-#: client/gui-gtk-2.0/gui_main.c:1557
+#: client/gui-gtk-2.0/gui_main.c:1723
msgid "<Novice AI>"
msgstr "<Áñ÷Üñéá ÔÍ>"
-#: client/gui-gtk-2.0/gui_main.c:1560
+#: client/gui-gtk-2.0/gui_main.c:1726
#, fuzzy
msgid "<Easy AI>"
msgstr "<Åýêïëç ÔÍ>"
-#: client/gui-gtk-2.0/gui_main.c:1563
+#: client/gui-gtk-2.0/gui_main.c:1729
msgid "<Normal AI>"
msgstr "<Äýóêïëç ÔÍ>"
-#: client/gui-gtk-2.0/gui_main.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1732
msgid "<Hard AI>"
msgstr "<ÓêëçñÞ ÔÍ>"
-#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1742 client/gui-win32/dialogs.c:594
#: client/gui-xaw/pages.c:217
msgid "Random"
msgstr "Ôõ÷áßï"
-#: client/gui-gtk-2.0/gui_main.c:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
msgid "Observer"
msgstr "Ðáñáêïëïýèçóå"
-#: client/gui-gtk-2.0/gui_main.c:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
msgid "Detached"
msgstr "ÁðïêïììÝíï"
-#: client/gui-gtk-2.0/gui_main.c:1899
+#: client/gui-gtk-2.0/gui_main.c:2073
msgid "Are you sure you want to quit?"
msgstr "Åßóáé óßãïõñïò üôé èÝëåéò íá ôåñìáôßóåéò;"
@@ -11623,473 +11797,512 @@ msgstr "_
msgid "Foreign Intelligence: %s Empire"
msgstr "Õðçñåóßá ðëçñïöïñéþí: %s Áõôïêñáôïñßá"
-#: client/gui-gtk-2.0/mapctrl.c:195 client/gui-sdl/mapctrl.c:2565
+#: client/gui-gtk-2.0/mapctrl.c:179 client/gui-sdl/mapctrl.c:2565
#: client/gui-sdl/menu.c:839 client/gui-sdl/menu.c:1021
#: client/gui-win32/mapctrl.c:353
msgid "Build New City"
msgstr "×ôßóå íåÜ ðüëç"
-#: client/gui-gtk-2.0/mapctrl.c:196 client/gui-sdl/mapctrl.c:2594
+#: client/gui-gtk-2.0/mapctrl.c:180 client/gui-sdl/mapctrl.c:2594
#: client/gui-win32/mapctrl.c:354 client/gui-xaw/mapctrl.c:89
msgid "What should we call our new city?"
msgstr "Ðþò èá ïíïìÜóïõìå ôç íÝá ìáò ðüëç;"
-#: client/gui-gtk-2.0/mapview.c:147
+#: client/gui-gtk-2.0/mapview.c:158
msgid "Shows your current luxury/science/tax rates;click to toggle them."
msgstr ""
"Äåß÷íåé ôá ôñÝ÷ïíôá ðïóïóôÜ áíÝóåéò/åðéóôÞìç/öüñïé-êëßê ãéá íá ôá áëëÜîåéò."
-#: client/gui-gtk-2.0/mapview.c:692 client/gui-win32/canvas.c:275
+#: client/gui-gtk-2.0/mapview.c:702 client/gui-win32/canvas.c:275
msgid "Better fog will only work in truecolor. Disabling it"
msgstr ""
"Êáëýôåñç ïìß÷ëç èá äïõëåýåé ìüíï óå ðñáãìáôéêü ÷ñþìá. Áðåíåñãïðïéåßôáé."
-#: client/gui-gtk-2.0/menu.c:250
+#: client/gui-gtk-2.0/menu.c:256
msgid "Leaving a local game will end it!"
msgstr "Öåýãïíôáò áðü Ýíá ôïðéêü ðáé÷íßäé èá ôï ôåñìáôßóåôå!"
-#: client/gui-gtk-2.0/menu.c:700 client/gui-win32/menu.c:303
+#: client/gui-gtk-2.0/menu.c:727 client/gui-win32/menu.c:303
msgid "_Game"
msgstr "_Ðáé÷íßäé"
-#: client/gui-gtk-2.0/menu.c:702 client/gui-gtk-2.0/menu.c:704
-#: client/gui-gtk-2.0/menu.c:706 client/gui-gtk-2.0/menu.c:708
-#: client/gui-gtk-2.0/menu.c:710 client/gui-gtk-2.0/menu.c:712
-#: client/gui-gtk-2.0/menu.c:714 client/gui-gtk-2.0/menu.c:717
-#: client/gui-gtk-2.0/menu.c:720 client/gui-gtk-2.0/menu.c:722
-#: client/gui-gtk-2.0/menu.c:724 client/gui-gtk-2.0/menu.c:726
-#: client/gui-gtk-2.0/menu.c:728 client/gui-gtk-2.0/menu.c:730
-#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:736
-#: client/gui-gtk-2.0/menu.c:738 client/gui-gtk-2.0/menu.c:740
+#: client/gui-gtk-2.0/menu.c:729 client/gui-gtk-2.0/menu.c:731
+#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:735
+#: client/gui-gtk-2.0/menu.c:737 client/gui-gtk-2.0/menu.c:739
+#: client/gui-gtk-2.0/menu.c:741 client/gui-gtk-2.0/menu.c:744
+#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
+#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
+#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
+#: client/gui-gtk-2.0/menu.c:760 client/gui-gtk-2.0/menu.c:763
+#: client/gui-gtk-2.0/menu.c:765 client/gui-gtk-2.0/menu.c:767
#: data/Freeciv.in:2026
msgid "Game"
msgstr "Ðáé÷íßäé"
-#: client/gui-gtk-2.0/menu.c:704 client/gui-gtk-2.0/menu.c:706
-#: client/gui-gtk-2.0/menu.c:708
+#: client/gui-gtk-2.0/menu.c:731 client/gui-gtk-2.0/menu.c:733
+#: client/gui-gtk-2.0/menu.c:735
msgid "_Chat"
msgstr "_Êïõâåíôïýëá"
-#: client/gui-gtk-2.0/menu.c:706 client/gui-win32/menu.c:314
+#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:314
msgid "_Clear Log"
msgstr "_Êáèáñéóìüò çìåñïëïãßïõ"
-#: client/gui-gtk-2.0/menu.c:708 client/gui-win32/menu.c:313
+#: client/gui-gtk-2.0/menu.c:735 client/gui-win32/menu.c:313
#, fuzzy
msgid "_Write Log"
msgstr "Åîá_ãùãÞ çìåñïëïãßïõ"
-#: client/gui-gtk-2.0/menu.c:710 client/gui-win32/menu.c:304
+#: client/gui-gtk-2.0/menu.c:737 client/gui-win32/menu.c:304
msgid "Local _Options"
msgstr "ÔïðéêÝò _ÅðéëïãÝò"
-#: client/gui-gtk-2.0/menu.c:712 client/gui-win32/menu.c:305
+#: client/gui-gtk-2.0/menu.c:739 client/gui-win32/menu.c:305
msgid "_Message Options"
msgstr "ÅðéëïãÝò _ÌçíõìÜôùí"
-#: client/gui-gtk-2.0/menu.c:717
+#: client/gui-gtk-2.0/menu.c:744
#, fuzzy
msgid "_Reload Tileset"
msgstr "Åðáíáö_üñôùóç ïìÜäáòÐëáêéäßùí"
-#: client/gui-gtk-2.0/menu.c:720
+#: client/gui-gtk-2.0/menu.c:747
msgid "Save Options on _Exit"
msgstr "Óþóå ÅðéëïãÝò ìå ôçí ¸î_ïäï"
-#: client/gui-gtk-2.0/menu.c:722
+#: client/gui-gtk-2.0/menu.c:749
#, fuzzy
msgid "Sa_ve Options"
msgstr "Ó_þóå ÅðéëïãÝò"
-#: client/gui-gtk-2.0/menu.c:726 client/gui-win32/menu.c:308
+#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:308
msgid "Server O_ptions"
msgstr "ÅðéëïãÝò Åîõð_çñåôçôÞ"
-#: client/gui-gtk-2.0/menu.c:730 client/gui-win32/menu.c:310
+#: client/gui-gtk-2.0/menu.c:757 client/gui-win32/menu.c:310
msgid "_Save Game"
msgstr "_Óþóå ðáé÷íßäé"
-#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:311
+#: client/gui-gtk-2.0/menu.c:760 client/gui-win32/menu.c:311
msgid "Save Game _As..."
msgstr "Óþóå ðáé÷íßäé Ó_áí..."
-#: client/gui-gtk-2.0/menu.c:738
+#: client/gui-gtk-2.0/menu.c:765
msgid "_Leave"
msgstr "_ÐáñáéôÞóïõ"
-#: client/gui-gtk-2.0/menu.c:740 client/gui-win32/menu.c:317
+#: client/gui-gtk-2.0/menu.c:767 client/gui-win32/menu.c:317
msgid "_Quit"
msgstr "_Ôåñìáôéóìüò"
-#: client/gui-gtk-2.0/menu.c:745 client/gui-win32/menu.c:321
+#: client/gui-gtk-2.0/menu.c:772 client/gui-win32/menu.c:321
#, fuzzy
msgid "Gov_ernment"
msgstr "Ðïëßôåõìá"
-#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
-#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
-#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:774 client/gui-gtk-2.0/menu.c:776
+#: client/gui-gtk-2.0/menu.c:778 client/gui-gtk-2.0/menu.c:780
+#: client/gui-gtk-2.0/menu.c:782 client/gui-gtk-2.0/menu.c:784
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
#: client/gui-xaw/menu.c:248 data/Freeciv.in:2027 data/helpdata.txt:1320
msgid "Government"
msgstr "Ðïëßôåõìá"
-#: client/gui-gtk-2.0/menu.c:749 client/gui-win32/menu.c:322
+#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:322
msgid "_Tax Rates"
msgstr "Ðïóïóôü _öüñùí"
-#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:324
+#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:324
msgid "_Find City"
msgstr "_Âñåò ðüëç"
-#: client/gui-gtk-2.0/menu.c:755 client/gui-win32/menu.c:325
+#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:325
msgid "_Worklists"
msgstr "_ËßóôáÅñãáóéþí"
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
-#: client/gui-gtk-2.0/menu.c:764 client/gui-win32/menu.c:327
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
+#: client/gui-gtk-2.0/menu.c:791 client/gui-win32/menu.c:327
msgid "_Change Government"
msgstr "_ÁëëáãÞ ðïëéôåýìáôïò"
-#: client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:788
msgid "_Revolution..."
msgstr "_ÅðáíÜóôáóç"
-#: client/gui-gtk-2.0/menu.c:764 client/gui-gtk-2.0/menu.c:970
+#: client/gui-gtk-2.0/menu.c:791 client/gui-gtk-2.0/menu.c:1013
#: client/gui-win32/menu.c:431
msgid "_Government"
msgstr "Ð_ïëßôåõìá"
-#: client/gui-gtk-2.0/menu.c:768 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:795 client/gui-gtk-2.0/menu.c:959
#: client/gui-win32/menu.c:334
msgid "_View"
msgstr "Ð_ñïâïëÞ"
-#: client/gui-gtk-2.0/menu.c:772
+#: client/gui-gtk-2.0/menu.c:799
msgid "City Outlines"
msgstr "Ðåñ_éãñÜììáôá ðüëåùí"
-#: client/gui-gtk-2.0/menu.c:774 client/gui-win32/menu.c:335
+#: client/gui-gtk-2.0/menu.c:801 client/gui-win32/menu.c:335
msgid "Map _Grid"
msgstr "ÐëÝ_ãìá ÷Üñôç"
-#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:336
+#: client/gui-gtk-2.0/menu.c:803 client/gui-win32/menu.c:336
msgid "National _Borders"
msgstr "ÅèíéêÜ _óýíïñá"
-#: client/gui-gtk-2.0/menu.c:778 client/gui-win32/menu.c:337
+#: client/gui-gtk-2.0/menu.c:805 client/gui-win32/menu.c:337
msgid "City _Names"
msgstr "_Ïíüìáôá ðüëåùí"
-#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:338
+#: client/gui-gtk-2.0/menu.c:807 client/gui-win32/menu.c:338
msgid "City G_rowth"
msgstr "_ÁíÜðôõîç ðüëçò"
-#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:339
+#: client/gui-gtk-2.0/menu.c:809 client/gui-win32/menu.c:339
msgid "City _Productions"
msgstr "_ÐáñáãùãÞ ðüëçò"
-#: client/gui-gtk-2.0/menu.c:784 client/gui-sdl/optiondlg.c:1719
+#: client/gui-gtk-2.0/menu.c:811
+#, fuzzy
+msgid "City Buy Cost"
+msgstr "Óõíïëéêü êüóôïò: "
+
+#: client/gui-gtk-2.0/menu.c:813
+#, fuzzy
+msgid "City Traderoutes"
+msgstr "Åìðïñ/òÄéáäñ/ò:"
+
+#: client/gui-gtk-2.0/menu.c:815 client/gui-sdl/optiondlg.c:1719
msgid "Draw city worker map grid"
msgstr "ÆùãñÜöéóå ôï ðëÝãìá ôïõ ÷Üñôç åñãáôþí ðüëçò"
-#: client/gui-gtk-2.0/menu.c:788 client/gui-sdl/optiondlg.c:1635
+#: client/gui-gtk-2.0/menu.c:819 client/gui-sdl/optiondlg.c:1635
#: client/gui-win32/menu.c:340 client/gui-xaw/menu.c:148
#: client/gui-xaw/menu.c:246 manual/civmanual.c:220 data/helpdata.txt:1220
msgid "Terrain"
msgstr "¸äáöüò"
-#: client/gui-gtk-2.0/menu.c:790 client/gui-win32/menu.c:341
+#: client/gui-gtk-2.0/menu.c:821 client/gui-win32/menu.c:341
#: client/gui-xaw/menu.c:149
msgid "Coastline"
msgstr "ÁêôïãñáììÞ"
-#: client/gui-gtk-2.0/menu.c:796 client/gui-win32/menu.c:343
+#: client/gui-gtk-2.0/menu.c:827 client/gui-win32/menu.c:343
msgid "Roads & Rails"
msgstr "Äñüìïé & Óéäçñüäñïìïé"
-#: client/gui-gtk-2.0/menu.c:800 client/gui-sdl/optiondlg.c:1933
+#: client/gui-gtk-2.0/menu.c:831 client/gui-sdl/optiondlg.c:1933
#: client/gui-win32/menu.c:345 client/gui-xaw/menu.c:152
msgid "Mines"
msgstr "Ïñõ÷åßá"
-#: client/gui-gtk-2.0/menu.c:802 client/gui-win32/menu.c:346
+#: client/gui-gtk-2.0/menu.c:833 client/gui-win32/menu.c:346
msgid "Fortress & Airbase"
msgstr "Öñïýñéá & Áåñ.ÂÜóåéò"
-#: client/gui-gtk-2.0/menu.c:804 client/gui-win32/menu.c:348
+#: client/gui-gtk-2.0/menu.c:835 client/gui-win32/menu.c:348
#: client/gui-xaw/menu.c:154
msgid "Specials"
msgstr "Åéäéêïß ðüñïé"
-#: client/gui-gtk-2.0/menu.c:806 client/gui-win32/menu.c:349
+#: client/gui-gtk-2.0/menu.c:837 client/gui-win32/menu.c:349
#: client/gui-xaw/menu.c:155
msgid "Pollution & Fallout"
msgstr "Ìüëõíóç & Ñáä.ÊáôÜëïéðá"
-#: client/gui-gtk-2.0/menu.c:812 client/gui-win32/menu.c:352
+#: client/gui-gtk-2.0/menu.c:843 client/gui-win32/menu.c:352
#: client/gui-xaw/menu.c:158
msgid "Focus Unit"
msgstr "ÅóôéÜóç ìïíÜäá"
-#: client/gui-gtk-2.0/menu.c:814 client/gui-sdl/optiondlg.c:1854
+#: client/gui-gtk-2.0/menu.c:845 client/gui-sdl/optiondlg.c:1854
#: client/gui-win32/menu.c:353 client/gui-xaw/menu.c:159
msgid "Fog of War"
msgstr "Ïìß÷ëç ðïëÝìïõ"
-#: client/gui-gtk-2.0/menu.c:818
+#: client/gui-gtk-2.0/menu.c:849
msgid "_Full Screen"
msgstr "Ð_ëÞñçò ïèüíç"
-#: client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/menu.c:853
msgid "_Center View"
msgstr "_ÊåíôñÜñéóìá ðñïâïëÞò"
-#: client/gui-gtk-2.0/menu.c:825 client/gui-win32/menu.c:358
+#: client/gui-gtk-2.0/menu.c:856 client/gui-win32/menu.c:358
msgid "_Orders"
msgstr "_ÄéáôáãÝò"
-#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
-#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
-#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
-#: client/gui-gtk-2.0/menu.c:855 client/gui-gtk-2.0/menu.c:857
-#: client/gui-gtk-2.0/menu.c:859 client/gui-gtk-2.0/menu.c:861
-#: client/gui-gtk-2.0/menu.c:863 client/gui-gtk-2.0/menu.c:865
-#: client/gui-gtk-2.0/menu.c:867 client/gui-gtk-2.0/menu.c:869
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875 client/gui-gtk-2.0/menu.c:877
-#: client/gui-gtk-2.0/menu.c:879 client/gui-gtk-2.0/menu.c:881
-#: client/gui-gtk-2.0/menu.c:883 client/gui-gtk-2.0/menu.c:885
-#: client/gui-gtk-2.0/menu.c:887 client/gui-gtk-2.0/menu.c:889
-#: client/gui-gtk-2.0/menu.c:891 client/gui-gtk-2.0/menu.c:893
-#: client/gui-gtk-2.0/menu.c:895 client/gui-gtk-2.0/menu.c:897
-#: client/gui-gtk-2.0/menu.c:899 client/gui-gtk-2.0/menu.c:901
-#: client/gui-gtk-2.0/menu.c:903 data/Freeciv.in:2029
+#: client/gui-gtk-2.0/menu.c:858 client/gui-gtk-2.0/menu.c:860
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:864
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:868
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:872
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:876
+#: client/gui-gtk-2.0/menu.c:878 client/gui-gtk-2.0/menu.c:880
+#: client/gui-gtk-2.0/menu.c:882 client/gui-gtk-2.0/menu.c:884
+#: client/gui-gtk-2.0/menu.c:886 client/gui-gtk-2.0/menu.c:888
+#: client/gui-gtk-2.0/menu.c:890 client/gui-gtk-2.0/menu.c:892
+#: client/gui-gtk-2.0/menu.c:894 client/gui-gtk-2.0/menu.c:896
+#: client/gui-gtk-2.0/menu.c:898 client/gui-gtk-2.0/menu.c:900
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906 client/gui-gtk-2.0/menu.c:908
+#: client/gui-gtk-2.0/menu.c:910 client/gui-gtk-2.0/menu.c:912
+#: client/gui-gtk-2.0/menu.c:914 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:918 client/gui-gtk-2.0/menu.c:920
+#: client/gui-gtk-2.0/menu.c:922 client/gui-gtk-2.0/menu.c:924
+#: client/gui-gtk-2.0/menu.c:926 client/gui-gtk-2.0/menu.c:928
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
+#: client/gui-gtk-2.0/menu.c:946 data/Freeciv.in:2029
msgid "Orders"
msgstr "ÄéáôáãÝò"
-#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:1444
+#: client/gui-gtk-2.0/menu.c:860 client/gui-gtk-2.0/menu.c:1489
#: client/gui-win32/menu.c:359
msgid "_Build City"
msgstr "_×ôßóå Ðüëç"
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:1466
-#: client/gui-gtk-2.0/menu.c:1472 client/gui-win32/menu.c:360
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:1511
+#: client/gui-gtk-2.0/menu.c:1517 client/gui-win32/menu.c:360
msgid "Build _Road"
msgstr "×ôßóå _Äñüìï"
-#: client/gui-gtk-2.0/menu.c:833 client/gui-gtk-2.0/menu.c:1360
+#: 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 "×ôßóå _¾äñåõóç"
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:1361
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:1406
#: client/gui-win32/menu.c:362
msgid "Build _Mine"
msgstr "×ôßóå _Ïñõ÷åßï"
-#: client/gui-gtk-2.0/menu.c:837 client/gui-gtk-2.0/menu.c:1362
+#: client/gui-gtk-2.0/menu.c:868 client/gui-gtk-2.0/menu.c:1407
msgid "Transf_orm Terrain"
msgstr "_Ìåôáó÷çìÜôéóå ÅäÜöïò"
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:1508
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:1553
#: client/gui-win32/menu.c:364
msgid "Build _Fortress"
msgstr "×ôßóå _Öñïýñéï"
-#: client/gui-gtk-2.0/menu.c:841 client/gui-win32/menu.c:365
+#: client/gui-gtk-2.0/menu.c:872 client/gui-win32/menu.c:365
msgid "Build Airbas_e"
msgstr "×ôßóå _Áåñ.ÂÜóç"
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:1514
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:1559
#: client/gui-win32/menu.c:366
msgid "Clean _Pollution"
msgstr "ÊáèÜñéóå Ìü_ëõíóç"
-#: client/gui-gtk-2.0/menu.c:845 client/gui-win32/menu.c:367
+#: client/gui-gtk-2.0/menu.c:876 client/gui-win32/menu.c:367
msgid "Clean _Nuclear Fallout"
msgstr "ÊáèÜñéóå Ñáäéå_íåñãÜ êáôÜëïéðá"
-#: client/gui-gtk-2.0/menu.c:849 client/gui-win32/menu.c:369
+#: client/gui-gtk-2.0/menu.c:880 client/gui-win32/menu.c:369
msgid "_Sentry"
msgstr "Öõëë_áãå"
-#: client/gui-gtk-2.0/menu.c:855 client/gui-win32/menu.c:372
+#: client/gui-gtk-2.0/menu.c:886 client/gui-win32/menu.c:372
msgid "Make _Homecity"
msgstr "ÊÜíå _Ðñùôåýïõóá"
-#: client/gui-gtk-2.0/menu.c:857 client/gui-win32/menu.c:373
+#: client/gui-gtk-2.0/menu.c:888 client/gui-win32/menu.c:373
msgid "_Load"
msgstr "Öüñô_ùóå"
-#: client/gui-gtk-2.0/menu.c:859
+#: client/gui-gtk-2.0/menu.c:890
msgid "_Unload Transporter"
msgstr "_Îåöüñôùóå Ìåôáöïñéêü"
-#: client/gui-gtk-2.0/menu.c:861 client/gui-win32/menu.c:374
+#: client/gui-gtk-2.0/menu.c:892 client/gui-win32/menu.c:374
msgid "_Unload"
msgstr "_Îåöüñôùóå"
-#: client/gui-gtk-2.0/menu.c:863 client/gui-win32/menu.c:375
+#: client/gui-gtk-2.0/menu.c:894 client/gui-win32/menu.c:375
msgid "Wake up o_thers"
msgstr "Îýðíá õðüëï_éðïõò"
-#: client/gui-gtk-2.0/menu.c:867
+#: client/gui-gtk-2.0/menu.c:898
msgid "_Auto Settler"
msgstr "Áðïßêéó_å áõôüìáôá"
-#: client/gui-gtk-2.0/menu.c:869 client/gui-win32/menu.c:378
+#: client/gui-gtk-2.0/menu.c:900 client/gui-win32/menu.c:378
msgid "Auto E_xplore"
msgstr "Åîåñåýí_çóå áõôüìáôá"
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906
msgid "_Connect"
msgstr "_Óýíäåóå"
-#: client/gui-gtk-2.0/menu.c:871 client/gui-win32/menu.c:380
+#: client/gui-gtk-2.0/menu.c:902 client/gui-win32/menu.c:380
msgid "_Road"
msgstr "_Äñüìï"
-#: client/gui-gtk-2.0/menu.c:873 client/gui-win32/menu.c:381
+#: client/gui-gtk-2.0/menu.c:904 client/gui-win32/menu.c:381
msgid "Rai_l"
msgstr "_Óéäçñüäñïìï"
-#: client/gui-gtk-2.0/menu.c:875 client/gui-win32/menu.c:382
+#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:382
msgid "_Irrigate"
msgstr "_¾äñåõóç"
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
msgid "Go _to"
msgstr "ÐÞãáéíå _íá"
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
msgid "_Build city"
msgstr "_×ôßóåéò ðüëç"
-#: client/gui-gtk-2.0/menu.c:879
+#: client/gui-gtk-2.0/menu.c:910
msgid "Patrol (_Q)"
msgstr "Ðå_ñéðüëçóå"
-#: client/gui-gtk-2.0/menu.c:881 client/gui-win32/menu.c:385
+#: client/gui-gtk-2.0/menu.c:912 client/gui-win32/menu.c:385
msgid "_Go to"
msgstr "ÐÞ_ãáéíå"
-#: client/gui-gtk-2.0/menu.c:883
+#: client/gui-gtk-2.0/menu.c:914
msgid "Go\\/Airlift to City"
msgstr "ÐÞãáéíå\\/ÐÝôáîå ðñïò Ðüëç"
-#: client/gui-gtk-2.0/menu.c:885 client/gui-sdl/menu.c:450
+#: client/gui-gtk-2.0/menu.c:916 client/gui-sdl/menu.c:450
#: client/gui-win32/menu.c:387 client/gui-xaw/menu.c:203
msgid "Return to nearest city"
msgstr "ÅðÝóôñåøå óôçí ðëçóéÝóôåñç ðüëç"
-#: client/gui-gtk-2.0/menu.c:889 client/gui-win32/menu.c:389
+#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:389
#: client/gui-xaw/menu.c:205
msgid "Disband Unit"
msgstr "ÁðÝëõóå ìüíÜäá"
-#: client/gui-gtk-2.0/menu.c:891 client/gui-sdl/citydlg.c:532
+#: client/gui-gtk-2.0/menu.c:922 client/gui-sdl/citydlg.c:532
#: data/Freeciv.in:1186
msgid "Upgrade unit"
msgstr "ÁíáâÜèìéóå ìïíÜäá"
-#: client/gui-gtk-2.0/menu.c:893
+#: client/gui-gtk-2.0/menu.c:924
msgid "Diplomat\\/Spy Actions"
msgstr "ÅíÝñãåéåò ÄéðëùìÜôç\\/Êáôáóêüðïõ"
-#: client/gui-gtk-2.0/menu.c:895 client/gui-sdl/menu.c:399
+#: client/gui-gtk-2.0/menu.c:926 client/gui-sdl/menu.c:399
#: client/gui-win32/menu.c:391 client/gui-xaw/menu.c:209
msgid "Explode Nuclear"
msgstr "Ðõñïäüôçóå Ðõñçíéêü"
-#: client/gui-gtk-2.0/menu.c:899
-msgid "Select same type"
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/cityrep.c:882
+msgid "Select"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:934
+#, fuzzy
+msgid "Single"
+msgstr "Æïýíãêëá"
+
+#: client/gui-gtk-2.0/menu.c:936
+#, fuzzy
+msgid "Same Type On Tile"
msgstr "ÅðÝëåîå ßäéï ôýðï"
-#: client/gui-gtk-2.0/menu.c:901 client/gui-win32/menu.c:393
+#: client/gui-gtk-2.0/menu.c:938
+msgid "All On Tile"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:940
+#, fuzzy
+msgid "Same Type On Continent"
+msgstr "ÅðÝëåîå ßäéï ôýðï"
+
+#: client/gui-gtk-2.0/menu.c:942
+msgid "Same Type Everywhere"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:393
msgid "_Wait"
msgstr "Ðåñßìåíå"
-#: client/gui-gtk-2.0/menu.c:903 client/gui-win32/menu.c:394
+#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:394
#: client/gui-xaw/menu.c:213
msgid "Done"
msgstr "¸ãéíå"
-#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:398
+#: client/gui-gtk-2.0/menu.c:949 client/gui-win32/menu.c:398
msgid "_Reports"
msgstr "_ÁíáöïñÝò"
-#: client/gui-gtk-2.0/menu.c:908 client/gui-gtk-2.0/menu.c:910
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:914
-#: client/gui-gtk-2.0/menu.c:916 client/gui-gtk-2.0/menu.c:918
-#: client/gui-gtk-2.0/menu.c:920 client/gui-gtk-2.0/menu.c:922
-#: client/gui-gtk-2.0/menu.c:924 client/gui-gtk-2.0/menu.c:926
-#: client/gui-gtk-2.0/menu.c:928 client/gui-gtk-2.0/menu.c:930
-#: client/gui-gtk-2.0/menu.c:932 data/Freeciv.in:2030
+#: client/gui-gtk-2.0/menu.c:951 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:957
+#: client/gui-gtk-2.0/menu.c:959 client/gui-gtk-2.0/menu.c:961
+#: client/gui-gtk-2.0/menu.c:963 client/gui-gtk-2.0/menu.c:965
+#: client/gui-gtk-2.0/menu.c:967 client/gui-gtk-2.0/menu.c:969
+#: client/gui-gtk-2.0/menu.c:971 client/gui-gtk-2.0/menu.c:973
+#: client/gui-gtk-2.0/menu.c:975 data/Freeciv.in:2030
msgid "Reports"
msgstr "ÁíáöïñÝò"
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:958
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:1001
#: client/gui-win32/menu.c:400 client/gui-win32/menu.c:425
msgid "_Units"
msgstr "_ÌïíÜäåò"
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/menu.c:914 client/gui-win32/menu.c:402
+#: client/gui-gtk-2.0/menu.c:957 client/gui-win32/menu.c:402
#, fuzzy
msgid "_Nations"
msgstr "_¸èíç"
-#: client/gui-gtk-2.0/menu.c:918 client/gui-win32/menu.c:403
+#: client/gui-gtk-2.0/menu.c:961 client/gui-win32/menu.c:403
msgid "_Economy"
msgstr "_Ïéêïíïìßá"
#. TRANS: Research report action
-#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:405
+#: client/gui-gtk-2.0/menu.c:963 client/gui-win32/menu.c:405
msgid "_Research"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:924 client/gui-win32/menu.c:407
+#: client/gui-gtk-2.0/menu.c:967 client/gui-win32/menu.c:407
msgid "_Wonders of the World"
msgstr "_Èáýìáôá ôïõ êüóìïõ"
-#: client/gui-gtk-2.0/menu.c:926 client/gui-win32/menu.c:408
+#: client/gui-gtk-2.0/menu.c:969 client/gui-win32/menu.c:408
msgid "_Top Five Cities"
msgstr "_Êáëýôåñåò ðÝíôå ðüëåéò"
-#: client/gui-gtk-2.0/menu.c:928 client/gui-win32/menu.c:409
+#: client/gui-gtk-2.0/menu.c:971 client/gui-win32/menu.c:409
msgid "_Messages"
msgstr "Ìç_íýìáôá"
-#: client/gui-gtk-2.0/menu.c:930 client/gui-win32/menu.c:410
+#: client/gui-gtk-2.0/menu.c:973 client/gui-win32/menu.c:410
msgid "_Demographics"
msgstr "_ÄçìïãñáöéêÜ óôáôéóôéêÜ"
-#: client/gui-gtk-2.0/menu.c:932 client/gui-gtk-2.0/plrdlg.c:471
+#: client/gui-gtk-2.0/menu.c:975 client/gui-gtk-2.0/plrdlg.c:354
#: client/gui-win32/menu.c:411
msgid "_Spaceship"
msgstr "_Äéáóôçìüðëïéï"
-#: client/gui-gtk-2.0/menu.c:936 client/gui-win32/menu.c:415
+#: client/gui-gtk-2.0/menu.c:979 client/gui-win32/menu.c:415
msgid "_Help"
msgstr "_ÂïÞèåéá"
-#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
-#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
-#: client/gui-gtk-2.0/menu.c:946 client/gui-gtk-2.0/menu.c:948
-#: client/gui-gtk-2.0/menu.c:950 client/gui-gtk-2.0/menu.c:952
-#: client/gui-gtk-2.0/menu.c:954 client/gui-gtk-2.0/menu.c:956
-#: client/gui-gtk-2.0/menu.c:958 client/gui-gtk-2.0/menu.c:960
-#: client/gui-gtk-2.0/menu.c:962 client/gui-gtk-2.0/menu.c:964
-#: client/gui-gtk-2.0/menu.c:966 client/gui-gtk-2.0/menu.c:968
-#: client/gui-gtk-2.0/menu.c:970 client/gui-gtk-2.0/menu.c:972
-#: client/gui-gtk-2.0/menu.c:974 client/gui-gtk-2.0/menu.c:976
-#: client/gui-gtk-2.0/menu.c:978 client/gui-gtk-2.0/menu.c:980
+#: client/gui-gtk-2.0/menu.c:981 client/gui-gtk-2.0/menu.c:983
+#: client/gui-gtk-2.0/menu.c:985 client/gui-gtk-2.0/menu.c:987
+#: client/gui-gtk-2.0/menu.c:989 client/gui-gtk-2.0/menu.c:991
+#: client/gui-gtk-2.0/menu.c:993 client/gui-gtk-2.0/menu.c:995
+#: client/gui-gtk-2.0/menu.c:997 client/gui-gtk-2.0/menu.c:999
+#: client/gui-gtk-2.0/menu.c:1001 client/gui-gtk-2.0/menu.c:1003
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-gtk-2.0/menu.c:1007
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-gtk-2.0/menu.c:1011
+#: client/gui-gtk-2.0/menu.c:1013 client/gui-gtk-2.0/menu.c:1015
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-gtk-2.0/menu.c:1019
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-gtk-2.0/menu.c:1023
#: client/gui-gtk-2.0/repodlgs.c:313 client/gui-win32/citydlg.c:1077
#: client/gui-win32/repodlgs.c:289 client/gui-win32/wldlg.c:846
#: data/Freeciv.in:1466 data/Freeciv.in:2031 data/Freeciv.in:2101
@@ -12097,119 +12310,119 @@ msgstr "_
msgid "Help"
msgstr "ÂïÞèåéá"
-#: client/gui-gtk-2.0/menu.c:940 client/gui-win32/menu.c:416
+#: client/gui-gtk-2.0/menu.c:983 client/gui-win32/menu.c:416
msgid "Language_s"
msgstr "Ãëþóóå_ò"
-#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/menu.c:417
+#: client/gui-gtk-2.0/menu.c:985 client/gui-win32/menu.c:417
msgid "Co_nnecting"
msgstr "_Óýíäåóç"
-#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:418
+#: client/gui-gtk-2.0/menu.c:987 client/gui-win32/menu.c:418
msgid "C_ontrols"
msgstr "_¸ëåã÷ïò"
-#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:419
+#: client/gui-gtk-2.0/menu.c:989 client/gui-win32/menu.c:419
msgid "C_hatline"
msgstr "ÃñáììÞ _êïõâåíôïýëáò"
-#: client/gui-gtk-2.0/menu.c:948 client/gui-win32/menu.c:420
+#: client/gui-gtk-2.0/menu.c:991 client/gui-win32/menu.c:420
msgid "_Worklist Editor"
msgstr "ÅðåîåñãáóôÞò _ËßóôáòÅñãáóéþí"
-#: client/gui-gtk-2.0/menu.c:950 client/gui-win32/menu.c:421
+#: client/gui-gtk-2.0/menu.c:993 client/gui-win32/menu.c:421
msgid "Citizen _Management"
msgstr "ÊõâÝñíçóç ð_ïëéôþí"
-#: client/gui-gtk-2.0/menu.c:952 client/gui-win32/menu.c:422
+#: client/gui-gtk-2.0/menu.c:995 client/gui-win32/menu.c:422
msgid "_Playing"
msgstr "_Ðáßîéìï"
-#: client/gui-gtk-2.0/menu.c:956 client/gui-win32/menu.c:424
+#: client/gui-gtk-2.0/menu.c:999 client/gui-win32/menu.c:424
msgid "City _Improvements"
msgstr "_ÕðïäïìÝò ðüëçò"
-#: client/gui-gtk-2.0/menu.c:960 client/gui-win32/menu.c:426
+#: client/gui-gtk-2.0/menu.c:1003 client/gui-win32/menu.c:426
msgid "Com_bat"
msgstr "ÌÜ_÷ç"
-#: client/gui-gtk-2.0/menu.c:962 client/gui-win32/menu.c:427
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-win32/menu.c:427
msgid "_ZOC"
msgstr "_Æ.Å"
-#: client/gui-gtk-2.0/menu.c:964 client/gui-win32/menu.c:428
+#: client/gui-gtk-2.0/menu.c:1007 client/gui-win32/menu.c:428
msgid "Techno_logy"
msgstr "_Ôå÷íïëïãßá"
-#: client/gui-gtk-2.0/menu.c:966 client/gui-win32/menu.c:429
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-win32/menu.c:429
msgid "_Terrain"
msgstr "¸_äáöïò"
-#: client/gui-gtk-2.0/menu.c:968 client/gui-win32/menu.c:430
+#: client/gui-gtk-2.0/menu.c:1011 client/gui-win32/menu.c:430
msgid "Won_ders"
msgstr "_Èáýìáôá"
-#: client/gui-gtk-2.0/menu.c:972 client/gui-win32/menu.c:432
+#: client/gui-gtk-2.0/menu.c:1015 client/gui-win32/menu.c:432
msgid "Happin_ess"
msgstr "Å_õôõ÷ßá"
-#: client/gui-gtk-2.0/menu.c:974 client/gui-win32/menu.c:433
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-win32/menu.c:433
msgid "Space _Race"
msgstr "_ÄéáóôçìéêÞ êïýñóá"
-#: client/gui-gtk-2.0/menu.c:978 client/gui-win32/menu.c:435
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-win32/menu.c:435
msgid "_Copying"
msgstr "Áíôéãñá_öÞ"
-#: client/gui-gtk-2.0/menu.c:980 client/gui-win32/menu.c:436
+#: client/gui-gtk-2.0/menu.c:1023 client/gui-win32/menu.c:436
msgid "_About"
msgstr "_Ó÷åôéêÜ"
-#: client/gui-gtk-2.0/menu.c:1264
+#: client/gui-gtk-2.0/menu.c:1307
#, c-format
msgid "%s..."
msgstr ""
-#: client/gui-gtk-2.0/menu.c:1352
+#: client/gui-gtk-2.0/menu.c:1397
#, c-format
msgid "Change to %s (_I)"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:1353
+#: client/gui-gtk-2.0/menu.c:1398
#, c-format
msgid "Change to %s (_M)"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:1354
+#: client/gui-gtk-2.0/menu.c:1399
#, c-format
msgid "Transf_orm to %s"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:1427
+#: client/gui-gtk-2.0/menu.c:1472
msgid "Help _Build Wonder"
msgstr "ÂïÞèçóå íá _÷ôéóôåß Èáýìá"
-#: client/gui-gtk-2.0/menu.c:1441
+#: client/gui-gtk-2.0/menu.c:1486
msgid "Add to City (_B)"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:1449
+#: client/gui-gtk-2.0/menu.c:1494
msgid "Make Trade _Route"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:1463
+#: client/gui-gtk-2.0/menu.c:1508
msgid "Build _Railroad"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:1486
+#: client/gui-gtk-2.0/menu.c:1531
msgid "Bu_ild Farmland"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:1506
+#: client/gui-gtk-2.0/menu.c:1551
msgid "_Fortify"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:1512
+#: client/gui-gtk-2.0/menu.c:1557
msgid "_Paradrop"
msgstr ""
@@ -12241,13 +12454,32 @@ msgstr "
msgid "Pop"
msgstr "ÅìöÜíéóç"
-#: client/gui-gtk-2.0/messagewin.c:155 client/gui-sdl/messagewin.c:247
+#: client/gui-gtk-2.0/messagewin.c:186 client/gui-sdl/messagewin.c:247
#: client/gui-win32/messagewin.c:132 client/gui-xaw/menu.c:228
#: data/Freeciv.in:3273 data/Freeciv.in:3274 data/Freeciv.in:3283
msgid "Messages"
msgstr "Ìçíýìáôá"
-#: client/gui-gtk-2.0/plrdlg.c:330
+#: client/gui-gtk-2.0/plrdlg.c:317
+msgid "_Meet"
+msgstr "_ÓõíÜíôçóç"
+
+#: client/gui-gtk-2.0/plrdlg.c:323
+#, fuzzy
+msgid "Cancel _Treaty"
+msgstr "_Áêýñùóå óõìöùíßá"
+
+#: client/gui-gtk-2.0/plrdlg.c:329
+#, fuzzy
+msgid "_Withdraw Vision"
+msgstr "_ÁðÝóõñå ïñáôüôçôá"
+
+#: client/gui-gtk-2.0/plrdlg.c:348
+#, fuzzy
+msgid "_Report"
+msgstr "_ÁíáöïñÝò"
+
+#: client/gui-gtk-2.0/plrdlg.c:386
msgid "?show:Dead Players"
msgstr "?äåßîå:Íåêñïß ðáß÷ôåò."
@@ -12255,271 +12487,274 @@ msgstr "?
#. TRANS: Nations report action
#. TRANS: Nations report title
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/plrdlg.c:350 client/gui-sdl/mapctrl.c:1580
+#: client/gui-gtk-2.0/plrdlg.c:406 client/gui-sdl/mapctrl.c:1580
#: client/gui-sdl/plrdlg.c:608 client/gui-win32/plrdlg.c:344
#: client/gui-xaw/menu.c:221 data/Freeciv.in:3192 data/Freeciv.in:3193
msgid "Nations"
msgstr "¸èíç"
-#: client/gui-gtk-2.0/plrdlg.c:443
-msgid "_Intelligence"
-msgstr "_Õðçñåóßá Ðëçñïöïñéþí"
-
-#: client/gui-gtk-2.0/plrdlg.c:450
-msgid "_Meet"
-msgstr "_ÓõíÜíôçóç"
-
-#: client/gui-gtk-2.0/plrdlg.c:457
+#: client/gui-gtk-2.0/plrdlg.c:511
#, fuzzy
-msgid "Cancel _Treaty"
-msgstr "_Áêýñùóå óõìöùíßá"
+msgid "Di_plomacy"
+msgstr "_Äéðëùìáôßá"
-#: client/gui-gtk-2.0/plrdlg.c:464
-msgid "_Withdraw vision"
-msgstr "_ÁðÝóõñå ïñáôüôçôá"
+#: client/gui-gtk-2.0/plrdlg.c:516
+msgid "_Intelligence"
+msgstr "_Õðçñåóßá Ðëçñïöïñéþí"
-#: client/gui-gtk-2.0/plrdlg.c:495
+#: client/gui-gtk-2.0/plrdlg.c:526
msgid "_AI"
msgstr "_TN"
-#: client/gui-gtk-2.0/plrdlg.c:501
+#: client/gui-gtk-2.0/plrdlg.c:532
msgid "_Toggle AI Mode"
msgstr "_ÁëëáãÞ ôñüðïõ TN"
-#: client/gui-gtk-2.0/pages.c:208
+#: client/gui-gtk-2.0/pages.c:221
msgid "Start _New Game"
msgstr "Îåêßíçóå _íÝï ðáé÷íßäé"
-#: client/gui-gtk-2.0/pages.c:214
+#: client/gui-gtk-2.0/pages.c:227
msgid "Start _Scenario Game"
msgstr "ÎåêßíçóÝ _óåíÜñéï"
-#: client/gui-gtk-2.0/pages.c:220
+#: client/gui-gtk-2.0/pages.c:233
msgid "_Load Saved Game"
msgstr "_Öüñôùóå áðïèçêåõìÝíï ðáé÷íßäé"
-#: client/gui-gtk-2.0/pages.c:229
+#: client/gui-gtk-2.0/pages.c:239
msgid "C_onnect to Network Game"
msgstr "_Óýíäåóç óå äéêôõáêü ðáé÷íßäé"
-#: client/gui-gtk-2.0/pages.c:236
+#: client/gui-gtk-2.0/pages.c:247
msgid "Connect to Gaming _Zone"
msgstr "Óýíäåóç óå æþíç ðáé÷íéäßùí"
-#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:300
#: client/gui-xaw/connectdlg.c:326
msgid "Passwords don't match, enter password."
msgstr "Ôá óõíèçìáôéêÜ äåí ôáéñéÜæïõí, ðáñáêáëþ åéóÞãáãå óõíèçìáôéêü"
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:779 client/gui-gtk-2.0/pages.c:820
+#: client/gui-win32/connectdlg.c:916
msgid "Server Name"
msgstr "¼íïìá åîõðçñåôçôÞ"
-#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
+#: 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
+#: data/Freeciv.in:96
msgid "Port"
msgstr "Èýñá"
-#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
+#: client/gui-win32/connectdlg.c:917
msgid "Version"
msgstr "¸êäïóç"
-#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
-#: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
+#: 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
msgid "Status"
msgstr "ÊáôÜóôáóç"
-#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
-#: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
+#: 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
msgid "Players"
msgstr "Ðáß÷ôåò"
-#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
+#: client/gui-win32/connectdlg.c:918
msgid "Comment"
msgstr "Ó÷üëéï"
-#: client/gui-gtk-2.0/pages.c:747
+#: client/gui-gtk-2.0/pages.c:786
msgid "Local _Area Network"
msgstr "Ôïðéêü _äßêôõï"
-#: client/gui-gtk-2.0/pages.c:783
+#: client/gui-gtk-2.0/pages.c:827
msgid "Internet _Metaserver"
msgstr "_ÌåôÜÅîõðçñåôçôÞò äéáäéêôýïõ"
-#: client/gui-gtk-2.0/pages.c:817
+#: client/gui-gtk-2.0/pages.c:864
msgid "_Host:"
msgstr "_ÕðïëïãéóôÞò:"
-#: client/gui-gtk-2.0/pages.c:834
+#: client/gui-gtk-2.0/pages.c:881
msgid "_Port:"
msgstr "_Èýñá"
-#: client/gui-gtk-2.0/pages.c:851
+#: client/gui-gtk-2.0/pages.c:898
msgid "_Login:"
msgstr "_Åßóïäïò"
-#: client/gui-gtk-2.0/pages.c:869
+#: client/gui-gtk-2.0/pages.c:916
msgid "Pass_word:"
msgstr "Óõí_èçìáôéêü"
-#: client/gui-gtk-2.0/pages.c:887
+#: client/gui-gtk-2.0/pages.c:934
msgid "Conf_irm Password:"
msgstr "Åðé_âåâáßùóå óõíèçìáôéêü"
-#: client/gui-gtk-2.0/pages.c:912
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: 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/wldlg.c:800 client/gui-win32/wldlg.c:806
+msgid "Type"
+msgstr "Ôýðïò"
+
+#: client/gui-gtk-2.0/pages.c:952 client/gui-win32/plrdlg.c:337
+#: data/Freeciv.in:88
+msgid "Host"
+msgstr ""
+
+#: client/gui-gtk-2.0/pages.c:981
msgid "C_onnect"
msgstr "Ó_ýíäåóç"
-#: client/gui-gtk-2.0/pages.c:1142
+#: client/gui-gtk-2.0/pages.c:1211
#, c-format
msgid "Connection name: %s"
msgstr "¼íïìá óýíäåóçò: %s"
-#: client/gui-gtk-2.0/pages.c:1145
+#: client/gui-gtk-2.0/pages.c:1214
#, c-format
msgid "Player name: %s"
msgstr "¼íïìá ðáß÷ôç: %s"
-#: client/gui-gtk-2.0/pages.c:1150
+#: client/gui-gtk-2.0/pages.c:1219
#, c-format
msgid "Host: %s"
msgstr "ÕðïëïãéóôÞò: %s"
-#: client/gui-gtk-2.0/pages.c:1158
+#: client/gui-gtk-2.0/pages.c:1227
msgid "Player/conn info"
msgstr "Ðëçñïöïñßåò ðáß÷ôç/óýíäåóçò"
-#: client/gui-gtk-2.0/pages.c:1185
+#: client/gui-gtk-2.0/pages.c:1254
#, c-format
msgid "%s info"
msgstr "%s ðëçñïöïñßåò"
-#: client/gui-gtk-2.0/pages.c:1196
+#: client/gui-gtk-2.0/pages.c:1265
msgid "Toggle player ready"
msgstr "ÊÜíå ðáß÷ôç åíåñãü"
-#: client/gui-gtk-2.0/pages.c:1204
+#: client/gui-gtk-2.0/pages.c:1273
msgid "Pick nation"
msgstr "ÅðÝëåîå Ýèíïò"
-#: client/gui-gtk-2.0/pages.c:1214
+#: client/gui-gtk-2.0/pages.c:1283
msgid "Observe this player"
msgstr "ÐáñáôÞñçóå áõôüí ôïí ðáß÷ôç"
-#: client/gui-gtk-2.0/pages.c:1221
+#: client/gui-gtk-2.0/pages.c:1290
msgid "Take this player"
msgstr "ÅðÝëåîå áõôüí ôïí ðáß÷ôç"
-#: client/gui-gtk-2.0/pages.c:1238
+#: client/gui-gtk-2.0/pages.c:1307
msgid "Cut connection"
msgstr "ÄéÝêïøå óýíäåóç"
-#: client/gui-gtk-2.0/pages.c:1248
+#: client/gui-gtk-2.0/pages.c:1317
msgid "Aitoggle player"
msgstr "¶ëëáîå ÔÍ ðáß÷ôç"
-#: client/gui-gtk-2.0/pages.c:1257
+#: client/gui-gtk-2.0/pages.c:1326
msgid "Remove player"
msgstr "Áöáßñåóå ðáß÷ôç"
-#: client/gui-gtk-2.0/pages.c:1268
+#: client/gui-gtk-2.0/pages.c:1337
msgid "Give info access"
msgstr "Äþóå ðñüóâáóç óå ðëçñïöïñßá"
-#: client/gui-gtk-2.0/pages.c:1276
+#: client/gui-gtk-2.0/pages.c:1345
#, fuzzy
msgid "Give ctrl access"
msgstr "Äþóå ðñüóâáóç åëÝã÷ïõ"
#. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1338
+#: client/gui-gtk-2.0/pages.c:1407
#, c-format
msgid "Put on %s"
msgstr "ÂÜëå óå %s"
-#: client/gui-gtk-2.0/pages.c:1442
+#: client/gui-gtk-2.0/pages.c:1511
#, fuzzy
msgid "Number of _Players (including AI):"
msgstr "_Áñéèìüò ðáé÷ôþí (óõìðåñéëáìâáíïìÝíùí ÔÍ):"
-#: client/gui-gtk-2.0/pages.c:1465
+#: client/gui-gtk-2.0/pages.c:1534
#, fuzzy
msgid "AI Skill _Level:"
msgstr "Åðßðåäï åðéäåîéüôçôáò _ÔÍ"
-#: client/gui-gtk-2.0/pages.c:1481
+#: client/gui-gtk-2.0/pages.c:1550
#, fuzzy
msgid "Ruleset _Version:"
msgstr "_ÓýíïëïÊáíüíùí"
-#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
#, fuzzy
msgid "_More Game Options..."
msgstr "Ðåñéóóüôåñåò åðé_ëïãÝò ðáé÷íéäßïõ..."
-#: client/gui-gtk-2.0/pages.c:1514
+#: client/gui-gtk-2.0/pages.c:1583
#, fuzzy
msgid "Record"
msgstr "ÊáôáãñáöÞ"
-#: client/gui-gtk-2.0/pages.c:1519
+#: client/gui-gtk-2.0/pages.c:1588
msgid "Rating"
msgstr "Âáèìïëïãßá"
-#: client/gui-gtk-2.0/pages.c:1525
+#: client/gui-gtk-2.0/pages.c:1594
msgid "Ready"
msgstr "¸ôïéìïò"
-#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
-#: data/nation/slovakian.ruleset:26
-msgid "Leader"
-msgstr "ÇãÝôçò"
+#: client/gui-gtk-2.0/pages.c:1601
+#, fuzzy
+msgid "?player:Leader"
+msgstr "?Player:¼íïìá"
-#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1732 client/gui-sdl/chatline.c:185
msgid "Choose Saved Game to Load"
msgstr "ÄéÜëåîå áðïèçêåõìÝíï ðáé÷íßäé ãéá öüñôùìá"
-#: client/gui-gtk-2.0/pages.c:1752
+#: client/gui-gtk-2.0/pages.c:1824
msgid "Choose Saved Game to _Load:"
msgstr "ÄéÜëåîå áðïèçêåõìÝíï ðáé÷íßäé ãéá _öüñôùìá"
-#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
-#: client/gui-gtk-2.0/pages.c:2375
+#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
+#: client/gui-gtk-2.0/pages.c:2451
msgid "_Browse..."
msgstr "_ÐåñéçãÞóïõ"
-#: client/gui-gtk-2.0/pages.c:1839
+#: client/gui-gtk-2.0/pages.c:1911
msgid "Choose a Scenario"
msgstr "ÅðÝëåîå Ýíá óåíÜñéï"
-#: client/gui-gtk-2.0/pages.c:1926
+#: client/gui-gtk-2.0/pages.c:1998
msgid "Choose a _Scenario:"
msgstr "ÅðÝëåîå _óåíÜñéï"
-#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
-#: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
-#: client/gui-win32/wldlg.c:806
-msgid "Type"
-msgstr "Ôýðïò"
-
-#: client/gui-gtk-2.0/pages.c:2101
+#: client/gui-gtk-2.0/pages.c:2173
msgid "Choose a _nation to play:"
msgstr "ÅðÝëåîå ôï _Ýèíïò óïõ:"
-#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2363 client/gui-win32/menu.c:581
msgid "Select Location to Save"
msgstr "ÅðÝëåîå êáôÜëïãï áðïèÞêåõóçò"
-#: client/gui-gtk-2.0/pages.c:2372 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2448 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr "ÁðïèÞêåõóç ðáé÷íßäé"
-#: client/gui-gtk-2.0/pages.c:2413
+#: client/gui-gtk-2.0/pages.c:2489
msgid "Saved _Games:"
msgstr "ÁðïèçêåõìÝíá _Ðáé÷íßäéá"
-#: client/gui-gtk-2.0/pages.c:2440
+#: client/gui-gtk-2.0/pages.c:2516
msgid "Save _Filename:"
msgstr "ÁðïèÞêåõóç _¼íïìáÁñ÷åßïõ"
@@ -12876,7 +13111,7 @@ msgstr "
msgid "Total users logged in : %d"
msgstr "Óýíïëï ÷ñçóôþí ðïõ åßíáé óõíäåäåìÝíïé óôï : %d"
-#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1094
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
msgid "Back"
msgstr "Ðßóù"
@@ -12885,7 +13120,7 @@ msgid "Start"
msgstr "Åêêßíçóç"
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:775
+#: client/gui-win32/connectdlg.c:777
msgid "Load Game"
msgstr "Öüñôùóå ðáé÷íßäé"
@@ -12923,12 +13158,12 @@ msgid "Make new homecity"
msgstr "¼ñéóå íåá ðñùôåýïõóá"
#: client/gui-sdl/citydlg.c:546 client/gui-sdl/citydlg.c:1418
-#: client/gui-sdl/connectdlg.c:307 client/gui-sdl/connectdlg.c:616
-#: client/gui-sdl/connectdlg.c:802 client/gui-sdl/connectdlg.c:984
+#: 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/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1039
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
#: 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
@@ -12978,7 +13213,7 @@ msgstr "
#: client/gui-sdl/diplodlg.c:1335 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:2427
+#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
#: client/gui-xaw/cityrep.c:666 client/gui-xaw/cma_fe.c:327
#: client/gui-xaw/cma_fe.c:511 client/gui-xaw/cma_fe.c:765
#: client/gui-xaw/messagedlg.c:72 client/gui-xaw/optiondlg.c:76
@@ -12994,7 +13229,7 @@ msgstr "
#: client/gui-sdl/diplodlg.c:1345 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:2427 client/gui-xaw/cityrep.c:666
+#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
#: client/gui-xaw/cma_fe.c:327 client/gui-xaw/cma_fe.c:511
#: client/gui-xaw/cma_fe.c:765 client/gui-xaw/messagedlg.c:72
#: client/gui-xaw/optiondlg.c:76 client/gui-xaw/optiondlg.c:304
@@ -13271,36 +13506,36 @@ msgstr "
msgid "Release city"
msgstr "¶öçóå ðüëç"
-#: client/gui-sdl/connectdlg.c:238
+#: client/gui-sdl/connectdlg.c:239
msgid "Creating Server List..."
msgstr "Äçìéïõñãßá ëßóôá åîõðçñåôçôþí..."
-#: client/gui-sdl/connectdlg.c:279 client/gui-sdl/connectdlg.c:343
+#: client/gui-sdl/connectdlg.c:280 client/gui-sdl/connectdlg.c:344
msgid "No LAN servers found"
msgstr "Äåí âñÝèçêáí åîõðçñåôçôÝò ôïðéêïý äéêôýïõ"
-#: client/gui-sdl/connectdlg.c:281 client/gui-sdl/connectdlg.c:345
+#: client/gui-sdl/connectdlg.c:282 client/gui-sdl/connectdlg.c:346
msgid "No public servers found"
msgstr "Äåí âñÝèçêáí äçìüóéïé åîõðçñåôçôÝò"
-#: client/gui-sdl/connectdlg.c:555
+#: client/gui-sdl/connectdlg.c:556
msgid "Player Name :"
msgstr "¼íïìá Ðáß÷ôç :"
-#: client/gui-sdl/connectdlg.c:571
+#: client/gui-sdl/connectdlg.c:572
msgid "Freeciv Server :"
msgstr "¼íïìá åîõðçñåôçôÞ Freeciv :"
-#: client/gui-sdl/connectdlg.c:588
+#: client/gui-sdl/connectdlg.c:589
msgid "Port :"
msgstr "Èýñá :"
-#: client/gui-sdl/connectdlg.c:608 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr "Óýíäåóç "
-#: client/gui-sdl/connectdlg.c:794 client/gui-sdl/connectdlg.c:977
+#: client/gui-sdl/connectdlg.c:795 client/gui-sdl/connectdlg.c:978
#: client/gui-xaw/connectdlg.c:145
msgid "Next"
msgstr "Åðüìåíï"
@@ -13583,7 +13818,7 @@ msgstr "
#: client/gui-sdl/graphics.c:1021
#, fuzzy, c-format
-msgid "Unable to initialize SDL_ttf library: %s"
+msgid "Unable to initialize SDL_ttf library: %s"
msgstr "Áäõíáìßá áñ÷éêïðïßçóçò âéâëéïèÞêçò SDL_ttf: %s"
#: client/gui-sdl/graphics.c:1058
@@ -13672,12 +13907,6 @@ msgstr "
msgid "Waiting for the beginning of the game"
msgstr "ÁíáìïíÞ ãéá ôçí åêêßíçóç ôïõ ðáé÷íéäßïõ"
-#: client/gui-sdl/gui_string.c:608
-msgid ""
-"Couldn't find stdfont.ttf file. Please link/copy/move anyunicode ttf font to "
-"data dir as stdfont.ttf"
-msgstr ""
-
#. TRANS: Future Technology
#: client/gui-sdl/gui_tilespec.c:506
msgid "FT"
@@ -14269,12 +14498,12 @@ msgid "Leave Game"
msgstr "ÁðïèÞêåõóç ðáé÷íßäé"
#: client/gui-sdl/optiondlg.c:2302 client/gui-sdl/pages.c:255
-#: client/gui-win32/connectdlg.c:1098 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1100 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:963
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
msgid "Start New Game"
msgstr "Îåêßíçóå íåï ðáé÷íßäé"
@@ -14392,8 +14621,8 @@ msgstr "
msgid "%s max rate : %d%%"
msgstr "%s ìÝãéóôï ðïóïóôü : %d%%"
-#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1081
-#: client/gui-win32/connectdlg.c:1089 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
+#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
msgid "Update"
msgstr "ÁíáíÝùóç"
@@ -14820,10 +15049,6 @@ msgstr ""
msgid "Refresh"
msgstr ""
-#: client/gui-win32/cityrep.c:882
-msgid "Select"
-msgstr ""
-
#: client/gui-win32/cityrep.c:883
msgid "Configure"
msgstr ""
@@ -14873,55 +15098,55 @@ msgstr ""
msgid "Verify Password"
msgstr ""
-#: client/gui-win32/connectdlg.c:912 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr ""
-#: client/gui-win32/connectdlg.c:913
+#: client/gui-win32/connectdlg.c:915
msgid "Local Area Network"
msgstr ""
-#: client/gui-win32/connectdlg.c:947
+#: client/gui-win32/connectdlg.c:949
msgid "Welcome to Freeciv"
msgstr "Êáëþò Þñèåò óôï Freeciv"
-#: client/gui-win32/connectdlg.c:965
+#: client/gui-win32/connectdlg.c:967
msgid "Load Saved Game"
msgstr ""
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
msgid "Connect To Network Game"
msgstr ""
-#: client/gui-win32/connectdlg.c:977
+#: client/gui-win32/connectdlg.c:979
msgid "Choose a nation to play"
msgstr ""
-#: client/gui-win32/connectdlg.c:1012
+#: client/gui-win32/connectdlg.c:1014
msgid "Number of players (Including AI):"
msgstr ""
-#: client/gui-win32/connectdlg.c:1020
+#: client/gui-win32/connectdlg.c:1022
msgid "AI skill level:"
msgstr ""
-#: client/gui-win32/connectdlg.c:1034 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
msgid "Game Options"
msgstr ""
-#: client/gui-win32/connectdlg.c:1038
+#: client/gui-win32/connectdlg.c:1040
msgid "Start Game"
msgstr ""
-#: client/gui-win32/connectdlg.c:1057
+#: client/gui-win32/connectdlg.c:1059
msgid "Login:"
msgstr ""
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
msgid "Host:"
msgstr ""
-#: client/gui-win32/connectdlg.c:1060
+#: client/gui-win32/connectdlg.c:1062
msgid "Port:"
msgstr ""
@@ -15170,10 +15395,6 @@ msgid_plural "(idle %d turns)"
msgstr[0] ""
msgstr[1] ""
-#: client/gui-win32/plrdlg.c:337 data/Freeciv.in:88
-msgid "Host"
-msgstr ""
-
#: client/gui-win32/plrdlg.c:355 data/Freeciv.in:3230
msgid "Intelligence"
msgstr ""
@@ -16910,12 +17131,12 @@ msgstr ""
#: data/helpdata.txt:781
msgid ""
-" To have a diplomatic relationship with another player, you must fist "
-"establish first contact with that player. To establish first contact, you "
-"have to move one of your units next to a city or unit belonging to that "
-"player, or vice versa. Unless you establish an embassy with that player, you "
-"may again lose contact with them after a set number of turns without direct "
-"physical contact."
+" To have a diplomatic relationship with another player, you must first "
+"establish contact with that player. To establish contact, you have to move "
+"one of your units next to a city or unit belonging to that player, or vice "
+"versa. Unless you establish an embassy with that player, you may again lose "
+"contact with them after a set number of turns without direct physical "
+"contact."
msgstr ""
#: data/helpdata.txt:788
@@ -19607,7 +19828,7 @@ msgid "Communism"
msgstr "Êïììïõíéóìüò"
#: data/default/governments.ruleset:121 data/civ2/governments.ruleset:118
-#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:26
+#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:27
msgid "Comrade"
msgstr "Óýíôñïöïò"
@@ -20596,6 +20817,11 @@ msgstr ""
"óðáôáëÞóåéò ðáñáðáíßóéá äïõëåéÜ êáé õðÜñ÷åé êáé ï êßíäõíïò óå ðåñßðôùóç "
"åðßèåóçò íá ÷Üóåéò üëåò ôéò ìïíÜäåò ìáæß!."
+#: data/default/units.ruleset:238
+#, fuzzy
+msgid "?unit:Workers"
+msgstr "ÅñãÜôåò"
+
#: data/default/units.ruleset:264
msgid ""
"Workers are one of the key units in the game. They can be used to irrigate "
@@ -21278,6 +21504,11 @@ msgid "Explorers are very useful for mapping unknown territory."
msgstr ""
"Ïé åîåõñåõíçôÝò åßíáé ðïëý ÷ñÞóéìïé ãéá ôçí áíß÷íåõóç Üãíùóôçò ðåñéï÷Þò."
+#: data/default/units.ruleset:1864
+#, fuzzy
+msgid "?unit:Leader"
+msgstr "ÇãÝôçò"
+
#: data/default/units.ruleset:1892
msgid "This is you. If you lose this unit, you lose the game. So don't."
msgstr "Áí ÷Üóåéò áõôÞ ôç ìïíÜäá , ÷Üíåéò êáé ôï ðáé÷íßäé.Ðñüóåîå."
@@ -21486,7 +21717,7 @@ msgid "Emir"
msgstr "Åìßñçò"
#: data/nation/afghani.ruleset:25 data/nation/slovakian.ruleset:30
-#: data/nation/soviet.ruleset:27
+#: data/nation/soviet.ruleset:28
msgid "General Secretary"
msgstr "Ãåíéêüò ÃñáììáôÝáò"
@@ -21603,7 +21834,7 @@ msgstr "?plural:
msgid ""
"According to legend, the Armenian people are the descendants of Haik - the "
"great-great-grandson of Noah. The modern Republic of Armenia gained "
-"independence from Soviet in 1991 AD"
+"independence from the Soviet Union in 1991."
msgstr ""
#: data/nation/assyrian.ruleset:3
@@ -22583,12 +22814,11 @@ msgstr "?plural:
#: data/nation/illyrian.ruleset:6
msgid ""
-"Illyrians were Indo-European tribes who appeared in the western part of the "
-"Balkan Peninsula before 1000 BC, including the Dalmatians to the north, "
-"Corcyra island and Ambracia bay in prehistoric Epirus to the south, mixing "
-"with Thracians in Dardania to the east, and settling Messapia across the "
-"Adriatic Sea. Illyrian kingdoms were independent for centuries, until "
-"conquered by the Roman Republic."
+"Illyrians were Indo-European tribes who appeared in the western part of the "
+"Balkan Peninsula before 1000 BC, including Corcyra island and Ambracia bay "
+"in prehistoric Epirus to the south. They mixed with Thracians in Dardania to "
+"the east, and settled Messapia across the Adriatic Sea. Illyrian kingdoms "
+"were independent for centuries, until conquered by the Roman Republic."
msgstr ""
#: data/nation/inca.ruleset:3
@@ -22886,7 +23116,7 @@ msgid ""
"1953."
msgstr ""
-#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:28
+#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:29
msgid "Great Leader"
msgstr ""
@@ -23048,9 +23278,9 @@ msgstr ""
msgid ""
"Sub-Saharan Africa has been a cultural and ethnical melting pot for "
"millennia. In medieval times, the region was home to a succession of empires "
-"called the Sahelian kingdoms. Of these, the Islamic Mali empire with it's "
+"called the Sahelian kingdoms. Of these, the Islamic Mali empire with its "
"capital in Timbuktu was the most influential. This empire reigned from the "
-"14th to the 17th century and was famed for it's wealth and benevolent kings. "
+"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 ""
@@ -23114,8 +23344,8 @@ msgstr "?plural:
#: data/nation/mayan.ruleset:6
msgid ""
-"The Mayans were a Mesoamerican civilization. Famous for building great "
-"pyramids and palaces in the jungle."
+"The Mayans were a Mesoamerican civilization. They are famous for building "
+"great pyramids and palaces in the jungle."
msgstr ""
#: data/nation/mayan.ruleset:19
@@ -23624,6 +23854,16 @@ msgid ""
"Czechoslovakia, until 1918 it was part of the Austro-Hungarian Empire."
msgstr ""
+#: data/nation/slovakian.ruleset:26
+#, fuzzy
+msgid "?male:Leader"
+msgstr "?female:×Üêåñ"
+
+#: data/nation/slovakian.ruleset:26
+#, fuzzy
+msgid "?female:Leader"
+msgstr "?female:×Üêåñ"
+
#: data/nation/slovakian.ruleset:29
msgid "Pope"
msgstr "ÐÜðáò"
@@ -23662,11 +23902,12 @@ msgstr "?plural:
#: data/nation/soviet.ruleset:6
msgid ""
-"Soviet Union's history starts in November 1917, when under Lenin's "
+"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 "
-"republics integrated into one country. Soviet Union became one of most "
-"powerful states in the 20th century. But by the end of 1991 due to many "
-"social shocks it disintegrated into fifteen independent countries"
+"republics integrated into one country. The Soviet Union became one of most "
+"powerful states in the 20th century, but by the end of 1991 it had "
+"disintegrated into fifteen independent countries due to social and economic "
+"problems."
msgstr ""
#: data/nation/spanish.ruleset:3
@@ -24045,8 +24286,8 @@ msgstr ""
#: data/nation/westphalian.ruleset:6
msgid ""
-"Westphalia, before becoming a Prussian province, was the western region the "
-"duchy of Saxony. Present-day it consists of the Northern part of the largest "
+"Westphalia, before becoming a Prussian province, was the western region of "
+"the duchy of Saxony. Today it makes up the northern part of the largest "
"German federal state, North Rhine-Westphalia."
msgstr ""
@@ -24196,7 +24437,7 @@ msgid ""
"The flag and background color indicate what civilization the city\n"
"belongs to (this will be useful when you meet other civilizations).\n"
"The top row of the bar also shows the name and size of the city, and\n"
-"will show one or more starts to indicate if there are units in the\n"
+"will show one or more stars to indicate if there are units in the\n"
"city. The bottom row shows what the city is building, and how long it\n"
"will take; it also shows how long the city will take to grow to the\n"
"next largest size."
@@ -24252,7 +24493,7 @@ msgid ""
"Now your city has grown to size five. As cities get larger unrest\n"
"becomes a problem. A city of this size will usually have one unhappy\n"
"citizen unless pacifying effects are used; meaning one entertainer\n"
-"specialist is required to keep your citzens content. This is basically\n"
+"specialist is required to keep your citizens content. This is basically\n"
"a wasted citizen.\n"
"\n"
"There are several things that can be done about this. One quick fix\n"
@@ -24324,7 +24565,7 @@ msgid ""
"existing cities. Generally when building new cities you want to make\n"
"sure that all tiles are covered by at least one city, but after that\n"
"it is best that your cities overlap as little as possible. Spreading\n"
-"out cities properly gives each city access to more resrouces, allowing\n"
+"out cities properly gives each city access to more resources, allowing\n"
"them to grow to larger sizes."
msgstr ""
@@ -24607,6 +24848,48 @@ msgstr "
msgid "Team 31"
msgstr "ÏìÜäá 31"
+#~ msgid "Auth config filename \"%s\" not allowed!"
+#~ msgstr "¼íïìá áñ÷åßï äéáìüñöùóçò ðñüóâáóéìüôçôáò \"%s\" äåí åðéôñÝðåôáé!"
+
+#~ msgid "The %s of the %s (%s)"
+#~ msgstr "Ï %s ôïõ %s (%s)"
+
+#~ msgid "We can't take control of server, attempting to kill it."
+#~ msgstr ""
+#~ "Äåí ìðïñïýìå íá ðÜñïõìå ôïí Ýëåã÷ï ôïõ åîõðçñåôçôÞ, ðñïóðÜèåéá åêôÝëåóÞò "
+#~ "ôïõ."
+
+#, fuzzy
+#~ msgid "%s territory"
+#~ msgstr "¸äáöüò"
+
+#~ msgid "%s territory (%d turn cease-fire)"
+#~ msgid_plural "%s territory (%d turn cease-fire)"
+#~ msgstr[0] "%s ðåñéï÷Þ (êáôÜðáõóç ðõñüò %d ãýñïò)"
+#~ msgstr[1] "%s ðåñéï÷Þ (êáôÜðáõóç ðõñüò %d ãýñïé)"
+
+#, fuzzy
+#~ msgid "%s territory (%s)"
+#~ msgstr "%s ðåñéï÷Þ (êáôÜðáõóç ðõñüò %d ãýñïò)"
+
+#, fuzzy
+#~ msgid "Unit: %s (%s)"
+#~ msgstr "ÌïíÜäá:%s (%s%s) "
+
+#~ msgid "no maximum, "
+#~ msgstr "ü÷é ìÝãéóôï,"
+
+#~ msgid "%d unit maximum, "
+#~ msgid_plural "%d units maximum, "
+#~ msgstr[0] "%d ìïíÜäá ìÝãéóôï, "
+#~ msgstr[1] "%d ìïíÜäåò ìÝãéóôï,"
+
+#~ msgid "%d per unit). "
+#~ msgstr "%d áíÜ ìïíÜäá). "
+
+#~ msgid "Select same type"
+#~ msgstr "ÅðÝëåîå ßäéï ôýðï"
+
#, fuzzy
#~ msgid "Technology: %s"
#~ msgstr "Ôå÷íïëïãßá"
@@ -25101,10 +25384,6 @@ msgstr "
#~ msgid "Recalculate _Borders"
#~ msgstr "Åðáíáõðïëïãéóìüò _Óõíüñùí"
-#, fuzzy
-#~ msgid "Select same type in tile"
-#~ msgstr "ÅðÝëåîå ßäéï ôýðï"
-
#~ msgid "_Editor"
#~ msgstr "_ÅðåîåñãáóôÞò"
@@ -25452,9 +25731,6 @@ msgstr "
#~ msgid "h4xx0r r0xx0rz!"
#~ msgstr "h4xx0r r0xx0rz!"
-#~ msgid "?female:Hacker"
-#~ msgstr "?female:×Üêåñ"
-
#, fuzzy
#~ msgid "Hawaiian"
#~ msgstr "ðåñéìÝíåé"
@@ -25853,9 +26129,6 @@ msgstr "
#~ msgid "Territory of the %s"
#~ msgstr "Ðåñéï÷Þ ôùí %s"
-#~ msgid "Territory of the %s %s"
-#~ msgstr "Ðåñéï÷Þ ôùí %s %s"
-
#~ msgid "."
#~ msgstr "."
diff --git a/po/en_GB.gmo b/po/en_GB.gmo
index 85a83a8..36a3375 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 4a17a41..acebe34 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -4,13 +4,13 @@
#
# Translated words are:
#
-# traveller, centre, railway, cancelled, colour, neighbour
+# traveller, centre, railway, cancelled, colour, neighbour, mediaeval
#
msgid ""
msgstr ""
"Project-Id-Version: freeciv 2.1.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 07:45+0900\n"
+"POT-Creation-Date: 2009-03-29 21:13+0900\n"
"PO-Revision-Date: 2007-09-09 07:42+0900\n"
"Last-Translator: Daniel Markstedt <himasaram at spray.se>\n"
"Language-Team: \n"
@@ -637,7 +637,7 @@ msgid "Road"
msgstr ""
#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
-#: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
+#: client/gui-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"
@@ -654,7 +654,7 @@ msgid "Mine"
msgstr ""
#: common/terrain.c:396 common/unit.c:548 server/report.c:124
-#: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
+#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr ""
@@ -700,7 +700,7 @@ msgstr ""
msgid "Sentry"
msgstr ""
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:851 client/gui-sdl/menu.c:648
+#: common/unit.c:566 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 ""
@@ -717,7 +717,7 @@ msgstr ""
msgid "Transform"
msgstr ""
-#: common/unit.c:584 client/text.c:106 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:584 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 ""
@@ -782,11 +782,11 @@ msgstr ""
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1406
+#: common/unittype.c:349 client/helpdata.c:1404
msgid " and "
msgstr ""
-#: common/unittype.c:355 client/helpdata.c:1392
+#: common/unittype.c:355 client/helpdata.c:1390
msgid "?and:, "
msgstr ""
@@ -1333,103 +1333,98 @@ msgstr ""
#: server/auth.c:281
#, c-format
-msgid "Auth config filename \"%s\" not allowed!"
-msgstr ""
-
-#: server/auth.c:286
-#, c-format
msgid "Cannot load auth config file \"%s\"!"
msgstr ""
-#: server/auth.c:397
+#: server/auth.c:392
#, c-format
msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
msgstr ""
-#: server/auth.c:404
+#: server/auth.c:399
msgid "Guests are not allowed on this server. Sorry."
msgstr ""
-#: server/auth.c:406
+#: server/auth.c:401
#, c-format
msgid "%s was rejected: Guests not allowed."
msgstr ""
-#: server/auth.c:425
+#: server/auth.c:420
#, c-format
msgid ""
"There was an error reading the user database, logging in as guest connection "
"'%s'."
msgstr ""
-#: server/auth.c:431
+#: server/auth.c:426
msgid ""
"There was an error reading the user database and guest logins are not "
"allowed. Sorry"
msgstr ""
-#: server/auth.c:434
+#: server/auth.c:429
#, c-format
msgid "%s was rejected: Database error and guests not allowed."
msgstr ""
-#: server/auth.c:441
+#: server/auth.c:436
#, c-format
msgid "Enter password for %s:"
msgstr ""
-#: server/auth.c:450
+#: server/auth.c:445
msgid "Enter a new password (and remember it)."
msgstr ""
-#: server/auth.c:456
+#: server/auth.c:451
msgid "This server allows only preregistered users. Sorry."
msgstr ""
-#: server/auth.c:459
+#: server/auth.c:454
#, c-format
msgid "%s was rejected: Only preregister users allowed."
msgstr ""
-#: server/auth.c:488 server/auth.c:547
+#: server/auth.c:483 server/auth.c:542
msgid "Sorry, too many wrong tries..."
msgstr ""
-#: server/auth.c:489
+#: server/auth.c:484
#, c-format
msgid "%s was rejected: Too many wrong password verifies for new user."
msgstr ""
-#: server/auth.c:505
+#: server/auth.c:500
msgid ""
"Warning: There was an error in saving to the database. Continuing, but your "
"stats will not be saved."
msgstr ""
-#: server/auth.c:549
+#: server/auth.c:544
#, c-format
msgid "%s was rejected: Too many wrong password tries."
msgstr ""
-#: server/auth.c:558
+#: server/auth.c:553
msgid "Your password is incorrect. Try again."
msgstr ""
-#: server/auth.c:569
+#: server/auth.c:564
msgid "Sorry, your connection timed out..."
msgstr ""
-#: server/auth.c:571
+#: server/auth.c:566
#, c-format
msgid "%s was rejected: Connection timeout waiting for password."
msgstr ""
-#: server/auth.c:636
+#: server/auth.c:631
#, c-format
msgid "Your password is too short, the minimum length is %d. Try again."
msgstr ""
-#: server/auth.c:642
+#: server/auth.c:637
#, c-format
msgid ""
"The password must have at least %d capital letters, %d numbers, and be at "
@@ -1913,7 +1908,7 @@ msgstr ""
msgid "You can learn a lot about Freeciv at %s"
msgstr ""
-#: server/civserver.c:206 client/civclient.c:237 manual/civmanual.c:380
+#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
@@ -1938,12 +1933,12 @@ msgstr ""
msgid " -b --bind ADDR\tListen for clients on ADDR\n"
msgstr ""
-#: server/civserver.c:217 client/civclient.c:241
+#: server/civserver.c:217 client/civclient.c:242
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:245
+#: server/civserver.c:221 client/civclient.c:246
msgid " -d, --debug NUM\tSet debug log level (0 to 3)\n"
msgstr ""
@@ -1951,7 +1946,7 @@ msgstr ""
msgid " -f, --file FILE\tLoad saved game FILE\n"
msgstr ""
-#: server/civserver.c:225 client/civclient.c:248 manual/civmanual.c:382
+#: server/civserver.c:225 client/civclient.c:249 manual/civmanual.c:382
msgid " -h, --help\t\tPrint a summary of the options\n"
msgstr ""
@@ -1999,11 +1994,11 @@ msgstr ""
msgid " -R, --Ranklog FILE\tUse FILE as ranking logfile\n"
msgstr ""
-#: server/civserver.c:247 client/civclient.c:267 manual/civmanual.c:383
+#: server/civserver.c:247 client/civclient.c:268 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:279
+#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, c-format
@@ -3096,7 +3091,7 @@ msgstr ""
msgid "Sea moving start units are not yet supported. Nobody gets %s."
msgstr ""
-#: server/gamehand.c:310 client/text.c:632
+#: server/gamehand.c:310 client/text.c:691
#, c-format
msgid "Year: %s"
msgstr ""
@@ -3368,8 +3363,8 @@ msgstr ""
#: server/plrhand.c:1686
#, c-format
msgid ""
-"Your nation is thrust into civil war, %s is declared the leader of the "
-"rebel states."
+"Your nation is thrust into civil war! %s is declared the leader of the rebel "
+"states."
msgstr ""
#: server/plrhand.c:1707
@@ -3464,7 +3459,7 @@ msgstr ""
msgid "Literacy"
msgstr ""
-#: server/report.c:121 client/cityrepdata.c:526 client/cityrepdata.c:527
+#: server/report.c:121 client/cityrepdata.c:524 client/cityrepdata.c:525
#: client/gui-sdl/cityrep.c:174
msgid "Production"
msgstr ""
@@ -3614,7 +3609,7 @@ msgstr ""
msgid "Demography string contains invalid characters. Try \"help demography\"."
msgstr ""
-#: server/report.c:743 server/report.c:766
+#: server/report.c:743 server/report.c:768
msgid "Demographics Report:"
msgstr ""
@@ -3622,9 +3617,11 @@ msgstr ""
msgid "Sorry, the Demographics report is unavailable."
msgstr ""
-#: server/report.c:748
+#. TRANS: <nation adjective> <government name> (<year>).
+#. * E.g. "Polish Despotism (200 AD)".
+#: server/report.c:750
#, c-format
-msgid "The %s of the %s (%s)"
+msgid "%s %s (%s)"
msgstr ""
#. TRANS: message about an installation error.
@@ -3672,14 +3669,6 @@ msgstr ""
msgid "%s had invalid nation; changing to %s."
msgstr ""
-#. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4073
-#, c-format
-msgid ""
-"Illegal alliance structure detected: %s alliance to %s reduced to peace "
-"treaty."
-msgstr ""
-
#: server/settings.c:32
msgid "Geological"
msgstr ""
@@ -4613,8 +4602,8 @@ msgstr ""
#: server/settings.c:1016
msgid ""
-"Automatically saved games will have name \"<prefix><year>.sav\". This "
-"setting sets the <prefix> part."
+"Automatically saved games will have name \"<prefix>-T<turn>-Y<year>.sav\". "
+"This setting sets the <prefix> part."
msgstr ""
#: server/settings.c:1023
@@ -4628,11 +4617,11 @@ msgid ""
"the game."
msgstr ""
-#: server/sernet.c:147
+#: server/sernet.c:150
msgid "Server cannot read standard input. Ignoring input."
msgstr ""
-#: server/sernet.c:922
+#: server/sernet.c:929
#, c-format
msgid "Server: bad address: [%s:%d]."
msgstr ""
@@ -4751,112 +4740,112 @@ msgid ""
"alliance with both."
msgstr ""
-#: server/srv_main.c:928
+#: server/srv_main.c:961
#, c-format
msgid "Failed saving game as %s"
msgstr ""
-#: server/srv_main.c:930
+#: server/srv_main.c:963
#, c-format
msgid "Game saved as %s"
msgstr ""
-#: server/srv_main.c:962
+#: server/srv_main.c:994
msgid "The game is already running."
msgstr ""
-#: server/srv_main.c:970
+#: server/srv_main.c:1002
#, c-format
msgid "%s lost control cmdlevel on game start. Use voting from now on."
msgstr ""
-#: server/srv_main.c:977
+#: server/srv_main.c:1009
msgid "Starting game."
msgstr ""
-#: server/srv_main.c:1039
+#: server/srv_main.c:1071
#, c-format
msgid "request for unknown report (type %d)"
msgstr ""
-#: server/srv_main.c:1104
+#: server/srv_main.c:1136
#, c-format
msgid "Warning: rejecting old client %s"
msgstr ""
-#: server/srv_main.c:1206
+#: server/srv_main.c:1238
#, c-format
msgid "Got a packet of type %d from a dead or observer player"
msgstr ""
-#: server/srv_main.c:1306
+#: server/srv_main.c:1338
msgid "Please choose a non-blank name."
msgstr ""
-#: server/srv_main.c:1322
+#: server/srv_main.c:1354
msgid "That nation is already in use."
msgstr ""
-#: server/srv_main.c:1338
+#: server/srv_main.c:1370
#, c-format
msgid "Another player already has the name '%s'. Please choose another name."
msgstr ""
-#: server/srv_main.c:1359
+#: server/srv_main.c:1391
msgid "Please choose a name containing only ASCII characters."
msgstr ""
-#: server/srv_main.c:1458
+#: server/srv_main.c:1490
#, c-format
msgid "%s nation is not available in this scenario."
msgstr ""
-#: server/srv_main.c:1464
+#: server/srv_main.c:1496
#, c-format
msgid "%s nation is already in use."
msgstr ""
-#: server/srv_main.c:1482
+#: server/srv_main.c:1514
#, c-format
msgid "%s is the %s ruler %s."
msgstr ""
-#: server/srv_main.c:1538
+#: server/srv_main.c:1570
#, c-format
msgid "Waiting to start game: %d out of %d players are ready to start."
msgstr ""
-#: server/srv_main.c:1582 server/srv_main.c:1586
+#: server/srv_main.c:1614 server/srv_main.c:1618
#, c-format
msgid "%s has been added as %s level AI-controlled player."
msgstr ""
-#: server/srv_main.c:1728
+#: server/srv_main.c:1760
#, c-format
msgid "Player %d"
msgstr ""
-#: server/srv_main.c:1739 server/srv_main.c:1745
+#: server/srv_main.c:1771 server/srv_main.c:1777
#, c-format
msgid "%s rules the %s."
msgstr ""
-#: server/srv_main.c:1910
+#: server/srv_main.c:1942
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
msgstr ""
-#: server/srv_main.c:1961
+#: server/srv_main.c:1993
#, c-format
msgid "Sending info to metaserver [%s]"
msgstr ""
-#: server/srv_main.c:1992
+#: server/srv_main.c:2024
msgid "The game is over..."
msgstr ""
-#: server/srv_main.c:2205
+#: server/srv_main.c:2237
msgid "Now accepting new client connections."
msgstr ""
@@ -5648,24 +5637,24 @@ msgid "Barbarian"
msgstr ""
#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2030 client/gui-sdl/plrdlg.c:645
+#: client/gui-gtk-2.0/pages.c:2102 client/gui-sdl/plrdlg.c:645
#: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
msgid "AI"
msgstr ""
#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
+#: client/gui-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
msgid "Human"
msgstr ""
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
-#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
+#: 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
msgid "Alive"
msgstr ""
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
#: client/gui-win32/connectdlg.c:200
msgid "Dead"
msgstr ""
@@ -5909,9 +5898,9 @@ 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:242
-#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
-#: client/text.c:1201
+#: 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
#, c-format
msgid "?clistmore:, %s"
msgstr ", %s"
@@ -6158,7 +6147,7 @@ msgstr ""
msgid "Cannot attack from sea."
msgstr ""
-#: server/unithand.c:996 server/unittools.c:2103
+#: server/unithand.c:996 server/unittools.c:2137
msgid "Cannot attack unless you declare war first."
msgstr ""
@@ -6255,99 +6244,100 @@ msgstr ""
#: server/unittools.c:297
#, c-format
-msgid "Not enough gold. %s disbanded"
+msgid "Not enough gold to pay upkeep for %s. Unit disbanded."
msgstr ""
-#: server/unittools.c:342
+#: server/unittools.c:343
#, c-format
msgid "Your %s has run out of hit points."
msgstr ""
-#: server/unittools.c:358
+#: server/unittools.c:359
#, c-format
msgid "Your %s has been lost on the high seas."
msgstr ""
-#: server/unittools.c:365
+#: server/unittools.c:366
#, c-format
msgid "Your %s survived on the high seas and became more experienced!"
msgstr ""
-#: server/unittools.c:376
+#: server/unittools.c:377
#, c-format
msgid "Your %s has been lost on unsafe terrain."
msgstr ""
-#: server/unittools.c:430
+#: server/unittools.c:431
#, c-format
msgid "Your %s has returned to refuel."
msgstr ""
-#: server/unittools.c:454
+#: server/unittools.c:455
#, c-format
msgid "Your %s has run out of fuel."
msgstr ""
-#. TRANS: And, <the unit> became ...
-#: server/unittools.c:616
-msgid "And, became more experienced!"
-msgstr ""
-
#. TRANS: Your <unit> became ...
-#: server/unittools.c:620
+#: server/unittools.c:619
#, c-format
msgid "Your %s became more experienced!"
msgstr ""
-#: server/unittools.c:1011
+#: server/unittools.c:1009
#, c-format
msgid "Teleported your %s to %s."
msgstr ""
-#: server/unittools.c:1041
+#. TRANS: A unit is moved to resolve stack conflicts.
+#: server/unittools.c:1065
+#, c-format
+msgid "Moved your %s."
+msgstr ""
+
+#: server/unittools.c:1076
#, c-format
msgid "Disbanded your %s."
msgstr ""
-#: server/unittools.c:1363
+#: server/unittools.c:1397
#, c-format
msgid "Unable to defend %s, %s has lost the game."
msgstr ""
-#: server/unittools.c:1367
+#: server/unittools.c:1401
#, c-format
msgid "Losing %s meant losing the game! Be more careful next time!"
msgstr ""
-#: server/unittools.c:1469
+#: server/unittools.c:1503
#, c-format
msgid "%s escaped the destruction of %s, and fled to %s."
msgstr ""
-#: server/unittools.c:1478
+#: server/unittools.c:1512
#, c-format
msgid "%s lost when %s was lost."
msgstr ""
-#: server/unittools.c:1527
+#: server/unittools.c:1561
#, c-format
msgid "Barbarian leader captured, %d gold ransom paid."
msgstr ""
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unittools.c:1545
+#: server/unittools.c:1579
#, c-format
msgid "Your attacking %s succeeded against the %s %s!"
msgstr ""
#. TRANS: "Cannon ... the Polish Destroyer."
-#: server/unittools.c:1554 server/unittools.c:1612
+#: server/unittools.c:1588 server/unittools.c:1646
#, c-format
msgid "%s lost to an attack by the %s %s."
msgstr ""
#. TRANS: "... Cannon ... the Polish Destroyer ...."
-#: server/unittools.c:1588
+#: server/unittools.c:1622
#, c-format
msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
msgid_plural ""
@@ -6357,14 +6347,14 @@ msgstr[1] ""
#. TRANS: "Cannon lost when the Polish Destroyer
#. * attacked the German Musketeers."
-#: server/unittools.c:1621
+#: server/unittools.c:1655
#, 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:1636
+#: server/unittools.c:1670
#, c-format
msgid "%s (and %s) lost to an attack from the %s %s."
msgstr ""
@@ -6372,7 +6362,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:1646
+#: server/unittools.c:1680
#, 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."
@@ -6382,192 +6372,192 @@ 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:1660
+#: server/unittools.c:1694
#, 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:1928
+#: server/unittools.c:1962
#, c-format
msgid "Your %s was nuked by %s."
msgstr ""
-#: server/unittools.c:1931 server/unittools.c:1947
+#: server/unittools.c:1965 server/unittools.c:1981
msgid "yourself"
msgstr ""
-#: server/unittools.c:1935
+#: server/unittools.c:1969
#, c-format
msgid "The %s %s was nuked."
msgstr ""
-#: server/unittools.c:1944
+#: server/unittools.c:1978
#, c-format
msgid "%s was nuked by %s."
msgstr ""
-#: server/unittools.c:1952
+#: server/unittools.c:1986
#, c-format
msgid "You nuked %s."
msgstr ""
-#: server/unittools.c:1993
+#: server/unittools.c:2027
#, c-format
msgid "The %s detonated a nuke!"
msgstr ""
-#: server/unittools.c:2017
+#: server/unittools.c:2051
#, c-format
msgid "%s transported successfully."
msgstr ""
-#: server/unittools.c:2069
+#: server/unittools.c:2103
msgid "This unit type can not be paradropped."
msgstr ""
-#: server/unittools.c:2079
+#: server/unittools.c:2113
msgid "You cannot paradrop a unit that is transporting other units."
msgstr ""
-#: server/unittools.c:2085
+#: server/unittools.c:2119
msgid "The destination location is not known."
msgstr ""
-#: server/unittools.c:2092
+#: server/unittools.c:2126
#, c-format
msgid "This unit cannot paradrop into %s."
msgstr ""
-#: server/unittools.c:2112
+#: server/unittools.c:2146
#, c-format
msgid "The distance to the target (%i) is greater than the unit's range (%i)."
msgstr ""
-#: server/unittools.c:2123
+#: server/unittools.c:2157
#, c-format
msgid "Your %s paradropped into the %s and was lost."
msgstr ""
-#: server/unittools.c:2136
+#: server/unittools.c:2170
#, c-format
msgid "Your %s was killed by enemy units at the paradrop destination."
msgstr ""
-#: server/unittools.c:2158
+#: server/unittools.c:2192
#, c-format
msgid "You found %d gold."
msgstr ""
-#: server/unittools.c:2175
+#: server/unittools.c:2209
#, c-format
msgid "You found %s in ancient scrolls of wisdom."
msgstr ""
-#: server/unittools.c:2182
+#: server/unittools.c:2216
#, c-format
msgid "The %s have acquired %s from ancient scrolls of wisdom."
msgstr ""
-#: server/unittools.c:2196
+#: server/unittools.c:2230
msgid "A band of friendly mercenaries joins your cause."
msgstr ""
-#: server/unittools.c:2214
+#: server/unittools.c:2248
msgid "An abandoned village is here."
msgstr ""
-#: server/unittools.c:2224
+#: server/unittools.c:2258
msgid "You have unleashed a horde of barbarians!"
msgstr ""
-#: server/unittools.c:2227
+#: server/unittools.c:2261
#, c-format
msgid "Your %s has been killed by barbarians!"
msgstr ""
-#: server/unittools.c:2243
+#: server/unittools.c:2277
msgid "You found a friendly city."
msgstr ""
-#: server/unittools.c:2257
+#: server/unittools.c:2291
msgid "Friendly nomads are impressed by you, and join you."
msgstr ""
-#: server/unittools.c:2282
+#: server/unittools.c:2316
msgid "Your overflight frightens the tribe; they scatter in terror."
msgstr ""
-#: server/unittools.c:2540
+#: server/unittools.c:2574
#, c-format
msgid "Orders for %s aborted after enemy movement was spotted."
msgstr ""
-#: server/unittools.c:2989
+#: server/unittools.c:3023
#, c-format
msgid "Orders for %s aborted as there are units nearby."
msgstr ""
-#: server/unittools.c:3041
+#: server/unittools.c:3075
#, c-format
msgid "Orders for %s aborted because building of city failed."
msgstr ""
-#: server/unittools.c:3054
+#: server/unittools.c:3088
#, c-format
msgid "Orders for %s aborted since they give an invalid activity."
msgstr ""
-#: server/unittools.c:3068
+#: server/unittools.c:3102
#, c-format
msgid "Orders for %s aborted since they give an invalid location."
msgstr ""
-#: server/unittools.c:3078
+#: server/unittools.c:3112
#, c-format
msgid "Orders for %s aborted as there are units in the way."
msgstr ""
-#: server/unittools.c:3104
+#: server/unittools.c:3138
#, c-format
msgid "Orders for %s aborted because of failed move."
msgstr ""
-#: server/unittools.c:3145
+#: server/unittools.c:3179
#, c-format
msgid "Attempt to change homecity for %s failed."
msgstr ""
-#: server/unittools.c:3156
+#: server/unittools.c:3190
#, c-format
msgid "Attempt to establish trade route for %s failed."
msgstr ""
-#: server/unittools.c:3168
+#: server/unittools.c:3202
#, c-format
msgid "Attempt to build wonder for %s failed."
msgstr ""
-#: server/unittools.c:3177
+#: server/unittools.c:3211
#, c-format
msgid "Your %s has invalid orders."
msgstr ""
-#: server/generator/mapgen.c:1737
+#: server/generator/mapgen.c:1771
msgid "High landmass - this may take a few seconds."
msgstr ""
-#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
+#: server/generator/mapgen.c:1969 server/generator/mapgen.c:2039
#, c-format
msgid "Falling back to generator %d."
msgstr ""
-#: server/generator/mapgen.c:2025
+#: server/generator/mapgen.c:2059
msgid "Generator 3 didn't place all big islands."
msgstr ""
-#: server/generator/mapgen.c:2054
+#: server/generator/mapgen.c:2088
#, c-format
msgid "Generator 3 left %li landmass unplaced."
msgstr ""
@@ -6670,7 +6660,7 @@ msgid_plural "%3d turns"
msgstr[0] ""
msgstr[1] ""
-#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:631
#: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
@@ -6787,333 +6777,332 @@ msgstr ""
msgid "(worklist)"
msgstr ""
-#: client/cityrepdata.c:447
-msgid "Special"
+#: client/cityrepdata.c:446
+msgid "?city:Name"
msgstr ""
-#: client/cityrepdata.c:448
-msgid "?entertainers/scientists/taxmen:E/S/T"
+#: client/cityrepdata.c:446 client/gui-sdl/cityrep.c:169
+msgid "City Name"
msgstr ""
-#: client/cityrepdata.c:449
-msgid "Entertainers, Scientists, Taxmen"
+#: client/cityrepdata.c:448
+msgid "?size [short]:Sz"
msgstr ""
-#: client/cityrepdata.c:452
-msgid "Concise + Rapture, - Disorder"
+#: client/cityrepdata.c:448
+msgid "Size"
msgstr ""
-#: client/cityrepdata.c:454 client/plrdlg_common.c:261
+#: client/cityrepdata.c:450 client/plrdlg_common.c:261
#: client/gui-win32/plrdlg.c:337
msgid "State"
msgstr ""
-#: client/cityrepdata.c:454
+#: client/cityrepdata.c:450
msgid "Rapture/Peace/Disorder"
msgstr ""
+#: client/cityrepdata.c:452
+msgid "Concise *=Rapture, X=Disorder"
+msgstr ""
+
+#: client/cityrepdata.c:456
+msgid "Special"
+msgstr ""
+
#: client/cityrepdata.c:457
+msgid "?entertainers/scientists/taxmen:E/S/T"
+msgstr ""
+
+#: client/cityrepdata.c:458
+msgid "Entertainers, Scientists, Taxmen"
+msgstr ""
+
+#: client/cityrepdata.c:461
msgid "?Happy workers:H"
msgstr ""
-#: client/cityrepdata.c:457
+#: client/cityrepdata.c:461
msgid "Workers: Happy"
msgstr ""
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
msgid "?Content workers:C"
msgstr ""
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
msgid "Workers: Content"
msgstr ""
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
msgid "?Unhappy workers:U"
msgstr ""
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
msgid "Workers: Unhappy"
msgstr ""
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
msgid "?Angry workers:A"
msgstr ""
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
msgid "Workers: Angry"
msgstr ""
-#: client/cityrepdata.c:465 client/gui-xaw/citydlg.c:2401
-#: data/default/units.ruleset:238
-msgid "Workers"
+#: client/cityrepdata.c:469 client/gui-xaw/citydlg.c:2402
+msgid "?city:Workers"
msgstr ""
-#: client/cityrepdata.c:466
+#: client/cityrepdata.c:470
msgid "?happy/content/unhappy/angry:H/C/U/A"
msgstr ""
-#: client/cityrepdata.c:467
+#: client/cityrepdata.c:471
msgid "Workers: Happy, Content, Unhappy, Angry"
msgstr ""
-#: client/cityrepdata.c:470 client/cityrepdata.c:472
+#: client/cityrepdata.c:474 client/cityrepdata.c:476
msgid "Best"
msgstr ""
-#: client/cityrepdata.c:470
+#: client/cityrepdata.c:474
msgid "attack"
msgstr ""
-#: client/cityrepdata.c:471
+#: client/cityrepdata.c:475
msgid "Best attacking units"
msgstr ""
-#: client/cityrepdata.c:472
+#: client/cityrepdata.c:476
msgid "defense"
msgstr ""
-#: client/cityrepdata.c:473
+#: client/cityrepdata.c:477
msgid "Best defending units"
msgstr ""
-#: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
-#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
-#: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
-#: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
-#: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
-#: client/gui-win32/menu.c:351 client/gui-win32/repodlgs.c:616
-#: client/gui-win32/repodlgs.c:707 client/gui-win32/repodlgs.c:716
-#: client/gui-xaw/menu.c:157 client/gui-xaw/menu.c:219
-#: client/gui-xaw/menu.c:242 client/gui-xaw/repodlgs.c:881
-#: client/gui-xaw/repodlgs.c:1069 data/Freeciv.in:1895 data/helpdata.txt:909
+#: client/cityrepdata.c:478 client/cityrepdata.c:482
+#: client/gui-gtk-2.0/cityrep.c:1437 client/gui-gtk-2.0/cityrep.c:1456
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-gtk-2.0/cityrep.c:1494
+#: client/gui-gtk-2.0/cityrep.c:1514 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/repodlgs.c:960 client/gui-sdl/helpdlg.c:688
+#: client/gui-sdl/mapctrl.c:1605 client/gui-sdl/optiondlg.c:1827
+#: client/gui-sdl/repodlgs.c:356 client/gui-win32/menu.c:351
+#: client/gui-win32/repodlgs.c:616 client/gui-win32/repodlgs.c:707
+#: client/gui-win32/repodlgs.c:716 client/gui-xaw/menu.c:157
+#: client/gui-xaw/menu.c:219 client/gui-xaw/menu.c:242
+#: client/gui-xaw/repodlgs.c:881 client/gui-xaw/repodlgs.c:1069
+#: data/Freeciv.in:1895 data/helpdata.txt:909
msgid "Units"
msgstr ""
#. TRANS: Header "Number of units inside city"
-#: client/cityrepdata.c:476
+#: client/cityrepdata.c:480
msgid "?Present (units):Here"
msgstr ""
-#: client/cityrepdata.c:477
+#: client/cityrepdata.c:481
msgid "Number of units present"
msgstr ""
#. TRANS: Header "Number of units supported by given city"
-#: client/cityrepdata.c:480
+#: client/cityrepdata.c:484
msgid "?Supported (units):Owned"
msgstr ""
-#: client/cityrepdata.c:481
+#: client/cityrepdata.c:485
msgid "Number of units supported"
msgstr ""
#. TRANS: Header "It will take this many turns before city grows"
-#: client/cityrepdata.c:484
+#: client/cityrepdata.c:488
msgid "?food (population):Grow"
msgstr ""
-#: client/cityrepdata.c:485 client/cityrepdata.c:530
+#: client/cityrepdata.c:489 client/cityrepdata.c:528
msgid "?Stock/Target:(Have/Need)"
msgstr ""
-#: client/cityrepdata.c:486
+#: client/cityrepdata.c:490
msgid "Turns until growth/famine"
msgstr ""
-#: client/cityrepdata.c:488
-msgid "?size [short]:Sz"
-msgstr ""
-
-#: client/cityrepdata.c:488
-msgid "Size"
-msgstr ""
-
-#: client/cityrepdata.c:492
-msgid "?city:Name"
-msgstr ""
-
-#: client/cityrepdata.c:492 client/gui-sdl/cityrep.c:169
-msgid "City Name"
-msgstr ""
-
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
msgid "Surplus"
msgstr ""
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
msgid "?food/production/trade:F/P/T"
msgstr ""
-#: client/cityrepdata.c:496
+#: client/cityrepdata.c:494
msgid "Surplus: Food, Production, Trade"
msgstr ""
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
msgid "?Food surplus [short]:+F"
msgstr ""
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
msgid "Surplus: Food"
msgstr ""
-#: client/cityrepdata.c:500
+#: client/cityrepdata.c:498
msgid "?Production surplus [short]:+P"
msgstr ""
-#: client/cityrepdata.c:501
+#: client/cityrepdata.c:499
msgid "Surplus: Production"
msgstr ""
-#: client/cityrepdata.c:502
+#: client/cityrepdata.c:500
msgid "?Production loss (waste) [short]:-P"
msgstr ""
-#: client/cityrepdata.c:503
+#: client/cityrepdata.c:501
msgid "Waste"
msgstr ""
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
msgid "?Trade surplus [short]:+T"
msgstr ""
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
msgid "Surplus: Trade"
msgstr ""
-#: client/cityrepdata.c:506
+#: client/cityrepdata.c:504
msgid "?Trade loss (corruption) [short]:-T"
msgstr ""
-#: client/cityrepdata.c:507
+#: client/cityrepdata.c:505
msgid "Corruption"
msgstr ""
-#: client/cityrepdata.c:509 client/gui-gtk-2.0/repodlgs.c:654
+#: client/cityrepdata.c:507 client/gui-gtk-2.0/repodlgs.c:654
#: client/gui-sdl/mapctrl.c:1400 client/gui-win32/repodlgs.c:334
#: client/gui-xaw/menu.c:222 client/gui-xaw/repodlgs.c:644
#: client/gui-xaw/repodlgs.c:773 data/Freeciv.in:1819
msgid "Economy"
msgstr ""
-#: client/cityrepdata.c:509
+#: client/cityrepdata.c:507
msgid "?gold/luxury/science:G/L/S"
msgstr ""
-#: client/cityrepdata.c:510
+#: client/cityrepdata.c:508
msgid "Economy: Gold, Luxuries, Science"
msgstr ""
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
msgid "?Gold:G"
msgstr ""
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
msgid "Economy: Gold"
msgstr ""
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
msgid "?Luxury:L"
msgstr ""
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
msgid "Economy: Luxury"
msgstr ""
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
msgid "?Science:S"
msgstr ""
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
msgid "Economy: Science"
msgstr ""
-#: client/cityrepdata.c:518
+#: client/cityrepdata.c:516
msgid "?number_trade_routes:n"
msgstr ""
-#: client/cityrepdata.c:518
+#: client/cityrepdata.c:516
msgid "?number_trade_routes:R"
msgstr ""
-#: client/cityrepdata.c:519
+#: client/cityrepdata.c:517
msgid "Number of Trade Routes"
msgstr ""
-#: client/cityrepdata.c:521
+#: client/cityrepdata.c:519
msgid "?pollution [short]:Pol"
msgstr ""
-#: client/cityrepdata.c:523
+#: client/cityrepdata.c:521
msgid "?cma:Governor"
msgstr ""
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
-#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
-#: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
-#: data/Freeciv.in:1459 data/helpdata.txt:820
+#: client/cityrepdata.c:521 client/gui-gtk-2.0/cityrep.c:1766
+#: client/gui-sdl/citydlg.c:3809 client/gui-sdl/cma_fe.c:858
+#: client/gui-win32/citydlg.c:726 data/Freeciv.in:1459 data/helpdata.txt:820
msgid "Citizen Governor"
msgstr ""
-#: client/cityrepdata.c:526
+#: client/cityrepdata.c:524
msgid "Turns/Buy"
msgstr ""
-#: client/cityrepdata.c:529 client/cityrepdata.c:531
+#: client/cityrepdata.c:527 client/cityrepdata.c:529
msgid "Currently Building"
msgstr ""
-#: client/cityrepdata.c:575
+#: client/cityrepdata.c:573
msgid "?specialist:S"
msgstr ""
-#: client/cityrepdata.c:578
+#: client/cityrepdata.c:576
msgid "Specialists"
msgstr ""
-#: client/civclient.c:239
+#: client/civclient.c:240
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr ""
-#: client/civclient.c:249
+#: client/civclient.c:250
msgid " -l, --log FILE\tUse FILE as logfile (spawned server also uses this)\n"
msgstr ""
-#: client/civclient.c:251
+#: client/civclient.c:252
msgid " -m, --meta HOST\tConnect to the metaserver at HOST\n"
msgstr ""
-#: client/civclient.c:253
+#: client/civclient.c:254
msgid " -n, --name NAME\tUse NAME as name\n"
msgstr ""
-#: client/civclient.c:255
+#: client/civclient.c:256
msgid " -p, --port PORT\tConnect to server port PORT (usually with -a)\n"
msgstr ""
-#: client/civclient.c:257
+#: client/civclient.c:258
#, c-format
msgid " -P, --Plugin PLUGIN\tUse PLUGIN for sound output %s\n"
msgstr ""
-#: client/civclient.c:259
+#: client/civclient.c:260
msgid " -r, --read FILE\tRead startup script FILE (for spawned server only)\n"
msgstr ""
-#: client/civclient.c:262
+#: client/civclient.c:263
msgid " -s, --server HOST\tConnect to the server at HOST (usually with -a)\n"
msgstr ""
-#: client/civclient.c:264
+#: client/civclient.c:265
msgid " -S, --Sound FILE\tRead sound tags from FILE\n"
msgstr ""
-#: client/civclient.c:265
+#: client/civclient.c:266
msgid " -t, --tiles FILE\tUse data file FILE.tilespec for tiles\n"
msgstr ""
-#: client/civclient.c:268
+#: client/civclient.c:269
#, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -7121,144 +7110,154 @@ msgid ""
msgstr ""
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:273
+#: client/civclient.c:274
#, c-format
msgid "Report bugs at %s\n"
msgstr ""
-#: client/civclient.c:297
+#: client/civclient.c:298
#, c-format
msgid "Invalid port \"%s\" specified with --port option.\n"
msgstr ""
-#: client/civclient.c:299 client/civclient.c:314
+#: client/civclient.c:300 client/civclient.c:315
msgid "Try using --help.\n"
msgstr ""
-#: client/civclient.c:312
+#: client/civclient.c:313
#, c-format
msgid "Invalid debug level \"%s\" specified with --debug option.\n"
msgstr ""
-#: client/civclient.c:325
+#: client/civclient.c:326
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr ""
-#: client/civclient.c:539
+#: client/civclient.c:391
+#, c-format
+msgid "Updating old metaserver address \"%s\"."
+msgstr ""
+
+#: client/civclient.c:394
+#, c-format
+msgid "Default metaserver has been set to \"%s\"."
+msgstr ""
+
+#: client/civclient.c:550
msgid "Game started."
msgstr ""
-#: client/civclient.c:577
+#: client/civclient.c:588
msgid "There was an error while auto connecting; aborting."
msgstr ""
-#: client/climisc.c:176
+#: client/climisc.c:177
#, c-format
msgid "Changing production of every %s into %s."
msgstr ""
-#: client/climisc.c:214
+#: client/climisc.c:215
msgid "?embassy:Both"
msgstr ""
-#: client/climisc.c:216
+#: client/climisc.c:217
msgid "?embassy:Yes"
msgstr ""
-#: client/climisc.c:219
+#: client/climisc.c:220
msgid "?embassy:With Us"
msgstr ""
-#: client/climisc.c:222
+#: client/climisc.c:223
msgid "?embassy:Contact"
msgstr ""
-#: client/climisc.c:224
+#: client/climisc.c:225
msgid "?embassy:No Contact"
msgstr ""
-#: client/climisc.c:236
+#: client/climisc.c:237
msgid "?vision:Both"
msgstr ""
-#: client/climisc.c:238
+#: client/climisc.c:239
msgid "?vision:To Them"
msgstr ""
-#: client/climisc.c:241
+#: client/climisc.c:242
msgid "?vision:To Us"
msgstr ""
-#: client/climisc.c:257 client/climisc.c:264
+#: client/climisc.c:258 client/climisc.c:265
#, c-format
msgid "The %s give %s"
msgstr ""
-#: client/climisc.c:268
+#: client/climisc.c:269
#, c-format
msgid "The %s give unknown city."
msgstr ""
-#: client/climisc.c:273
+#: client/climisc.c:274
#, c-format
msgid "The %s give %d gold"
msgstr ""
-#: client/climisc.c:278
+#: client/climisc.c:279
#, c-format
msgid "The %s give their worldmap"
msgstr ""
-#: client/climisc.c:282
+#: client/climisc.c:283
#, c-format
msgid "The %s give their seamap"
msgstr ""
-#: client/climisc.c:286
+#: client/climisc.c:287
msgid "The parties agree on a cease-fire"
msgstr ""
-#: client/climisc.c:289
+#: client/climisc.c:290
msgid "The parties agree on a peace"
msgstr ""
-#: client/climisc.c:292
+#: client/climisc.c:293
msgid "The parties create an alliance"
msgstr ""
-#: client/climisc.c:295
+#: client/climisc.c:296
#, c-format
msgid "The %s give shared vision"
msgstr ""
-#: client/climisc.c:299
+#: client/climisc.c:300
#, c-format
msgid "The %s give an embassy"
msgstr ""
-#: client/climisc.c:902
+#: client/climisc.c:906
msgid "Popup Request"
msgstr ""
-#: client/climisc.c:932
+#: client/climisc.c:936
msgid "Exporting output window to civgame.log ..."
msgstr ""
-#: client/climisc.c:936
+#: client/climisc.c:940
msgid "Export complete."
msgstr ""
-#: client/climisc.c:938
+#: client/climisc.c:942
msgid "Export failed, couldn't write to file."
msgstr ""
-#: client/climisc.c:1038
+#: client/climisc.c:1042
#, c-format
msgid "You don't buy %s in %s!"
msgstr ""
-#: client/climisc.c:1056
+#: client/climisc.c:1060
#, c-format
msgid "%s costs %d gold and you only have %d gold."
msgstr ""
@@ -7302,19 +7301,19 @@ msgid ""
"%d times"
msgstr ""
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1289
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
msgid "novice"
msgstr ""
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1289
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1358
msgid "easy"
msgstr ""
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1290
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
msgid "normal"
msgstr ""
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1290
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
msgid "hard"
msgstr ""
@@ -7343,38 +7342,41 @@ msgid "We probably couldn't start it from here."
msgstr ""
#: client/connectdlg_common.c:470
-msgid "We have control of the server (command access level hack)"
+msgid ""
+"Established control over the server. You have command access level 'hack'."
msgstr ""
#: client/connectdlg_common.c:475
-msgid "We can't take control of server, attempting to kill it."
+msgid ""
+"Failed to obtain the required access level to take control of the server. "
+"The server will now be shutdown."
msgstr ""
-#: client/control.c:1104
+#: client/control.c:1123
msgid "Only transporter units can be unloaded."
msgstr ""
-#: client/control.c:1353
+#: client/control.c:1425
msgid "Only settler units can be put into auto mode."
msgstr ""
-#: client/control.c:1444
+#: client/control.c:1516
msgid "Only nuclear units can do this."
msgstr ""
-#: client/control.c:1473
+#: client/control.c:1545
msgid "Only paratrooper units can do this."
msgstr ""
-#: client/control.c:1921
+#: client/control.c:2020
msgid "Too far for this unit."
msgstr ""
-#: client/control.c:2131 client/control.c:2161 client/control.c:2177
+#: client/control.c:2230 client/control.c:2260 client/control.c:2276
msgid "Didn't find a route to the destination!"
msgstr ""
-#: client/control.c:2221
+#: client/control.c:2320
msgid "Oh my! You seem to have no capital!"
msgstr ""
@@ -7442,16 +7444,16 @@ msgid "Allows %s (with %s)."
msgstr ""
#. TRANS: preserve single space at beginning
-#: client/helpdata.c:418
+#: client/helpdata.c:416
msgid " Rivers"
msgstr ""
-#: client/helpdata.c:576
+#: client/helpdata.c:574
#, c-format
msgid "Sorry, no help topic for %s.\n"
msgstr ""
-#: client/helpdata.c:580
+#: client/helpdata.c:578
#, c-format
msgid ""
"Sorry, no help topic for %s.\n"
@@ -7459,293 +7461,293 @@ msgid ""
"\n"
msgstr ""
-#: client/helpdata.c:670
+#: client/helpdata.c:668
msgid ""
"Requires: Nothing\n"
"\n"
msgstr ""
-#: client/helpdata.c:675
+#: client/helpdata.c:673
#, c-format
msgid "* The discovery of %s will make %s obsolete.\n"
msgstr ""
-#: client/helpdata.c:694
+#: client/helpdata.c:692
#, c-format
msgid "* Allows all players with knowledge of %s to build %s units.\n"
msgstr ""
-#: client/helpdata.c:706
+#: client/helpdata.c:704
#, c-format
msgid "* Allows %s (with %s).\n"
msgstr ""
-#: client/helpdata.c:710
+#: client/helpdata.c:708
#, c-format
msgid "* Allows %s.\n"
msgstr ""
-#: client/helpdata.c:780
+#: client/helpdata.c:778
#, c-format
msgid "* Can only be built if there is %s in the city.\n"
msgstr ""
-#: client/helpdata.c:786
+#: client/helpdata.c:784
#, c-format
msgid "* Can only be built with %s as government.\n"
msgstr ""
-#: client/helpdata.c:791
+#: client/helpdata.c:789
msgid "* May not be built in cities.\n"
msgstr ""
-#: client/helpdata.c:794
+#: client/helpdata.c:792
msgid "* Never has a home city.\n"
msgstr ""
-#: client/helpdata.c:797
+#: client/helpdata.c:795
msgid "* Losing this unit will lose you the game!\n"
msgstr ""
-#: client/helpdata.c:801
+#: client/helpdata.c:799
msgid "* Each player may only have one of this type of unit.\n"
msgstr ""
-#: client/helpdata.c:805
+#: client/helpdata.c:803
#, c-format
msgid "* Requires %d population to build.\n"
msgstr ""
-#: client/helpdata.c:811
+#: client/helpdata.c:809
#, c-format
msgid "* Can carry and refuel %d air unit.\n"
msgid_plural "* Can carry and refuel %d air units.\n"
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:816
+#: client/helpdata.c:814
#, c-format
msgid "* Can carry and refuel %d missile unit.\n"
msgid_plural "* Can carry and refuel %d missile units.\n"
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:821
+#: client/helpdata.c:819
#, c-format
msgid "* Can carry %d ground unit across water.\n"
msgid_plural "* Can carry %d ground units across water.\n"
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:830
+#: client/helpdata.c:828
msgid ""
"* Can establish trade routes (must travel to target city and must be at "
"least 9 tiles [in Manhattan distance] from this unit's home city).\n"
msgstr ""
-#: client/helpdata.c:836
+#: client/helpdata.c:834
#, c-format
msgid "* Can help build wonders (adds %d production).\n"
msgstr ""
-#: client/helpdata.c:840
+#: client/helpdata.c:838
msgid "* May not be disbanded.\n"
msgstr ""
-#: client/helpdata.c:842
+#: client/helpdata.c:840
#, c-format
msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
msgstr ""
-#: client/helpdata.c:846
+#: client/helpdata.c:844
msgid "* Can build new cities.\n"
msgstr ""
-#: client/helpdata.c:849
+#: client/helpdata.c:847
#, c-format
msgid "* Can add on %d population to cities of no more than size %d.\n"
msgstr ""
-#: client/helpdata.c:858
+#: client/helpdata.c:856
msgid "* Can build roads and railroads.\n"
msgstr "* Can build roads and railways.\n"
-#: client/helpdata.c:859
+#: client/helpdata.c:857
msgid "* Can build mines on tiles.\n"
msgstr ""
-#: client/helpdata.c:860
+#: client/helpdata.c:858
msgid "* Can build irrigation on tiles.\n"
msgstr ""
-#: client/helpdata.c:865
+#: client/helpdata.c:863
msgid "* Can build farmland.\n"
msgstr ""
-#: client/helpdata.c:869
+#: client/helpdata.c:867
#, c-format
msgid "* Can build farmland (if %s is known).\n"
msgstr ""
-#: client/helpdata.c:873
+#: client/helpdata.c:871
#, c-format
msgid "* Can build farmland (if any of the following are known: %s).\n"
msgstr ""
-#: client/helpdata.c:881
+#: client/helpdata.c:879
msgid "* Can build fortresses.\n"
msgstr ""
-#: client/helpdata.c:885
+#: client/helpdata.c:883
#, c-format
msgid "* Can build fortresses (if %s is known).\n"
msgstr ""
-#: client/helpdata.c:889
+#: client/helpdata.c:887
#, c-format
msgid "* Can build fortresses (if any of the following are known: %s).\n"
msgstr ""
-#: client/helpdata.c:895
+#: client/helpdata.c:893
msgid "* Can clean pollution from tiles.\n"
msgstr ""
-#: client/helpdata.c:896
+#: client/helpdata.c:894
msgid "* Can clean nuclear fallout from tiles.\n"
msgstr ""
-#: client/helpdata.c:899
+#: client/helpdata.c:897
msgid "* Can transform tiles.\n"
msgstr ""
-#: client/helpdata.c:902
+#: client/helpdata.c:900
msgid "* Can build airbases.\n"
msgstr ""
-#: client/helpdata.c:906
+#: client/helpdata.c:904
#, c-format
msgid "* May fortify, granting a 50%% defensive bonus.\n"
msgstr ""
-#: client/helpdata.c:909
+#: client/helpdata.c:907
msgid "* May pillage to destroy infrastructure from tiles.\n"
msgstr ""
-#: client/helpdata.c:913
+#: client/helpdata.c:911
msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
msgstr ""
-#: client/helpdata.c:916
+#: client/helpdata.c:914
msgid "* Can perform diplomatic actions.\n"
msgstr ""
-#: client/helpdata.c:920
+#: client/helpdata.c:918
msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
msgstr ""
-#: client/helpdata.c:923
+#: client/helpdata.c:921
msgid "* May not be bribed.\n"
msgstr ""
-#: client/helpdata.c:926
+#: client/helpdata.c:924
msgid "* Can attack enemy air units.\n"
msgstr ""
-#: client/helpdata.c:930
+#: client/helpdata.c:928
msgid "* Is invisible except when next to an enemy unit or city.\n"
msgstr ""
-#: client/helpdata.c:934
+#: client/helpdata.c:932
msgid "* Can only attack units on ocean squares (no land attacks).\n"
msgstr ""
-#: client/helpdata.c:938
+#: client/helpdata.c:936
msgid ""
"* Can attack from aboard sea units: against enemy cities and onto land "
"squares.\n"
msgstr ""
-#: client/helpdata.c:943
+#: client/helpdata.c:941
#, c-format
msgid "* Can be paradropped from a friendly city (Range: %d).\n"
msgstr ""
-#: client/helpdata.c:949
+#: client/helpdata.c:947
msgid "* Gets double defense against units specified as 'mounted'.\n"
msgstr ""
-#: client/helpdata.c:953
+#: client/helpdata.c:951
msgid "* Counts as 'mounted' against certain defenders.\n"
msgstr ""
-#: client/helpdata.c:957
+#: client/helpdata.c:955
msgid "* A missile unit: gets used up in making an attack.\n"
msgstr ""
-#: client/helpdata.c:960
+#: client/helpdata.c:958
msgid "* Making an attack ends this unit's turn.\n"
msgstr ""
-#: client/helpdata.c:964
+#: client/helpdata.c:962
msgid "* This unit's attack causes a nuclear explosion!\n"
msgstr ""
-#: client/helpdata.c:968
+#: client/helpdata.c:966
msgid "* Gets double firepower when attacking cities.\n"
msgstr ""
-#: client/helpdata.c:971
+#: client/helpdata.c:969
msgid "* Ignores the effects of city walls.\n"
msgstr ""
-#: client/helpdata.c:975
+#: client/helpdata.c:973
#, c-format
msgid ""
"* Does bombard attacks (%d per turn). These attacks will only damage (never "
"kill) the defender, but have no risk for the attacker.\n"
msgstr ""
-#: client/helpdata.c:982
+#: client/helpdata.c:980
msgid "* Gets quintuple defense against missiles and aircraft.\n"
msgstr "* Gets quintuple defence against missiles and aircraft.\n"
-#: client/helpdata.c:986
+#: client/helpdata.c:984
msgid "* Ignores terrain effects (treats all squares as roads).\n"
msgstr ""
-#: client/helpdata.c:989
+#: client/helpdata.c:987
msgid "* Ignores zones of control.\n"
msgstr ""
-#: client/helpdata.c:993
+#: client/helpdata.c:991
msgid "* A non-military unit (cannot attack; no martial law).\n"
msgstr ""
-#: client/helpdata.c:997
+#: client/helpdata.c:995
msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
msgstr ""
-#: client/helpdata.c:1000
+#: client/helpdata.c:998
msgid "* Will never achieve veteran status.\n"
msgstr ""
-#: client/helpdata.c:1002
+#: client/helpdata.c:1000
msgid "* May become veteran through training or combat.\n"
msgstr ""
-#: client/helpdata.c:1008
+#: client/helpdata.c:1006
#, c-format
msgid ""
"* Must end turn in a city or next to land, or has a 50%% risk of being lost "
"at sea.\n"
msgstr ""
-#: client/helpdata.c:1012
+#: client/helpdata.c:1010
#, c-format
msgid "* The discovery of %s reduces the risk to 25%%.\n"
msgstr ""
-#: client/helpdata.c:1017
+#: client/helpdata.c:1015
#, c-format
msgid "* %s reduces the risk to 12%%.\n"
msgstr ""
@@ -7754,115 +7756,115 @@ msgstr ""
#. * last two elements
#. TRANS: List of possible output types has this between
#. * last two elements
-#: client/helpdata.c:1068 client/helpdata.c:1402
+#: client/helpdata.c:1066 client/helpdata.c:1400
msgid " or "
msgstr ""
-#: client/helpdata.c:1070 client/helpdata.c:1390
+#: client/helpdata.c:1068 client/helpdata.c:1388
msgid "?or:, "
msgstr ""
-#: client/helpdata.c:1082
+#: 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"
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:1124
+#: client/helpdata.c:1122
#, c-format
msgid "If we would now start with %s we would need %d bulbs."
msgstr ""
-#: client/helpdata.c:1129
+#: client/helpdata.c:1127
#, 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:1137
+#: client/helpdata.c:1135
msgid "You cannot research this technology."
msgstr ""
-#: client/helpdata.c:1141
+#: client/helpdata.c:1139
msgid " This number may vary depending on what other players will research.\n"
msgstr ""
-#: client/helpdata.c:1153
+#: client/helpdata.c:1151
#, c-format
msgid "* The first player to research %s gets an immediate advance.\n"
msgstr ""
-#: client/helpdata.c:1158
+#: client/helpdata.c:1156
#, c-format
msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
msgstr ""
-#: client/helpdata.c:1161
+#: client/helpdata.c:1159
#, c-format
msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
msgstr ""
-#: client/helpdata.c:1165
+#: client/helpdata.c:1163
msgid "* Increases the pollution generated by the population.\n"
msgstr ""
-#: client/helpdata.c:1170
+#: client/helpdata.c:1168
#, c-format
msgid "* Allows %s to build roads on river squares.\n"
msgstr ""
-#: client/helpdata.c:1177
+#: client/helpdata.c:1175
#, c-format
msgid "* Allows %s to build fortresses.\n"
msgstr ""
-#: client/helpdata.c:1185
+#: client/helpdata.c:1183
#, c-format
msgid "* Allows %s to build airbases.\n"
msgstr ""
-#: client/helpdata.c:1194
+#: client/helpdata.c:1192
#, c-format
msgid "* Allows %s to upgrade roads to railroads.\n"
msgstr "* Allows %s to upgrade roads to railways.\n"
-#: client/helpdata.c:1202
+#: client/helpdata.c:1200
#, c-format
msgid "* Allows %s to upgrade irrigation to farmland.\n"
msgstr ""
-#: client/helpdata.c:1236
+#: client/helpdata.c:1234
msgid "* Pollution cannot be generated on this terrain."
msgstr ""
-#: client/helpdata.c:1241
+#: client/helpdata.c:1239
msgid "* You cannot build cities on this terrain."
msgstr ""
-#: client/helpdata.c:1247
+#: client/helpdata.c:1245
msgid "* The coastline of this terrain is unsafe."
msgstr ""
-#: client/helpdata.c:1252
+#: client/helpdata.c:1250
msgid "* This terrain is unsafe for units to travel on."
msgstr ""
-#: client/helpdata.c:1257
+#: client/helpdata.c:1255
msgid "* Land units cannot travel on oceanic terrains."
msgstr ""
-#: client/helpdata.c:1307
+#: client/helpdata.c:1305
msgid "Features:\n"
msgstr ""
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1413 client/helpdata.c:1414
+#: client/helpdata.c:1411 client/helpdata.c:1412
msgid "?outputlist: Nothing "
msgstr ""
-#: client/helpdata.c:1421
+#: client/helpdata.c:1419
#, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
@@ -7873,7 +7875,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:1431
+#: client/helpdata.c:1429
#, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -7881,48 +7883,48 @@ msgid ""
msgstr ""
#. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1439
+#: client/helpdata.c:1437
#, c-format
msgid "* You pay %d times normal %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1444
+#: client/helpdata.c:1442
#, 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:1449
+#: client/helpdata.c:1447
#, c-format
msgid "* You pay no %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1453
+#: client/helpdata.c:1451
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:1462
+#: client/helpdata.c:1460
#, 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:1470
+#: client/helpdata.c:1468
#, c-format
msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
msgstr ""
-#: client/helpdata.c:1477
+#: client/helpdata.c:1475
#, 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:1484
+#: client/helpdata.c:1482
#, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -7930,23 +7932,23 @@ msgid ""
msgstr ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1491
+#: client/helpdata.c:1489
#, 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:1499
+#: client/helpdata.c:1497
#, c-format
msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
msgstr ""
-#: client/helpdata.c:1504
+#: client/helpdata.c:1502
msgid "Has unlimited science/gold/luxuries rates.\n"
msgstr ""
-#: client/helpdata.c:1509
+#: client/helpdata.c:1507
#, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
@@ -7957,7 +7959,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:1521
+#: client/helpdata.c:1519
#, 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"
@@ -7965,60 +7967,60 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1532
+#: client/helpdata.c:1530
#, 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:1538
+#: client/helpdata.c:1536
msgid "* Your units cannot be bribed.\n"
msgstr ""
-#: client/helpdata.c:1541
+#: client/helpdata.c:1539
msgid "* Your cities cannot be incited.\n"
msgstr ""
-#: client/helpdata.c:1545
+#: client/helpdata.c:1543
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:1551
+#: client/helpdata.c:1549
msgid "* Has a senate that may prevent declaration of war.\n"
msgstr ""
-#: client/helpdata.c:1555
+#: client/helpdata.c:1553
msgid "* Allows partisans when cities are taken by the enemy.\n"
msgstr ""
-#: client/helpdata.c:1559
+#: client/helpdata.c:1557
msgid ""
"* Buildings that normally confer bonuses against unhappiness will instead "
"give gold.\n"
msgstr ""
-#: client/helpdata.c:1563
+#: client/helpdata.c:1561
msgid "* Pays no upkeep for fanatics.\n"
msgstr ""
-#: client/helpdata.c:1566
+#: client/helpdata.c:1564
msgid "* Has no unhappy citizens.\n"
msgstr ""
-#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
+#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
#, c-format
msgid "* Veteran %s units.\n"
msgstr ""
-#: client/helpdata.c:1587
+#: client/helpdata.c:1585
msgid "* Veteran units.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1593
+#: client/helpdata.c:1591
#, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8026,7 +8028,7 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1602
+#: client/helpdata.c:1600
#, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8034,194 +8036,194 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1610
+#: client/helpdata.c:1608
#, 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:1619
+#: client/helpdata.c:1617
#, c-format
msgid "* %s production is increased %d%%.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1627
+#: client/helpdata.c:1625
#, c-format
msgid "* %s production will suffer massive waste.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1632
+#: client/helpdata.c:1630
#, c-format
msgid "* %s production will suffer some waste.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1637
+#: client/helpdata.c:1635
#, 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:1645
+#: client/helpdata.c:1643
#, 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:1651
+#: client/helpdata.c:1649
#, 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:1657
+#: client/helpdata.c:1655
#, c-format
msgid "* %s waste will increase slowly with distance from capital.\n"
msgstr ""
-#: client/helpdata.c:1674
+#: client/helpdata.c:1672
#, c-format
msgid "* Allows you to build %s.\n"
msgstr ""
#. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1701
+#: client/helpdata.c:1699
#, c-format
msgid "%s%d %s"
msgstr ""
-#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1700 client/helpdata.c:1708 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:1709
+#: client/helpdata.c:1707
#, c-format
msgid "%s%d unhappy"
msgstr ""
-#: client/mapctrl_common.c:382
+#: client/mapctrl_common.c:399
#, c-format
msgid "You don't know how to build %s!"
msgstr ""
-#: client/mapctrl_common.c:392
+#: client/mapctrl_common.c:409
#, c-format
msgid "Copy %s to clipboard."
msgstr ""
-#: client/mapctrl_common.c:408
+#: client/mapctrl_common.c:425
msgid "Clipboard is empty."
msgstr ""
-#: client/options.c:98
+#: client/options.c:102
msgid "Graphics"
msgstr ""
-#: client/options.c:99
+#: client/options.c:103
msgid "Overview"
msgstr ""
-#: client/options.c:100
+#: client/options.c:104
msgid "Sound"
msgstr ""
-#: client/options.c:101
+#: client/options.c:105
msgid "Interface"
msgstr ""
-#: client/options.c:102
+#: client/options.c:106
msgid "Network"
msgstr ""
-#: client/options.c:107
+#: client/options.c:111
msgid "Login name"
msgstr ""
-#: client/options.c:108
+#: client/options.c:112
msgid ""
"This is the default login username that will be used in the connection "
"dialogs or with the -a command-line parameter."
msgstr ""
-#: client/options.c:113
+#: client/options.c:117
msgid "Server"
msgstr ""
-#: client/options.c:114
+#: client/options.c:118
msgid ""
"This is the default server hostname that will be used in the connection "
"dialogs or with the -a command-line parameter."
msgstr ""
-#: client/options.c:119
+#: client/options.c:123
msgid "Server port"
msgstr ""
-#: client/options.c:120
+#: client/options.c:124
msgid ""
"This is the default server port that will be used in the connection dialogs "
"or with the -a command-line parameter."
msgstr ""
-#: client/options.c:125 client/gui-win32/connectdlg.c:912 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
msgid "Metaserver"
msgstr ""
-#: client/options.c:126
+#: client/options.c:130
msgid ""
"The metaserver is a host that the client contacts to find out about games on "
"the internet. Don't change this from its default value unless you know what "
"you're doing."
msgstr ""
-#: client/options.c:132
+#: client/options.c:136
msgid "Soundset"
msgstr ""
-#: client/options.c:133
+#: client/options.c:137
msgid ""
"This is the soundset that will be used. Changing this is the same as using "
"the -S command-line parameter."
msgstr ""
-#: client/options.c:138
+#: client/options.c:142
msgid "Sound plugin"
msgstr ""
-#: client/options.c:139
+#: client/options.c:143
msgid ""
"If you have a problem with sound, try changing the sound plugin. The new "
"plugin won't take effect until you restart Freeciv. Changing this is the "
"same as using the -P command-line option."
msgstr ""
-#: client/options.c:144 client/gui-sdl/gui_main.c:162
+#: client/options.c:148 client/gui-sdl/gui_main.c:162
msgid "Theme"
msgstr ""
-#: client/options.c:145
+#: client/options.c:149
msgid "By changing this option you change the active theme."
msgstr ""
-#: client/options.c:148
+#: client/options.c:152
msgid "Tileset"
msgstr ""
-#: client/options.c:149
+#: client/options.c:153
msgid ""
"By changing this option you change the active tileset. This is the same as "
"using the -t command-line parameter."
msgstr ""
-#: client/options.c:156
+#: client/options.c:160
msgid "Solid unit background color"
msgstr "Solid unit background colour"
-#: client/options.c:157
+#: client/options.c:161
msgid ""
"Setting this option will cause units on the map view to be drawn with a "
"solid background color instead of the flag backdrop."
@@ -8229,32 +8231,32 @@ msgstr ""
"Setting this option will cause units on the map view to be drawn with a "
"solid background colour instead of the flag backdrop."
-#: client/options.c:161 client/gui-sdl/optiondlg.c:960
+#: client/options.c:165 client/gui-sdl/optiondlg.c:960
msgid "Sound bell at new turn"
msgstr ""
-#: client/options.c:162
+#: client/options.c:166
msgid ""
"Set this option to have a \"bell\" event be generated at the start of a new "
"turn. You can control the behavior of the \"bell\" event by editing the "
"message options."
msgstr ""
-#: client/options.c:168
+#: client/options.c:172
msgid "Unit movement animation time (milliseconds)"
msgstr ""
-#: client/options.c:169
+#: client/options.c:173
msgid ""
"This option controls how long unit \"animation\" takes when a unit moves on "
"the map view. Set it to 0 to disable animation entirely."
msgstr ""
-#: client/options.c:174
+#: client/options.c:178
msgid "Mapview recentering time (milliseconds)"
msgstr "Mapview recentring time (milliseconds)"
-#: client/options.c:175
+#: client/options.c:179
msgid ""
"When the map view is recentered, it will slide smoothly over the map to its "
"new position. This option controls how long this slide lasts. Set it to 0 "
@@ -8264,62 +8266,62 @@ msgstr ""
"new position. This option controls how long this slide lasts. Set it to 0 "
"to disable mapview sliding entirely."
-#: client/options.c:180 client/gui-sdl/optiondlg.c:1014
+#: client/options.c:184 client/gui-sdl/optiondlg.c:1014
msgid "Show combat animation"
msgstr ""
-#: client/options.c:181
+#: client/options.c:185
msgid ""
"Disabling this option will turn off combat animation between units on the "
"mapview."
msgstr ""
-#: client/options.c:184
+#: client/options.c:188
msgid "Draw the citybar"
msgstr ""
-#: client/options.c:185
+#: client/options.c:189
msgid ""
"Setting this option will display a 'citybar' containing useful information "
"beneath each city. Disabling this option will display only the city's name "
"and optionally, production."
msgstr ""
-#: client/options.c:191
+#: client/options.c:195
msgid "Show icons in the technology tree"
msgstr ""
-#: client/options.c:192
+#: client/options.c:196
msgid ""
"Setting this option will display icons on the technology tree diagram. "
"Turning this option off makes the technology tree more compact."
msgstr ""
-#: client/options.c:197
+#: client/options.c:201
msgid "Draw shield graphics for units"
msgstr ""
-#: client/options.c:198
+#: client/options.c:202
msgid ""
"Setting this option will draw a shield icon as the flags on units. If "
"unset, the full flag will be drawn."
msgstr ""
-#: client/options.c:202
+#: client/options.c:206
msgid "Manual Turn Done in AI Mode"
msgstr ""
-#: client/options.c:203
+#: client/options.c:207
msgid ""
"Disable this option if you do not want to press the Turn Done button "
"manually when watching an AI player."
msgstr ""
-#: client/options.c:207 client/gui-sdl/optiondlg.c:1121
+#: client/options.c:211 client/gui-sdl/optiondlg.c:1121
msgid "Auto Center on Units"
msgstr "Auto Centre on Units"
-#: client/options.c:208
+#: client/options.c:212
msgid ""
"Set this option to have the active unit centered automatically when the unit "
"focus changes."
@@ -8327,11 +8329,11 @@ msgstr ""
"Set this option to have the active unit centred automatically when the unit "
"focus changes."
-#: client/options.c:211 client/gui-sdl/optiondlg.c:1147
+#: client/options.c:215 client/gui-sdl/optiondlg.c:1147
msgid "Auto Center on Combat"
msgstr "Auto Centre on Combat"
-#: client/options.c:212
+#: client/options.c:216
msgid ""
"Set this option to have any combat be centered automatically. Disabled this "
"will speed up the time between turns but may cause you to miss combat "
@@ -8341,29 +8343,29 @@ msgstr ""
"will speed up the time between turns but may cause you to miss combat "
"entirely."
-#: client/options.c:217 client/gui-sdl/optiondlg.c:1174
+#: client/options.c:221 client/gui-sdl/optiondlg.c:1174
msgid "Focus on Awakened Units"
msgstr ""
-#: client/options.c:218
+#: client/options.c:222
msgid "Set this option to have newly awoken units be focused automatically."
msgstr ""
-#: client/options.c:221
+#: client/options.c:225
msgid "Allow goto into the unknown"
msgstr ""
-#: client/options.c:222
+#: client/options.c:226
msgid ""
"Setting this option will make the game consider moving into unknown tiles. "
"If not, then goto routes will detour around or be blocked by unknown tiles."
msgstr ""
-#: client/options.c:226
+#: client/options.c:230
msgid "Center map when Popup city"
msgstr "Centre map when Popup city"
-#: client/options.c:227
+#: client/options.c:231
msgid ""
"Setting this option makes the mapview center on a city when its city dialog "
"is popped up."
@@ -8371,113 +8373,159 @@ msgstr ""
"Setting this option makes the mapview centre on a city when its city dialog "
"is popped up."
-#: client/options.c:230
+#: client/options.c:234
msgid "Concise City Production"
msgstr ""
-#: client/options.c:231
+#: client/options.c:235
msgid ""
"Set this option to make the city production (as shown in the city dialog) to "
"be more compact."
msgstr ""
-#: client/options.c:234 client/gui-sdl/optiondlg.c:1252
+#: client/options.c:238 client/gui-sdl/optiondlg.c:1252
msgid "End Turn when done moving"
msgstr ""
-#: client/options.c:235
+#: client/options.c:239
msgid ""
"Setting this option makes your turn end automatically when all your units "
"are done moving."
msgstr ""
-#: client/options.c:238 client/gui-sdl/optiondlg.c:1226
+#: client/options.c:242 client/gui-sdl/optiondlg.c:1226
msgid "Prompt for city names"
msgstr ""
-#: client/options.c:239
+#: client/options.c:243
msgid ""
"Disabling this option will make the names of newly founded cities chosen "
"automatically by the server."
msgstr ""
-#: client/options.c:242 client/gui-sdl/optiondlg.c:1200
+#: client/options.c:246 client/gui-sdl/optiondlg.c:1200
msgid "Pop up city dialog for new cities"
msgstr ""
-#: client/options.c:243
+#: client/options.c:247
msgid ""
"Setting this option will pop up a newly-founded city's city dialog "
"automatically."
msgstr ""
-#: client/options.c:248
+#: client/options.c:250
+msgid "Pop up caravan actions"
+msgstr ""
+
+#: client/options.c:251
+msgid ""
+"If this option is enabled, when caravans arrive at a city where they can "
+"establish a traderoute or help build a wonder, a window will popup asking "
+"which action should be performed. Disabling this option means you will have "
+"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 ""
+
+#: client/options.c:260
+msgid "Enable cursor changing"
+msgstr ""
+
+#: client/options.c:261
+msgid ""
+"This option controls whether the client should try to change the mouse "
+"cursor depending on what is being pointed at, as well as to indicate changes "
+"in the client or server state."
+msgstr ""
+
+#: client/options.c:266
+msgid "Select cities before units"
+msgstr ""
+
+#: 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 ""
+
+#: client/options.c:272
+msgid "Clear unit orders on selection"
+msgstr ""
+
+#: client/options.c:273
+msgid ""
+"Enabling this option will cause unit orders to be cleared whenever one or "
+"more units are selected. If this option is disabled, selecting units will "
+"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 ""
+
+#: client/options.c:282
msgid "Background layer"
msgstr ""
-#: client/options.c:249
+#: client/options.c:283
msgid "The background layer of the overview shows just ocean and land."
msgstr ""
-#: client/options.c:252
+#: client/options.c:286
msgid "Terrain relief map layer"
msgstr ""
-#: client/options.c:253
+#: client/options.c:287
msgid "The relief layer shows all terrains on the map."
msgstr ""
-#: client/options.c:256
+#: client/options.c:290
msgid "Borders layer"
msgstr ""
-#: client/options.c:257
+#: client/options.c:291
msgid ""
"The borders layer of the overview shows which tiles are owned by each player."
msgstr ""
-#: client/options.c:261
+#: client/options.c:295
msgid "Units layer"
msgstr ""
-#: client/options.c:262
+#: client/options.c:296
msgid "Enabling this will draw units on the overview."
msgstr ""
-#: client/options.c:265
+#: client/options.c:299
msgid "Cities layer"
msgstr ""
-#: client/options.c:266
+#: client/options.c:300
msgid "Enabling this will draw cities on the overview."
msgstr ""
-#: client/options.c:269
+#: client/options.c:303
msgid "Overview fog of war"
msgstr ""
-#: client/options.c:270
+#: client/options.c:304
msgid "Enabling this will show fog of war on the overview."
msgstr ""
-#: client/options.c:488
+#: client/options.c:526
msgid "If you add a preset by hand, also update \"number_of_presets\""
msgstr ""
-#: client/options.c:516
+#: client/options.c:554
msgid "Cannot find your home directory"
msgstr ""
-#: client/options.c:665 client/options.c:796
+#: client/options.c:703 client/options.c:834
msgid "Save failed, cannot find a filename."
msgstr ""
-#: client/options.c:678 client/options.c:859
+#: client/options.c:716 client/options.c:897
#, c-format
msgid "Save failed, cannot write to file %s"
msgstr ""
-#: client/options.c:680 client/options.c:862
+#: client/options.c:718 client/options.c:900
#, c-format
msgid "Saved settings to file %s"
msgstr ""
@@ -8501,16 +8549,16 @@ msgstr ""
msgid "Start of turn %d"
msgstr ""
-#: client/packhand.c:1590
+#: client/packhand.c:1591
#, c-format
msgid "AI Mode is now %s."
msgstr ""
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "ON"
msgstr ""
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "OFF"
msgstr ""
@@ -8542,14 +8590,15 @@ msgid "Username"
msgstr ""
#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
-#: client/gui-gtk-2.0/pages.c:2085
+#: client/gui-gtk-2.0/pages.c:2157
msgid "Flag"
msgstr ""
#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
-#: client/gui-gtk-2.0/pages.c:1536 client/gui-gtk-2.0/pages.c:2087
-#: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
-#: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
+#: 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/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr ""
@@ -8561,7 +8610,7 @@ msgstr ""
msgid "Score"
msgstr ""
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
msgid "Team"
msgstr ""
@@ -8632,277 +8681,299 @@ msgstr ""
msgid "Could not open temp file."
msgstr ""
-#: client/servers.c:407
+#: client/servers.c:410
msgid "Invalid $http_proxy or metaserver value, must start with 'http://'"
msgstr ""
-#: client/servers.c:413
+#: client/servers.c:416
msgid "Failed looking up metaserver's host"
msgstr ""
-#: client/text.c:85 client/text.c:86 client/text.c:91
+#. TRANS: "AI <player name>"
+#: client/text.c:94
+#, c-format
+msgid "AI %s"
+msgstr ""
+
+#. TRANS: "<nation adjective>, team <team name>"
+#: client/text.c:118
+#, c-format
+msgid "%s, team %s"
+msgstr ""
+
+#: client/text.c:135 client/text.c:136 client/text.c:141
#: client/gui-sdl/mapview.c:752
msgid "?nation:Neutral"
msgstr ""
-#: client/text.c:85 client/gui-sdl/mapview.c:752
+#: client/text.c:135 client/gui-sdl/mapview.c:752
msgid "?nation:Hostile"
msgstr ""
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Peaceful"
msgstr ""
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Friendly"
msgstr ""
-#: client/text.c:88 client/gui-sdl/mapview.c:755
+#: client/text.c:138 client/gui-sdl/mapview.c:755
msgid "?nation:Mysterious"
msgstr ""
-#: client/text.c:88
+#: client/text.c:138
msgid "?nation:Friendly(team)"
msgstr ""
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
msgid "?city:Neutral"
msgstr ""
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
msgid "?city:Hostile"
msgstr ""
-#: client/text.c:92 client/gui-sdl/mapview.c:786
+#: client/text.c:142 client/gui-sdl/mapview.c:786
msgid "?city:Peaceful"
msgstr ""
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Friendly"
msgstr ""
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Mysterious"
msgstr ""
-#: client/text.c:93
+#: client/text.c:143
msgid "?city:Friendly(team)"
msgstr ""
-#: client/text.c:100
+#: client/text.c:151
#, c-format
msgid "Location: (%d, %d) [%d]"
msgstr ""
-#: client/text.c:109
+#: client/text.c:153
+#, c-format
+msgid "Native coordinates: (%d, %d)"
+msgstr ""
+
+#: client/text.c:160
#, c-format
msgid "Terrain: %s"
msgstr ""
-#: client/text.c:110
+#: client/text.c:161
#, c-format
msgid "Food/Prod/Trade: %s"
msgstr ""
-#: client/text.c:113
+#: client/text.c:164
msgid "Minor Tribe Village"
msgstr ""
-#: client/text.c:119
+#: client/text.c:173
msgid "Our territory"
msgstr ""
-#. TRANS: "Polish territory"
-#: client/text.c:122
+#. TRANS: "Territory of <username> (<nation + team>)"
+#: client/text.c:176
#, c-format
-msgid "%s territory"
+msgid "Territory of %s (%s)"
msgstr ""
-#. TRANS: "Polish territory (5 turn cease-fire)"
-#: client/text.c:131
+#: client/text.c:186
#, c-format
-msgid "%s territory (%d turn cease-fire)"
-msgid_plural "%s territory (%d turn cease-fire)"
+msgid "Territory of %s (%s) (%d turn cease-fire)"
+msgid_plural "Territory of %s (%s) (%d turn cease-fire)"
msgstr[0] ""
msgstr[1] ""
-#. TRANS: "Polish territory (friendly)"
-#: client/text.c:140
+#. TRANS: "Territory of <username>
+#. * (<nation + team> | <diplomatic state>)"
+#: client/text.c:195
#, c-format
-msgid "%s territory (%s)"
+msgid "Territory of %s (%s | %s)"
msgstr ""
-#: client/text.c:145
+#: client/text.c:200
msgid "Unclaimed territory"
msgstr ""
-#. TRANS: "City: Warsaw (Polish)"
-#: client/text.c:156
+#. TRANS: "City: <city name> | <username> (<nation + team>)"
+#: client/text.c:214
#, c-format
-msgid "City: %s (%s)"
+msgid "City: %s | %s (%s)"
msgstr ""
-#. TRANS: "City: Warsaw (Polish, 5 turn cease-fire)"
-#: client/text.c:166
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <number> turn cease-fire)"
+#: client/text.c:224
#, c-format
-msgid "City: %s (%s, %d turn cease-fire)"
-msgid_plural "City: %s (%s, %d turn cease-fire)"
+msgid "City: %s | %s (%s, %d turn cease-fire)"
+msgid_plural "City: %s | %s (%s, %d turn cease-fire)"
msgstr[0] ""
msgstr[1] ""
-#. TRANS: "City: Warsaw (Polish,friendly)"
-#: client/text.c:174
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <diplomatic state>)"
+#: client/text.c:231
#, c-format
-msgid "City: %s (%s, %s)"
+msgid "City: %s | %s (%s, %s)"
msgstr ""
#. TRANS: previous lines gave other information about the city.
-#: client/text.c:189
+#: client/text.c:246
#, c-format
msgid "?clistbegin: with %s"
msgstr "?clistbegin: with %s"
#. TRANS: "Trade from Warsaw: 5"
-#: client/text.c:202
+#: client/text.c:259
#, c-format
msgid "Trade from %s: %d"
msgstr ""
-#: client/text.c:210
+#: client/text.c:267
#, c-format
msgid "Infrastructure: %s"
msgstr ""
-#: client/text.c:215
+#: client/text.c:272
#, c-format
msgid "Activity: %s"
msgstr ""
-#. TRANS: "Unit: Musketeers (Polish, Warsaw)"
-#. TRANS: "Unit: Musketeers (Polish,friendly)"
-#: client/text.c:226 client/text.c:253
+#. TRANS: "Unit: <unit type> | <username>
+#. * (<nation + team>, <homecity>)"
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <diplomatic state>)"
+#: client/text.c:287 client/text.c:313
#, c-format
-msgid "Unit: %s (%s, %s)"
+msgid "Unit: %s | %s (%s, %s)"
msgstr ""
-#. TRANS: "Unit: Musketeers (Polish)"
-#: client/text.c:232
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>)"
+#: client/text.c:292
#, c-format
-msgid "Unit: %s (%s)"
+msgid "Unit: %s | %s (%s)"
msgstr ""
-#. TRANS: "Unit: Musketeers (Polish, 5 turn cease-fire)"
-#: client/text.c:245
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <number> turn cease-fire)"
+#: client/text.c:305
#, c-format
-msgid "Unit: %s (%s, %d turn cease-fire)"
-msgid_plural "Unit: %s (%s, %d turn cease-fire)"
+msgid "Unit: %s | %s (%s, %d turn cease-fire)"
+msgid_plural "Unit: %s | %s (%s, %d turn cease-fire)"
msgstr[0] ""
msgstr[1] ""
#. TRANS: "Chance to win: A:95% D:46%"
-#: client/text.c:279
+#: client/text.c:338
#, c-format
msgid "Chance to win: A:%d%% D:%d%%"
msgstr ""
#. TRANS: A is attack power, D is defense power, FP is firepower,
#. * HP is hitpoints (current and max).
-#: client/text.c:286
+#: client/text.c:345
#, c-format
msgid "A:%d D:%d FP:%d HP:%d/%d (%s)"
msgstr ""
#. TRANS: "5 more" units on this tile
-#: client/text.c:295
+#: client/text.c:354
#, c-format
msgid " (%d more)"
msgstr ""
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:364
+#: client/text.c:423
#, c-format
msgid "far from %s"
msgstr ""
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:367
+#: client/text.c:426
#, c-format
msgid "near %s"
msgstr ""
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:370
+#: client/text.c:429
#, c-format
msgid "in %s"
msgstr ""
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:403
+#: client/text.c:462
#, c-format
msgid "from %s"
msgstr ""
-#: client/text.c:466
+#: client/text.c:525
msgid "Progress: no research"
msgstr ""
-#: client/text.c:470
+#: client/text.c:529
msgid "Progress: no research target"
msgstr ""
-#: client/text.c:475
+#: client/text.c:534
#, c-format
msgid "Progress: %d turn/advance"
msgid_plural "Progress: %d turns/advance"
msgstr[0] ""
msgstr[1] ""
-#: client/text.c:480
+#: client/text.c:539
#, c-format
msgid "%d bulb/turn"
msgid_plural "%d bulbs/turn"
msgstr[0] ""
msgstr[1] ""
-#: client/text.c:485
+#: client/text.c:544
#, c-format
msgid ", %d bulb/turn from team"
msgid_plural ", %d bulbs/turn from team"
msgstr[0] ""
msgstr[1] ""
-#: client/text.c:512
+#: client/text.c:571
#, c-format
msgid "%d/- (never)"
msgstr ""
-#: client/text.c:524
+#: client/text.c:583
#, c-format
msgid "%d/%d (%d turn)"
msgid_plural "%d/%d (%d turns)"
msgstr[0] ""
msgstr[1] ""
-#: client/text.c:527
+#: client/text.c:586
#, c-format
msgid "%d/%d (never)"
msgstr ""
-#: client/text.c:564
+#: client/text.c:623
#, c-format
msgid "%d step"
msgid_plural "%d steps"
msgstr[0] ""
msgstr[1] ""
-#: client/text.c:566
+#: client/text.c:625
#, c-format
msgid "%d bulb"
msgid_plural "%d bulbs"
msgstr[0] ""
msgstr[1] ""
-#: client/text.c:570 client/agents/cma_fec.c:269 client/agents/cma_fec.c:313
+#: 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
#, c-format
msgid "%d turn"
@@ -8910,88 +8981,88 @@ msgid_plural "%d turns"
msgstr[0] ""
msgstr[1] ""
-#: client/text.c:592
+#: client/text.c:651
#, c-format
msgid "Population: %s"
msgstr ""
-#: client/text.c:595
+#: client/text.c:654
#, c-format
msgid "Year: %s (T%d)"
msgstr ""
-#: client/text.c:598
+#: client/text.c:657
#, c-format
msgid "Gold: %d (%+d)"
msgstr ""
-#: client/text.c:600
+#: client/text.c:659
#, c-format
msgid "Tax: %d Lux: %d Sci: %d"
msgstr ""
-#: client/text.c:607
+#: client/text.c:666
msgid "Moving: Nobody"
msgstr ""
-#: client/text.c:609
+#: client/text.c:668
#, c-format
msgid "Moving: %s"
msgstr ""
-#: client/text.c:613
+#: client/text.c:672
msgid "(Click for more info)"
msgstr ""
-#: client/text.c:629
+#: client/text.c:688
#, c-format
msgid "%s People"
msgstr ""
-#: client/text.c:633
+#: client/text.c:692
#, c-format
msgid "Turn: %d"
msgstr ""
-#: client/text.c:635 client/gui-win32/inteldlg.c:111
+#: client/text.c:694 client/gui-win32/inteldlg.c:111
#: client/gui-xaw/inteldlg.c:208
#, c-format
msgid "Gold: %d"
msgstr ""
-#: client/text.c:636
+#: client/text.c:695
#, c-format
msgid "Net Income: %d"
msgstr ""
#. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:639
+#: client/text.c:698
#, c-format
msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
msgstr ""
-#: client/text.c:643
+#: client/text.c:702
#, c-format
msgid "Researching %s: %s"
msgstr ""
-#: client/text.c:650
+#: client/text.c:709
#, c-format
msgid "Global warming chance: %d%% (%+d%%/turn)"
msgstr ""
-#: client/text.c:653
+#: client/text.c:712
#, c-format
msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
msgstr ""
-#: client/text.c:658 client/gui-win32/inteldlg.c:104
+#: client/text.c:717 client/gui-win32/inteldlg.c:104
#: client/gui-xaw/inteldlg.c:200
#, c-format
msgid "Government: %s"
msgstr ""
-#: client/text.c:682
+#: client/text.c:741
#, c-format
msgid "%d unit"
msgid_plural "%d units"
@@ -8999,55 +9070,55 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Impossible to reach goto target tile
-#: client/text.c:715 client/gui-sdl/mapview.c:566
+#: client/text.c:774 client/gui-sdl/mapview.c:566
msgid "?goto:Unreachable"
msgstr ""
-#: client/text.c:717 client/gui-sdl/mapview.c:568
+#: client/text.c:776 client/gui-sdl/mapview.c:568
#, c-format
msgid "Turns to target: %d"
msgstr ""
-#: client/text.c:719 client/gui-sdl/mapview.c:570
+#: client/text.c:778 client/gui-sdl/mapview.c:570
#, c-format
msgid "Turns to target: %d to %d"
msgstr ""
-#: client/text.c:725 client/gui-sdl/mapview.c:576
+#: client/text.c:784 client/gui-sdl/mapview.c:576
#, c-format
msgid "%d unit selected"
msgid_plural "%d units selected"
msgstr[0] ""
msgstr[1] ""
-#: client/text.c:730 client/gui-sdl/mapview.c:581
+#: client/text.c:789 client/gui-sdl/mapview.c:581
msgid "No units selected."
msgstr ""
-#: client/text.c:804 client/gui-sdl/mapview.c:654
+#: client/text.c:863 client/gui-sdl/mapview.c:654
#, c-format
msgid "Others: %d civil; %d military"
msgstr ""
-#: client/text.c:806 client/gui-sdl/mapview.c:656
+#: client/text.c:865 client/gui-sdl/mapview.c:656
#, c-format
msgid "Others: %d civilian"
msgstr ""
-#: client/text.c:808 client/gui-sdl/mapview.c:658
+#: client/text.c:867 client/gui-sdl/mapview.c:658
#, c-format
msgid "Others: %d military"
msgstr ""
-#: client/text.c:839
+#: client/text.c:898
msgid "No units to upgrade!"
msgstr ""
-#: client/text.c:864
+#: client/text.c:923
msgid "None of these units may be upgraded."
msgstr ""
-#: client/text.c:870
+#: client/text.c:929
#, c-format
msgid ""
"Upgrade %d unit for %d gold?\n"
@@ -9058,72 +9129,72 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: client/text.c:891
+#: client/text.c:950
msgid "Shows your progress in researching the current technology."
msgstr ""
-#: client/text.c:897
+#: client/text.c:956
msgid "no research target."
msgstr ""
#. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:900
+#: client/text.c:959
#, c-format
msgid "%s: %d/%d."
msgstr ""
-#: client/text.c:920
+#: client/text.c:979
msgid "Shows the progress of global warming:"
msgstr ""
-#: client/text.c:921
+#: client/text.c:980
#, c-format
msgid "Pollution rate: %d%%"
msgstr ""
-#: client/text.c:923
+#: client/text.c:982
#, c-format
msgid "Chance of catastrophic warming each turn: %d%%"
msgstr ""
-#: client/text.c:939
+#: client/text.c:998
msgid "Shows the progress of nuclear winter:"
msgstr ""
-#: client/text.c:940
+#: client/text.c:999
#, c-format
msgid "Fallout rate: %d%%"
msgstr ""
-#: client/text.c:942
+#: client/text.c:1001
#, c-format
msgid "Chance of catastrophic winter each turn: %d%%"
msgstr ""
-#: client/text.c:957
+#: client/text.c:1016
msgid "Shows your current government:"
msgstr ""
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:981
+#: client/text.c:1040
#, c-format
msgid "Population: %5d"
msgstr ""
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:1043
#, c-format
msgid "Support: %5d %%"
msgstr ""
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:1047
#, c-format
msgid "Energy: %5d %%"
msgstr ""
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:992
+#: client/text.c:1051
#, c-format
msgid "Mass: %5d ton"
msgid_plural "Mass: %5d tons"
@@ -9131,96 +9202,97 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1057
#, c-format
msgid "Travel time: %5.1f years"
msgstr ""
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1061
msgid "Travel time: N/A "
msgstr ""
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1065
#, c-format
msgid "Success prob.: %5d %%"
msgstr ""
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1010
+#: client/text.c:1069
#, c-format
msgid "Year of arrival: %8s"
msgstr ""
-#: client/text.c:1030
+#: client/text.c:1089
msgid "?timeout:off"
msgstr ""
-#: client/text.c:1054
+#: client/text.c:1113
#, c-format
msgid "?seconds:%02ds"
msgstr ""
-#: client/text.c:1056
+#: client/text.c:1115
#, c-format
msgid "?mins/secs:%02dm %02ds"
msgstr ""
-#: client/text.c:1058
+#: client/text.c:1117
#, c-format
msgid "?hrs/mns:%02dh %02dm"
msgstr ""
-#: client/text.c:1060
+#: client/text.c:1119
#, c-format
msgid "?dys/hrs:%02dd %02dh"
msgstr ""
-#: client/text.c:1063
+#: client/text.c:1122
msgid "?duration:overflow"
msgstr ""
-#: client/text.c:1084
+#: client/text.c:1143
#, c-format
msgid "%6d.%02d ms"
msgstr ""
-#. TRANS: "Republic of the Poles"
-#: client/text.c:1127
+#. TRANS: <nation adjective> <government name>.
+#. * E.g. "Polish Republic".
+#: client/text.c:1188
#, c-format
-msgid "%s of the %s"
+msgid "?nationgovernment:%s %s"
msgstr ""
#. TRANS: "Observer: 1985"
-#: client/text.c:1137
+#: client/text.c:1198
#, c-format
msgid "Observer: %s"
msgstr ""
-#: client/text.c:1155
+#: client/text.c:1216
msgid "Buildings: "
msgstr ""
-#: client/text.c:1172 client/text.c:1211
+#: client/text.c:1233 client/text.c:1272
msgid "None. "
msgstr ""
-#: client/text.c:1174 client/text.c:1213
+#: client/text.c:1235 client/text.c:1274
msgid "?clistend:."
msgstr "?clistend:."
-#: client/text.c:1192
+#: client/text.c:1253
msgid "Wonders: "
msgstr ""
-#: client/text.c:1247
+#: client/text.c:1308
#, c-format
msgid "Cities: %d total, %d over threshold of %d cities."
msgstr ""
#. TRANS: 0-21 content [citizen(s)] ...
-#: client/text.c:1251
+#: client/text.c:1312
#, c-format
msgid "%d content before penalty."
msgid_plural "%d content before penalty."
@@ -9228,45 +9300,40 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1257
+#: client/text.c:1318
#, c-format
msgid "%d additional unhappy citizen."
msgid_plural "%d additional unhappy citizens."
msgstr[0] ""
msgstr[1] ""
-#. TRANS: Martial law opening parenthesis
-#: client/text.c:1279
-msgid "Martial law in effect ("
+#: client/text.c:1339
+msgid "Unlimited martial law in effect."
msgstr ""
-#. TRANS: no [unit] maximum
-#: client/text.c:1284
-msgid "no maximum, "
-msgstr ""
-
-#: client/text.c:1287
+#: client/text.c:1341
#, c-format
-msgid "%d unit maximum, "
-msgid_plural "%d units maximum, "
+msgid "%d military unit may impose martial law."
+msgid_plural "Up to %d military units may impose martial law."
msgstr[0] ""
msgstr[1] ""
-#. TRANS: Martial law closing parenthesis
-#: client/text.c:1294
+#: client/text.c:1345
#, c-format
-msgid "%d per unit). "
-msgstr ""
+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:1298
+#: client/text.c:1352
msgid "Military units in the field may cause unhappiness. "
msgstr ""
-#: client/text.c:1301
+#: client/text.c:1355
msgid "Military units have no happiness effect. "
msgstr ""
-#: client/text.c:1316
+#: client/text.c:1370
#, c-format
msgid "Luxury: %d total."
msgstr ""
@@ -9286,7 +9353,7 @@ msgid ""
"instead."
msgstr ""
-#: client/tilespec.c:3968
+#: client/tilespec.c:3966
#, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
@@ -9307,12 +9374,12 @@ msgid ""
"have a look."
msgstr ""
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
-#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:599
+#: client/gui-gtk-2.0/cityrep.c:624 client/gui-sdl/citydlg.c:2009
msgid "none"
msgstr ""
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:645
msgid "custom"
msgstr ""
@@ -9599,7 +9666,7 @@ msgstr ""
msgid "Enter Marketplace"
msgstr ""
-#: client/gui-gtk-2.0/chatline.c:144 client/gui-win32/chatline.c:134
+#: client/gui-gtk-2.0/chatline.c:218 client/gui-win32/chatline.c:134
#: client/gui-xaw/chatline.c:120
msgid "Cleared output window."
msgstr ""
@@ -9680,11 +9747,11 @@ msgid "%d/%d %d turns"
msgstr ""
#: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:821
+#: client/gui-gtk-2.0/cityrep.c:1027
msgid "_Buy"
msgstr ""
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:869
msgid "_Production"
msgstr ""
@@ -9705,12 +9772,12 @@ msgid "Entertainers"
msgstr ""
#: client/gui-gtk-2.0/citydlg.c:1029 client/gui-win32/citydlg.c:1989
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2403
msgid "Scientists"
msgstr ""
#: client/gui-gtk-2.0/citydlg.c:1030 client/gui-win32/citydlg.c:1991
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2404
msgid "Taxmen"
msgstr ""
@@ -9803,7 +9870,7 @@ msgstr ""
msgid "Present units %d"
msgstr ""
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:1019
msgid "Cen_ter"
msgstr ""
@@ -9888,31 +9955,55 @@ msgstr ""
msgid "What should we rename the city to?"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:699
+#: client/gui-gtk-2.0/cityrep.c:794
+msgid "(no worklists defined)"
+msgstr ""
+
+#: client/gui-gtk-2.0/cityrep.c:876
msgid "Chan_ge"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:703
+#: client/gui-gtk-2.0/cityrep.c:880
msgid "Add _First"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:707
+#: client/gui-gtk-2.0/cityrep.c:884
msgid "Add _Next"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:711
+#: client/gui-gtk-2.0/cityrep.c:888
+msgid "Add _2nd Last"
+msgstr ""
+
+#: client/gui-gtk-2.0/cityrep.c:892
msgid "Add _Last"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:715
+#: client/gui-gtk-2.0/cityrep.c:899
+msgid "Set Worklist"
+msgstr ""
+
+#: client/gui-gtk-2.0/cityrep.c:905
+msgid "Append Worklist"
+msgstr ""
+
+#: client/gui-gtk-2.0/cityrep.c:911
+msgid "Clear _Worklist"
+msgstr ""
+
+#: client/gui-gtk-2.0/cityrep.c:916
+msgid "Gover_nor"
+msgstr ""
+
+#: client/gui-gtk-2.0/cityrep.c:921
msgid "_Select"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
+#: client/gui-gtk-2.0/cityrep.c:925 client/gui-gtk-2.0/plrdlg.c:521
msgid "_Display"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:800 client/gui-gtk-2.0/menu.c:808
+#: 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-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
#: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -9922,100 +10013,100 @@ msgstr ""
msgid "Cities"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:817
+#: client/gui-gtk-2.0/cityrep.c:1023
msgid "_Inspect"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
-#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-sdl/helpdlg.c:297 client/gui-win32/menu.c:342
-#: client/gui-xaw/menu.c:241
+#: 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
+#: client/gui-gtk-2.0/cityrep.c:1518 client/gui-gtk-2.0/menu.c:823
+#: client/gui-gtk-2.0/menu.c:825 client/gui-gtk-2.0/menu.c:827
+#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:831
+#: client/gui-gtk-2.0/menu.c:833 client/gui-sdl/helpdlg.c:297
+#: client/gui-win32/menu.c:342 client/gui-xaw/menu.c:241
msgid "Improvements"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
-#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
-#: client/gui-xaw/menu.c:247
+#: client/gui-gtk-2.0/cityrep.c:1441 client/gui-gtk-2.0/cityrep.c:1460
+#: client/gui-gtk-2.0/cityrep.c:1479 client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1522 client/gui-xaw/menu.c:247
msgid "Wonders"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1662 client/gui-win32/cityrep.c:439
#: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
msgid "All Cities"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1667 client/gui-win32/cityrep.c:440
msgid "No Cities"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1672 client/gui-win32/cityrep.c:441
msgid "Invert Selection"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:1420
+#: client/gui-gtk-2.0/cityrep.c:1682
msgid "Building Units"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:1426
+#: client/gui-gtk-2.0/cityrep.c:1688
msgid "Building Improvements"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:1432
+#: client/gui-gtk-2.0/cityrep.c:1694
msgid "Building Wonders"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:1444
+#: client/gui-gtk-2.0/cityrep.c:1706
msgid "Building Unit"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:1448
+#: client/gui-gtk-2.0/cityrep.c:1710
msgid "Building Improvement"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:1452
+#: client/gui-gtk-2.0/cityrep.c:1714
msgid "Building Wonder"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1722 client/gui-win32/cityrep.c:443
msgid "Coastal Cities"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1727 client/gui-win32/cityrep.c:444
msgid "Same Island"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1737 client/gui-win32/cityrep.c:447
msgid "Supported Units"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1740 client/gui-win32/cityrep.c:454
msgid "Units Present"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1744 client/gui-win32/cityrep.c:469
msgid "Improvements in City"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:1486
+#: client/gui-gtk-2.0/cityrep.c:1748
msgid "Wonders in City"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:1495
+#: client/gui-gtk-2.0/cityrep.c:1757
msgid "Available Units"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1760
msgid "Available Improvements"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:1501
+#: client/gui-gtk-2.0/cityrep.c:1763
msgid "Available Wonders"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:1625
+#: client/gui-gtk-2.0/cityrep.c:1882
#, c-format
msgid "Total Buy Cost: %d"
msgstr ""
@@ -10081,11 +10172,11 @@ msgstr ""
msgid "Remove this preset?"
msgstr ""
-#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:186
+#: client/gui-gtk-2.0/dialogs.c:196 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:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
msgid "Inspect _City"
msgstr ""
@@ -10113,10 +10204,10 @@ msgstr ""
msgid "Unit"
msgstr ""
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
-#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
-#: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
-#: manual/civmanual.c:302 data/Freeciv.in:80
+#: 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-win32/plrdlg.c:335 manual/civmanual.c:302 data/Freeciv.in:80
msgid "Name"
msgstr ""
@@ -10141,7 +10232,7 @@ 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:1036 data/Freeciv.in:3371
+#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
msgid "Pick Nation"
msgstr ""
@@ -10220,7 +10311,7 @@ msgstr ""
msgid "_Advances"
msgstr ""
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:910
+#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr ""
@@ -10325,108 +10416,177 @@ msgstr ""
msgid "Show _All Cities"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:150
+#: client/gui-gtk-2.0/gui_main.c:162
msgid "Show Map Scrollbars"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:151
+#: client/gui-gtk-2.0/gui_main.c:163
msgid "Disable this option to hide the scrollbars on the map view."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:155
+#: client/gui-gtk-2.0/gui_main.c:167
msgid "Keyboardless goto"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:156
+#: client/gui-gtk-2.0/gui_main.c:168
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:161
+#: client/gui-gtk-2.0/gui_main.c:173
msgid "Keep dialogs on top"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:174
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:166
+#: client/gui-gtk-2.0/gui_main.c:178
msgid "Show worklist task icons"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:179
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:171
+#: client/gui-gtk-2.0/gui_main.c:183
msgid "Enable status report tabs"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:172
+#: client/gui-gtk-2.0/gui_main.c:184
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:177 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:189 client/gui-win32/gui_main.c:110
msgid "Better fog-of-war drawing"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:178 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:190 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:277 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:195
+msgid "Show time for each chat message"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:196
+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
+msgid "Split bottom notebook area"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:202
+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
+msgid "New message events go to top of list"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:208
+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
+msgid "Show extra message window buttons"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:214
+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 "
+"is disabled, these buttons will not appear (you can still double-click with "
+"the left mouse button or right-click on a row to inspect or goto "
+"respectively). This option will only take effect once the message window is "
+"closed and reopened."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:224
+msgid "Metaserver tab first in network page"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:225
+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
+msgid "Plain chat messages are sent to allies only"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:231
+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 "
+"messages will be sent as public chat messages. To send a public chat message "
+"with this option enabled, prefix the message with a single colon ':'. This "
+"option can also be set using a toggle button beside the chat entry (only "
+"visible in multiplayer games)."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:340 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:723 client/gui-gtk-2.0/gui_main.c:1345
+#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
msgid "Freeciv"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1088 client/gui-gtk-2.0/gui_main.c:1095
+#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
#: 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:1095 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1232 client/gui-sdl/mapctrl.c:1566
#: client/gui-sdl/mapview.c:1082
msgid "Shift+Return"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1127 client/gui-gtk-2.0/menu.c:770
-#: client/gui-gtk-2.0/menu.c:772 client/gui-gtk-2.0/menu.c:774
-#: client/gui-gtk-2.0/menu.c:776 client/gui-gtk-2.0/menu.c:778
-#: client/gui-gtk-2.0/menu.c:780 client/gui-gtk-2.0/menu.c:782
-#: client/gui-gtk-2.0/menu.c:784 client/gui-gtk-2.0/menu.c:786
-#: client/gui-gtk-2.0/menu.c:788 client/gui-gtk-2.0/menu.c:790
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-gtk-2.0/menu.c:804 client/gui-gtk-2.0/menu.c:806
-#: client/gui-gtk-2.0/menu.c:808 client/gui-gtk-2.0/menu.c:810
-#: client/gui-gtk-2.0/menu.c:812 client/gui-gtk-2.0/menu.c:814
-#: client/gui-gtk-2.0/menu.c:816 client/gui-gtk-2.0/menu.c:818
-#: client/gui-gtk-2.0/menu.c:820 client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/gui_main.c:1266 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
+#: client/gui-gtk-2.0/menu.c:811 client/gui-gtk-2.0/menu.c:813
+#: client/gui-gtk-2.0/menu.c:815 client/gui-gtk-2.0/menu.c:817
+#: client/gui-gtk-2.0/menu.c:819 client/gui-gtk-2.0/menu.c:821
+#: client/gui-gtk-2.0/menu.c:823 client/gui-gtk-2.0/menu.c:825
+#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
+#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
+#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
+#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
+#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
+#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
#: data/Freeciv.in:2028
msgid "View"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1208
+#: client/gui-gtk-2.0/gui_main.c:1359
msgid "Chat"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1224 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1377 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"
@@ -10434,69 +10594,73 @@ msgid ""
"Now.. Go give'em hell!"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1491
+#: client/gui-gtk-2.0/gui_main.c:1392
+msgid "Allies Only"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:1657
msgid "Not _ready"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
+#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
msgid "_Ready"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2132
+#: 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
msgid "_Start"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1520
+#: client/gui-gtk-2.0/gui_main.c:1686
msgid "_Take Player"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
+#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
msgid "Pick _Nation"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
+#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
msgid "_Observe"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1532
+#: client/gui-gtk-2.0/gui_main.c:1698
msgid "Do not _observe"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
msgid "<AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1557
+#: client/gui-gtk-2.0/gui_main.c:1723
msgid "<Novice AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1560
+#: client/gui-gtk-2.0/gui_main.c:1726
msgid "<Easy AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1563
+#: client/gui-gtk-2.0/gui_main.c:1729
msgid "<Normal AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1732
msgid "<Hard AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1742 client/gui-win32/dialogs.c:594
#: client/gui-xaw/pages.c:217
msgid "Random"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
msgid "Observer"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
msgid "Detached"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1899
+#: client/gui-gtk-2.0/gui_main.c:2073
msgid "Are you sure you want to quit?"
msgstr ""
@@ -10726,466 +10890,500 @@ msgstr ""
msgid "Foreign Intelligence: %s Empire"
msgstr ""
-#: client/gui-gtk-2.0/mapctrl.c:195 client/gui-sdl/mapctrl.c:2565
+#: client/gui-gtk-2.0/mapctrl.c:179 client/gui-sdl/mapctrl.c:2565
#: client/gui-sdl/menu.c:839 client/gui-sdl/menu.c:1021
#: client/gui-win32/mapctrl.c:353
msgid "Build New City"
msgstr ""
-#: client/gui-gtk-2.0/mapctrl.c:196 client/gui-sdl/mapctrl.c:2594
+#: client/gui-gtk-2.0/mapctrl.c:180 client/gui-sdl/mapctrl.c:2594
#: client/gui-win32/mapctrl.c:354 client/gui-xaw/mapctrl.c:89
msgid "What should we call our new city?"
msgstr ""
-#: client/gui-gtk-2.0/mapview.c:147
+#: client/gui-gtk-2.0/mapview.c:158
msgid "Shows your current luxury/science/tax rates;click to toggle them."
msgstr ""
-#: client/gui-gtk-2.0/mapview.c:692 client/gui-win32/canvas.c:275
+#: client/gui-gtk-2.0/mapview.c:702 client/gui-win32/canvas.c:275
msgid "Better fog will only work in truecolor. Disabling it"
msgstr "Better fog will only work in truecoulor. Disabling it"
-#: client/gui-gtk-2.0/menu.c:250
+#: client/gui-gtk-2.0/menu.c:256
msgid "Leaving a local game will end it!"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:700 client/gui-win32/menu.c:303
+#: client/gui-gtk-2.0/menu.c:727 client/gui-win32/menu.c:303
msgid "_Game"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:702 client/gui-gtk-2.0/menu.c:704
-#: client/gui-gtk-2.0/menu.c:706 client/gui-gtk-2.0/menu.c:708
-#: client/gui-gtk-2.0/menu.c:710 client/gui-gtk-2.0/menu.c:712
-#: client/gui-gtk-2.0/menu.c:714 client/gui-gtk-2.0/menu.c:717
-#: client/gui-gtk-2.0/menu.c:720 client/gui-gtk-2.0/menu.c:722
-#: client/gui-gtk-2.0/menu.c:724 client/gui-gtk-2.0/menu.c:726
-#: client/gui-gtk-2.0/menu.c:728 client/gui-gtk-2.0/menu.c:730
-#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:736
-#: client/gui-gtk-2.0/menu.c:738 client/gui-gtk-2.0/menu.c:740
+#: client/gui-gtk-2.0/menu.c:729 client/gui-gtk-2.0/menu.c:731
+#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:735
+#: client/gui-gtk-2.0/menu.c:737 client/gui-gtk-2.0/menu.c:739
+#: client/gui-gtk-2.0/menu.c:741 client/gui-gtk-2.0/menu.c:744
+#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
+#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
+#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
+#: client/gui-gtk-2.0/menu.c:760 client/gui-gtk-2.0/menu.c:763
+#: client/gui-gtk-2.0/menu.c:765 client/gui-gtk-2.0/menu.c:767
#: data/Freeciv.in:2026
msgid "Game"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:704 client/gui-gtk-2.0/menu.c:706
-#: client/gui-gtk-2.0/menu.c:708
+#: client/gui-gtk-2.0/menu.c:731 client/gui-gtk-2.0/menu.c:733
+#: client/gui-gtk-2.0/menu.c:735
msgid "_Chat"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:706 client/gui-win32/menu.c:314
+#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:314
msgid "_Clear Log"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:708 client/gui-win32/menu.c:313
+#: client/gui-gtk-2.0/menu.c:735 client/gui-win32/menu.c:313
msgid "_Write Log"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:710 client/gui-win32/menu.c:304
+#: client/gui-gtk-2.0/menu.c:737 client/gui-win32/menu.c:304
msgid "Local _Options"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:712 client/gui-win32/menu.c:305
+#: client/gui-gtk-2.0/menu.c:739 client/gui-win32/menu.c:305
msgid "_Message Options"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:717
+#: client/gui-gtk-2.0/menu.c:744
msgid "_Reload Tileset"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:720
+#: client/gui-gtk-2.0/menu.c:747
msgid "Save Options on _Exit"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:722
+#: client/gui-gtk-2.0/menu.c:749
msgid "Sa_ve Options"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:726 client/gui-win32/menu.c:308
+#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:308
msgid "Server O_ptions"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:730 client/gui-win32/menu.c:310
+#: client/gui-gtk-2.0/menu.c:757 client/gui-win32/menu.c:310
msgid "_Save Game"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:311
+#: client/gui-gtk-2.0/menu.c:760 client/gui-win32/menu.c:311
msgid "Save Game _As..."
msgstr ""
-#: client/gui-gtk-2.0/menu.c:738
+#: client/gui-gtk-2.0/menu.c:765
msgid "_Leave"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:740 client/gui-win32/menu.c:317
+#: client/gui-gtk-2.0/menu.c:767 client/gui-win32/menu.c:317
msgid "_Quit"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:745 client/gui-win32/menu.c:321
+#: client/gui-gtk-2.0/menu.c:772 client/gui-win32/menu.c:321
msgid "Gov_ernment"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
-#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
-#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:774 client/gui-gtk-2.0/menu.c:776
+#: client/gui-gtk-2.0/menu.c:778 client/gui-gtk-2.0/menu.c:780
+#: client/gui-gtk-2.0/menu.c:782 client/gui-gtk-2.0/menu.c:784
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
#: client/gui-xaw/menu.c:248 data/Freeciv.in:2027 data/helpdata.txt:1320
msgid "Government"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:749 client/gui-win32/menu.c:322
+#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:322
msgid "_Tax Rates"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:324
+#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:324
msgid "_Find City"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:755 client/gui-win32/menu.c:325
+#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:325
msgid "_Worklists"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
-#: client/gui-gtk-2.0/menu.c:764 client/gui-win32/menu.c:327
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
+#: client/gui-gtk-2.0/menu.c:791 client/gui-win32/menu.c:327
msgid "_Change Government"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:788
msgid "_Revolution..."
msgstr ""
-#: client/gui-gtk-2.0/menu.c:764 client/gui-gtk-2.0/menu.c:970
+#: client/gui-gtk-2.0/menu.c:791 client/gui-gtk-2.0/menu.c:1013
#: client/gui-win32/menu.c:431
msgid "_Government"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:768 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:795 client/gui-gtk-2.0/menu.c:959
#: client/gui-win32/menu.c:334
msgid "_View"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:772
+#: client/gui-gtk-2.0/menu.c:799
msgid "City Outlines"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:774 client/gui-win32/menu.c:335
+#: client/gui-gtk-2.0/menu.c:801 client/gui-win32/menu.c:335
msgid "Map _Grid"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:336
+#: client/gui-gtk-2.0/menu.c:803 client/gui-win32/menu.c:336
msgid "National _Borders"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:778 client/gui-win32/menu.c:337
+#: client/gui-gtk-2.0/menu.c:805 client/gui-win32/menu.c:337
msgid "City _Names"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:338
+#: client/gui-gtk-2.0/menu.c:807 client/gui-win32/menu.c:338
msgid "City G_rowth"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:339
+#: client/gui-gtk-2.0/menu.c:809 client/gui-win32/menu.c:339
msgid "City _Productions"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:784 client/gui-sdl/optiondlg.c:1719
+#: client/gui-gtk-2.0/menu.c:811
+msgid "City Buy Cost"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:813
+msgid "City Traderoutes"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:815 client/gui-sdl/optiondlg.c:1719
msgid "Draw city worker map grid"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:788 client/gui-sdl/optiondlg.c:1635
+#: client/gui-gtk-2.0/menu.c:819 client/gui-sdl/optiondlg.c:1635
#: client/gui-win32/menu.c:340 client/gui-xaw/menu.c:148
#: client/gui-xaw/menu.c:246 manual/civmanual.c:220 data/helpdata.txt:1220
msgid "Terrain"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:790 client/gui-win32/menu.c:341
+#: client/gui-gtk-2.0/menu.c:821 client/gui-win32/menu.c:341
#: client/gui-xaw/menu.c:149
msgid "Coastline"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:796 client/gui-win32/menu.c:343
+#: client/gui-gtk-2.0/menu.c:827 client/gui-win32/menu.c:343
msgid "Roads & Rails"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:800 client/gui-sdl/optiondlg.c:1933
+#: client/gui-gtk-2.0/menu.c:831 client/gui-sdl/optiondlg.c:1933
#: client/gui-win32/menu.c:345 client/gui-xaw/menu.c:152
msgid "Mines"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:802 client/gui-win32/menu.c:346
+#: client/gui-gtk-2.0/menu.c:833 client/gui-win32/menu.c:346
msgid "Fortress & Airbase"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:804 client/gui-win32/menu.c:348
+#: client/gui-gtk-2.0/menu.c:835 client/gui-win32/menu.c:348
#: client/gui-xaw/menu.c:154
msgid "Specials"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:806 client/gui-win32/menu.c:349
+#: client/gui-gtk-2.0/menu.c:837 client/gui-win32/menu.c:349
#: client/gui-xaw/menu.c:155
msgid "Pollution & Fallout"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:812 client/gui-win32/menu.c:352
+#: client/gui-gtk-2.0/menu.c:843 client/gui-win32/menu.c:352
#: client/gui-xaw/menu.c:158
msgid "Focus Unit"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:814 client/gui-sdl/optiondlg.c:1854
+#: client/gui-gtk-2.0/menu.c:845 client/gui-sdl/optiondlg.c:1854
#: client/gui-win32/menu.c:353 client/gui-xaw/menu.c:159
msgid "Fog of War"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:818
+#: client/gui-gtk-2.0/menu.c:849
msgid "_Full Screen"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/menu.c:853
msgid "_Center View"
msgstr "_Centre View"
-#: client/gui-gtk-2.0/menu.c:825 client/gui-win32/menu.c:358
+#: client/gui-gtk-2.0/menu.c:856 client/gui-win32/menu.c:358
msgid "_Orders"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
-#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
-#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
-#: client/gui-gtk-2.0/menu.c:855 client/gui-gtk-2.0/menu.c:857
-#: client/gui-gtk-2.0/menu.c:859 client/gui-gtk-2.0/menu.c:861
-#: client/gui-gtk-2.0/menu.c:863 client/gui-gtk-2.0/menu.c:865
-#: client/gui-gtk-2.0/menu.c:867 client/gui-gtk-2.0/menu.c:869
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875 client/gui-gtk-2.0/menu.c:877
-#: client/gui-gtk-2.0/menu.c:879 client/gui-gtk-2.0/menu.c:881
-#: client/gui-gtk-2.0/menu.c:883 client/gui-gtk-2.0/menu.c:885
-#: client/gui-gtk-2.0/menu.c:887 client/gui-gtk-2.0/menu.c:889
-#: client/gui-gtk-2.0/menu.c:891 client/gui-gtk-2.0/menu.c:893
-#: client/gui-gtk-2.0/menu.c:895 client/gui-gtk-2.0/menu.c:897
-#: client/gui-gtk-2.0/menu.c:899 client/gui-gtk-2.0/menu.c:901
-#: client/gui-gtk-2.0/menu.c:903 data/Freeciv.in:2029
+#: client/gui-gtk-2.0/menu.c:858 client/gui-gtk-2.0/menu.c:860
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:864
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:868
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:872
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:876
+#: client/gui-gtk-2.0/menu.c:878 client/gui-gtk-2.0/menu.c:880
+#: client/gui-gtk-2.0/menu.c:882 client/gui-gtk-2.0/menu.c:884
+#: client/gui-gtk-2.0/menu.c:886 client/gui-gtk-2.0/menu.c:888
+#: client/gui-gtk-2.0/menu.c:890 client/gui-gtk-2.0/menu.c:892
+#: client/gui-gtk-2.0/menu.c:894 client/gui-gtk-2.0/menu.c:896
+#: client/gui-gtk-2.0/menu.c:898 client/gui-gtk-2.0/menu.c:900
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906 client/gui-gtk-2.0/menu.c:908
+#: client/gui-gtk-2.0/menu.c:910 client/gui-gtk-2.0/menu.c:912
+#: client/gui-gtk-2.0/menu.c:914 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:918 client/gui-gtk-2.0/menu.c:920
+#: client/gui-gtk-2.0/menu.c:922 client/gui-gtk-2.0/menu.c:924
+#: client/gui-gtk-2.0/menu.c:926 client/gui-gtk-2.0/menu.c:928
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
+#: client/gui-gtk-2.0/menu.c:946 data/Freeciv.in:2029
msgid "Orders"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:1444
+#: client/gui-gtk-2.0/menu.c:860 client/gui-gtk-2.0/menu.c:1489
#: client/gui-win32/menu.c:359
msgid "_Build City"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:1466
-#: client/gui-gtk-2.0/menu.c:1472 client/gui-win32/menu.c:360
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:1511
+#: client/gui-gtk-2.0/menu.c:1517 client/gui-win32/menu.c:360
msgid "Build _Road"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:833 client/gui-gtk-2.0/menu.c:1360
+#: 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 ""
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:1361
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:1406
#: client/gui-win32/menu.c:362
msgid "Build _Mine"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:837 client/gui-gtk-2.0/menu.c:1362
+#: client/gui-gtk-2.0/menu.c:868 client/gui-gtk-2.0/menu.c:1407
msgid "Transf_orm Terrain"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:1508
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:1553
#: client/gui-win32/menu.c:364
msgid "Build _Fortress"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:841 client/gui-win32/menu.c:365
+#: client/gui-gtk-2.0/menu.c:872 client/gui-win32/menu.c:365
msgid "Build Airbas_e"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:1514
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:1559
#: client/gui-win32/menu.c:366
msgid "Clean _Pollution"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:845 client/gui-win32/menu.c:367
+#: client/gui-gtk-2.0/menu.c:876 client/gui-win32/menu.c:367
msgid "Clean _Nuclear Fallout"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:849 client/gui-win32/menu.c:369
+#: client/gui-gtk-2.0/menu.c:880 client/gui-win32/menu.c:369
msgid "_Sentry"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:855 client/gui-win32/menu.c:372
+#: client/gui-gtk-2.0/menu.c:886 client/gui-win32/menu.c:372
msgid "Make _Homecity"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:857 client/gui-win32/menu.c:373
+#: client/gui-gtk-2.0/menu.c:888 client/gui-win32/menu.c:373
msgid "_Load"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:859
+#: client/gui-gtk-2.0/menu.c:890
msgid "_Unload Transporter"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:861 client/gui-win32/menu.c:374
+#: client/gui-gtk-2.0/menu.c:892 client/gui-win32/menu.c:374
msgid "_Unload"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:863 client/gui-win32/menu.c:375
+#: client/gui-gtk-2.0/menu.c:894 client/gui-win32/menu.c:375
msgid "Wake up o_thers"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:867
+#: client/gui-gtk-2.0/menu.c:898
msgid "_Auto Settler"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:869 client/gui-win32/menu.c:378
+#: client/gui-gtk-2.0/menu.c:900 client/gui-win32/menu.c:378
msgid "Auto E_xplore"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906
msgid "_Connect"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:871 client/gui-win32/menu.c:380
+#: client/gui-gtk-2.0/menu.c:902 client/gui-win32/menu.c:380
msgid "_Road"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:873 client/gui-win32/menu.c:381
+#: client/gui-gtk-2.0/menu.c:904 client/gui-win32/menu.c:381
msgid "Rai_l"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:875 client/gui-win32/menu.c:382
+#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:382
msgid "_Irrigate"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
msgid "Go _to"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
msgid "_Build city"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:879
+#: client/gui-gtk-2.0/menu.c:910
msgid "Patrol (_Q)"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:881 client/gui-win32/menu.c:385
+#: client/gui-gtk-2.0/menu.c:912 client/gui-win32/menu.c:385
msgid "_Go to"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:883
+#: client/gui-gtk-2.0/menu.c:914
msgid "Go\\/Airlift to City"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:885 client/gui-sdl/menu.c:450
+#: client/gui-gtk-2.0/menu.c:916 client/gui-sdl/menu.c:450
#: client/gui-win32/menu.c:387 client/gui-xaw/menu.c:203
msgid "Return to nearest city"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:889 client/gui-win32/menu.c:389
+#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:389
#: client/gui-xaw/menu.c:205
msgid "Disband Unit"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:891 client/gui-sdl/citydlg.c:532
+#: client/gui-gtk-2.0/menu.c:922 client/gui-sdl/citydlg.c:532
#: data/Freeciv.in:1186
msgid "Upgrade unit"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:893
+#: client/gui-gtk-2.0/menu.c:924
msgid "Diplomat\\/Spy Actions"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:895 client/gui-sdl/menu.c:399
+#: client/gui-gtk-2.0/menu.c:926 client/gui-sdl/menu.c:399
#: client/gui-win32/menu.c:391 client/gui-xaw/menu.c:209
msgid "Explode Nuclear"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:899
-msgid "Select same type"
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/cityrep.c:882
+msgid "Select"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:934
+msgid "Single"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:936
+msgid "Same Type On Tile"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:938
+msgid "All On Tile"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:940
+msgid "Same Type On Continent"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:942
+msgid "Same Type Everywhere"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:901 client/gui-win32/menu.c:393
+#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:393
msgid "_Wait"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:903 client/gui-win32/menu.c:394
+#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:394
#: client/gui-xaw/menu.c:213
msgid "Done"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:398
+#: client/gui-gtk-2.0/menu.c:949 client/gui-win32/menu.c:398
msgid "_Reports"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:908 client/gui-gtk-2.0/menu.c:910
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:914
-#: client/gui-gtk-2.0/menu.c:916 client/gui-gtk-2.0/menu.c:918
-#: client/gui-gtk-2.0/menu.c:920 client/gui-gtk-2.0/menu.c:922
-#: client/gui-gtk-2.0/menu.c:924 client/gui-gtk-2.0/menu.c:926
-#: client/gui-gtk-2.0/menu.c:928 client/gui-gtk-2.0/menu.c:930
-#: client/gui-gtk-2.0/menu.c:932 data/Freeciv.in:2030
+#: client/gui-gtk-2.0/menu.c:951 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:957
+#: client/gui-gtk-2.0/menu.c:959 client/gui-gtk-2.0/menu.c:961
+#: client/gui-gtk-2.0/menu.c:963 client/gui-gtk-2.0/menu.c:965
+#: client/gui-gtk-2.0/menu.c:967 client/gui-gtk-2.0/menu.c:969
+#: client/gui-gtk-2.0/menu.c:971 client/gui-gtk-2.0/menu.c:973
+#: client/gui-gtk-2.0/menu.c:975 data/Freeciv.in:2030
msgid "Reports"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:958
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:1001
#: client/gui-win32/menu.c:400 client/gui-win32/menu.c:425
msgid "_Units"
msgstr ""
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/menu.c:914 client/gui-win32/menu.c:402
+#: client/gui-gtk-2.0/menu.c:957 client/gui-win32/menu.c:402
msgid "_Nations"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:918 client/gui-win32/menu.c:403
+#: client/gui-gtk-2.0/menu.c:961 client/gui-win32/menu.c:403
msgid "_Economy"
msgstr ""
#. TRANS: Research report action
-#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:405
+#: client/gui-gtk-2.0/menu.c:963 client/gui-win32/menu.c:405
msgid "_Research"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:924 client/gui-win32/menu.c:407
+#: client/gui-gtk-2.0/menu.c:967 client/gui-win32/menu.c:407
msgid "_Wonders of the World"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:926 client/gui-win32/menu.c:408
+#: client/gui-gtk-2.0/menu.c:969 client/gui-win32/menu.c:408
msgid "_Top Five Cities"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:928 client/gui-win32/menu.c:409
+#: client/gui-gtk-2.0/menu.c:971 client/gui-win32/menu.c:409
msgid "_Messages"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:930 client/gui-win32/menu.c:410
+#: client/gui-gtk-2.0/menu.c:973 client/gui-win32/menu.c:410
msgid "_Demographics"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:932 client/gui-gtk-2.0/plrdlg.c:471
+#: client/gui-gtk-2.0/menu.c:975 client/gui-gtk-2.0/plrdlg.c:354
#: client/gui-win32/menu.c:411
msgid "_Spaceship"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:936 client/gui-win32/menu.c:415
+#: client/gui-gtk-2.0/menu.c:979 client/gui-win32/menu.c:415
msgid "_Help"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
-#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
-#: client/gui-gtk-2.0/menu.c:946 client/gui-gtk-2.0/menu.c:948
-#: client/gui-gtk-2.0/menu.c:950 client/gui-gtk-2.0/menu.c:952
-#: client/gui-gtk-2.0/menu.c:954 client/gui-gtk-2.0/menu.c:956
-#: client/gui-gtk-2.0/menu.c:958 client/gui-gtk-2.0/menu.c:960
-#: client/gui-gtk-2.0/menu.c:962 client/gui-gtk-2.0/menu.c:964
-#: client/gui-gtk-2.0/menu.c:966 client/gui-gtk-2.0/menu.c:968
-#: client/gui-gtk-2.0/menu.c:970 client/gui-gtk-2.0/menu.c:972
-#: client/gui-gtk-2.0/menu.c:974 client/gui-gtk-2.0/menu.c:976
-#: client/gui-gtk-2.0/menu.c:978 client/gui-gtk-2.0/menu.c:980
+#: client/gui-gtk-2.0/menu.c:981 client/gui-gtk-2.0/menu.c:983
+#: client/gui-gtk-2.0/menu.c:985 client/gui-gtk-2.0/menu.c:987
+#: client/gui-gtk-2.0/menu.c:989 client/gui-gtk-2.0/menu.c:991
+#: client/gui-gtk-2.0/menu.c:993 client/gui-gtk-2.0/menu.c:995
+#: client/gui-gtk-2.0/menu.c:997 client/gui-gtk-2.0/menu.c:999
+#: client/gui-gtk-2.0/menu.c:1001 client/gui-gtk-2.0/menu.c:1003
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-gtk-2.0/menu.c:1007
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-gtk-2.0/menu.c:1011
+#: client/gui-gtk-2.0/menu.c:1013 client/gui-gtk-2.0/menu.c:1015
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-gtk-2.0/menu.c:1019
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-gtk-2.0/menu.c:1023
#: client/gui-gtk-2.0/repodlgs.c:313 client/gui-win32/citydlg.c:1077
#: client/gui-win32/repodlgs.c:289 client/gui-win32/wldlg.c:846
#: data/Freeciv.in:1466 data/Freeciv.in:2031 data/Freeciv.in:2101
@@ -11193,119 +11391,119 @@ msgstr ""
msgid "Help"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:940 client/gui-win32/menu.c:416
+#: client/gui-gtk-2.0/menu.c:983 client/gui-win32/menu.c:416
msgid "Language_s"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/menu.c:417
+#: client/gui-gtk-2.0/menu.c:985 client/gui-win32/menu.c:417
msgid "Co_nnecting"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:418
+#: client/gui-gtk-2.0/menu.c:987 client/gui-win32/menu.c:418
msgid "C_ontrols"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:419
+#: client/gui-gtk-2.0/menu.c:989 client/gui-win32/menu.c:419
msgid "C_hatline"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:948 client/gui-win32/menu.c:420
+#: client/gui-gtk-2.0/menu.c:991 client/gui-win32/menu.c:420
msgid "_Worklist Editor"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:950 client/gui-win32/menu.c:421
+#: client/gui-gtk-2.0/menu.c:993 client/gui-win32/menu.c:421
msgid "Citizen _Management"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:952 client/gui-win32/menu.c:422
+#: client/gui-gtk-2.0/menu.c:995 client/gui-win32/menu.c:422
msgid "_Playing"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:956 client/gui-win32/menu.c:424
+#: client/gui-gtk-2.0/menu.c:999 client/gui-win32/menu.c:424
msgid "City _Improvements"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:960 client/gui-win32/menu.c:426
+#: client/gui-gtk-2.0/menu.c:1003 client/gui-win32/menu.c:426
msgid "Com_bat"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:962 client/gui-win32/menu.c:427
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-win32/menu.c:427
msgid "_ZOC"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:964 client/gui-win32/menu.c:428
+#: client/gui-gtk-2.0/menu.c:1007 client/gui-win32/menu.c:428
msgid "Techno_logy"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:966 client/gui-win32/menu.c:429
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-win32/menu.c:429
msgid "_Terrain"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:968 client/gui-win32/menu.c:430
+#: client/gui-gtk-2.0/menu.c:1011 client/gui-win32/menu.c:430
msgid "Won_ders"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:972 client/gui-win32/menu.c:432
+#: client/gui-gtk-2.0/menu.c:1015 client/gui-win32/menu.c:432
msgid "Happin_ess"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:974 client/gui-win32/menu.c:433
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-win32/menu.c:433
msgid "Space _Race"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:978 client/gui-win32/menu.c:435
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-win32/menu.c:435
msgid "_Copying"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:980 client/gui-win32/menu.c:436
+#: client/gui-gtk-2.0/menu.c:1023 client/gui-win32/menu.c:436
msgid "_About"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:1264
+#: client/gui-gtk-2.0/menu.c:1307
#, c-format
msgid "%s..."
msgstr ""
-#: client/gui-gtk-2.0/menu.c:1352
+#: client/gui-gtk-2.0/menu.c:1397
#, c-format
msgid "Change to %s (_I)"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:1353
+#: client/gui-gtk-2.0/menu.c:1398
#, c-format
msgid "Change to %s (_M)"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:1354
+#: client/gui-gtk-2.0/menu.c:1399
#, c-format
msgid "Transf_orm to %s"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:1427
+#: client/gui-gtk-2.0/menu.c:1472
msgid "Help _Build Wonder"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:1441
+#: client/gui-gtk-2.0/menu.c:1486
msgid "Add to City (_B)"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:1449
+#: client/gui-gtk-2.0/menu.c:1494
msgid "Make Trade _Route"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:1463
+#: client/gui-gtk-2.0/menu.c:1508
msgid "Build _Railroad"
msgstr "Build _Railway"
-#: client/gui-gtk-2.0/menu.c:1486
+#: client/gui-gtk-2.0/menu.c:1531
msgid "Bu_ild Farmland"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:1506
+#: client/gui-gtk-2.0/menu.c:1551
msgid "_Fortify"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:1512
+#: client/gui-gtk-2.0/menu.c:1557
msgid "_Paradrop"
msgstr ""
@@ -11337,13 +11535,29 @@ msgstr ""
msgid "Pop"
msgstr ""
-#: client/gui-gtk-2.0/messagewin.c:155 client/gui-sdl/messagewin.c:247
+#: client/gui-gtk-2.0/messagewin.c:186 client/gui-sdl/messagewin.c:247
#: client/gui-win32/messagewin.c:132 client/gui-xaw/menu.c:228
#: data/Freeciv.in:3273 data/Freeciv.in:3274 data/Freeciv.in:3283
msgid "Messages"
msgstr ""
-#: client/gui-gtk-2.0/plrdlg.c:330
+#: client/gui-gtk-2.0/plrdlg.c:317
+msgid "_Meet"
+msgstr ""
+
+#: client/gui-gtk-2.0/plrdlg.c:323
+msgid "Cancel _Treaty"
+msgstr ""
+
+#: client/gui-gtk-2.0/plrdlg.c:329
+msgid "_Withdraw Vision"
+msgstr ""
+
+#: client/gui-gtk-2.0/plrdlg.c:348
+msgid "_Report"
+msgstr ""
+
+#: client/gui-gtk-2.0/plrdlg.c:386
msgid "?show:Dead Players"
msgstr ""
@@ -11351,264 +11565,266 @@ msgstr ""
#. TRANS: Nations report action
#. TRANS: Nations report title
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/plrdlg.c:350 client/gui-sdl/mapctrl.c:1580
+#: client/gui-gtk-2.0/plrdlg.c:406 client/gui-sdl/mapctrl.c:1580
#: client/gui-sdl/plrdlg.c:608 client/gui-win32/plrdlg.c:344
#: client/gui-xaw/menu.c:221 data/Freeciv.in:3192 data/Freeciv.in:3193
msgid "Nations"
msgstr ""
-#: client/gui-gtk-2.0/plrdlg.c:443
-msgid "_Intelligence"
+#: client/gui-gtk-2.0/plrdlg.c:511
+msgid "Di_plomacy"
msgstr ""
-#: client/gui-gtk-2.0/plrdlg.c:450
-msgid "_Meet"
-msgstr ""
-
-#: client/gui-gtk-2.0/plrdlg.c:457
-msgid "Cancel _Treaty"
-msgstr ""
-
-#: client/gui-gtk-2.0/plrdlg.c:464
-msgid "_Withdraw vision"
+#: client/gui-gtk-2.0/plrdlg.c:516
+msgid "_Intelligence"
msgstr ""
-#: client/gui-gtk-2.0/plrdlg.c:495
+#: client/gui-gtk-2.0/plrdlg.c:526
msgid "_AI"
msgstr ""
-#: client/gui-gtk-2.0/plrdlg.c:501
+#: client/gui-gtk-2.0/plrdlg.c:532
msgid "_Toggle AI Mode"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:208
+#: client/gui-gtk-2.0/pages.c:221
msgid "Start _New Game"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:214
+#: client/gui-gtk-2.0/pages.c:227
msgid "Start _Scenario Game"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:220
+#: client/gui-gtk-2.0/pages.c:233
msgid "_Load Saved Game"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:229
+#: client/gui-gtk-2.0/pages.c:239
msgid "C_onnect to Network Game"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:236
+#: client/gui-gtk-2.0/pages.c:247
msgid "Connect to Gaming _Zone"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:300
#: client/gui-xaw/connectdlg.c:326
msgid "Passwords don't match, enter password."
msgstr ""
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:779 client/gui-gtk-2.0/pages.c:820
+#: client/gui-win32/connectdlg.c:916
msgid "Server Name"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
+#: 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
+#: data/Freeciv.in:96
msgid "Port"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
+#: client/gui-win32/connectdlg.c:917
msgid "Version"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
-#: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
+#: 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
msgid "Status"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
-#: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
+#: 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
msgid "Players"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
+#: client/gui-win32/connectdlg.c:918
msgid "Comment"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:747
+#: client/gui-gtk-2.0/pages.c:786
msgid "Local _Area Network"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:783
+#: client/gui-gtk-2.0/pages.c:827
msgid "Internet _Metaserver"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:817
+#: client/gui-gtk-2.0/pages.c:864
msgid "_Host:"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:834
+#: client/gui-gtk-2.0/pages.c:881
msgid "_Port:"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:851
+#: client/gui-gtk-2.0/pages.c:898
msgid "_Login:"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:869
+#: client/gui-gtk-2.0/pages.c:916
msgid "Pass_word:"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:887
+#: client/gui-gtk-2.0/pages.c:934
msgid "Conf_irm Password:"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:912
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: 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/wldlg.c:800 client/gui-win32/wldlg.c:806
+msgid "Type"
+msgstr ""
+
+#: client/gui-gtk-2.0/pages.c:952 client/gui-win32/plrdlg.c:337
+#: data/Freeciv.in:88
+msgid "Host"
+msgstr ""
+
+#: client/gui-gtk-2.0/pages.c:981
msgid "C_onnect"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1142
+#: client/gui-gtk-2.0/pages.c:1211
#, c-format
msgid "Connection name: %s"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1145
+#: client/gui-gtk-2.0/pages.c:1214
#, c-format
msgid "Player name: %s"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1150
+#: client/gui-gtk-2.0/pages.c:1219
#, c-format
msgid "Host: %s"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1158
+#: client/gui-gtk-2.0/pages.c:1227
msgid "Player/conn info"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1185
+#: client/gui-gtk-2.0/pages.c:1254
#, c-format
msgid "%s info"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1196
+#: client/gui-gtk-2.0/pages.c:1265
msgid "Toggle player ready"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1204
+#: client/gui-gtk-2.0/pages.c:1273
msgid "Pick nation"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1214
+#: client/gui-gtk-2.0/pages.c:1283
msgid "Observe this player"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1221
+#: client/gui-gtk-2.0/pages.c:1290
msgid "Take this player"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1238
+#: client/gui-gtk-2.0/pages.c:1307
msgid "Cut connection"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1248
+#: client/gui-gtk-2.0/pages.c:1317
msgid "Aitoggle player"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1257
+#: client/gui-gtk-2.0/pages.c:1326
msgid "Remove player"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1268
+#: client/gui-gtk-2.0/pages.c:1337
msgid "Give info access"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1276
+#: client/gui-gtk-2.0/pages.c:1345
msgid "Give ctrl access"
msgstr ""
#. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1338
+#: client/gui-gtk-2.0/pages.c:1407
#, c-format
msgid "Put on %s"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1442
+#: client/gui-gtk-2.0/pages.c:1511
msgid "Number of _Players (including AI):"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1465
+#: client/gui-gtk-2.0/pages.c:1534
msgid "AI Skill _Level:"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1481
+#: client/gui-gtk-2.0/pages.c:1550
msgid "Ruleset _Version:"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
msgid "_More Game Options..."
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1514
+#: client/gui-gtk-2.0/pages.c:1583
msgid "Record"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1519
+#: client/gui-gtk-2.0/pages.c:1588
msgid "Rating"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1525
+#: client/gui-gtk-2.0/pages.c:1594
msgid "Ready"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
-#: data/nation/slovakian.ruleset:26
-msgid "Leader"
+#: client/gui-gtk-2.0/pages.c:1601
+msgid "?player:Leader"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1732 client/gui-sdl/chatline.c:185
msgid "Choose Saved Game to Load"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1752
+#: client/gui-gtk-2.0/pages.c:1824
msgid "Choose Saved Game to _Load:"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
-#: client/gui-gtk-2.0/pages.c:2375
+#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
+#: client/gui-gtk-2.0/pages.c:2451
msgid "_Browse..."
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1839
+#: client/gui-gtk-2.0/pages.c:1911
msgid "Choose a Scenario"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1926
+#: client/gui-gtk-2.0/pages.c:1998
msgid "Choose a _Scenario:"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
-#: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
-#: client/gui-win32/wldlg.c:806
-msgid "Type"
-msgstr ""
-
-#: client/gui-gtk-2.0/pages.c:2101
+#: client/gui-gtk-2.0/pages.c:2173
msgid "Choose a _nation to play:"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2363 client/gui-win32/menu.c:581
msgid "Select Location to Save"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:2372 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2448 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:2413
+#: client/gui-gtk-2.0/pages.c:2489
msgid "Saved _Games:"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:2440
+#: client/gui-gtk-2.0/pages.c:2516
msgid "Save _Filename:"
msgstr ""
@@ -11939,7 +12155,7 @@ msgstr ""
msgid "Total users logged in : %d"
msgstr ""
-#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1094
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
msgid "Back"
msgstr ""
@@ -11948,7 +12164,7 @@ msgid "Start"
msgstr ""
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:775
+#: client/gui-win32/connectdlg.c:777
msgid "Load Game"
msgstr ""
@@ -11985,12 +12201,12 @@ msgid "Make new homecity"
msgstr ""
#: client/gui-sdl/citydlg.c:546 client/gui-sdl/citydlg.c:1418
-#: client/gui-sdl/connectdlg.c:307 client/gui-sdl/connectdlg.c:616
-#: client/gui-sdl/connectdlg.c:802 client/gui-sdl/connectdlg.c:984
+#: 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/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1039
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
#: 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
@@ -12033,7 +12249,7 @@ msgstr ""
#: client/gui-sdl/diplodlg.c:1335 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:2427
+#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
#: client/gui-xaw/cityrep.c:666 client/gui-xaw/cma_fe.c:327
#: client/gui-xaw/cma_fe.c:511 client/gui-xaw/cma_fe.c:765
#: client/gui-xaw/messagedlg.c:72 client/gui-xaw/optiondlg.c:76
@@ -12049,7 +12265,7 @@ msgstr ""
#: client/gui-sdl/diplodlg.c:1345 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:2427 client/gui-xaw/cityrep.c:666
+#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
#: client/gui-xaw/cma_fe.c:327 client/gui-xaw/cma_fe.c:511
#: client/gui-xaw/cma_fe.c:765 client/gui-xaw/messagedlg.c:72
#: client/gui-xaw/optiondlg.c:76 client/gui-xaw/optiondlg.c:304
@@ -12322,36 +12538,36 @@ msgstr ""
msgid "Release city"
msgstr ""
-#: client/gui-sdl/connectdlg.c:238
+#: client/gui-sdl/connectdlg.c:239
msgid "Creating Server List..."
msgstr ""
-#: client/gui-sdl/connectdlg.c:279 client/gui-sdl/connectdlg.c:343
+#: client/gui-sdl/connectdlg.c:280 client/gui-sdl/connectdlg.c:344
msgid "No LAN servers found"
msgstr ""
-#: client/gui-sdl/connectdlg.c:281 client/gui-sdl/connectdlg.c:345
+#: client/gui-sdl/connectdlg.c:282 client/gui-sdl/connectdlg.c:346
msgid "No public servers found"
msgstr ""
-#: client/gui-sdl/connectdlg.c:555
+#: client/gui-sdl/connectdlg.c:556
msgid "Player Name :"
msgstr ""
-#: client/gui-sdl/connectdlg.c:571
+#: client/gui-sdl/connectdlg.c:572
msgid "Freeciv Server :"
msgstr ""
-#: client/gui-sdl/connectdlg.c:588
+#: client/gui-sdl/connectdlg.c:589
msgid "Port :"
msgstr ""
-#: client/gui-sdl/connectdlg.c:608 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr ""
-#: client/gui-sdl/connectdlg.c:794 client/gui-sdl/connectdlg.c:977
+#: client/gui-sdl/connectdlg.c:795 client/gui-sdl/connectdlg.c:978
#: client/gui-xaw/connectdlg.c:145
msgid "Next"
msgstr ""
@@ -12628,7 +12844,7 @@ msgstr ""
#: client/gui-sdl/graphics.c:1021
#, c-format
-msgid "Unable to initialize SDL_ttf library: %s"
+msgid "Unable to initialize SDL_ttf library: %s"
msgstr ""
#: client/gui-sdl/graphics.c:1058
@@ -12713,12 +12929,6 @@ msgstr ""
msgid "Waiting for the beginning of the game"
msgstr ""
-#: client/gui-sdl/gui_string.c:608
-msgid ""
-"Couldn't find stdfont.ttf file. Please link/copy/move anyunicode ttf font to "
-"data dir as stdfont.ttf"
-msgstr ""
-
#. TRANS: Future Technology
#: client/gui-sdl/gui_tilespec.c:506
msgid "FT"
@@ -13278,12 +13488,12 @@ msgid "Leave Game"
msgstr ""
#: client/gui-sdl/optiondlg.c:2302 client/gui-sdl/pages.c:255
-#: client/gui-win32/connectdlg.c:1098 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1100 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:963
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
msgid "Start New Game"
msgstr ""
@@ -13391,8 +13601,8 @@ msgstr ""
msgid "%s max rate : %d%%"
msgstr ""
-#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1081
-#: client/gui-win32/connectdlg.c:1089 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
+#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
msgid "Update"
msgstr ""
@@ -13810,10 +14020,6 @@ msgstr ""
msgid "Refresh"
msgstr ""
-#: client/gui-win32/cityrep.c:882
-msgid "Select"
-msgstr ""
-
#: client/gui-win32/cityrep.c:883
msgid "Configure"
msgstr ""
@@ -13863,55 +14069,55 @@ msgstr ""
msgid "Verify Password"
msgstr ""
-#: client/gui-win32/connectdlg.c:912 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr ""
-#: client/gui-win32/connectdlg.c:913
+#: client/gui-win32/connectdlg.c:915
msgid "Local Area Network"
msgstr ""
-#: client/gui-win32/connectdlg.c:947
+#: client/gui-win32/connectdlg.c:949
msgid "Welcome to Freeciv"
msgstr ""
-#: client/gui-win32/connectdlg.c:965
+#: client/gui-win32/connectdlg.c:967
msgid "Load Saved Game"
msgstr ""
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
msgid "Connect To Network Game"
msgstr ""
-#: client/gui-win32/connectdlg.c:977
+#: client/gui-win32/connectdlg.c:979
msgid "Choose a nation to play"
msgstr ""
-#: client/gui-win32/connectdlg.c:1012
+#: client/gui-win32/connectdlg.c:1014
msgid "Number of players (Including AI):"
msgstr ""
-#: client/gui-win32/connectdlg.c:1020
+#: client/gui-win32/connectdlg.c:1022
msgid "AI skill level:"
msgstr ""
-#: client/gui-win32/connectdlg.c:1034 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
msgid "Game Options"
msgstr ""
-#: client/gui-win32/connectdlg.c:1038
+#: client/gui-win32/connectdlg.c:1040
msgid "Start Game"
msgstr ""
-#: client/gui-win32/connectdlg.c:1057
+#: client/gui-win32/connectdlg.c:1059
msgid "Login:"
msgstr ""
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
msgid "Host:"
msgstr ""
-#: client/gui-win32/connectdlg.c:1060
+#: client/gui-win32/connectdlg.c:1062
msgid "Port:"
msgstr ""
@@ -14159,10 +14365,6 @@ msgid_plural "(idle %d turns)"
msgstr[0] ""
msgstr[1] ""
-#: client/gui-win32/plrdlg.c:337 data/Freeciv.in:88
-msgid "Host"
-msgstr ""
-
#: client/gui-win32/plrdlg.c:355 data/Freeciv.in:3230
msgid "Intelligence"
msgstr ""
@@ -15666,12 +15868,12 @@ msgstr ""
#: data/helpdata.txt:781
msgid ""
-" To have a diplomatic relationship with another player, you must fist "
-"establish first contact with that player. To establish first contact, you "
-"have to move one of your units next to a city or unit belonging to that "
-"player, or vice versa. Unless you establish an embassy with that player, you "
-"may again lose contact with them after a set number of turns without direct "
-"physical contact."
+" To have a diplomatic relationship with another player, you must first "
+"establish contact with that player. To establish contact, you have to move "
+"one of your units next to a city or unit belonging to that player, or vice "
+"versa. Unless you establish an embassy with that player, you may again lose "
+"contact with them after a set number of turns without direct physical "
+"contact."
msgstr ""
#: data/helpdata.txt:788
@@ -17397,7 +17599,7 @@ msgstr ""
#: data/default/nations.ruleset:23
msgid "?nationgroup:Medieval"
-msgstr ""
+msgstr "Mediaeval"
#: data/default/nations.ruleset:26
msgid "?nationgroup:Modern"
@@ -17837,7 +18039,7 @@ msgid "Communism"
msgstr ""
#: data/default/governments.ruleset:121 data/civ2/governments.ruleset:118
-#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:26
+#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:27
msgid "Comrade"
msgstr ""
@@ -18735,6 +18937,10 @@ msgstr ""
"and a group of Settlers and/or Engineers is highly vulnerable to enemy "
"attacks."
+#: data/default/units.ruleset:238
+msgid "?unit:Workers"
+msgstr ""
+
#: data/default/units.ruleset:264
msgid ""
"Workers are one of the key units in the game. They can be used to irrigate "
@@ -19304,6 +19510,10 @@ msgstr ""
msgid "Explorers are very useful for mapping unknown territory."
msgstr ""
+#: data/default/units.ruleset:1864
+msgid "?unit:Leader"
+msgstr ""
+
#: data/default/units.ruleset:1892
msgid "This is you. If you lose this unit, you lose the game. So don't."
msgstr ""
@@ -19525,7 +19735,7 @@ msgid "Emir"
msgstr ""
#: data/nation/afghani.ruleset:25 data/nation/slovakian.ruleset:30
-#: data/nation/soviet.ruleset:27
+#: data/nation/soviet.ruleset:28
msgid "General Secretary"
msgstr ""
@@ -19640,7 +19850,7 @@ msgstr ""
msgid ""
"According to legend, the Armenian people are the descendants of Haik - the "
"great-great-grandson of Noah. The modern Republic of Armenia gained "
-"independence from Soviet in 1991 AD"
+"independence from the Soviet Union in 1991."
msgstr ""
#: data/nation/assyrian.ruleset:3
@@ -19711,6 +19921,8 @@ msgid ""
"Austria means Eastern Realm, given its position as the far east territory of "
"the medieval Holy Roman Empire."
msgstr ""
+"Austria means Eastern Realm, given its position as the far east territory of "
+"the mediaeval Holy Roman Empire."
#: data/nation/aztec.ruleset:3
msgid "Aztec"
@@ -20602,12 +20814,11 @@ msgstr ""
#: data/nation/illyrian.ruleset:6
msgid ""
-"Illyrians were Indo-European tribes who appeared in the western part of the "
-"Balkan Peninsula before 1000 BC, including the Dalmatians to the north, "
-"Corcyra island and Ambracia bay in prehistoric Epirus to the south, mixing "
-"with Thracians in Dardania to the east, and settling Messapia across the "
-"Adriatic Sea. Illyrian kingdoms were independent for centuries, until "
-"conquered by the Roman Republic."
+"Illyrians were Indo-European tribes who appeared in the western part of the "
+"Balkan Peninsula before 1000 BC, including Corcyra island and Ambracia bay "
+"in prehistoric Epirus to the south. They mixed with Thracians in Dardania to "
+"the east, and settled Messapia across the Adriatic Sea. Illyrian kingdoms "
+"were independent for centuries, until conquered by the Roman Republic."
msgstr ""
#: data/nation/inca.ruleset:3
@@ -20893,7 +21104,7 @@ msgid ""
"1953."
msgstr ""
-#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:28
+#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:29
msgid "Great Leader"
msgstr ""
@@ -21046,14 +21257,14 @@ msgstr ""
msgid "?plural:Malians"
msgstr ""
-# typo fix
#: 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 "
-"called the Sahelian kingdoms. Of these, the Islamic Mali empire with it's "
+"called the Sahelian kingdoms. Of these, the Islamic Mali empire with its "
"capital in Timbuktu was the most influential. This empire reigned from the "
-"14th to the 17th century and was famed for it's wealth and benevolent kings. "
+"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 ""
"Sub-Saharan Africa has been a cultural and ethnical melting pot for "
@@ -21119,8 +21330,8 @@ msgstr ""
#: data/nation/mayan.ruleset:6
msgid ""
-"The Mayans were a Mesoamerican civilization. Famous for building great "
-"pyramids and palaces in the jungle."
+"The Mayans were a Mesoamerican civilization. They are famous for building "
+"great pyramids and palaces in the jungle."
msgstr ""
#: data/nation/mayan.ruleset:19
@@ -21618,6 +21829,14 @@ msgid ""
"Czechoslovakia, until 1918 it was part of the Austro-Hungarian Empire."
msgstr ""
+#: data/nation/slovakian.ruleset:26
+msgid "?male:Leader"
+msgstr ""
+
+#: data/nation/slovakian.ruleset:26
+msgid "?female:Leader"
+msgstr ""
+
#: data/nation/slovakian.ruleset:29
msgid "Pope"
msgstr ""
@@ -21664,11 +21883,12 @@ msgstr ""
#: data/nation/soviet.ruleset:6
msgid ""
-"Soviet Union's history starts in November 1917, when under Lenin's "
+"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 "
-"republics integrated into one country. Soviet Union became one of most "
-"powerful states in the 20th century. But by the end of 1991 due to many "
-"social shocks it disintegrated into fifteen independent countries"
+"republics integrated into one country. The Soviet Union became one of most "
+"powerful states in the 20th century, but by the end of 1991 it had "
+"disintegrated into fifteen independent countries due to social and economic "
+"problems."
msgstr ""
#: data/nation/spanish.ruleset:3
@@ -22033,16 +22253,12 @@ msgstr ""
msgid "?plural:Westphalians"
msgstr ""
-# typo fix
#: data/nation/westphalian.ruleset:6
msgid ""
-"Westphalia, before becoming a Prussian province, was the western region the "
-"duchy of Saxony. Present-day it consists of the Northern part of the largest "
-"German federal state, North Rhine-Westphalia."
-msgstr ""
"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 "
+"the duchy of Saxony. Today it makes up the northern part of the largest "
"German federal state, North Rhine-Westphalia."
+msgstr ""
#: data/nation/zulu.ruleset:3
msgid "Zulu"
@@ -22185,7 +22401,7 @@ msgid ""
"The flag and background color indicate what civilization the city\n"
"belongs to (this will be useful when you meet other civilizations).\n"
"The top row of the bar also shows the name and size of the city, and\n"
-"will show one or more starts to indicate if there are units in the\n"
+"will show one or more stars to indicate if there are units in the\n"
"city. The bottom row shows what the city is building, and how long it\n"
"will take; it also shows how long the city will take to grow to the\n"
"next largest size."
@@ -22197,7 +22413,7 @@ msgstr ""
"The flag and background colour indicate what civilization the city\n"
"belongs to (this will be useful when you meet other civilizations).\n"
"The top row of the bar also shows the name and size of the city, and\n"
-"will show one or more starts to indicate if there are units in the\n"
+"will show one or more stars to indicate if there are units in the\n"
"city. The bottom row shows what the city is building, and how long it\n"
"will take; it also shows how long the city will take to grow to the\n"
"next largest size."
@@ -22267,7 +22483,7 @@ msgid ""
"Now your city has grown to size five. As cities get larger unrest\n"
"becomes a problem. A city of this size will usually have one unhappy\n"
"citizen unless pacifying effects are used; meaning one entertainer\n"
-"specialist is required to keep your citzens content. This is basically\n"
+"specialist is required to keep your citizens content. This is basically\n"
"a wasted citizen.\n"
"\n"
"There are several things that can be done about this. One quick fix\n"
@@ -22339,7 +22555,7 @@ msgid ""
"existing cities. Generally when building new cities you want to make\n"
"sure that all tiles are covered by at least one city, but after that\n"
"it is best that your cities overlap as little as possible. Spreading\n"
-"out cities properly gives each city access to more resrouces, allowing\n"
+"out cities properly gives each city access to more resources, allowing\n"
"them to grow to larger sizes."
msgstr ""
diff --git a/po/eo.gmo b/po/eo.gmo
index 992ffb8..36acecc 100644
Binary files a/po/eo.gmo and b/po/eo.gmo differ
diff --git a/po/eo.po b/po/eo.po
index 0544207..078ed23 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: 2008-12-01 07:45+0900\n"
+"POT-Creation-Date: 2009-03-29 21:13+0900\n"
"PO-Revision-Date: 2008-07-10 17:52+0200\n"
"Last-Translator: Antonio Codazzi <f_sophia at libero.it>\n"
"Language-Team: Esperanto <eo at li.org>\n"
@@ -727,7 +727,7 @@ msgid "Road"
msgstr "Vojo"
#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
-#: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
+#: client/gui-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"
@@ -744,7 +744,7 @@ msgid "Mine"
msgstr "Minejo"
#: common/terrain.c:396 common/unit.c:548 server/report.c:124
-#: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
+#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr "Poluado"
@@ -790,7 +790,7 @@ msgstr "Fortigita"
msgid "Sentry"
msgstr "Gardosoldato"
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:851 client/gui-sdl/menu.c:648
+#: common/unit.c:566 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"
@@ -807,7 +807,7 @@ msgstr "Esploru"
msgid "Transform"
msgstr "Transformu"
-#: common/unit.c:584 client/text.c:106 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:584 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"
@@ -876,11 +876,11 @@ msgstr "Atombomboj"
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1406
+#: common/unittype.c:349 client/helpdata.c:1404
msgid " and "
msgstr " kaj "
-#: common/unittype.c:355 client/helpdata.c:1392
+#: common/unittype.c:355 client/helpdata.c:1390
msgid "?and:, "
msgstr "?and:, "
@@ -1489,104 +1489,99 @@ msgstr ""
#: server/auth.c:281
#, c-format
-msgid "Auth config filename \"%s\" not allowed!"
-msgstr ""
-
-#: server/auth.c:286
-#, c-format
msgid "Cannot load auth config file \"%s\"!"
msgstr ""
-#: server/auth.c:397
+#: server/auth.c:392
#, c-format
msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
msgstr ""
-#: server/auth.c:404
+#: server/auth.c:399
msgid "Guests are not allowed on this server. Sorry."
msgstr ""
-#: server/auth.c:406
+#: server/auth.c:401
#, c-format
msgid "%s was rejected: Guests not allowed."
msgstr ""
-#: server/auth.c:425
+#: server/auth.c:420
#, c-format
msgid ""
"There was an error reading the user database, logging in as guest connection "
"'%s'."
msgstr ""
-#: server/auth.c:431
+#: server/auth.c:426
msgid ""
"There was an error reading the user database and guest logins are not "
"allowed. Sorry"
msgstr ""
-#: server/auth.c:434
+#: server/auth.c:429
#, c-format
msgid "%s was rejected: Database error and guests not allowed."
msgstr ""
-#: server/auth.c:441
+#: server/auth.c:436
#, c-format
msgid "Enter password for %s:"
msgstr "Enigu pasvorton por %s:"
-#: server/auth.c:450
+#: server/auth.c:445
msgid "Enter a new password (and remember it)."
msgstr "Enigu novan pasvorton (kaj memorigu Äin!)."
-#: server/auth.c:456
+#: server/auth.c:451
msgid "This server allows only preregistered users. Sorry."
msgstr ""
-#: server/auth.c:459
+#: server/auth.c:454
#, c-format
msgid "%s was rejected: Only preregister users allowed."
msgstr ""
-#: server/auth.c:488 server/auth.c:547
+#: server/auth.c:483 server/auth.c:542
msgid "Sorry, too many wrong tries..."
msgstr "BedaÅre, tro da eraraj provoj..."
-#: server/auth.c:489
+#: server/auth.c:484
#, c-format
msgid "%s was rejected: Too many wrong password verifies for new user."
msgstr ""
-#: server/auth.c:505
+#: server/auth.c:500
msgid ""
"Warning: There was an error in saving to the database. Continuing, but your "
"stats will not be saved."
msgstr ""
-#: server/auth.c:549
+#: server/auth.c:544
#, c-format
msgid "%s was rejected: Too many wrong password tries."
msgstr ""
-#: server/auth.c:558
+#: server/auth.c:553
msgid "Your password is incorrect. Try again."
msgstr "Via pasvorto ne estas Äusta. Provu denove."
-#: server/auth.c:569
+#: server/auth.c:564
msgid "Sorry, your connection timed out..."
msgstr ""
-#: server/auth.c:571
+#: server/auth.c:566
#, c-format
msgid "%s was rejected: Connection timeout waiting for password."
msgstr ""
-#: server/auth.c:636
+#: server/auth.c:631
#, c-format
msgid "Your password is too short, the minimum length is %d. Try again."
msgstr ""
"Via pasvorto estas tro mallonga, la minimuma longo estas %d. Provu denove."
-#: server/auth.c:642
+#: server/auth.c:637
#, c-format
msgid ""
"The password must have at least %d capital letters, %d numbers, and be at "
@@ -2099,7 +2094,7 @@ msgstr "Tiu ĉi estas la servilo por %s"
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:237 manual/civmanual.c:380
+#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
@@ -2124,12 +2119,12 @@ msgstr ""
msgid " -b --bind ADDR\tListen for clients on ADDR\n"
msgstr ""
-#: server/civserver.c:217 client/civclient.c:241
+#: server/civserver.c:217 client/civclient.c:242
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:245
+#: server/civserver.c:221 client/civclient.c:246
msgid " -d, --debug NUM\tSet debug log level (0 to 3)\n"
msgstr ""
@@ -2137,7 +2132,7 @@ msgstr ""
msgid " -f, --file FILE\tLoad saved game FILE\n"
msgstr ""
-#: server/civserver.c:225 client/civclient.c:248 manual/civmanual.c:382
+#: server/civserver.c:225 client/civclient.c:249 manual/civmanual.c:382
msgid " -h, --help\t\tPrint a summary of the options\n"
msgstr ""
@@ -2185,11 +2180,11 @@ msgstr ""
msgid " -R, --Ranklog FILE\tUse FILE as ranking logfile\n"
msgstr ""
-#: server/civserver.c:247 client/civclient.c:267 manual/civmanual.c:383
+#: server/civserver.c:247 client/civclient.c:268 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:279
+#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, fuzzy, c-format
@@ -3339,7 +3334,7 @@ msgstr "%s kaÅzis diplomatan incidenton dum instigado al ribelo en %s."
msgid "Sea moving start units are not yet supported. Nobody gets %s."
msgstr "Marmovado por unuoj ne estas ankoraÅ disponebla. Neniu havas %sn."
-#: server/gamehand.c:310 client/text.c:632
+#: server/gamehand.c:310 client/text.c:691
#, c-format
msgid "Year: %s"
msgstr "Jaro: %s"
@@ -3623,8 +3618,8 @@ msgstr ""
#: server/plrhand.c:1686
#, fuzzy, c-format
msgid ""
-"Your nation is thrust into civil war, %s is declared the leader of the "
-"rebel states."
+"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
@@ -3727,7 +3722,7 @@ msgstr "Rapideco de la studado"
msgid "Literacy"
msgstr "AlfabetiÄo"
-#: server/report.c:121 client/cityrepdata.c:526 client/cityrepdata.c:527
+#: server/report.c:121 client/cityrepdata.c:524 client/cityrepdata.c:525
#: client/gui-sdl/cityrep.c:174
msgid "Production"
msgstr "Produktado"
@@ -3884,7 +3879,7 @@ msgstr "a"
msgid "Demography string contains invalid characters. Try \"help demography\"."
msgstr ""
-#: server/report.c:743 server/report.c:766
+#: server/report.c:743 server/report.c:768
msgid "Demographics Report:"
msgstr "Demografia raporto:"
@@ -3892,10 +3887,12 @@ msgstr "Demografia raporto:"
msgid "Sorry, the Demographics report is unavailable."
msgstr "BedaÅrinde, la demografia raporto ne estas disponebla."
-#: server/report.c:748
-#, c-format
-msgid "The %s of the %s (%s)"
-msgstr "La %s de la %s (%s)"
+#. TRANS: <nation adjective> <government name> (<year>).
+#. * E.g. "Polish Despotism (200 AD)".
+#: server/report.c:750
+#, fuzzy, c-format
+msgid "%s %s (%s)"
+msgstr "%s en %s (%s)\n"
#. TRANS: message about an installation error.
#: server/ruleset.c:163
@@ -3950,16 +3947,6 @@ msgstr ""
msgid "%s had invalid nation; changing to %s."
msgstr "%s havas nevalidan nacion; ÅanÄante al %s."
-#. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4073
-#, c-format
-msgid ""
-"Illegal alliance structure detected: %s alliance to %s reduced to peace "
-"treaty."
-msgstr ""
-"Estis trovita nevalida strukturo de alianco: la alianco inter %s kaj %s "
-"reduktiÄis al packontrakto."
-
#: server/settings.c:32
msgid "Geological"
msgstr "Geologia"
@@ -5009,8 +4996,8 @@ msgstr "AntaÅmetaĵo por la nomoj de la aÅtomata konservado"
#: server/settings.c:1016
msgid ""
-"Automatically saved games will have name \"<prefix><year>.sav\". This "
-"setting sets the <prefix> part."
+"Automatically saved games will have name \"<prefix>-T<turn>-Y<year>.sav\". "
+"This setting sets the <prefix> part."
msgstr ""
#: server/settings.c:1023
@@ -5024,11 +5011,11 @@ msgid ""
"the game."
msgstr ""
-#: server/sernet.c:147
+#: server/sernet.c:150
msgid "Server cannot read standard input. Ignoring input."
msgstr ""
-#: server/sernet.c:922
+#: server/sernet.c:929
#, c-format
msgid "Server: bad address: [%s:%d]."
msgstr ""
@@ -5151,113 +5138,113 @@ msgstr ""
"La pafĉesigo inter %s kaj %s finis. Ili estas militantaj. Vi nuligas vian "
"aliancon kun ambaÅ ili."
-#: server/srv_main.c:928
+#: server/srv_main.c:961
#, c-format
msgid "Failed saving game as %s"
msgstr "Malsukcesis la konservado de la ludo kiel %s"
-#: server/srv_main.c:930
+#: server/srv_main.c:963
#, c-format
msgid "Game saved as %s"
msgstr "La ludo estas konservita kiel %s"
-#: server/srv_main.c:962
+#: server/srv_main.c:994
msgid "The game is already running."
msgstr "La ludo estas jam plenumanta."
-#: server/srv_main.c:970
+#: server/srv_main.c:1002
#, c-format
msgid "%s lost control cmdlevel on game start. Use voting from now on."
msgstr ""
-#: server/srv_main.c:977
+#: server/srv_main.c:1009
msgid "Starting game."
msgstr "Komenco de la ludo."
-#: server/srv_main.c:1039
+#: server/srv_main.c:1071
#, c-format
msgid "request for unknown report (type %d)"
msgstr "mendo pri nekonata raporto (speco %d)"
-#: server/srv_main.c:1104
+#: server/srv_main.c:1136
#, c-format
msgid "Warning: rejecting old client %s"
msgstr "Atentu: malnova kliento %s estas rifuzita"
-#: server/srv_main.c:1206
+#: server/srv_main.c:1238
#, 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:1306
+#: server/srv_main.c:1338
msgid "Please choose a non-blank name."
msgstr "Bonvolu ne elekti nulan nomon."
-#: server/srv_main.c:1322
+#: server/srv_main.c:1354
msgid "That nation is already in use."
msgstr "Tiu nacio estas jam uzata."
-#: server/srv_main.c:1338
+#: server/srv_main.c:1370
#, 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:1359
+#: server/srv_main.c:1391
msgid "Please choose a name containing only ASCII characters."
msgstr "Bonvolu elekti nomon kiu entenas nur ASCII literojn."
-#: server/srv_main.c:1458
+#: server/srv_main.c:1490
#, 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:1464
+#: server/srv_main.c:1496
#, c-format
msgid "%s nation is already in use."
msgstr "%s nacio estas jam uzata."
-#: server/srv_main.c:1482
+#: server/srv_main.c:1514
#, c-format
msgid "%s is the %s ruler %s."
msgstr "%s estas la %s estro %s."
-#: server/srv_main.c:1538
+#: server/srv_main.c:1570
#, 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:1582 server/srv_main.c:1586
+#: server/srv_main.c:1614 server/srv_main.c:1618
#, 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:1728
+#: server/srv_main.c:1760
#, c-format
msgid "Player %d"
msgstr "Ludanto %d"
-#: server/srv_main.c:1739 server/srv_main.c:1745
+#: server/srv_main.c:1771 server/srv_main.c:1777
#, c-format
msgid "%s rules the %s."
msgstr "%s estas la %s."
-#: server/srv_main.c:1910
+#: server/srv_main.c:1942
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
msgstr ""
-#: server/srv_main.c:1961
+#: server/srv_main.c:1993
#, c-format
msgid "Sending info to metaserver [%s]"
msgstr "Sendante informojn al la metaservilo [%s]"
-#: server/srv_main.c:1992
+#: server/srv_main.c:2024
msgid "The game is over..."
msgstr "La ludo estas finita..."
-#: server/srv_main.c:2205
+#: server/srv_main.c:2237
msgid "Now accepting new client connections."
msgstr "Nun novaj konektoj de klientoj estas akcepteblaj."
@@ -6073,24 +6060,24 @@ msgid "Barbarian"
msgstr "Barbara"
#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2030 client/gui-sdl/plrdlg.c:645
+#: client/gui-gtk-2.0/pages.c:2102 client/gui-sdl/plrdlg.c:645
#: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
msgid "AI"
msgstr "AI"
#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
+#: 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
msgid "Human"
msgstr "Homo"
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
-#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
+#: 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
msgid "Alive"
msgstr "Aktiva"
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
#: client/gui-win32/connectdlg.c:200
msgid "Dead"
msgstr "Malaktiva"
@@ -6341,9 +6328,9 @@ 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:242
-#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
-#: client/text.c:1201
+#: 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
#, c-format
msgid "?clistmore:, %s"
msgstr "?clistmore:, %s"
@@ -6595,7 +6582,7 @@ msgstr "Nur la %s kapablas ataki de la maro."
msgid "Cannot attack from sea."
msgstr "Estas neeble ataki de la maro."
-#: server/unithand.c:996 server/unittools.c:2103
+#: server/unithand.c:996 server/unittools.c:2137
msgid "Cannot attack unless you declare war first."
msgstr "Vi ne povas ataki sen militdeklari antaÅe."
@@ -6698,82 +6685,83 @@ msgid "%s was upgraded for free to %s."
msgstr "%s estas senpage Äisdatigitaj al %s."
#: server/unittools.c:297
-#, c-format
-msgid "Not enough gold. %s disbanded"
+#, fuzzy, c-format
+msgid "Not enough gold to pay upkeep for %s. Unit disbanded."
msgstr "Oro estas nesufiĉa. %s estas dissolvitaj"
-#: server/unittools.c:342
+#: server/unittools.c:343
#, c-format
msgid "Your %s has run out of hit points."
msgstr "Viaj %s finis la vivo-poentojn."
-#: server/unittools.c:358
+#: server/unittools.c:359
#, fuzzy, c-format
msgid "Your %s has been lost on the high seas."
msgstr "Viaj %s finis la vivo-poentojn."
-#: server/unittools.c:365
+#: server/unittools.c:366
#, fuzzy, c-format
msgid "Your %s survived on the high seas and became more experienced!"
msgstr "Viaj %s iÄis pli spertaj!"
-#: server/unittools.c:376
+#: server/unittools.c:377
#, fuzzy, c-format
msgid "Your %s has been lost on unsafe terrain."
msgstr "Viaj %s finis la vivo-poentojn."
-#: server/unittools.c:430
+#: server/unittools.c:431
#, c-format
msgid "Your %s has returned to refuel."
msgstr "Viaj %s revenis por sin provizi."
-#: server/unittools.c:454
+#: server/unittools.c:455
#, c-format
msgid "Your %s has run out of fuel."
msgstr "Viaj %s elĉerpis la fuelon."
-#. TRANS: And, <the unit> became ...
-#: server/unittools.c:616
-msgid "And, became more experienced!"
-msgstr "Kaj, ili iÄas pli spertaj!"
-
#. TRANS: Your <unit> became ...
-#: server/unittools.c:620
+#: server/unittools.c:619
#, c-format
msgid "Your %s became more experienced!"
msgstr "Viaj %s iÄis pli spertaj!"
-#: server/unittools.c:1011
+#: server/unittools.c:1009
#, c-format
msgid "Teleported your %s to %s."
msgstr "Viaj %s estis teletransportitaj al %s."
-#: server/unittools.c:1041
+#. TRANS: A unit is moved to resolve stack conflicts.
+#: server/unittools.c:1065
+#, fuzzy, c-format
+msgid "Moved your %s."
+msgstr "Viaj %s estis dissolvita."
+
+#: server/unittools.c:1076
#, c-format
msgid "Disbanded your %s."
msgstr "Viaj %s estis dissolvita."
-#: server/unittools.c:1363
+#: server/unittools.c:1397
#, c-format
msgid "Unable to defend %s, %s has lost the game."
msgstr "Oni malkapablas defendi %sn, %s malvenkis la ludon."
-#: server/unittools.c:1367
+#: server/unittools.c:1401
#, 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:1469
+#: server/unittools.c:1503
#, 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:1478
+#: server/unittools.c:1512
#, c-format
msgid "%s lost when %s was lost."
msgstr "%s malvenkis pro la perdo de %s."
-#: server/unittools.c:1527
+#: server/unittools.c:1561
#, c-format
msgid "Barbarian leader captured, %d gold ransom paid."
msgstr ""
@@ -6781,19 +6769,19 @@ msgstr ""
"pagita."
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unittools.c:1545
+#: server/unittools.c:1579
#, 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:1554 server/unittools.c:1612
+#: server/unittools.c:1588 server/unittools.c:1646
#, 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:1588
+#: server/unittools.c:1622
#, c-format
msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
msgid_plural ""
@@ -6803,14 +6791,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:1621
+#: server/unittools.c:1655
#, 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:1636
+#: server/unittools.c:1670
#, 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."
@@ -6818,7 +6806,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:1646
+#: server/unittools.c:1680
#, 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."
@@ -6828,196 +6816,196 @@ 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:1660
+#: server/unittools.c:1694
#, 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:1928
+#: server/unittools.c:1962
#, c-format
msgid "Your %s was nuked by %s."
msgstr "Via %s estis atombombita fare de %s."
-#: server/unittools.c:1931 server/unittools.c:1947
+#: server/unittools.c:1965 server/unittools.c:1981
msgid "yourself"
msgstr "vi mem"
-#: server/unittools.c:1935
+#: server/unittools.c:1969
#, c-format
msgid "The %s %s was nuked."
msgstr "La %sj %s estis atombombitaj"
-#: server/unittools.c:1944
+#: server/unittools.c:1978
#, c-format
msgid "%s was nuked by %s."
msgstr "%s estis atombombita fare de %s."
-#: server/unittools.c:1952
+#: server/unittools.c:1986
#, c-format
msgid "You nuked %s."
msgstr "Vi atombombis %sn."
-#: server/unittools.c:1993
+#: server/unittools.c:2027
#, c-format
msgid "The %s detonated a nuke!"
msgstr "La %s eksplodigis atombombon!"
-#: server/unittools.c:2017
+#: server/unittools.c:2051
#, c-format
msgid "%s transported successfully."
msgstr "%s estis transportitaj sukcese."
-#: server/unittools.c:2069
+#: server/unittools.c:2103
msgid "This unit type can not be paradropped."
msgstr "Ĉi tiu speco de unuo ne estas paraÅutebla."
-#: server/unittools.c:2079
+#: server/unittools.c:2113
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:2085
+#: server/unittools.c:2119
msgid "The destination location is not known."
msgstr "La alvenpunkto estas nekonata."
-#: server/unittools.c:2092
+#: server/unittools.c:2126
#, c-format
msgid "This unit cannot paradrop into %s."
msgstr "Ĉi tiu unuo ne povas paraÅuti en %sn."
-#: server/unittools.c:2112
+#: server/unittools.c:2146
#, 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:2123
+#: server/unittools.c:2157
#, 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:2136
+#: server/unittools.c:2170
#, 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:2158
+#: server/unittools.c:2192
#, c-format
msgid "You found %d gold."
msgstr "Vi trovis %d oraj monerojn."
-#: server/unittools.c:2175
+#: server/unittools.c:2209
#, c-format
msgid "You found %s in ancient scrolls of wisdom."
msgstr "Vi trovis %sn en antikvaj pergamenoj de saÄo."
-#: server/unittools.c:2182
+#: server/unittools.c:2216
#, 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:2196
+#: server/unittools.c:2230
msgid "A band of friendly mercenaries joins your cause."
msgstr "Bando da amikaj dungosoldatoj aliÄas al via idealo."
-#: server/unittools.c:2214
+#: server/unittools.c:2248
msgid "An abandoned village is here."
msgstr "Ĉi tie estas forlasita vilaÄo."
-#: server/unittools.c:2224
+#: server/unittools.c:2258
msgid "You have unleashed a horde of barbarians!"
msgstr "Vi senbridigis hordon de barbaroj!"
-#: server/unittools.c:2227
+#: server/unittools.c:2261
#, c-format
msgid "Your %s has been killed by barbarians!"
msgstr "Viaj %s estis mortigita de la barbaroj!"
-#: server/unittools.c:2243
+#: server/unittools.c:2277
msgid "You found a friendly city."
msgstr "Vi trovis amikan urbon."
-#: server/unittools.c:2257
+#: server/unittools.c:2291
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:2282
+#: server/unittools.c:2316
msgid "Your overflight frightens the tribe; they scatter in terror."
msgstr "Via superflugo teruris la tribon; ili forkuris terruroplenaj."
-#: server/unittools.c:2540
+#: server/unittools.c:2574
#, 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:2989
+#: server/unittools.c:3023
#, 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:3041
+#: server/unittools.c:3075
#, 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:3054
+#: server/unittools.c:3088
#, 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:3068
+#: server/unittools.c:3102
#, 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:3078
+#: server/unittools.c:3112
#, 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:3104
+#: server/unittools.c:3138
#, c-format
msgid "Orders for %s aborted because of failed move."
msgstr "La ordonoj por %s estis nuligitaj pro malsukcesa movo."
-#: server/unittools.c:3145
+#: server/unittools.c:3179
#, c-format
msgid "Attempt to change homecity for %s failed."
msgstr "AnstataÅigo de nuna hejmurbo per %s malsukcesis."
-#: server/unittools.c:3156
+#: server/unittools.c:3190
#, c-format
msgid "Attempt to establish trade route for %s failed."
msgstr "Malsukcesis provo por starigi komercan kurson por %s."
-#: server/unittools.c:3168
+#: server/unittools.c:3202
#, c-format
msgid "Attempt to build wonder for %s failed."
msgstr "Malsukcesis provo por konstrui mirindaĵon por %s."
-#: server/unittools.c:3177
+#: server/unittools.c:3211
#, c-format
msgid "Your %s has invalid orders."
msgstr "Viaj %s havas nevalidajn ordonojn."
-#: server/generator/mapgen.c:1737
+#: server/generator/mapgen.c:1771
msgid "High landmass - this may take a few seconds."
msgstr ""
-#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
+#: server/generator/mapgen.c:1969 server/generator/mapgen.c:2039
#, c-format
msgid "Falling back to generator %d."
msgstr "AnstataÅo de generatoro per generatoro %d."
-#: server/generator/mapgen.c:2025
+#: server/generator/mapgen.c:2059
msgid "Generator 3 didn't place all big islands."
msgstr "La generatoro 3 ne lokis ĉiujn grandajn insulojn."
-#: server/generator/mapgen.c:2054
+#: server/generator/mapgen.c:2088
#, c-format
msgid "Generator 3 left %li landmass unplaced."
msgstr "La generatoro 3 lasis ne-lokita %li da lando."
@@ -7123,7 +7111,7 @@ msgid_plural "%3d turns"
msgstr[0] "%3d vico"
msgstr[1] "%3d vicoj"
-#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:631
#: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
@@ -7241,338 +7229,339 @@ msgstr "?city_state:Paca"
msgid "(worklist)"
msgstr "(laborlisto)"
-#: client/cityrepdata.c:447
-msgid "Special"
-msgstr "Specialistoj"
+#: client/cityrepdata.c:446
+msgid "?city:Name"
+msgstr "?city:Nomo"
-#: client/cityrepdata.c:448
-msgid "?entertainers/scientists/taxmen:E/S/T"
-msgstr "?entertainers/scientists/taxmen:Ve/Sc/Im"
+#: client/cityrepdata.c:446 client/gui-sdl/cityrep.c:169
+msgid "City Name"
+msgstr "Urbonomo"
-#: client/cityrepdata.c:449
-msgid "Entertainers, Scientists, Taxmen"
-msgstr "Vervigantoj, Sciencistoj, Impostisto"
+#: client/cityrepdata.c:448
+msgid "?size [short]:Sz"
+msgstr "?size:Gr"
-#: client/cityrepdata.c:452
-msgid "Concise + Rapture, - Disorder"
-msgstr "Mallonge + Entuziasmo, - Tumulto"
+#: client/cityrepdata.c:448
+msgid "Size"
+msgstr "Grando"
-#: client/cityrepdata.c:454 client/plrdlg_common.c:261
+#: client/cityrepdata.c:450 client/plrdlg_common.c:261
#: client/gui-win32/plrdlg.c:337
msgid "State"
msgstr "Stato"
-#: client/cityrepdata.c:454
+#: client/cityrepdata.c:450
msgid "Rapture/Peace/Disorder"
msgstr "Entuziasmo/Paco/Tumulto"
+#: client/cityrepdata.c:452
+#, fuzzy
+msgid "Concise *=Rapture, X=Disorder"
+msgstr "Mallonge + Entuziasmo, - Tumulto"
+
+#: client/cityrepdata.c:456
+msgid "Special"
+msgstr "Specialistoj"
+
#: client/cityrepdata.c:457
+msgid "?entertainers/scientists/taxmen:E/S/T"
+msgstr "?entertainers/scientists/taxmen:Ve/Sc/Im"
+
+#: client/cityrepdata.c:458
+msgid "Entertainers, Scientists, Taxmen"
+msgstr "Vervigantoj, Sciencistoj, Impostisto"
+
+#: client/cityrepdata.c:461
msgid "?Happy workers:H"
msgstr "?Happy workers:Fe"
-#: client/cityrepdata.c:457
+#: client/cityrepdata.c:461
msgid "Workers: Happy"
msgstr "Laboristoj: Feliĉaj"
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
msgid "?Content workers:C"
msgstr "?Content workers:Kn"
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
msgid "Workers: Content"
msgstr "Laboristoj: Kontentaj"
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
msgid "?Unhappy workers:U"
msgstr "?Unhappy workers:Mk"
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
msgid "Workers: Unhappy"
msgstr "Laboristoj: Malkontentaj"
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
msgid "?Angry workers:A"
msgstr "?Angry workers:Kl"
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
msgid "Workers: Angry"
msgstr "Laboristoj: Koleraj"
-#: client/cityrepdata.c:465 client/gui-xaw/citydlg.c:2401
-#: data/default/units.ruleset:238
-msgid "Workers"
+#: client/cityrepdata.c:469 client/gui-xaw/citydlg.c:2402
+#, fuzzy
+msgid "?city:Workers"
msgstr "Laboristoj"
-#: client/cityrepdata.c:466
+#: client/cityrepdata.c:470
msgid "?happy/content/unhappy/angry:H/C/U/A"
msgstr "?happy/content/unhappy/angry:Fe/Kn/Mk/Kl"
-#: client/cityrepdata.c:467
+#: client/cityrepdata.c:471
msgid "Workers: Happy, Content, Unhappy, Angry"
msgstr "Laboristoj: Feliĉaj, Kontentoj, Malkontentoj, Koleraj"
-#: client/cityrepdata.c:470 client/cityrepdata.c:472
+#: client/cityrepdata.c:474 client/cityrepdata.c:476
msgid "Best"
msgstr "La plej bona"
-#: client/cityrepdata.c:470
+#: client/cityrepdata.c:474
msgid "attack"
msgstr "atako"
-#: client/cityrepdata.c:471
+#: client/cityrepdata.c:475
msgid "Best attacking units"
msgstr "La plej bona atak-unuo"
-#: client/cityrepdata.c:472
+#: client/cityrepdata.c:476
msgid "defense"
msgstr "defendo"
-#: client/cityrepdata.c:473
+#: client/cityrepdata.c:477
msgid "Best defending units"
msgstr "La plej bona defend-unuo"
-#: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
-#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
-#: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
-#: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
-#: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
-#: client/gui-win32/menu.c:351 client/gui-win32/repodlgs.c:616
-#: client/gui-win32/repodlgs.c:707 client/gui-win32/repodlgs.c:716
-#: client/gui-xaw/menu.c:157 client/gui-xaw/menu.c:219
-#: client/gui-xaw/menu.c:242 client/gui-xaw/repodlgs.c:881
-#: client/gui-xaw/repodlgs.c:1069 data/Freeciv.in:1895 data/helpdata.txt:909
+#: client/cityrepdata.c:478 client/cityrepdata.c:482
+#: client/gui-gtk-2.0/cityrep.c:1437 client/gui-gtk-2.0/cityrep.c:1456
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-gtk-2.0/cityrep.c:1494
+#: client/gui-gtk-2.0/cityrep.c:1514 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/repodlgs.c:960 client/gui-sdl/helpdlg.c:688
+#: client/gui-sdl/mapctrl.c:1605 client/gui-sdl/optiondlg.c:1827
+#: client/gui-sdl/repodlgs.c:356 client/gui-win32/menu.c:351
+#: client/gui-win32/repodlgs.c:616 client/gui-win32/repodlgs.c:707
+#: client/gui-win32/repodlgs.c:716 client/gui-xaw/menu.c:157
+#: client/gui-xaw/menu.c:219 client/gui-xaw/menu.c:242
+#: client/gui-xaw/repodlgs.c:881 client/gui-xaw/repodlgs.c:1069
+#: data/Freeciv.in:1895 data/helpdata.txt:909
msgid "Units"
msgstr "Unuoj"
#. TRANS: Header "Number of units inside city"
-#: client/cityrepdata.c:476
+#: client/cityrepdata.c:480
msgid "?Present (units):Here"
msgstr "?Present (units):Ĉi tie"
-#: client/cityrepdata.c:477
+#: client/cityrepdata.c:481
msgid "Number of units present"
msgstr "Nombro da ĉeestantaj unuoj"
#. TRANS: Header "Number of units supported by given city"
-#: client/cityrepdata.c:480
+#: client/cityrepdata.c:484
msgid "?Supported (units):Owned"
msgstr "?Supported (units):Tenitaj"
-#: client/cityrepdata.c:481
+#: client/cityrepdata.c:485
msgid "Number of units supported"
msgstr "Nombro da unuoj subtenitaj"
#. TRANS: Header "It will take this many turns before city grows"
-#: client/cityrepdata.c:484
+#: client/cityrepdata.c:488
msgid "?food (population):Grow"
msgstr "?food (population):PlinombriÄo"
-#: client/cityrepdata.c:485 client/cityrepdata.c:530
+#: client/cityrepdata.c:489 client/cityrepdata.c:528
msgid "?Stock/Target:(Have/Need)"
msgstr "?Stock/Target:(Havaĵo/Necesaĵo)"
-#: client/cityrepdata.c:486
+#: client/cityrepdata.c:490
msgid "Turns until growth/famine"
msgstr "Vicoj antaÅ pliiÄo/malsatmisero"
-#: client/cityrepdata.c:488
-msgid "?size [short]:Sz"
-msgstr "?size:Gr"
-
-#: client/cityrepdata.c:488
-msgid "Size"
-msgstr "Grando"
-
-#: client/cityrepdata.c:492
-msgid "?city:Name"
-msgstr "?city:Nomo"
-
-#: client/cityrepdata.c:492 client/gui-sdl/cityrep.c:169
-msgid "City Name"
-msgstr "Urbonomo"
-
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
msgid "Surplus"
msgstr "Troo"
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
msgid "?food/production/trade:F/P/T"
msgstr "?food/production/trade:Nu/Pr/Ko"
-#: client/cityrepdata.c:496
+#: client/cityrepdata.c:494
msgid "Surplus: Food, Production, Trade"
msgstr "Troo: Nutraĵo, Produktado, Komerco"
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
msgid "?Food surplus [short]:+F"
msgstr "?Food surplus [short]:+NU"
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
msgid "Surplus: Food"
msgstr "Troo: Nutraĵo"
-#: client/cityrepdata.c:500
+#: client/cityrepdata.c:498
msgid "?Production surplus [short]:+P"
msgstr "?Production surplus [short]:+Pr"
-#: client/cityrepdata.c:501
+#: client/cityrepdata.c:499
msgid "Surplus: Production"
msgstr "Troo: Produktado"
-#: client/cityrepdata.c:502
+#: client/cityrepdata.c:500
msgid "?Production loss (waste) [short]:-P"
msgstr "?Production loss (waste) [short]:-Pr"
-#: client/cityrepdata.c:503
+#: client/cityrepdata.c:501
msgid "Waste"
msgstr "MalÅparo"
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
msgid "?Trade surplus [short]:+T"
msgstr "?Trade surplus [short]:+Ko"
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
msgid "Surplus: Trade"
msgstr "Surplus: Komerco"
-#: client/cityrepdata.c:506
+#: client/cityrepdata.c:504
msgid "?Trade loss (corruption) [short]:-T"
msgstr "?Trade perdita (subaĉeto) [mallonge]:-Ko"
-#: client/cityrepdata.c:507
+#: client/cityrepdata.c:505
msgid "Corruption"
msgstr "Subaĉetado"
-#: client/cityrepdata.c:509 client/gui-gtk-2.0/repodlgs.c:654
+#: client/cityrepdata.c:507 client/gui-gtk-2.0/repodlgs.c:654
#: client/gui-sdl/mapctrl.c:1400 client/gui-win32/repodlgs.c:334
#: client/gui-xaw/menu.c:222 client/gui-xaw/repodlgs.c:644
#: client/gui-xaw/repodlgs.c:773 data/Freeciv.in:1819
msgid "Economy"
msgstr "Ekonomio"
-#: client/cityrepdata.c:509
+#: client/cityrepdata.c:507
#, fuzzy
msgid "?gold/luxury/science:G/L/S"
msgstr "?gold/lÅury/science:Au/Lu/Sc"
-#: client/cityrepdata.c:510
+#: client/cityrepdata.c:508
#, fuzzy
msgid "Economy: Gold, Luxuries, Science"
msgstr "Ekonomio: Oro, Lukso, Scienco"
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
msgid "?Gold:G"
msgstr "?Gold:Au"
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
msgid "Economy: Gold"
msgstr "Ekonomio: Oro"
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
#, fuzzy
msgid "?Luxury:L"
msgstr "?LÅury:Lu"
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
#, fuzzy
msgid "Economy: Luxury"
msgstr "Ekonomio: Lukso"
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
msgid "?Science:S"
msgstr "?Science:Sc"
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
msgid "Economy: Science"
msgstr "Ekonomio: Scienco"
-#: client/cityrepdata.c:518
+#: client/cityrepdata.c:516
msgid "?number_trade_routes:n"
msgstr "?number_trade_routes:n"
-#: client/cityrepdata.c:518
+#: client/cityrepdata.c:516
msgid "?number_trade_routes:R"
msgstr "?number_trade_routes:Kv"
-#: client/cityrepdata.c:519
+#: client/cityrepdata.c:517
msgid "Number of Trade Routes"
msgstr "Nombro da komercaj kursoj"
-#: client/cityrepdata.c:521
+#: client/cityrepdata.c:519
msgid "?pollution [short]:Pol"
msgstr "?pollution [short]:Pol"
-#: client/cityrepdata.c:523
+#: client/cityrepdata.c:521
msgid "?cma:Governor"
msgstr "?cma:Reganto"
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
-#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
-#: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
-#: data/Freeciv.in:1459 data/helpdata.txt:820
+#: client/cityrepdata.c:521 client/gui-gtk-2.0/cityrep.c:1766
+#: client/gui-sdl/citydlg.c:3809 client/gui-sdl/cma_fe.c:858
+#: client/gui-win32/citydlg.c:726 data/Freeciv.in:1459 data/helpdata.txt:820
msgid "Citizen Governor"
msgstr "Urba regado"
-#: client/cityrepdata.c:526
+#: client/cityrepdata.c:524
msgid "Turns/Buy"
msgstr "Vicoj/Aĉeti"
-#: client/cityrepdata.c:529 client/cityrepdata.c:531
+#: client/cityrepdata.c:527 client/cityrepdata.c:529
msgid "Currently Building"
msgstr "Konstruata konstruaĵo"
-#: client/cityrepdata.c:575
+#: client/cityrepdata.c:573
msgid "?specialist:S"
msgstr "?specialist:S"
-#: client/cityrepdata.c:578
+#: client/cityrepdata.c:576
#, fuzzy
msgid "Specialists"
msgstr "Specialistoj: %s"
-#: client/civclient.c:239
+#: client/civclient.c:240
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr ""
-#: client/civclient.c:249
+#: client/civclient.c:250
msgid " -l, --log FILE\tUse FILE as logfile (spawned server also uses this)\n"
msgstr ""
-#: client/civclient.c:251
+#: client/civclient.c:252
msgid " -m, --meta HOST\tConnect to the metaserver at HOST\n"
msgstr ""
-#: client/civclient.c:253
+#: client/civclient.c:254
msgid " -n, --name NAME\tUse NAME as name\n"
msgstr ""
-#: client/civclient.c:255
+#: client/civclient.c:256
msgid " -p, --port PORT\tConnect to server port PORT (usually with -a)\n"
msgstr ""
-#: client/civclient.c:257
+#: client/civclient.c:258
#, c-format
msgid " -P, --Plugin PLUGIN\tUse PLUGIN for sound output %s\n"
msgstr ""
-#: client/civclient.c:259
+#: client/civclient.c:260
msgid " -r, --read FILE\tRead startup script FILE (for spawned server only)\n"
msgstr ""
-#: client/civclient.c:262
+#: client/civclient.c:263
msgid " -s, --server HOST\tConnect to the server at HOST (usually with -a)\n"
msgstr ""
-#: client/civclient.c:264
+#: client/civclient.c:265
msgid " -S, --Sound FILE\tRead sound tags from FILE\n"
msgstr ""
-#: client/civclient.c:265
+#: client/civclient.c:266
msgid " -t, --tiles FILE\tUse data file FILE.tilespec for tiles\n"
msgstr ""
-#: client/civclient.c:268
+#: client/civclient.c:269
#, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -7580,145 +7569,155 @@ msgid ""
msgstr ""
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:273
+#: client/civclient.c:274
#, c-format
msgid "Report bugs at %s\n"
msgstr "Bonvolu raporti pri la eraro al %s\n"
-#: client/civclient.c:297
+#: client/civclient.c:298
#, c-format
msgid "Invalid port \"%s\" specified with --port option.\n"
msgstr ""
-#: client/civclient.c:299 client/civclient.c:314
+#: client/civclient.c:300 client/civclient.c:315
msgid "Try using --help.\n"
msgstr ""
-#: client/civclient.c:312
+#: client/civclient.c:313
#, c-format
msgid "Invalid debug level \"%s\" specified with --debug option.\n"
msgstr ""
-#: client/civclient.c:325
+#: client/civclient.c:326
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr "Nekonata opcio: \"%s\"\n"
-#: client/civclient.c:539
+#: client/civclient.c:391
+#, fuzzy, c-format
+msgid "Updating old metaserver address \"%s\"."
+msgstr "metaserver <adreso>"
+
+#: client/civclient.c:394
+#, fuzzy, c-format
+msgid "Default metaserver has been set to \"%s\"."
+msgstr "Opcio: %s estis agordita je \"%s\"."
+
+#: client/civclient.c:550
msgid "Game started."
msgstr "La ludo komencas."
-#: client/civclient.c:577
+#: client/civclient.c:588
msgid "There was an error while auto connecting; aborting."
msgstr ""
-#: client/climisc.c:176
+#: client/climisc.c:177
#, c-format
msgid "Changing production of every %s into %s."
msgstr "ÅœanÄado de produktado de ĉiu %s en %s."
-#: client/climisc.c:214
+#: client/climisc.c:215
msgid "?embassy:Both"
msgstr ""
-#: client/climisc.c:216
+#: client/climisc.c:217
#, fuzzy
msgid "?embassy:Yes"
msgstr "Ambasado"
-#: client/climisc.c:219
+#: client/climisc.c:220
msgid "?embassy:With Us"
msgstr ""
-#: client/climisc.c:222
+#: client/climisc.c:223
msgid "?embassy:Contact"
msgstr ""
-#: client/climisc.c:224
+#: client/climisc.c:225
msgid "?embassy:No Contact"
msgstr ""
-#: client/climisc.c:236
+#: client/climisc.c:237
msgid "?vision:Both"
msgstr "?vision:AmbaÅ"
-#: client/climisc.c:238
+#: client/climisc.c:239
msgid "?vision:To Them"
msgstr "?vision:al ili"
-#: client/climisc.c:241
+#: client/climisc.c:242
msgid "?vision:To Us"
msgstr "?vision:al ni"
-#: client/climisc.c:257 client/climisc.c:264
+#: client/climisc.c:258 client/climisc.c:265
#, c-format
msgid "The %s give %s"
msgstr "La %s donas %sn"
-#: client/climisc.c:268
+#: client/climisc.c:269
#, c-format
msgid "The %s give unknown city."
msgstr "La %s donas nekonatan urbon."
-#: client/climisc.c:273
+#: client/climisc.c:274
#, c-format
msgid "The %s give %d gold"
msgstr "La %s donas %d orajn monerojn"
-#: client/climisc.c:278
+#: client/climisc.c:279
#, c-format
msgid "The %s give their worldmap"
msgstr "La %s donas ilian mapon de la mondo"
-#: client/climisc.c:282
+#: client/climisc.c:283
#, c-format
msgid "The %s give their seamap"
msgstr "La %s donas ilian mar-mapon"
-#: client/climisc.c:286
+#: client/climisc.c:287
msgid "The parties agree on a cease-fire"
msgstr "La partioj interkonsentas pri pafĉesigo"
-#: client/climisc.c:289
+#: client/climisc.c:290
msgid "The parties agree on a peace"
msgstr "La partioj interkonsentas pri paco"
-#: client/climisc.c:292
+#: client/climisc.c:293
msgid "The parties create an alliance"
msgstr "La partioj kreas aliancon"
-#: client/climisc.c:295
+#: client/climisc.c:296
#, c-format
msgid "The %s give shared vision"
msgstr "La %s donas komunan vidon"
-#: client/climisc.c:299
+#: client/climisc.c:300
#, fuzzy, c-format
msgid "The %s give an embassy"
msgstr "La %s donas %sn"
-#: client/climisc.c:902
+#: client/climisc.c:906
msgid "Popup Request"
msgstr "Åœpruc-mendado"
-#: client/climisc.c:932
+#: client/climisc.c:936
msgid "Exporting output window to civgame.log ..."
msgstr "Eksportante la fenestron de la mesaÄoj en civgame.log ..."
-#: client/climisc.c:936
+#: client/climisc.c:940
msgid "Export complete."
msgstr "La eksportado kompletiÄis."
-#: client/climisc.c:938
+#: client/climisc.c:942
msgid "Export failed, couldn't write to file."
msgstr "La eksportado malsukcesis, ĉar estas neeble skribi en la dosiero."
-#: client/climisc.c:1038
+#: client/climisc.c:1042
#, c-format
msgid "You don't buy %s in %s!"
msgstr "Vi ne aĉetis %sn en %s!"
-#: client/climisc.c:1056
+#: client/climisc.c:1060
#, c-format
msgid "%s costs %d gold and you only have %d gold."
msgstr "%s kostas %d orajn monerojn kaj vi havas nur %d orajn monerojn."
@@ -7769,22 +7768,22 @@ 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:1289
+#: client/connectdlg_common.c:79 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:1289
+#: client/connectdlg_common.c:80 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:1290
+#: client/connectdlg_common.c:81 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:1290
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
#, fuzzy
msgid "hard"
msgstr "Malfacila"
@@ -7815,38 +7814,42 @@ msgid "We probably couldn't start it from here."
msgstr "Eble ni ne povas startigi Äin de ĉi tie."
#: client/connectdlg_common.c:470
-msgid "We have control of the server (command access level hack)"
+#, 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
-msgid "We can't take control of server, attempting to kill it."
-msgstr "Ni ne povas mastrumi la servilon, do ni provas haltigi Äin."
+msgid ""
+"Failed to obtain the required access level to take control of the server. "
+"The server will now be shutdown."
+msgstr ""
-#: client/control.c:1104
+#: client/control.c:1123
msgid "Only transporter units can be unloaded."
msgstr "Nur la kargo-Åipoj povas esti malÅargitaj."
-#: client/control.c:1353
+#: client/control.c:1425
msgid "Only settler units can be put into auto mode."
msgstr "Nur la farmistoj povas esti aÅtomate mastrumitaj."
-#: client/control.c:1444
+#: client/control.c:1516
msgid "Only nuclear units can do this."
msgstr "Nur la atomaj unuoj povas fari tion."
-#: client/control.c:1473
+#: client/control.c:1545
msgid "Only paratrooper units can do this."
msgstr "Nur la paraÅutistoj povas fari tion."
-#: client/control.c:1921
+#: client/control.c:2020
msgid "Too far for this unit."
msgstr "Tro malproksima por ĉi tiu unuo."
-#: client/control.c:2131 client/control.c:2161 client/control.c:2177
+#: client/control.c:2230 client/control.c:2260 client/control.c:2276
msgid "Didn't find a route to the destination!"
msgstr "Estas neeble trovi irvojon por la alvenpunkto!"
-#: client/control.c:2221
+#: client/control.c:2320
msgid "Oh my! You seem to have no capital!"
msgstr "Oh ve! Ŝajnas ke via nacio ne havas ĉefurbon!"
@@ -7932,16 +7935,16 @@ msgid "Allows %s (with %s)."
msgstr "Tio ebligas %sn (kun %s)."
#. TRANS: preserve single space at beginning
-#: client/helpdata.c:418
+#: client/helpdata.c:416
msgid " Rivers"
msgstr " Riveroj"
-#: client/helpdata.c:576
+#: client/helpdata.c:574
#, c-format
msgid "Sorry, no help topic for %s.\n"
msgstr ""
-#: client/helpdata.c:580
+#: client/helpdata.c:578
#, c-format
msgid ""
"Sorry, no help topic for %s.\n"
@@ -7949,7 +7952,7 @@ msgid ""
"\n"
msgstr ""
-#: client/helpdata.c:670
+#: client/helpdata.c:668
#, fuzzy
msgid ""
"Requires: Nothing\n"
@@ -7958,288 +7961,288 @@ msgstr ""
"Necesas la %s konstruaĵo.\n"
"\n"
-#: client/helpdata.c:675
+#: client/helpdata.c:673
#, c-format
msgid "* The discovery of %s will make %s obsolete.\n"
msgstr ""
-#: client/helpdata.c:694
+#: client/helpdata.c:692
#, c-format
msgid "* Allows all players with knowledge of %s to build %s units.\n"
msgstr ""
-#: client/helpdata.c:706
+#: client/helpdata.c:704
#, c-format
msgid "* Allows %s (with %s).\n"
msgstr ""
-#: client/helpdata.c:710
+#: client/helpdata.c:708
#, c-format
msgid "* Allows %s.\n"
msgstr ""
-#: client/helpdata.c:780
+#: client/helpdata.c:778
#, c-format
msgid "* Can only be built if there is %s in the city.\n"
msgstr ""
-#: client/helpdata.c:786
+#: client/helpdata.c:784
#, c-format
msgid "* Can only be built with %s as government.\n"
msgstr ""
-#: client/helpdata.c:791
+#: client/helpdata.c:789
msgid "* May not be built in cities.\n"
msgstr ""
-#: client/helpdata.c:794
+#: client/helpdata.c:792
msgid "* Never has a home city.\n"
msgstr ""
-#: client/helpdata.c:797
+#: client/helpdata.c:795
msgid "* Losing this unit will lose you the game!\n"
msgstr ""
-#: client/helpdata.c:801
+#: client/helpdata.c:799
msgid "* Each player may only have one of this type of unit.\n"
msgstr ""
-#: client/helpdata.c:805
+#: client/helpdata.c:803
#, c-format
msgid "* Requires %d population to build.\n"
msgstr ""
-#: client/helpdata.c:811
+#: client/helpdata.c:809
#, c-format
msgid "* Can carry and refuel %d air unit.\n"
msgid_plural "* Can carry and refuel %d air units.\n"
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:816
+#: client/helpdata.c:814
#, c-format
msgid "* Can carry and refuel %d missile unit.\n"
msgid_plural "* Can carry and refuel %d missile units.\n"
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:821
+#: client/helpdata.c:819
#, c-format
msgid "* Can carry %d ground unit across water.\n"
msgid_plural "* Can carry %d ground units across water.\n"
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:830
+#: client/helpdata.c:828
msgid ""
"* Can establish trade routes (must travel to target city and must be at "
"least 9 tiles [in Manhattan distance] from this unit's home city).\n"
msgstr ""
-#: client/helpdata.c:836
+#: client/helpdata.c:834
#, c-format
msgid "* Can help build wonders (adds %d production).\n"
msgstr ""
-#: client/helpdata.c:840
+#: client/helpdata.c:838
msgid "* May not be disbanded.\n"
msgstr ""
-#: client/helpdata.c:842
+#: client/helpdata.c:840
#, c-format
msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
msgstr ""
-#: client/helpdata.c:846
+#: client/helpdata.c:844
msgid "* Can build new cities.\n"
msgstr ""
-#: client/helpdata.c:849
+#: client/helpdata.c:847
#, c-format
msgid "* Can add on %d population to cities of no more than size %d.\n"
msgstr ""
-#: client/helpdata.c:858
+#: client/helpdata.c:856
msgid "* Can build roads and railroads.\n"
msgstr ""
-#: client/helpdata.c:859
+#: client/helpdata.c:857
msgid "* Can build mines on tiles.\n"
msgstr ""
-#: client/helpdata.c:860
+#: client/helpdata.c:858
msgid "* Can build irrigation on tiles.\n"
msgstr ""
-#: client/helpdata.c:865
+#: client/helpdata.c:863
msgid "* Can build farmland.\n"
msgstr ""
-#: client/helpdata.c:869
+#: client/helpdata.c:867
#, c-format
msgid "* Can build farmland (if %s is known).\n"
msgstr ""
-#: client/helpdata.c:873
+#: client/helpdata.c:871
#, c-format
msgid "* Can build farmland (if any of the following are known: %s).\n"
msgstr ""
-#: client/helpdata.c:881
+#: client/helpdata.c:879
msgid "* Can build fortresses.\n"
msgstr ""
-#: client/helpdata.c:885
+#: client/helpdata.c:883
#, c-format
msgid "* Can build fortresses (if %s is known).\n"
msgstr ""
-#: client/helpdata.c:889
+#: client/helpdata.c:887
#, c-format
msgid "* Can build fortresses (if any of the following are known: %s).\n"
msgstr ""
-#: client/helpdata.c:895
+#: client/helpdata.c:893
msgid "* Can clean pollution from tiles.\n"
msgstr ""
-#: client/helpdata.c:896
+#: client/helpdata.c:894
msgid "* Can clean nuclear fallout from tiles.\n"
msgstr ""
-#: client/helpdata.c:899
+#: client/helpdata.c:897
msgid "* Can transform tiles.\n"
msgstr ""
-#: client/helpdata.c:902
+#: client/helpdata.c:900
#, fuzzy
msgid "* Can build airbases.\n"
msgstr "Estas neeble fondi urbon"
-#: client/helpdata.c:906
+#: client/helpdata.c:904
#, c-format
msgid "* May fortify, granting a 50%% defensive bonus.\n"
msgstr ""
-#: client/helpdata.c:909
+#: client/helpdata.c:907
msgid "* May pillage to destroy infrastructure from tiles.\n"
msgstr ""
-#: client/helpdata.c:913
+#: client/helpdata.c:911
msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
msgstr ""
-#: client/helpdata.c:916
+#: client/helpdata.c:914
msgid "* Can perform diplomatic actions.\n"
msgstr ""
-#: client/helpdata.c:920
+#: client/helpdata.c:918
msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
msgstr ""
-#: client/helpdata.c:923
+#: client/helpdata.c:921
msgid "* May not be bribed.\n"
msgstr ""
-#: client/helpdata.c:926
+#: client/helpdata.c:924
msgid "* Can attack enemy air units.\n"
msgstr ""
-#: client/helpdata.c:930
+#: client/helpdata.c:928
msgid "* Is invisible except when next to an enemy unit or city.\n"
msgstr ""
-#: client/helpdata.c:934
+#: client/helpdata.c:932
msgid "* Can only attack units on ocean squares (no land attacks).\n"
msgstr ""
-#: client/helpdata.c:938
+#: client/helpdata.c:936
msgid ""
"* Can attack from aboard sea units: against enemy cities and onto land "
"squares.\n"
msgstr ""
-#: client/helpdata.c:943
+#: client/helpdata.c:941
#, c-format
msgid "* Can be paradropped from a friendly city (Range: %d).\n"
msgstr ""
-#: client/helpdata.c:949
+#: client/helpdata.c:947
msgid "* Gets double defense against units specified as 'mounted'.\n"
msgstr ""
-#: client/helpdata.c:953
+#: client/helpdata.c:951
msgid "* Counts as 'mounted' against certain defenders.\n"
msgstr ""
-#: client/helpdata.c:957
+#: client/helpdata.c:955
msgid "* A missile unit: gets used up in making an attack.\n"
msgstr ""
-#: client/helpdata.c:960
+#: client/helpdata.c:958
msgid "* Making an attack ends this unit's turn.\n"
msgstr ""
-#: client/helpdata.c:964
+#: client/helpdata.c:962
msgid "* This unit's attack causes a nuclear explosion!\n"
msgstr ""
-#: client/helpdata.c:968
+#: client/helpdata.c:966
msgid "* Gets double firepower when attacking cities.\n"
msgstr ""
-#: client/helpdata.c:971
+#: client/helpdata.c:969
msgid "* Ignores the effects of city walls.\n"
msgstr ""
-#: client/helpdata.c:975
+#: client/helpdata.c:973
#, c-format
msgid ""
"* Does bombard attacks (%d per turn). These attacks will only damage (never "
"kill) the defender, but have no risk for the attacker.\n"
msgstr ""
-#: client/helpdata.c:982
+#: client/helpdata.c:980
msgid "* Gets quintuple defense against missiles and aircraft.\n"
msgstr ""
-#: client/helpdata.c:986
+#: client/helpdata.c:984
msgid "* Ignores terrain effects (treats all squares as roads).\n"
msgstr ""
-#: client/helpdata.c:989
+#: client/helpdata.c:987
msgid "* Ignores zones of control.\n"
msgstr ""
-#: client/helpdata.c:993
+#: client/helpdata.c:991
msgid "* A non-military unit (cannot attack; no martial law).\n"
msgstr ""
-#: client/helpdata.c:997
+#: client/helpdata.c:995
msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
msgstr ""
-#: client/helpdata.c:1000
+#: client/helpdata.c:998
msgid "* Will never achieve veteran status.\n"
msgstr ""
-#: client/helpdata.c:1002
+#: client/helpdata.c:1000
msgid "* May become veteran through training or combat.\n"
msgstr ""
-#: client/helpdata.c:1008
+#: client/helpdata.c:1006
#, c-format
msgid ""
"* Must end turn in a city or next to land, or has a 50%% risk of being lost "
"at sea.\n"
msgstr ""
-#: client/helpdata.c:1012
+#: client/helpdata.c:1010
#, c-format
msgid "* The discovery of %s reduces the risk to 25%%.\n"
msgstr ""
-#: client/helpdata.c:1017
+#: client/helpdata.c:1015
#, c-format
msgid "* %s reduces the risk to 12%%.\n"
msgstr ""
@@ -8248,27 +8251,27 @@ msgstr ""
#. * last two elements
#. TRANS: List of possible output types has this between
#. * last two elements
-#: client/helpdata.c:1068 client/helpdata.c:1402
+#: client/helpdata.c:1066 client/helpdata.c:1400
msgid " or "
msgstr " aÅ "
-#: client/helpdata.c:1070 client/helpdata.c:1390
+#: client/helpdata.c:1068 client/helpdata.c:1388
msgid "?or:, "
msgstr "?or:, "
-#: client/helpdata.c:1082
+#: 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"
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:1124
+#: client/helpdata.c:1122
#, 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:1129
+#: client/helpdata.c:1127
#, c-format
msgid ""
"To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8277,90 +8280,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:1137
+#: client/helpdata.c:1135
msgid "You cannot research this technology."
msgstr "Vi ne povas studi tiun ĉi teĥnologion."
-#: client/helpdata.c:1141
+#: client/helpdata.c:1139
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:1153
+#: client/helpdata.c:1151
#, c-format
msgid "* The first player to research %s gets an immediate advance.\n"
msgstr ""
-#: client/helpdata.c:1158
+#: client/helpdata.c:1156
#, c-format
msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
msgstr ""
-#: client/helpdata.c:1161
+#: client/helpdata.c:1159
#, c-format
msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
msgstr ""
-#: client/helpdata.c:1165
+#: client/helpdata.c:1163
msgid "* Increases the pollution generated by the population.\n"
msgstr ""
-#: client/helpdata.c:1170
+#: client/helpdata.c:1168
#, c-format
msgid "* Allows %s to build roads on river squares.\n"
msgstr ""
-#: client/helpdata.c:1177
+#: client/helpdata.c:1175
#, c-format
msgid "* Allows %s to build fortresses.\n"
msgstr ""
-#: client/helpdata.c:1185
+#: client/helpdata.c:1183
#, c-format
msgid "* Allows %s to build airbases.\n"
msgstr ""
-#: client/helpdata.c:1194
+#: client/helpdata.c:1192
#, c-format
msgid "* Allows %s to upgrade roads to railroads.\n"
msgstr ""
-#: client/helpdata.c:1202
+#: client/helpdata.c:1200
#, c-format
msgid "* Allows %s to upgrade irrigation to farmland.\n"
msgstr ""
-#: client/helpdata.c:1236
+#: client/helpdata.c:1234
msgid "* Pollution cannot be generated on this terrain."
msgstr ""
-#: client/helpdata.c:1241
+#: client/helpdata.c:1239
msgid "* You cannot build cities on this terrain."
msgstr ""
-#: client/helpdata.c:1247
+#: client/helpdata.c:1245
msgid "* The coastline of this terrain is unsafe."
msgstr ""
-#: client/helpdata.c:1252
+#: client/helpdata.c:1250
msgid "* This terrain is unsafe for units to travel on."
msgstr ""
-#: client/helpdata.c:1257
+#: client/helpdata.c:1255
msgid "* Land units cannot travel on oceanic terrains."
msgstr ""
-#: client/helpdata.c:1307
+#: client/helpdata.c:1305
msgid "Features:\n"
msgstr ""
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1413 client/helpdata.c:1414
+#: client/helpdata.c:1411 client/helpdata.c:1412
msgid "?outputlist: Nothing "
msgstr "?outputlist: Nenio "
-#: client/helpdata.c:1421
+#: client/helpdata.c:1419
#, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
@@ -8371,7 +8374,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:1431
+#: client/helpdata.c:1429
#, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8379,48 +8382,48 @@ msgid ""
msgstr ""
#. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1439
+#: client/helpdata.c:1437
#, c-format
msgid "* You pay %d times normal %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1444
+#: client/helpdata.c:1442
#, 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:1449
+#: client/helpdata.c:1447
#, c-format
msgid "* You pay no %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1453
+#: client/helpdata.c:1451
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:1462
+#: client/helpdata.c:1460
#, 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:1470
+#: client/helpdata.c:1468
#, c-format
msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
msgstr ""
-#: client/helpdata.c:1477
+#: client/helpdata.c:1475
#, 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:1484
+#: client/helpdata.c:1482
#, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -8428,23 +8431,23 @@ msgid ""
msgstr ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1491
+#: client/helpdata.c:1489
#, 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:1499
+#: client/helpdata.c:1497
#, c-format
msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
msgstr ""
-#: client/helpdata.c:1504
+#: client/helpdata.c:1502
msgid "Has unlimited science/gold/luxuries rates.\n"
msgstr ""
-#: client/helpdata.c:1509
+#: client/helpdata.c:1507
#, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
@@ -8455,7 +8458,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:1521
+#: client/helpdata.c:1519
#, 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"
@@ -8463,60 +8466,60 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1532
+#: client/helpdata.c:1530
#, 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:1538
+#: client/helpdata.c:1536
msgid "* Your units cannot be bribed.\n"
msgstr ""
-#: client/helpdata.c:1541
+#: client/helpdata.c:1539
msgid "* Your cities cannot be incited.\n"
msgstr ""
-#: client/helpdata.c:1545
+#: client/helpdata.c:1543
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:1551
+#: client/helpdata.c:1549
msgid "* Has a senate that may prevent declaration of war.\n"
msgstr ""
-#: client/helpdata.c:1555
+#: client/helpdata.c:1553
msgid "* Allows partisans when cities are taken by the enemy.\n"
msgstr ""
-#: client/helpdata.c:1559
+#: client/helpdata.c:1557
msgid ""
"* Buildings that normally confer bonuses against unhappiness will instead "
"give gold.\n"
msgstr ""
-#: client/helpdata.c:1563
+#: client/helpdata.c:1561
msgid "* Pays no upkeep for fanatics.\n"
msgstr ""
-#: client/helpdata.c:1566
+#: client/helpdata.c:1564
msgid "* Has no unhappy citizens.\n"
msgstr ""
-#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
+#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
#, c-format
msgid "* Veteran %s units.\n"
msgstr ""
-#: client/helpdata.c:1587
+#: client/helpdata.c:1585
msgid "* Veteran units.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1593
+#: client/helpdata.c:1591
#, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8524,7 +8527,7 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1602
+#: client/helpdata.c:1600
#, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8532,438 +8535,485 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1610
+#: client/helpdata.c:1608
#, 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:1619
+#: client/helpdata.c:1617
#, c-format
msgid "* %s production is increased %d%%.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1627
+#: client/helpdata.c:1625
#, c-format
msgid "* %s production will suffer massive waste.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1632
+#: client/helpdata.c:1630
#, c-format
msgid "* %s production will suffer some waste.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1637
+#: client/helpdata.c:1635
#, 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:1645
+#: client/helpdata.c:1643
#, 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:1651
+#: client/helpdata.c:1649
#, 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:1657
+#: client/helpdata.c:1655
#, c-format
msgid "* %s waste will increase slowly with distance from capital.\n"
msgstr ""
-#: client/helpdata.c:1674
+#: client/helpdata.c:1672
#, c-format
msgid "* Allows you to build %s.\n"
msgstr ""
#. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1701
+#: client/helpdata.c:1699
#, c-format
msgid "%s%d %s"
msgstr "%s%d %s"
-#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1700 client/helpdata.c:1708 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:1709
+#: client/helpdata.c:1707
#, c-format
msgid "%s%d unhappy"
msgstr "%s%d malkontenta(j)"
-#: client/mapctrl_common.c:382
+#: client/mapctrl_common.c:399
#, c-format
msgid "You don't know how to build %s!"
msgstr "Vi ne scias kiel konstrui %sn!"
-#: client/mapctrl_common.c:392
+#: client/mapctrl_common.c:409
#, c-format
msgid "Copy %s to clipboard."
msgstr "Kopiu %sn en la poÅon."
-#: client/mapctrl_common.c:408
+#: client/mapctrl_common.c:425
msgid "Clipboard is empty."
msgstr "La poÅo estas malplena."
-#: client/options.c:98
+#: client/options.c:102
msgid "Graphics"
msgstr "Grafikaĵoj"
-#: client/options.c:99
+#: client/options.c:103
msgid "Overview"
msgstr "Priskribo"
-#: client/options.c:100
+#: client/options.c:104
msgid "Sound"
msgstr "AÅdo"
-#: client/options.c:101
+#: client/options.c:105
msgid "Interface"
msgstr "Interfaco"
-#: client/options.c:102
+#: client/options.c:106
msgid "Network"
msgstr "Reto"
-#: client/options.c:107
+#: client/options.c:111
msgid "Login name"
msgstr "Nomo"
-#: client/options.c:108
+#: client/options.c:112
msgid ""
"This is the default login username that will be used in the connection "
"dialogs or with the -a command-line parameter."
msgstr ""
-#: client/options.c:113
+#: client/options.c:117
msgid "Server"
msgstr "Servilo"
-#: client/options.c:114
+#: client/options.c:118
msgid ""
"This is the default server hostname that will be used in the connection "
"dialogs or with the -a command-line parameter."
msgstr ""
-#: client/options.c:119
+#: client/options.c:123
msgid "Server port"
msgstr "Pordo de la servilo"
-#: client/options.c:120
+#: client/options.c:124
msgid ""
"This is the default server port that will be used in the connection dialogs "
"or with the -a command-line parameter."
msgstr ""
-#: client/options.c:125 client/gui-win32/connectdlg.c:912 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
msgid "Metaserver"
msgstr "Metaservilo"
-#: client/options.c:126
+#: client/options.c:130
msgid ""
"The metaserver is a host that the client contacts to find out about games on "
"the internet. Don't change this from its default value unless you know what "
"you're doing."
msgstr ""
-#: client/options.c:132
+#: client/options.c:136
msgid "Soundset"
msgstr "Sonaĵoj"
-#: client/options.c:133
+#: client/options.c:137
msgid ""
"This is the soundset that will be used. Changing this is the same as using "
"the -S command-line parameter."
msgstr ""
-#: client/options.c:138
+#: client/options.c:142
msgid "Sound plugin"
msgstr "Sona kromaĵo"
-#: client/options.c:139
+#: client/options.c:143
msgid ""
"If you have a problem with sound, try changing the sound plugin. The new "
"plugin won't take effect until you restart Freeciv. Changing this is the "
"same as using the -P command-line option."
msgstr ""
-#: client/options.c:144 client/gui-sdl/gui_main.c:162
+#: client/options.c:148 client/gui-sdl/gui_main.c:162
msgid "Theme"
msgstr "Temo"
-#: client/options.c:145
+#: client/options.c:149
msgid "By changing this option you change the active theme."
msgstr ""
-#: client/options.c:148
+#: client/options.c:152
msgid "Tileset"
msgstr "Grafikaĵo"
-#: client/options.c:149
+#: client/options.c:153
msgid ""
"By changing this option you change the active tileset. This is the same as "
"using the -t command-line parameter."
msgstr ""
-#: client/options.c:156
+#: client/options.c:160
msgid "Solid unit background color"
msgstr "Solida fona koloro por la unuoj"
-#: client/options.c:157
+#: client/options.c:161
msgid ""
"Setting this option will cause units on the map view to be drawn with a "
"solid background color instead of the flag backdrop."
msgstr ""
-#: client/options.c:161 client/gui-sdl/optiondlg.c:960
+#: client/options.c:165 client/gui-sdl/optiondlg.c:960
msgid "Sound bell at new turn"
msgstr "Sonu per bip-signalo la novan vicon"
-#: client/options.c:162
+#: client/options.c:166
msgid ""
"Set this option to have a \"bell\" event be generated at the start of a new "
"turn. You can control the behavior of the \"bell\" event by editing the "
"message options."
msgstr ""
-#: client/options.c:168
+#: client/options.c:172
msgid "Unit movement animation time (milliseconds)"
msgstr "DaÅro de la animacio por la movoj de la unuoj (milisekundoj)"
-#: client/options.c:169
+#: client/options.c:173
msgid ""
"This option controls how long unit \"animation\" takes when a unit moves on "
"the map view. Set it to 0 to disable animation entirely."
msgstr ""
-#: client/options.c:174
+#: client/options.c:178
msgid "Mapview recentering time (milliseconds)"
msgstr "Tempo por ree centrigo de la mapo (milisekundoj)"
-#: client/options.c:175
+#: client/options.c:179
msgid ""
"When the map view is recentered, it will slide smoothly over the map to its "
"new position. This option controls how long this slide lasts. Set it to 0 "
"to disable mapview sliding entirely."
msgstr ""
-#: client/options.c:180 client/gui-sdl/optiondlg.c:1014
+#: client/options.c:184 client/gui-sdl/optiondlg.c:1014
msgid "Show combat animation"
msgstr "Vidigu animacion de la batalado"
-#: client/options.c:181
+#: client/options.c:185
msgid ""
"Disabling this option will turn off combat animation between units on the "
"mapview."
msgstr ""
-#: client/options.c:184
+#: client/options.c:188
msgid "Draw the citybar"
msgstr "Desegnu urbostangon"
-#: client/options.c:185
+#: client/options.c:189
msgid ""
"Setting this option will display a 'citybar' containing useful information "
"beneath each city. Disabling this option will display only the city's name "
"and optionally, production."
msgstr ""
-#: client/options.c:191
+#: client/options.c:195
msgid "Show icons in the technology tree"
msgstr "Vidigu ikonojn en la teĥnologia arbumo"
-#: client/options.c:192
+#: client/options.c:196
msgid ""
"Setting this option will display icons on the technology tree diagram. "
"Turning this option off makes the technology tree more compact."
msgstr ""
-#: client/options.c:197
+#: client/options.c:201
msgid "Draw shield graphics for units"
msgstr "Desegnu Åildeton por unuoj"
-#: client/options.c:198
+#: client/options.c:202
msgid ""
"Setting this option will draw a shield icon as the flags on units. If "
"unset, the full flag will be drawn."
msgstr ""
-#: client/options.c:202
+#: client/options.c:206
msgid "Manual Turn Done in AI Mode"
msgstr "Mana vico-fino en IA-moduso"
-#: client/options.c:203
+#: client/options.c:207
msgid ""
"Disable this option if you do not want to press the Turn Done button "
"manually when watching an AI player."
msgstr ""
-#: client/options.c:207 client/gui-sdl/optiondlg.c:1121
+#: client/options.c:211 client/gui-sdl/optiondlg.c:1121
msgid "Auto Center on Units"
msgstr "AÅtomata centrigo de la unuoj "
-#: client/options.c:208
+#: client/options.c:212
msgid ""
"Set this option to have the active unit centered automatically when the unit "
"focus changes."
msgstr ""
-#: client/options.c:211 client/gui-sdl/optiondlg.c:1147
+#: client/options.c:215 client/gui-sdl/optiondlg.c:1147
msgid "Auto Center on Combat"
msgstr "AÅtomata centrigo de la bataloj"
-#: client/options.c:212
+#: client/options.c:216
msgid ""
"Set this option to have any combat be centered automatically. Disabled this "
"will speed up the time between turns but may cause you to miss combat "
"entirely."
msgstr ""
-#: client/options.c:217 client/gui-sdl/optiondlg.c:1174
+#: client/options.c:221 client/gui-sdl/optiondlg.c:1174
msgid "Focus on Awakened Units"
msgstr "Enfazigu aktivajn unuojn"
-#: client/options.c:218
+#: client/options.c:222
msgid "Set this option to have newly awoken units be focused automatically."
msgstr ""
-#: client/options.c:221
+#: client/options.c:225
msgid "Allow goto into the unknown"
msgstr "Ebligu iri al la nekonataj landoj"
-#: client/options.c:222
+#: client/options.c:226
msgid ""
"Setting this option will make the game consider moving into unknown tiles. "
"If not, then goto routes will detour around or be blocked by unknown tiles."
msgstr ""
-#: client/options.c:226
+#: client/options.c:230
msgid "Center map when Popup city"
msgstr "Centrigu la mapon kiam urbo iÄas aktiva"
-#: client/options.c:227
+#: client/options.c:231
msgid ""
"Setting this option makes the mapview center on a city when its city dialog "
"is popped up."
msgstr ""
-#: client/options.c:230
+#: client/options.c:234
msgid "Concise City Production"
msgstr "Konciza produktado de la urbo"
-#: client/options.c:231
+#: client/options.c:235
msgid ""
"Set this option to make the city production (as shown in the city dialog) to "
"be more compact."
msgstr ""
-#: client/options.c:234 client/gui-sdl/optiondlg.c:1252
+#: client/options.c:238 client/gui-sdl/optiondlg.c:1252
msgid "End Turn when done moving"
msgstr "Finigu la vicon kiam ĉiuj movoj estas plenumitaj"
-#: client/options.c:235
+#: client/options.c:239
msgid ""
"Setting this option makes your turn end automatically when all your units "
"are done moving."
msgstr ""
-#: client/options.c:238 client/gui-sdl/optiondlg.c:1226
+#: client/options.c:242 client/gui-sdl/optiondlg.c:1226
msgid "Prompt for city names"
msgstr "Invito por nomoj de la urboj"
-#: client/options.c:239
+#: client/options.c:243
msgid ""
"Disabling this option will make the names of newly founded cities chosen "
"automatically by the server."
msgstr ""
-#: client/options.c:242 client/gui-sdl/optiondlg.c:1200
+#: client/options.c:246 client/gui-sdl/optiondlg.c:1200
msgid "Pop up city dialog for new cities"
msgstr "Malfermu Åprucfenestron pri urbo por novaj urboj"
-#: client/options.c:243
+#: client/options.c:247
msgid ""
"Setting this option will pop up a newly-founded city's city dialog "
"automatically."
msgstr ""
-#: client/options.c:248
+#: client/options.c:250
+#, fuzzy
+msgid "Pop up caravan actions"
+msgstr "Agoj de Karavano"
+
+#: client/options.c:251
+msgid ""
+"If this option is enabled, when caravans arrive at a city where they can "
+"establish a traderoute or help build a wonder, a window will popup asking "
+"which action should be performed. Disabling this option means you will have "
+"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 ""
+
+#: client/options.c:260
+msgid "Enable cursor changing"
+msgstr ""
+
+#: client/options.c:261
+msgid ""
+"This option controls whether the client should try to change the mouse "
+"cursor depending on what is being pointed at, as well as to indicate changes "
+"in the client or server state."
+msgstr ""
+
+#: client/options.c:266
+msgid "Select cities before units"
+msgstr ""
+
+#: 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 ""
+
+#: client/options.c:272
+msgid "Clear unit orders on selection"
+msgstr ""
+
+#: client/options.c:273
+msgid ""
+"Enabling this option will cause unit orders to be cleared whenever one or "
+"more units are selected. If this option is disabled, selecting units will "
+"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 ""
+
+#: client/options.c:282
msgid "Background layer"
msgstr "Fona tavolo"
-#: client/options.c:249
+#: client/options.c:283
msgid "The background layer of the overview shows just ocean and land."
msgstr ""
-#: client/options.c:252
+#: client/options.c:286
msgid "Terrain relief map layer"
msgstr "Reliefa tavolo de grundoj"
-#: client/options.c:253
+#: client/options.c:287
msgid "The relief layer shows all terrains on the map."
msgstr ""
-#: client/options.c:256
+#: client/options.c:290
msgid "Borders layer"
msgstr "Tavolo de landlimoj"
-#: client/options.c:257
+#: client/options.c:291
msgid ""
"The borders layer of the overview shows which tiles are owned by each player."
msgstr ""
-#: client/options.c:261
+#: client/options.c:295
msgid "Units layer"
msgstr "Tavolo de unuoj"
-#: client/options.c:262
+#: client/options.c:296
msgid "Enabling this will draw units on the overview."
msgstr ""
-#: client/options.c:265
+#: client/options.c:299
msgid "Cities layer"
msgstr "Tavolo de urboj"
-#: client/options.c:266
+#: client/options.c:300
msgid "Enabling this will draw cities on the overview."
msgstr ""
-#: client/options.c:269
+#: client/options.c:303
msgid "Overview fog of war"
msgstr "Militnebulo en la trarigardo"
-#: client/options.c:270
+#: client/options.c:304
msgid "Enabling this will show fog of war on the overview."
msgstr ""
-#: client/options.c:488
+#: client/options.c:526
msgid "If you add a preset by hand, also update \"number_of_presets\""
msgstr ""
-#: client/options.c:516
+#: client/options.c:554
msgid "Cannot find your home directory"
msgstr "Estas neeble trovi vian hejm-dosierujon"
-#: client/options.c:665 client/options.c:796
+#: client/options.c:703 client/options.c:834
msgid "Save failed, cannot find a filename."
msgstr "La konservo malsukcesis, estas neeble trovi dosiernomon."
-#: client/options.c:678 client/options.c:859
+#: client/options.c:716 client/options.c:897
#, c-format
msgid "Save failed, cannot write to file %s"
msgstr "La konservo malsukcesis, estas neeble skribi en la dosiero %s"
-#: client/options.c:680 client/options.c:862
+#: client/options.c:718 client/options.c:900
#, c-format
msgid "Saved settings to file %s"
msgstr "La agordaĵoj estas konservitaj en la dosiero %s"
@@ -8988,16 +9038,16 @@ msgstr "Ĉeno de la servilkapacito: %s"
msgid "Start of turn %d"
msgstr "Komenco de la %da vico"
-#: client/packhand.c:1590
+#: client/packhand.c:1591
#, c-format
msgid "AI Mode is now %s."
msgstr "La IA-moduso nun estas %s."
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "ON"
msgstr "aktiva"
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "OFF"
msgstr "malaktiva"
@@ -9030,14 +9080,15 @@ msgid "Username"
msgstr "Uzantonomo"
#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
-#: client/gui-gtk-2.0/pages.c:2085
+#: client/gui-gtk-2.0/pages.c:2157
msgid "Flag"
msgstr "Flago"
#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
-#: client/gui-gtk-2.0/pages.c:1536 client/gui-gtk-2.0/pages.c:2087
-#: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
-#: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
+#: 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/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr "Nacio"
@@ -9049,7 +9100,7 @@ msgstr "Landlimo"
msgid "Score"
msgstr "Poentaro"
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
msgid "Team"
msgstr "Grupo"
@@ -9120,277 +9171,303 @@ msgstr "%s ne povus esti dissolvitaj."
msgid "Could not open temp file."
msgstr ""
-#: client/servers.c:407
+#: client/servers.c:410
msgid "Invalid $http_proxy or metaserver value, must start with 'http://'"
msgstr ""
-#: client/servers.c:413
+#: client/servers.c:416
msgid "Failed looking up metaserver's host"
msgstr ""
-#: client/text.c:85 client/text.c:86 client/text.c:91
+#. TRANS: "AI <player name>"
+#: client/text.c:94
+#, c-format
+msgid "AI %s"
+msgstr ""
+
+#. TRANS: "<nation adjective>, team <team name>"
+#: client/text.c:118
+#, fuzzy, c-format
+msgid "%s, team %s"
+msgstr "%s de la %s"
+
+#: client/text.c:135 client/text.c:136 client/text.c:141
#: client/gui-sdl/mapview.c:752
msgid "?nation:Neutral"
msgstr "?nation:NeÅtrala"
-#: client/text.c:85 client/gui-sdl/mapview.c:752
+#: client/text.c:135 client/gui-sdl/mapview.c:752
msgid "?nation:Hostile"
msgstr "?nation:Malamika"
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Peaceful"
msgstr "?nation:Paca"
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Friendly"
msgstr "?nation:Amika"
-#: client/text.c:88 client/gui-sdl/mapview.c:755
+#: client/text.c:138 client/gui-sdl/mapview.c:755
msgid "?nation:Mysterious"
msgstr "?nation:Mistera"
-#: client/text.c:88
+#: client/text.c:138
msgid "?nation:Friendly(team)"
msgstr "?nation:Amika (grupo)"
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
msgid "?city:Neutral"
msgstr "?city:NeÅtrala"
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
msgid "?city:Hostile"
msgstr "?city:Malamika"
-#: client/text.c:92 client/gui-sdl/mapview.c:786
+#: client/text.c:142 client/gui-sdl/mapview.c:786
msgid "?city:Peaceful"
msgstr "?city:Paca"
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Friendly"
msgstr "?city:Amika"
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Mysterious"
msgstr "?city:Mistera"
-#: client/text.c:93
+#: client/text.c:143
msgid "?city:Friendly(team)"
msgstr "?city:Amika(grupo)"
-#: client/text.c:100
+#: client/text.c:151
#, c-format
msgid "Location: (%d, %d) [%d]"
msgstr "LokiÄo: (%d, %d) [%d]"
-#: client/text.c:109
+#: client/text.c:153
+#, c-format
+msgid "Native coordinates: (%d, %d)"
+msgstr ""
+
+#: client/text.c:160
#, c-format
msgid "Terrain: %s"
msgstr "Grundo: %s"
-#: client/text.c:110
+#: client/text.c:161
#, c-format
msgid "Food/Prod/Trade: %s"
msgstr "Nutraĵo/Prod/Komerco: %s"
-#: client/text.c:113
+#: client/text.c:164
msgid "Minor Tribe Village"
msgstr "VilaÄo de eta tribo"
-#: client/text.c:119
+#: client/text.c:173
msgid "Our territory"
msgstr "Nia teritorio"
-#. TRANS: "Polish territory"
-#: client/text.c:122
-#, c-format
-msgid "%s territory"
-msgstr "%s teritorio"
+#. TRANS: "Territory of <username> (<nation + team>)"
+#: client/text.c:176
+#, fuzzy, c-format
+msgid "Territory of %s (%s)"
+msgstr ""
+"\n"
+"Teritorio de la %s %s"
-#. TRANS: "Polish territory (5 turn cease-fire)"
-#: client/text.c:131
-#, c-format
-msgid "%s territory (%d turn cease-fire)"
-msgid_plural "%s territory (%d turn cease-fire)"
-msgstr[0] "%s teritorio (%d vico de pafĉesigo)"
-msgstr[1] "%s teritorio (%d vicoj de pafĉesigo)"
+#: client/text.c:186
+#, fuzzy, c-format
+msgid "Territory of %s (%s) (%d turn cease-fire)"
+msgid_plural "Territory of %s (%s) (%d turn cease-fire)"
+msgstr[0] "Urbo: %s (%s, %d vico de pafĉesigo)"
+msgstr[1] "Urbo: %s (%s, %d vicoj de pafĉesigo)"
-#. TRANS: "Polish territory (friendly)"
-#: client/text.c:140
-#, c-format
-msgid "%s territory (%s)"
-msgstr "%s teritorio (%s)"
+#. TRANS: "Territory of <username>
+#. * (<nation + team> | <diplomatic state>)"
+#: client/text.c:195
+#, fuzzy, c-format
+msgid "Territory of %s (%s | %s)"
+msgstr ""
+"\n"
+"Teritorio de la %s %s"
-#: client/text.c:145
+#: client/text.c:200
msgid "Unclaimed territory"
msgstr "Nenies teritorio"
-#. TRANS: "City: Warsaw (Polish)"
-#: client/text.c:156
-#, c-format
-msgid "City: %s (%s)"
-msgstr "Urbo: %s (%s)"
+#. TRANS: "City: <city name> | <username> (<nation + team>)"
+#: client/text.c:214
+#, fuzzy, c-format
+msgid "City: %s | %s (%s)"
+msgstr "Urbo: %s (%s, %s)"
-#. TRANS: "City: Warsaw (Polish, 5 turn cease-fire)"
-#: client/text.c:166
-#, c-format
-msgid "City: %s (%s, %d turn cease-fire)"
-msgid_plural "City: %s (%s, %d turn cease-fire)"
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <number> turn cease-fire)"
+#: client/text.c:224
+#, fuzzy, c-format
+msgid "City: %s | %s (%s, %d turn cease-fire)"
+msgid_plural "City: %s | %s (%s, %d turn cease-fire)"
msgstr[0] "Urbo: %s (%s, %d vico de pafĉesigo)"
msgstr[1] "Urbo: %s (%s, %d vicoj de pafĉesigo)"
-#. TRANS: "City: Warsaw (Polish,friendly)"
-#: client/text.c:174
-#, c-format
-msgid "City: %s (%s, %s)"
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <diplomatic state>)"
+#: client/text.c:231
+#, fuzzy, c-format
+msgid "City: %s | %s (%s, %s)"
msgstr "Urbo: %s (%s, %s)"
#. TRANS: previous lines gave other information about the city.
-#: client/text.c:189
+#: client/text.c:246
#, c-format
msgid "?clistbegin: with %s"
msgstr "?clistbegin: kun %s"
#. TRANS: "Trade from Warsaw: 5"
-#: client/text.c:202
+#: client/text.c:259
#, c-format
msgid "Trade from %s: %d"
msgstr "Komercado el %s: %d"
-#: client/text.c:210
+#: client/text.c:267
#, c-format
msgid "Infrastructure: %s"
msgstr "Instalaĵo: %s"
-#: client/text.c:215
+#: client/text.c:272
#, c-format
msgid "Activity: %s"
msgstr "Ago: %s"
-#. TRANS: "Unit: Musketeers (Polish, Warsaw)"
-#. TRANS: "Unit: Musketeers (Polish,friendly)"
-#: client/text.c:226 client/text.c:253
-#, c-format
-msgid "Unit: %s (%s, %s)"
+#. TRANS: "Unit: <unit type> | <username>
+#. * (<nation + team>, <homecity>)"
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <diplomatic state>)"
+#: client/text.c:287 client/text.c:313
+#, fuzzy, c-format
+msgid "Unit: %s | %s (%s, %s)"
msgstr "Unuo: %s (%s, %s)"
-#. TRANS: "Unit: Musketeers (Polish)"
-#: client/text.c:232
-#, c-format
-msgid "Unit: %s (%s)"
-msgstr "Unuo: %s (%s)"
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>)"
+#: client/text.c:292
+#, fuzzy, c-format
+msgid "Unit: %s | %s (%s)"
+msgstr "Unuo: %s (%s, %s)"
-#. TRANS: "Unit: Musketeers (Polish, 5 turn cease-fire)"
-#: client/text.c:245
-#, c-format
-msgid "Unit: %s (%s, %d turn cease-fire)"
-msgid_plural "Unit: %s (%s, %d turn cease-fire)"
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <number> turn cease-fire)"
+#: client/text.c:305
+#, fuzzy, c-format
+msgid "Unit: %s | %s (%s, %d turn cease-fire)"
+msgid_plural "Unit: %s | %s (%s, %d turn cease-fire)"
msgstr[0] "Unuo: %s (%s, %d vico de pafĉesigo)"
msgstr[1] "Unuo: %s (%s, %d vicoj de pafĉesigo)"
#. TRANS: "Chance to win: A:95% D:46%"
-#: client/text.c:279
+#: client/text.c:338
#, c-format
msgid "Chance to win: A:%d%% D:%d%%"
msgstr "Åœancoj pri venko: A:%d%% D:%d%%"
#. TRANS: A is attack power, D is defense power, FP is firepower,
#. * HP is hitpoints (current and max).
-#: client/text.c:286
+#: client/text.c:345
#, c-format
msgid "A:%d D:%d FP:%d HP:%d/%d (%s)"
msgstr "A:%d D:%d FP:%d ĈP:%d/%d (%s)"
#. TRANS: "5 more" units on this tile
-#: client/text.c:295
+#: client/text.c:354
#, c-format
msgid " (%d more)"
msgstr " (%d plue)"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:364
+#: client/text.c:423
#, c-format
msgid "far from %s"
msgstr "fore de %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:367
+#: client/text.c:426
#, c-format
msgid "near %s"
msgstr "apud %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:370
+#: client/text.c:429
#, c-format
msgid "in %s"
msgstr "en %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:403
+#: client/text.c:462
#, c-format
msgid "from %s"
msgstr "de %s"
-#: client/text.c:466
+#: client/text.c:525
msgid "Progress: no research"
msgstr "Progreso: neniu studado"
-#: client/text.c:470
+#: client/text.c:529
msgid "Progress: no research target"
msgstr "Progreso: neniu celo por la studado"
-#: client/text.c:475
+#: client/text.c:534
#, c-format
msgid "Progress: %d turn/advance"
msgid_plural "Progress: %d turns/advance"
msgstr[0] "Progreso: %d vico/eltrovo"
msgstr[1] "Progreso: %d vicoj/eltrovo"
-#: client/text.c:480
+#: client/text.c:539
#, c-format
msgid "%d bulb/turn"
msgid_plural "%d bulbs/turn"
msgstr[0] "%d ampolo/vico"
msgstr[1] "%d ampoloj/vico"
-#: client/text.c:485
+#: client/text.c:544
#, c-format
msgid ", %d bulb/turn from team"
msgid_plural ", %d bulbs/turn from team"
msgstr[0] ", %d ampolo/vico por grupo"
msgstr[1] ", %d ampoloj/vico por grupo"
-#: client/text.c:512
+#: client/text.c:571
#, c-format
msgid "%d/- (never)"
msgstr "%d/- (neniam)"
-#: client/text.c:524
+#: client/text.c:583
#, c-format
msgid "%d/%d (%d turn)"
msgid_plural "%d/%d (%d turns)"
msgstr[0] "%d/%d (%d vico)"
msgstr[1] "%d/%d (%d vicoj)"
-#: client/text.c:527
+#: client/text.c:586
#, c-format
msgid "%d/%d (never)"
msgstr "%d/%d (neniam)"
-#: client/text.c:564
+#: client/text.c:623
#, c-format
msgid "%d step"
msgid_plural "%d steps"
msgstr[0] "%d paÅo"
msgstr[1] "%d paÅoj"
-#: client/text.c:566
+#: client/text.c:625
#, c-format
msgid "%d bulb"
msgid_plural "%d bulbs"
msgstr[0] "%d ampolo"
msgstr[1] "%d ampoloj"
-#: client/text.c:570 client/agents/cma_fec.c:269 client/agents/cma_fec.c:313
+#: client/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
#, c-format
msgid "%d turn"
@@ -9398,89 +9475,89 @@ msgid_plural "%d turns"
msgstr[0] "%d vico"
msgstr[1] "%d vicoj"
-#: client/text.c:592
+#: client/text.c:651
#, c-format
msgid "Population: %s"
msgstr "Populacio: %s"
-#: client/text.c:595
+#: client/text.c:654
#, c-format
msgid "Year: %s (T%d)"
msgstr "Jaro: %s (T%d)"
-#: client/text.c:598
+#: client/text.c:657
#, c-format
msgid "Gold: %d (%+d)"
msgstr "Oro: %d (%+d)"
-#: client/text.c:600
+#: client/text.c:659
#, fuzzy, c-format
msgid "Tax: %d Lux: %d Sci: %d"
msgstr "Imp: %d Lukso: %d Sci:%d"
-#: client/text.c:607
+#: client/text.c:666
#, fuzzy
msgid "Moving: Nobody"
msgstr "MoviÄanta: %s"
-#: client/text.c:609
+#: client/text.c:668
#, c-format
msgid "Moving: %s"
msgstr "MoviÄanta: %s"
-#: client/text.c:613
+#: client/text.c:672
msgid "(Click for more info)"
msgstr "(Alklaku por havi pli informojn)"
-#: client/text.c:629
+#: client/text.c:688
#, c-format
msgid "%s People"
msgstr "%s Popolo"
-#: client/text.c:633
+#: client/text.c:692
#, c-format
msgid "Turn: %d"
msgstr "Vico: %d"
-#: client/text.c:635 client/gui-win32/inteldlg.c:111
+#: client/text.c:694 client/gui-win32/inteldlg.c:111
#: client/gui-xaw/inteldlg.c:208
#, c-format
msgid "Gold: %d"
msgstr "Oro: %d"
-#: client/text.c:636
+#: client/text.c:695
#, c-format
msgid "Net Income: %d"
msgstr ""
#. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:639
+#: client/text.c:698
#, fuzzy, c-format
msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
msgstr "Procento: Oro:%d%% Lukso:%d%% Scienco:%d%%"
-#: client/text.c:643
+#: client/text.c:702
#, c-format
msgid "Researching %s: %s"
msgstr "Studante %sn: %s"
-#: client/text.c:650
+#: client/text.c:709
#, c-format
msgid "Global warming chance: %d%% (%+d%%/turn)"
msgstr "Probablo pri Äenerala varmiÄo: %d%% (%+d%%/vico)"
-#: client/text.c:653
+#: client/text.c:712
#, c-format
msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
msgstr "Probablo pri atomvintro: %d%% (%+d%%/vico)"
-#: client/text.c:658 client/gui-win32/inteldlg.c:104
+#: client/text.c:717 client/gui-win32/inteldlg.c:104
#: client/gui-xaw/inteldlg.c:200
#, c-format
msgid "Government: %s"
msgstr "Regsistemo: %s"
-#: client/text.c:682
+#: client/text.c:741
#, c-format
msgid "%d unit"
msgid_plural "%d units"
@@ -9488,55 +9565,55 @@ msgstr[0] "%d unuo"
msgstr[1] "%d unuoj"
#. TRANS: Impossible to reach goto target tile
-#: client/text.c:715 client/gui-sdl/mapview.c:566
+#: client/text.c:774 client/gui-sdl/mapview.c:566
msgid "?goto:Unreachable"
msgstr "?goto:Neatingebla"
-#: client/text.c:717 client/gui-sdl/mapview.c:568
+#: client/text.c:776 client/gui-sdl/mapview.c:568
#, c-format
msgid "Turns to target: %d"
msgstr "Vicoj al la celo: %d"
-#: client/text.c:719 client/gui-sdl/mapview.c:570
+#: client/text.c:778 client/gui-sdl/mapview.c:570
#, c-format
msgid "Turns to target: %d to %d"
msgstr "Vicoj al la celo: de %d Äis %d"
-#: client/text.c:725 client/gui-sdl/mapview.c:576
+#: client/text.c:784 client/gui-sdl/mapview.c:576
#, c-format
msgid "%d unit selected"
msgid_plural "%d units selected"
msgstr[0] "%d elektita unuo"
msgstr[1] "%d elektitaj unuoj"
-#: client/text.c:730 client/gui-sdl/mapview.c:581
+#: client/text.c:789 client/gui-sdl/mapview.c:581
msgid "No units selected."
msgstr "Neniu unuo estas elektita."
-#: client/text.c:804 client/gui-sdl/mapview.c:654
+#: client/text.c:863 client/gui-sdl/mapview.c:654
#, c-format
msgid "Others: %d civil; %d military"
msgstr "Aliuloj: %d civiloj; %d militistoj"
-#: client/text.c:806 client/gui-sdl/mapview.c:656
+#: client/text.c:865 client/gui-sdl/mapview.c:656
#, c-format
msgid "Others: %d civilian"
msgstr "Aliuloj: %d civiloj"
-#: client/text.c:808 client/gui-sdl/mapview.c:658
+#: client/text.c:867 client/gui-sdl/mapview.c:658
#, c-format
msgid "Others: %d military"
msgstr "Aliuloj: %d militistoj"
-#: client/text.c:839
+#: client/text.c:898
msgid "No units to upgrade!"
msgstr "Neniu Äisdatigenda unuo."
-#: client/text.c:864
+#: client/text.c:923
msgid "None of these units may be upgraded."
msgstr "Neniu el ĉi tiuj unuoj estas Äisdatigebla."
-#: client/text.c:870
+#: client/text.c:929
#, c-format
msgid ""
"Upgrade %d unit for %d gold?\n"
@@ -9551,72 +9628,72 @@ msgstr[1] ""
"Ĉu vi deziras modernigi %d unuojn per %d oraj moneroj?\n"
"La Åtata kaso entenas %d orajn monerojn."
-#: client/text.c:891
+#: client/text.c:950
msgid "Shows your progress in researching the current technology."
msgstr "Vidigu la evoluon de la studado pri la nuna teĥnologio."
-#: client/text.c:897
+#: client/text.c:956
msgid "no research target."
msgstr "Neniu celo pri studado."
#. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:900
+#: client/text.c:959
#, c-format
msgid "%s: %d/%d."
msgstr "%s: %d/%d."
-#: client/text.c:920
+#: client/text.c:979
msgid "Shows the progress of global warming:"
msgstr "Vidigu la evoluon de la Äenerala varmiÄo:"
-#: client/text.c:921
+#: client/text.c:980
#, c-format
msgid "Pollution rate: %d%%"
msgstr "Procento de poluado: %d%%"
-#: client/text.c:923
+#: client/text.c:982
#, c-format
msgid "Chance of catastrophic warming each turn: %d%%"
msgstr "Probablo pri katastrofa varmiÄo en ciu turno: %d%%"
-#: client/text.c:939
+#: client/text.c:998
msgid "Shows the progress of nuclear winter:"
msgstr "Vidigu la evoluon de la atomvintro:"
-#: client/text.c:940
+#: client/text.c:999
#, c-format
msgid "Fallout rate: %d%%"
msgstr "Radioaktiveco: %d%%"
-#: client/text.c:942
+#: client/text.c:1001
#, c-format
msgid "Chance of catastrophic winter each turn: %d%%"
msgstr "Probablo pri katastrofa vintro en ciu turno: %d%%"
-#: client/text.c:957
+#: client/text.c:1016
msgid "Shows your current government:"
msgstr "Vidigu vian nunan regsistemon:"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:981
+#: client/text.c:1040
#, c-format
msgid "Population: %5d"
msgstr "Populacio: %5d"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:1043
#, c-format
msgid "Support: %5d %%"
msgstr "Bazo: %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:1047
#, c-format
msgid "Energy: %5d %%"
msgstr "Energio: %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:992
+#: client/text.c:1051
#, c-format
msgid "Mass: %5d ton"
msgid_plural "Mass: %5d tons"
@@ -9624,96 +9701,97 @@ msgstr[0] "Maso: %5d tuno"
msgstr[1] "Maso: %5d tunoj"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1057
#, c-format
msgid "Travel time: %5.1f years"
msgstr "VojaÄodaÅro: %5.1f jaroj"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1061
msgid "Travel time: N/A "
msgstr "VojaÄodaÅro: - "
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1065
#, c-format
msgid "Success prob.: %5d %%"
msgstr "Sukcesprobablo: %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1010
+#: client/text.c:1069
#, c-format
msgid "Year of arrival: %8s"
msgstr "Alvenjaro: %8s"
-#: client/text.c:1030
+#: client/text.c:1089
msgid "?timeout:off"
msgstr "?timeout:-"
-#: client/text.c:1054
+#: client/text.c:1113
#, c-format
msgid "?seconds:%02ds"
msgstr "?seconds:%02ds"
-#: client/text.c:1056
+#: client/text.c:1115
#, c-format
msgid "?mins/secs:%02dm %02ds"
msgstr "?mins/secs:%02dm %02ds"
-#: client/text.c:1058
+#: client/text.c:1117
#, c-format
msgid "?hrs/mns:%02dh %02dm"
msgstr "?hrs/mns:%02dh %02dm"
-#: client/text.c:1060
+#: client/text.c:1119
#, c-format
msgid "?dys/hrs:%02dd %02dh"
msgstr "?dys/hrs:%02dg %02dh"
-#: client/text.c:1063
+#: client/text.c:1122
msgid "?duration:overflow"
msgstr "?duration:troo"
-#: client/text.c:1084
+#: client/text.c:1143
#, c-format
msgid "%6d.%02d ms"
msgstr "%6d.%02d ms"
-#. TRANS: "Republic of the Poles"
-#: client/text.c:1127
-#, c-format
-msgid "%s of the %s"
-msgstr "%s de la %s"
+#. TRANS: <nation adjective> <government name>.
+#. * E.g. "Polish Republic".
+#: client/text.c:1188
+#, fuzzy, c-format
+msgid "?nationgovernment:%s %s"
+msgstr "Regsistemo: %s"
#. TRANS: "Observer: 1985"
-#: client/text.c:1137
+#: client/text.c:1198
#, c-format
msgid "Observer: %s"
msgstr "Observanto: %s"
-#: client/text.c:1155
+#: client/text.c:1216
msgid "Buildings: "
msgstr "Konstruaĵoj: "
-#: client/text.c:1172 client/text.c:1211
+#: client/text.c:1233 client/text.c:1272
msgid "None. "
msgstr "Neniu. "
-#: client/text.c:1174 client/text.c:1213
+#: client/text.c:1235 client/text.c:1274
msgid "?clistend:."
msgstr "?clistend:."
-#: client/text.c:1192
+#: client/text.c:1253
msgid "Wonders: "
msgstr "Mirindaĵoj: "
-#: client/text.c:1247
+#: client/text.c:1308
#, 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:1251
+#: client/text.c:1312
#, c-format
msgid "%d content before penalty."
msgid_plural "%d content before penalty."
@@ -9721,45 +9799,45 @@ 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:1257
+#: client/text.c:1318
#, 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."
-#. TRANS: Martial law opening parenthesis
-#: client/text.c:1279
-msgid "Martial law in effect ("
+#: client/text.c:1339
+#, fuzzy
+msgid "Unlimited martial law in effect."
msgstr "Milita leÄo plenumanta ("
-#. TRANS: no [unit] maximum
-#: client/text.c:1284
-msgid "no maximum, "
-msgstr "neniu maksimumo, "
-
-#: client/text.c:1287
+#: client/text.c:1341
#, c-format
-msgid "%d unit maximum, "
-msgid_plural "%d units maximum, "
-msgstr[0] "%d unuo maksimume, "
-msgstr[1] "%d unuoj maksimume, "
+msgid "%d military unit may impose martial law."
+msgid_plural "Up to %d military units may impose martial law."
+msgstr[0] ""
+msgstr[1] ""
-#. TRANS: Martial law closing parenthesis
-#: client/text.c:1294
-#, c-format
-msgid "%d per unit). "
-msgstr "%d por unuo). "
+#: client/text.c:1345
+#, fuzzy, c-format
+msgid "Each military unit makes %d unhappy citizen content."
+msgid_plural "Each military unit makes %d unhappy citizens content."
+msgstr[0] ""
+"Äœi amuzas la civitanoj de unu urbo kaj igas kontentaj tri malkontentaj "
+"civitanoj."
+msgstr[1] ""
+"Äœi amuzas la civitanoj de unu urbo kaj igas kontentaj tri malkontentaj "
+"civitanoj."
-#: client/text.c:1298
+#: client/text.c:1352
msgid "Military units in the field may cause unhappiness. "
msgstr "Armeaj unuoj en la areo povus kaÅzi malkontenton. "
-#: client/text.c:1301
+#: client/text.c:1355
msgid "Military units have no happiness effect. "
msgstr "Armeaj unuoj ne havas feliĉigantan efikon. "
-#: client/text.c:1316
+#: client/text.c:1370
#, fuzzy, c-format
msgid "Luxury: %d total."
msgstr "Lukso: %d sume."
@@ -9781,7 +9859,7 @@ msgid ""
"instead."
msgstr "La kliento ne subtenas trarigardantajn grafikaĵojn."
-#: client/tilespec.c:3968
+#: client/tilespec.c:3966
#, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
@@ -9805,12 +9883,12 @@ msgid ""
msgstr ""
"La aÅtomata urba regado konfuzis la renkontiÄon kun %s. Estus bone kontroli."
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
-#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:599
+#: client/gui-gtk-2.0/cityrep.c:624 client/gui-sdl/citydlg.c:2009
msgid "none"
msgstr "neniu"
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:645
msgid "custom"
msgstr "persona"
@@ -10118,7 +10196,7 @@ msgstr "Starigu _komercan kurson"
msgid "Enter Marketplace"
msgstr "Eniru la bazaron"
-#: client/gui-gtk-2.0/chatline.c:144 client/gui-win32/chatline.c:134
+#: client/gui-gtk-2.0/chatline.c:218 client/gui-win32/chatline.c:134
#: client/gui-xaw/chatline.c:120
msgid "Cleared output window."
msgstr "La fenestro de mesaÄoj estas vakigita."
@@ -10200,11 +10278,11 @@ msgid "%d/%d %d turns"
msgstr "%d/%d %d vicoj"
#: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:821
+#: client/gui-gtk-2.0/cityrep.c:1027
msgid "_Buy"
msgstr "Aĉ_etu"
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:869
msgid "_Production"
msgstr "_Produktado"
@@ -10225,12 +10303,12 @@ msgid "Entertainers"
msgstr "Vervigantoj"
#: client/gui-gtk-2.0/citydlg.c:1029 client/gui-win32/citydlg.c:1989
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2403
msgid "Scientists"
msgstr "Sciencistoj"
#: client/gui-gtk-2.0/citydlg.c:1030 client/gui-win32/citydlg.c:1991
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2404
msgid "Taxmen"
msgstr "Impostistoj"
@@ -10323,7 +10401,7 @@ msgstr "Subtenitaj unuoj %d"
msgid "Present units %d"
msgstr "Ĉeestantaj unuoj %d"
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:1019
msgid "Cen_ter"
msgstr "C_entrigu"
@@ -10412,31 +10490,61 @@ msgstr "Renomu urbon"
msgid "What should we rename the city to?"
msgstr "Kiu estas la nova nomo de la urbo?"
-#: client/gui-gtk-2.0/cityrep.c:699
+#: client/gui-gtk-2.0/cityrep.c:794
+#, fuzzy
+msgid "(no worklists defined)"
+msgstr "(laborlisto)"
+
+#: client/gui-gtk-2.0/cityrep.c:876
msgid "Chan_ge"
msgstr "Åœan_Äu"
-#: client/gui-gtk-2.0/cityrep.c:703
+#: client/gui-gtk-2.0/cityrep.c:880
msgid "Add _First"
msgstr "Aldonu _unuan"
-#: client/gui-gtk-2.0/cityrep.c:707
+#: client/gui-gtk-2.0/cityrep.c:884
msgid "Add _Next"
msgstr "Aldonu _sekvan"
-#: client/gui-gtk-2.0/cityrep.c:711
+#: client/gui-gtk-2.0/cityrep.c:888
+#, fuzzy
+msgid "Add _2nd Last"
+msgstr "Aldonu _lastan"
+
+#: client/gui-gtk-2.0/cityrep.c:892
msgid "Add _Last"
msgstr "Aldonu _lastan"
-#: client/gui-gtk-2.0/cityrep.c:715
+#: client/gui-gtk-2.0/cityrep.c:899
+#, fuzzy
+msgid "Set Worklist"
+msgstr "Laborlisto"
+
+#: client/gui-gtk-2.0/cityrep.c:905
+#, fuzzy
+msgid "Append Worklist"
+msgstr "Renomu laborliston"
+
+#: client/gui-gtk-2.0/cityrep.c:911
+#, fuzzy
+msgid "Clear _Worklist"
+msgstr "Celo de la _Laborlisto:"
+
+#: client/gui-gtk-2.0/cityrep.c:916
+#, fuzzy
+msgid "Gover_nor"
+msgstr "Guberniestro"
+
+#: client/gui-gtk-2.0/cityrep.c:921
msgid "_Select"
msgstr "_Elektu"
-#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
+#: client/gui-gtk-2.0/cityrep.c:925 client/gui-gtk-2.0/plrdlg.c:521
msgid "_Display"
msgstr "_Ekrano"
-#: client/gui-gtk-2.0/cityrep.c:800 client/gui-gtk-2.0/menu.c:808
+#: 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-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
#: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -10446,100 +10554,100 @@ msgstr "_Ekrano"
msgid "Cities"
msgstr "Urboj"
-#: client/gui-gtk-2.0/cityrep.c:817
+#: client/gui-gtk-2.0/cityrep.c:1023
msgid "_Inspect"
msgstr "_Enketado"
-#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
-#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-sdl/helpdlg.c:297 client/gui-win32/menu.c:342
-#: client/gui-xaw/menu.c:241
+#: 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
+#: client/gui-gtk-2.0/cityrep.c:1518 client/gui-gtk-2.0/menu.c:823
+#: client/gui-gtk-2.0/menu.c:825 client/gui-gtk-2.0/menu.c:827
+#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:831
+#: client/gui-gtk-2.0/menu.c:833 client/gui-sdl/helpdlg.c:297
+#: client/gui-win32/menu.c:342 client/gui-xaw/menu.c:241
msgid "Improvements"
msgstr "Urbaj plibonigoj"
-#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
-#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
-#: client/gui-xaw/menu.c:247
+#: client/gui-gtk-2.0/cityrep.c:1441 client/gui-gtk-2.0/cityrep.c:1460
+#: client/gui-gtk-2.0/cityrep.c:1479 client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1522 client/gui-xaw/menu.c:247
msgid "Wonders"
msgstr "Mirindaĵoj"
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1662 client/gui-win32/cityrep.c:439
#: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
msgid "All Cities"
msgstr "Ĉiu urbo"
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1667 client/gui-win32/cityrep.c:440
msgid "No Cities"
msgstr "Neniu urbo"
-#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1672 client/gui-win32/cityrep.c:441
msgid "Invert Selection"
msgstr "Renversu elektaĵon"
-#: client/gui-gtk-2.0/cityrep.c:1420
+#: client/gui-gtk-2.0/cityrep.c:1682
msgid "Building Units"
msgstr "Prepari unuojn"
-#: client/gui-gtk-2.0/cityrep.c:1426
+#: client/gui-gtk-2.0/cityrep.c:1688
msgid "Building Improvements"
msgstr "Prepari plibonigojn"
-#: client/gui-gtk-2.0/cityrep.c:1432
+#: client/gui-gtk-2.0/cityrep.c:1694
msgid "Building Wonders"
msgstr "Konstrui mirindaĵojn"
-#: client/gui-gtk-2.0/cityrep.c:1444
+#: client/gui-gtk-2.0/cityrep.c:1706
msgid "Building Unit"
msgstr "Fondi urbon"
-#: client/gui-gtk-2.0/cityrep.c:1448
+#: client/gui-gtk-2.0/cityrep.c:1710
msgid "Building Improvement"
msgstr "Prepari plibonigon"
-#: client/gui-gtk-2.0/cityrep.c:1452
+#: client/gui-gtk-2.0/cityrep.c:1714
msgid "Building Wonder"
msgstr "Konstrui mirindaĵon"
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1722 client/gui-win32/cityrep.c:443
msgid "Coastal Cities"
msgstr "Marbordaj urboj"
-#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1727 client/gui-win32/cityrep.c:444
msgid "Same Island"
msgstr "Sama insulo"
-#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1737 client/gui-win32/cityrep.c:447
msgid "Supported Units"
msgstr "Subtenitaj unuoj"
-#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1740 client/gui-win32/cityrep.c:454
msgid "Units Present"
msgstr "Ĉeestantaj unuoj"
-#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1744 client/gui-win32/cityrep.c:469
msgid "Improvements in City"
msgstr "Plibonigoj en la urbo"
-#: client/gui-gtk-2.0/cityrep.c:1486
+#: client/gui-gtk-2.0/cityrep.c:1748
msgid "Wonders in City"
msgstr "Mirindaĵoj en la urbo"
-#: client/gui-gtk-2.0/cityrep.c:1495
+#: client/gui-gtk-2.0/cityrep.c:1757
msgid "Available Units"
msgstr "Disponeblaj unuoj"
-#: client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1760
msgid "Available Improvements"
msgstr "Disponeblaj plibonigoj"
-#: client/gui-gtk-2.0/cityrep.c:1501
+#: client/gui-gtk-2.0/cityrep.c:1763
msgid "Available Wonders"
msgstr "Disponeblaj mirindaĵoj"
-#: client/gui-gtk-2.0/cityrep.c:1625
+#: client/gui-gtk-2.0/cityrep.c:1882
#, fuzzy, c-format
msgid "Total Buy Cost: %d"
msgstr "Elspezo:"
@@ -10605,11 +10713,11 @@ msgstr ""
msgid "Remove this preset?"
msgstr ""
-#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:186
+#: client/gui-gtk-2.0/dialogs.c:196 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:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
msgid "Inspect _City"
msgstr "_Enketi la urbon"
@@ -10637,10 +10745,10 @@ msgstr "Kio estas disrabenda:"
msgid "Unit"
msgstr "Unuo"
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
-#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
-#: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
-#: manual/civmanual.c:302 data/Freeciv.in:80
+#: 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-win32/plrdlg.c:335 manual/civmanual.c:302 data/Freeciv.in:80
msgid "Name"
msgstr "Nomo"
@@ -10665,7 +10773,7 @@ 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:1036 data/Freeciv.in:3371
+#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
msgid "Pick Nation"
msgstr "Elektu nacion"
@@ -10744,7 +10852,7 @@ msgstr "_Mapoj"
msgid "_Advances"
msgstr "_Avanaĵoj"
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:910
+#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr "_Urboj"
@@ -10850,108 +10958,177 @@ msgstr "Elektu alvenpunkton"
msgid "Show _All Cities"
msgstr "Vidigu _ĉiujn urbojn"
-#: client/gui-gtk-2.0/gui_main.c:150
+#: client/gui-gtk-2.0/gui_main.c:162
msgid "Show Map Scrollbars"
msgstr "Vidigu rulumstangojn"
-#: client/gui-gtk-2.0/gui_main.c:151
+#: client/gui-gtk-2.0/gui_main.c:163
msgid "Disable this option to hide the scrollbars on the map view."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:155
+#: client/gui-gtk-2.0/gui_main.c:167
msgid "Keyboardless goto"
msgstr "\"Iru al\" senklavare"
-#: client/gui-gtk-2.0/gui_main.c:156
+#: client/gui-gtk-2.0/gui_main.c:168
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:161
+#: client/gui-gtk-2.0/gui_main.c:173
msgid "Keep dialogs on top"
msgstr "Tenu la dialgofenestrojn supre"
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:174
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:166
+#: client/gui-gtk-2.0/gui_main.c:178
msgid "Show worklist task icons"
msgstr "Vidigu ikonojn de la taskoj de la laborlisto"
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:179
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:171
+#: client/gui-gtk-2.0/gui_main.c:183
msgid "Enable status report tabs"
msgstr "Ebligu la langetojn de la raportoj pri la stato"
-#: client/gui-gtk-2.0/gui_main.c:172
+#: client/gui-gtk-2.0/gui_main.c:184
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:177 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:189 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:178 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:190 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:277 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:195
+msgid "Show time for each chat message"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:196
+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
+msgid "Split bottom notebook area"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:202
+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
+msgid "New message events go to top of list"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:208
+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
+msgid "Show extra message window buttons"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:214
+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 "
+"is disabled, these buttons will not appear (you can still double-click with "
+"the left mouse button or right-click on a row to inspect or goto "
+"respectively). This option will only take effect once the message window is "
+"closed and reopened."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:224
+msgid "Metaserver tab first in network page"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:225
+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
+msgid "Plain chat messages are sent to allies only"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:231
+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 "
+"messages will be sent as public chat messages. To send a public chat message "
+"with this option enabled, prefix the message with a single colon ':'. This "
+"option can also be set using a toggle button beside the chat entry (only "
+"visible in multiplayer games)."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:340 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:723 client/gui-gtk-2.0/gui_main.c:1345
+#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
msgid "Freeciv"
msgstr "Freeciv"
-#: client/gui-gtk-2.0/gui_main.c:1088 client/gui-gtk-2.0/gui_main.c:1095
+#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
#: 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:1095 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1232 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:1127 client/gui-gtk-2.0/menu.c:770
-#: client/gui-gtk-2.0/menu.c:772 client/gui-gtk-2.0/menu.c:774
-#: client/gui-gtk-2.0/menu.c:776 client/gui-gtk-2.0/menu.c:778
-#: client/gui-gtk-2.0/menu.c:780 client/gui-gtk-2.0/menu.c:782
-#: client/gui-gtk-2.0/menu.c:784 client/gui-gtk-2.0/menu.c:786
-#: client/gui-gtk-2.0/menu.c:788 client/gui-gtk-2.0/menu.c:790
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-gtk-2.0/menu.c:804 client/gui-gtk-2.0/menu.c:806
-#: client/gui-gtk-2.0/menu.c:808 client/gui-gtk-2.0/menu.c:810
-#: client/gui-gtk-2.0/menu.c:812 client/gui-gtk-2.0/menu.c:814
-#: client/gui-gtk-2.0/menu.c:816 client/gui-gtk-2.0/menu.c:818
-#: client/gui-gtk-2.0/menu.c:820 client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/gui_main.c:1266 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
+#: client/gui-gtk-2.0/menu.c:811 client/gui-gtk-2.0/menu.c:813
+#: client/gui-gtk-2.0/menu.c:815 client/gui-gtk-2.0/menu.c:817
+#: client/gui-gtk-2.0/menu.c:819 client/gui-gtk-2.0/menu.c:821
+#: client/gui-gtk-2.0/menu.c:823 client/gui-gtk-2.0/menu.c:825
+#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
+#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
+#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
+#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
+#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
+#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
#: data/Freeciv.in:2028
msgid "View"
msgstr "Videbligo"
-#: client/gui-gtk-2.0/gui_main.c:1208
+#: client/gui-gtk-2.0/gui_main.c:1359
msgid "Chat"
msgstr "_Babillineo"
-#: client/gui-gtk-2.0/gui_main.c:1224 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1377 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"
@@ -10962,75 +11139,79 @@ 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:1491
+#: client/gui-gtk-2.0/gui_main.c:1392
+msgid "Allies Only"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:1657
msgid "Not _ready"
msgstr "Ne preta"
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
+#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
msgid "_Ready"
msgstr "_Preta"
-#: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2132
+#: 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
msgid "_Start"
msgstr "_Startigu"
-#: client/gui-gtk-2.0/gui_main.c:1520
+#: client/gui-gtk-2.0/gui_main.c:1686
#, fuzzy
msgid "_Take Player"
msgstr "Prenu tiun ĉi ludanton"
-#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
+#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
msgid "Pick _Nation"
msgstr "Elektu _nacion"
-#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
+#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
msgid "_Observe"
msgstr "_Observi"
-#: client/gui-gtk-2.0/gui_main.c:1532
+#: client/gui-gtk-2.0/gui_main.c:1698
msgid "Do not _observe"
msgstr "Ne _observi"
-#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
#, fuzzy
msgid "<AI>"
msgstr "AI"
-#: client/gui-gtk-2.0/gui_main.c:1557
+#: client/gui-gtk-2.0/gui_main.c:1723
#, fuzzy
msgid "<Novice AI>"
msgstr "Novico"
-#: client/gui-gtk-2.0/gui_main.c:1560
+#: client/gui-gtk-2.0/gui_main.c:1726
#, fuzzy
msgid "<Easy AI>"
msgstr "Facila"
-#: client/gui-gtk-2.0/gui_main.c:1563
+#: client/gui-gtk-2.0/gui_main.c:1729
#, fuzzy
msgid "<Normal AI>"
msgstr "Normala"
-#: client/gui-gtk-2.0/gui_main.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1732
#, fuzzy
msgid "<Hard AI>"
msgstr "Malfacila"
-#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1742 client/gui-win32/dialogs.c:594
#: client/gui-xaw/pages.c:217
msgid "Random"
msgstr "Hazarda"
-#: client/gui-gtk-2.0/gui_main.c:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
msgid "Observer"
msgstr "Observanto"
-#: client/gui-gtk-2.0/gui_main.c:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
msgid "Detached"
msgstr "Malkonektigita"
-#: client/gui-gtk-2.0/gui_main.c:1899
+#: client/gui-gtk-2.0/gui_main.c:2073
msgid "Are you sure you want to quit?"
msgstr "Ĉu vi deziras eliri?"
@@ -11262,472 +11443,511 @@ msgstr "_Teĥnologioj"
msgid "Foreign Intelligence: %s Empire"
msgstr "Spionado: Imperio %s"
-#: client/gui-gtk-2.0/mapctrl.c:195 client/gui-sdl/mapctrl.c:2565
+#: client/gui-gtk-2.0/mapctrl.c:179 client/gui-sdl/mapctrl.c:2565
#: client/gui-sdl/menu.c:839 client/gui-sdl/menu.c:1021
#: client/gui-win32/mapctrl.c:353
msgid "Build New City"
msgstr "Konstruu novan urbon"
-#: client/gui-gtk-2.0/mapctrl.c:196 client/gui-sdl/mapctrl.c:2594
+#: client/gui-gtk-2.0/mapctrl.c:180 client/gui-sdl/mapctrl.c:2594
#: client/gui-win32/mapctrl.c:354 client/gui-xaw/mapctrl.c:89
msgid "What should we call our new city?"
msgstr "Kiel ni devas nomi nian novan urbon?"
-#: client/gui-gtk-2.0/mapview.c:147
+#: client/gui-gtk-2.0/mapview.c:158
#, fuzzy
msgid "Shows your current luxury/science/tax rates;click to toggle them."
msgstr ""
"Vidigu la nunan kvanto pri lukso/scienco/imposto; alklaku ĉi tie por "
"mastrumi ilin."
-#: client/gui-gtk-2.0/mapview.c:692 client/gui-win32/canvas.c:275
+#: client/gui-gtk-2.0/mapview.c:702 client/gui-win32/canvas.c:275
msgid "Better fog will only work in truecolor. Disabling it"
msgstr "Nebulo plenumas bone nur en verkolora moduso. Malebligu Äin"
-#: client/gui-gtk-2.0/menu.c:250
+#: client/gui-gtk-2.0/menu.c:256
msgid "Leaving a local game will end it!"
msgstr "Forlaso de loka ludo estas la fino de la ludo mem!"
-#: client/gui-gtk-2.0/menu.c:700 client/gui-win32/menu.c:303
+#: client/gui-gtk-2.0/menu.c:727 client/gui-win32/menu.c:303
msgid "_Game"
msgstr "_Ludo"
-#: client/gui-gtk-2.0/menu.c:702 client/gui-gtk-2.0/menu.c:704
-#: client/gui-gtk-2.0/menu.c:706 client/gui-gtk-2.0/menu.c:708
-#: client/gui-gtk-2.0/menu.c:710 client/gui-gtk-2.0/menu.c:712
-#: client/gui-gtk-2.0/menu.c:714 client/gui-gtk-2.0/menu.c:717
-#: client/gui-gtk-2.0/menu.c:720 client/gui-gtk-2.0/menu.c:722
-#: client/gui-gtk-2.0/menu.c:724 client/gui-gtk-2.0/menu.c:726
-#: client/gui-gtk-2.0/menu.c:728 client/gui-gtk-2.0/menu.c:730
-#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:736
-#: client/gui-gtk-2.0/menu.c:738 client/gui-gtk-2.0/menu.c:740
+#: client/gui-gtk-2.0/menu.c:729 client/gui-gtk-2.0/menu.c:731
+#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:735
+#: client/gui-gtk-2.0/menu.c:737 client/gui-gtk-2.0/menu.c:739
+#: client/gui-gtk-2.0/menu.c:741 client/gui-gtk-2.0/menu.c:744
+#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
+#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
+#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
+#: client/gui-gtk-2.0/menu.c:760 client/gui-gtk-2.0/menu.c:763
+#: client/gui-gtk-2.0/menu.c:765 client/gui-gtk-2.0/menu.c:767
#: data/Freeciv.in:2026
msgid "Game"
msgstr "Ludo"
-#: client/gui-gtk-2.0/menu.c:704 client/gui-gtk-2.0/menu.c:706
-#: client/gui-gtk-2.0/menu.c:708
+#: client/gui-gtk-2.0/menu.c:731 client/gui-gtk-2.0/menu.c:733
+#: client/gui-gtk-2.0/menu.c:735
msgid "_Chat"
msgstr "_Babillineo"
-#: client/gui-gtk-2.0/menu.c:706 client/gui-win32/menu.c:314
+#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:314
msgid "_Clear Log"
msgstr "_Vakigu protokolon"
-#: client/gui-gtk-2.0/menu.c:708 client/gui-win32/menu.c:313
+#: client/gui-gtk-2.0/menu.c:735 client/gui-win32/menu.c:313
msgid "_Write Log"
msgstr "_Skribu protokolon"
-#: client/gui-gtk-2.0/menu.c:710 client/gui-win32/menu.c:304
+#: client/gui-gtk-2.0/menu.c:737 client/gui-win32/menu.c:304
msgid "Local _Options"
msgstr "Lokaj _opcioj"
-#: client/gui-gtk-2.0/menu.c:712 client/gui-win32/menu.c:305
+#: client/gui-gtk-2.0/menu.c:739 client/gui-win32/menu.c:305
msgid "_Message Options"
msgstr "Opcioj de _mesaÄoj"
-#: client/gui-gtk-2.0/menu.c:717
+#: client/gui-gtk-2.0/menu.c:744
msgid "_Reload Tileset"
msgstr "_ReÅargu grafikaĵon"
-#: client/gui-gtk-2.0/menu.c:720
+#: client/gui-gtk-2.0/menu.c:747
msgid "Save Options on _Exit"
msgstr "Konservu opciojn _elirante"
-#: client/gui-gtk-2.0/menu.c:722
+#: client/gui-gtk-2.0/menu.c:749
#, fuzzy
msgid "Sa_ve Options"
msgstr "Foraj opcioj"
-#: client/gui-gtk-2.0/menu.c:726 client/gui-win32/menu.c:308
+#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:308
msgid "Server O_ptions"
msgstr "O_pcioj de la servilo"
-#: client/gui-gtk-2.0/menu.c:730 client/gui-win32/menu.c:310
+#: client/gui-gtk-2.0/menu.c:757 client/gui-win32/menu.c:310
msgid "_Save Game"
msgstr "_Konservu ludon"
-#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:311
+#: client/gui-gtk-2.0/menu.c:760 client/gui-win32/menu.c:311
msgid "Save Game _As..."
msgstr "Konservu ludon k_iel..."
-#: client/gui-gtk-2.0/menu.c:738
+#: client/gui-gtk-2.0/menu.c:765
msgid "_Leave"
msgstr "_Forlasu"
-#: client/gui-gtk-2.0/menu.c:740 client/gui-win32/menu.c:317
+#: client/gui-gtk-2.0/menu.c:767 client/gui-win32/menu.c:317
msgid "_Quit"
msgstr "_Eliro"
-#: client/gui-gtk-2.0/menu.c:745 client/gui-win32/menu.c:321
+#: client/gui-gtk-2.0/menu.c:772 client/gui-win32/menu.c:321
#, fuzzy
msgid "Gov_ernment"
msgstr "Regsistemo"
-#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
-#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
-#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:774 client/gui-gtk-2.0/menu.c:776
+#: client/gui-gtk-2.0/menu.c:778 client/gui-gtk-2.0/menu.c:780
+#: client/gui-gtk-2.0/menu.c:782 client/gui-gtk-2.0/menu.c:784
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
#: client/gui-xaw/menu.c:248 data/Freeciv.in:2027 data/helpdata.txt:1320
msgid "Government"
msgstr "Regsistemo"
-#: client/gui-gtk-2.0/menu.c:749 client/gui-win32/menu.c:322
+#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:322
msgid "_Tax Rates"
msgstr "_Impostado"
-#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:324
+#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:324
msgid "_Find City"
msgstr "_Trovu urbon"
-#: client/gui-gtk-2.0/menu.c:755 client/gui-win32/menu.c:325
+#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:325
msgid "_Worklists"
msgstr "_Laborlistoj"
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
-#: client/gui-gtk-2.0/menu.c:764 client/gui-win32/menu.c:327
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
+#: client/gui-gtk-2.0/menu.c:791 client/gui-win32/menu.c:327
#, fuzzy
msgid "_Change Government"
msgstr "_Regsistemo"
-#: client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:788
msgid "_Revolution..."
msgstr "_Revolucio..."
-#: client/gui-gtk-2.0/menu.c:764 client/gui-gtk-2.0/menu.c:970
+#: client/gui-gtk-2.0/menu.c:791 client/gui-gtk-2.0/menu.c:1013
#: client/gui-win32/menu.c:431
msgid "_Government"
msgstr "_Regsistemo"
-#: client/gui-gtk-2.0/menu.c:768 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:795 client/gui-gtk-2.0/menu.c:959
#: client/gui-win32/menu.c:334
msgid "_View"
msgstr "_Videbligo"
-#: client/gui-gtk-2.0/menu.c:772
+#: client/gui-gtk-2.0/menu.c:799
msgid "City Outlines"
msgstr "Limoj de la urbo"
-#: client/gui-gtk-2.0/menu.c:774 client/gui-win32/menu.c:335
+#: client/gui-gtk-2.0/menu.c:801 client/gui-win32/menu.c:335
msgid "Map _Grid"
msgstr "Map_krado"
-#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:336
+#: client/gui-gtk-2.0/menu.c:803 client/gui-win32/menu.c:336
msgid "National _Borders"
msgstr "Landlimoj"
-#: client/gui-gtk-2.0/menu.c:778 client/gui-win32/menu.c:337
+#: client/gui-gtk-2.0/menu.c:805 client/gui-win32/menu.c:337
msgid "City _Names"
msgstr "_Nomoj de la urboj"
-#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:338
+#: client/gui-gtk-2.0/menu.c:807 client/gui-win32/menu.c:338
msgid "City G_rowth"
msgstr "_PliiÄoj de la urboj"
-#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:339
+#: client/gui-gtk-2.0/menu.c:809 client/gui-win32/menu.c:339
msgid "City _Productions"
msgstr "_Produktadoj de la urbo"
-#: client/gui-gtk-2.0/menu.c:784 client/gui-sdl/optiondlg.c:1719
+#: client/gui-gtk-2.0/menu.c:811
+#, fuzzy
+msgid "City Buy Cost"
+msgstr "Elspezo:"
+
+#: client/gui-gtk-2.0/menu.c:813
+#, fuzzy
+msgid "City Traderoutes"
+msgstr "Komercaj kursoj:"
+
+#: client/gui-gtk-2.0/menu.c:815 client/gui-sdl/optiondlg.c:1719
msgid "Draw city worker map grid"
msgstr "Desegnu mapkradon de la urbaj laboristoj"
-#: client/gui-gtk-2.0/menu.c:788 client/gui-sdl/optiondlg.c:1635
+#: client/gui-gtk-2.0/menu.c:819 client/gui-sdl/optiondlg.c:1635
#: client/gui-win32/menu.c:340 client/gui-xaw/menu.c:148
#: client/gui-xaw/menu.c:246 manual/civmanual.c:220 data/helpdata.txt:1220
msgid "Terrain"
msgstr "Grundo"
-#: client/gui-gtk-2.0/menu.c:790 client/gui-win32/menu.c:341
+#: client/gui-gtk-2.0/menu.c:821 client/gui-win32/menu.c:341
#: client/gui-xaw/menu.c:149
msgid "Coastline"
msgstr "Marbordo"
-#: client/gui-gtk-2.0/menu.c:796 client/gui-win32/menu.c:343
+#: client/gui-gtk-2.0/menu.c:827 client/gui-win32/menu.c:343
msgid "Roads & Rails"
msgstr "Vojoj kaj fervojoj"
-#: client/gui-gtk-2.0/menu.c:800 client/gui-sdl/optiondlg.c:1933
+#: client/gui-gtk-2.0/menu.c:831 client/gui-sdl/optiondlg.c:1933
#: client/gui-win32/menu.c:345 client/gui-xaw/menu.c:152
msgid "Mines"
msgstr "Minejoj"
-#: client/gui-gtk-2.0/menu.c:802 client/gui-win32/menu.c:346
+#: client/gui-gtk-2.0/menu.c:833 client/gui-win32/menu.c:346
msgid "Fortress & Airbase"
msgstr "Fortresoj kaj Aviaj Bazoj"
-#: client/gui-gtk-2.0/menu.c:804 client/gui-win32/menu.c:348
+#: client/gui-gtk-2.0/menu.c:835 client/gui-win32/menu.c:348
#: client/gui-xaw/menu.c:154
msgid "Specials"
msgstr "Specialaj risurcoj"
-#: client/gui-gtk-2.0/menu.c:806 client/gui-win32/menu.c:349
+#: client/gui-gtk-2.0/menu.c:837 client/gui-win32/menu.c:349
#: client/gui-xaw/menu.c:155
msgid "Pollution & Fallout"
msgstr "Poluo kaj radioaktiveco"
-#: client/gui-gtk-2.0/menu.c:812 client/gui-win32/menu.c:352
+#: client/gui-gtk-2.0/menu.c:843 client/gui-win32/menu.c:352
#: client/gui-xaw/menu.c:158
msgid "Focus Unit"
msgstr "Aktiva unuo"
-#: client/gui-gtk-2.0/menu.c:814 client/gui-sdl/optiondlg.c:1854
+#: client/gui-gtk-2.0/menu.c:845 client/gui-sdl/optiondlg.c:1854
#: client/gui-win32/menu.c:353 client/gui-xaw/menu.c:159
msgid "Fog of War"
msgstr "Milit-nebulo"
-#: client/gui-gtk-2.0/menu.c:818
+#: client/gui-gtk-2.0/menu.c:849
msgid "_Full Screen"
msgstr "_Plenekrane"
-#: client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/menu.c:853
msgid "_Center View"
msgstr "_Centrigu la vidon"
-#: client/gui-gtk-2.0/menu.c:825 client/gui-win32/menu.c:358
+#: client/gui-gtk-2.0/menu.c:856 client/gui-win32/menu.c:358
msgid "_Orders"
msgstr "_Ordonoj"
-#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
-#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
-#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
-#: client/gui-gtk-2.0/menu.c:855 client/gui-gtk-2.0/menu.c:857
-#: client/gui-gtk-2.0/menu.c:859 client/gui-gtk-2.0/menu.c:861
-#: client/gui-gtk-2.0/menu.c:863 client/gui-gtk-2.0/menu.c:865
-#: client/gui-gtk-2.0/menu.c:867 client/gui-gtk-2.0/menu.c:869
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875 client/gui-gtk-2.0/menu.c:877
-#: client/gui-gtk-2.0/menu.c:879 client/gui-gtk-2.0/menu.c:881
-#: client/gui-gtk-2.0/menu.c:883 client/gui-gtk-2.0/menu.c:885
-#: client/gui-gtk-2.0/menu.c:887 client/gui-gtk-2.0/menu.c:889
-#: client/gui-gtk-2.0/menu.c:891 client/gui-gtk-2.0/menu.c:893
-#: client/gui-gtk-2.0/menu.c:895 client/gui-gtk-2.0/menu.c:897
-#: client/gui-gtk-2.0/menu.c:899 client/gui-gtk-2.0/menu.c:901
-#: client/gui-gtk-2.0/menu.c:903 data/Freeciv.in:2029
+#: client/gui-gtk-2.0/menu.c:858 client/gui-gtk-2.0/menu.c:860
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:864
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:868
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:872
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:876
+#: client/gui-gtk-2.0/menu.c:878 client/gui-gtk-2.0/menu.c:880
+#: client/gui-gtk-2.0/menu.c:882 client/gui-gtk-2.0/menu.c:884
+#: client/gui-gtk-2.0/menu.c:886 client/gui-gtk-2.0/menu.c:888
+#: client/gui-gtk-2.0/menu.c:890 client/gui-gtk-2.0/menu.c:892
+#: client/gui-gtk-2.0/menu.c:894 client/gui-gtk-2.0/menu.c:896
+#: client/gui-gtk-2.0/menu.c:898 client/gui-gtk-2.0/menu.c:900
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906 client/gui-gtk-2.0/menu.c:908
+#: client/gui-gtk-2.0/menu.c:910 client/gui-gtk-2.0/menu.c:912
+#: client/gui-gtk-2.0/menu.c:914 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:918 client/gui-gtk-2.0/menu.c:920
+#: client/gui-gtk-2.0/menu.c:922 client/gui-gtk-2.0/menu.c:924
+#: client/gui-gtk-2.0/menu.c:926 client/gui-gtk-2.0/menu.c:928
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
+#: client/gui-gtk-2.0/menu.c:946 data/Freeciv.in:2029
msgid "Orders"
msgstr "Ordonoj"
-#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:1444
+#: client/gui-gtk-2.0/menu.c:860 client/gui-gtk-2.0/menu.c:1489
#: client/gui-win32/menu.c:359
msgid "_Build City"
msgstr "_Fondu urbon (_B)"
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:1466
-#: client/gui-gtk-2.0/menu.c:1472 client/gui-win32/menu.c:360
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:1511
+#: client/gui-gtk-2.0/menu.c:1517 client/gui-win32/menu.c:360
msgid "Build _Road"
msgstr "Konst_ruu vojon"
-#: client/gui-gtk-2.0/menu.c:833 client/gui-gtk-2.0/menu.c:1360
+#: 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 "Preparu _irigacion"
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:1361
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:1406
#: client/gui-win32/menu.c:362
msgid "Build _Mine"
msgstr "Konstruu _minejon"
-#: client/gui-gtk-2.0/menu.c:837 client/gui-gtk-2.0/menu.c:1362
+#: client/gui-gtk-2.0/menu.c:868 client/gui-gtk-2.0/menu.c:1407
msgid "Transf_orm Terrain"
msgstr "Transf_ormu grundon"
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:1508
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:1553
#: client/gui-win32/menu.c:364
msgid "Build _Fortress"
msgstr "Konstruu _fortreson"
-#: client/gui-gtk-2.0/menu.c:841 client/gui-win32/menu.c:365
+#: client/gui-gtk-2.0/menu.c:872 client/gui-win32/menu.c:365
msgid "Build Airbas_e"
msgstr "Konstruu avian bazon"
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:1514
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:1559
#: client/gui-win32/menu.c:366
msgid "Clean _Pollution"
msgstr "_Malpolui"
-#: client/gui-gtk-2.0/menu.c:845 client/gui-win32/menu.c:367
+#: client/gui-gtk-2.0/menu.c:876 client/gui-win32/menu.c:367
msgid "Clean _Nuclear Fallout"
msgstr "Malpolui _radioaktivan refalon"
-#: client/gui-gtk-2.0/menu.c:849 client/gui-win32/menu.c:369
+#: client/gui-gtk-2.0/menu.c:880 client/gui-win32/menu.c:369
msgid "_Sentry"
msgstr "_Gardosoldato"
-#: client/gui-gtk-2.0/menu.c:855 client/gui-win32/menu.c:372
+#: client/gui-gtk-2.0/menu.c:886 client/gui-win32/menu.c:372
msgid "Make _Homecity"
msgstr "Igu Äin _hejmurbo"
-#: client/gui-gtk-2.0/menu.c:857 client/gui-win32/menu.c:373
+#: client/gui-gtk-2.0/menu.c:888 client/gui-win32/menu.c:373
msgid "_Load"
msgstr "_Åœargu"
-#: client/gui-gtk-2.0/menu.c:859
+#: client/gui-gtk-2.0/menu.c:890
msgid "_Unload Transporter"
msgstr "_MalÅargu kargon"
-#: client/gui-gtk-2.0/menu.c:861 client/gui-win32/menu.c:374
+#: client/gui-gtk-2.0/menu.c:892 client/gui-win32/menu.c:374
msgid "_Unload"
msgstr "_MalÅargu"
-#: client/gui-gtk-2.0/menu.c:863 client/gui-win32/menu.c:375
+#: client/gui-gtk-2.0/menu.c:894 client/gui-win32/menu.c:375
msgid "Wake up o_thers"
msgstr "Vekigu la a_liajn"
-#: client/gui-gtk-2.0/menu.c:867
+#: client/gui-gtk-2.0/menu.c:898
msgid "_Auto Settler"
msgstr "_AÅtomata farmigo"
-#: client/gui-gtk-2.0/menu.c:869 client/gui-win32/menu.c:378
+#: client/gui-gtk-2.0/menu.c:900 client/gui-win32/menu.c:378
msgid "Auto E_xplore"
msgstr "AÅtomata e_ksplorado"
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906
msgid "_Connect"
msgstr "_Kunligu"
-#: client/gui-gtk-2.0/menu.c:871 client/gui-win32/menu.c:380
+#: client/gui-gtk-2.0/menu.c:902 client/gui-win32/menu.c:380
msgid "_Road"
msgstr "_Vojo"
-#: client/gui-gtk-2.0/menu.c:873 client/gui-win32/menu.c:381
+#: client/gui-gtk-2.0/menu.c:904 client/gui-win32/menu.c:381
msgid "Rai_l"
msgstr "_Fervojo"
-#: client/gui-gtk-2.0/menu.c:875 client/gui-win32/menu.c:382
+#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:382
msgid "_Irrigate"
msgstr "_Irigacio"
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
msgid "Go _to"
msgstr "Iru _al"
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
msgid "_Build city"
msgstr "Konstruu ur_bon"
-#: client/gui-gtk-2.0/menu.c:879
+#: client/gui-gtk-2.0/menu.c:910
msgid "Patrol (_Q)"
msgstr "Patrolado (_Q)"
-#: client/gui-gtk-2.0/menu.c:881 client/gui-win32/menu.c:385
+#: client/gui-gtk-2.0/menu.c:912 client/gui-win32/menu.c:385
msgid "_Go to"
msgstr "_Iru al"
-#: client/gui-gtk-2.0/menu.c:883
+#: client/gui-gtk-2.0/menu.c:914
msgid "Go\\/Airlift to City"
msgstr "Iru\\/Flugtransportu al urbo"
-#: client/gui-gtk-2.0/menu.c:885 client/gui-sdl/menu.c:450
+#: client/gui-gtk-2.0/menu.c:916 client/gui-sdl/menu.c:450
#: client/gui-win32/menu.c:387 client/gui-xaw/menu.c:203
msgid "Return to nearest city"
msgstr "Revenu al la pli apuda urbo"
-#: client/gui-gtk-2.0/menu.c:889 client/gui-win32/menu.c:389
+#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:389
#: client/gui-xaw/menu.c:205
msgid "Disband Unit"
msgstr "Dissolvu unuon"
-#: client/gui-gtk-2.0/menu.c:891 client/gui-sdl/citydlg.c:532
+#: client/gui-gtk-2.0/menu.c:922 client/gui-sdl/citydlg.c:532
#: data/Freeciv.in:1186
msgid "Upgrade unit"
msgstr "Äœisdatigu unuon"
-#: client/gui-gtk-2.0/menu.c:893
+#: client/gui-gtk-2.0/menu.c:924
msgid "Diplomat\\/Spy Actions"
msgstr "Diplomatiaj\\/Spionaj agoj"
-#: client/gui-gtk-2.0/menu.c:895 client/gui-sdl/menu.c:399
+#: client/gui-gtk-2.0/menu.c:926 client/gui-sdl/menu.c:399
#: client/gui-win32/menu.c:391 client/gui-xaw/menu.c:209
msgid "Explode Nuclear"
msgstr "Atomeksplodo"
-#: client/gui-gtk-2.0/menu.c:899
-msgid "Select same type"
-msgstr "Elektu saman specon"
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/cityrep.c:882
+msgid "Select"
+msgstr "Elektu"
+
+#: client/gui-gtk-2.0/menu.c:934
+#, fuzzy
+msgid "Single"
+msgstr "Äœangalo"
+
+#: client/gui-gtk-2.0/menu.c:936
+#, fuzzy
+msgid "Same Type On Tile"
+msgstr "Elektu saman specon en kahelo"
+
+#: client/gui-gtk-2.0/menu.c:938
+msgid "All On Tile"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:940
+#, fuzzy
+msgid "Same Type On Continent"
+msgstr "Elektu saman specon en kahelo"
+
+#: client/gui-gtk-2.0/menu.c:942
+msgid "Same Type Everywhere"
+msgstr ""
-#: client/gui-gtk-2.0/menu.c:901 client/gui-win32/menu.c:393
+#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:393
msgid "_Wait"
msgstr "_Atendu"
-#: client/gui-gtk-2.0/menu.c:903 client/gui-win32/menu.c:394
+#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:394
#: client/gui-xaw/menu.c:213
msgid "Done"
msgstr "Finita"
-#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:398
+#: client/gui-gtk-2.0/menu.c:949 client/gui-win32/menu.c:398
msgid "_Reports"
msgstr "_Raportoj"
-#: client/gui-gtk-2.0/menu.c:908 client/gui-gtk-2.0/menu.c:910
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:914
-#: client/gui-gtk-2.0/menu.c:916 client/gui-gtk-2.0/menu.c:918
-#: client/gui-gtk-2.0/menu.c:920 client/gui-gtk-2.0/menu.c:922
-#: client/gui-gtk-2.0/menu.c:924 client/gui-gtk-2.0/menu.c:926
-#: client/gui-gtk-2.0/menu.c:928 client/gui-gtk-2.0/menu.c:930
-#: client/gui-gtk-2.0/menu.c:932 data/Freeciv.in:2030
+#: client/gui-gtk-2.0/menu.c:951 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:957
+#: client/gui-gtk-2.0/menu.c:959 client/gui-gtk-2.0/menu.c:961
+#: client/gui-gtk-2.0/menu.c:963 client/gui-gtk-2.0/menu.c:965
+#: client/gui-gtk-2.0/menu.c:967 client/gui-gtk-2.0/menu.c:969
+#: client/gui-gtk-2.0/menu.c:971 client/gui-gtk-2.0/menu.c:973
+#: client/gui-gtk-2.0/menu.c:975 data/Freeciv.in:2030
msgid "Reports"
msgstr "Raportoj"
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:958
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:1001
#: client/gui-win32/menu.c:400 client/gui-win32/menu.c:425
msgid "_Units"
msgstr "_Unuoj"
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/menu.c:914 client/gui-win32/menu.c:402
+#: client/gui-gtk-2.0/menu.c:957 client/gui-win32/menu.c:402
msgid "_Nations"
msgstr "_Nacioj"
-#: client/gui-gtk-2.0/menu.c:918 client/gui-win32/menu.c:403
+#: client/gui-gtk-2.0/menu.c:961 client/gui-win32/menu.c:403
msgid "_Economy"
msgstr "_Ekonomio"
#. TRANS: Research report action
-#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:405
+#: client/gui-gtk-2.0/menu.c:963 client/gui-win32/menu.c:405
msgid "_Research"
msgstr "_Studado"
-#: client/gui-gtk-2.0/menu.c:924 client/gui-win32/menu.c:407
+#: client/gui-gtk-2.0/menu.c:967 client/gui-win32/menu.c:407
msgid "_Wonders of the World"
msgstr "_Mirindaĵoj de la mondo"
-#: client/gui-gtk-2.0/menu.c:926 client/gui-win32/menu.c:408
+#: client/gui-gtk-2.0/menu.c:969 client/gui-win32/menu.c:408
msgid "_Top Five Cities"
msgstr "La k_vin urboj pli gravaj"
-#: client/gui-gtk-2.0/menu.c:928 client/gui-win32/menu.c:409
+#: client/gui-gtk-2.0/menu.c:971 client/gui-win32/menu.c:409
msgid "_Messages"
msgstr "_MesaÄoj"
-#: client/gui-gtk-2.0/menu.c:930 client/gui-win32/menu.c:410
+#: client/gui-gtk-2.0/menu.c:973 client/gui-win32/menu.c:410
msgid "_Demographics"
msgstr "_Demografio"
-#: client/gui-gtk-2.0/menu.c:932 client/gui-gtk-2.0/plrdlg.c:471
+#: client/gui-gtk-2.0/menu.c:975 client/gui-gtk-2.0/plrdlg.c:354
#: client/gui-win32/menu.c:411
msgid "_Spaceship"
msgstr "_KosmoÅipo"
-#: client/gui-gtk-2.0/menu.c:936 client/gui-win32/menu.c:415
+#: client/gui-gtk-2.0/menu.c:979 client/gui-win32/menu.c:415
msgid "_Help"
msgstr "_Helpilo"
-#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
-#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
-#: client/gui-gtk-2.0/menu.c:946 client/gui-gtk-2.0/menu.c:948
-#: client/gui-gtk-2.0/menu.c:950 client/gui-gtk-2.0/menu.c:952
-#: client/gui-gtk-2.0/menu.c:954 client/gui-gtk-2.0/menu.c:956
-#: client/gui-gtk-2.0/menu.c:958 client/gui-gtk-2.0/menu.c:960
-#: client/gui-gtk-2.0/menu.c:962 client/gui-gtk-2.0/menu.c:964
-#: client/gui-gtk-2.0/menu.c:966 client/gui-gtk-2.0/menu.c:968
-#: client/gui-gtk-2.0/menu.c:970 client/gui-gtk-2.0/menu.c:972
-#: client/gui-gtk-2.0/menu.c:974 client/gui-gtk-2.0/menu.c:976
-#: client/gui-gtk-2.0/menu.c:978 client/gui-gtk-2.0/menu.c:980
+#: client/gui-gtk-2.0/menu.c:981 client/gui-gtk-2.0/menu.c:983
+#: client/gui-gtk-2.0/menu.c:985 client/gui-gtk-2.0/menu.c:987
+#: client/gui-gtk-2.0/menu.c:989 client/gui-gtk-2.0/menu.c:991
+#: client/gui-gtk-2.0/menu.c:993 client/gui-gtk-2.0/menu.c:995
+#: client/gui-gtk-2.0/menu.c:997 client/gui-gtk-2.0/menu.c:999
+#: client/gui-gtk-2.0/menu.c:1001 client/gui-gtk-2.0/menu.c:1003
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-gtk-2.0/menu.c:1007
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-gtk-2.0/menu.c:1011
+#: client/gui-gtk-2.0/menu.c:1013 client/gui-gtk-2.0/menu.c:1015
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-gtk-2.0/menu.c:1019
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-gtk-2.0/menu.c:1023
#: client/gui-gtk-2.0/repodlgs.c:313 client/gui-win32/citydlg.c:1077
#: client/gui-win32/repodlgs.c:289 client/gui-win32/wldlg.c:846
#: data/Freeciv.in:1466 data/Freeciv.in:2031 data/Freeciv.in:2101
@@ -11735,119 +11955,119 @@ msgstr "_Helpilo"
msgid "Help"
msgstr "Helpilo"
-#: client/gui-gtk-2.0/menu.c:940 client/gui-win32/menu.c:416
+#: client/gui-gtk-2.0/menu.c:983 client/gui-win32/menu.c:416
msgid "Language_s"
msgstr "L_ingvoj"
-#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/menu.c:417
+#: client/gui-gtk-2.0/menu.c:985 client/gui-win32/menu.c:417
msgid "Co_nnecting"
msgstr "Ku_nligo"
-#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:418
+#: client/gui-gtk-2.0/menu.c:987 client/gui-win32/menu.c:418
msgid "C_ontrols"
msgstr "Regil_oj"
-#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:419
+#: client/gui-gtk-2.0/menu.c:989 client/gui-win32/menu.c:419
msgid "C_hatline"
msgstr "_Babillineo"
-#: client/gui-gtk-2.0/menu.c:948 client/gui-win32/menu.c:420
+#: client/gui-gtk-2.0/menu.c:991 client/gui-win32/menu.c:420
msgid "_Worklist Editor"
msgstr "Redaktu _laborliston"
-#: client/gui-gtk-2.0/menu.c:950 client/gui-win32/menu.c:421
+#: client/gui-gtk-2.0/menu.c:993 client/gui-win32/menu.c:421
msgid "Citizen _Management"
msgstr "_Mastrumo de civitanoj"
-#: client/gui-gtk-2.0/menu.c:952 client/gui-win32/menu.c:422
+#: client/gui-gtk-2.0/menu.c:995 client/gui-win32/menu.c:422
msgid "_Playing"
msgstr "_Ludado"
-#: client/gui-gtk-2.0/menu.c:956 client/gui-win32/menu.c:424
+#: client/gui-gtk-2.0/menu.c:999 client/gui-win32/menu.c:424
msgid "City _Improvements"
msgstr "_Urbaj plibonigoj"
-#: client/gui-gtk-2.0/menu.c:960 client/gui-win32/menu.c:426
+#: client/gui-gtk-2.0/menu.c:1003 client/gui-win32/menu.c:426
msgid "Com_bat"
msgstr "_Batalo"
-#: client/gui-gtk-2.0/menu.c:962 client/gui-win32/menu.c:427
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-win32/menu.c:427
msgid "_ZOC"
msgstr "_Influareo"
-#: client/gui-gtk-2.0/menu.c:964 client/gui-win32/menu.c:428
+#: client/gui-gtk-2.0/menu.c:1007 client/gui-win32/menu.c:428
msgid "Techno_logy"
msgstr "Teĥno_logio"
-#: client/gui-gtk-2.0/menu.c:966 client/gui-win32/menu.c:429
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-win32/menu.c:429
msgid "_Terrain"
msgstr "_Grundo"
-#: client/gui-gtk-2.0/menu.c:968 client/gui-win32/menu.c:430
+#: client/gui-gtk-2.0/menu.c:1011 client/gui-win32/menu.c:430
msgid "Won_ders"
msgstr "Mirin_daĵoj"
-#: client/gui-gtk-2.0/menu.c:972 client/gui-win32/menu.c:432
+#: client/gui-gtk-2.0/menu.c:1015 client/gui-win32/menu.c:432
msgid "Happin_ess"
msgstr "Kontent_eco"
-#: client/gui-gtk-2.0/menu.c:974 client/gui-win32/menu.c:433
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-win32/menu.c:433
msgid "Space _Race"
msgstr "Konku_ro por la kosmo"
-#: client/gui-gtk-2.0/menu.c:978 client/gui-win32/menu.c:435
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-win32/menu.c:435
msgid "_Copying"
msgstr "_Permesilo"
-#: client/gui-gtk-2.0/menu.c:980 client/gui-win32/menu.c:436
+#: client/gui-gtk-2.0/menu.c:1023 client/gui-win32/menu.c:436
msgid "_About"
msgstr "_Pri"
-#: client/gui-gtk-2.0/menu.c:1264
+#: client/gui-gtk-2.0/menu.c:1307
#, c-format
msgid "%s..."
msgstr "%s..."
-#: client/gui-gtk-2.0/menu.c:1352
+#: client/gui-gtk-2.0/menu.c:1397
#, c-format
msgid "Change to %s (_I)"
msgstr "ÅœanÄu en %s (_I)"
-#: client/gui-gtk-2.0/menu.c:1353
+#: client/gui-gtk-2.0/menu.c:1398
#, c-format
msgid "Change to %s (_M)"
msgstr "ÅœanÄu en %s (_M)"
-#: client/gui-gtk-2.0/menu.c:1354
+#: client/gui-gtk-2.0/menu.c:1399
#, c-format
msgid "Transf_orm to %s"
msgstr "Transf_ormu en %s"
-#: client/gui-gtk-2.0/menu.c:1427
+#: client/gui-gtk-2.0/menu.c:1472
msgid "Help _Build Wonder"
msgstr "Helpu konstrui mirindaĵon (_B)"
-#: client/gui-gtk-2.0/menu.c:1441
+#: client/gui-gtk-2.0/menu.c:1486
msgid "Add to City (_B)"
msgstr "Aldonu al urbo (_B)"
-#: client/gui-gtk-2.0/menu.c:1449
+#: client/gui-gtk-2.0/menu.c:1494
msgid "Make Trade _Route"
msgstr "Kreu komercan _kurson"
-#: client/gui-gtk-2.0/menu.c:1463
+#: client/gui-gtk-2.0/menu.c:1508
msgid "Build _Railroad"
msgstr "Konstruu _fervojon"
-#: client/gui-gtk-2.0/menu.c:1486
+#: client/gui-gtk-2.0/menu.c:1531
msgid "Bu_ild Farmland"
msgstr "Konstruu fa_rmaron"
-#: client/gui-gtk-2.0/menu.c:1506
+#: client/gui-gtk-2.0/menu.c:1551
msgid "_Fortify"
msgstr "_Fortigado"
-#: client/gui-gtk-2.0/menu.c:1512
+#: client/gui-gtk-2.0/menu.c:1557
msgid "_Paradrop"
msgstr "_ParaÅuti"
@@ -11882,13 +12102,31 @@ msgstr "Mes"
msgid "Pop"
msgstr "Åœpruc."
-#: client/gui-gtk-2.0/messagewin.c:155 client/gui-sdl/messagewin.c:247
+#: client/gui-gtk-2.0/messagewin.c:186 client/gui-sdl/messagewin.c:247
#: client/gui-win32/messagewin.c:132 client/gui-xaw/menu.c:228
#: data/Freeciv.in:3273 data/Freeciv.in:3274 data/Freeciv.in:3283
msgid "Messages"
msgstr "MesaÄoj"
-#: client/gui-gtk-2.0/plrdlg.c:330
+#: client/gui-gtk-2.0/plrdlg.c:317
+msgid "_Meet"
+msgstr "_RenkontiÄo"
+
+#: client/gui-gtk-2.0/plrdlg.c:323
+msgid "Cancel _Treaty"
+msgstr "Nuligu kontra_kton"
+
+#: client/gui-gtk-2.0/plrdlg.c:329
+#, fuzzy
+msgid "_Withdraw Vision"
+msgstr "_Repripensu la vidon"
+
+#: client/gui-gtk-2.0/plrdlg.c:348
+#, fuzzy
+msgid "_Report"
+msgstr "_Raportoj"
+
+#: client/gui-gtk-2.0/plrdlg.c:386
msgid "?show:Dead Players"
msgstr "?show:Mortintaj Ludantoj"
@@ -11896,264 +12134,268 @@ msgstr "?show:Mortintaj Ludantoj"
#. TRANS: Nations report action
#. TRANS: Nations report title
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/plrdlg.c:350 client/gui-sdl/mapctrl.c:1580
+#: client/gui-gtk-2.0/plrdlg.c:406 client/gui-sdl/mapctrl.c:1580
#: client/gui-sdl/plrdlg.c:608 client/gui-win32/plrdlg.c:344
#: client/gui-xaw/menu.c:221 data/Freeciv.in:3192 data/Freeciv.in:3193
msgid "Nations"
msgstr "Nacioj"
-#: client/gui-gtk-2.0/plrdlg.c:443
+#: client/gui-gtk-2.0/plrdlg.c:511
+#, fuzzy
+msgid "Di_plomacy"
+msgstr "Diplomatio"
+
+#: client/gui-gtk-2.0/plrdlg.c:516
msgid "_Intelligence"
msgstr "_Spionado"
-#: client/gui-gtk-2.0/plrdlg.c:450
-msgid "_Meet"
-msgstr "_RenkontiÄo"
-
-#: client/gui-gtk-2.0/plrdlg.c:457
-msgid "Cancel _Treaty"
-msgstr "Nuligu kontra_kton"
-
-#: client/gui-gtk-2.0/plrdlg.c:464
-msgid "_Withdraw vision"
-msgstr "_Repripensu la vidon"
-
-#: client/gui-gtk-2.0/plrdlg.c:495
+#: client/gui-gtk-2.0/plrdlg.c:526
msgid "_AI"
msgstr "_AI"
-#: client/gui-gtk-2.0/plrdlg.c:501
+#: client/gui-gtk-2.0/plrdlg.c:532
msgid "_Toggle AI Mode"
msgstr "_Mastrumu AI-moduson"
-#: client/gui-gtk-2.0/pages.c:208
+#: client/gui-gtk-2.0/pages.c:221
msgid "Start _New Game"
msgstr "Startigu _novan ludon"
-#: client/gui-gtk-2.0/pages.c:214
+#: client/gui-gtk-2.0/pages.c:227
msgid "Start _Scenario Game"
msgstr "Startigu scenejon"
-#: client/gui-gtk-2.0/pages.c:220
+#: client/gui-gtk-2.0/pages.c:233
msgid "_Load Saved Game"
msgstr "Åœargu konservitan _ludon"
-#: client/gui-gtk-2.0/pages.c:229
+#: client/gui-gtk-2.0/pages.c:239
msgid "C_onnect to Network Game"
msgstr "K_onekto al retan ludon"
-#: client/gui-gtk-2.0/pages.c:236
+#: client/gui-gtk-2.0/pages.c:247
msgid "Connect to Gaming _Zone"
msgstr "Konekto al _areon de ludo"
-#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:300
#: 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:704 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:779 client/gui-gtk-2.0/pages.c:820
+#: client/gui-win32/connectdlg.c:916
msgid "Server Name"
msgstr "Servilnomo"
-#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
+#: 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
+#: data/Freeciv.in:96
msgid "Port"
msgstr "Pordo"
-#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
+#: client/gui-win32/connectdlg.c:917
msgid "Version"
msgstr "Versio"
-#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
-#: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
+#: 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
msgid "Status"
msgstr "Stato"
-#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
-#: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
+#: 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
msgid "Players"
msgstr "Ludantoj"
-#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
+#: client/gui-win32/connectdlg.c:918
msgid "Comment"
msgstr "Komento"
-#: client/gui-gtk-2.0/pages.c:747
+#: client/gui-gtk-2.0/pages.c:786
msgid "Local _Area Network"
msgstr "Loka _Reto"
-#: client/gui-gtk-2.0/pages.c:783
+#: client/gui-gtk-2.0/pages.c:827
msgid "Internet _Metaserver"
msgstr "Interreta _Metaservilo"
-#: client/gui-gtk-2.0/pages.c:817
+#: client/gui-gtk-2.0/pages.c:864
msgid "_Host:"
msgstr "_Gast.komp:"
-#: client/gui-gtk-2.0/pages.c:834
+#: client/gui-gtk-2.0/pages.c:881
msgid "_Port:"
msgstr "_Pordo:"
-#: client/gui-gtk-2.0/pages.c:851
+#: client/gui-gtk-2.0/pages.c:898
msgid "_Login:"
msgstr "_Nomo:"
-#: client/gui-gtk-2.0/pages.c:869
+#: client/gui-gtk-2.0/pages.c:916
msgid "Pass_word:"
msgstr "Pas_vorto:"
-#: client/gui-gtk-2.0/pages.c:887
+#: client/gui-gtk-2.0/pages.c:934
msgid "Conf_irm Password:"
msgstr "Konf_irmu pasvorton:"
-#: client/gui-gtk-2.0/pages.c:912
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: 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/wldlg.c:800 client/gui-win32/wldlg.c:806
+msgid "Type"
+msgstr "Speco"
+
+#: client/gui-gtk-2.0/pages.c:952 client/gui-win32/plrdlg.c:337
+#: data/Freeciv.in:88
+msgid "Host"
+msgstr "Gast. komputilo"
+
+#: client/gui-gtk-2.0/pages.c:981
msgid "C_onnect"
msgstr "K_onektu"
-#: client/gui-gtk-2.0/pages.c:1142
+#: client/gui-gtk-2.0/pages.c:1211
#, c-format
msgid "Connection name: %s"
msgstr "Nomo de la konekto: %s"
-#: client/gui-gtk-2.0/pages.c:1145
+#: client/gui-gtk-2.0/pages.c:1214
#, c-format
msgid "Player name: %s"
msgstr "Nomo de la ludanto: %s"
-#: client/gui-gtk-2.0/pages.c:1150
+#: client/gui-gtk-2.0/pages.c:1219
#, c-format
msgid "Host: %s"
msgstr "Gast.komp: %s"
-#: client/gui-gtk-2.0/pages.c:1158
+#: client/gui-gtk-2.0/pages.c:1227
msgid "Player/conn info"
msgstr "Pri ludanto/konekto"
-#: client/gui-gtk-2.0/pages.c:1185
+#: client/gui-gtk-2.0/pages.c:1254
#, c-format
msgid "%s info"
msgstr "Pri %s"
-#: client/gui-gtk-2.0/pages.c:1196
+#: client/gui-gtk-2.0/pages.c:1265
msgid "Toggle player ready"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1204
+#: client/gui-gtk-2.0/pages.c:1273
msgid "Pick nation"
msgstr "Elektu nacion"
-#: client/gui-gtk-2.0/pages.c:1214
+#: client/gui-gtk-2.0/pages.c:1283
msgid "Observe this player"
msgstr "Observu tiun ĉi ludanton"
-#: client/gui-gtk-2.0/pages.c:1221
+#: client/gui-gtk-2.0/pages.c:1290
msgid "Take this player"
msgstr "Prenu tiun ĉi ludanton"
-#: client/gui-gtk-2.0/pages.c:1238
+#: client/gui-gtk-2.0/pages.c:1307
msgid "Cut connection"
msgstr "Fermu konekton"
-#: client/gui-gtk-2.0/pages.c:1248
+#: client/gui-gtk-2.0/pages.c:1317
msgid "Aitoggle player"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1257
+#: client/gui-gtk-2.0/pages.c:1326
msgid "Remove player"
msgstr "Formovu ludanton"
-#: client/gui-gtk-2.0/pages.c:1268
+#: client/gui-gtk-2.0/pages.c:1337
msgid "Give info access"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1276
+#: client/gui-gtk-2.0/pages.c:1345
msgid "Give ctrl access"
msgstr ""
#. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1338
+#: client/gui-gtk-2.0/pages.c:1407
#, c-format
msgid "Put on %s"
msgstr "Enigu en %s"
-#: client/gui-gtk-2.0/pages.c:1442
+#: client/gui-gtk-2.0/pages.c:1511
msgid "Number of _Players (including AI):"
msgstr "Nombro de _ludantoj (inkluziva de la AI):"
-#: client/gui-gtk-2.0/pages.c:1465
+#: client/gui-gtk-2.0/pages.c:1534
msgid "AI Skill _Level:"
msgstr "Lerteco de _AI:"
-#: client/gui-gtk-2.0/pages.c:1481
+#: client/gui-gtk-2.0/pages.c:1550
msgid "Ruleset _Version:"
msgstr "_Versio de la reguloj:"
-#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
msgid "_More Game Options..."
msgstr "Pluaj opcioj de la ludo..."
-#: client/gui-gtk-2.0/pages.c:1514
+#: client/gui-gtk-2.0/pages.c:1583
msgid "Record"
msgstr "Raporto"
-#: client/gui-gtk-2.0/pages.c:1519
+#: client/gui-gtk-2.0/pages.c:1588
msgid "Rating"
msgstr "Skribado"
-#: client/gui-gtk-2.0/pages.c:1525
+#: client/gui-gtk-2.0/pages.c:1594
msgid "Ready"
msgstr "Preta"
-#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
-#: data/nation/slovakian.ruleset:26
-msgid "Leader"
-msgstr "Estro"
+#: client/gui-gtk-2.0/pages.c:1601
+#, fuzzy
+msgid "?player:Leader"
+msgstr "?female:Estrino"
-#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1732 client/gui-sdl/chatline.c:185
msgid "Choose Saved Game to Load"
msgstr "Elektu konservitan ludon"
-#: client/gui-gtk-2.0/pages.c:1752
+#: client/gui-gtk-2.0/pages.c:1824
msgid "Choose Saved Game to _Load:"
msgstr "Elektu Åargendan konvervitan _ludon:"
-#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
-#: client/gui-gtk-2.0/pages.c:2375
+#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
+#: client/gui-gtk-2.0/pages.c:2451
msgid "_Browse..."
msgstr "_Foliumu..."
-#: client/gui-gtk-2.0/pages.c:1839
+#: client/gui-gtk-2.0/pages.c:1911
msgid "Choose a Scenario"
msgstr "Elektu scenejon"
-#: client/gui-gtk-2.0/pages.c:1926
+#: client/gui-gtk-2.0/pages.c:1998
msgid "Choose a _Scenario:"
msgstr "Elektu _scenejon:"
-#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
-#: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
-#: client/gui-win32/wldlg.c:806
-msgid "Type"
-msgstr "Speco"
-
-#: client/gui-gtk-2.0/pages.c:2101
+#: client/gui-gtk-2.0/pages.c:2173
msgid "Choose a _nation to play:"
msgstr "Elektu _nacion por ludi:"
-#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2363 client/gui-win32/menu.c:581
msgid "Select Location to Save"
msgstr "Elektu lokon por konservi"
-#: client/gui-gtk-2.0/pages.c:2372 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2448 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr "Konservu ludon"
-#: client/gui-gtk-2.0/pages.c:2413
+#: client/gui-gtk-2.0/pages.c:2489
msgid "Saved _Games:"
msgstr "Konservitaj _ludoj:"
-#: client/gui-gtk-2.0/pages.c:2440
+#: client/gui-gtk-2.0/pages.c:2516
msgid "Save _Filename:"
msgstr "Konservu dosiernomon:"
@@ -12505,7 +12747,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:1094
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
msgid "Back"
msgstr "AntaÅe"
@@ -12514,7 +12756,7 @@ msgid "Start"
msgstr "Komencu"
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:775
+#: client/gui-win32/connectdlg.c:777
msgid "Load Game"
msgstr "Åœargu ludon"
@@ -12551,12 +12793,12 @@ msgid "Make new homecity"
msgstr "Kreu novan hejmurbon"
#: client/gui-sdl/citydlg.c:546 client/gui-sdl/citydlg.c:1418
-#: client/gui-sdl/connectdlg.c:307 client/gui-sdl/connectdlg.c:616
-#: client/gui-sdl/connectdlg.c:802 client/gui-sdl/connectdlg.c:984
+#: 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/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1039
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
#: 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
@@ -12603,7 +12845,7 @@ msgstr "Ĉu vi aĉetas Äin?"
#: client/gui-sdl/diplodlg.c:1335 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:2427
+#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
#: client/gui-xaw/cityrep.c:666 client/gui-xaw/cma_fe.c:327
#: client/gui-xaw/cma_fe.c:511 client/gui-xaw/cma_fe.c:765
#: client/gui-xaw/messagedlg.c:72 client/gui-xaw/optiondlg.c:76
@@ -12619,7 +12861,7 @@ msgstr "Ne"
#: client/gui-sdl/diplodlg.c:1345 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:2427 client/gui-xaw/cityrep.c:666
+#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
#: client/gui-xaw/cma_fe.c:327 client/gui-xaw/cma_fe.c:511
#: client/gui-xaw/cma_fe.c:765 client/gui-xaw/messagedlg.c:72
#: client/gui-xaw/optiondlg.c:76 client/gui-xaw/optiondlg.c:304
@@ -12896,36 +13138,36 @@ msgstr "Apliku unufoje"
msgid "Release city"
msgstr "Malpremu urbon"
-#: client/gui-sdl/connectdlg.c:238
+#: client/gui-sdl/connectdlg.c:239
msgid "Creating Server List..."
msgstr "Kreante liston pri la serviloj..."
-#: client/gui-sdl/connectdlg.c:279 client/gui-sdl/connectdlg.c:343
+#: client/gui-sdl/connectdlg.c:280 client/gui-sdl/connectdlg.c:344
msgid "No LAN servers found"
msgstr "Neniu loka servilo estis trovita"
-#: client/gui-sdl/connectdlg.c:281 client/gui-sdl/connectdlg.c:345
+#: client/gui-sdl/connectdlg.c:282 client/gui-sdl/connectdlg.c:346
msgid "No public servers found"
msgstr "Nenio publika servilo estis trovita"
-#: client/gui-sdl/connectdlg.c:555
+#: client/gui-sdl/connectdlg.c:556
msgid "Player Name :"
msgstr "Nomo de ludanto :"
-#: client/gui-sdl/connectdlg.c:571
+#: client/gui-sdl/connectdlg.c:572
msgid "Freeciv Server :"
msgstr "Freeciv-Servilo :"
-#: client/gui-sdl/connectdlg.c:588
+#: client/gui-sdl/connectdlg.c:589
msgid "Port :"
msgstr "Pordo :"
-#: client/gui-sdl/connectdlg.c:608 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr "Konektu"
-#: client/gui-sdl/connectdlg.c:794 client/gui-sdl/connectdlg.c:977
+#: client/gui-sdl/connectdlg.c:795 client/gui-sdl/connectdlg.c:978
#: client/gui-xaw/connectdlg.c:145
msgid "Next"
msgstr "Sekva"
@@ -13208,7 +13450,7 @@ msgstr "Estas neeble prepari la SDL-bibliotekon: %s"
#: client/gui-sdl/graphics.c:1021
#, fuzzy, c-format
-msgid "Unable to initialize SDL_ttf library: %s"
+msgid "Unable to initialize SDL_ttf library: %s"
msgstr "Estas neeble prepari la SDL_ttf bibliotekon: %s"
#: client/gui-sdl/graphics.c:1058
@@ -13293,12 +13535,6 @@ msgstr "Preparado de la kliento"
msgid "Waiting for the beginning of the game"
msgstr "Atendante la komencon de la ludo"
-#: client/gui-sdl/gui_string.c:608
-msgid ""
-"Couldn't find stdfont.ttf file. Please link/copy/move anyunicode ttf font to "
-"data dir as stdfont.ttf"
-msgstr ""
-
#. TRANS: Future Technology
#: client/gui-sdl/gui_tilespec.c:506
msgid "FT"
@@ -13886,12 +14122,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:1098 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1100 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:963
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
msgid "Start New Game"
msgstr "Startigu novan ludon"
@@ -14005,8 +14241,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:1081
-#: client/gui-win32/connectdlg.c:1089 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
+#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
msgid "Update"
msgstr "Äœisdatigu"
@@ -14454,10 +14690,6 @@ msgstr "ÅœanÄu ĉion"
msgid "Refresh"
msgstr "Äœisdatigu"
-#: client/gui-win32/cityrep.c:882
-msgid "Select"
-msgstr "Elektu"
-
#: client/gui-win32/cityrep.c:883
msgid "Configure"
msgstr "Agordu"
@@ -14507,55 +14739,55 @@ msgstr "Estas neeble Åargi konservitan ludon"
msgid "Verify Password"
msgstr "Kontrolo de la pasvorto"
-#: client/gui-win32/connectdlg.c:912 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr "Elekto de Freeciv-servilo"
-#: client/gui-win32/connectdlg.c:913
+#: client/gui-win32/connectdlg.c:915
msgid "Local Area Network"
msgstr "Loka reto"
-#: client/gui-win32/connectdlg.c:947
+#: client/gui-win32/connectdlg.c:949
msgid "Welcome to Freeciv"
msgstr "Bonvenon al Freeciv"
-#: client/gui-win32/connectdlg.c:965
+#: client/gui-win32/connectdlg.c:967
msgid "Load Saved Game"
msgstr "Åœargu konservitan ludon"
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
msgid "Connect To Network Game"
msgstr "Konekto al reta ludo"
-#: client/gui-win32/connectdlg.c:977
+#: client/gui-win32/connectdlg.c:979
msgid "Choose a nation to play"
msgstr "Elektu nacion por ludi"
-#: client/gui-win32/connectdlg.c:1012
+#: client/gui-win32/connectdlg.c:1014
msgid "Number of players (Including AI):"
msgstr "Nombro da ludantoj (inkluzive la AI):"
-#: client/gui-win32/connectdlg.c:1020
+#: client/gui-win32/connectdlg.c:1022
msgid "AI skill level:"
msgstr "Lerteco de _AI:"
-#: client/gui-win32/connectdlg.c:1034 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
msgid "Game Options"
msgstr "Opcioj de la ludo"
-#: client/gui-win32/connectdlg.c:1038
+#: client/gui-win32/connectdlg.c:1040
msgid "Start Game"
msgstr "Startigu ludon"
-#: client/gui-win32/connectdlg.c:1057
+#: client/gui-win32/connectdlg.c:1059
msgid "Login:"
msgstr "Nomo:"
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
msgid "Host:"
msgstr "Gast.Komp.:"
-#: client/gui-win32/connectdlg.c:1060
+#: client/gui-win32/connectdlg.c:1062
msgid "Port:"
msgstr "Pordo:"
@@ -14814,10 +15046,6 @@ msgid_plural "(idle %d turns)"
msgstr[0] "(paÅzo: %d vico)"
msgstr[1] "(paÅzo: %d vicoj)"
-#: client/gui-win32/plrdlg.c:337 data/Freeciv.in:88
-msgid "Host"
-msgstr "Gast. komputilo"
-
#: client/gui-win32/plrdlg.c:355 data/Freeciv.in:3230
msgid "Intelligence"
msgstr "Spionado"
@@ -16303,12 +16531,12 @@ msgstr ""
#: data/helpdata.txt:781
msgid ""
-" To have a diplomatic relationship with another player, you must fist "
-"establish first contact with that player. To establish first contact, you "
-"have to move one of your units next to a city or unit belonging to that "
-"player, or vice versa. Unless you establish an embassy with that player, you "
-"may again lose contact with them after a set number of turns without direct "
-"physical contact."
+" To have a diplomatic relationship with another player, you must first "
+"establish contact with that player. To establish contact, you have to move "
+"one of your units next to a city or unit belonging to that player, or vice "
+"versa. Unless you establish an embassy with that player, you may again lose "
+"contact with them after a set number of turns without direct physical "
+"contact."
msgstr ""
#: data/helpdata.txt:788
@@ -18447,7 +18675,7 @@ msgid "Communism"
msgstr "Komunismo"
#: data/default/governments.ruleset:121 data/civ2/governments.ruleset:118
-#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:26
+#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:27
msgid "Comrade"
msgstr "Kamarado"
@@ -19317,6 +19545,11 @@ msgid ""
"attacks."
msgstr ""
+#: data/default/units.ruleset:238
+#, fuzzy
+msgid "?unit:Workers"
+msgstr "Laboristoj"
+
#: data/default/units.ruleset:264
msgid ""
"Workers are one of the key units in the game. They can be used to irrigate "
@@ -19875,6 +20108,11 @@ msgstr "Skolto"
msgid "Explorers are very useful for mapping unknown territory."
msgstr ""
+#: data/default/units.ruleset:1864
+#, fuzzy
+msgid "?unit:Leader"
+msgstr "Estro"
+
#: data/default/units.ruleset:1892
msgid "This is you. If you lose this unit, you lose the game. So don't."
msgstr ""
@@ -20072,7 +20310,7 @@ msgid "Emir"
msgstr "Emiro"
#: data/nation/afghani.ruleset:25 data/nation/slovakian.ruleset:30
-#: data/nation/soviet.ruleset:27
+#: data/nation/soviet.ruleset:28
msgid "General Secretary"
msgstr "Äœenerala Sekretario"
@@ -20187,7 +20425,7 @@ msgstr "?plural:Armenoj"
msgid ""
"According to legend, the Armenian people are the descendants of Haik - the "
"great-great-grandson of Noah. The modern Republic of Armenia gained "
-"independence from Soviet in 1991 AD"
+"independence from the Soviet Union in 1991."
msgstr ""
#: data/nation/assyrian.ruleset:3
@@ -21157,12 +21395,11 @@ msgstr "?plural:Iliroj"
#: data/nation/illyrian.ruleset:6
msgid ""
-"Illyrians were Indo-European tribes who appeared in the western part of the "
-"Balkan Peninsula before 1000 BC, including the Dalmatians to the north, "
-"Corcyra island and Ambracia bay in prehistoric Epirus to the south, mixing "
-"with Thracians in Dardania to the east, and settling Messapia across the "
-"Adriatic Sea. Illyrian kingdoms were independent for centuries, until "
-"conquered by the Roman Republic."
+"Illyrians were Indo-European tribes who appeared in the western part of the "
+"Balkan Peninsula before 1000 BC, including Corcyra island and Ambracia bay "
+"in prehistoric Epirus to the south. They mixed with Thracians in Dardania to "
+"the east, and settled Messapia across the Adriatic Sea. Illyrian kingdoms "
+"were independent for centuries, until conquered by the Roman Republic."
msgstr ""
#: data/nation/inca.ruleset:3
@@ -21468,7 +21705,7 @@ msgid ""
"1953."
msgstr ""
-#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:28
+#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:29
msgid "Great Leader"
msgstr "Äœenerala Sekretario"
@@ -21627,9 +21864,9 @@ msgstr "?plural:Malianoj"
msgid ""
"Sub-Saharan Africa has been a cultural and ethnical melting pot for "
"millennia. In medieval times, the region was home to a succession of empires "
-"called the Sahelian kingdoms. Of these, the Islamic Mali empire with it's "
+"called the Sahelian kingdoms. Of these, the Islamic Mali empire with its "
"capital in Timbuktu was the most influential. This empire reigned from the "
-"14th to the 17th century and was famed for it's wealth and benevolent kings. "
+"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 ""
@@ -21689,8 +21926,8 @@ msgstr ""
#: data/nation/mayan.ruleset:6
msgid ""
-"The Mayans were a Mesoamerican civilization. Famous for building great "
-"pyramids and palaces in the jungle."
+"The Mayans were a Mesoamerican civilization. They are famous for building "
+"great pyramids and palaces in the jungle."
msgstr ""
#: data/nation/mayan.ruleset:19
@@ -22185,6 +22422,15 @@ msgid ""
"Czechoslovakia, until 1918 it was part of the Austro-Hungarian Empire."
msgstr ""
+#: data/nation/slovakian.ruleset:26
+#, fuzzy
+msgid "?male:Leader"
+msgstr "?female:Estrino"
+
+#: data/nation/slovakian.ruleset:26
+msgid "?female:Leader"
+msgstr "?female:Estrino"
+
#: data/nation/slovakian.ruleset:29
msgid "Pope"
msgstr "Papo"
@@ -22223,11 +22469,12 @@ msgstr "?plural:Sovetianoj"
#: data/nation/soviet.ruleset:6
msgid ""
-"Soviet Union's history starts in November 1917, when under Lenin's "
+"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 "
-"republics integrated into one country. Soviet Union became one of most "
-"powerful states in the 20th century. But by the end of 1991 due to many "
-"social shocks it disintegrated into fifteen independent countries"
+"republics integrated into one country. The Soviet Union became one of most "
+"powerful states in the 20th century, but by the end of 1991 it had "
+"disintegrated into fifteen independent countries due to social and economic "
+"problems."
msgstr ""
#: data/nation/spanish.ruleset:3
@@ -22601,8 +22848,8 @@ msgstr "?plural:Vestfaloj"
#: data/nation/westphalian.ruleset:6
msgid ""
-"Westphalia, before becoming a Prussian province, was the western region the "
-"duchy of Saxony. Present-day it consists of the Northern part of the largest "
+"Westphalia, before becoming a Prussian province, was the western region of "
+"the duchy of Saxony. Today it makes up the northern part of the largest "
"German federal state, North Rhine-Westphalia."
msgstr ""
@@ -22747,7 +22994,7 @@ msgid ""
"The flag and background color indicate what civilization the city\n"
"belongs to (this will be useful when you meet other civilizations).\n"
"The top row of the bar also shows the name and size of the city, and\n"
-"will show one or more starts to indicate if there are units in the\n"
+"will show one or more stars to indicate if there are units in the\n"
"city. The bottom row shows what the city is building, and how long it\n"
"will take; it also shows how long the city will take to grow to the\n"
"next largest size."
@@ -22803,7 +23050,7 @@ msgid ""
"Now your city has grown to size five. As cities get larger unrest\n"
"becomes a problem. A city of this size will usually have one unhappy\n"
"citizen unless pacifying effects are used; meaning one entertainer\n"
-"specialist is required to keep your citzens content. This is basically\n"
+"specialist is required to keep your citizens content. This is basically\n"
"a wasted citizen.\n"
"\n"
"There are several things that can be done about this. One quick fix\n"
@@ -22875,7 +23122,7 @@ msgid ""
"existing cities. Generally when building new cities you want to make\n"
"sure that all tiles are covered by at least one city, but after that\n"
"it is best that your cities overlap as little as possible. Spreading\n"
-"out cities properly gives each city access to more resrouces, allowing\n"
+"out cities properly gives each city access to more resources, allowing\n"
"them to grow to larger sizes."
msgstr ""
@@ -23156,6 +23403,53 @@ msgstr "Grupo 30"
msgid "Team 31"
msgstr "Grupo 31"
+#~ msgid "The %s of the %s (%s)"
+#~ msgstr "La %s de la %s (%s)"
+
+#~ msgid ""
+#~ "Illegal alliance structure detected: %s alliance to %s reduced to peace "
+#~ "treaty."
+#~ msgstr ""
+#~ "Estis trovita nevalida strukturo de alianco: la alianco inter %s kaj %s "
+#~ "reduktiÄis al packontrakto."
+
+#~ msgid "And, became more experienced!"
+#~ msgstr "Kaj, ili iÄas pli spertaj!"
+
+#~ msgid "We can't take control of server, attempting to kill it."
+#~ msgstr "Ni ne povas mastrumi la servilon, do ni provas haltigi Äin."
+
+#~ msgid "%s territory"
+#~ msgstr "%s teritorio"
+
+#~ msgid "%s territory (%d turn cease-fire)"
+#~ msgid_plural "%s territory (%d turn cease-fire)"
+#~ msgstr[0] "%s teritorio (%d vico de pafĉesigo)"
+#~ msgstr[1] "%s teritorio (%d vicoj de pafĉesigo)"
+
+#~ msgid "%s territory (%s)"
+#~ msgstr "%s teritorio (%s)"
+
+#~ msgid "City: %s (%s)"
+#~ msgstr "Urbo: %s (%s)"
+
+#~ msgid "Unit: %s (%s)"
+#~ msgstr "Unuo: %s (%s)"
+
+#~ msgid "no maximum, "
+#~ msgstr "neniu maksimumo, "
+
+#~ msgid "%d unit maximum, "
+#~ msgid_plural "%d units maximum, "
+#~ msgstr[0] "%d unuo maksimume, "
+#~ msgstr[1] "%d unuoj maksimume, "
+
+#~ msgid "%d per unit). "
+#~ msgstr "%d por unuo). "
+
+#~ msgid "Select same type"
+#~ msgstr "Elektu saman specon"
+
#~ msgid "Technology: %s"
#~ msgstr "Teĥnologio: %s"
@@ -23579,9 +23873,6 @@ msgstr "Grupo 31"
#~ msgid "Regenerate _Water"
#~ msgstr "Regeneru ak_von"
-#~ msgid "Select same type in tile"
-#~ msgstr "Elektu saman specon en kahelo"
-
#~ msgid "_Editor"
#~ msgstr "R_edaktilo"
@@ -24146,9 +24437,6 @@ msgstr "Grupo 31"
#~ msgid "SioÅ"
#~ msgstr "Siua"
-#~ msgid "?female:Leader"
-#~ msgstr "?female:Estrino"
-
#~ msgid "?female:General Secretary"
#~ msgstr "?female:Äœenerala Sekretario"
diff --git a/po/es.gmo b/po/es.gmo
index c4591bc..ea21414 100644
Binary files a/po/es.gmo and b/po/es.gmo differ
diff --git a/po/es.po b/po/es.po
index fd239f5..4123f4e 100644
--- a/po/es.po
+++ b/po/es.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Freeciv 2.1-beta1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 07:45+0900\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"
@@ -647,7 +647,7 @@ msgid "Road"
msgstr "Camino"
#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
-#: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
+#: client/gui-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"
@@ -664,7 +664,7 @@ msgid "Mine"
msgstr "Mina"
#: common/terrain.c:396 common/unit.c:548 server/report.c:124
-#: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
+#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr "Contaminación"
@@ -710,7 +710,7 @@ msgstr "Atrincherada"
msgid "Sentry"
msgstr "Vigilante"
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:851 client/gui-sdl/menu.c:648
+#: common/unit.c:566 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"
@@ -727,7 +727,7 @@ msgstr "Explorar"
msgid "Transform"
msgstr "Transformar"
-#: common/unit.c:584 client/text.c:106 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:584 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"
@@ -800,11 +800,11 @@ msgstr "Misil Nuclear"
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1406
+#: common/unittype.c:349 client/helpdata.c:1404
msgid " and "
msgstr " y "
-#: common/unittype.c:355 client/helpdata.c:1392
+#: common/unittype.c:355 client/helpdata.c:1390
msgid "?and:, "
msgstr ", "
@@ -1430,30 +1430,25 @@ msgstr ""
#: server/auth.c:281
#, fuzzy, c-format
-msgid "Auth config filename \"%s\" not allowed!"
-msgstr "Este nombre no se permite."
-
-#: server/auth.c:286
-#, fuzzy, c-format
msgid "Cannot load auth config file \"%s\"!"
msgstr "No encuentro el fichero de sonido %s"
-#: server/auth.c:397
+#: server/auth.c:392
#, c-format
msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
msgstr ""
"Atención: se ha adquirido el nombre del invitado '%s', se le renombra a '%s'."
-#: server/auth.c:404
+#: server/auth.c:399
msgid "Guests are not allowed on this server. Sorry."
msgstr "En este servidor no se permiten invitados. Lo siento."
-#: server/auth.c:406
+#: server/auth.c:401
#, c-format
msgid "%s was rejected: Guests not allowed."
msgstr "Rechazado %s: Invitados no permitidos."
-#: server/auth.c:425
+#: server/auth.c:420
#, c-format
msgid ""
"There was an error reading the user database, logging in as guest connection "
@@ -1462,7 +1457,7 @@ msgstr ""
"Ha habido un error leyendo la base de datos de usuarios, conectando como el "
"invitado '%s'."
-#: server/auth.c:431
+#: server/auth.c:426
msgid ""
"There was an error reading the user database and guest logins are not "
"allowed. Sorry"
@@ -1470,41 +1465,41 @@ msgstr ""
"Ha habido un error leyendo la base de datos de usuarios, y además no se "
"permiten las conexiones como invitado. Lo siento."
-#: server/auth.c:434
+#: server/auth.c:429
#, c-format
msgid "%s was rejected: Database error and guests not allowed."
msgstr "Rechazado %s: Error en la base de datos e invitados no permitidos."
-#: server/auth.c:441
+#: server/auth.c:436
#, c-format
msgid "Enter password for %s:"
msgstr "Introduce la contraseña para %s:"
-#: server/auth.c:450
+#: server/auth.c:445
msgid "Enter a new password (and remember it)."
msgstr "Introduce una nueva contraseña (y recuérdala)."
-#: server/auth.c:456
+#: server/auth.c:451
msgid "This server allows only preregistered users. Sorry."
msgstr "Este servidor sólo permite usuarios preregistrados. Lo siento."
-#: server/auth.c:459
+#: server/auth.c:454
#, c-format
msgid "%s was rejected: Only preregister users allowed."
msgstr "Rechazado %s: Sólo se permiten usuarios preregistrados."
-#: server/auth.c:488 server/auth.c:547
+#: server/auth.c:483 server/auth.c:542
msgid "Sorry, too many wrong tries..."
msgstr "Lo siento, demasiados intentos fallidos..."
-#: server/auth.c:489
+#: server/auth.c:484
#, c-format
msgid "%s was rejected: Too many wrong password verifies for new user."
msgstr ""
"Rechazado %s: Demasiadas verificaciones de contraseña incorrectas para el "
"nuevo usuario."
-#: server/auth.c:505
+#: server/auth.c:500
msgid ""
"Warning: There was an error in saving to the database. Continuing, but your "
"stats will not be saved."
@@ -1512,32 +1507,32 @@ msgstr ""
"Atención: Ha habido un error escribiendo en la base de datos. Se prosigue, "
"pero tus estadísticas no se van a almacenar."
-#: server/auth.c:549
+#: server/auth.c:544
#, c-format
msgid "%s was rejected: Too many wrong password tries."
msgstr "Rechazado %s: Demasiados intentos fallidos."
-#: server/auth.c:558
+#: server/auth.c:553
msgid "Your password is incorrect. Try again."
msgstr "Tu contraseña es incorrecta. Inténtalo de nuevo."
-#: server/auth.c:569
+#: server/auth.c:564
msgid "Sorry, your connection timed out..."
msgstr "Lo siento, tu conexión ha expirado..."
-#: server/auth.c:571
+#: server/auth.c:566
#, c-format
msgid "%s was rejected: Connection timeout waiting for password."
msgstr "Rechazado %s: Demasiado tiempo esperando por la contraseña."
-#: server/auth.c:636
+#: server/auth.c:631
#, c-format
msgid "Your password is too short, the minimum length is %d. Try again."
msgstr ""
"Tu contraseña es demasiado corta, la longitud mínima es %d. Inténtalo de "
"nuevo."
-#: server/auth.c:642
+#: server/auth.c:637
#, c-format
msgid ""
"The password must have at least %d capital letters, %d numbers, and be at "
@@ -2055,7 +2050,7 @@ msgstr "Este es el servidor %s"
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:237 manual/civmanual.c:380
+#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
@@ -2088,14 +2083,14 @@ 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:241
+#: server/civserver.c:217 client/civclient.c:242
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:245
+#: server/civserver.c:221 client/civclient.c:246
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"
@@ -2103,7 +2098,7 @@ msgstr " -d, --debug NUM\tEstablecer el nivel de depuraci
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:248 manual/civmanual.c:382
+#: server/civserver.c:225 client/civclient.c:249 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"
@@ -2153,11 +2148,11 @@ msgstr " -r, --read FICH\tEjecutar el fichero de preparaci
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:267 manual/civmanual.c:383
+#: server/civserver.c:247 client/civclient.c:268 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:279
+#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, fuzzy, c-format
@@ -3428,7 +3423,7 @@ msgid "Sea moving start units are not yet supported. Nobody gets %s."
msgstr ""
"Aún no están soportadas las unidades navales de inicio. Nadie, recibe %s."
-#: server/gamehand.c:310 client/text.c:632
+#: server/gamehand.c:310 client/text.c:691
#, c-format
msgid "Year: %s"
msgstr "Año: %s"
@@ -3718,10 +3713,10 @@ msgid "Could not throw %s into civil war - no available nations"
msgstr "No se pudo instigar la guerra civil en %s - demasiados jugadores"
#: server/plrhand.c:1686
-#, c-format
+#, fuzzy, c-format
msgid ""
-"Your nation is thrust into civil war, %s is declared the leader of the "
-"rebel states."
+"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 "
"sublevados."
@@ -3824,7 +3819,7 @@ msgstr "Vel. investigaci
msgid "Literacy"
msgstr "Alfabetización"
-#: server/report.c:121 client/cityrepdata.c:526 client/cityrepdata.c:527
+#: server/report.c:121 client/cityrepdata.c:524 client/cityrepdata.c:525
#: client/gui-sdl/cityrep.c:174
msgid "Production"
msgstr "Producción"
@@ -3976,7 +3971,7 @@ msgstr ""
"La cadena de \"demography\" contiene caracteres incorrectos. Prueba \"help "
"demography\"."
-#: server/report.c:743 server/report.c:766
+#: server/report.c:743 server/report.c:768
msgid "Demographics Report:"
msgstr "Informe demográfico:"
@@ -3984,10 +3979,12 @@ msgstr "Informe demogr
msgid "Sorry, the Demographics report is unavailable."
msgstr "Lo siento, el informe demográfico no está disponible."
-#: server/report.c:748
-#, c-format
-msgid "The %s of the %s (%s)"
-msgstr "El %s de los %s (%s)"
+#. TRANS: <nation adjective> <government name> (<year>).
+#. * E.g. "Polish Despotism (200 AD)".
+#: server/report.c:750
+#, fuzzy, c-format
+msgid "%s %s (%s)"
+msgstr "%s en %s (%s)\n"
#. TRANS: message about an installation error.
#: server/ruleset.c:163
@@ -4047,16 +4044,6 @@ msgstr ""
msgid "%s had invalid nation; changing to %s."
msgstr ""
-#. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4073
-#, fuzzy, c-format
-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."
-
#: server/settings.c:32
msgid "Geological"
msgstr "Geológicas"
@@ -5333,9 +5320,10 @@ msgid "Auto-save name prefix"
msgstr "Prefijo para auto-salvado"
#: server/settings.c:1016
+#, fuzzy
msgid ""
-"Automatically saved games will have name \"<prefix><year>.sav\". This "
-"setting sets the <prefix> part."
+"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>."
@@ -5354,13 +5342,13 @@ msgstr ""
"log\" cada turno. Estas estadísticas se pueden usar para crear gráficos "
"después del juego."
-#: server/sernet.c:147
+#: server/sernet.c:150
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:922
+#: server/sernet.c:929
#, c-format
msgid "Server: bad address: [%s:%d]."
msgstr "Servidor: dirección incorrecta: [%s:%d]."
@@ -5493,119 +5481,119 @@ 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/srv_main.c:928
+#: server/srv_main.c:961
#, c-format
msgid "Failed saving game as %s"
msgstr "Error salvando la partida en el fichero %s"
-#: server/srv_main.c:930
+#: server/srv_main.c:963
#, c-format
msgid "Game saved as %s"
msgstr "Partida salvada en el fichero %s"
-#: server/srv_main.c:962
+#: server/srv_main.c:994
msgid "The game is already running."
msgstr "La partida ya está en marcha."
-#: server/srv_main.c:970
+#: server/srv_main.c:1002
#, 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:977
+#: server/srv_main.c:1009
msgid "Starting game."
msgstr "Empezando la partida."
-#: server/srv_main.c:1039
+#: server/srv_main.c:1071
#, c-format
msgid "request for unknown report (type %d)"
msgstr "solicitud de informe desconocido (tipo %d)"
-#: server/srv_main.c:1104
+#: server/srv_main.c:1136
#, c-format
msgid "Warning: rejecting old client %s"
msgstr "Aviso: rechazando cliente antiguo %s"
-#: server/srv_main.c:1206
+#: server/srv_main.c:1238
#, 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:1306
+#: server/srv_main.c:1338
msgid "Please choose a non-blank name."
msgstr "Por favor, elige un nombre no vacío."
-#: server/srv_main.c:1322
+#: server/srv_main.c:1354
msgid "That nation is already in use."
msgstr "La nation ya se está usando."
-#: server/srv_main.c:1338
+#: server/srv_main.c:1370
#, 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:1359
+#: server/srv_main.c:1391
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:1458
+#: server/srv_main.c:1490
#, 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:1464
+#: server/srv_main.c:1496
#, c-format
msgid "%s nation is already in use."
msgstr "La nacion %s está en uso."
-#: server/srv_main.c:1482
+#: server/srv_main.c:1514
#, c-format
msgid "%s is the %s ruler %s."
msgstr "%s es %s, el gobernante de los %s."
-#: server/srv_main.c:1538
+#: server/srv_main.c:1570
#, 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:1582 server/srv_main.c:1586
+#: server/srv_main.c:1614 server/srv_main.c:1618
#, 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:1728
+#: server/srv_main.c:1760
#, c-format
msgid "Player %d"
msgstr "Jugador %d"
-#: server/srv_main.c:1739 server/srv_main.c:1745
+#: server/srv_main.c:1771 server/srv_main.c:1777
#, c-format
msgid "%s rules the %s."
msgstr "%s gobierna a los %s."
-#: server/srv_main.c:1910
+#: server/srv_main.c:1942
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
msgstr ""
-#: server/srv_main.c:1961
+#: server/srv_main.c:1993
#, c-format
msgid "Sending info to metaserver [%s]"
msgstr "Enviando información al metaservidor [%s]"
-#: server/srv_main.c:1992
+#: server/srv_main.c:2024
msgid "The game is over..."
msgstr "¡La partida ha finalizado!"
-#: server/srv_main.c:2205
+#: server/srv_main.c:2237
msgid "Now accepting new client connections."
msgstr "Aceptando más conexiones de clientes."
@@ -6436,24 +6424,24 @@ 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:2030 client/gui-sdl/plrdlg.c:645
+#: 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
msgid "AI"
msgstr "Ordenador"
#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
+#: client/gui-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
msgid "Human"
msgstr "Humano"
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
-#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
+#: 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
msgid "Alive"
msgstr "Vivo"
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
#: client/gui-win32/connectdlg.c:200
msgid "Dead"
msgstr "Muerto"
@@ -6725,9 +6713,9 @@ 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:242
-#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
-#: client/text.c:1201
+#: 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
#, c-format
msgid "?clistmore:, %s"
msgstr ", %s"
@@ -6979,7 +6967,7 @@ msgstr "S
msgid "Cannot attack from sea."
msgstr "No se puede atacar desde el mar."
-#: server/unithand.c:996 server/unittools.c:2103
+#: server/unithand.c:996 server/unittools.c:2137
msgid "Cannot attack unless you declare war first."
msgstr "No puedes atacar si no declaras primero la guerra."
@@ -7083,104 +7071,104 @@ msgid "%s was upgraded for free to %s."
msgstr "%s se ha mejorado gratuitamente a %s."
#: server/unittools.c:297
-#, c-format
-msgid "Not enough gold. %s disbanded"
+#, fuzzy, c-format
+msgid "Not enough gold to pay upkeep for %s. Unit disbanded."
msgstr "No hay suficiente oro. Se desarticula %s"
-#: server/unittools.c:342
+#: server/unittools.c:343
#, c-format
msgid "Your %s has run out of hit points."
msgstr "Tu %s se ha quedado sin puntos de vida."
-#: server/unittools.c:358
+#: server/unittools.c:359
#, c-format
msgid "Your %s has been lost on the high seas."
msgstr "Tu %s se ha perdido en alta mar."
-#: server/unittools.c:365
+#: server/unittools.c:366
#, c-format
msgid "Your %s survived on the high seas and became more experienced!"
msgstr ""
"Tu %s ha sobrevivido en las aguas del océano y se ha vuelto más "
"experimentada."
-#: server/unittools.c:376
+#: server/unittools.c:377
#, c-format
msgid "Your %s has been lost on unsafe terrain."
msgstr "Tu %s se ha perdido en terreno inseguro."
-#: server/unittools.c:430
+#: server/unittools.c:431
#, c-format
msgid "Your %s has returned to refuel."
msgstr "Tu %s ha vuelto para repostar."
-#: server/unittools.c:454
+#: server/unittools.c:455
#, c-format
msgid "Your %s has run out of fuel."
msgstr "Tu %s se ha quedado sin combustible."
-#. TRANS: And, <the unit> became ...
-#: server/unittools.c:616
-#, fuzzy
-msgid "And, became more experienced!"
-msgstr " y se ha vuelto más experimentado!"
-
#. TRANS: Your <unit> became ...
-#: server/unittools.c:620
+#: server/unittools.c:619
#, c-format
msgid "Your %s became more experienced!"
msgstr "Tu %s se volvió más experimentado!"
-#: server/unittools.c:1011
+#: server/unittools.c:1009
#, c-format
msgid "Teleported your %s to %s."
msgstr "Se ha teletransportado tu %s a %s."
-#: server/unittools.c:1041
+#. TRANS: A unit is moved to resolve stack conflicts.
+#: server/unittools.c:1065
+#, fuzzy, c-format
+msgid "Moved your %s."
+msgstr "Se han desarticulado tu %s."
+
+#: server/unittools.c:1076
#, c-format
msgid "Disbanded your %s."
msgstr "Se han desarticulado tu %s."
-#: server/unittools.c:1363
+#: server/unittools.c:1397
#, 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:1367
+#: server/unittools.c:1401
#, 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:1469
+#: server/unittools.c:1503
#, 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:1478
+#: server/unittools.c:1512
#, c-format
msgid "%s lost when %s was lost."
msgstr "Has perdido un %s al desaparecer tu %s."
-#: server/unittools.c:1527
+#: server/unittools.c:1561
#, 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:1545
+#: server/unittools.c:1579
#, fuzzy, 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:1554 server/unittools.c:1612
+#: server/unittools.c:1588 server/unittools.c:1646
#, fuzzy, 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."
#. TRANS: "... Cannon ... the Polish Destroyer ...."
-#: server/unittools.c:1588
+#: server/unittools.c:1622
#, fuzzy, c-format
msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
msgid_plural ""
@@ -7192,14 +7180,14 @@ msgstr[1] ""
#. TRANS: "Cannon lost when the Polish Destroyer
#. * attacked the German Musketeers."
-#: server/unittools.c:1621
+#: server/unittools.c:1655
#, fuzzy, 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."
#. TRANS: "Musketeers (and Cannon) lost to an
#. * attack from the Polish Destroyer."
-#: server/unittools.c:1636
+#: server/unittools.c:1670
#, fuzzy, 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."
@@ -7207,7 +7195,7 @@ msgstr "Has perdido un %1$s (y %2$s) bajo un ataque de un %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:1646
+#: server/unittools.c:1680
#, 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."
@@ -7219,197 +7207,197 @@ 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:1660
+#: server/unittools.c:1694
#, 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] "%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."
-#: server/unittools.c:1928
+#: server/unittools.c:1962
#, 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:1931 server/unittools.c:1947
+#: server/unittools.c:1965 server/unittools.c:1981
msgid "yourself"
msgstr "tú"
-#: server/unittools.c:1935
+#: server/unittools.c:1969
#, fuzzy, c-format
msgid "The %s %s was nuked."
msgstr "Una bomba atómica ha destruido %2$s de %1$s."
-#: server/unittools.c:1944
+#: server/unittools.c:1978
#, c-format
msgid "%s was nuked by %s."
msgstr "%2$s ha lanzado una bomba atómica sobre %1$s."
-#: server/unittools.c:1952
+#: server/unittools.c:1986
#, c-format
msgid "You nuked %s."
msgstr "Has lanzado una bomba atómica sobre %s."
-#: server/unittools.c:1993
+#: server/unittools.c:2027
#, fuzzy, c-format
msgid "The %s detonated a nuke!"
msgstr "¡%s ha detonado una bomba atómica!"
-#: server/unittools.c:2017
+#: server/unittools.c:2051
#, c-format
msgid "%s transported successfully."
msgstr "%s fue transportado con éxito."
-#: server/unittools.c:2069
+#: server/unittools.c:2103
msgid "This unit type can not be paradropped."
msgstr "Este tipo de unidad no se puede tirar en paracaídas."
-#: server/unittools.c:2079
+#: server/unittools.c:2113
#, fuzzy
msgid "You cannot paradrop a unit that is transporting other units."
msgstr "Esta unidad de transporte no se puede tirar en paracaídas."
-#: server/unittools.c:2085
+#: server/unittools.c:2119
msgid "The destination location is not known."
msgstr "Posición de destino desconocida."
-#: server/unittools.c:2092
+#: server/unittools.c:2126
#, c-format
msgid "This unit cannot paradrop into %s."
msgstr "Esta unidad no se puede tirar en paracaídas sobre %s."
-#: server/unittools.c:2112
+#: server/unittools.c:2146
#, 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:2123
+#: server/unittools.c:2157
#, 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:2136
+#: server/unittools.c:2170
#, 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:2158
+#: server/unittools.c:2192
#, c-format
msgid "You found %d gold."
msgstr "Has encontrado %d monedas de oro."
-#: server/unittools.c:2175
+#: server/unittools.c:2209
#, 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:2182
+#: server/unittools.c:2216
#, 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:2196
+#: server/unittools.c:2230
msgid "A band of friendly mercenaries joins your cause."
msgstr "Una banda de mercenarios amistosos se une a tu causa."
-#: server/unittools.c:2214
+#: server/unittools.c:2248
msgid "An abandoned village is here."
msgstr "Encuentras una aldea abandonada."
-#: server/unittools.c:2224
+#: server/unittools.c:2258
msgid "You have unleashed a horde of barbarians!"
msgstr "¡Has provocado una horda de bárbaros!"
-#: server/unittools.c:2227
+#: server/unittools.c:2261
#, c-format
msgid "Your %s has been killed by barbarians!"
msgstr "¡Los bárbaros han destruido tu %s!"
-#: server/unittools.c:2243
+#: server/unittools.c:2277
msgid "You found a friendly city."
msgstr "Has encontrado una ciudad amiga."
-#: server/unittools.c:2257
+#: server/unittools.c:2291
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:2282
+#: server/unittools.c:2316
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:2540
+#: server/unittools.c:2574
#, c-format
msgid "Orders for %s aborted after enemy movement was spotted."
msgstr "Órdenes de %s abortadas porque hay unidades cerca."
-#: server/unittools.c:2989
+#: server/unittools.c:3023
#, c-format
msgid "Orders for %s aborted as there are units nearby."
msgstr "Órdenes de %s abortadas porque hay unidades cerca."
-#: server/unittools.c:3041
+#: server/unittools.c:3075
#, 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:3054
+#: server/unittools.c:3088
#, 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:3068
+#: server/unittools.c:3102
#, 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:3078
+#: server/unittools.c:3112
#, 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:3104
+#: server/unittools.c:3138
#, 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:3145
+#: server/unittools.c:3179
#, 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:3156
+#: server/unittools.c:3190
#, 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:3168
+#: server/unittools.c:3202
#, c-format
msgid "Attempt to build wonder for %s failed."
msgstr "Falló el intento de construir una maravilla por %s."
-#: server/unittools.c:3177
+#: server/unittools.c:3211
#, c-format
msgid "Your %s has invalid orders."
msgstr "Tu %s tiene órdenes inválidas."
-#: server/generator/mapgen.c:1737
+#: 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."
-#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
+#: server/generator/mapgen.c:1969 server/generator/mapgen.c:2039
#, c-format
msgid "Falling back to generator %d."
msgstr "Recurriendo al generador %d."
-#: server/generator/mapgen.c:2025
+#: server/generator/mapgen.c:2059
msgid "Generator 3 didn't place all big islands."
msgstr "El generador 3 no ha podido colocar todas las islas grandes."
-#: server/generator/mapgen.c:2054
+#: server/generator/mapgen.c:2088
#, c-format
msgid "Generator 3 left %li landmass unplaced."
msgstr "El generador 3 ha dejado %li masas terrestres sin colocar."
@@ -7519,7 +7507,7 @@ msgid_plural "%3d turns"
msgstr[0] "%3d turno"
msgstr[1] "%3d turnos"
-#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:631
#: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
@@ -7637,356 +7625,356 @@ msgstr "Paz"
msgid "(worklist)"
msgstr "(lista de tareas)"
-#: client/cityrepdata.c:447
-msgid "Special"
-msgstr "Especial"
-
-#: client/cityrepdata.c:448
-msgid "?entertainers/scientists/taxmen:E/S/T"
-msgstr "H/C/R"
+#: client/cityrepdata.c:446
+msgid "?city:Name"
+msgstr "Nombre"
-#: client/cityrepdata.c:449
-msgid "Entertainers, Scientists, Taxmen"
-msgstr "Hosteleros, Científicos, Recaudadores"
+#: client/cityrepdata.c:446 client/gui-sdl/cityrep.c:169
+msgid "City Name"
+msgstr "Nombre de la Ciudad"
-#: client/cityrepdata.c:452
+#: client/cityrepdata.c:448
#, fuzzy
-msgid "Concise + Rapture, - Disorder"
-msgstr "Breve: + Celebraciones, - Disturbios"
+msgid "?size [short]:Sz"
+msgstr "Tm"
-#: client/cityrepdata.c:454 client/plrdlg_common.c:261
+#: client/cityrepdata.c:448
+msgid "Size"
+msgstr "Tamaño"
+
+#: client/cityrepdata.c:450 client/plrdlg_common.c:261
#: client/gui-win32/plrdlg.c:337
msgid "State"
msgstr "Estado"
-#: client/cityrepdata.c:454
+#: client/cityrepdata.c:450
msgid "Rapture/Peace/Disorder"
msgstr "Celebraciones/Paz/Disturbios"
+#: client/cityrepdata.c:452
+#, fuzzy
+msgid "Concise *=Rapture, X=Disorder"
+msgstr "Breve: + Celebraciones, - Disturbios"
+
+#: client/cityrepdata.c:456
+msgid "Special"
+msgstr "Especial"
+
#: client/cityrepdata.c:457
+msgid "?entertainers/scientists/taxmen:E/S/T"
+msgstr "H/C/R"
+
+#: client/cityrepdata.c:458
+msgid "Entertainers, Scientists, Taxmen"
+msgstr "Hosteleros, Científicos, Recaudadores"
+
+#: client/cityrepdata.c:461
msgid "?Happy workers:H"
msgstr "F"
-#: client/cityrepdata.c:457
+#: client/cityrepdata.c:461
msgid "Workers: Happy"
msgstr "Obreros: Felices"
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
msgid "?Content workers:C"
msgstr "C"
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
msgid "Workers: Content"
msgstr "Obreros: Conformes"
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
msgid "?Unhappy workers:U"
msgstr "D"
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
msgid "Workers: Unhappy"
msgstr "Obreros: Descontentos"
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
msgid "?Angry workers:A"
msgstr "E"
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
msgid "Workers: Angry"
msgstr "Obreros: Enfadados"
-#: client/cityrepdata.c:465 client/gui-xaw/citydlg.c:2401
-#: data/default/units.ruleset:238
-msgid "Workers"
+#: client/cityrepdata.c:469 client/gui-xaw/citydlg.c:2402
+#, fuzzy
+msgid "?city:Workers"
msgstr "Obreros"
-#: client/cityrepdata.c:466
+#: client/cityrepdata.c:470
msgid "?happy/content/unhappy/angry:H/C/U/A"
msgstr "F/C/D/E"
-#: client/cityrepdata.c:467
+#: client/cityrepdata.c:471
msgid "Workers: Happy, Content, Unhappy, Angry"
msgstr "Ciudadanos: Felices, Conformes, Descontentos, Enfadados"
-#: client/cityrepdata.c:470 client/cityrepdata.c:472
+#: client/cityrepdata.c:474 client/cityrepdata.c:476
msgid "Best"
msgstr "Mejor"
-#: client/cityrepdata.c:470
+#: client/cityrepdata.c:474
msgid "attack"
msgstr "ataque"
-#: client/cityrepdata.c:471
+#: client/cityrepdata.c:475
msgid "Best attacking units"
msgstr "Mejores unidades ofensivas"
-#: client/cityrepdata.c:472
+#: client/cityrepdata.c:476
msgid "defense"
msgstr "defensa"
-#: client/cityrepdata.c:473
+#: client/cityrepdata.c:477
msgid "Best defending units"
msgstr "Mejores unidades defensivas"
-#: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
-#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
-#: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
-#: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
-#: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
-#: client/gui-win32/menu.c:351 client/gui-win32/repodlgs.c:616
-#: client/gui-win32/repodlgs.c:707 client/gui-win32/repodlgs.c:716
-#: client/gui-xaw/menu.c:157 client/gui-xaw/menu.c:219
-#: client/gui-xaw/menu.c:242 client/gui-xaw/repodlgs.c:881
-#: client/gui-xaw/repodlgs.c:1069 data/Freeciv.in:1895 data/helpdata.txt:909
+#: client/cityrepdata.c:478 client/cityrepdata.c:482
+#: client/gui-gtk-2.0/cityrep.c:1437 client/gui-gtk-2.0/cityrep.c:1456
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-gtk-2.0/cityrep.c:1494
+#: client/gui-gtk-2.0/cityrep.c:1514 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/repodlgs.c:960 client/gui-sdl/helpdlg.c:688
+#: client/gui-sdl/mapctrl.c:1605 client/gui-sdl/optiondlg.c:1827
+#: client/gui-sdl/repodlgs.c:356 client/gui-win32/menu.c:351
+#: client/gui-win32/repodlgs.c:616 client/gui-win32/repodlgs.c:707
+#: client/gui-win32/repodlgs.c:716 client/gui-xaw/menu.c:157
+#: client/gui-xaw/menu.c:219 client/gui-xaw/menu.c:242
+#: client/gui-xaw/repodlgs.c:881 client/gui-xaw/repodlgs.c:1069
+#: data/Freeciv.in:1895 data/helpdata.txt:909
msgid "Units"
msgstr "Unidades"
#. TRANS: Header "Number of units inside city"
-#: client/cityrepdata.c:476
+#: client/cityrepdata.c:480
#, fuzzy
msgid "?Present (units):Here"
msgstr "Pre"
-#: client/cityrepdata.c:477
+#: client/cityrepdata.c:481
msgid "Number of units present"
msgstr "Número de unidades presentes"
#. TRANS: Header "Number of units supported by given city"
-#: client/cityrepdata.c:480
+#: client/cityrepdata.c:484
#, fuzzy
msgid "?Supported (units):Owned"
msgstr "Man"
-#: client/cityrepdata.c:481
+#: client/cityrepdata.c:485
msgid "Number of units supported"
msgstr "Número de unidades mantenidas"
#. TRANS: Header "It will take this many turns before city grows"
-#: client/cityrepdata.c:484
+#: client/cityrepdata.c:488
#, fuzzy
msgid "?food (population):Grow"
msgstr "Crece"
-#: client/cityrepdata.c:485 client/cityrepdata.c:530
+#: client/cityrepdata.c:489 client/cityrepdata.c:528
#, fuzzy
msgid "?Stock/Target:(Have/Need)"
msgstr "(Construido/Objetivo)"
-#: client/cityrepdata.c:486
+#: client/cityrepdata.c:490
msgid "Turns until growth/famine"
msgstr "Turnos hasta crecimiento/hambruna"
-#: client/cityrepdata.c:488
-#, fuzzy
-msgid "?size [short]:Sz"
-msgstr "Tm"
-
-#: client/cityrepdata.c:488
-msgid "Size"
-msgstr "Tamaño"
-
-#: client/cityrepdata.c:492
-msgid "?city:Name"
-msgstr "Nombre"
-
-#: client/cityrepdata.c:492 client/gui-sdl/cityrep.c:169
-msgid "City Name"
-msgstr "Nombre de la Ciudad"
-
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
msgid "Surplus"
msgstr "Superávit"
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
msgid "?food/production/trade:F/P/T"
msgstr "A/P/C"
-#: client/cityrepdata.c:496
+#: client/cityrepdata.c:494
msgid "Surplus: Food, Production, Trade"
msgstr "Superávit: Alimento, Producción, Comercio"
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
#, fuzzy
msgid "?Food surplus [short]:+F"
msgstr "+A"
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
msgid "Surplus: Food"
msgstr "Superávit: Comida"
-#: client/cityrepdata.c:500
+#: client/cityrepdata.c:498
#, fuzzy
msgid "?Production surplus [short]:+P"
msgstr "+P"
-#: client/cityrepdata.c:501
+#: client/cityrepdata.c:499
msgid "Surplus: Production"
msgstr "Superávit: Producción"
-#: client/cityrepdata.c:502
+#: client/cityrepdata.c:500
#, fuzzy
msgid "?Production loss (waste) [short]:-P"
msgstr "-P"
-#: client/cityrepdata.c:503
+#: client/cityrepdata.c:501
msgid "Waste"
msgstr "Desidia"
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
#, fuzzy
msgid "?Trade surplus [short]:+T"
msgstr "+C"
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
msgid "Surplus: Trade"
msgstr "Superávit: Comercio"
-#: client/cityrepdata.c:506
+#: client/cityrepdata.c:504
#, fuzzy
msgid "?Trade loss (corruption) [short]:-T"
msgstr "-C"
-#: client/cityrepdata.c:507
+#: client/cityrepdata.c:505
msgid "Corruption"
msgstr "Corrupción"
-#: client/cityrepdata.c:509 client/gui-gtk-2.0/repodlgs.c:654
+#: client/cityrepdata.c:507 client/gui-gtk-2.0/repodlgs.c:654
#: client/gui-sdl/mapctrl.c:1400 client/gui-win32/repodlgs.c:334
#: client/gui-xaw/menu.c:222 client/gui-xaw/repodlgs.c:644
#: client/gui-xaw/repodlgs.c:773 data/Freeciv.in:1819
msgid "Economy"
msgstr "Economía"
-#: client/cityrepdata.c:509
+#: client/cityrepdata.c:507
msgid "?gold/luxury/science:G/L/S"
msgstr "O/L/C"
-#: client/cityrepdata.c:510
+#: client/cityrepdata.c:508
msgid "Economy: Gold, Luxuries, Science"
msgstr "Economía: Oro, Lujo, Ciencia"
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
msgid "?Gold:G"
msgstr "O"
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
msgid "Economy: Gold"
msgstr "Economía: Oro"
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
msgid "?Luxury:L"
msgstr "L"
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
msgid "Economy: Luxury"
msgstr "Economía: Lujo"
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
msgid "?Science:S"
msgstr "C"
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
msgid "Economy: Science"
msgstr "Economía: Ciencia"
-#: client/cityrepdata.c:518
+#: client/cityrepdata.c:516
#, fuzzy
msgid "?number_trade_routes:n"
msgstr "R"
-#: client/cityrepdata.c:518
+#: client/cityrepdata.c:516
#, fuzzy
msgid "?number_trade_routes:R"
msgstr "C"
-#: client/cityrepdata.c:519
+#: client/cityrepdata.c:517
msgid "Number of Trade Routes"
msgstr "Rutas comerciales"
-#: client/cityrepdata.c:521
+#: client/cityrepdata.c:519
msgid "?pollution [short]:Pol"
msgstr "Con"
-#: client/cityrepdata.c:523
+#: client/cityrepdata.c:521
msgid "?cma:Governor"
msgstr "Gobernador"
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
-#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
-#: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
-#: data/Freeciv.in:1459 data/helpdata.txt:820
+#: client/cityrepdata.c:521 client/gui-gtk-2.0/cityrep.c:1766
+#: client/gui-sdl/citydlg.c:3809 client/gui-sdl/cma_fe.c:858
+#: client/gui-win32/citydlg.c:726 data/Freeciv.in:1459 data/helpdata.txt:820
msgid "Citizen Governor"
msgstr "Gobernador del Pueblo"
-#: client/cityrepdata.c:526
+#: client/cityrepdata.c:524
#, fuzzy
msgid "Turns/Buy"
msgstr "Turnos/Precio"
-#: client/cityrepdata.c:529 client/cityrepdata.c:531
+#: client/cityrepdata.c:527 client/cityrepdata.c:529
msgid "Currently Building"
msgstr "Construyendo"
-#: client/cityrepdata.c:575
+#: client/cityrepdata.c:573
#, fuzzy
msgid "?specialist:S"
msgstr "?Especialistas:E"
-#: client/cityrepdata.c:578
+#: client/cityrepdata.c:576
#, fuzzy
msgid "Specialists"
msgstr "Especialistas"
-#: client/civclient.c:239
+#: client/civclient.c:240
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr " -a, --autoconnect\tPrescindir de la ventana de conexión\n"
-#: client/civclient.c:249
+#: client/civclient.c:250
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:251
+#: client/civclient.c:252
msgid " -m, --meta HOST\tConnect to the metaserver at HOST\n"
msgstr " -m, --meta HOST\tConectarse al metaservidor en HOST\n"
-#: client/civclient.c:253
+#: client/civclient.c:254
msgid " -n, --name NAME\tUse NAME as name\n"
msgstr " -n, --name NOMBRE\tUsar NOMBRE como nombre\n"
-#: client/civclient.c:255
+#: client/civclient.c:256
#, fuzzy
msgid " -p, --port PORT\tConnect to server port PORT (usually with -a)\n"
msgstr " -p, --port PUERTO\tConectarse al puerto PUERTO del servidor\n"
-#: client/civclient.c:257
+#: client/civclient.c:258
#, 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:259
+#: client/civclient.c:260
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:262
+#: client/civclient.c:263
#, fuzzy
msgid " -s, --server HOST\tConnect to the server at HOST (usually with -a)\n"
msgstr " -s, --server HOST\tConectarse al servidor en HOST\n"
-#: client/civclient.c:264
+#: client/civclient.c:265
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:265
+#: client/civclient.c:266
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:268
+#: client/civclient.c:269
#, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -7996,145 +7984,155 @@ msgstr ""
" Prueba con \"%s -- --help\" para más información.\n"
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:273
+#: client/civclient.c:274
#, fuzzy, c-format
msgid "Report bugs at %s\n"
msgstr "Informa de los bugs a <%s>.\n"
-#: client/civclient.c:297
+#: client/civclient.c:298
#, 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:299 client/civclient.c:314
+#: client/civclient.c:300 client/civclient.c:315
msgid "Try using --help.\n"
msgstr "Prueba usando --help.\n"
-#: client/civclient.c:312
+#: client/civclient.c:313
#, 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:325
+#: client/civclient.c:326
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr "Opción desconocida: \"%s\"\n"
-#: client/civclient.c:539
+#: client/civclient.c:391
+#, fuzzy, c-format
+msgid "Updating old metaserver address \"%s\"."
+msgstr "metaserver <dirección>"
+
+#: client/civclient.c:394
+#, fuzzy, c-format
+msgid "Default metaserver has been set to \"%s\"."
+msgstr "Opción: %s ahora vale \"%s\"."
+
+#: client/civclient.c:550
msgid "Game started."
msgstr "La partida ha empezado."
-#: client/civclient.c:577
+#: client/civclient.c:588
msgid "There was an error while auto connecting; aborting."
msgstr "Ha ocurrido un error durante la autoconexión; cancelando."
-#: client/climisc.c:176
+#: client/climisc.c:177
#, c-format
msgid "Changing production of every %s into %s."
msgstr "Cambiando la prducción de cada %s en %s."
-#: client/climisc.c:214
+#: client/climisc.c:215
msgid "?embassy:Both"
msgstr "Ambos"
-#: client/climisc.c:216
+#: client/climisc.c:217
msgid "?embassy:Yes"
msgstr "Sí"
-#: client/climisc.c:219
+#: client/climisc.c:220
msgid "?embassy:With Us"
msgstr "Con nosotros"
-#: client/climisc.c:222
+#: client/climisc.c:223
msgid "?embassy:Contact"
msgstr "Contacto"
-#: client/climisc.c:224
+#: client/climisc.c:225
msgid "?embassy:No Contact"
msgstr "Sin Contacto"
-#: client/climisc.c:236
+#: client/climisc.c:237
msgid "?vision:Both"
msgstr "Ambos"
-#: client/climisc.c:238
+#: client/climisc.c:239
msgid "?vision:To Them"
msgstr "Para ellos"
-#: client/climisc.c:241
+#: client/climisc.c:242
msgid "?vision:To Us"
msgstr "Para Ti"
-#: client/climisc.c:257 client/climisc.c:264
+#: client/climisc.c:258 client/climisc.c:265
#, c-format
msgid "The %s give %s"
msgstr "Los %s dan %s"
-#: client/climisc.c:268
+#: client/climisc.c:269
#, c-format
msgid "The %s give unknown city."
msgstr "Los %s dan una ciudad desconocida."
-#: client/climisc.c:273
+#: client/climisc.c:274
#, c-format
msgid "The %s give %d gold"
msgstr "Los %s dan %d monedas de oro"
-#: client/climisc.c:278
+#: client/climisc.c:279
#, c-format
msgid "The %s give their worldmap"
msgstr "Los %s dan su mapamundi"
-#: client/climisc.c:282
+#: client/climisc.c:283
#, c-format
msgid "The %s give their seamap"
msgstr "Los %s dan su mapa marítimo"
-#: client/climisc.c:286
+#: client/climisc.c:287
msgid "The parties agree on a cease-fire"
msgstr "Los firmantes acuerdan una tregua"
-#: client/climisc.c:289
+#: client/climisc.c:290
msgid "The parties agree on a peace"
msgstr "Los firmantes acuerdan la paz"
-#: client/climisc.c:292
+#: client/climisc.c:293
msgid "The parties create an alliance"
msgstr "Los firmantes crean una alianza"
-#: client/climisc.c:295
+#: client/climisc.c:296
#, c-format
msgid "The %s give shared vision"
msgstr "Los %s dan visión compartida"
-#: client/climisc.c:299
+#: client/climisc.c:300
#, c-format
msgid "The %s give an embassy"
msgstr "Los %s dan una embajada"
-#: client/climisc.c:902
+#: client/climisc.c:906
msgid "Popup Request"
msgstr "Nueva ventana"
-#: client/climisc.c:932
+#: client/climisc.c:936
msgid "Exporting output window to civgame.log ..."
msgstr "Exportando la ventana principal a civgame.log ..."
-#: client/climisc.c:936
+#: client/climisc.c:940
msgid "Export complete."
msgstr "Fin de la exportación."
-#: client/climisc.c:938
+#: client/climisc.c:942
msgid "Export failed, couldn't write to file."
msgstr "Grabación cancelada, no puedo escribir el fichero."
-#: client/climisc.c:1038
+#: client/climisc.c:1042
#, c-format
msgid "You don't buy %s in %s!"
msgstr "¡No has comprado %s en %s!"
-#: client/climisc.c:1056
+#: client/climisc.c:1060
#, c-format
msgid "%s costs %d gold and you only have %d gold."
msgstr "%s cuesta %d monedas de oro, y tú sólo tienes %d."
@@ -8185,19 +8183,19 @@ msgstr ""
"Autoconectando con el servidor \"%s\", puerto %d, como \"%s\" cada %f segundo"
"(s) hasta %d intentos"
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1289
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
msgid "novice"
msgstr "novato"
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1289
+#: client/connectdlg_common.c:80 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:1290
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
msgid "normal"
msgstr "normal"
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1290
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
msgid "hard"
msgstr "difícil"
@@ -8226,38 +8224,42 @@ msgid "We probably couldn't start it from here."
msgstr "Probablemente no lo hemos podido iniciar desde aquí."
#: client/connectdlg_common.c:470
-msgid "We have control of the server (command access level hack)"
+#, fuzzy
+msgid ""
+"Established control over the server. You have command access level 'hack'."
msgstr "Tenemos el control del servidor (nivel de acceso a comandos 'hack')"
#: client/connectdlg_common.c:475
-msgid "We can't take control of server, attempting to kill it."
-msgstr "No hemos obtenido el control del servidor, lo intentamos matar."
+msgid ""
+"Failed to obtain the required access level to take control of the server. "
+"The server will now be shutdown."
+msgstr ""
-#: client/control.c:1104
+#: client/control.c:1123
msgid "Only transporter units can be unloaded."
msgstr "Sólo las unidades de transporte pueden descargarse."
-#: client/control.c:1353
+#: client/control.c:1425
msgid "Only settler units can be put into auto mode."
msgstr "Sólo los colonos pueden ponerse en modo automático."
-#: client/control.c:1444
+#: client/control.c:1516
msgid "Only nuclear units can do this."
msgstr "Sólo las armas nucleares pueden hacer eso."
-#: client/control.c:1473
+#: client/control.c:1545
msgid "Only paratrooper units can do this."
msgstr "Sólo los paracaidistas pueden hacer eso."
-#: client/control.c:1921
+#: client/control.c:2020
msgid "Too far for this unit."
msgstr "Demasiado lejos para esa unidad."
-#: client/control.c:2131 client/control.c:2161 client/control.c:2177
+#: client/control.c:2230 client/control.c:2260 client/control.c:2276
msgid "Didn't find a route to the destination!"
msgstr "¡No hay una ruta hacia el destino!"
-#: client/control.c:2221
+#: client/control.c:2320
msgid "Oh my! You seem to have no capital!"
msgstr "¡Vaya! ¡Parece que no tienes capital!"
@@ -8345,16 +8347,16 @@ msgid "Allows %s (with %s)."
msgstr "Permite %s (con %s)."
#. TRANS: preserve single space at beginning
-#: client/helpdata.c:418
+#: client/helpdata.c:416
msgid " Rivers"
msgstr " Ríos"
-#: client/helpdata.c:576
+#: client/helpdata.c:574
#, c-format
msgid "Sorry, no help topic for %s.\n"
msgstr "Lo siento, no se encuentra el tema de ayuda para %s.\n"
-#: client/helpdata.c:580
+#: client/helpdata.c:578
#, c-format
msgid ""
"Sorry, no help topic for %s.\n"
@@ -8365,7 +8367,7 @@ msgstr ""
"Esta página se ha generado automáticamente.\n"
"\n"
-#: client/helpdata.c:670
+#: client/helpdata.c:668
#, fuzzy
msgid ""
"Requires: Nothing\n"
@@ -8374,80 +8376,80 @@ msgstr ""
"Requiere la construcción de %s.\n"
"\n"
-#: client/helpdata.c:675
+#: client/helpdata.c:673
#, c-format
msgid "* The discovery of %s will make %s obsolete.\n"
msgstr "* El descubrimiento de %s dejará obsoleto %s.\n"
-#: client/helpdata.c:694
+#: client/helpdata.c:692
#, c-format
msgid "* Allows all players with knowledge of %s to build %s units.\n"
msgstr ""
"* Permite a todos los jugadores que conozcan %s construir unidades %s.\n"
-#: client/helpdata.c:706
+#: client/helpdata.c:704
#, c-format
msgid "* Allows %s (with %s).\n"
msgstr "* Permite %s (con %s).\n"
-#: client/helpdata.c:710
+#: client/helpdata.c:708
#, c-format
msgid "* Allows %s.\n"
msgstr "* Permite %s.\n"
-#: client/helpdata.c:780
+#: client/helpdata.c:778
#, fuzzy, c-format
msgid "* Can only be built if there is %s in the city.\n"
msgstr "* Sólo puede construirse gobernando con %s.\n"
-#: client/helpdata.c:786
+#: client/helpdata.c:784
#, c-format
msgid "* Can only be built with %s as government.\n"
msgstr "* Sólo puede construirse gobernando con %s.\n"
-#: client/helpdata.c:791
+#: client/helpdata.c:789
msgid "* May not be built in cities.\n"
msgstr "* No se puede construir en ciudades.\n"
-#: client/helpdata.c:794
+#: client/helpdata.c:792
msgid "* Never has a home city.\n"
msgstr "* Nunca se establece en una ciudad.\n"
-#: client/helpdata.c:797
+#: client/helpdata.c:795
msgid "* Losing this unit will lose you the game!\n"
msgstr "* Perder esta unidad significa perder la partida!\n"
-#: client/helpdata.c:801
+#: client/helpdata.c:799
msgid "* Each player may only have one of this type of unit.\n"
msgstr "* Cada jugador sólo puede tener una unidad de este tipo.\n"
-#: client/helpdata.c:805
+#: client/helpdata.c:803
#, c-format
msgid "* Requires %d population to build.\n"
msgstr "* Requiere %d de población para construirla.\n"
-#: client/helpdata.c:811
+#: client/helpdata.c:809
#, c-format
msgid "* Can carry and refuel %d air unit.\n"
msgid_plural "* Can carry and refuel %d air units.\n"
msgstr[0] "* Puede transportar y repostar %d unidad aérea.\n"
msgstr[1] "* Puede transportar y repostar %d unidades aéreas.\n"
-#: client/helpdata.c:816
+#: client/helpdata.c:814
#, c-format
msgid "* Can carry and refuel %d missile unit.\n"
msgid_plural "* Can carry and refuel %d missile units.\n"
msgstr[0] "* Puede transportar y repostar %d misil.\n"
msgstr[1] "* Puede transportar y repostar %d misiles.\n"
-#: client/helpdata.c:821
+#: client/helpdata.c:819
#, c-format
msgid "* Can carry %d ground unit across water.\n"
msgid_plural "* Can carry %d ground units across water.\n"
msgstr[0] "* Puede transportar %d unidad terrestre por el océano.\n"
msgstr[1] "* Puede transportar %d unidades terrestres por el océano.\n"
-#: client/helpdata.c:830
+#: client/helpdata.c:828
msgid ""
"* Can establish trade routes (must travel to target city and must be at "
"least 9 tiles [in Manhattan distance] from this unit's home city).\n"
@@ -8456,135 +8458,135 @@ msgstr ""
"que tiene que estar cómo mínimo a 9 casillas apartada [la distancia de "
"Manhattan] desde la ciudad en la cual está establecida).\n"
-#: client/helpdata.c:836
+#: client/helpdata.c:834
#, c-format
msgid "* Can help build wonders (adds %d production).\n"
msgstr ""
"* Puede contribuir a la construcción de una maravilla. (añade %d de "
"producción)\n"
-#: client/helpdata.c:840
+#: client/helpdata.c:838
msgid "* May not be disbanded.\n"
msgstr "* No se puede desmontar.\n"
-#: client/helpdata.c:842
+#: client/helpdata.c:840
#, c-format
msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
msgstr ""
"* Se puede desmontar en una ciudad para recuperar 50%% del coste de "
"producción.\n"
-#: client/helpdata.c:846
+#: client/helpdata.c:844
msgid "* Can build new cities.\n"
msgstr "* Puede construir nuevas ciudades.\n"
-#: client/helpdata.c:849
+#: client/helpdata.c:847
#, c-format
msgid "* Can add on %d population to cities of no more than size %d.\n"
msgstr "* Puede añadir %d población a ciudades de población máxima de %d.\n"
-#: client/helpdata.c:858
+#: client/helpdata.c:856
msgid "* Can build roads and railroads.\n"
msgstr "* Puede construir carreteras y ferrocarilles.\n"
-#: client/helpdata.c:859
+#: client/helpdata.c:857
msgid "* Can build mines on tiles.\n"
msgstr "* Puede construir minas en las casillas.\n"
-#: client/helpdata.c:860
+#: client/helpdata.c:858
msgid "* Can build irrigation on tiles.\n"
msgstr "* Puede construir irrigación en las casillas.\n"
-#: client/helpdata.c:865
+#: client/helpdata.c:863
msgid "* Can build farmland.\n"
msgstr "* Puede construir huertas.\n"
-#: client/helpdata.c:869
+#: client/helpdata.c:867
#, c-format
msgid "* Can build farmland (if %s is known).\n"
msgstr "* Puede construir huertas ( si %s es conocido).\n"
-#: client/helpdata.c:873
+#: client/helpdata.c:871
#, c-format
msgid "* Can build farmland (if any of the following are known: %s).\n"
msgstr ""
"* Puede construir huertas (si alguno de los siguientes son conocidos: %s).\n"
-#: client/helpdata.c:881
+#: client/helpdata.c:879
msgid "* Can build fortresses.\n"
msgstr "* Puede construir fortalezas.\n"
-#: client/helpdata.c:885
+#: client/helpdata.c:883
#, c-format
msgid "* Can build fortresses (if %s is known).\n"
msgstr "* Puede construir fortalezas ( si %s es conocido).\n"
-#: client/helpdata.c:889
+#: client/helpdata.c:887
#, c-format
msgid "* Can build fortresses (if any of the following are known: %s).\n"
msgstr ""
"* Puede construir fortalezas ( si alguno de los siguientes son conocidos: %"
"s).\n"
-#: client/helpdata.c:895
+#: client/helpdata.c:893
msgid "* Can clean pollution from tiles.\n"
msgstr "* Puede borrar la polución de las casillas.\n"
-#: client/helpdata.c:896
+#: client/helpdata.c:894
msgid "* Can clean nuclear fallout from tiles.\n"
msgstr "* Puede limpiar la radioactividad de las casillas.\n"
-#: client/helpdata.c:899
+#: client/helpdata.c:897
msgid "* Can transform tiles.\n"
msgstr "* Puede efectuar transformaciones de las casillas.\n"
-#: client/helpdata.c:902
+#: client/helpdata.c:900
msgid "* Can build airbases.\n"
msgstr "* Puede construir bases aéreas.\n"
-#: client/helpdata.c:906
+#: client/helpdata.c:904
#, c-format
msgid "* May fortify, granting a 50%% defensive bonus.\n"
msgstr "* Se puede fortificar, ganando un bonus defensivo del 50%%.\n"
-#: client/helpdata.c:909
+#: client/helpdata.c:907
msgid "* May pillage to destroy infrastructure from tiles.\n"
msgstr "* Puede saquear para destruir la infraestructura de las casillas.\n"
-#: client/helpdata.c:913
+#: client/helpdata.c:911
msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
msgstr ""
"* Puede realizar acciones diplomáticas, y tiene habilidades especiales de "
"espionaje.\n"
-#: client/helpdata.c:916
+#: client/helpdata.c:914
msgid "* Can perform diplomatic actions.\n"
msgstr "* Puede realizar acciones diplomáticas.\n"
-#: client/helpdata.c:920
+#: client/helpdata.c:918
msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
msgstr ""
"* Nunca perderá un combate de un diplomático contra otro diplomático.\n"
-#: client/helpdata.c:923
+#: client/helpdata.c:921
msgid "* May not be bribed.\n"
msgstr "* No se puede sobornar.\n"
-#: client/helpdata.c:926
+#: client/helpdata.c:924
msgid "* Can attack enemy air units.\n"
msgstr "* Puede atacar a unidades aéreas enemigas.\n"
-#: client/helpdata.c:930
+#: client/helpdata.c:928
msgid "* Is invisible except when next to an enemy unit or city.\n"
msgstr ""
"* Es invisible excepto cuando está junto a una ciudad o unidad enemiga.\n"
-#: client/helpdata.c:934
+#: client/helpdata.c:932
msgid "* Can only attack units on ocean squares (no land attacks).\n"
msgstr ""
"* Sólo puede atacar a unidades en casillas de océano (no ataca a tierra).\n"
-#: client/helpdata.c:938
+#: client/helpdata.c:936
msgid ""
"* Can attack from aboard sea units: against enemy cities and onto land "
"squares.\n"
@@ -8592,40 +8594,40 @@ msgstr ""
"* Puede atacar desde a bordo de unidades marítimas: a ciudades enemigas y "
"casillas de tierra.\n"
-#: client/helpdata.c:943
+#: client/helpdata.c:941
#, c-format
msgid "* Can be paradropped from a friendly city (Range: %d).\n"
msgstr "* Se puede tirar en paracaídas desde una ciudad amiga (Alcance: %d).\n"
-#: client/helpdata.c:949
+#: client/helpdata.c:947
msgid "* Gets double defense against units specified as 'mounted'.\n"
msgstr "* Tiene el doble de defensa contra unidades que sean 'a caballo'.\n"
-#: client/helpdata.c:953
+#: client/helpdata.c:951
msgid "* Counts as 'mounted' against certain defenders.\n"
msgstr "* Es una unidad 'a caballo' (eso importa contra ciertos defensores).\n"
-#: client/helpdata.c:957
+#: client/helpdata.c:955
msgid "* A missile unit: gets used up in making an attack.\n"
msgstr "* Es una unidad de misil: se destruye al efectuar un ataque.\n"
-#: client/helpdata.c:960
+#: client/helpdata.c:958
msgid "* Making an attack ends this unit's turn.\n"
msgstr "* El turno de esta unidad se termina si ataca.\n"
-#: client/helpdata.c:964
+#: client/helpdata.c:962
msgid "* This unit's attack causes a nuclear explosion!\n"
msgstr "* ¡El ataque de esta unidad causa una explosión nuclear!\n"
-#: client/helpdata.c:968
+#: client/helpdata.c:966
msgid "* Gets double firepower when attacking cities.\n"
msgstr "* Obtiene el doble de poder de tiro cuando ataca a ciudades.\n"
-#: client/helpdata.c:971
+#: client/helpdata.c:969
msgid "* Ignores the effects of city walls.\n"
msgstr "* Ignora el efecto de las murallas.\n"
-#: client/helpdata.c:975
+#: client/helpdata.c:973
#, c-format
msgid ""
"* Does bombard attacks (%d per turn). These attacks will only damage (never "
@@ -8634,39 +8636,39 @@ msgstr ""
"* Hace ataques de bombardeo /%d por turno). Estos ataques sólo dañarán "
"(nunca matarán) al defensor pero sin riesgo para el atacante.\n"
-#: client/helpdata.c:982
+#: client/helpdata.c:980
msgid "* Gets quintuple defense against missiles and aircraft.\n"
msgstr "* Tiene cinco veces más defensa contra misiles y aviones.\n"
-#: client/helpdata.c:986
+#: client/helpdata.c:984
msgid "* Ignores terrain effects (treats all squares as roads).\n"
msgstr ""
"* Ignora el efecto del terreno (actúa como si todas las casillas fueran "
"caminos).\n"
-#: client/helpdata.c:989
+#: client/helpdata.c:987
msgid "* Ignores zones of control.\n"
msgstr "* Ignora las zonas de control.\n"
-#: client/helpdata.c:993
+#: client/helpdata.c:991
msgid "* A non-military unit (cannot attack; no martial law).\n"
msgstr "* Es una unidad no militar (no ataca y no provoca ley marcial).\n"
-#: client/helpdata.c:997
+#: client/helpdata.c:995
msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
msgstr ""
"* Es una unidad de campo: crea un descontento incluso cuando no es "
"agresiva.\n"
-#: client/helpdata.c:1000
+#: client/helpdata.c:998
msgid "* Will never achieve veteran status.\n"
msgstr "* No puede tener niveles veteranos.\n"
-#: client/helpdata.c:1002
+#: client/helpdata.c:1000
msgid "* May become veteran through training or combat.\n"
msgstr "* Puede volverse veterano a través de entrenamiento o combate.\n"
-#: client/helpdata.c:1008
+#: client/helpdata.c:1006
#, c-format
msgid ""
"* Must end turn in a city or next to land, or has a 50%% risk of being lost "
@@ -8675,12 +8677,12 @@ msgstr ""
"* Debe acabar el turno en una ciudad o junto a la costa, o tiene un 50%% de "
"riesgo de desaparecer en el mar.\n"
-#: client/helpdata.c:1012
+#: client/helpdata.c:1010
#, c-format
msgid "* The discovery of %s reduces the risk to 25%%.\n"
msgstr "* El descubrimiento de %s reduce el riesgo al 25%%.\n"
-#: client/helpdata.c:1017
+#: client/helpdata.c:1015
#, c-format
msgid "* %s reduces the risk to 12%%.\n"
msgstr "* %s reduce el riesgo al 12%%.\n"
@@ -8689,15 +8691,15 @@ msgstr "* %s reduce el riesgo al 12%%.\n"
#. * last two elements
#. TRANS: List of possible output types has this between
#. * last two elements
-#: client/helpdata.c:1068 client/helpdata.c:1402
+#: client/helpdata.c:1066 client/helpdata.c:1400
msgid " or "
msgstr " o "
-#: client/helpdata.c:1070 client/helpdata.c:1390
+#: client/helpdata.c:1068 client/helpdata.c:1388
msgid "?or:, "
msgstr ", "
-#: client/helpdata.c:1082
+#: 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"
@@ -8705,12 +8707,12 @@ msgstr[0] "* La unidad tiene que acabar en una ciudad o un %s cada %d turno.\n"
msgstr[1] ""
"* La unidad tiene que acabar en una ciudad o un %s cada %d turnos.\n"
-#: client/helpdata.c:1124
+#: client/helpdata.c:1122
#, 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:1129
+#: client/helpdata.c:1127
#, c-format
msgid ""
"To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8719,89 +8721,89 @@ msgstr ""
"Para llegar a %s necesitamos antes otros %d avances. El proyecto entero "
"empleará %d bombillas."
-#: client/helpdata.c:1137
+#: client/helpdata.c:1135
msgid "You cannot research this technology."
msgstr "No puedes investigar este avance."
-#: client/helpdata.c:1141
+#: client/helpdata.c:1139
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:1153
+#: client/helpdata.c:1151
#, 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:1158
+#: client/helpdata.c:1156
#, 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:1161
+#: client/helpdata.c:1159
#, 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:1165
+#: client/helpdata.c:1163
msgid "* Increases the pollution generated by the population.\n"
msgstr "* Aumenta la contaminación generada por la población.\n"
-#: client/helpdata.c:1170
+#: client/helpdata.c:1168
#, 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:1177
+#: client/helpdata.c:1175
#, c-format
msgid "* Allows %s to build fortresses.\n"
msgstr "* Permite que los %s construyan fortalezas.\n"
-#: client/helpdata.c:1185
+#: client/helpdata.c:1183
#, c-format
msgid "* Allows %s to build airbases.\n"
msgstr "* Permite que los %s construyan bases aéreas.\n"
-#: client/helpdata.c:1194
+#: client/helpdata.c:1192
#, 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:1202
+#: client/helpdata.c:1200
#, 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:1236
+#: client/helpdata.c:1234
msgid "* Pollution cannot be generated on this terrain."
msgstr "* No se puede generar polución en este terreno."
-#: client/helpdata.c:1241
+#: client/helpdata.c:1239
msgid "* You cannot build cities on this terrain."
msgstr "* No se pueden construir ciudades en este terreno."
-#: client/helpdata.c:1247
+#: client/helpdata.c:1245
msgid "* The coastline of this terrain is unsafe."
msgstr "* La costa de este terreno no es segura."
-#: client/helpdata.c:1252
+#: client/helpdata.c:1250
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:1257
+#: client/helpdata.c:1255
msgid "* Land units cannot travel on oceanic terrains."
msgstr "* Las unidades terrestres no puede viajar en el océano."
-#: client/helpdata.c:1307
+#: client/helpdata.c:1305
msgid "Features:\n"
msgstr "Características:\n"
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1413 client/helpdata.c:1414
+#: client/helpdata.c:1411 client/helpdata.c:1412
msgid "?outputlist: Nothing "
msgstr ""
-#: client/helpdata.c:1421
+#: client/helpdata.c:1419
#, fuzzy, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
@@ -8816,7 +8818,7 @@ msgstr[1] ""
"* Las unidades militares alejadas y las unidades de campo harán que %d "
"ciudadanos pasen a descontentos.\n"
-#: client/helpdata.c:1431
+#: client/helpdata.c:1429
#, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8826,23 +8828,23 @@ msgstr ""
"causado por las unidades.\n"
#. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1439
+#: client/helpdata.c:1437
#, 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:1444
+#: client/helpdata.c:1442
#, 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:1449
+#: client/helpdata.c:1447
#, fuzzy, c-format
msgid "* You pay no %s upkeep for your units.\n"
msgstr "* Pagas %d veces del %s del sustento normal de tus unidades.\n"
-#: client/helpdata.c:1453
+#: client/helpdata.c:1451
#, fuzzy
msgid "* You pay no upkeep for your units.\n"
msgstr "* Pagas %d veces del sustento normal de tus unidades.\n"
@@ -8850,7 +8852,7 @@ msgstr "* Pagas %d veces del sustento normal de tus unidades.\n"
#. TRANS: %s is the output type, like 'shield' or 'gold'.
#. * There is currently no way to control the
#. * singular/plural version of these.
-#: client/helpdata.c:1462
+#: client/helpdata.c:1460
#, c-format
msgid "* Each of your cities will avoid paying %d %s towards unit upkeep.\n"
msgstr ""
@@ -8859,19 +8861,19 @@ msgstr ""
#. TRANS: Amount is subtracted from upkeep cost
#. * for each upkeep type.
-#: client/helpdata.c:1470
+#: client/helpdata.c:1468
#, 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:1477
+#: client/helpdata.c:1475
#, 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:1484
+#: client/helpdata.c:1482
#, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -8881,7 +8883,7 @@ msgstr ""
"civilización, aparecerá cuando tengas %d ciudades.\n"
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1491
+#: client/helpdata.c:1489
#, c-format
msgid ""
"* After the first unhappy citizen due to city size, for each %d additional "
@@ -8890,17 +8892,17 @@ msgstr ""
"* Después del primer ciudadano descontento, debido al tamaño de la ciudad, "
"por cada %d ciudades adicionales, aparecerá otro ciudadano descontento.\n"
-#: client/helpdata.c:1499
+#: client/helpdata.c:1497
#, 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:1504
+#: client/helpdata.c:1502
msgid "Has unlimited science/gold/luxuries rates.\n"
msgstr "Tienes impuestos ilimitados para Ciencia/Oro/Lujos.\n"
-#: client/helpdata.c:1509
+#: client/helpdata.c:1507
#, fuzzy, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
@@ -8915,7 +8917,7 @@ msgstr[1] ""
"* Tus unidades pueden imponer la Ley Marcial. Cada unidad militar dentro de "
"una ciudad obligará a %d ciudadanos descontentos a estar contentos.\n"
-#: client/helpdata.c:1521
+#: client/helpdata.c:1519
#, 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"
@@ -8927,7 +8929,7 @@ msgstr[1] ""
"Marcial.\n"
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1532
+#: client/helpdata.c:1530
#, c-format
msgid ""
"* You may grow your cities by means of celebrations. Your cities must be at "
@@ -8936,15 +8938,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:1538
+#: client/helpdata.c:1536
msgid "* Your units cannot be bribed.\n"
msgstr "* Tus unidades no pueden ser sobornadas.\n"
-#: client/helpdata.c:1541
+#: client/helpdata.c:1539
msgid "* Your cities cannot be incited.\n"
msgstr "* Tus ciudades no pueden ser incitadas.\n"
-#: client/helpdata.c:1545
+#: client/helpdata.c:1543
msgid ""
"* Government will fall into anarchy if any city is in disorder for more than "
"two turns in a row.\n"
@@ -8952,17 +8954,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:1551
+#: client/helpdata.c:1549
msgid "* Has a senate that may prevent declaration of war.\n"
msgstr "* Tiene un Senado que puede prevenir la Guerra.\n"
-#: client/helpdata.c:1555
+#: client/helpdata.c:1553
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:1559
+#: client/helpdata.c:1557
msgid ""
"* Buildings that normally confer bonuses against unhappiness will instead "
"give gold.\n"
@@ -8970,25 +8972,25 @@ msgstr ""
"* Los edificios que normalmente ofrecen primas contra los descontentos, "
"ofrecerán oro en su lugar.\n"
-#: client/helpdata.c:1563
+#: client/helpdata.c:1561
msgid "* Pays no upkeep for fanatics.\n"
msgstr "* No paga nigún sustento para los fanáticos.\n"
-#: client/helpdata.c:1566
+#: client/helpdata.c:1564
msgid "* Has no unhappy citizens.\n"
msgstr "* No tiene ciudadanos descontentos.\n"
-#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
+#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
#, c-format
msgid "* Veteran %s units.\n"
msgstr "* Unidades %s veteranas.\n"
-#: client/helpdata.c:1587
+#: client/helpdata.c:1585
msgid "* Veteran units.\n"
msgstr "* Unidades veteranas.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1593
+#: client/helpdata.c:1591
#, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8998,7 +9000,7 @@ msgstr ""
"no haya celebraciones.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1602
+#: client/helpdata.c:1600
#, fuzzy, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -9008,117 +9010,117 @@ msgstr ""
"cuando haya celebraciones.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1610
+#: client/helpdata.c:1608
#, fuzzy, c-format
msgid "* Each worked tile with at least 1 %s will yield %d more of it.\n"
msgstr ""
"* Cada casilla trabajada con al menos 1 %s producirá %d %s adicionales.\n"
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1619
+#: client/helpdata.c:1617
#, fuzzy, c-format
msgid "* %s production is increased %d%%.\n"
msgstr "* La producción de %s sufrirá un desperdicio masivo.\n"
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1627
+#: client/helpdata.c:1625
#, 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:1632
+#: client/helpdata.c:1630
#, 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:1637
+#: client/helpdata.c:1635
#, 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:1645
+#: client/helpdata.c:1643
#, 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:1651
+#: client/helpdata.c:1649
#, 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:1657
+#: client/helpdata.c:1655
#, 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:1674
+#: client/helpdata.c:1672
#, c-format
msgid "* Allows you to build %s.\n"
msgstr "* Te permite construir %s.\n"
#. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1701
+#: client/helpdata.c:1699
#, c-format
msgid "%s%d %s"
msgstr "%s%d %s"
-#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1700 client/helpdata.c:1708 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:1709
+#: client/helpdata.c:1707
#, c-format
msgid "%s%d unhappy"
msgstr "%s%d descontentos"
-#: client/mapctrl_common.c:382
+#: client/mapctrl_common.c:399
#, c-format
msgid "You don't know how to build %s!"
msgstr "¡No sabes cómo construir %s!"
-#: client/mapctrl_common.c:392
+#: client/mapctrl_common.c:409
#, c-format
msgid "Copy %s to clipboard."
msgstr "Copia %s al portapapeles."
-#: client/mapctrl_common.c:408
+#: client/mapctrl_common.c:425
msgid "Clipboard is empty."
msgstr "El portapapeles está vacío."
-#: client/options.c:98
+#: client/options.c:102
msgid "Graphics"
msgstr "Gráficos"
-#: client/options.c:99
+#: client/options.c:103
msgid "Overview"
msgstr "Vista general"
-#: client/options.c:100
+#: client/options.c:104
msgid "Sound"
msgstr "Sonido"
-#: client/options.c:101
+#: client/options.c:105
msgid "Interface"
msgstr "Interfaz"
-#: client/options.c:102
+#: client/options.c:106
msgid "Network"
msgstr "De Red"
-#: client/options.c:107
+#: client/options.c:111
msgid "Login name"
msgstr "Nombre de usuario"
-#: client/options.c:108
+#: client/options.c:112
msgid ""
"This is the default login username that will be used in the connection "
"dialogs or with the -a command-line parameter."
@@ -9126,11 +9128,11 @@ msgstr ""
"Este es el nombre de usuario por defecto que se usará en los diálogos de "
"conexión o con el párametro -a de la línea de comandos."
-#: client/options.c:113
+#: client/options.c:117
msgid "Server"
msgstr "Servidor"
-#: client/options.c:114
+#: client/options.c:118
msgid ""
"This is the default server hostname that will be used in the connection "
"dialogs or with the -a command-line parameter."
@@ -9138,11 +9140,11 @@ msgstr ""
"Este es el nombre de servidor por defecto 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:119
+#: client/options.c:123
msgid "Server port"
msgstr "Puerto del servidor"
-#: client/options.c:120
+#: client/options.c:124
msgid ""
"This is the default server port that will be used in the connection dialogs "
"or with the -a command-line parameter."
@@ -9150,11 +9152,11 @@ 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:125 client/gui-win32/connectdlg.c:912 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
msgid "Metaserver"
msgstr "Metaservidor"
-#: client/options.c:126
+#: client/options.c:130
msgid ""
"The metaserver is a host that the client contacts to find out about games on "
"the internet. Don't change this from its default value unless you know what "
@@ -9164,11 +9166,11 @@ msgstr ""
"en Internet. No cambies el valor por defecto a menos que sepas lo que estás "
"haciendo."
-#: client/options.c:132
+#: client/options.c:136
msgid "Soundset"
msgstr "Conjunto de sonidos"
-#: client/options.c:133
+#: client/options.c:137
msgid ""
"This is the soundset that will be used. Changing this is the same as using "
"the -S command-line parameter."
@@ -9176,11 +9178,11 @@ msgstr ""
"Este es el conjunto de sonidos que se utilizará. Cambiar esto es igual que "
"usar el parámetro -S en la línea de comandos."
-#: client/options.c:138
+#: client/options.c:142
msgid "Sound plugin"
msgstr "Plugin de sonido"
-#: client/options.c:139
+#: client/options.c:143
msgid ""
"If you have a problem with sound, try changing the sound plugin. The new "
"plugin won't take effect until you restart Freeciv. Changing this is the "
@@ -9190,23 +9192,23 @@ msgstr ""
"El nuevo plugin no funcionará hasta que reinicies Freeciv. Cambiar esto es "
"lo mismo que usar la opción -P en la línea de comandos."
-#: client/options.c:144 client/gui-sdl/gui_main.c:162
+#: client/options.c:148 client/gui-sdl/gui_main.c:162
#, fuzzy
msgid "Theme"
msgstr "Templo"
-#: client/options.c:145
+#: 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."
-#: client/options.c:148
+#: client/options.c:152
msgid "Tileset"
msgstr "Tileset"
-#: client/options.c:149
+#: client/options.c:153
msgid ""
"By changing this option you change the active tileset. This is the same as "
"using the -t command-line parameter."
@@ -9214,11 +9216,11 @@ 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."
-#: client/options.c:156
+#: client/options.c:160
msgid "Solid unit background color"
msgstr "Unidades con fondo opaco"
-#: client/options.c:157
+#: client/options.c:161
msgid ""
"Setting this option will cause units on the map view to be drawn with a "
"solid background color instead of the flag backdrop."
@@ -9226,11 +9228,11 @@ msgstr ""
"Poniendo esta opción, harás que las unidades se dibujen en el mapa con un "
"color de fondo en lugar de una bandera."
-#: client/options.c:161 client/gui-sdl/optiondlg.c:960
+#: client/options.c:165 client/gui-sdl/optiondlg.c:960
msgid "Sound bell at new turn"
msgstr "Sonido al comenzar el turno"
-#: client/options.c:162
+#: client/options.c:166
msgid ""
"Set this option to have a \"bell\" event be generated at the start of a new "
"turn. You can control the behavior of the \"bell\" event by editing the "
@@ -9240,11 +9242,11 @@ msgstr ""
"turno. Puedes controlar el comportamiento del \"pitido\" editando las "
"opciones de los mensajes."
-#: client/options.c:168
+#: client/options.c:172
msgid "Unit movement animation time (milliseconds)"
msgstr "Tiempo de animación de movimiento de unidades (milisegundos)"
-#: client/options.c:169
+#: client/options.c:173
msgid ""
"This option controls how long unit \"animation\" takes when a unit moves on "
"the map view. Set it to 0 to disable animation entirely."
@@ -9252,11 +9254,11 @@ msgstr ""
"Esta opción controla la duración de las \"animaciones\" cuando las unidades "
"se mueven en el mapa. Si vale 0, la animación se desactiva."
-#: client/options.c:174
+#: client/options.c:178
msgid "Mapview recentering time (milliseconds)"
msgstr "Tiempo de recentrado de la vista del mapa (milisegundos)"
-#: client/options.c:175
+#: client/options.c:179
msgid ""
"When the map view is recentered, it will slide smoothly over the map to its "
"new position. This option controls how long this slide lasts. Set it to 0 "
@@ -9266,11 +9268,11 @@ msgstr ""
"posición. Esta opción controla cuanto tarda dicho desplazamiento. Si se pone "
"a 0, se desactiva este efecto de movimiento en el mapa."
-#: client/options.c:180 client/gui-sdl/optiondlg.c:1014
+#: client/options.c:184 client/gui-sdl/optiondlg.c:1014
msgid "Show combat animation"
msgstr "Animar los combates"
-#: client/options.c:181
+#: client/options.c:185
msgid ""
"Disabling this option will turn off combat animation between units on the "
"mapview."
@@ -9278,11 +9280,11 @@ msgstr ""
"Desactivando esta opción, se desactivará también las animaciones en los "
"combates entre unidades en el mapa."
-#: client/options.c:184
+#: client/options.c:188
msgid "Draw the citybar"
msgstr "Mostrar la barra de ciudad"
-#: client/options.c:185
+#: client/options.c:189
msgid ""
"Setting this option will display a 'citybar' containing useful information "
"beneath each city. Disabling this option will display only the city's name "
@@ -9292,11 +9294,11 @@ msgstr ""
"información útil sobre la ciudad. Desactivando esta opción, sólo se mostrará "
"el nombre de la ciudad y, opcionalmente, la producción."
-#: client/options.c:191
+#: client/options.c:195
msgid "Show icons in the technology tree"
msgstr "Mostrar iconos en el árbol de tecnologías"
-#: client/options.c:192
+#: client/options.c:196
msgid ""
"Setting this option will display icons on the technology tree diagram. "
"Turning this option off makes the technology tree more compact."
@@ -9305,11 +9307,11 @@ msgstr ""
"tecnologías. Desactivándo esta opción, el árbol de teconlogías se vuelve más "
"compacto."
-#: client/options.c:197
+#: client/options.c:201
msgid "Draw shield graphics for units"
msgstr "Muestra el escudo en las unidades."
-#: client/options.c:198
+#: client/options.c:202
msgid ""
"Setting this option will draw a shield icon as the flags on units. If "
"unset, the full flag will be drawn."
@@ -9317,11 +9319,11 @@ msgstr ""
"Activando esta opción, se mostrará un escudo como bandera en las unidades. "
"Si no está activada, se mostará la bandera completa."
-#: client/options.c:202
+#: client/options.c:206
msgid "Manual Turn Done in AI Mode"
msgstr "Fin de turno manual en modo ordenador"
-#: client/options.c:203
+#: client/options.c:207
msgid ""
"Disable this option if you do not want to press the Turn Done button "
"manually when watching an AI player."
@@ -9329,11 +9331,11 @@ msgstr ""
"Desactiva esta opción si no quieres presionar 'Fin del turno' manualmente "
"cuando estás observando a un jugador del Ordenador."
-#: client/options.c:207 client/gui-sdl/optiondlg.c:1121
+#: client/options.c:211 client/gui-sdl/optiondlg.c:1121
msgid "Auto Center on Units"
msgstr "Centrar las unidades"
-#: client/options.c:208
+#: client/options.c:212
msgid ""
"Set this option to have the active unit centered automatically when the unit "
"focus changes."
@@ -9341,11 +9343,11 @@ msgstr ""
"Activa esta opción si quieres tener la unidad activa centrada "
"automáticamente cuando el foco de la unidad cambia."
-#: client/options.c:211 client/gui-sdl/optiondlg.c:1147
+#: client/options.c:215 client/gui-sdl/optiondlg.c:1147
msgid "Auto Center on Combat"
msgstr "Centrar los combates"
-#: client/options.c:212
+#: client/options.c:216
msgid ""
"Set this option to have any combat be centered automatically. Disabled this "
"will speed up the time between turns but may cause you to miss combat "
@@ -9355,21 +9357,21 @@ msgstr ""
"automáticamente. Desactivada, hará que los tiempos entre turnos pasen más "
"rápido, pero también hace que te pierdas el combate por completo."
-#: client/options.c:217 client/gui-sdl/optiondlg.c:1174
+#: client/options.c:221 client/gui-sdl/optiondlg.c:1174
msgid "Focus on Awakened Units"
msgstr "Observar las unidades activadas"
-#: client/options.c:218
+#: client/options.c:222
msgid "Set this option to have newly awoken units be focused automatically."
msgstr ""
"Activa esta opción para centrar automáticamente las nuevas unidades que "
"emergen."
-#: client/options.c:221
+#: client/options.c:225
msgid "Allow goto into the unknown"
msgstr "Permitir ir a sitio desconocido"
-#: client/options.c:222
+#: client/options.c:226
msgid ""
"Setting this option will make the game consider moving into unknown tiles. "
"If not, then goto routes will detour around or be blocked by unknown tiles."
@@ -9378,11 +9380,11 @@ msgstr ""
"desconocidas. Si no, entonces las reglas de 'Ir' emplearán desvíos o "
"bloqueos en las casillas desconocidas."
-#: client/options.c:226
+#: client/options.c:230
msgid "Center map when Popup city"
msgstr "Centrar el mapa al activar una ciudad"
-#: client/options.c:227
+#: client/options.c:231
msgid ""
"Setting this option makes the mapview center on a city when its city dialog "
"is popped up."
@@ -9390,11 +9392,11 @@ msgstr ""
"Activando esta opción, se centrará la vista en una ciudad cuando el diálogo "
"de ciudad aparezca."
-#: client/options.c:230
+#: client/options.c:234
msgid "Concise City Production"
msgstr "Mostrar producción de la ciudad"
-#: client/options.c:231
+#: client/options.c:235
msgid ""
"Set this option to make the city production (as shown in the city dialog) to "
"be more compact."
@@ -9402,11 +9404,11 @@ msgstr ""
"Activa esta opción para hacer que la producción de la ciudad (como se "
"muestra en el cuadro de diálogo de la ciudad) sea más compacta."
-#: client/options.c:234 client/gui-sdl/optiondlg.c:1252
+#: client/options.c:238 client/gui-sdl/optiondlg.c:1252
msgid "End Turn when done moving"
msgstr "Terminar el turno al acabar de mover"
-#: client/options.c:235
+#: client/options.c:239
msgid ""
"Setting this option makes your turn end automatically when all your units "
"are done moving."
@@ -9414,11 +9416,11 @@ msgstr ""
"Activando esta opción, se termina el turno automáticamente cuando todas las "
"unidades han sido movidas."
-#: client/options.c:238 client/gui-sdl/optiondlg.c:1226
+#: client/options.c:242 client/gui-sdl/optiondlg.c:1226
msgid "Prompt for city names"
msgstr "Solicitar nombres de ciudades"
-#: client/options.c:239
+#: client/options.c:243
msgid ""
"Disabling this option will make the names of newly founded cities chosen "
"automatically by the server."
@@ -9426,11 +9428,11 @@ msgstr ""
"Desactivando esta opción, los nombres de las ciudades recién fundadas serán "
"elegidos automáticamente por el servidor."
-#: client/options.c:242 client/gui-sdl/optiondlg.c:1200
+#: client/options.c:246 client/gui-sdl/optiondlg.c:1200
msgid "Pop up city dialog for new cities"
msgstr "Solicita al usuario los nombres de las nuevas ciudades"
-#: client/options.c:243
+#: client/options.c:247
msgid ""
"Setting this option will pop up a newly-founded city's city dialog "
"automatically."
@@ -9438,75 +9440,123 @@ msgstr ""
"Activando esta opción, se mostrará una ventana automáticamente cuando una "
"ciudad es fundada."
-#: client/options.c:248
+#: client/options.c:250
+#, fuzzy
+msgid "Pop up caravan actions"
+msgstr "Acciones de la caravana"
+
+#: client/options.c:251
+msgid ""
+"If this option is enabled, when caravans arrive at a city where they can "
+"establish a traderoute or help build a wonder, a window will popup asking "
+"which action should be performed. Disabling this option means you will have "
+"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 ""
+
+#: client/options.c:260
+#, fuzzy
+msgid "Enable cursor changing"
+msgstr "Activar alpha blending (transparencias)"
+
+#: client/options.c:261
+msgid ""
+"This option controls whether the client should try to change the mouse "
+"cursor depending on what is being pointed at, as well as to indicate changes "
+"in the client or server state."
+msgstr ""
+
+#: client/options.c:266
+msgid "Select cities before units"
+msgstr ""
+
+#: 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 ""
+
+#: client/options.c:272
+msgid "Clear unit orders on selection"
+msgstr ""
+
+#: client/options.c:273
+msgid ""
+"Enabling this option will cause unit orders to be cleared whenever one or "
+"more units are selected. If this option is disabled, selecting units will "
+"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 ""
+
+#: client/options.c:282
msgid "Background layer"
msgstr "Capa de fondo"
-#: client/options.c:249
+#: client/options.c:283
msgid "The background layer of the overview shows just ocean and land."
msgstr "La capa de la vista general muestra sólo oceáno y tierra."
-#: client/options.c:252
+#: client/options.c:286
msgid "Terrain relief map layer"
msgstr "Capa de renovación del terreno"
-#: client/options.c:253
+#: client/options.c:287
msgid "The relief layer shows all terrains on the map."
msgstr "La renovación de la capa muestra todos los terrenos en el mapa."
-#: client/options.c:256
+#: client/options.c:290
msgid "Borders layer"
msgstr "Capa de borders"
-#: client/options.c:257
+#: client/options.c:291
msgid ""
"The borders layer of the overview shows which tiles are owned by each player."
msgstr ""
"La capa de bordes de la vista general muestra qué casillas pertenecen a cada "
"jugador."
-#: client/options.c:261
+#: client/options.c:295
msgid "Units layer"
msgstr "Capa de unidades"
-#: client/options.c:262
+#: client/options.c:296
msgid "Enabling this will draw units on the overview."
msgstr "Si se activa, se mostrarán las unidades en la vista general."
-#: client/options.c:265
+#: client/options.c:299
msgid "Cities layer"
msgstr "Capa de ciudades"
-#: client/options.c:266
+#: client/options.c:300
msgid "Enabling this will draw cities on the overview."
msgstr "Si se activa, se mostrarán las ciudades en la vista general."
-#: client/options.c:269
+#: client/options.c:303
msgid "Overview fog of war"
msgstr "Vista general de la niebla en la guerra"
-#: client/options.c:270
+#: client/options.c:304
msgid "Enabling this will show fog of war on the overview."
msgstr "Si se activa, se mostrará la niebla de la guerra en la vista general."
-#: client/options.c:488
+#: client/options.c:526
msgid "If you add a preset by hand, also update \"number_of_presets\""
msgstr "Si creas una configuración a mano, actualiza \"number_of_presets\"."
-#: client/options.c:516
+#: client/options.c:554
msgid "Cannot find your home directory"
msgstr "No encuentro tu directorio 'home'"
-#: client/options.c:665 client/options.c:796
+#: client/options.c:703 client/options.c:834
msgid "Save failed, cannot find a filename."
msgstr "Grabación cancelada, no se ha dado un nombre al fichero."
-#: client/options.c:678 client/options.c:859
+#: client/options.c:716 client/options.c:897
#, c-format
msgid "Save failed, cannot write to file %s"
msgstr "Grabación cancelada, no puedo escribir el fichero %s"
-#: client/options.c:680 client/options.c:862
+#: client/options.c:718 client/options.c:900
#, c-format
msgid "Saved settings to file %s"
msgstr "Se han grabado las preferencias en el fichero %s"
@@ -9531,16 +9581,16 @@ msgstr "Cadena de capacidades del servidor: %s"
msgid "Start of turn %d"
msgstr "Comienzo del turno %d"
-#: client/packhand.c:1590
+#: client/packhand.c:1591
#, c-format
msgid "AI Mode is now %s."
msgstr "El control por ordenador ahora está %s."
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "ON"
msgstr "ACTIVO"
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "OFF"
msgstr "INACTIVO"
@@ -9572,14 +9622,15 @@ 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:2085
+#: client/gui-gtk-2.0/pages.c:2157
msgid "Flag"
msgstr "Bandera"
#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
-#: client/gui-gtk-2.0/pages.c:1536 client/gui-gtk-2.0/pages.c:2087
-#: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
-#: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
+#: 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/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr "Nación"
@@ -9591,7 +9642,7 @@ msgstr "Frontera"
msgid "Score"
msgstr "Puntuació"
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
msgid "Team"
msgstr "Equipo"
@@ -9662,280 +9713,306 @@ msgstr "No se pudo desmantelar ning
msgid "Could not open temp file."
msgstr "No se pudo abrir el fichero temporal."
-#: client/servers.c:407
+#: client/servers.c:410
msgid "Invalid $http_proxy or metaserver value, must start with 'http://'"
msgstr ""
"Valor inválido para $http_proxy o valor del metaservidor, debe empezar con "
"'http://'"
-#: client/servers.c:413
+#: client/servers.c:416
msgid "Failed looking up metaserver's host"
msgstr "Fallo buscando el metaservidor"
-#: client/text.c:85 client/text.c:86 client/text.c:91
+#. TRANS: "AI <player name>"
+#: client/text.c:94
+#, c-format
+msgid "AI %s"
+msgstr ""
+
+#. TRANS: "<nation adjective>, team <team name>"
+#: client/text.c:118
+#, fuzzy, c-format
+msgid "%s, team %s"
+msgstr ", equipo %s"
+
+#: client/text.c:135 client/text.c:136 client/text.c:141
#: client/gui-sdl/mapview.c:752
msgid "?nation:Neutral"
msgstr "Neutral"
-#: client/text.c:85 client/gui-sdl/mapview.c:752
+#: client/text.c:135 client/gui-sdl/mapview.c:752
msgid "?nation:Hostile"
msgstr "Hostil"
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Peaceful"
msgstr "Pacífico"
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Friendly"
msgstr "Amigable"
-#: client/text.c:88 client/gui-sdl/mapview.c:755
+#: client/text.c:138 client/gui-sdl/mapview.c:755
msgid "?nation:Mysterious"
msgstr "Misterioso"
-#: client/text.c:88
+#: client/text.c:138
msgid "?nation:Friendly(team)"
msgstr "Amigable(equipo)"
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
msgid "?city:Neutral"
msgstr "Neutral"
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
msgid "?city:Hostile"
msgstr "Hostil"
-#: client/text.c:92 client/gui-sdl/mapview.c:786
+#: client/text.c:142 client/gui-sdl/mapview.c:786
msgid "?city:Peaceful"
msgstr "Pacífica"
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Friendly"
msgstr "Amigable"
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Mysterious"
msgstr "Misteriosa"
-#: client/text.c:93
+#: client/text.c:143
msgid "?city:Friendly(team)"
msgstr "Amigable(equipo)"
-#: client/text.c:100
+#: client/text.c:151
#, c-format
msgid "Location: (%d, %d) [%d]"
msgstr "Localización: (%d, %d) [%d]"
-#: client/text.c:109
+#: client/text.c:153
+#, c-format
+msgid "Native coordinates: (%d, %d)"
+msgstr ""
+
+#: client/text.c:160
#, c-format
msgid "Terrain: %s"
msgstr "Terreno: %s"
-#: client/text.c:110
+#: client/text.c:161
#, c-format
msgid "Food/Prod/Trade: %s"
msgstr "Alimento/Producción/Comercio: %s"
-#: client/text.c:113
+#: client/text.c:164
msgid "Minor Tribe Village"
msgstr "Aldea Indígena"
-#: client/text.c:119
+#: client/text.c:173
#, fuzzy
msgid "Our territory"
msgstr "Nuestro Territorio"
-#. TRANS: "Polish territory"
-#: client/text.c:122
+#. TRANS: "Territory of <username> (<nation + team>)"
+#: client/text.c:176
#, fuzzy, c-format
-msgid "%s territory"
-msgstr "Territorio de %s"
+msgid "Territory of %s (%s)"
+msgstr ""
+"\n"
+"Territorio de los %s %s"
-#. TRANS: "Polish territory (5 turn cease-fire)"
-#: client/text.c:131
-#, c-format
-msgid "%s territory (%d turn cease-fire)"
-msgid_plural "%s territory (%d turn cease-fire)"
-msgstr[0] "territorio de %s (%d turno de alto el fuego)"
-msgstr[1] "territorio de %s (%d turnos de alto el fuego)"
+#: client/text.c:186
+#, fuzzy, 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)"
-#. TRANS: "Polish territory (friendly)"
-#: client/text.c:140
+#. TRANS: "Territory of <username>
+#. * (<nation + team> | <diplomatic state>)"
+#: client/text.c:195
#, fuzzy, c-format
-msgid "%s territory (%s)"
-msgstr "Territorio de %s %s"
+msgid "Territory of %s (%s | %s)"
+msgstr ""
+"\n"
+"Territorio de los %s %s"
-#: client/text.c:145
+#: client/text.c:200
msgid "Unclaimed territory"
msgstr "Territorio sin reclamar"
-#. TRANS: "City: Warsaw (Polish)"
-#: client/text.c:156
-#, c-format
-msgid "City: %s (%s)"
-msgstr "Ciudad: %s(%s)"
+#. TRANS: "City: <city name> | <username> (<nation + team>)"
+#: client/text.c:214
+#, fuzzy, c-format
+msgid "City: %s | %s (%s)"
+msgstr "Ciudad: %s (%s, %s)"
-#. TRANS: "City: Warsaw (Polish, 5 turn cease-fire)"
-#: client/text.c:166
-#, c-format
-msgid "City: %s (%s, %d turn cease-fire)"
-msgid_plural "City: %s (%s, %d turn cease-fire)"
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <number> turn cease-fire)"
+#: client/text.c:224
+#, fuzzy, 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)"
-#. TRANS: "City: Warsaw (Polish,friendly)"
-#: client/text.c:174
-#, c-format
-msgid "City: %s (%s, %s)"
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <diplomatic state>)"
+#: client/text.c:231
+#, fuzzy, c-format
+msgid "City: %s | %s (%s, %s)"
msgstr "Ciudad: %s (%s, %s)"
#. TRANS: previous lines gave other information about the city.
-#: client/text.c:189
+#: client/text.c:246
#, fuzzy, c-format
msgid "?clistbegin: with %s"
msgstr " con %s"
#. TRANS: "Trade from Warsaw: 5"
-#: client/text.c:202
+#: client/text.c:259
#, c-format
msgid "Trade from %s: %d"
msgstr "Comercio de %s: %d"
-#: client/text.c:210
+#: client/text.c:267
#, c-format
msgid "Infrastructure: %s"
msgstr "Infraestructura: %s"
-#: client/text.c:215
+#: client/text.c:272
#, c-format
msgid "Activity: %s"
msgstr "Actividad: %s"
-#. TRANS: "Unit: Musketeers (Polish, Warsaw)"
-#. TRANS: "Unit: Musketeers (Polish,friendly)"
-#: client/text.c:226 client/text.c:253
-#, c-format
-msgid "Unit: %s (%s, %s)"
+#. TRANS: "Unit: <unit type> | <username>
+#. * (<nation + team>, <homecity>)"
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <diplomatic state>)"
+#: client/text.c:287 client/text.c:313
+#, fuzzy, c-format
+msgid "Unit: %s | %s (%s, %s)"
msgstr "Unidad: %s (%s, %s)"
-#. TRANS: "Unit: Musketeers (Polish)"
-#: client/text.c:232
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>)"
+#: client/text.c:292
#, fuzzy, c-format
-msgid "Unit: %s (%s)"
-msgstr "Unidad: %s (%s)"
+msgid "Unit: %s | %s (%s)"
+msgstr "Unidad: %s (%s, %s)"
-#. TRANS: "Unit: Musketeers (Polish, 5 turn cease-fire)"
-#: client/text.c:245
-#, c-format
-msgid "Unit: %s (%s, %d turn cease-fire)"
-msgid_plural "Unit: %s (%s, %d turn cease-fire)"
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <number> turn cease-fire)"
+#: client/text.c:305
+#, fuzzy, 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)"
#. TRANS: "Chance to win: A:95% D:46%"
-#: client/text.c:279
+#: client/text.c:338
#, c-format
msgid "Chance to win: A:%d%% D:%d%%"
msgstr "Prop. de ganar: A:%d%% D:%d%%"
#. TRANS: A is attack power, D is defense power, FP is firepower,
#. * HP is hitpoints (current and max).
-#: client/text.c:286
+#: client/text.c:345
#, c-format
msgid "A:%d D:%d FP:%d HP:%d/%d (%s)"
msgstr "A:%d D:%d PF:%d PV:%d/%d (%s)"
#. TRANS: "5 more" units on this tile
-#: client/text.c:295
+#: client/text.c:354
#, c-format
msgid " (%d more)"
msgstr " (%d más)"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:364
+#: client/text.c:423
#, c-format
msgid "far from %s"
msgstr "lejos de %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:367
+#: client/text.c:426
#, c-format
msgid "near %s"
msgstr "cerca de %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:370
+#: client/text.c:429
#, c-format
msgid "in %s"
msgstr "en %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:403
+#: client/text.c:462
#, c-format
msgid "from %s"
msgstr "de %s"
-#: client/text.c:466
+#: client/text.c:525
msgid "Progress: no research"
msgstr "Progreso: no hay investigación"
-#: client/text.c:470
+#: client/text.c:529
msgid "Progress: no research target"
msgstr "Progreso: no hay un objetivo en la investigación"
-#: client/text.c:475
+#: client/text.c:534
#, c-format
msgid "Progress: %d turn/advance"
msgid_plural "Progress: %d turns/advance"
msgstr[0] "Progreso: %d turno/avance"
msgstr[1] "Progreso: %d turnos/avance"
-#: client/text.c:480
+#: client/text.c:539
#, c-format
msgid "%d bulb/turn"
msgid_plural "%d bulbs/turn"
msgstr[0] "%d bulbo/turno"
msgstr[1] "%d bulbos/turnos"
-#: client/text.c:485
+#: client/text.c:544
#, c-format
msgid ", %d bulb/turn from team"
msgid_plural ", %d bulbs/turn from team"
msgstr[0] ", %d bulbo/turno de equipo"
msgstr[1] ", %d bulbos/turnos de equipo"
-#: client/text.c:512
+#: client/text.c:571
#, c-format
msgid "%d/- (never)"
msgstr "%d/- (nunca)"
-#: client/text.c:524
+#: client/text.c:583
#, c-format
msgid "%d/%d (%d turn)"
msgid_plural "%d/%d (%d turns)"
msgstr[0] "%d/%d (%d turno)"
msgstr[1] "%d/%d (%d turnos)"
-#: client/text.c:527
+#: client/text.c:586
#, c-format
msgid "%d/%d (never)"
msgstr "%d/%d (nunca)"
-#: client/text.c:564
+#: client/text.c:623
#, c-format
msgid "%d step"
msgid_plural "%d steps"
msgstr[0] "%d paso"
msgstr[1] "%d pasos"
-#: client/text.c:566
+#: client/text.c:625
#, c-format
msgid "%d bulb"
msgid_plural "%d bulbs"
msgstr[0] "%d bulbo"
msgstr[1] "%d bulbos"
-#: client/text.c:570 client/agents/cma_fec.c:269 client/agents/cma_fec.c:313
+#: 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
#, c-format
msgid "%d turn"
@@ -9943,89 +10020,89 @@ msgid_plural "%d turns"
msgstr[0] "%d turno"
msgstr[1] "%d turnos"
-#: client/text.c:592
+#: client/text.c:651
#, c-format
msgid "Population: %s"
msgstr "Población: %s"
-#: client/text.c:595
+#: client/text.c:654
#, c-format
msgid "Year: %s (T%d)"
msgstr "Año: %s (T%d)"
-#: client/text.c:598
+#: client/text.c:657
#, c-format
msgid "Gold: %d (%+d)"
msgstr "Oro: %d (%+d)"
-#: client/text.c:600
+#: client/text.c:659
#, c-format
msgid "Tax: %d Lux: %d Sci: %d"
msgstr "Imp:%d Lujo:%d Cie:%d"
-#: client/text.c:607
+#: client/text.c:666
#, fuzzy
msgid "Moving: Nobody"
msgstr "Moviendo: %s"
-#: client/text.c:609
+#: client/text.c:668
#, c-format
msgid "Moving: %s"
msgstr "Moviendo: %s"
-#: client/text.c:613
+#: client/text.c:672
msgid "(Click for more info)"
msgstr "(Haz click para más info)"
-#: client/text.c:629
+#: client/text.c:688
#, c-format
msgid "%s People"
msgstr "%s Gente"
-#: client/text.c:633
+#: client/text.c:692
#, c-format
msgid "Turn: %d"
msgstr "Turno: %d"
-#: client/text.c:635 client/gui-win32/inteldlg.c:111
+#: client/text.c:694 client/gui-win32/inteldlg.c:111
#: client/gui-xaw/inteldlg.c:208
#, c-format
msgid "Gold: %d"
msgstr "Oro: %d"
-#: client/text.c:636
+#: client/text.c:695
#, c-format
msgid "Net Income: %d"
msgstr "Beneficios netos: %d"
#. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:639
+#: client/text.c:698
#, c-format
msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
msgstr "Impuestos: Oro:%d%% Lujo:%d%% Cie:%d%%"
-#: client/text.c:643
+#: client/text.c:702
#, c-format
msgid "Researching %s: %s"
msgstr "Investigando %s: %s"
-#: client/text.c:650
+#: client/text.c:709
#, c-format
msgid "Global warming chance: %d%% (%+d%%/turn)"
msgstr "Probabilidad de calentamiento global: %d%% (%+d%%/turno)"
-#: client/text.c:653
+#: client/text.c:712
#, c-format
msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
msgstr "Probabilidad de Invierno Nuclear: %d%% (%+d%%/turno)"
-#: client/text.c:658 client/gui-win32/inteldlg.c:104
+#: client/text.c:717 client/gui-win32/inteldlg.c:104
#: client/gui-xaw/inteldlg.c:200
#, c-format
msgid "Government: %s"
msgstr "Gobierno: %s"
-#: client/text.c:682
+#: client/text.c:741
#, c-format
msgid "%d unit"
msgid_plural "%d units"
@@ -10033,55 +10110,55 @@ msgstr[0] " %d unidad"
msgstr[1] " %d unidades"
#. TRANS: Impossible to reach goto target tile
-#: client/text.c:715 client/gui-sdl/mapview.c:566
+#: client/text.c:774 client/gui-sdl/mapview.c:566
msgid "?goto:Unreachable"
msgstr ""
-#: client/text.c:717 client/gui-sdl/mapview.c:568
+#: client/text.c:776 client/gui-sdl/mapview.c:568
#, c-format
msgid "Turns to target: %d"
msgstr "Turnos hasta destino: %d"
-#: client/text.c:719 client/gui-sdl/mapview.c:570
+#: client/text.c:778 client/gui-sdl/mapview.c:570
#, c-format
msgid "Turns to target: %d to %d"
msgstr "Turnos hasta el destino: %d a %d"
-#: client/text.c:725 client/gui-sdl/mapview.c:576
+#: client/text.c:784 client/gui-sdl/mapview.c:576
#, c-format
msgid "%d unit selected"
msgid_plural "%d units selected"
msgstr[0] "%d unidad seleccionada"
msgstr[1] "%d unidades seleccionadas"
-#: client/text.c:730 client/gui-sdl/mapview.c:581
+#: client/text.c:789 client/gui-sdl/mapview.c:581
msgid "No units selected."
msgstr "No hay unidades seleccionadas."
-#: client/text.c:804 client/gui-sdl/mapview.c:654
+#: client/text.c:863 client/gui-sdl/mapview.c:654
#, c-format
msgid "Others: %d civil; %d military"
msgstr "Otros: %d civiles; %d militares"
-#: client/text.c:806 client/gui-sdl/mapview.c:656
+#: client/text.c:865 client/gui-sdl/mapview.c:656
#, c-format
msgid "Others: %d civilian"
msgstr "Otros: %d civiles"
-#: client/text.c:808 client/gui-sdl/mapview.c:658
+#: client/text.c:867 client/gui-sdl/mapview.c:658
#, c-format
msgid "Others: %d military"
msgstr "Otros: %d militares"
-#: client/text.c:839
+#: client/text.c:898
msgid "No units to upgrade!"
msgstr "Ninguna unidad que actualizar."
-#: client/text.c:864
+#: client/text.c:923
msgid "None of these units may be upgraded."
msgstr "Ninguna unidad puede actualizarse."
-#: client/text.c:870
+#: client/text.c:929
#, c-format
msgid ""
"Upgrade %d unit for %d gold?\n"
@@ -10096,72 +10173,72 @@ msgstr[1] ""
"¿Deseas mejorar %d unidades por %d monedas de oro?\n"
"En el tesoro tienes %d monedas de oro."
-#: client/text.c:891
+#: client/text.c:950
msgid "Shows your progress in researching the current technology."
msgstr "Muestra el progreso en la investigación tecnológica actual."
-#: client/text.c:897
+#: client/text.c:956
msgid "no research target."
msgstr "no hay un objetivo de investigación."
#. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:900
+#: client/text.c:959
#, c-format
msgid "%s: %d/%d."
msgstr "%s: %d/%d."
-#: client/text.c:920
+#: client/text.c:979
msgid "Shows the progress of global warming:"
msgstr "Muestra el progreso del calentamiento global:"
-#: client/text.c:921
+#: client/text.c:980
#, c-format
msgid "Pollution rate: %d%%"
msgstr "Nivel de contaminación: %d%%"
-#: client/text.c:923
+#: client/text.c:982
#, c-format
msgid "Chance of catastrophic warming each turn: %d%%"
msgstr "Probabilidad de calentamiento catastrófico en cada turno: %d%%"
-#: client/text.c:939
+#: client/text.c:998
msgid "Shows the progress of nuclear winter:"
msgstr "Muestra el progreso del Invierno Nuclear:"
-#: client/text.c:940
+#: client/text.c:999
#, c-format
msgid "Fallout rate: %d%%"
msgstr "Cantidad de polvo radiactivo: %d%%"
-#: client/text.c:942
+#: client/text.c:1001
#, c-format
msgid "Chance of catastrophic winter each turn: %d%%"
msgstr "Probabilidad de invierno catastrófico en cada turno: %d%%"
-#: client/text.c:957
+#: client/text.c:1016
msgid "Shows your current government:"
msgstr "Muestra tu gobierno actual:"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:981
+#: client/text.c:1040
#, c-format
msgid "Population: %5d"
msgstr "Población: %5d"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:1043
#, c-format
msgid "Support: %5d %%"
msgstr "Soporte: %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:1047
#, c-format
msgid "Energy: %5d %%"
msgstr "Energía: %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:992
+#: client/text.c:1051
#, c-format
msgid "Mass: %5d ton"
msgid_plural "Mass: %5d tons"
@@ -10169,96 +10246,97 @@ msgstr[0] "Masa: %5d tonelada"
msgstr[1] "Masa: %5d toneladas"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1057
#, c-format
msgid "Travel time: %5.1f years"
msgstr "Duración del viaje: %5.1f años"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1061
msgid "Travel time: N/A "
msgstr "Duración del viaje: - "
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1065
#, c-format
msgid "Success prob.: %5d %%"
msgstr "Probab. Éxito: %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1010
+#: client/text.c:1069
#, c-format
msgid "Year of arrival: %8s"
msgstr "Año de Llegada: %8s"
-#: client/text.c:1030
+#: client/text.c:1089
msgid "?timeout:off"
msgstr "inactivo"
-#: client/text.c:1054
+#: client/text.c:1113
#, c-format
msgid "?seconds:%02ds"
msgstr "%02ds"
-#: client/text.c:1056
+#: client/text.c:1115
#, c-format
msgid "?mins/secs:%02dm %02ds"
msgstr "%02dm %02ds"
-#: client/text.c:1058
+#: client/text.c:1117
#, c-format
msgid "?hrs/mns:%02dh %02dm"
msgstr "%02dh %02dm"
-#: client/text.c:1060
+#: client/text.c:1119
#, c-format
msgid "?dys/hrs:%02dd %02dh"
msgstr "%02dd %02dh"
-#: client/text.c:1063
+#: client/text.c:1122
msgid "?duration:overflow"
msgstr "desbordamiento"
-#: client/text.c:1084
+#: client/text.c:1143
#, c-format
msgid "%6d.%02d ms"
msgstr "%6d.%02d ms"
-#. TRANS: "Republic of the Poles"
-#: client/text.c:1127
-#, c-format
-msgid "%s of the %s"
-msgstr "%s de los %s"
+#. TRANS: <nation adjective> <government name>.
+#. * E.g. "Polish Republic".
+#: client/text.c:1188
+#, fuzzy, c-format
+msgid "?nationgovernment:%s %s"
+msgstr "Gobierno: %s"
#. TRANS: "Observer: 1985"
-#: client/text.c:1137
+#: client/text.c:1198
#, c-format
msgid "Observer: %s"
msgstr "Observador: %s"
-#: client/text.c:1155
+#: client/text.c:1216
msgid "Buildings: "
msgstr "Instalaciones: "
-#: client/text.c:1172 client/text.c:1211
+#: client/text.c:1233 client/text.c:1272
msgid "None. "
msgstr "Ninguna. "
-#: client/text.c:1174 client/text.c:1213
+#: client/text.c:1235 client/text.c:1274
msgid "?clistend:."
msgstr "."
-#: client/text.c:1192
+#: client/text.c:1253
msgid "Wonders: "
msgstr "Maravillas: "
-#: client/text.c:1247
+#: client/text.c:1308
#, 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:1251
+#: client/text.c:1312
#, fuzzy, c-format
msgid "%d content before penalty."
msgid_plural "%d content before penalty."
@@ -10266,45 +10344,45 @@ msgstr[0] "%d ciudadanos conformes antes de penalizar con "
msgstr[1] "%d ciudadanos conformes antes de penalizar con "
#. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1257
+#: client/text.c:1318
#, fuzzy, c-format
msgid "%d additional unhappy citizen."
msgid_plural "%d additional unhappy citizens."
msgstr[0] "%d descontentos adicionales."
msgstr[1] "%d descontentos adicionales."
-#. TRANS: Martial law opening parenthesis
-#: client/text.c:1279
-msgid "Martial law in effect ("
+#: client/text.c:1339
+#, fuzzy
+msgid "Unlimited martial law in effect."
msgstr "Ley marcial en vigor ("
-#. TRANS: no [unit] maximum
-#: client/text.c:1284
-msgid "no maximum, "
-msgstr "sin límite, "
-
-#: client/text.c:1287
-#, c-format
-msgid "%d unit maximum, "
-msgid_plural "%d units maximum, "
-msgstr[0] "límite de %d unidad, "
-msgstr[1] "límite de %d unidades, "
+#: client/text.c:1341
+#, fuzzy, 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"
-#. TRANS: Martial law closing parenthesis
-#: client/text.c:1294
-#, c-format
-msgid "%d per unit). "
-msgstr "%d por unidad). "
+#: client/text.c:1345
+#, fuzzy, 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."
+msgstr[1] ""
+"Proporciona diversión a los ciudadanos de una ciudad, transformando 3 "
+"ciudadanos descontentos a conformes."
-#: client/text.c:1298
+#: client/text.c:1352
msgid "Military units in the field may cause unhappiness. "
msgstr "Las unidades militares en los alrededores pueden causar descontento. "
-#: client/text.c:1301
+#: client/text.c:1355
msgid "Military units have no happiness effect. "
msgstr "Las unidades militares no influyen en el descontento. "
-#: client/text.c:1316
+#: client/text.c:1370
#, c-format
msgid "Luxury: %d total."
msgstr "Lujo: %d en total."
@@ -10329,7 +10407,7 @@ msgstr ""
"El cliente no soporta el aspecto (tileset) de vista superior. Se usará el "
"aspecto por defecto."
-#: client/tilespec.c:3968
+#: client/tilespec.c:3966
#, fuzzy, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
@@ -10354,12 +10432,12 @@ msgid ""
"have a look."
msgstr "CMA: Hubo una confusión con %s. Mejor que eches un vistazo."
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
-#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:599
+#: client/gui-gtk-2.0/cityrep.c:624 client/gui-sdl/citydlg.c:2009
msgid "none"
msgstr "ninguno"
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:645
msgid "custom"
msgstr "personal"
@@ -10668,7 +10746,7 @@ msgstr "Establecer _ruta comercial"
msgid "Enter Marketplace"
msgstr "Entrar al mercado"
-#: client/gui-gtk-2.0/chatline.c:144 client/gui-win32/chatline.c:134
+#: client/gui-gtk-2.0/chatline.c:218 client/gui-win32/chatline.c:134
#: client/gui-xaw/chatline.c:120
msgid "Cleared output window."
msgstr "Se ha borrado la ventana principal."
@@ -10749,11 +10827,11 @@ msgid "%d/%d %d turns"
msgstr "%d/%d %d turnos"
#: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:821
+#: client/gui-gtk-2.0/cityrep.c:1027
msgid "_Buy"
msgstr "_Comprar"
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:869
#, fuzzy
msgid "_Production"
msgstr "Pro_ducción"
@@ -10775,12 +10853,12 @@ msgid "Entertainers"
msgstr "Hosteleros"
#: client/gui-gtk-2.0/citydlg.c:1029 client/gui-win32/citydlg.c:1989
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2403
msgid "Scientists"
msgstr "Científicos"
#: client/gui-gtk-2.0/citydlg.c:1030 client/gui-win32/citydlg.c:1991
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2404
msgid "Taxmen"
msgstr "Recaudadores"
@@ -10873,7 +10951,7 @@ msgstr "Unidades mantenidas %d"
msgid "Present units %d"
msgstr "Unidades presentes %d"
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:1019
msgid "Cen_ter"
msgstr "Ce_ntrar"
@@ -10962,32 +11040,62 @@ msgstr "Renombrar ciudad"
msgid "What should we rename the city to?"
msgstr "¿Cuál será el nuevo nombre de la ciudad?"
-#: client/gui-gtk-2.0/cityrep.c:699
+#: client/gui-gtk-2.0/cityrep.c:794
+#, fuzzy
+msgid "(no worklists defined)"
+msgstr "(lista de tareas)"
+
+#: client/gui-gtk-2.0/cityrep.c:876
msgid "Chan_ge"
msgstr "Cam_biar"
-#: client/gui-gtk-2.0/cityrep.c:703
+#: client/gui-gtk-2.0/cityrep.c:880
msgid "Add _First"
msgstr "Añadir Primero(_F)"
-#: client/gui-gtk-2.0/cityrep.c:707
+#: client/gui-gtk-2.0/cityrep.c:884
msgid "Add _Next"
msgstr "Añadir Siguiente(_N)"
-#: client/gui-gtk-2.0/cityrep.c:711
+#: client/gui-gtk-2.0/cityrep.c:888
+#, fuzzy
+msgid "Add _2nd Last"
+msgstr "Añadir Ultimo(_L)"
+
+#: client/gui-gtk-2.0/cityrep.c:892
msgid "Add _Last"
msgstr "Añadir Ultimo(_L)"
-#: client/gui-gtk-2.0/cityrep.c:715
+#: client/gui-gtk-2.0/cityrep.c:899
+#, fuzzy
+msgid "Set Worklist"
+msgstr "Lista de tareas"
+
+#: client/gui-gtk-2.0/cityrep.c:905
+#, fuzzy
+msgid "Append Worklist"
+msgstr "Renombrar la lista de tareas"
+
+#: client/gui-gtk-2.0/cityrep.c:911
+#, fuzzy
+msgid "Clear _Worklist"
+msgstr "Tareas _resultantes:"
+
+#: client/gui-gtk-2.0/cityrep.c:916
+#, fuzzy
+msgid "Gover_nor"
+msgstr "Governador"
+
+#: client/gui-gtk-2.0/cityrep.c:921
msgid "_Select"
msgstr "_Seleccionar"
-#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
+#: 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:800 client/gui-gtk-2.0/menu.c:808
+#: 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-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
#: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -10997,101 +11105,101 @@ msgstr "_Mostrar"
msgid "Cities"
msgstr "Ciudades"
-#: client/gui-gtk-2.0/cityrep.c:817
+#: client/gui-gtk-2.0/cityrep.c:1023
#, fuzzy
msgid "_Inspect"
msgstr "_Ventana"
-#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
-#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-sdl/helpdlg.c:297 client/gui-win32/menu.c:342
-#: client/gui-xaw/menu.c:241
+#: 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
+#: client/gui-gtk-2.0/cityrep.c:1518 client/gui-gtk-2.0/menu.c:823
+#: client/gui-gtk-2.0/menu.c:825 client/gui-gtk-2.0/menu.c:827
+#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:831
+#: client/gui-gtk-2.0/menu.c:833 client/gui-sdl/helpdlg.c:297
+#: client/gui-win32/menu.c:342 client/gui-xaw/menu.c:241
msgid "Improvements"
msgstr "Instalaciones"
-#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
-#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
-#: client/gui-xaw/menu.c:247
+#: client/gui-gtk-2.0/cityrep.c:1441 client/gui-gtk-2.0/cityrep.c:1460
+#: client/gui-gtk-2.0/cityrep.c:1479 client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1522 client/gui-xaw/menu.c:247
msgid "Wonders"
msgstr "Maravillas"
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1662 client/gui-win32/cityrep.c:439
#: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
msgid "All Cities"
msgstr "Todas las ciudades"
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1667 client/gui-win32/cityrep.c:440
msgid "No Cities"
msgstr "Ninguna ciudad"
-#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1672 client/gui-win32/cityrep.c:441
msgid "Invert Selection"
msgstr "Invertir selección"
-#: client/gui-gtk-2.0/cityrep.c:1420
+#: client/gui-gtk-2.0/cityrep.c:1682
msgid "Building Units"
msgstr "Producción de unidades"
-#: client/gui-gtk-2.0/cityrep.c:1426
+#: client/gui-gtk-2.0/cityrep.c:1688
msgid "Building Improvements"
msgstr "Construcción de instalaciones"
-#: client/gui-gtk-2.0/cityrep.c:1432
+#: client/gui-gtk-2.0/cityrep.c:1694
msgid "Building Wonders"
msgstr "Construcción de maravillas"
-#: client/gui-gtk-2.0/cityrep.c:1444
+#: client/gui-gtk-2.0/cityrep.c:1706
msgid "Building Unit"
msgstr "Producción de unidad"
-#: client/gui-gtk-2.0/cityrep.c:1448
+#: client/gui-gtk-2.0/cityrep.c:1710
msgid "Building Improvement"
msgstr "Construcción de instalación"
-#: client/gui-gtk-2.0/cityrep.c:1452
+#: client/gui-gtk-2.0/cityrep.c:1714
msgid "Building Wonder"
msgstr "Construcción de maravilla"
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1722 client/gui-win32/cityrep.c:443
msgid "Coastal Cities"
msgstr "Ciudades costeras"
-#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1727 client/gui-win32/cityrep.c:444
msgid "Same Island"
msgstr "En la misma isla"
-#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1737 client/gui-win32/cityrep.c:447
msgid "Supported Units"
msgstr "Unidades mantenidas"
-#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1740 client/gui-win32/cityrep.c:454
msgid "Units Present"
msgstr "Unidades presentes"
-#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1744 client/gui-win32/cityrep.c:469
msgid "Improvements in City"
msgstr "Instalaciones de la ciudad"
-#: client/gui-gtk-2.0/cityrep.c:1486
+#: client/gui-gtk-2.0/cityrep.c:1748
msgid "Wonders in City"
msgstr "Maravillas de la Ciudad"
-#: client/gui-gtk-2.0/cityrep.c:1495
+#: client/gui-gtk-2.0/cityrep.c:1757
msgid "Available Units"
msgstr "Unidades disponibles"
-#: client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1760
msgid "Available Improvements"
msgstr "Instalaciones disponibles"
-#: client/gui-gtk-2.0/cityrep.c:1501
+#: client/gui-gtk-2.0/cityrep.c:1763
msgid "Available Wonders"
msgstr "Maravillas disponibles"
-#: client/gui-gtk-2.0/cityrep.c:1625
+#: client/gui-gtk-2.0/cityrep.c:1882
#, fuzzy, c-format
msgid "Total Buy Cost: %d"
msgstr "Costes totales: "
@@ -11160,12 +11268,12 @@ 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:186
+#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:222
#, fuzzy
msgid "Goto _Location"
msgstr "Ir a _lugar"
-#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
#, fuzzy
msgid "Inspect _City"
msgstr "Ventana de _ciudad"
@@ -11194,10 +11302,10 @@ msgstr "Elige qu
msgid "Unit"
msgstr "Unidad"
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
-#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
-#: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
-#: manual/civmanual.c:302 data/Freeciv.in:80
+#: 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-win32/plrdlg.c:335 manual/civmanual.c:302 data/Freeciv.in:80
msgid "Name"
msgstr "Nombre"
@@ -11223,7 +11331,7 @@ 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:1036 data/Freeciv.in:3371
+#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
msgid "Pick Nation"
msgstr "Elegir Nación"
@@ -11305,7 +11413,7 @@ msgstr "_Mapas"
msgid "_Advances"
msgstr "_Avances"
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:910
+#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr "_Ciudades"
@@ -11410,20 +11518,20 @@ msgstr "Elegir destino"
msgid "Show _All Cities"
msgstr "_Todas las ciudades"
-#: client/gui-gtk-2.0/gui_main.c:150
+#: client/gui-gtk-2.0/gui_main.c:162
msgid "Show Map Scrollbars"
msgstr "Mostrar barras de desplazamiento en el mapa"
-#: client/gui-gtk-2.0/gui_main.c:151
+#: client/gui-gtk-2.0/gui_main.c:163
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:155
+#: client/gui-gtk-2.0/gui_main.c:167
msgid "Keyboardless goto"
msgstr "Goto sin el teclado"
-#: client/gui-gtk-2.0/gui_main.c:156
+#: client/gui-gtk-2.0/gui_main.c:168
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."
@@ -11432,11 +11540,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:161
+#: client/gui-gtk-2.0/gui_main.c:173
msgid "Keep dialogs on top"
msgstr "Mantener los diálogos en primer plano"
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:174
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."
@@ -11445,11 +11553,11 @@ msgstr ""
"la ventana principal de Freeciv. Desactivándola, no tiene efecto a pantalla "
"completa."
-#: client/gui-gtk-2.0/gui_main.c:166
+#: client/gui-gtk-2.0/gui_main.c:178
msgid "Show worklist task icons"
msgstr "Mostrar los iconos de tareas de la lista de tareas"
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:179
msgid ""
"Disabling this will turn off the unit and building icons in the worklist "
"dialog and the production tab of the city dialog."
@@ -11457,11 +11565,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:171
+#: client/gui-gtk-2.0/gui_main.c:183
msgid "Enable status report tabs"
msgstr "Habilita informe de estado en lengüetas"
-#: client/gui-gtk-2.0/gui_main.c:172
+#: client/gui-gtk-2.0/gui_main.c:184
msgid ""
"If this option is enabled then report dialogs will be shown as separate tabs "
"rather than in popup dialogs."
@@ -11469,11 +11577,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:177 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:189 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:178 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:190 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."
@@ -11481,50 +11589,120 @@ 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:277 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:195
+msgid "Show time for each chat message"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:196
+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
+msgid "Split bottom notebook area"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:202
+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
+msgid "New message events go to top of list"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:208
+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
+msgid "Show extra message window buttons"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:214
+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 "
+"is disabled, these buttons will not appear (you can still double-click with "
+"the left mouse button or right-click on a row to inspect or goto "
+"respectively). This option will only take effect once the message window is "
+"closed and reopened."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:224
+#, fuzzy
+msgid "Metaserver tab first in network page"
+msgstr "Se ha establecido la cadena de información del metaservidor a '%s'."
+
+#: client/gui-gtk-2.0/gui_main.c:225
+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
+msgid "Plain chat messages are sent to allies only"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:231
+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 "
+"messages will be sent as public chat messages. To send a public chat message "
+"with this option enabled, prefix the message with a single colon ':'. This "
+"option can also be set using a toggle button beside the chat entry (only "
+"visible in multiplayer games)."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:340 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:723 client/gui-gtk-2.0/gui_main.c:1345
+#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
msgid "Freeciv"
msgstr "Freeciv"
-#: client/gui-gtk-2.0/gui_main.c:1088 client/gui-gtk-2.0/gui_main.c:1095
+#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
#: 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:1095 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1232 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:1127 client/gui-gtk-2.0/menu.c:770
-#: client/gui-gtk-2.0/menu.c:772 client/gui-gtk-2.0/menu.c:774
-#: client/gui-gtk-2.0/menu.c:776 client/gui-gtk-2.0/menu.c:778
-#: client/gui-gtk-2.0/menu.c:780 client/gui-gtk-2.0/menu.c:782
-#: client/gui-gtk-2.0/menu.c:784 client/gui-gtk-2.0/menu.c:786
-#: client/gui-gtk-2.0/menu.c:788 client/gui-gtk-2.0/menu.c:790
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-gtk-2.0/menu.c:804 client/gui-gtk-2.0/menu.c:806
-#: client/gui-gtk-2.0/menu.c:808 client/gui-gtk-2.0/menu.c:810
-#: client/gui-gtk-2.0/menu.c:812 client/gui-gtk-2.0/menu.c:814
-#: client/gui-gtk-2.0/menu.c:816 client/gui-gtk-2.0/menu.c:818
-#: client/gui-gtk-2.0/menu.c:820 client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/gui_main.c:1266 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
+#: client/gui-gtk-2.0/menu.c:811 client/gui-gtk-2.0/menu.c:813
+#: client/gui-gtk-2.0/menu.c:815 client/gui-gtk-2.0/menu.c:817
+#: client/gui-gtk-2.0/menu.c:819 client/gui-gtk-2.0/menu.c:821
+#: client/gui-gtk-2.0/menu.c:823 client/gui-gtk-2.0/menu.c:825
+#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
+#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
+#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
+#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
+#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
+#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
#: data/Freeciv.in:2028
msgid "View"
msgstr "Ver"
-#: client/gui-gtk-2.0/gui_main.c:1208
+#: client/gui-gtk-2.0/gui_main.c:1359
msgid "Chat"
msgstr "Charla"
-#: client/gui-gtk-2.0/gui_main.c:1224 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1377 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"
@@ -11535,71 +11713,75 @@ 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:1491
+#: client/gui-gtk-2.0/gui_main.c:1392
+msgid "Allies Only"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:1657
msgid "Not _ready"
msgstr "No _preparado"
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
+#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
msgid "_Ready"
msgstr "_Listo"
-#: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2132
+#: 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
msgid "_Start"
msgstr "_Comenzar"
-#: client/gui-gtk-2.0/gui_main.c:1520
+#: client/gui-gtk-2.0/gui_main.c:1686
#, fuzzy
msgid "_Take Player"
msgstr "Elegir este jugador"
-#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
+#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
msgid "Pick _Nation"
msgstr "Elegir _Nación"
-#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
+#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
msgid "_Observe"
msgstr "_Observar"
-#: client/gui-gtk-2.0/gui_main.c:1532
+#: client/gui-gtk-2.0/gui_main.c:1698
#, fuzzy
msgid "Do not _observe"
msgstr "No _observar"
-#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
msgid "<AI>"
msgstr "<Ordenador>"
-#: client/gui-gtk-2.0/gui_main.c:1557
+#: client/gui-gtk-2.0/gui_main.c:1723
msgid "<Novice AI>"
msgstr "<Ordenador principiante>"
-#: client/gui-gtk-2.0/gui_main.c:1560
+#: client/gui-gtk-2.0/gui_main.c:1726
msgid "<Easy AI>"
msgstr "<Ordenador fácil>"
-#: client/gui-gtk-2.0/gui_main.c:1563
+#: client/gui-gtk-2.0/gui_main.c:1729
msgid "<Normal AI>"
msgstr "<Ordenador normal>"
-#: client/gui-gtk-2.0/gui_main.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1732
msgid "<Hard AI>"
msgstr "<Ordenador difícil>"
-#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1742 client/gui-win32/dialogs.c:594
#: client/gui-xaw/pages.c:217
msgid "Random"
msgstr "Aleatorio"
-#: client/gui-gtk-2.0/gui_main.c:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
msgid "Observer"
msgstr "Observador"
-#: client/gui-gtk-2.0/gui_main.c:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
msgid "Detached"
msgstr "Separado"
-#: client/gui-gtk-2.0/gui_main.c:1899
+#: client/gui-gtk-2.0/gui_main.c:2073
msgid "Are you sure you want to quit?"
msgstr "Seguro que quiere salir?"
@@ -11831,472 +12013,509 @@ msgstr "_Tecno"
msgid "Foreign Intelligence: %s Empire"
msgstr "Servicios de Información: %s Imperio"
-#: client/gui-gtk-2.0/mapctrl.c:195 client/gui-sdl/mapctrl.c:2565
+#: client/gui-gtk-2.0/mapctrl.c:179 client/gui-sdl/mapctrl.c:2565
#: client/gui-sdl/menu.c:839 client/gui-sdl/menu.c:1021
#: client/gui-win32/mapctrl.c:353
msgid "Build New City"
msgstr "Construir nueva ciudad"
-#: client/gui-gtk-2.0/mapctrl.c:196 client/gui-sdl/mapctrl.c:2594
+#: client/gui-gtk-2.0/mapctrl.c:180 client/gui-sdl/mapctrl.c:2594
#: client/gui-win32/mapctrl.c:354 client/gui-xaw/mapctrl.c:89
msgid "What should we call our new city?"
msgstr "¿Cómo se llamará la nueva ciudad?"
-#: client/gui-gtk-2.0/mapview.c:147
+#: client/gui-gtk-2.0/mapview.c:158
msgid "Shows your current luxury/science/tax rates;click to toggle them."
msgstr ""
"Muestra tus impuestos actuales de lujo/ciencia/impuestos; pulsa para activar/"
"desactivar."
-#: client/gui-gtk-2.0/mapview.c:692 client/gui-win32/canvas.c:275
+#: client/gui-gtk-2.0/mapview.c:702 client/gui-win32/canvas.c:275
msgid "Better fog will only work in truecolor. Disabling it"
msgstr ""
"Mejor neblina de la guerra sólo funcionará mejor en truecolor. Se deshabilita"
-#: client/gui-gtk-2.0/menu.c:250
+#: client/gui-gtk-2.0/menu.c:256
msgid "Leaving a local game will end it!"
msgstr "Dejar un juego en local lo acabará!"
-#: client/gui-gtk-2.0/menu.c:700 client/gui-win32/menu.c:303
+#: client/gui-gtk-2.0/menu.c:727 client/gui-win32/menu.c:303
msgid "_Game"
msgstr "_Partida"
-#: client/gui-gtk-2.0/menu.c:702 client/gui-gtk-2.0/menu.c:704
-#: client/gui-gtk-2.0/menu.c:706 client/gui-gtk-2.0/menu.c:708
-#: client/gui-gtk-2.0/menu.c:710 client/gui-gtk-2.0/menu.c:712
-#: client/gui-gtk-2.0/menu.c:714 client/gui-gtk-2.0/menu.c:717
-#: client/gui-gtk-2.0/menu.c:720 client/gui-gtk-2.0/menu.c:722
-#: client/gui-gtk-2.0/menu.c:724 client/gui-gtk-2.0/menu.c:726
-#: client/gui-gtk-2.0/menu.c:728 client/gui-gtk-2.0/menu.c:730
-#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:736
-#: client/gui-gtk-2.0/menu.c:738 client/gui-gtk-2.0/menu.c:740
+#: client/gui-gtk-2.0/menu.c:729 client/gui-gtk-2.0/menu.c:731
+#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:735
+#: client/gui-gtk-2.0/menu.c:737 client/gui-gtk-2.0/menu.c:739
+#: client/gui-gtk-2.0/menu.c:741 client/gui-gtk-2.0/menu.c:744
+#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
+#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
+#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
+#: client/gui-gtk-2.0/menu.c:760 client/gui-gtk-2.0/menu.c:763
+#: client/gui-gtk-2.0/menu.c:765 client/gui-gtk-2.0/menu.c:767
#: data/Freeciv.in:2026
msgid "Game"
msgstr "Partida"
-#: client/gui-gtk-2.0/menu.c:704 client/gui-gtk-2.0/menu.c:706
-#: client/gui-gtk-2.0/menu.c:708
+#: client/gui-gtk-2.0/menu.c:731 client/gui-gtk-2.0/menu.c:733
+#: client/gui-gtk-2.0/menu.c:735
msgid "_Chat"
msgstr "_Charla"
-#: client/gui-gtk-2.0/menu.c:706 client/gui-win32/menu.c:314
+#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:314
msgid "_Clear Log"
msgstr "_Borrar registro"
-#: client/gui-gtk-2.0/menu.c:708 client/gui-win32/menu.c:313
+#: client/gui-gtk-2.0/menu.c:735 client/gui-win32/menu.c:313
#, fuzzy
msgid "_Write Log"
msgstr "E_xportar registro"
-#: client/gui-gtk-2.0/menu.c:710 client/gui-win32/menu.c:304
+#: client/gui-gtk-2.0/menu.c:737 client/gui-win32/menu.c:304
msgid "Local _Options"
msgstr "_Opciones locales"
-#: client/gui-gtk-2.0/menu.c:712 client/gui-win32/menu.c:305
+#: client/gui-gtk-2.0/menu.c:739 client/gui-win32/menu.c:305
msgid "_Message Options"
msgstr "Opciones sobre _mensajes"
-#: client/gui-gtk-2.0/menu.c:717
+#: client/gui-gtk-2.0/menu.c:744
msgid "_Reload Tileset"
msgstr "_Recargar Tileset"
-#: client/gui-gtk-2.0/menu.c:720
+#: client/gui-gtk-2.0/menu.c:747
msgid "Save Options on _Exit"
msgstr "Guardar opciones al Salir(_E)"
-#: client/gui-gtk-2.0/menu.c:722
+#: client/gui-gtk-2.0/menu.c:749
msgid "Sa_ve Options"
msgstr "Guarar(_v) Opciones"
-#: client/gui-gtk-2.0/menu.c:726 client/gui-win32/menu.c:308
+#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:308
msgid "Server O_ptions"
msgstr "O_pciones del servidor"
-#: client/gui-gtk-2.0/menu.c:730 client/gui-win32/menu.c:310
+#: client/gui-gtk-2.0/menu.c:757 client/gui-win32/menu.c:310
msgid "_Save Game"
msgstr "Grabar(_S) partida"
-#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:311
+#: client/gui-gtk-2.0/menu.c:760 client/gui-win32/menu.c:311
msgid "Save Game _As..."
msgstr "Grabar p_artida como..."
-#: client/gui-gtk-2.0/menu.c:738
+#: client/gui-gtk-2.0/menu.c:765
msgid "_Leave"
msgstr "Abandonar(_L) partida"
-#: client/gui-gtk-2.0/menu.c:740 client/gui-win32/menu.c:317
+#: client/gui-gtk-2.0/menu.c:767 client/gui-win32/menu.c:317
msgid "_Quit"
msgstr "_Salir"
-#: client/gui-gtk-2.0/menu.c:745 client/gui-win32/menu.c:321
+#: client/gui-gtk-2.0/menu.c:772 client/gui-win32/menu.c:321
msgid "Gov_ernment"
msgstr "Gobi_erno"
-#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
-#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
-#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:774 client/gui-gtk-2.0/menu.c:776
+#: client/gui-gtk-2.0/menu.c:778 client/gui-gtk-2.0/menu.c:780
+#: client/gui-gtk-2.0/menu.c:782 client/gui-gtk-2.0/menu.c:784
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
#: client/gui-xaw/menu.c:248 data/Freeciv.in:2027 data/helpdata.txt:1320
msgid "Government"
msgstr "Gobiernos"
-#: client/gui-gtk-2.0/menu.c:749 client/gui-win32/menu.c:322
+#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:322
msgid "_Tax Rates"
msgstr "_Tasas"
-#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:324
+#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:324
msgid "_Find City"
msgstr "Buscar ciudad (_F)"
-#: client/gui-gtk-2.0/menu.c:755 client/gui-win32/menu.c:325
+#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:325
msgid "_Worklists"
msgstr "_Listas de tareas"
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
-#: client/gui-gtk-2.0/menu.c:764 client/gui-win32/menu.c:327
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
+#: client/gui-gtk-2.0/menu.c:791 client/gui-win32/menu.c:327
msgid "_Change Government"
msgstr "_Cambiar Gobierno"
-#: client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:788
msgid "_Revolution..."
msgstr "_Revolución..."
-#: client/gui-gtk-2.0/menu.c:764 client/gui-gtk-2.0/menu.c:970
+#: client/gui-gtk-2.0/menu.c:791 client/gui-gtk-2.0/menu.c:1013
#: client/gui-win32/menu.c:431
msgid "_Government"
msgstr "_Gobiernos"
-#: client/gui-gtk-2.0/menu.c:768 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:795 client/gui-gtk-2.0/menu.c:959
#: client/gui-win32/menu.c:334
msgid "_View"
msgstr "_Ver"
-#: client/gui-gtk-2.0/menu.c:772
+#: client/gui-gtk-2.0/menu.c:799
msgid "City Outlines"
msgstr "Contornos de ciudad"
-#: client/gui-gtk-2.0/menu.c:774 client/gui-win32/menu.c:335
+#: client/gui-gtk-2.0/menu.c:801 client/gui-win32/menu.c:335
msgid "Map _Grid"
msgstr "_Cuadrícula del mapa"
-#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:336
+#: client/gui-gtk-2.0/menu.c:803 client/gui-win32/menu.c:336
msgid "National _Borders"
msgstr "_Fronteras nacionales"
-#: client/gui-gtk-2.0/menu.c:778 client/gui-win32/menu.c:337
+#: client/gui-gtk-2.0/menu.c:805 client/gui-win32/menu.c:337
msgid "City _Names"
msgstr "_Nombres de las ciudades"
-#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:338
+#: client/gui-gtk-2.0/menu.c:807 client/gui-win32/menu.c:338
msgid "City G_rowth"
msgstr "Ciudad: C_rece"
-#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:339
+#: client/gui-gtk-2.0/menu.c:809 client/gui-win32/menu.c:339
msgid "City _Productions"
msgstr "_Producciones de las ciudades"
-#: client/gui-gtk-2.0/menu.c:784 client/gui-sdl/optiondlg.c:1719
+#: client/gui-gtk-2.0/menu.c:811
+#, fuzzy
+msgid "City Buy Cost"
+msgstr "Costes totales: "
+
+#: client/gui-gtk-2.0/menu.c:813
+#, fuzzy
+msgid "City Traderoutes"
+msgstr "Rutas comerciales : "
+
+#: client/gui-gtk-2.0/menu.c:815 client/gui-sdl/optiondlg.c:1719
msgid "Draw city worker map grid"
msgstr "Mostrar trabajadores de la ciudad"
-#: client/gui-gtk-2.0/menu.c:788 client/gui-sdl/optiondlg.c:1635
+#: client/gui-gtk-2.0/menu.c:819 client/gui-sdl/optiondlg.c:1635
#: client/gui-win32/menu.c:340 client/gui-xaw/menu.c:148
#: client/gui-xaw/menu.c:246 manual/civmanual.c:220 data/helpdata.txt:1220
msgid "Terrain"
msgstr "Terreno"
-#: client/gui-gtk-2.0/menu.c:790 client/gui-win32/menu.c:341
+#: client/gui-gtk-2.0/menu.c:821 client/gui-win32/menu.c:341
#: client/gui-xaw/menu.c:149
msgid "Coastline"
msgstr "Costa"
-#: client/gui-gtk-2.0/menu.c:796 client/gui-win32/menu.c:343
+#: client/gui-gtk-2.0/menu.c:827 client/gui-win32/menu.c:343
msgid "Roads & Rails"
msgstr "Caminos y vías"
-#: client/gui-gtk-2.0/menu.c:800 client/gui-sdl/optiondlg.c:1933
+#: client/gui-gtk-2.0/menu.c:831 client/gui-sdl/optiondlg.c:1933
#: client/gui-win32/menu.c:345 client/gui-xaw/menu.c:152
msgid "Mines"
msgstr "Minas"
-#: client/gui-gtk-2.0/menu.c:802 client/gui-win32/menu.c:346
+#: client/gui-gtk-2.0/menu.c:833 client/gui-win32/menu.c:346
msgid "Fortress & Airbase"
msgstr "Fortaleza y base aérea"
-#: client/gui-gtk-2.0/menu.c:804 client/gui-win32/menu.c:348
+#: client/gui-gtk-2.0/menu.c:835 client/gui-win32/menu.c:348
#: client/gui-xaw/menu.c:154
msgid "Specials"
msgstr "Especiales"
-#: client/gui-gtk-2.0/menu.c:806 client/gui-win32/menu.c:349
+#: client/gui-gtk-2.0/menu.c:837 client/gui-win32/menu.c:349
#: client/gui-xaw/menu.c:155
msgid "Pollution & Fallout"
msgstr "Contaminación"
-#: client/gui-gtk-2.0/menu.c:812 client/gui-win32/menu.c:352
+#: client/gui-gtk-2.0/menu.c:843 client/gui-win32/menu.c:352
#: client/gui-xaw/menu.c:158
msgid "Focus Unit"
msgstr "Observar unidad"
-#: client/gui-gtk-2.0/menu.c:814 client/gui-sdl/optiondlg.c:1854
+#: client/gui-gtk-2.0/menu.c:845 client/gui-sdl/optiondlg.c:1854
#: client/gui-win32/menu.c:353 client/gui-xaw/menu.c:159
msgid "Fog of War"
msgstr "Niebla de guerra"
-#: client/gui-gtk-2.0/menu.c:818
+#: client/gui-gtk-2.0/menu.c:849
msgid "_Full Screen"
msgstr "Pantalla(_F) completa"
-#: client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/menu.c:853
msgid "_Center View"
msgstr "C_entrar vista"
-#: client/gui-gtk-2.0/menu.c:825 client/gui-win32/menu.c:358
+#: client/gui-gtk-2.0/menu.c:856 client/gui-win32/menu.c:358
msgid "_Orders"
msgstr "_Órdenes"
-#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
-#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
-#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
-#: client/gui-gtk-2.0/menu.c:855 client/gui-gtk-2.0/menu.c:857
-#: client/gui-gtk-2.0/menu.c:859 client/gui-gtk-2.0/menu.c:861
-#: client/gui-gtk-2.0/menu.c:863 client/gui-gtk-2.0/menu.c:865
-#: client/gui-gtk-2.0/menu.c:867 client/gui-gtk-2.0/menu.c:869
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875 client/gui-gtk-2.0/menu.c:877
-#: client/gui-gtk-2.0/menu.c:879 client/gui-gtk-2.0/menu.c:881
-#: client/gui-gtk-2.0/menu.c:883 client/gui-gtk-2.0/menu.c:885
-#: client/gui-gtk-2.0/menu.c:887 client/gui-gtk-2.0/menu.c:889
-#: client/gui-gtk-2.0/menu.c:891 client/gui-gtk-2.0/menu.c:893
-#: client/gui-gtk-2.0/menu.c:895 client/gui-gtk-2.0/menu.c:897
-#: client/gui-gtk-2.0/menu.c:899 client/gui-gtk-2.0/menu.c:901
-#: client/gui-gtk-2.0/menu.c:903 data/Freeciv.in:2029
+#: client/gui-gtk-2.0/menu.c:858 client/gui-gtk-2.0/menu.c:860
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:864
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:868
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:872
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:876
+#: client/gui-gtk-2.0/menu.c:878 client/gui-gtk-2.0/menu.c:880
+#: client/gui-gtk-2.0/menu.c:882 client/gui-gtk-2.0/menu.c:884
+#: client/gui-gtk-2.0/menu.c:886 client/gui-gtk-2.0/menu.c:888
+#: client/gui-gtk-2.0/menu.c:890 client/gui-gtk-2.0/menu.c:892
+#: client/gui-gtk-2.0/menu.c:894 client/gui-gtk-2.0/menu.c:896
+#: client/gui-gtk-2.0/menu.c:898 client/gui-gtk-2.0/menu.c:900
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906 client/gui-gtk-2.0/menu.c:908
+#: client/gui-gtk-2.0/menu.c:910 client/gui-gtk-2.0/menu.c:912
+#: client/gui-gtk-2.0/menu.c:914 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:918 client/gui-gtk-2.0/menu.c:920
+#: client/gui-gtk-2.0/menu.c:922 client/gui-gtk-2.0/menu.c:924
+#: client/gui-gtk-2.0/menu.c:926 client/gui-gtk-2.0/menu.c:928
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
+#: client/gui-gtk-2.0/menu.c:946 data/Freeciv.in:2029
msgid "Orders"
msgstr "Órdenes"
-#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:1444
+#: client/gui-gtk-2.0/menu.c:860 client/gui-gtk-2.0/menu.c:1489
#: client/gui-win32/menu.c:359
msgid "_Build City"
msgstr "Construir ciudad (_B)"
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:1466
-#: client/gui-gtk-2.0/menu.c:1472 client/gui-win32/menu.c:360
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:1511
+#: client/gui-gtk-2.0/menu.c:1517 client/gui-win32/menu.c:360
msgid "Build _Road"
msgstr "Const_ruir camino"
-#: client/gui-gtk-2.0/menu.c:833 client/gui-gtk-2.0/menu.c:1360
+#: 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 "Constru_ir regadío"
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:1361
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:1406
#: client/gui-win32/menu.c:362
msgid "Build _Mine"
msgstr "Construir _mina"
-#: client/gui-gtk-2.0/menu.c:837 client/gui-gtk-2.0/menu.c:1362
+#: client/gui-gtk-2.0/menu.c:868 client/gui-gtk-2.0/menu.c:1407
msgid "Transf_orm Terrain"
msgstr "Transf_ormar el terreno"
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:1508
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:1553
#: client/gui-win32/menu.c:364
msgid "Build _Fortress"
msgstr "Construir _fortaleza"
-#: client/gui-gtk-2.0/menu.c:841 client/gui-win32/menu.c:365
+#: client/gui-gtk-2.0/menu.c:872 client/gui-win32/menu.c:365
msgid "Build Airbas_e"
msgstr "Construir bas_e aérea"
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:1514
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:1559
#: client/gui-win32/menu.c:366
msgid "Clean _Pollution"
msgstr "Descontaminar (_P)"
-#: client/gui-gtk-2.0/menu.c:845 client/gui-win32/menu.c:367
+#: client/gui-gtk-2.0/menu.c:876 client/gui-win32/menu.c:367
msgid "Clean _Nuclear Fallout"
msgstr "Limpiar la radioactividad (_N)"
-#: client/gui-gtk-2.0/menu.c:849 client/gui-win32/menu.c:369
+#: client/gui-gtk-2.0/menu.c:880 client/gui-win32/menu.c:369
msgid "_Sentry"
msgstr "Vigilancia (_S)"
-#: client/gui-gtk-2.0/menu.c:855 client/gui-win32/menu.c:372
+#: client/gui-gtk-2.0/menu.c:886 client/gui-win32/menu.c:372
msgid "Make _Homecity"
msgstr "Asignar a esta ciudad (_H)"
-#: client/gui-gtk-2.0/menu.c:857 client/gui-win32/menu.c:373
+#: client/gui-gtk-2.0/menu.c:888 client/gui-win32/menu.c:373
msgid "_Load"
msgstr "Cargar (_L)"
-#: client/gui-gtk-2.0/menu.c:859
+#: client/gui-gtk-2.0/menu.c:890
msgid "_Unload Transporter"
msgstr "Descargar(_U) Transporte"
-#: client/gui-gtk-2.0/menu.c:861 client/gui-win32/menu.c:374
+#: client/gui-gtk-2.0/menu.c:892 client/gui-win32/menu.c:374
msgid "_Unload"
msgstr "Descargar (_U)"
-#: client/gui-gtk-2.0/menu.c:863 client/gui-win32/menu.c:375
+#: client/gui-gtk-2.0/menu.c:894 client/gui-win32/menu.c:375
msgid "Wake up o_thers"
msgstr "Despertar a los o_tros"
-#: client/gui-gtk-2.0/menu.c:867
+#: client/gui-gtk-2.0/menu.c:898
msgid "_Auto Settler"
msgstr "_Autocolonizar"
-#: client/gui-gtk-2.0/menu.c:869 client/gui-win32/menu.c:378
+#: client/gui-gtk-2.0/menu.c:900 client/gui-win32/menu.c:378
msgid "Auto E_xplore"
msgstr "Autoe_xplorar"
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906
msgid "_Connect"
msgstr "_Conectar"
-#: client/gui-gtk-2.0/menu.c:871 client/gui-win32/menu.c:380
+#: client/gui-gtk-2.0/menu.c:902 client/gui-win32/menu.c:380
msgid "_Road"
msgstr "Camino(_R)"
-#: client/gui-gtk-2.0/menu.c:873 client/gui-win32/menu.c:381
+#: client/gui-gtk-2.0/menu.c:904 client/gui-win32/menu.c:381
msgid "Rai_l"
msgstr "Ferrocarri_l"
-#: client/gui-gtk-2.0/menu.c:875 client/gui-win32/menu.c:382
+#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:382
msgid "_Irrigate"
msgstr "_Irrigar"
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
msgid "Go _to"
msgstr "Ir a (_t)"
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
msgid "_Build city"
msgstr "Construir ciudad (_B)"
-#: client/gui-gtk-2.0/menu.c:879
+#: client/gui-gtk-2.0/menu.c:910
msgid "Patrol (_Q)"
msgstr "Patrulla (_Q)"
-#: client/gui-gtk-2.0/menu.c:881 client/gui-win32/menu.c:385
+#: client/gui-gtk-2.0/menu.c:912 client/gui-win32/menu.c:385
msgid "_Go to"
msgstr "Ir a (_G)"
-#: client/gui-gtk-2.0/menu.c:883
+#: client/gui-gtk-2.0/menu.c:914
msgid "Go\\/Airlift to City"
msgstr "Aerotransportar a ciudad"
-#: client/gui-gtk-2.0/menu.c:885 client/gui-sdl/menu.c:450
+#: client/gui-gtk-2.0/menu.c:916 client/gui-sdl/menu.c:450
#: client/gui-win32/menu.c:387 client/gui-xaw/menu.c:203
msgid "Return to nearest city"
msgstr "Volver a la ciudad más próxima"
-#: client/gui-gtk-2.0/menu.c:889 client/gui-win32/menu.c:389
+#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:389
#: client/gui-xaw/menu.c:205
msgid "Disband Unit"
msgstr "Desarticular unidad"
-#: client/gui-gtk-2.0/menu.c:891 client/gui-sdl/citydlg.c:532
+#: client/gui-gtk-2.0/menu.c:922 client/gui-sdl/citydlg.c:532
#: data/Freeciv.in:1186
msgid "Upgrade unit"
msgstr "Mejorar unidad"
-#: client/gui-gtk-2.0/menu.c:893
+#: client/gui-gtk-2.0/menu.c:924
msgid "Diplomat\\/Spy Actions"
msgstr "Acciones diplom\\/espionaje"
-#: client/gui-gtk-2.0/menu.c:895 client/gui-sdl/menu.c:399
+#: client/gui-gtk-2.0/menu.c:926 client/gui-sdl/menu.c:399
#: client/gui-win32/menu.c:391 client/gui-xaw/menu.c:209
msgid "Explode Nuclear"
msgstr "Explosión nuclear"
-#: client/gui-gtk-2.0/menu.c:899
-msgid "Select same type"
-msgstr "Elegir el mismo tipo"
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/cityrep.c:882
+msgid "Select"
+msgstr "Seleccionar"
+
+#: client/gui-gtk-2.0/menu.c:934
+#, fuzzy
+msgid "Single"
+msgstr "Jungla"
+
+#: client/gui-gtk-2.0/menu.c:936
+msgid "Same Type On Tile"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:938
+msgid "All On Tile"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:940
+msgid "Same Type On Continent"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:942
+msgid "Same Type Everywhere"
+msgstr ""
-#: client/gui-gtk-2.0/menu.c:901 client/gui-win32/menu.c:393
+#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:393
msgid "_Wait"
msgstr "Esperar (_W)"
-#: client/gui-gtk-2.0/menu.c:903 client/gui-win32/menu.c:394
+#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:394
#: client/gui-xaw/menu.c:213
msgid "Done"
msgstr "Salir"
-#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:398
+#: client/gui-gtk-2.0/menu.c:949 client/gui-win32/menu.c:398
msgid "_Reports"
msgstr "Info_rmes"
-#: client/gui-gtk-2.0/menu.c:908 client/gui-gtk-2.0/menu.c:910
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:914
-#: client/gui-gtk-2.0/menu.c:916 client/gui-gtk-2.0/menu.c:918
-#: client/gui-gtk-2.0/menu.c:920 client/gui-gtk-2.0/menu.c:922
-#: client/gui-gtk-2.0/menu.c:924 client/gui-gtk-2.0/menu.c:926
-#: client/gui-gtk-2.0/menu.c:928 client/gui-gtk-2.0/menu.c:930
-#: client/gui-gtk-2.0/menu.c:932 data/Freeciv.in:2030
+#: client/gui-gtk-2.0/menu.c:951 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:957
+#: client/gui-gtk-2.0/menu.c:959 client/gui-gtk-2.0/menu.c:961
+#: client/gui-gtk-2.0/menu.c:963 client/gui-gtk-2.0/menu.c:965
+#: client/gui-gtk-2.0/menu.c:967 client/gui-gtk-2.0/menu.c:969
+#: client/gui-gtk-2.0/menu.c:971 client/gui-gtk-2.0/menu.c:973
+#: client/gui-gtk-2.0/menu.c:975 data/Freeciv.in:2030
msgid "Reports"
msgstr "Informes"
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:958
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:1001
#: client/gui-win32/menu.c:400 client/gui-win32/menu.c:425
msgid "_Units"
msgstr "_Unidades"
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/menu.c:914 client/gui-win32/menu.c:402
+#: client/gui-gtk-2.0/menu.c:957 client/gui-win32/menu.c:402
#, fuzzy
msgid "_Nations"
msgstr "_Naciones"
-#: client/gui-gtk-2.0/menu.c:918 client/gui-win32/menu.c:403
+#: client/gui-gtk-2.0/menu.c:961 client/gui-win32/menu.c:403
msgid "_Economy"
msgstr "_Economía"
#. TRANS: Research report action
-#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:405
+#: client/gui-gtk-2.0/menu.c:963 client/gui-win32/menu.c:405
#, fuzzy
msgid "_Research"
msgstr "_Investigar"
-#: client/gui-gtk-2.0/menu.c:924 client/gui-win32/menu.c:407
+#: client/gui-gtk-2.0/menu.c:967 client/gui-win32/menu.c:407
msgid "_Wonders of the World"
msgstr "_Maravillas del mundo"
-#: client/gui-gtk-2.0/menu.c:926 client/gui-win32/menu.c:408
+#: client/gui-gtk-2.0/menu.c:969 client/gui-win32/menu.c:408
msgid "_Top Five Cities"
msgstr "Las cinco ma_yores ciudades"
-#: client/gui-gtk-2.0/menu.c:928 client/gui-win32/menu.c:409
+#: client/gui-gtk-2.0/menu.c:971 client/gui-win32/menu.c:409
msgid "_Messages"
msgstr "_Mensajes"
-#: client/gui-gtk-2.0/menu.c:930 client/gui-win32/menu.c:410
+#: client/gui-gtk-2.0/menu.c:973 client/gui-win32/menu.c:410
msgid "_Demographics"
msgstr "Informe _demográfico"
-#: client/gui-gtk-2.0/menu.c:932 client/gui-gtk-2.0/plrdlg.c:471
+#: client/gui-gtk-2.0/menu.c:975 client/gui-gtk-2.0/plrdlg.c:354
#: client/gui-win32/menu.c:411
msgid "_Spaceship"
msgstr "_Nave espacial"
-#: client/gui-gtk-2.0/menu.c:936 client/gui-win32/menu.c:415
+#: client/gui-gtk-2.0/menu.c:979 client/gui-win32/menu.c:415
msgid "_Help"
msgstr "_Ayuda"
-#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
-#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
-#: client/gui-gtk-2.0/menu.c:946 client/gui-gtk-2.0/menu.c:948
-#: client/gui-gtk-2.0/menu.c:950 client/gui-gtk-2.0/menu.c:952
-#: client/gui-gtk-2.0/menu.c:954 client/gui-gtk-2.0/menu.c:956
-#: client/gui-gtk-2.0/menu.c:958 client/gui-gtk-2.0/menu.c:960
-#: client/gui-gtk-2.0/menu.c:962 client/gui-gtk-2.0/menu.c:964
-#: client/gui-gtk-2.0/menu.c:966 client/gui-gtk-2.0/menu.c:968
-#: client/gui-gtk-2.0/menu.c:970 client/gui-gtk-2.0/menu.c:972
-#: client/gui-gtk-2.0/menu.c:974 client/gui-gtk-2.0/menu.c:976
-#: client/gui-gtk-2.0/menu.c:978 client/gui-gtk-2.0/menu.c:980
+#: client/gui-gtk-2.0/menu.c:981 client/gui-gtk-2.0/menu.c:983
+#: client/gui-gtk-2.0/menu.c:985 client/gui-gtk-2.0/menu.c:987
+#: client/gui-gtk-2.0/menu.c:989 client/gui-gtk-2.0/menu.c:991
+#: client/gui-gtk-2.0/menu.c:993 client/gui-gtk-2.0/menu.c:995
+#: client/gui-gtk-2.0/menu.c:997 client/gui-gtk-2.0/menu.c:999
+#: client/gui-gtk-2.0/menu.c:1001 client/gui-gtk-2.0/menu.c:1003
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-gtk-2.0/menu.c:1007
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-gtk-2.0/menu.c:1011
+#: client/gui-gtk-2.0/menu.c:1013 client/gui-gtk-2.0/menu.c:1015
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-gtk-2.0/menu.c:1019
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-gtk-2.0/menu.c:1023
#: client/gui-gtk-2.0/repodlgs.c:313 client/gui-win32/citydlg.c:1077
#: client/gui-win32/repodlgs.c:289 client/gui-win32/wldlg.c:846
#: data/Freeciv.in:1466 data/Freeciv.in:2031 data/Freeciv.in:2101
@@ -12304,119 +12523,119 @@ msgstr "_Ayuda"
msgid "Help"
msgstr "Ayuda"
-#: client/gui-gtk-2.0/menu.c:940 client/gui-win32/menu.c:416
+#: client/gui-gtk-2.0/menu.c:983 client/gui-win32/menu.c:416
msgid "Language_s"
msgstr "_Idiomas"
-#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/menu.c:417
+#: client/gui-gtk-2.0/menu.c:985 client/gui-win32/menu.c:417
msgid "Co_nnecting"
msgstr "Co_nectarse"
-#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:418
+#: client/gui-gtk-2.0/menu.c:987 client/gui-win32/menu.c:418
msgid "C_ontrols"
msgstr "C_ontroles"
-#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:419
+#: client/gui-gtk-2.0/menu.c:989 client/gui-win32/menu.c:419
msgid "C_hatline"
msgstr "Línea de _chat"
-#: client/gui-gtk-2.0/menu.c:948 client/gui-win32/menu.c:420
+#: client/gui-gtk-2.0/menu.c:991 client/gui-win32/menu.c:420
msgid "_Worklist Editor"
msgstr "Editor de _listas de tareas"
-#: client/gui-gtk-2.0/menu.c:950 client/gui-win32/menu.c:421
+#: client/gui-gtk-2.0/menu.c:993 client/gui-win32/menu.c:421
msgid "Citizen _Management"
msgstr "_Control de ciudades"
-#: client/gui-gtk-2.0/menu.c:952 client/gui-win32/menu.c:422
+#: client/gui-gtk-2.0/menu.c:995 client/gui-win32/menu.c:422
msgid "_Playing"
msgstr "Cómo _jugar"
-#: client/gui-gtk-2.0/menu.c:956 client/gui-win32/menu.c:424
+#: client/gui-gtk-2.0/menu.c:999 client/gui-win32/menu.c:424
msgid "City _Improvements"
msgstr "Instalaciones _urbanas"
-#: client/gui-gtk-2.0/menu.c:960 client/gui-win32/menu.c:426
+#: client/gui-gtk-2.0/menu.c:1003 client/gui-win32/menu.c:426
msgid "Com_bat"
msgstr "Com_bates"
-#: client/gui-gtk-2.0/menu.c:962 client/gui-win32/menu.c:427
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-win32/menu.c:427
msgid "_ZOC"
msgstr "_Zona de Control"
-#: client/gui-gtk-2.0/menu.c:964 client/gui-win32/menu.c:428
+#: client/gui-gtk-2.0/menu.c:1007 client/gui-win32/menu.c:428
msgid "Techno_logy"
msgstr "Tecno_logía"
-#: client/gui-gtk-2.0/menu.c:966 client/gui-win32/menu.c:429
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-win32/menu.c:429
msgid "_Terrain"
msgstr "_Terreno"
-#: client/gui-gtk-2.0/menu.c:968 client/gui-win32/menu.c:430
+#: client/gui-gtk-2.0/menu.c:1011 client/gui-win32/menu.c:430
msgid "Won_ders"
msgstr "Mara_villas"
-#: client/gui-gtk-2.0/menu.c:972 client/gui-win32/menu.c:432
+#: client/gui-gtk-2.0/menu.c:1015 client/gui-win32/menu.c:432
msgid "Happin_ess"
msgstr "_Felicidad"
-#: client/gui-gtk-2.0/menu.c:974 client/gui-win32/menu.c:433
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-win32/menu.c:433
msgid "Space _Race"
msgstr "Carrera e_spacial"
-#: client/gui-gtk-2.0/menu.c:978 client/gui-win32/menu.c:435
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-win32/menu.c:435
msgid "_Copying"
msgstr "Co_piar"
-#: client/gui-gtk-2.0/menu.c:980 client/gui-win32/menu.c:436
+#: client/gui-gtk-2.0/menu.c:1023 client/gui-win32/menu.c:436
msgid "_About"
msgstr "Cré_ditos"
-#: client/gui-gtk-2.0/menu.c:1264
+#: client/gui-gtk-2.0/menu.c:1307
#, c-format
msgid "%s..."
msgstr "%s..."
-#: client/gui-gtk-2.0/menu.c:1352
+#: client/gui-gtk-2.0/menu.c:1397
#, c-format
msgid "Change to %s (_I)"
msgstr "Transformar a %s (_I)"
-#: client/gui-gtk-2.0/menu.c:1353
+#: client/gui-gtk-2.0/menu.c:1398
#, c-format
msgid "Change to %s (_M)"
msgstr "Transformar a %s (_M)"
-#: client/gui-gtk-2.0/menu.c:1354
+#: client/gui-gtk-2.0/menu.c:1399
#, c-format
msgid "Transf_orm to %s"
msgstr "Transf_ormar a %s"
-#: client/gui-gtk-2.0/menu.c:1427
+#: client/gui-gtk-2.0/menu.c:1472
msgid "Help _Build Wonder"
msgstr "Contri_buir a la maravilla"
-#: client/gui-gtk-2.0/menu.c:1441
+#: client/gui-gtk-2.0/menu.c:1486
msgid "Add to City (_B)"
msgstr "Añadir a la ciudad (_B)"
-#: client/gui-gtk-2.0/menu.c:1449
+#: client/gui-gtk-2.0/menu.c:1494
msgid "Make Trade _Route"
msgstr "Establecer _ruta comercial"
-#: client/gui-gtk-2.0/menu.c:1463
+#: client/gui-gtk-2.0/menu.c:1508
msgid "Build _Railroad"
msgstr "Construir vía _férrea"
-#: client/gui-gtk-2.0/menu.c:1486
+#: client/gui-gtk-2.0/menu.c:1531
msgid "Bu_ild Farmland"
msgstr "Construir _huerta"
-#: client/gui-gtk-2.0/menu.c:1506
+#: client/gui-gtk-2.0/menu.c:1551
msgid "_Fortify"
msgstr "Atri_ncherar"
-#: client/gui-gtk-2.0/menu.c:1512
+#: client/gui-gtk-2.0/menu.c:1557
msgid "_Paradrop"
msgstr "_Lanzarse en paracaídas"
@@ -12451,13 +12670,32 @@ msgstr "Men"
msgid "Pop"
msgstr "Ind"
-#: client/gui-gtk-2.0/messagewin.c:155 client/gui-sdl/messagewin.c:247
+#: client/gui-gtk-2.0/messagewin.c:186 client/gui-sdl/messagewin.c:247
#: client/gui-win32/messagewin.c:132 client/gui-xaw/menu.c:228
#: data/Freeciv.in:3273 data/Freeciv.in:3274 data/Freeciv.in:3283
msgid "Messages"
msgstr "Mensajes"
-#: client/gui-gtk-2.0/plrdlg.c:330
+#: client/gui-gtk-2.0/plrdlg.c:317
+msgid "_Meet"
+msgstr "_Cumbre"
+
+#: client/gui-gtk-2.0/plrdlg.c:323
+#, fuzzy
+msgid "Cancel _Treaty"
+msgstr "_Cancelar pacto"
+
+#: client/gui-gtk-2.0/plrdlg.c:329
+#, fuzzy
+msgid "_Withdraw Vision"
+msgstr "Retirar visión (_W)"
+
+#: client/gui-gtk-2.0/plrdlg.c:348
+#, fuzzy
+msgid "_Report"
+msgstr "Info_rmes"
+
+#: client/gui-gtk-2.0/plrdlg.c:386
msgid "?show:Dead Players"
msgstr "Jugadores muertos"
@@ -12465,269 +12703,272 @@ msgstr "Jugadores muertos"
#. TRANS: Nations report action
#. TRANS: Nations report title
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/plrdlg.c:350 client/gui-sdl/mapctrl.c:1580
+#: client/gui-gtk-2.0/plrdlg.c:406 client/gui-sdl/mapctrl.c:1580
#: client/gui-sdl/plrdlg.c:608 client/gui-win32/plrdlg.c:344
#: client/gui-xaw/menu.c:221 data/Freeciv.in:3192 data/Freeciv.in:3193
msgid "Nations"
msgstr "Naciones"
-#: client/gui-gtk-2.0/plrdlg.c:443
-msgid "_Intelligence"
-msgstr "_Información"
-
-#: client/gui-gtk-2.0/plrdlg.c:450
-msgid "_Meet"
-msgstr "_Cumbre"
-
-#: client/gui-gtk-2.0/plrdlg.c:457
+#: client/gui-gtk-2.0/plrdlg.c:511
#, fuzzy
-msgid "Cancel _Treaty"
-msgstr "_Cancelar pacto"
+msgid "Di_plomacy"
+msgstr "Diplomacia"
-#: client/gui-gtk-2.0/plrdlg.c:464
-msgid "_Withdraw vision"
-msgstr "Retirar visión (_W)"
+#: client/gui-gtk-2.0/plrdlg.c:516
+msgid "_Intelligence"
+msgstr "_Información"
-#: client/gui-gtk-2.0/plrdlg.c:495
+#: client/gui-gtk-2.0/plrdlg.c:526
msgid "_AI"
msgstr "Orden_ador"
-#: client/gui-gtk-2.0/plrdlg.c:501
+#: client/gui-gtk-2.0/plrdlg.c:532
msgid "_Toggle AI Mode"
msgstr "Cambiar Modo _Ordenador"
-#: client/gui-gtk-2.0/pages.c:208
+#: client/gui-gtk-2.0/pages.c:221
msgid "Start _New Game"
msgstr "Empezar una _nueva partida"
-#: client/gui-gtk-2.0/pages.c:214
+#: client/gui-gtk-2.0/pages.c:227
msgid "Start _Scenario Game"
msgstr "Empezar un e_scenario"
-#: client/gui-gtk-2.0/pages.c:220
+#: client/gui-gtk-2.0/pages.c:233
msgid "_Load Saved Game"
msgstr "Cargar(_L) una partida guardada"
-#: client/gui-gtk-2.0/pages.c:229
+#: client/gui-gtk-2.0/pages.c:239
msgid "C_onnect to Network Game"
msgstr "C_onectar con un juego en red"
-#: client/gui-gtk-2.0/pages.c:236
+#: client/gui-gtk-2.0/pages.c:247
msgid "Connect to Gaming _Zone"
msgstr "Conectar con _Zona de Juegos"
-#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:300
#: client/gui-xaw/connectdlg.c:326
msgid "Passwords don't match, enter password."
msgstr "Las contraseñas no coinciden, introduce tu contraseña."
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:779 client/gui-gtk-2.0/pages.c:820
+#: client/gui-win32/connectdlg.c:916
msgid "Server Name"
msgstr "Nombre del servidor"
-#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
+#: 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
+#: data/Freeciv.in:96
msgid "Port"
msgstr "Puerto"
-#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
+#: client/gui-win32/connectdlg.c:917
msgid "Version"
msgstr "Versión"
-#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
-#: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
+#: 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
msgid "Status"
msgstr "Estado"
-#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
-#: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
+#: 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
msgid "Players"
msgstr "Jugadores"
-#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
+#: client/gui-win32/connectdlg.c:918
msgid "Comment"
msgstr "Comentario"
-#: client/gui-gtk-2.0/pages.c:747
+#: client/gui-gtk-2.0/pages.c:786
msgid "Local _Area Network"
msgstr "Red de _Área Local"
-#: client/gui-gtk-2.0/pages.c:783
+#: client/gui-gtk-2.0/pages.c:827
msgid "Internet _Metaserver"
msgstr "_Metaservidor de Internet"
-#: client/gui-gtk-2.0/pages.c:817
+#: client/gui-gtk-2.0/pages.c:864
msgid "_Host:"
msgstr "_Host:"
-#: client/gui-gtk-2.0/pages.c:834
+#: client/gui-gtk-2.0/pages.c:881
msgid "_Port:"
msgstr "_Puerto:"
-#: client/gui-gtk-2.0/pages.c:851
+#: client/gui-gtk-2.0/pages.c:898
msgid "_Login:"
msgstr "_Usuario:"
-#: client/gui-gtk-2.0/pages.c:869
+#: client/gui-gtk-2.0/pages.c:916
msgid "Pass_word:"
msgstr "Co_ntraseña:"
-#: client/gui-gtk-2.0/pages.c:887
+#: client/gui-gtk-2.0/pages.c:934
msgid "Conf_irm Password:"
msgstr "Conf_irme Contraseña:"
-#: client/gui-gtk-2.0/pages.c:912
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: 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/wldlg.c:800 client/gui-win32/wldlg.c:806
+msgid "Type"
+msgstr "Tipo"
+
+#: client/gui-gtk-2.0/pages.c:952 client/gui-win32/plrdlg.c:337
+#: data/Freeciv.in:88
+msgid "Host"
+msgstr "Host"
+
+#: client/gui-gtk-2.0/pages.c:981
msgid "C_onnect"
msgstr "C_onectar"
-#: client/gui-gtk-2.0/pages.c:1142
+#: client/gui-gtk-2.0/pages.c:1211
#, c-format
msgid "Connection name: %s"
msgstr "Nombre de la conexión: %s"
-#: client/gui-gtk-2.0/pages.c:1145
+#: client/gui-gtk-2.0/pages.c:1214
#, c-format
msgid "Player name: %s"
msgstr "Nombre del jugador: %s"
-#: client/gui-gtk-2.0/pages.c:1150
+#: client/gui-gtk-2.0/pages.c:1219
#, c-format
msgid "Host: %s"
msgstr "Host: %s"
-#: client/gui-gtk-2.0/pages.c:1158
+#: client/gui-gtk-2.0/pages.c:1227
msgid "Player/conn info"
msgstr "Información de jugad/conex"
-#: client/gui-gtk-2.0/pages.c:1185
+#: client/gui-gtk-2.0/pages.c:1254
#, c-format
msgid "%s info"
msgstr "Info. de %s"
-#: client/gui-gtk-2.0/pages.c:1196
+#: client/gui-gtk-2.0/pages.c:1265
msgid "Toggle player ready"
msgstr "Activa/Desact. jugador listo"
-#: client/gui-gtk-2.0/pages.c:1204
+#: client/gui-gtk-2.0/pages.c:1273
msgid "Pick nation"
msgstr "Elegir nación"
-#: client/gui-gtk-2.0/pages.c:1214
+#: client/gui-gtk-2.0/pages.c:1283
msgid "Observe this player"
msgstr "Observar a este jugador"
-#: client/gui-gtk-2.0/pages.c:1221
+#: client/gui-gtk-2.0/pages.c:1290
msgid "Take this player"
msgstr "Elegir este jugador"
-#: client/gui-gtk-2.0/pages.c:1238
+#: client/gui-gtk-2.0/pages.c:1307
msgid "Cut connection"
msgstr "Cerrar la conexión"
-#: client/gui-gtk-2.0/pages.c:1248
+#: client/gui-gtk-2.0/pages.c:1317
msgid "Aitoggle player"
msgstr "Aitoggle jugador"
-#: client/gui-gtk-2.0/pages.c:1257
+#: client/gui-gtk-2.0/pages.c:1326
msgid "Remove player"
msgstr "Eliminar jugador"
-#: client/gui-gtk-2.0/pages.c:1268
+#: client/gui-gtk-2.0/pages.c:1337
msgid "Give info access"
msgstr "Dar información de acceso"
-#: client/gui-gtk-2.0/pages.c:1276
+#: client/gui-gtk-2.0/pages.c:1345
msgid "Give ctrl access"
msgstr "Dar acceso de control"
#. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1338
+#: client/gui-gtk-2.0/pages.c:1407
#, c-format
msgid "Put on %s"
msgstr "Poner en %s"
-#: client/gui-gtk-2.0/pages.c:1442
+#: 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:"
-#: client/gui-gtk-2.0/pages.c:1465
+#: client/gui-gtk-2.0/pages.c:1534
#, fuzzy
msgid "AI Skill _Level:"
msgstr "Nivell de los Jugadores Controlados por Ordenador:"
-#: client/gui-gtk-2.0/pages.c:1481
+#: client/gui-gtk-2.0/pages.c:1550
#, fuzzy
msgid "Ruleset _Version:"
msgstr "_Ruleset:"
-#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
msgid "_More Game Options..."
msgstr "Más _Opciones del Juego..."
-#: client/gui-gtk-2.0/pages.c:1514
+#: client/gui-gtk-2.0/pages.c:1583
msgid "Record"
msgstr "Registro"
-#: client/gui-gtk-2.0/pages.c:1519
+#: client/gui-gtk-2.0/pages.c:1588
msgid "Rating"
msgstr "Grado"
-#: client/gui-gtk-2.0/pages.c:1525
+#: client/gui-gtk-2.0/pages.c:1594
msgid "Ready"
msgstr "Listo"
-#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
-#: data/nation/slovakian.ruleset:26
-msgid "Leader"
-msgstr "Líder"
+#: client/gui-gtk-2.0/pages.c:1601
+#, fuzzy
+msgid "?player:Leader"
+msgstr "Nombre:"
-#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1732 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:1752
+#: client/gui-gtk-2.0/pages.c:1824
msgid "Choose Saved Game to _Load:"
msgstr "Escoja la partida guardada a _Cargar:"
-#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
-#: client/gui-gtk-2.0/pages.c:2375
+#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
+#: client/gui-gtk-2.0/pages.c:2451
msgid "_Browse..."
msgstr "_Navegar..."
-#: client/gui-gtk-2.0/pages.c:1839
+#: client/gui-gtk-2.0/pages.c:1911
msgid "Choose a Scenario"
msgstr "Escoger un Escenario"
-#: client/gui-gtk-2.0/pages.c:1926
+#: client/gui-gtk-2.0/pages.c:1998
msgid "Choose a _Scenario:"
msgstr "Escoger un E_scenario:"
-#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
-#: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
-#: client/gui-win32/wldlg.c:806
-msgid "Type"
-msgstr "Tipo"
-
-#: client/gui-gtk-2.0/pages.c:2101
+#: client/gui-gtk-2.0/pages.c:2173
msgid "Choose a _nation to play:"
msgstr "Elige una _nación para jugar:"
-#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2363 client/gui-win32/menu.c:581
msgid "Select Location to Save"
msgstr "Elige camino para gravar"
-#: client/gui-gtk-2.0/pages.c:2372 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2448 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr "Grabar partida"
-#: client/gui-gtk-2.0/pages.c:2413
+#: client/gui-gtk-2.0/pages.c:2489
msgid "Saved _Games:"
msgstr "Partidas _Gravadas:"
-#: client/gui-gtk-2.0/pages.c:2440
+#: client/gui-gtk-2.0/pages.c:2516
msgid "Save _Filename:"
msgstr "Grabar a Nombre_Fichero:"
@@ -13079,7 +13320,7 @@ msgstr "Cerrar ventana"
msgid "Total users logged in : %d"
msgstr "Usuarios conectados : %d"
-#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1094
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
msgid "Back"
msgstr "Volver"
@@ -13088,7 +13329,7 @@ msgid "Start"
msgstr "Comenzar"
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:775
+#: client/gui-win32/connectdlg.c:777
msgid "Load Game"
msgstr "Cargar partida"
@@ -13129,12 +13370,12 @@ msgid "Make new homecity"
msgstr "Asignar a esta ciudad"
#: client/gui-sdl/citydlg.c:546 client/gui-sdl/citydlg.c:1418
-#: client/gui-sdl/connectdlg.c:307 client/gui-sdl/connectdlg.c:616
-#: client/gui-sdl/connectdlg.c:802 client/gui-sdl/connectdlg.c:984
+#: 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/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1039
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
#: 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
@@ -13184,7 +13425,7 @@ msgstr "
#: client/gui-sdl/diplodlg.c:1335 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:2427
+#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
#: client/gui-xaw/cityrep.c:666 client/gui-xaw/cma_fe.c:327
#: client/gui-xaw/cma_fe.c:511 client/gui-xaw/cma_fe.c:765
#: client/gui-xaw/messagedlg.c:72 client/gui-xaw/optiondlg.c:76
@@ -13200,7 +13441,7 @@ msgstr "No"
#: client/gui-sdl/diplodlg.c:1345 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:2427 client/gui-xaw/cityrep.c:666
+#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
#: client/gui-xaw/cma_fe.c:327 client/gui-xaw/cma_fe.c:511
#: client/gui-xaw/cma_fe.c:765 client/gui-xaw/messagedlg.c:72
#: client/gui-xaw/optiondlg.c:76 client/gui-xaw/optiondlg.c:304
@@ -13484,37 +13725,37 @@ msgstr "Aplicar una vez"
msgid "Release city"
msgstr "Dejar la ciudad"
-#: client/gui-sdl/connectdlg.c:238
+#: client/gui-sdl/connectdlg.c:239
msgid "Creating Server List..."
msgstr "Creando lista de servidores..."
-#: client/gui-sdl/connectdlg.c:279 client/gui-sdl/connectdlg.c:343
+#: client/gui-sdl/connectdlg.c:280 client/gui-sdl/connectdlg.c:344
#, fuzzy
msgid "No LAN servers found"
msgstr "Servidores LAN"
-#: client/gui-sdl/connectdlg.c:281 client/gui-sdl/connectdlg.c:345
+#: client/gui-sdl/connectdlg.c:282 client/gui-sdl/connectdlg.c:346
msgid "No public servers found"
msgstr ""
-#: client/gui-sdl/connectdlg.c:555
+#: client/gui-sdl/connectdlg.c:556
msgid "Player Name :"
msgstr "Nombre del jugador:"
-#: client/gui-sdl/connectdlg.c:571
+#: client/gui-sdl/connectdlg.c:572
msgid "Freeciv Server :"
msgstr "Servidor de Freeciv :"
-#: client/gui-sdl/connectdlg.c:588
+#: client/gui-sdl/connectdlg.c:589
msgid "Port :"
msgstr "Puerto:"
-#: client/gui-sdl/connectdlg.c:608 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr "Conectar"
-#: client/gui-sdl/connectdlg.c:794 client/gui-sdl/connectdlg.c:977
+#: client/gui-sdl/connectdlg.c:795 client/gui-sdl/connectdlg.c:978
#: client/gui-xaw/connectdlg.c:145
msgid "Next"
msgstr "Siguiente"
@@ -13796,8 +14037,8 @@ msgid "Unable to initialize SDL library: %s"
msgstr "No se ha podido inicializar la librería SDL: %s"
#: client/gui-sdl/graphics.c:1021
-#, c-format
-msgid "Unable to initialize SDL_ttf library: %s"
+#, fuzzy, c-format
+msgid "Unable to initialize SDL_ttf library: %s"
msgstr "No se ha podido inicializar la librería SDL_ttf: %s"
#: client/gui-sdl/graphics.c:1058
@@ -13889,15 +14130,6 @@ msgstr "Inicializando cliente"
msgid "Waiting for the beginning of the game"
msgstr "Esperando el inicio de la partida"
-#: client/gui-sdl/gui_string.c:608
-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"
-
#. TRANS: Future Technology
#: client/gui-sdl/gui_tilespec.c:506
msgid "FT"
@@ -14504,12 +14736,12 @@ msgid "Leave Game"
msgstr "Grabar partida"
#: client/gui-sdl/optiondlg.c:2302 client/gui-sdl/pages.c:255
-#: client/gui-win32/connectdlg.c:1098 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1100 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:963
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
msgid "Start New Game"
msgstr "Empezar una nueva partida"
@@ -14626,8 +14858,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:1081
-#: client/gui-win32/connectdlg.c:1089 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
+#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
msgid "Update"
msgstr "Actualizar"
@@ -15085,10 +15317,6 @@ msgstr "Cambiar todo"
msgid "Refresh"
msgstr "Refrescar"
-#: client/gui-win32/cityrep.c:882
-msgid "Select"
-msgstr "Seleccionar"
-
#: client/gui-win32/cityrep.c:883
msgid "Configure"
msgstr "Configurar"
@@ -15138,55 +15366,55 @@ msgstr "No se ha podido cargar la partida salvada"
msgid "Verify Password"
msgstr "Repite la contraseña"
-#: client/gui-win32/connectdlg.c:912 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr "Selección del servidor Freeciv"
-#: client/gui-win32/connectdlg.c:913
+#: client/gui-win32/connectdlg.c:915
msgid "Local Area Network"
msgstr "Red de Área Local"
-#: client/gui-win32/connectdlg.c:947
+#: client/gui-win32/connectdlg.c:949
msgid "Welcome to Freeciv"
msgstr "Bienvenidos a Freeciv"
-#: client/gui-win32/connectdlg.c:965
+#: client/gui-win32/connectdlg.c:967
msgid "Load Saved Game"
msgstr "Cargar Partida Salvada"
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
msgid "Connect To Network Game"
msgstr "Conectar a Partida en Red"
-#: client/gui-win32/connectdlg.c:977
+#: client/gui-win32/connectdlg.c:979
msgid "Choose a nation to play"
msgstr "Escoje una nación para jugar"
-#: client/gui-win32/connectdlg.c:1012
+#: client/gui-win32/connectdlg.c:1014
msgid "Number of players (Including AI):"
msgstr "Número de jugadores (incluidos los controlados por el ordenador):"
-#: client/gui-win32/connectdlg.c:1020
+#: client/gui-win32/connectdlg.c:1022
msgid "AI skill level:"
msgstr "Nivell de dificultad de Jug. Contr. por Ordenador:"
-#: client/gui-win32/connectdlg.c:1034 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
msgid "Game Options"
msgstr "Opciones de Juego"
-#: client/gui-win32/connectdlg.c:1038
+#: client/gui-win32/connectdlg.c:1040
msgid "Start Game"
msgstr "Empezando la partida"
-#: client/gui-win32/connectdlg.c:1057
+#: client/gui-win32/connectdlg.c:1059
msgid "Login:"
msgstr "Usuario:"
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
msgid "Host:"
msgstr "Host:"
-#: client/gui-win32/connectdlg.c:1060
+#: client/gui-win32/connectdlg.c:1062
msgid "Port:"
msgstr "Puerto:"
@@ -15449,10 +15677,6 @@ msgid_plural "(idle %d turns)"
msgstr[0] "(inactivo %d turno)"
msgstr[1] "(inactivo %d turnos)"
-#: client/gui-win32/plrdlg.c:337 data/Freeciv.in:88
-msgid "Host"
-msgstr "Host"
-
#: client/gui-win32/plrdlg.c:355 data/Freeciv.in:3230
msgid "Intelligence"
msgstr "Información"
@@ -17247,12 +17471,12 @@ msgstr ""
#: data/helpdata.txt:781
msgid ""
-" To have a diplomatic relationship with another player, you must fist "
-"establish first contact with that player. To establish first contact, you "
-"have to move one of your units next to a city or unit belonging to that "
-"player, or vice versa. Unless you establish an embassy with that player, you "
-"may again lose contact with them after a set number of turns without direct "
-"physical contact."
+" To have a diplomatic relationship with another player, you must first "
+"establish contact with that player. To establish contact, you have to move "
+"one of your units next to a city or unit belonging to that player, or vice "
+"versa. Unless you establish an embassy with that player, you may again lose "
+"contact with them after a set number of turns without direct physical "
+"contact."
msgstr ""
#: data/helpdata.txt:788
@@ -20134,7 +20358,7 @@ msgid "Communism"
msgstr "Comunismo"
#: data/default/governments.ruleset:121 data/civ2/governments.ruleset:118
-#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:26
+#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:27
msgid "Comrade"
msgstr "Camarada"
@@ -21119,6 +21343,11 @@ msgstr ""
"trabajo se podría perder, y un grupo de Colonos y/o Ingenieros es vulnerable "
"a los ataques enemigos."
+#: data/default/units.ruleset:238
+#, fuzzy
+msgid "?unit:Workers"
+msgstr "Obreros"
+
#: data/default/units.ruleset:264
msgid ""
"Workers are one of the key units in the game. They can be used to irrigate "
@@ -21784,6 +22013,11 @@ msgid "Explorers are very useful for mapping unknown territory."
msgstr ""
"Los Exploradores son muy útiles para explorar un territorio desconocido."
+#: data/default/units.ruleset:1864
+#, fuzzy
+msgid "?unit:Leader"
+msgstr "Líder"
+
#: data/default/units.ruleset:1892
msgid "This is you. If you lose this unit, you lose the game. So don't."
msgstr "Pues esto. Si pierdes esta unidad, tu pierdes la partida. Ten cuidado."
@@ -22054,7 +22288,7 @@ msgid "Emir"
msgstr "Emir"
#: data/nation/afghani.ruleset:25 data/nation/slovakian.ruleset:30
-#: data/nation/soviet.ruleset:27
+#: data/nation/soviet.ruleset:28
msgid "General Secretary"
msgstr "Secretario General"
@@ -22172,10 +22406,11 @@ 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 "
-"independence from Soviet in 1991 AD"
+"independence from the Soviet Union in 1991."
msgstr ""
"Según cuenta la leyenda, los Armenios son descendientes de Haik - el "
"tátaranieto de Noah. La moderna República de Armenia ganó su Independencia "
@@ -23256,13 +23491,13 @@ 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 the Dalmatians to the north, "
-"Corcyra island and Ambracia bay in prehistoric Epirus to the south, mixing "
-"with Thracians in Dardania to the east, and settling Messapia across the "
-"Adriatic Sea. Illyrian kingdoms were independent for centuries, until "
-"conquered by the Roman Republic."
+"Illyrians were Indo-European tribes who appeared in the western part of the "
+"Balkan Peninsula before 1000 BC, including Corcyra island and Ambracia bay "
+"in prehistoric Epirus to the south. They mixed with Thracians in Dardania to "
+"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 "
@@ -23603,7 +23838,7 @@ msgstr ""
"península de Corea está dividida en dos estados, Corea del Norte y Corea del "
"Sur, como resultado del acuerdo después de la guerra de Corea en el año 1953."
-#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:28
+#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:29
msgid "Great Leader"
msgstr "Gran Líder"
@@ -23776,12 +24011,13 @@ 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 "
-"called the Sahelian kingdoms. Of these, the Islamic Mali empire with it's "
+"called the Sahelian kingdoms. Of these, the Islamic Mali empire with its "
"capital in Timbuktu was the most influential. This empire reigned from the "
-"14th to the 17th century and was famed for it's wealth and benevolent kings. "
+"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 "
@@ -23853,9 +24089,10 @@ msgid "?plural:Mayas"
msgstr "Mayas"
#: data/nation/mayan.ruleset:6
+#, fuzzy
msgid ""
-"The Mayans were a Mesoamerican civilization. Famous for building great "
-"pyramids and palaces in the jungle."
+"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 "
"grandes pirámides y palacios en medio de la selva."
@@ -24413,6 +24650,16 @@ msgstr ""
"Eslovaquia es un país situado en el corazón de Europa. Formalmente, parte de "
"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"
+
#: data/nation/slovakian.ruleset:29
msgid "Pope"
msgstr "Papa"
@@ -24459,12 +24706,14 @@ msgid "?plural:Soviets"
msgstr "Soviéticos"
#: data/nation/soviet.ruleset:6
+#, fuzzy
msgid ""
-"Soviet Union's history starts in November 1917, when under Lenin's "
+"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 "
-"republics integrated into one country. Soviet Union became one of most "
-"powerful states in the 20th century. But by the end of 1991 due to many "
-"social shocks it disintegrated into fifteen independent countries"
+"republics integrated into one country. The Soviet Union became one of most "
+"powerful states in the 20th century, but by the end of 1991 it had "
+"disintegrated into fifteen independent countries due to social and economic "
+"problems."
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 "
@@ -24908,9 +25157,10 @@ msgid "?plural:Westphalians"
msgstr "Westfalianos"
#: data/nation/westphalian.ruleset:6
+#, fuzzy
msgid ""
-"Westphalia, before becoming a Prussian province, was the western region the "
-"duchy of Saxony. Present-day it consists of the Northern part of the largest "
+"Westphalia, before becoming a Prussian province, was the western region of "
+"the duchy of Saxony. Today it makes up the northern part of the largest "
"German federal state, North Rhine-Westphalia."
msgstr ""
"Westfalia, antes de ser una provincia de Prusia, fue la región oeste del "
@@ -25063,7 +25313,7 @@ msgid ""
"The flag and background color indicate what civilization the city\n"
"belongs to (this will be useful when you meet other civilizations).\n"
"The top row of the bar also shows the name and size of the city, and\n"
-"will show one or more starts to indicate if there are units in the\n"
+"will show one or more stars to indicate if there are units in the\n"
"city. The bottom row shows what the city is building, and how long it\n"
"will take; it also shows how long the city will take to grow to the\n"
"next largest size."
@@ -25119,7 +25369,7 @@ msgid ""
"Now your city has grown to size five. As cities get larger unrest\n"
"becomes a problem. A city of this size will usually have one unhappy\n"
"citizen unless pacifying effects are used; meaning one entertainer\n"
-"specialist is required to keep your citzens content. This is basically\n"
+"specialist is required to keep your citizens content. This is basically\n"
"a wasted citizen.\n"
"\n"
"There are several things that can be done about this. One quick fix\n"
@@ -25191,7 +25441,7 @@ msgid ""
"existing cities. Generally when building new cities you want to make\n"
"sure that all tiles are covered by at least one city, but after that\n"
"it is best that your cities overlap as little as possible. Spreading\n"
-"out cities properly gives each city access to more resrouces, allowing\n"
+"out cities properly gives each city access to more resources, allowing\n"
"them to grow to larger sizes."
msgstr ""
@@ -25474,6 +25724,73 @@ msgstr "Equipo 30"
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: "
@@ -25596,9 +25913,6 @@ msgstr "Equipo 31"
#~ msgid ", nation %s"
#~ msgstr ", nación %s"
-#~ msgid ", team %s"
-#~ msgstr ", equipo %s"
-
#~ msgid "_Map"
#~ msgstr "_Mapa"
@@ -26998,9 +27312,6 @@ msgstr "Equipo 31"
#~ "El último jugador que quedaba se ha desconectado: habrá que volver a "
#~ "empezar (restart)."
-#~ msgid "Metaserver topic string set to '%s'."
-#~ msgstr "Se ha establecido la cadena de información del metaservidor a '%s'."
-
#~ 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 "
diff --git a/po/et.gmo b/po/et.gmo
index 894fe70..f2b7216 100644
Binary files a/po/et.gmo and b/po/et.gmo differ
diff --git a/po/et.po b/po/et.po
index fdae11a..8404344 100644
--- a/po/et.po
+++ b/po/et.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: et\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 07:45+0900\n"
-"PO-Revision-Date: 2008-04-29 21:32+0300\n"
+"POT-Creation-Date: 2009-03-29 21:13+0900\n"
+"PO-Revision-Date: 2009-02-27 00:03+0200\n"
"Last-Translator: Elmo Todurov <todurov at gmail.com>\n"
"Language-Team: eesti\n"
"MIME-Version: 1.0\n"
@@ -637,7 +637,7 @@ msgid "Road"
msgstr "Tee"
#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
-#: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
+#: client/gui-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"
@@ -654,7 +654,7 @@ msgid "Mine"
msgstr "Kaevandus"
#: common/terrain.c:396 common/unit.c:548 server/report.c:124
-#: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
+#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr "Saast"
@@ -700,7 +700,7 @@ msgstr "Kindlustatud"
msgid "Sentry"
msgstr "Vahiteenistus"
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:851 client/gui-sdl/menu.c:648
+#: common/unit.c:566 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"
@@ -717,7 +717,7 @@ msgstr "Avasta"
msgid "Transform"
msgstr "Muuda"
-#: common/unit.c:584 client/text.c:106 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:584 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"
@@ -786,11 +786,11 @@ msgstr "Tuumapomm"
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1406
+#: common/unittype.c:349 client/helpdata.c:1404
msgid " and "
msgstr " ja "
-#: common/unittype.c:355 client/helpdata.c:1392
+#: common/unittype.c:355 client/helpdata.c:1390
msgid "?and:, "
msgstr "?and:, "
@@ -1362,9 +1362,9 @@ msgstr ""
#. TRANS: Further information about option will follow.
#: server/auth.c:170
-#, fuzzy, c-format
+#, c-format
msgid "Auth option \"%s\":"
-msgstr "Kõik seaded"
+msgstr "Autentimise seade \"%s\":"
#. TRANS: After 'Auth option "user":'. Option value
#. may have been inserted between these.
@@ -1390,40 +1390,35 @@ msgstr " (seatud)"
#: server/auth.c:234
#, c-format
msgid "Illegal value for auth port: \"%s\""
-msgstr ""
+msgstr "Vigane väärtus autentimise pordile: \"%s\""
#: server/auth.c:281
-#, fuzzy, c-format
-msgid "Auth config filename \"%s\" not allowed!"
-msgstr "See nimi pole lubatud."
-
-#: server/auth.c:286
-#, fuzzy, c-format
+#, c-format
msgid "Cannot load auth config file \"%s\"!"
-msgstr "Ei leia helifaili %s"
+msgstr "Ei suutnud laadida autentimise konfifaili \"%s\""
-#: server/auth.c:397
+#: server/auth.c:392
#, c-format
msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
msgstr "Hoiatus: külalisnimi '%s' on juba võetud, uueks nimeks saab '%s'."
-#: server/auth.c:404
+#: server/auth.c:399
msgid "Guests are not allowed on this server. Sorry."
msgstr "Siia serverisse pole külalised lubatud. Vabanda."
-#: server/auth.c:406
+#: server/auth.c:401
#, c-format
msgid "%s was rejected: Guests not allowed."
msgstr "%s-le öeldi ära. Külalisi ei lubata."
-#: server/auth.c:425
+#: server/auth.c:420
#, c-format
msgid ""
"There was an error reading the user database, logging in as guest connection "
"'%s'."
msgstr "Viga kasutajabaasi lugemisel, logib sisse külalisena '%s'."
-#: server/auth.c:431
+#: server/auth.c:426
msgid ""
"There was an error reading the user database and guest logins are not "
"allowed. Sorry"
@@ -1431,39 +1426,39 @@ msgstr ""
"Kasutajate andmebaasi lugemisel juhtus mingi viga ja külalisi ei lubata "
"seetõttu sisse. Vabanda"
-#: server/auth.c:434
+#: server/auth.c:429
#, c-format
msgid "%s was rejected: Database error and guests not allowed."
msgstr "%s-le keelduti: Andmebaasi viga ja külalised pole lubatud."
-#: server/auth.c:441
+#: server/auth.c:436
#, c-format
msgid "Enter password for %s:"
msgstr "Sisesta kasutaja %s parool:"
-#: server/auth.c:450
+#: server/auth.c:445
msgid "Enter a new password (and remember it)."
msgstr "Sisesta parool (ja jäta meelde)."
-#: server/auth.c:456
+#: server/auth.c:451
msgid "This server allows only preregistered users. Sorry."
msgstr "Siia serveri on lubatud ainult registreeritud kasutajad."
-#: server/auth.c:459
+#: server/auth.c:454
#, c-format
msgid "%s was rejected: Only preregister users allowed."
msgstr "%s-le öeldi ära. Lubatud on ainult registreeritud kasutajad."
-#: server/auth.c:488 server/auth.c:547
+#: server/auth.c:483 server/auth.c:542
msgid "Sorry, too many wrong tries..."
msgstr "Dang, liiga palju vigaseid katseid..."
-#: server/auth.c:489
+#: server/auth.c:484
#, c-format
msgid "%s was rejected: Too many wrong password verifies for new user."
msgstr "%s-le keelduti: Liiga palju uue kasutaja paroolivigu."
-#: server/auth.c:505
+#: server/auth.c:500
msgid ""
"Warning: There was an error in saving to the database. Continuing, but your "
"stats will not be saved."
@@ -1471,30 +1466,30 @@ msgstr ""
"Hoiatus: Andmebaasi salvestamine ei õnnestunud. Jätkan, kuid su statistikat "
"ei salvestata."
-#: server/auth.c:549
+#: server/auth.c:544
#, c-format
msgid "%s was rejected: Too many wrong password tries."
msgstr "%s-le öeldi ära. Liiga palju katseid parooli sisestamisel."
-#: server/auth.c:558
+#: server/auth.c:553
msgid "Your password is incorrect. Try again."
msgstr "Parool on vale. Proovi uuesti."
-#: server/auth.c:569
+#: server/auth.c:564
msgid "Sorry, your connection timed out..."
msgstr "Vabanda, su ühendus aegus..."
-#: server/auth.c:571
+#: server/auth.c:566
#, c-format
msgid "%s was rejected: Connection timeout waiting for password."
msgstr "%s-le keelduti: Ãœhendus aegus parooli ootamisel."
-#: server/auth.c:636
+#: server/auth.c:631
#, c-format
msgid "Your password is too short, the minimum length is %d. Try again."
msgstr "Parool liiga lühike, vähim pikkus on %d. Proovi uuesti."
-#: server/auth.c:642
+#: server/auth.c:637
#, c-format
msgid ""
"The password must have at least %d capital letters, %d numbers, and be at "
@@ -1933,7 +1928,7 @@ msgstr "Pole raha, et käigus hoida %s linnas %s, ehitis müüdud!"
#: server/cityturn.c:1336
#, c-format
msgid "Pollution near %s."
-msgstr "Reostus linna %s lähedal."
+msgstr "Saast linna %s lähedal."
#: server/cityturn.c:1483
#, c-format
@@ -2003,7 +1998,7 @@ msgstr "See on %s server"
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:237 manual/civmanual.c:380
+#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
@@ -2013,11 +2008,12 @@ msgstr ""
"Võimalikud võtmed on:\n"
#: server/civserver.c:208
-#, fuzzy
msgid ""
" -a --auth FILE\tEnable server authentication with configuration from "
"FILE.\n"
-msgstr " -a --auth\t\tLülita sisse serveri autentimine.\n"
+msgstr ""
+" -a --auth FAIL\tLülita sisse serveri autentimine konfiga mis tuleb "
+"FAIList.\n"
#: server/civserver.c:210
msgid " -G --Guests\t\tAllow guests to login if auth is enabled.\n"
@@ -2035,14 +2031,14 @@ msgstr ""
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:241
+#: server/civserver.c:217 client/civclient.c:242
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:245
+#: server/civserver.c:221 client/civclient.c:246
msgid " -d, --debug NUM\tSet debug log level (0 to 3)\n"
msgstr " -d, --debug NUM\tMäära logimistase (0 - 3)\n"
@@ -2050,7 +2046,7 @@ msgstr " -d, --debug NUM\tMäära logimistase (0 - 3)\n"
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:248 manual/civmanual.c:382
+#: server/civserver.c:225 client/civclient.c:249 manual/civmanual.c:382
msgid " -h, --help\t\tPrint a summary of the options\n"
msgstr " -h, --help\t\tVõtmete ülevaade\n"
@@ -2098,11 +2094,11 @@ msgstr " -r, --read FAIL\tLoe käivitusskript FAIL\n"
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:267 manual/civmanual.c:383
+#: server/civserver.c:247 client/civclient.c:268 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:279
+#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, c-format
@@ -2275,7 +2271,7 @@ msgid "Cast a vote."
msgstr "Hääleta."
#: server/commands.c:111
-#, fuzzy, no-c-format
+#, 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 "
@@ -2287,11 +2283,10 @@ 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"
"\" (ja vabatahtlikus korras ka hääletuse number) annab su hääle. Kui sa ei "
-"anna hääletuse numbrit, läheb hääl viimasesse hääletusse. Korraga saab anda "
-"ainult ühe hääle. Hääletus on automaatselt võidetud, kui rohkem kui pooled "
-"mängijad hääletavad poolt või automaatselt kaotatud, kui üle poole "
-"mängijatest hääletab vastu. Kui üks terve käik läheb mööda ja keegi ei "
-"hääleta vastu, võib hääletus võita."
+"anna hääletuse numbrit, läheb hääl viimasesse hääletusse. Korraga saab "
+"hääletusele panna ainult ühe ettepaneku. Hääletus on automaatselt võidetud, "
+"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
msgid ""
@@ -3103,46 +3098,46 @@ msgid "The %s have established an embassy in %s."
msgstr "%s avas saatkonna linnas %s."
#: server/diplomats.c:333
-#, fuzzy, c-format
+#, c-format
msgid "Your %s could not sabotage the %s %s."
-msgstr "Su %s ei suutnud saboteerida %s %s't."
+msgstr "Su %s ei suutnud saboteerida rahvuse %s üksust %s."
#: server/diplomats.c:355
-#, fuzzy, c-format
+#, c-format
msgid "Your %s succeeded in sabotaging the %s %s."
-msgstr "Su %s saboteeris linnas %s %s't."
+msgstr "Su %s saboteeris rahvuse %s üksust %s."
#. TRANS: ... the Poles!
#: server/diplomats.c:362
-#, fuzzy, c-format
+#, c-format
msgid "Your %s was sabotaged by the %s!"
-msgstr "Su %s saboteeris %s!"
+msgstr "Su %s saboteerisid %s!"
#: server/diplomats.c:411
msgid "You can't bribe a unit from this nation."
msgstr "Sa ei saa selle rahvuse üksust ära osta."
#: server/diplomats.c:422
-#, fuzzy, c-format
+#, c-format
msgid "You don't have enough gold to bribe the %s %s."
-msgstr "Sul pole piisavalt raha et osta ära %s-te %s't"
+msgstr "Sul pole piisavalt raha et osta ära rahvuse %s üksust %s."
#: server/diplomats.c:432
-#, fuzzy, c-format
+#, c-format
msgid "You cannot bribe the %s!"
-msgstr "Sa ei osta ära %s!"
+msgstr "Sa ei ära osta üksust %s!"
#. TRANS: <diplomat> ... <unit>
#: server/diplomats.c:455
-#, fuzzy, c-format
+#, c-format
msgid "Your %s succeeded in bribing the %s."
-msgstr "Su %s ostis ära %s."
+msgstr "Su %s ostis ära üksuse %s."
#. TRANS: <unit> ... <Poles>
#: server/diplomats.c:463
-#, fuzzy, c-format
+#, c-format
msgid "Your %s was bribed by the %s."
-msgstr "Su %s osteti ära %s poolt."
+msgstr "Su %s ostsid ära %s."
#: server/diplomats.c:594
#, c-format
@@ -3159,9 +3154,9 @@ msgid "Your %s was caught in the attempt of stealing technology from %s."
msgstr "Su %s jäi vahele kui püüdis varastada tehnoloogiat linnast %s."
#: server/diplomats.c:606
-#, fuzzy, c-format
+#, c-format
msgid "The %s %s failed to steal technology from %s."
-msgstr "%s'e %s ei suutnud varastada tehnoloogiat linnast %s."
+msgstr "Rahvuse %s %s ei suutnud varastada tehnoloogiat linnast %s."
#: server/diplomats.c:620
#, c-format
@@ -3254,9 +3249,9 @@ msgstr "%s hävitas %s %s-is."
#. TRANS: <unit> ... <diplomat>
#: server/diplomats.c:1091
-#, fuzzy, c-format
+#, c-format
msgid "An enemy %s has been eliminated by your %s."
-msgstr "Vaenlaste %s, kes kaitses %s-i, hävitati."
+msgstr "Vaenlase üksus %s hävitati sinu üksuse %s poolt."
#. TRANS: <unit> ... <city> ... <diplomat>
#: server/diplomats.c:1098
@@ -3266,9 +3261,9 @@ msgstr "Su %s hävitati, kui ta üritas kaitsta %s-i %s-ide vastu."
#. TRANS: <unit> ... <diplomat>
#: server/diplomats.c:1106
-#, fuzzy, c-format
+#, c-format
msgid "Your %s has been eliminated defending against a %s."
-msgstr "Su %s hävitati, kui ta üritas kaitsta %s-ide vastu."
+msgstr "Su %s langes kaitses üksuse %s vastu."
#: server/diplomats.c:1119
#, c-format
@@ -3286,25 +3281,25 @@ msgid "Eliminated %s %s while infiltrating our troops."
msgstr "Elimineeriti %s-te %s, kes üritas me üksustega midagi teha."
#: server/diplomats.c:1185
-#, fuzzy, c-format
+#, 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 %s-sse."
+msgstr "Su %s lõpetas edukalt oma missiooni ja naases vigastamatult linna %s."
#: server/diplomats.c:1204
-#, fuzzy, c-format
+#, 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
-#, fuzzy, c-format
+#, 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
-#, fuzzy, c-format
+#, c-format
msgid "You have caused an incident while bribing the %s %s."
-msgstr "Sa põhjustasid intsidendi üritades ära osta %s-te %s-t."
+msgstr "Sa põhjustasid intsidendi üritades ära osta rahvuse %s üksust %s."
#: server/diplomats.c:1247
#, c-format
@@ -3336,7 +3331,7 @@ msgstr "%s põhjustasid intsidendi, kui üritasid revolutsiooni süüdata %s-s."
msgid "Sea moving start units are not yet supported. Nobody gets %s."
msgstr "Merel sõitvad algüksused ei ole veel toetatud. Keegi ei saanud %s-t."
-#: server/gamehand.c:310 client/text.c:632
+#: server/gamehand.c:310 client/text.c:691
#, c-format
msgid "Year: %s"
msgstr "Aasta: %s"
@@ -3616,10 +3611,10 @@ 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
-#, c-format
+#, fuzzy, c-format
msgid ""
-"Your nation is thrust into civil war, %s is declared the leader of the "
-"rebel states."
+"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
@@ -3718,7 +3713,7 @@ msgstr "Teadustöö kiirus"
msgid "Literacy"
msgstr "Kirjaoskus"
-#: server/report.c:121 client/cityrepdata.c:526 client/cityrepdata.c:527
+#: server/report.c:121 client/cityrepdata.c:524 client/cityrepdata.c:525
#: client/gui-sdl/cityrep.c:174
msgid "Production"
msgstr "Toodang"
@@ -3868,7 +3863,7 @@ msgstr "."
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:766
+#: server/report.c:743 server/report.c:768
msgid "Demographics Report:"
msgstr "Demograafiline Raport:"
@@ -3876,10 +3871,12 @@ msgstr "Demograafiline Raport:"
msgid "Sorry, the Demographics report is unavailable."
msgstr "Vabandame, Demograafiline raport pole kättesaadav."
-#: server/report.c:748
-#, c-format
-msgid "The %s of the %s (%s)"
-msgstr "%s rahvusel %s (%s)"
+#. TRANS: <nation adjective> <government name> (<year>).
+#. * E.g. "Polish Despotism (200 AD)".
+#: server/report.c:750
+#, fuzzy, c-format
+msgid "%s %s (%s)"
+msgstr "%s %s-s (%s)\n"
#. TRANS: message about an installation error.
#: server/ruleset.c:163
@@ -3934,16 +3931,6 @@ msgstr ""
msgid "%s had invalid nation; changing to %s."
msgstr "%s sattus vigase rahva juhiks. Annan talle rahva %s."
-#. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4073
-#, c-format
-msgid ""
-"Illegal alliance structure detected: %s alliance to %s reduced to peace "
-"treaty."
-msgstr ""
-"Leitud vigane liitlaste struktuur: rahva %s liit rahvaga %s muudeti "
-"rahuleppeks."
-
#: server/settings.c:32
msgid "Geological"
msgstr "Geoloogia"
@@ -4469,7 +4456,7 @@ msgstr ""
"Iga leiutise eest, mille sa saad läbi diplomaatilise leppe kaotad "
"teaduspunkte nõnda palju kui on see protsent korda uue leiutise hind. Kui "
"see väärtus ei ole null, võid omada negatiivseid teaduspunkte. See seade "
-"muudab samuti kulla ülekandeid diplomaatilistes lepetes."
+"muudab samuti raha ülekandeid diplomaatilistes lepetes."
#: server/settings.c:512
msgid "Penalty when getting tech from conquering"
@@ -5130,7 +5117,7 @@ msgstr ""
" R = näita teadustöö kiirust\n"
" E = näita majandust\n"
" M = näita sõjaväeteenistust\n"
-" O = näita reostust\n"
+" O = näita saastamist\n"
"Lisaks tähistavad järgnevad tähed, kas vastavaid tulpi näidatakse või "
"mitte:\n"
" q = näita \"hulk\"-tulpa\n"
@@ -5169,9 +5156,10 @@ msgid "Auto-save name prefix"
msgstr "Automaatselt salvestatud mängu nime prefix"
#: server/settings.c:1016
+#, fuzzy
msgid ""
-"Automatically saved games will have name \"<prefix><year>.sav\". This "
-"setting sets the <prefix> part."
+"Automatically saved games will have name \"<prefix>-T<turn>-Y<year>.sav\". "
+"This setting sets the <prefix> part."
msgstr ""
"Automaatselt salvestatud mängude nimeks tuleb \"<prefix><year>.sav\". See "
"seade määrab <prefix>i."
@@ -5189,11 +5177,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:147
+#: server/sernet.c:150
msgid "Server cannot read standard input. Ignoring input."
msgstr "Server ei suuda standardsisendit lugeda. Ignoreerin sisendit."
-#: server/sernet.c:922
+#: server/sernet.c:929
#, c-format
msgid "Server: bad address: [%s:%d]."
msgstr "Server: halb aadress: [%s:%d]."
@@ -5283,16 +5271,16 @@ msgstr "Võitis meeskond %s"
#: server/srv_main.c:297 server/srv_main.c:338
#, c-format
msgid "Game ended in victory for %s"
-msgstr "Mäng lõppes %s võidiuga"
+msgstr "Mäng lõppes %s võiduga"
#: server/srv_main.c:345
msgid "Game ended in a draw"
msgstr "Mäng lõppes viigiga"
#: server/srv_main.c:461 server/srv_main.c:472
-#, fuzzy, c-format
+#, c-format
msgid "Your %s was disbanded in accordance with your peace treaty with the %s."
-msgstr "Su %s üksus lasti lahti, kuna nii nõudis rahulepe rahvusega %s."
+msgstr "Su üksus %s lasti lahti, kuna nii nõudis rahulepe rahvusega %s."
#: server/srv_main.c:512 server/srv_main.c:516
#, c-format
@@ -5314,97 +5302,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:928
+#: server/srv_main.c:961
#, c-format
msgid "Failed saving game as %s"
msgstr "Ei suutnud salvestada mängu faili %s"
-#: server/srv_main.c:930
+#: server/srv_main.c:963
#, c-format
msgid "Game saved as %s"
msgstr "Mäng salvestati faili %s."
-#: server/srv_main.c:962
+#: server/srv_main.c:994
msgid "The game is already running."
msgstr "Mäng juba käib."
-#: server/srv_main.c:970
+#: server/srv_main.c:1002
#, 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:977
+#: server/srv_main.c:1009
msgid "Starting game."
msgstr "Alustame mänguga."
-#: server/srv_main.c:1039
+#: server/srv_main.c:1071
#, c-format
msgid "request for unknown report (type %d)"
msgstr "küsiti tundmatut raportit (tüüp %d)"
-#: server/srv_main.c:1104
+#: server/srv_main.c:1136
#, c-format
msgid "Warning: rejecting old client %s"
msgstr "Hoiatus: ei luba sisse vana klienti %s"
-#: server/srv_main.c:1206
+#: server/srv_main.c:1238
#, 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:1306
+#: server/srv_main.c:1338
msgid "Please choose a non-blank name."
msgstr "Palun vali mittetühi nimi."
-#: server/srv_main.c:1322
+#: server/srv_main.c:1354
msgid "That nation is already in use."
msgstr "See rahvus on juba kasutusel."
-#: server/srv_main.c:1338
+#: server/srv_main.c:1370
#, 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:1359
+#: server/srv_main.c:1391
msgid "Please choose a name containing only ASCII characters."
msgstr "Palun vali nimi, mis sisaldab ainult ASCII märke."
-#: server/srv_main.c:1458
+#: server/srv_main.c:1490
#, c-format
msgid "%s nation is not available in this scenario."
msgstr "Rahvus %s ei ole saadaval selles stsenaariumis."
-#: server/srv_main.c:1464
+#: server/srv_main.c:1496
#, c-format
msgid "%s nation is already in use."
msgstr "Rahvus %s on juba kasutuses."
-#: server/srv_main.c:1482
+#: server/srv_main.c:1514
#, c-format
msgid "%s is the %s ruler %s."
msgstr "%s on rahvuse %s valitseja %s."
-#: server/srv_main.c:1538
+#: server/srv_main.c:1570
#, 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:1582 server/srv_main.c:1586
+#: server/srv_main.c:1614 server/srv_main.c:1618
#, 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:1728
+#: server/srv_main.c:1760
#, c-format
msgid "Player %d"
msgstr "Mängija %d"
-#: server/srv_main.c:1739 server/srv_main.c:1745
+#: server/srv_main.c:1771 server/srv_main.c:1777
#, c-format
msgid "%s rules the %s."
msgstr "%s on %s valitseja."
-#: server/srv_main.c:1910
+#: server/srv_main.c:1942
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
@@ -5412,16 +5400,16 @@ msgstr ""
"See civserver'i programm toetab mängijate autentimist, kuid see pole hetkel "
"kasutuses."
-#: server/srv_main.c:1961
+#: server/srv_main.c:1993
#, c-format
msgid "Sending info to metaserver [%s]"
msgstr "Saadan infot metaserverile [%s]"
-#: server/srv_main.c:1992
+#: server/srv_main.c:2024
msgid "The game is over..."
msgstr "Mäng on läbi..."
-#: server/srv_main.c:2205
+#: server/srv_main.c:2237
msgid "Now accepting new client connections."
msgstr "Ootan klientprogrammide ühendusi."
@@ -6228,24 +6216,24 @@ msgid "Barbarian"
msgstr "Barbar"
#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2030 client/gui-sdl/plrdlg.c:645
+#: client/gui-gtk-2.0/pages.c:2102 client/gui-sdl/plrdlg.c:645
#: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
msgid "AI"
msgstr "Tehisintellekt"
#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
+#: 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
msgid "Human"
msgstr "inimene"
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
-#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
+#: 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
msgid "Alive"
msgstr "Elus"
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
#: client/gui-win32/connectdlg.c:200
msgid "Dead"
msgstr "Surnud"
@@ -6512,9 +6500,9 @@ 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:242
-#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
-#: client/text.c:1201
+#: 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
#, c-format
msgid "?clistmore:, %s"
msgstr ", %s"
@@ -6766,7 +6754,7 @@ msgstr "Ainult %s suudab merelt rünnata."
msgid "Cannot attack from sea."
msgstr "Merelt ei saa rünnata."
-#: server/unithand.c:996 server/unittools.c:2103
+#: server/unithand.c:996 server/unittools.c:2137
msgid "Cannot attack unless you declare war first."
msgstr "Rünnata ei saa, selleks peab enne sõja kuulutama."
@@ -6863,101 +6851,102 @@ msgid "%s was upgraded for free to %s."
msgstr "Üksus %s uuendati tasuta üksuseks %s."
#: server/unittools.c:297
-#, c-format
-msgid "Not enough gold. %s disbanded"
+#, fuzzy, c-format
+msgid "Not enough gold to pay upkeep for %s. Unit disbanded."
msgstr "Raha on otsakorral. %s saadeti laiali"
-#: server/unittools.c:342
+#: server/unittools.c:343
#, c-format
msgid "Your %s has run out of hit points."
msgstr "%s hukkus elupunktide lõppemise tõttu."
-#: server/unittools.c:358
+#: server/unittools.c:359
#, c-format
msgid "Your %s has been lost on the high seas."
msgstr "Sinu %s läks avamerel põhja."
-#: server/unittools.c:365
+#: server/unittools.c:366
#, c-format
msgid "Your %s survived on the high seas and became more experienced!"
msgstr "Sinu %s sai tänu osavale seilamisele tugevamaks!"
-#: server/unittools.c:376
+#: server/unittools.c:377
#, c-format
msgid "Your %s has been lost on unsafe terrain."
msgstr "%s sai hukka, kuna rändas ringi ohtlikus piirkonnas."
-#: server/unittools.c:430
+#: server/unittools.c:431
#, c-format
msgid "Your %s has returned to refuel."
msgstr "Ãœksus %s tuli tankima."
-#: server/unittools.c:454
+#: server/unittools.c:455
#, c-format
msgid "Your %s has run out of fuel."
msgstr "Ãœksusel %s sai bensiin otsa."
-#. TRANS: And, <the unit> became ...
-#: server/unittools.c:616
-msgid "And, became more experienced!"
-msgstr " ja sai kogenumaks!"
-
#. TRANS: Your <unit> became ...
-#: server/unittools.c:620
+#: server/unittools.c:619
#, c-format
msgid "Your %s became more experienced!"
-msgstr "Ãœksus %s sai kogemust juurde!"
+msgstr "Ãœksus %s sai kogenumaks!"
-#: server/unittools.c:1011
+#: server/unittools.c:1009
#, c-format
msgid "Teleported your %s to %s."
msgstr "Sinu %s teleporditi linna %s."
-#: server/unittools.c:1041
+#. TRANS: A unit is moved to resolve stack conflicts.
+#: server/unittools.c:1065
+#, c-format
+msgid "Moved your %s."
+msgstr "Sinu üksust %s nihutati."
+
+#: server/unittools.c:1076
#, c-format
msgid "Disbanded your %s."
msgstr "Sinu %s saadeti laiali."
-#: server/unittools.c:1363
+#: server/unittools.c:1397
#, 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:1367
+#: server/unittools.c:1401
#, 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:1469
+#: server/unittools.c:1503
#, 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:1478
+#: server/unittools.c:1512
#, c-format
msgid "%s lost when %s was lost."
msgstr "Üksus %s kaotati koos üksusega %s."
-#: server/unittools.c:1527
+#: server/unittools.c:1561
#, 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:1545
+#: server/unittools.c:1579
#, 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:1554 server/unittools.c:1612
+#: server/unittools.c:1588 server/unittools.c:1646
#, 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:1588
+#: server/unittools.c:1622
#, c-format
msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
msgid_plural ""
@@ -6967,14 +6956,14 @@ msgstr[1] ""
#. TRANS: "Cannon lost when the Polish Destroyer
#. * attacked the German Musketeers."
-#: server/unittools.c:1621
+#: server/unittools.c:1655
#, 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:1636
+#: server/unittools.c:1670
#, 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."
@@ -6982,7 +6971,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:1646
+#: server/unittools.c:1680
#, 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."
@@ -6992,192 +6981,192 @@ 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:1660
+#: server/unittools.c:1694
#, 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:1928
+#: server/unittools.c:1962
#, c-format
msgid "Your %s was nuked by %s."
msgstr "Sinu linn %s sai pihta %s tuumapommiga."
-#: server/unittools.c:1931 server/unittools.c:1947
+#: server/unittools.c:1965 server/unittools.c:1981
msgid "yourself"
msgstr "iseennast"
-#: server/unittools.c:1935
+#: server/unittools.c:1969
#, fuzzy, c-format
msgid "The %s %s was nuked."
msgstr "Mängija %s %s sai tuumapommiga pihta."
-#: server/unittools.c:1944
+#: server/unittools.c:1978
#, c-format
msgid "%s was nuked by %s."
msgstr "%s sai pihta %s tuumapommiga."
-#: server/unittools.c:1952
+#: server/unittools.c:1986
#, c-format
msgid "You nuked %s."
msgstr "Sa lasid %s tuumapommiga õhku."
-#: server/unittools.c:1993
+#: server/unittools.c:2027
#, fuzzy, c-format
msgid "The %s detonated a nuke!"
msgstr "Rahvus %s lasi tuumapommi õhku!"
-#: server/unittools.c:2017
+#: server/unittools.c:2051
#, c-format
msgid "%s transported successfully."
msgstr "%s edukalt transporditud."
-#: server/unittools.c:2069
+#: server/unittools.c:2103
msgid "This unit type can not be paradropped."
msgstr "Seda tüüpi üksust ei saa langevarjutada."
-#: server/unittools.c:2079
+#: server/unittools.c:2113
msgid "You cannot paradrop a unit that is transporting other units."
msgstr "Ei saa langevarjutada üksust, mis transpordib teisi üksusi."
-#: server/unittools.c:2085
+#: server/unittools.c:2119
msgid "The destination location is not known."
msgstr "Sihtkoht on tundmatu."
-#: server/unittools.c:2092
+#: server/unittools.c:2126
#, c-format
msgid "This unit cannot paradrop into %s."
msgstr "Seda üksus ei saa langevarjutada linna %s."
-#: server/unittools.c:2112
+#: server/unittools.c:2146
#, 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:2123
+#: server/unittools.c:2157
#, c-format
msgid "Your %s paradropped into the %s and was lost."
msgstr "Su üksus %s langevarjutati linna %s ja kaotati."
-#: server/unittools.c:2136
+#: server/unittools.c:2170
#, 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:2158
+#: server/unittools.c:2192
#, c-format
msgid "You found %d gold."
msgstr "Sa leidsid %d raha."
-#: server/unittools.c:2175
+#: server/unittools.c:2209
#, c-format
msgid "You found %s in ancient scrolls of wisdom."
msgstr "Sa leidsid tehnoloogia %s iidsetest tarkuserullidest."
-#: server/unittools.c:2182
+#: server/unittools.c:2216
#, c-format
msgid "The %s have acquired %s from ancient scrolls of wisdom."
msgstr "%s leidsid tehnoloogia %s iidsetest tarkuserullidest."
-#: server/unittools.c:2196
+#: server/unittools.c:2230
msgid "A band of friendly mercenaries joins your cause."
msgstr "Jõuk sõbralikke kõrilõikajad liituvad su vägedega."
-#: server/unittools.c:2214
+#: server/unittools.c:2248
msgid "An abandoned village is here."
msgstr "Siin on mahajäetud küla."
-#: server/unittools.c:2224
+#: server/unittools.c:2258
msgid "You have unleashed a horde of barbarians!"
msgstr "Sa vallandasid barbarite hordi viha!"
-#: server/unittools.c:2227
+#: server/unittools.c:2261
#, c-format
msgid "Your %s has been killed by barbarians!"
msgstr "Barbarid lõikasid su üksuse %s kõri!"
-#: server/unittools.c:2243
+#: server/unittools.c:2277
msgid "You found a friendly city."
msgstr "Sa leidsid sõbraliku linna."
-#: server/unittools.c:2257
+#: server/unittools.c:2291
msgid "Friendly nomads are impressed by you, and join you."
msgstr "Sa vaimustasid sõbralikke nomaade, nad ühinevad sinuga."
-#: server/unittools.c:2282
+#: server/unittools.c:2316
msgid "Your overflight frightens the tribe; they scatter in terror."
msgstr "Su ülelend ehmatab hõimu, nad jooksevad paanikas laiali."
-#: server/unittools.c:2540
+#: server/unittools.c:2574
#, 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:2989
+#: server/unittools.c:3023
#, 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:3041
+#: server/unittools.c:3075
#, 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:3054
+#: server/unittools.c:3088
#, 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:3068
+#: server/unittools.c:3102
#, 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:3078
+#: server/unittools.c:3112
#, 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:3104
+#: server/unittools.c:3138
#, c-format
msgid "Orders for %s aborted because of failed move."
msgstr "Käsk üksusele %s katkestatud, kuna ei õnnestunud liikuda."
-#: server/unittools.c:3145
+#: server/unittools.c:3179
#, c-format
msgid "Attempt to change homecity for %s failed."
msgstr "Katse muuta %s kodulinna ei õnnestunud."
-#: server/unittools.c:3156
+#: server/unittools.c:3190
#, c-format
msgid "Attempt to establish trade route for %s failed."
msgstr "Katse luua kaubatee linna %s ei õnnestunud."
-#: server/unittools.c:3168
+#: server/unittools.c:3202
#, c-format
msgid "Attempt to build wonder for %s failed."
msgstr "Katse ehitada ilmaime linna %s ei õnnestunud."
-#: server/unittools.c:3177
+#: server/unittools.c:3211
#, c-format
msgid "Your %s has invalid orders."
msgstr "Su üksusel %s on vigased käsud."
-#: server/generator/mapgen.c:1737
+#: 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."
-#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
+#: server/generator/mapgen.c:1969 server/generator/mapgen.c:2039
#, c-format
msgid "Falling back to generator %d."
msgstr "Kasutan ikkagi generaatorit %d."
-#: server/generator/mapgen.c:2025
+#: server/generator/mapgen.c:2059
msgid "Generator 3 didn't place all big islands."
msgstr "Generaator 3 ei paigutanud kõiki suuri saari."
-#: server/generator/mapgen.c:2054
+#: server/generator/mapgen.c:2088
#, c-format
msgid "Generator 3 left %li landmass unplaced."
msgstr "Generaator 3 jättis %li maad paigutamata."
@@ -7284,7 +7273,7 @@ msgid_plural "%3d turns"
msgstr[0] "%3d käik"
msgstr[1] "%3d käiku"
-#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:631
#: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
@@ -7402,342 +7391,342 @@ msgstr "?city_state:Rahu"
msgid "(worklist)"
msgstr "(tööde nimekiri)"
-#: client/cityrepdata.c:447
-msgid "Special"
-msgstr "Spetsiaal"
+#: client/cityrepdata.c:446
+msgid "?city:Name"
+msgstr "?city:Nimi"
-#: client/cityrepdata.c:448
-msgid "?entertainers/scientists/taxmen:E/S/T"
-msgstr "?entertainers/scientists/taxmen:E/T/M"
+#: client/cityrepdata.c:446 client/gui-sdl/cityrep.c:169
+msgid "City Name"
+msgstr "Linna nimi"
-#: client/cityrepdata.c:449
-msgid "Entertainers, Scientists, Taxmen"
-msgstr "Esinejad, Teadlased, Maksukogujad"
+#: client/cityrepdata.c:448
+msgid "?size [short]:Sz"
+msgstr "?size [short]:Ss"
-#: client/cityrepdata.c:452
-#, fuzzy
-msgid "Concise + Rapture, - Disorder"
-msgstr "+ Joovastus, - Rahutused"
+#: client/cityrepdata.c:448
+msgid "Size"
+msgstr "Suurus"
-#: client/cityrepdata.c:454 client/plrdlg_common.c:261
+#: client/cityrepdata.c:450 client/plrdlg_common.c:261
#: client/gui-win32/plrdlg.c:337
msgid "State"
msgstr "Staatus"
-#: client/cityrepdata.c:454
+#: client/cityrepdata.c:450
msgid "Rapture/Peace/Disorder"
msgstr "Joovastus/Rahu/Rahutused"
+#: client/cityrepdata.c:452
+#, fuzzy
+msgid "Concise *=Rapture, X=Disorder"
+msgstr "+ Joovastus, - Rahutused"
+
+#: client/cityrepdata.c:456
+msgid "Special"
+msgstr "Spetsiaal"
+
#: client/cityrepdata.c:457
+msgid "?entertainers/scientists/taxmen:E/S/T"
+msgstr "?entertainers/scientists/taxmen:E/T/M"
+
+#: client/cityrepdata.c:458
+msgid "Entertainers, Scientists, Taxmen"
+msgstr "Esinejad, Teadlased, Maksukogujad"
+
+#: client/cityrepdata.c:461
msgid "?Happy workers:H"
msgstr "?Happy workers:Õ"
-#: client/cityrepdata.c:457
+#: client/cityrepdata.c:461
msgid "Workers: Happy"
msgstr "Töölised: õnnelikud"
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
msgid "?Content workers:C"
msgstr "?Content workers:R"
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
msgid "Workers: Content"
msgstr "Töölised: Rahul"
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
msgid "?Unhappy workers:U"
msgstr "?Unhappy workers:K"
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
msgid "Workers: Unhappy"
msgstr "Töölised: Kurvad"
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
msgid "?Angry workers:A"
msgstr "?Angry workers:V"
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
msgid "Workers: Angry"
msgstr "Töölised: vihased"
-#: client/cityrepdata.c:465 client/gui-xaw/citydlg.c:2401
-#: data/default/units.ruleset:238
-msgid "Workers"
+#: client/cityrepdata.c:469 client/gui-xaw/citydlg.c:2402
+#, fuzzy
+msgid "?city:Workers"
msgstr "Töölised"
-#: client/cityrepdata.c:466
+#: client/cityrepdata.c:470
msgid "?happy/content/unhappy/angry:H/C/U/A"
msgstr "?happy/content/unhappy/angry:Õ/R/K/V"
-#: client/cityrepdata.c:467
+#: client/cityrepdata.c:471
msgid "Workers: Happy, Content, Unhappy, Angry"
msgstr "Töölised: Õnnelikud, Rahul, Õnnetud, Vihased"
-#: client/cityrepdata.c:470 client/cityrepdata.c:472
+#: client/cityrepdata.c:474 client/cityrepdata.c:476
msgid "Best"
msgstr "Parimad"
-#: client/cityrepdata.c:470
+#: client/cityrepdata.c:474
msgid "attack"
msgstr "ründe"
-#: client/cityrepdata.c:471
+#: client/cityrepdata.c:475
msgid "Best attacking units"
msgstr "Parimad ründeüksused"
-#: client/cityrepdata.c:472
+#: client/cityrepdata.c:476
msgid "defense"
msgstr "kaitse"
-#: client/cityrepdata.c:473
+#: client/cityrepdata.c:477
msgid "Best defending units"
msgstr "Parimad kaitseüksused"
-#: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
-#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
-#: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
-#: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
-#: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
-#: client/gui-win32/menu.c:351 client/gui-win32/repodlgs.c:616
-#: client/gui-win32/repodlgs.c:707 client/gui-win32/repodlgs.c:716
-#: client/gui-xaw/menu.c:157 client/gui-xaw/menu.c:219
-#: client/gui-xaw/menu.c:242 client/gui-xaw/repodlgs.c:881
-#: client/gui-xaw/repodlgs.c:1069 data/Freeciv.in:1895 data/helpdata.txt:909
+#: client/cityrepdata.c:478 client/cityrepdata.c:482
+#: client/gui-gtk-2.0/cityrep.c:1437 client/gui-gtk-2.0/cityrep.c:1456
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-gtk-2.0/cityrep.c:1494
+#: client/gui-gtk-2.0/cityrep.c:1514 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/repodlgs.c:960 client/gui-sdl/helpdlg.c:688
+#: client/gui-sdl/mapctrl.c:1605 client/gui-sdl/optiondlg.c:1827
+#: client/gui-sdl/repodlgs.c:356 client/gui-win32/menu.c:351
+#: client/gui-win32/repodlgs.c:616 client/gui-win32/repodlgs.c:707
+#: client/gui-win32/repodlgs.c:716 client/gui-xaw/menu.c:157
+#: client/gui-xaw/menu.c:219 client/gui-xaw/menu.c:242
+#: client/gui-xaw/repodlgs.c:881 client/gui-xaw/repodlgs.c:1069
+#: data/Freeciv.in:1895 data/helpdata.txt:909
msgid "Units"
msgstr "Ãœksused"
#. TRANS: Header "Number of units inside city"
-#: client/cityrepdata.c:476
+#: client/cityrepdata.c:480
msgid "?Present (units):Here"
msgstr ""
-#: client/cityrepdata.c:477
+#: client/cityrepdata.c:481
msgid "Number of units present"
msgstr "Kohalolevad väed"
#. TRANS: Header "Number of units supported by given city"
-#: client/cityrepdata.c:480
+#: client/cityrepdata.c:484
msgid "?Supported (units):Owned"
msgstr ""
-#: client/cityrepdata.c:481
+#: client/cityrepdata.c:485
msgid "Number of units supported"
msgstr "Toetatud üksuste arv"
#. TRANS: Header "It will take this many turns before city grows"
-#: client/cityrepdata.c:484
+#: client/cityrepdata.c:488
msgid "?food (population):Grow"
msgstr "?food (population):Kasvab"
-#: client/cityrepdata.c:485 client/cityrepdata.c:530
+#: client/cityrepdata.c:489 client/cityrepdata.c:528
msgid "?Stock/Target:(Have/Need)"
msgstr "?Stock/Target:(On/Vaja)"
-#: client/cityrepdata.c:486
+#: client/cityrepdata.c:490
msgid "Turns until growth/famine"
msgstr "Käike kasvamise/näljani"
-#: client/cityrepdata.c:488
-msgid "?size [short]:Sz"
-msgstr "?size [short]:Ss"
-
-#: client/cityrepdata.c:488
-msgid "Size"
-msgstr "Suurus"
-
-#: client/cityrepdata.c:492
-msgid "?city:Name"
-msgstr "?city:Nimi"
-
-#: client/cityrepdata.c:492 client/gui-sdl/cityrep.c:169
-msgid "City Name"
-msgstr "Linna nimi"
-
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
msgid "Surplus"
msgstr "Ülejääk"
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
msgid "?food/production/trade:F/P/T"
msgstr "?food/production/trade:T/Tm/K"
-#: client/cityrepdata.c:496
+#: client/cityrepdata.c:494
msgid "Surplus: Food, Production, Trade"
msgstr "Ülejääk: Toit, Tootmine, Kaubandus"
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
msgid "?Food surplus [short]:+F"
msgstr "?Food surplus [short]:+T"
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
msgid "Surplus: Food"
msgstr "Jääk: Toit"
-#: client/cityrepdata.c:500
+#: client/cityrepdata.c:498
msgid "?Production surplus [short]:+P"
msgstr "?Production surplus [short]:+Tm"
-#: client/cityrepdata.c:501
+#: client/cityrepdata.c:499
msgid "Surplus: Production"
msgstr "Ülejääk: Tootmine"
-#: client/cityrepdata.c:502
+#: client/cityrepdata.c:500
msgid "?Production loss (waste) [short]:-P"
msgstr "?Production loss (waste) [short]:-Tm"
-#: client/cityrepdata.c:503
+#: client/cityrepdata.c:501
msgid "Waste"
msgstr "Jäätmed"
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
msgid "?Trade surplus [short]:+T"
msgstr "?Trade surplus [short]:+K"
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
msgid "Surplus: Trade"
msgstr "Ülejääk: Taubandus"
-#: client/cityrepdata.c:506
+#: client/cityrepdata.c:504
msgid "?Trade loss (corruption) [short]:-T"
msgstr "?Trade loss (corruption) [short]:-K"
-#: client/cityrepdata.c:507
+#: client/cityrepdata.c:505
msgid "Corruption"
msgstr "Korruptsioon"
-#: client/cityrepdata.c:509 client/gui-gtk-2.0/repodlgs.c:654
+#: client/cityrepdata.c:507 client/gui-gtk-2.0/repodlgs.c:654
#: client/gui-sdl/mapctrl.c:1400 client/gui-win32/repodlgs.c:334
#: client/gui-xaw/menu.c:222 client/gui-xaw/repodlgs.c:644
#: client/gui-xaw/repodlgs.c:773 data/Freeciv.in:1819
msgid "Economy"
msgstr "Majandus"
-#: client/cityrepdata.c:509
+#: client/cityrepdata.c:507
msgid "?gold/luxury/science:G/L/S"
msgstr "?gold/luxury/science:K/H/T"
-#: client/cityrepdata.c:510
+#: client/cityrepdata.c:508
msgid "Economy: Gold, Luxuries, Science"
msgstr "Majandus: Kuld, Hüved, Teadus"
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
msgid "?Gold:G"
msgstr "?Gold:K"
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
msgid "Economy: Gold"
msgstr "Majandus: Kuld"
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
msgid "?Luxury:L"
msgstr "?Hüved:L"
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
msgid "Economy: Luxury"
msgstr "Majandus: Hüved"
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
msgid "?Science:S"
msgstr "?Science:T"
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
msgid "Economy: Science"
msgstr "Majandus: Teadus"
-#: client/cityrepdata.c:518
+#: client/cityrepdata.c:516
#, fuzzy
msgid "?number_trade_routes:n"
msgstr "K"
-#: client/cityrepdata.c:518
+#: client/cityrepdata.c:516
#, fuzzy
msgid "?number_trade_routes:R"
msgstr "a"
-#: client/cityrepdata.c:519
+#: client/cityrepdata.c:517
msgid "Number of Trade Routes"
msgstr "Kaubateede arv"
-#: client/cityrepdata.c:521
+#: client/cityrepdata.c:519
msgid "?pollution [short]:Pol"
msgstr "?pollution [short]:Sst"
-#: client/cityrepdata.c:523
+#: client/cityrepdata.c:521
msgid "?cma:Governor"
msgstr "?cma:Linnapea"
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
-#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
-#: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
-#: data/Freeciv.in:1459 data/helpdata.txt:820
+#: client/cityrepdata.c:521 client/gui-gtk-2.0/cityrep.c:1766
+#: client/gui-sdl/citydlg.c:3809 client/gui-sdl/cma_fe.c:858
+#: client/gui-win32/citydlg.c:726 data/Freeciv.in:1459 data/helpdata.txt:820
msgid "Citizen Governor"
msgstr "Linnapea"
-#: client/cityrepdata.c:526
+#: client/cityrepdata.c:524
msgid "Turns/Buy"
msgstr "Käike/Hind"
-#: client/cityrepdata.c:529 client/cityrepdata.c:531
+#: client/cityrepdata.c:527 client/cityrepdata.c:529
msgid "Currently Building"
msgstr "Hetkel ehitamisel"
-#: client/cityrepdata.c:575
+#: client/cityrepdata.c:573
msgid "?specialist:S"
msgstr "?specialist:S"
-#: client/cityrepdata.c:578
+#: client/cityrepdata.c:576
msgid "Specialists"
msgstr "Spetsialistid"
-#: client/civclient.c:239
+#: client/civclient.c:240
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr " -a, --autoconnect\tÄra näita ühendumisdialoogi\n"
-#: client/civclient.c:249
+#: client/civclient.c:250
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:251
+#: client/civclient.c:252
msgid " -m, --meta HOST\tConnect to the metaserver at HOST\n"
msgstr " -m, --meta AADRESS\tÃœhenda metaserveriga aadressil AADRESS\n"
-#: client/civclient.c:253
+#: client/civclient.c:254
msgid " -n, --name NAME\tUse NAME as name\n"
msgstr " -n, --name NIMI\tKasuta NIME oma nimena\n"
-#: client/civclient.c:255
+#: client/civclient.c:256
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:257
+#: client/civclient.c:258
#, 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:259
+#: client/civclient.c:260
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:262
+#: client/civclient.c:263
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:264
+#: client/civclient.c:265
msgid " -S, --Sound FILE\tRead sound tags from FILE\n"
msgstr " -s, --sound FAIL\tLoe hääleinfo failist FAIL\n"
-#: client/civclient.c:265
+#: client/civclient.c:266
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:268
+#: client/civclient.c:269
#, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -7747,144 +7736,154 @@ msgstr ""
"\t\t\tProovi \"%s -- --help\" lisainfo saamiseks.\n"
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:273
+#: client/civclient.c:274
#, fuzzy, c-format
msgid "Report bugs at %s\n"
msgstr "Teata vigadest aadressile %s.\n"
-#: client/civclient.c:297
+#: client/civclient.c:298
#, 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:299 client/civclient.c:314
+#: client/civclient.c:300 client/civclient.c:315
msgid "Try using --help.\n"
msgstr "Proovi --help.\n"
-#: client/civclient.c:312
+#: client/civclient.c:313
#, 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:325
+#: client/civclient.c:326
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr "Tundmatu võti: \"%s\"\n"
-#: client/civclient.c:539
+#: client/civclient.c:391
+#, fuzzy, c-format
+msgid "Updating old metaserver address \"%s\"."
+msgstr "metaserver <aadress>"
+
+#: client/civclient.c:394
+#, fuzzy, c-format
+msgid "Default metaserver has been set to \"%s\"."
+msgstr "Seade: %s seati \"%s\"."
+
+#: client/civclient.c:550
msgid "Game started."
msgstr "Mäng algas."
-#: client/civclient.c:577
+#: client/civclient.c:588
msgid "There was an error while auto connecting; aborting."
msgstr "Automaatse ühendamise käigus tekkis viga; katkestan ühendamise."
-#: client/climisc.c:176
-#, fuzzy, c-format
+#: client/climisc.c:177
+#, c-format
msgid "Changing production of every %s into %s."
-msgstr "%s asemel hakatakse tootma %s."
+msgstr "Iga %s asemel hakatakse tootma %s."
-#: client/climisc.c:214
+#: client/climisc.c:215
msgid "?embassy:Both"
msgstr "?embassy:Mõlemal"
-#: client/climisc.c:216
+#: client/climisc.c:217
msgid "?embassy:Yes"
msgstr "?embassy:Jah"
-#: client/climisc.c:219
+#: client/climisc.c:220
msgid "?embassy:With Us"
msgstr "?embassy:Meiega"
-#: client/climisc.c:222
+#: client/climisc.c:223
msgid "?embassy:Contact"
msgstr "?embassy:Kontakt"
-#: client/climisc.c:224
+#: client/climisc.c:225
msgid "?embassy:No Contact"
msgstr "?embassy:Kontakt puudub"
-#: client/climisc.c:236
+#: client/climisc.c:237
msgid "?vision:Both"
msgstr "?vision:Mõlemal"
-#: client/climisc.c:238
+#: client/climisc.c:239
msgid "?vision:To Them"
msgstr "?vision:Neile"
-#: client/climisc.c:241
+#: client/climisc.c:242
msgid "?vision:To Us"
msgstr "?vision:Meile"
-#: client/climisc.c:257 client/climisc.c:264
+#: client/climisc.c:258 client/climisc.c:265
#, c-format
msgid "The %s give %s"
msgstr "%s annavad %s"
-#: client/climisc.c:268
+#: client/climisc.c:269
#, c-format
msgid "The %s give unknown city."
msgstr "%s annavad tundmatu linna."
-#: client/climisc.c:273
+#: client/climisc.c:274
#, c-format
msgid "The %s give %d gold"
msgstr "%s annavad %d raha"
-#: client/climisc.c:278
+#: client/climisc.c:279
#, c-format
msgid "The %s give their worldmap"
msgstr "%s annavad oma maakaardi."
-#: client/climisc.c:282
+#: client/climisc.c:283
#, c-format
msgid "The %s give their seamap"
msgstr "%s annavad oma merekaardi"
-#: client/climisc.c:286
+#: client/climisc.c:287
msgid "The parties agree on a cease-fire"
msgstr "Osapooled teevad vaherahu"
-#: client/climisc.c:289
+#: client/climisc.c:290
msgid "The parties agree on a peace"
msgstr "Osapooled sõlmivad rahu"
-#: client/climisc.c:292
+#: client/climisc.c:293
msgid "The parties create an alliance"
msgstr "Osapooled loovad alliantsi"
-#: client/climisc.c:295
+#: client/climisc.c:296
#, c-format
msgid "The %s give shared vision"
msgstr "%s annavad jagatud vaate"
-#: client/climisc.c:299
+#: client/climisc.c:300
#, c-format
msgid "The %s give an embassy"
msgstr "%s annavad saatkonna"
-#: client/climisc.c:902
+#: client/climisc.c:906
msgid "Popup Request"
msgstr ""
-#: client/climisc.c:932
+#: client/climisc.c:936
msgid "Exporting output window to civgame.log ..."
msgstr "Ekspordin väljundakna sisu faili civgame.log ..."
-#: client/climisc.c:936
+#: client/climisc.c:940
msgid "Export complete."
msgstr "Eksportimine valmis."
-#: client/climisc.c:938
+#: client/climisc.c:942
msgid "Export failed, couldn't write to file."
msgstr "Eksportimine ebaõnnestus, ei suutnud kirjutada faili."
-#: client/climisc.c:1038
+#: client/climisc.c:1042
#, c-format
msgid "You don't buy %s in %s!"
msgstr ""
-#: client/climisc.c:1056
+#: client/climisc.c:1060
#, c-format
msgid "%s costs %d gold and you only have %d gold."
msgstr "%s maksab %d raha, aga meil on ainult %d raha."
@@ -7933,19 +7932,19 @@ msgstr ""
"Automaatselt ühendun serveri \"%s\" porti %d mängijana \"%s\" iga %f sekundi "
"takka %d korda"
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1289
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
msgid "novice"
msgstr "algaja"
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1289
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1358
msgid "easy"
msgstr "kerge"
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1290
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
msgid "normal"
msgstr "tavaline"
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1290
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
msgid "hard"
msgstr "raske"
@@ -7974,38 +7973,42 @@ msgid "We probably couldn't start it from here."
msgstr ""
#: client/connectdlg_common.c:470
-msgid "We have control of the server (command access level hack)"
+#, 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
-msgid "We can't take control of server, attempting to kill it."
-msgstr "Me ei saa serveri üle võimu, üritan maha tappa."
+msgid ""
+"Failed to obtain the required access level to take control of the server. "
+"The server will now be shutdown."
+msgstr ""
-#: client/control.c:1104
+#: client/control.c:1123
msgid "Only transporter units can be unloaded."
msgstr "Ainult transportivaid aluseid saab tühjaks laadida."
-#: client/control.c:1353
+#: client/control.c:1425
msgid "Only settler units can be put into auto mode."
msgstr "Ainult asunikke saab panna automaatrežiimi."
-#: client/control.c:1444
+#: client/control.c:1516
msgid "Only nuclear units can do this."
msgstr "Ainult tuumarelvad saavad seda teha."
-#: client/control.c:1473
+#: client/control.c:1545
msgid "Only paratrooper units can do this."
msgstr "Ainult langevarjurid saavad seda teha."
-#: client/control.c:1921
+#: client/control.c:2020
msgid "Too far for this unit."
msgstr "Liiga kaugel selle üksuse jaoks."
-#: client/control.c:2131 client/control.c:2161 client/control.c:2177
+#: client/control.c:2230 client/control.c:2260 client/control.c:2276
msgid "Didn't find a route to the destination!"
msgstr "Sihtkohani ei leidnud teed."
-#: client/control.c:2221
+#: client/control.c:2320
msgid "Oh my! You seem to have no capital!"
msgstr "Jama! Sul vist polegi pealinna!"
@@ -8018,46 +8021,34 @@ msgid "(Railroads and fortresses require 3 turns, regardless of terrain.)"
msgstr "(Raudteede ja kindlustuste peale läheb 3 käiku, sõltumata maastikust.)"
#: client/helpdata.c:169
-#, fuzzy, c-format
+#, c-format
msgid "Requires the %s technology.\n"
-msgstr ""
-"Vajab tehnoloogiat %s.\n"
-"\n"
+msgstr "Vajab tehnoloogiat %s.\n"
#: client/helpdata.c:173
-#, fuzzy, c-format
+#, c-format
msgid "Requires the %s government.\n"
-msgstr ""
-"Vajab valitsusvormi %s\n"
-"\n"
+msgstr "Vajab valitsusvormi %s\n"
#: client/helpdata.c:177
-#, fuzzy, c-format
+#, c-format
msgid "Requires the %s building.\n"
-msgstr ""
-"Vajab ehitist %s.\n"
-"\n"
+msgstr "Vajab ehitist %s.\n"
#: client/helpdata.c:181
-#, fuzzy, c-format
+#, c-format
msgid "Requires the %s terrain special.\n"
-msgstr ""
-"Vajab maastiku eripära %s.\n"
-"\n"
+msgstr "Vajab maastiku eripära %s.\n"
#: client/helpdata.c:185
-#, fuzzy, c-format
+#, c-format
msgid "Requires the %s terrain.\n"
-msgstr ""
-"Vajab maastikku %s.\n"
-"\n"
+msgstr "Vajab maastikku %s.\n"
#: client/helpdata.c:189
-#, fuzzy, c-format
+#, c-format
msgid "Requires the %s nation.\n"
-msgstr ""
-"Vajab rahvust %s.\n"
-"\n"
+msgstr "Vajab rahvust %s.\n"
#: client/helpdata.c:193 client/helpdata.c:197 client/helpdata.c:201
#, fuzzy, c-format
@@ -8089,16 +8080,16 @@ msgid "Allows %s (with %s)."
msgstr "Võimaldab ehitada %s (kui on olemas %s)."
#. TRANS: preserve single space at beginning
-#: client/helpdata.c:418
+#: client/helpdata.c:416
msgid " Rivers"
msgstr " Jõed"
-#: client/helpdata.c:576
+#: client/helpdata.c:574
#, c-format
msgid "Sorry, no help topic for %s.\n"
msgstr "Kahjuks pole lisainfot teemal %s.\n"
-#: client/helpdata.c:580
+#: client/helpdata.c:578
#, c-format
msgid ""
"Sorry, no help topic for %s.\n"
@@ -8109,7 +8100,7 @@ msgstr ""
"See leht on automaatselt loodud.\n"
"\n"
-#: client/helpdata.c:670
+#: client/helpdata.c:668
#, fuzzy
msgid ""
"Requires: Nothing\n"
@@ -8118,79 +8109,79 @@ msgstr ""
"Vajab ehitist %s.\n"
"\n"
-#: client/helpdata.c:675
+#: client/helpdata.c:673
#, c-format
msgid "* The discovery of %s will make %s obsolete.\n"
msgstr "* Teaduse %s avastamine muudab iganenuks teaduse %s.\n"
-#: client/helpdata.c:694
+#: client/helpdata.c:692
#, c-format
msgid "* Allows all players with knowledge of %s to build %s units.\n"
msgstr "* Võimaldab mängijal, kes omab teadust %s, ehitada %s.\n"
-#: client/helpdata.c:706
+#: client/helpdata.c:704
#, c-format
msgid "* Allows %s (with %s).\n"
msgstr "* Võimaldab %s (kui on %s).\n"
-#: client/helpdata.c:710
+#: client/helpdata.c:708
#, c-format
msgid "* Allows %s.\n"
msgstr "* Võimaldab %s.\n"
-#: client/helpdata.c:780
+#: client/helpdata.c:778
#, c-format
msgid "* Can only be built if there is %s in the city.\n"
msgstr "* Saab ehitada, kui linnas on olemas %s.\n"
-#: client/helpdata.c:786
+#: client/helpdata.c:784
#, c-format
msgid "* Can only be built with %s as government.\n"
msgstr "* Saab ehitada, kui valitsuseks on %s.\n"
-#: client/helpdata.c:791
+#: client/helpdata.c:789
msgid "* May not be built in cities.\n"
msgstr "* Ei saa ehitada linnadesse.\n"
-#: client/helpdata.c:794
+#: client/helpdata.c:792
msgid "* Never has a home city.\n"
msgstr "* Ei oma kodulinna.\n"
-#: client/helpdata.c:797
+#: client/helpdata.c:795
msgid "* Losing this unit will lose you the game!\n"
msgstr "* Selle üksuse kaotamisel kaotad kogu mängu!\n"
-#: client/helpdata.c:801
+#: client/helpdata.c:799
msgid "* Each player may only have one of this type of unit.\n"
msgstr "* Seda tüüpi üksusi võib igal mängijal olla vaid üks.\n"
-#: client/helpdata.c:805
+#: client/helpdata.c:803
#, c-format
msgid "* Requires %d population to build.\n"
msgstr "* Vajab ehitamiseks rahvaarvu %d.\n"
-#: client/helpdata.c:811
+#: client/helpdata.c:809
#, c-format
msgid "* Can carry and refuel %d air unit.\n"
msgid_plural "* Can carry and refuel %d air units.\n"
msgstr[0] "* Saab kanda ja tankida %d õhuüksust.\n"
msgstr[1] "* Saab kanda ja tankida %d õhuüksust.\n"
-#: client/helpdata.c:816
+#: client/helpdata.c:814
#, c-format
msgid "* Can carry and refuel %d missile unit.\n"
msgid_plural "* Can carry and refuel %d missile units.\n"
msgstr[0] "* Suudab kanda ja tankida %d raketi.\n"
msgstr[1] "* Suudab kanda ja tankida %d raketti.\n"
-#: client/helpdata.c:821
+#: client/helpdata.c:819
#, c-format
msgid "* Can carry %d ground unit across water.\n"
msgid_plural "* Can carry %d ground units across water.\n"
msgstr[0] "* Saab kanda %d üksuse üle vee.\n"
msgstr[1] "* Saab kanda %d üksuse üle vee.\n"
-#: client/helpdata.c:830
+#: client/helpdata.c:828
msgid ""
"* Can establish trade routes (must travel to target city and must be at "
"least 9 tiles [in Manhattan distance] from this unit's home city).\n"
@@ -8198,164 +8189,164 @@ msgstr ""
"* Saab luua kaubateid (selleks peab rändama mõnda linna, mis asub üksuse "
"kodulinnast vähemalt 9 ruudukese kaugusel.\n"
-#: client/helpdata.c:836
+#: client/helpdata.c:834
#, c-format
msgid "* Can help build wonders (adds %d production).\n"
msgstr ""
"* Saab aidata kaasa ilmaimede ehitamisele (lisab toodangusse %d ühikut).\n"
-#: client/helpdata.c:840
+#: client/helpdata.c:838
msgid "* May not be disbanded.\n"
msgstr "* Ei saa laiali saata.\n"
-#: client/helpdata.c:842
+#: client/helpdata.c:840
#, c-format
msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
msgstr "* Linnas laiali saates annab tagasi 50%% toodangukuludest.\n"
-#: client/helpdata.c:846
+#: client/helpdata.c:844
msgid "* Can build new cities.\n"
msgstr "* Saab ehitada uusi linnu.\n"
-#: client/helpdata.c:849
+#: client/helpdata.c:847
#, c-format
msgid "* Can add on %d population to cities of no more than size %d.\n"
msgstr "* Võib lisada %d rahvaarvule linnades, mille suurus on ülimalt %d.\n"
-#: client/helpdata.c:858
+#: client/helpdata.c:856
msgid "* Can build roads and railroads.\n"
msgstr "* Saab ehitada teid ja raudteid.\n"
-#: client/helpdata.c:859
+#: client/helpdata.c:857
msgid "* Can build mines on tiles.\n"
msgstr "* Saab ehitada kaevandusi.\n"
-#: client/helpdata.c:860
+#: client/helpdata.c:858
msgid "* Can build irrigation on tiles.\n"
msgstr "* Saab ehitada niisutust.\n"
-#: client/helpdata.c:865
+#: client/helpdata.c:863
msgid "* Can build farmland.\n"
msgstr "* Saab ehitada põllumaad.\n"
-#: client/helpdata.c:869
+#: client/helpdata.c:867
#, c-format
msgid "* Can build farmland (if %s is known).\n"
msgstr "* Saab ehitada põllumaad (kui on teada %s).\n"
-#: client/helpdata.c:873
+#: client/helpdata.c:871
#, c-format
msgid "* Can build farmland (if any of the following are known: %s).\n"
msgstr "* Saab ehitada põllumaad (kui on teada üks järgnevaist: %s).\n"
-#: client/helpdata.c:881
+#: client/helpdata.c:879
msgid "* Can build fortresses.\n"
msgstr "* Saab ehitada kindlusi.\n"
-#: client/helpdata.c:885
+#: client/helpdata.c:883
#, c-format
msgid "* Can build fortresses (if %s is known).\n"
msgstr "* Saab ehitada kindlusi (kui on olemas %s).\n"
-#: client/helpdata.c:889
+#: client/helpdata.c:887
#, c-format
msgid "* Can build fortresses (if any of the following are known: %s).\n"
msgstr "* Saab ehitada kindlusi (kui üks järgnevatest on olemas: %s).\n"
-#: client/helpdata.c:895
+#: client/helpdata.c:893
msgid "* Can clean pollution from tiles.\n"
-msgstr "* Võib ruutudelt eemaldada reostust.\n"
+msgstr "* Võib ruutudelt eemaldada saasta.\n"
-#: client/helpdata.c:896
+#: client/helpdata.c:894
msgid "* Can clean nuclear fallout from tiles.\n"
msgstr "* Võib puhastada kaardiruute tuumajäätmetest.\n"
-#: client/helpdata.c:899
+#: client/helpdata.c:897
msgid "* Can transform tiles.\n"
msgstr "* Võib muuta kaardiruute.\n"
-#: client/helpdata.c:902
+#: client/helpdata.c:900
msgid "* Can build airbases.\n"
msgstr "* Võib ehitada lennubaase.\n"
-#: client/helpdata.c:906
+#: client/helpdata.c:904
#, c-format
msgid "* May fortify, granting a 50%% defensive bonus.\n"
msgstr "* Võib ehitada kindlustusi, lisades 50%% kaitseboonust.\n"
-#: client/helpdata.c:909
+#: client/helpdata.c:907
msgid "* May pillage to destroy infrastructure from tiles.\n"
msgstr "* Võib ruudukesi infrastruktuuri hävitamiseks rüüstada.\n"
-#: client/helpdata.c:913
+#: client/helpdata.c:911
msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
msgstr "* Oskab lisaks diplomaatilistele tegevustele ka spiooni tegevusi.\n"
-#: client/helpdata.c:916
+#: client/helpdata.c:914
msgid "* Can perform diplomatic actions.\n"
msgstr "* Saab diplomaatilisi tegevusi teha.\n"
-#: client/helpdata.c:920
+#: client/helpdata.c:918
msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
msgstr "* Ei kaota kunagi diplomaat-vs-diplomaat võitlust.\n"
-#: client/helpdata.c:923
+#: client/helpdata.c:921
msgid "* May not be bribed.\n"
msgstr "* Ei saa ära osta.\n"
-#: client/helpdata.c:926
+#: client/helpdata.c:924
msgid "* Can attack enemy air units.\n"
msgstr "* Saab rünnata vaenlase õhuüksusi.\n"
-#: client/helpdata.c:930
+#: client/helpdata.c:928
msgid "* Is invisible except when next to an enemy unit or city.\n"
msgstr "* Nähtamatu (välja arvatud vaenlase üksuse või linna kõrval).\n"
-#: client/helpdata.c:934
+#: client/helpdata.c:932
msgid "* Can only attack units on ocean squares (no land attacks).\n"
msgstr ""
"* Saab rünnata ainult meres asuvaid üksusi (ei saa rünnata maismaaüksusi).\n"
-#: client/helpdata.c:938
+#: client/helpdata.c:936
msgid ""
"* Can attack from aboard sea units: against enemy cities and onto land "
"squares.\n"
msgstr "* Saab rünnata laevade pealt linnu ja maaüksusi.\n"
-#: client/helpdata.c:943
+#: client/helpdata.c:941
#, c-format
msgid "* Can be paradropped from a friendly city (Range: %d).\n"
msgstr "* Võib langevarjutada sõbralikust linnast (Raadius: %d).\n"
-#: client/helpdata.c:949
+#: client/helpdata.c:947
msgid "* Gets double defense against units specified as 'mounted'.\n"
msgstr "* Kahekordne kaitsejõud ratsaüksuste vastu kaitstes.\n"
-#: client/helpdata.c:953
+#: client/helpdata.c:951
msgid "* Counts as 'mounted' against certain defenders.\n"
msgstr "* Arvestatakse teatud üksuste ründamisel ratsaüksuseks.\n"
-#: client/helpdata.c:957
+#: client/helpdata.c:955
msgid "* A missile unit: gets used up in making an attack.\n"
msgstr "* Rakett: ründamisel ei saa uuesti kasutada.\n"
-#: client/helpdata.c:960
+#: client/helpdata.c:958
msgid "* Making an attack ends this unit's turn.\n"
msgstr "* Ründamine lõpetab selle üksuse käigu.\n"
-#: client/helpdata.c:964
+#: client/helpdata.c:962
msgid "* This unit's attack causes a nuclear explosion!\n"
msgstr "* Selle üksuse rünnak põhjustab tuumaplahvatuse!\n"
-#: client/helpdata.c:968
+#: client/helpdata.c:966
msgid "* Gets double firepower when attacking cities.\n"
msgstr "* Topelt tulejõud linnade ründamisel.\n"
-#: client/helpdata.c:971
+#: client/helpdata.c:969
msgid "* Ignores the effects of city walls.\n"
msgstr "* Linnamüüride mõju ei lähe arvesse.\n"
-#: client/helpdata.c:975
+#: client/helpdata.c:973
#, c-format
msgid ""
"* Does bombard attacks (%d per turn). These attacks will only damage (never "
@@ -8364,36 +8355,36 @@ msgstr ""
"* Teeb pommitusrünnakuid (%d rünnakut käigus). Need rünnakud kahjustavad "
"(kuid ei tapa kunagi) kaitsjat, kuid ei ole ründajale ohtlikud.\n"
-#: client/helpdata.c:982
+#: client/helpdata.c:980
msgid "* Gets quintuple defense against missiles and aircraft.\n"
msgstr "* Neljakordselt tugev kaitse õhurünnakute vastu.\n"
-#: client/helpdata.c:986
+#: client/helpdata.c:984
msgid "* Ignores terrain effects (treats all squares as roads).\n"
msgstr "* Maastik ei mõjuta seda üksust (kõik ruudukesed käituvad teedena).\n"
-#: client/helpdata.c:989
+#: client/helpdata.c:987
msgid "* Ignores zones of control.\n"
msgstr "* Ei tee välja kontrolltsoonidest.\n"
-#: client/helpdata.c:993
+#: client/helpdata.c:991
msgid "* A non-military unit (cannot attack; no martial law).\n"
msgstr "* Tsiviilüksus (ei saa rünnata ega sõjaseisukorda kehtestada).\n"
-#: client/helpdata.c:997
+#: client/helpdata.c:995
msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
msgstr ""
-#: client/helpdata.c:1000
+#: client/helpdata.c:998
msgid "* Will never achieve veteran status.\n"
msgstr "* Ei saavuta kunagi veterani staatust.\n"
-#: client/helpdata.c:1002
+#: client/helpdata.c:1000
msgid "* May become veteran through training or combat.\n"
msgstr ""
"* Võib treenimise või võitluste tulemusena saavutada veterani staatuse.\n"
-#: client/helpdata.c:1008
+#: client/helpdata.c:1006
#, c-format
msgid ""
"* Must end turn in a city or next to land, or has a 50%% risk of being lost "
@@ -8402,12 +8393,12 @@ msgstr ""
"* Peab käigu lõpetama linna või maismaa lähedal, muidu on 50%% võimalus "
"põhjaminekuks.\n"
-#: client/helpdata.c:1012
+#: client/helpdata.c:1010
#, c-format
msgid "* The discovery of %s reduces the risk to 25%%.\n"
msgstr "* %s avastamine vähendab riski 25%%-ni.\n"
-#: client/helpdata.c:1017
+#: client/helpdata.c:1015
#, c-format
msgid "* %s reduces the risk to 12%%.\n"
msgstr "* %s vähendab riski 12%%-ni.\n"
@@ -8416,27 +8407,27 @@ msgstr "* %s vähendab riski 12%%-ni.\n"
#. * last two elements
#. TRANS: List of possible output types has this between
#. * last two elements
-#: client/helpdata.c:1068 client/helpdata.c:1402
+#: client/helpdata.c:1066 client/helpdata.c:1400
msgid " or "
msgstr "või"
-#: client/helpdata.c:1070 client/helpdata.c:1390
+#: client/helpdata.c:1068 client/helpdata.c:1388
msgid "?or:, "
msgstr "?or:,"
-#: client/helpdata.c:1082
+#: 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"
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:1124
+#: client/helpdata.c:1122
#, 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:1129
+#: client/helpdata.c:1127
#, c-format
msgid ""
"To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8445,90 +8436,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:1137
+#: client/helpdata.c:1135
msgid "You cannot research this technology."
msgstr "Seda teadust sa ei saa uurida."
-#: client/helpdata.c:1141
+#: client/helpdata.c:1139
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:1153
+#: client/helpdata.c:1151
#, 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:1158
+#: client/helpdata.c:1156
#, 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:1161
+#: client/helpdata.c:1159
#, 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:1165
+#: client/helpdata.c:1163
msgid "* Increases the pollution generated by the population.\n"
-msgstr "* Suurendab rahvastiku poolt tekitatavat reostuse hulka.\n"
+msgstr "* Suurendab rahvastiku poolt tekitatavat saasta hulka.\n"
-#: client/helpdata.c:1170
+#: client/helpdata.c:1168
#, 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:1177
+#: client/helpdata.c:1175
#, c-format
msgid "* Allows %s to build fortresses.\n"
msgstr "* Võimaldab üksusel %s ehitada kindluseid.\n"
-#: client/helpdata.c:1185
+#: client/helpdata.c:1183
#, c-format
msgid "* Allows %s to build airbases.\n"
msgstr "* Võimaldab üksusel %s ehitada lennuvälju.\n"
-#: client/helpdata.c:1194
+#: client/helpdata.c:1192
#, c-format
msgid "* Allows %s to upgrade roads to railroads.\n"
msgstr "* Võimaldab üksusel %s uuendada teed raudteedeks.\n"
-#: client/helpdata.c:1202
+#: client/helpdata.c:1200
#, c-format
msgid "* Allows %s to upgrade irrigation to farmland.\n"
msgstr "* Võimaldab üksusel %s uuendada niisutuse põllumaaks.\n"
-#: client/helpdata.c:1236
+#: client/helpdata.c:1234
msgid "* Pollution cannot be generated on this terrain."
-msgstr "* Sellel pinnasel ei saa tekitada reostust."
+msgstr "* Sellel pinnasel ei saa tekitada saasta."
-#: client/helpdata.c:1241
+#: client/helpdata.c:1239
msgid "* You cannot build cities on this terrain."
msgstr "* Sa ei saa sellele maastikule linnu ehitada."
-#: client/helpdata.c:1247
+#: client/helpdata.c:1245
msgid "* The coastline of this terrain is unsafe."
msgstr "* Selle piirkonna rannikuala on ebaturvaline."
-#: client/helpdata.c:1252
+#: client/helpdata.c:1250
msgid "* This terrain is unsafe for units to travel on."
msgstr "* See maastik on üksustele liikumiseks ohtlik."
-#: client/helpdata.c:1257
+#: client/helpdata.c:1255
msgid "* Land units cannot travel on oceanic terrains."
msgstr "* Maaüksused ei saa liikuda mere aladel."
-#: client/helpdata.c:1307
+#: client/helpdata.c:1305
msgid "Features:\n"
msgstr "Omadused:\n"
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1413 client/helpdata.c:1414
+#: client/helpdata.c:1411 client/helpdata.c:1412
msgid "?outputlist: Nothing "
msgstr ""
-#: client/helpdata.c:1421
+#: client/helpdata.c:1419
#, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
@@ -8539,7 +8530,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:1431
+#: client/helpdata.c:1429
#, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8548,49 +8539,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:1439
+#: client/helpdata.c:1437
#, 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:1444
+#: client/helpdata.c:1442
#, 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:1449
+#: client/helpdata.c:1447
#, 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:1453
+#: client/helpdata.c:1451
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:1462
+#: client/helpdata.c:1460
#, 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:1470
+#: client/helpdata.c:1468
#, c-format
msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
msgstr ""
-#: client/helpdata.c:1477
+#: client/helpdata.c:1475
#, 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:1484
+#: client/helpdata.c:1482
#, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -8600,23 +8591,23 @@ msgstr ""
"sul on %d linna.\n"
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1491
+#: client/helpdata.c:1489
#, 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:1499
+#: client/helpdata.c:1497
#, 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:1504
+#: client/helpdata.c:1502
msgid "Has unlimited science/gold/luxuries rates.\n"
msgstr "Piiramata suurusega teaduse/maksude/hüvede määr.\n"
-#: client/helpdata.c:1509
+#: client/helpdata.c:1507
#, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
@@ -8627,7 +8618,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:1521
+#: client/helpdata.c:1519
#, 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"
@@ -8635,7 +8626,7 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1532
+#: client/helpdata.c:1530
#, c-format
msgid ""
"* You may grow your cities by means of celebrations. Your cities must be at "
@@ -8644,15 +8635,15 @@ msgstr ""
"* Kasvada saab ka pidustuste korraldamise abil. Su linna suurus peab olema "
"vähemalt %d, et sel viisil kasvada.\n"
-#: client/helpdata.c:1538
+#: client/helpdata.c:1536
msgid "* Your units cannot be bribed.\n"
msgstr "* Su üksusi ei saa ära osta.\n"
-#: client/helpdata.c:1541
+#: client/helpdata.c:1539
msgid "* Your cities cannot be incited.\n"
msgstr "* Su linnu ei saa mässule õhutada.\n"
-#: client/helpdata.c:1545
+#: client/helpdata.c:1543
msgid ""
"* Government will fall into anarchy if any city is in disorder for more than "
"two turns in a row.\n"
@@ -8660,15 +8651,15 @@ msgstr ""
"* Valitsus langeb anarhiasse, kui mõnes linnas on rahutused kauem, kui kaks "
"käiku järjest.\n"
-#: client/helpdata.c:1551
+#: client/helpdata.c:1549
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:1555
+#: client/helpdata.c:1553
msgid "* Allows partisans when cities are taken by the enemy.\n"
msgstr "* Lubab partisanidel tegutsema hakata, kui linnad vallutatakse.\n"
-#: client/helpdata.c:1559
+#: client/helpdata.c:1557
msgid ""
"* Buildings that normally confer bonuses against unhappiness will instead "
"give gold.\n"
@@ -8676,25 +8667,25 @@ msgstr ""
"* Ehitised, mis muidu annaks boonuseid õnnetu meeleolu vastu, toodavad "
"hoopis raha.\n"
-#: client/helpdata.c:1563
+#: client/helpdata.c:1561
msgid "* Pays no upkeep for fanatics.\n"
msgstr "* Ei maksa fanaatikute ülalpidamiskulusid.\n"
-#: client/helpdata.c:1566
+#: client/helpdata.c:1564
msgid "* Has no unhappy citizens.\n"
msgstr "* Pole õnnetuid kodanikke.\n"
-#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
+#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
#, c-format
msgid "* Veteran %s units.\n"
msgstr "* Veteran-%s üksused.\n"
-#: client/helpdata.c:1587
+#: client/helpdata.c:1585
msgid "* Veteran units.\n"
msgstr "* Veteranid.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1593
+#: client/helpdata.c:1591
#, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8702,7 +8693,7 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1602
+#: client/helpdata.c:1600
#, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8710,37 +8701,37 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1610
+#: client/helpdata.c:1608
#, 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:1619
+#: client/helpdata.c:1617
#, 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:1627
+#: client/helpdata.c:1625
#, 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:1632
+#: client/helpdata.c:1630
#, 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:1637
+#: client/helpdata.c:1635
#, 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:1645
+#: client/helpdata.c:1643
#, fuzzy, c-format
msgid "* %s waste will increase quickly with distance from capital.\n"
msgstr ""
@@ -8748,81 +8739,81 @@ msgstr ""
"pealinnast.\n"
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1651
+#: client/helpdata.c:1649
#, 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:1657
+#: client/helpdata.c:1655
#, 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:1674
+#: client/helpdata.c:1672
#, 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:1701
+#: client/helpdata.c:1699
#, c-format
msgid "%s%d %s"
msgstr "%s%d %s"
-#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1700 client/helpdata.c:1708 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:1709
+#: client/helpdata.c:1707
#, c-format
msgid "%s%d unhappy"
msgstr "%s%d õnnetus"
-#: client/mapctrl_common.c:382
+#: client/mapctrl_common.c:399
#, c-format
msgid "You don't know how to build %s!"
msgstr "Sa ei tea kuidas ehitada ehitist %s!"
-#: client/mapctrl_common.c:392
+#: client/mapctrl_common.c:409
#, c-format
msgid "Copy %s to clipboard."
msgstr ""
-#: client/mapctrl_common.c:408
+#: client/mapctrl_common.c:425
msgid "Clipboard is empty."
msgstr ""
-#: client/options.c:98
+#: client/options.c:102
msgid "Graphics"
msgstr "Graafika"
-#: client/options.c:99
+#: client/options.c:103
msgid "Overview"
msgstr "Ãœlevaade"
-#: client/options.c:100
+#: client/options.c:104
msgid "Sound"
msgstr "Heli"
-#: client/options.c:101
+#: client/options.c:105
msgid "Interface"
msgstr "Liides"
-#: client/options.c:102
+#: client/options.c:106
msgid "Network"
msgstr "Võrk"
-#: client/options.c:107
+#: client/options.c:111
msgid "Login name"
msgstr "Kasutajanimi"
-#: client/options.c:108
+#: client/options.c:112
msgid ""
"This is the default login username that will be used in the connection "
"dialogs or with the -a command-line parameter."
@@ -8830,11 +8821,11 @@ msgstr ""
"Vaikimisi loginanimi, mida kasutatakse ühenduse loomise akendes ja "
"käsureavõtmega -a."
-#: client/options.c:113
+#: client/options.c:117
msgid "Server"
msgstr "Server"
-#: client/options.c:114
+#: client/options.c:118
msgid ""
"This is the default server hostname that will be used in the connection "
"dialogs or with the -a command-line parameter."
@@ -8842,11 +8833,11 @@ msgstr ""
"Vaikimisi valitav serveri nimi, kasutatakse ühenduse loomise akendes ja "
"käsureavõtmega -a."
-#: client/options.c:119
+#: client/options.c:123
msgid "Server port"
msgstr "Serveri port"
-#: client/options.c:120
+#: client/options.c:124
msgid ""
"This is the default server port that will be used in the connection dialogs "
"or with the -a command-line parameter."
@@ -8854,11 +8845,11 @@ msgstr ""
"See on vaikimisi serveriport, mida kasutatakse ühenduse loomise "
"dialoogiakendes või käsureavõtmega -a."
-#: client/options.c:125 client/gui-win32/connectdlg.c:912 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
msgid "Metaserver"
msgstr "Metaserver"
-#: client/options.c:126
+#: client/options.c:130
msgid ""
"The metaserver is a host that the client contacts to find out about games on "
"the internet. Don't change this from its default value unless you know what "
@@ -8868,11 +8859,11 @@ msgstr ""
"mängude kohta infot saada. Ära vaikimisi väärtust muuda, kui sa just täiesti "
"kindel pole, mida sa teed."
-#: client/options.c:132
+#: client/options.c:136
msgid "Soundset"
msgstr "Helikomplekt"
-#: client/options.c:133
+#: client/options.c:137
msgid ""
"This is the soundset that will be used. Changing this is the same as using "
"the -S command-line parameter."
@@ -8880,11 +8871,11 @@ msgstr ""
"Kasutatav helikomplekt. Väärtuse muutmine annab sama efekti, kui "
"käsureavõtme -S kasutamine."
-#: client/options.c:138
+#: client/options.c:142
msgid "Sound plugin"
msgstr "Heliplugin"
-#: client/options.c:139
+#: client/options.c:143
msgid ""
"If you have a problem with sound, try changing the sound plugin. The new "
"plugin won't take effect until you restart Freeciv. Changing this is the "
@@ -8894,19 +8885,19 @@ msgstr ""
"rakendu enne, kui Freecivi uuesti käivitad. Väärtuse muutmine annab sama "
"efekti, kui käsureavõtme -P kasutamine."
-#: client/options.c:144 client/gui-sdl/gui_main.c:162
+#: client/options.c:148 client/gui-sdl/gui_main.c:162
msgid "Theme"
msgstr "Teema"
-#: client/options.c:145
+#: client/options.c:149
msgid "By changing this option you change the active theme."
msgstr "Muudab aktiivset teemat."
-#: client/options.c:148
+#: client/options.c:152
msgid "Tileset"
msgstr "Ruudustik"
-#: client/options.c:149
+#: client/options.c:153
msgid ""
"By changing this option you change the active tileset. This is the same as "
"using the -t command-line parameter."
@@ -8914,21 +8905,21 @@ msgstr ""
"Muudab aktiivset ruudustikku. Väärtuse muutmine annab sama efekti, kui "
"käsureavõtme -t kasutamine."
-#: client/options.c:156
+#: client/options.c:160
msgid "Solid unit background color"
msgstr ""
-#: client/options.c:157
+#: client/options.c:161
msgid ""
"Setting this option will cause units on the map view to be drawn with a "
"solid background color instead of the flag backdrop."
msgstr ""
-#: client/options.c:161 client/gui-sdl/optiondlg.c:960
+#: client/options.c:165 client/gui-sdl/optiondlg.c:960
msgid "Sound bell at new turn"
msgstr "Helimärguanne käigu alguses"
-#: client/options.c:162
+#: client/options.c:166
msgid ""
"Set this option to have a \"bell\" event be generated at the start of a new "
"turn. You can control the behavior of the \"bell\" event by editing the "
@@ -8937,11 +8928,11 @@ msgstr ""
"Tekitab helimärguande käigu alguses. Helimärguande käitumist saad muuta "
"teatevalikute juurest."
-#: client/options.c:168
+#: client/options.c:172
msgid "Unit movement animation time (milliseconds)"
msgstr "Ãœksuse liikumise animeerimine (millisekundites)"
-#: client/options.c:169
+#: client/options.c:173
msgid ""
"This option controls how long unit \"animation\" takes when a unit moves on "
"the map view. Set it to 0 to disable animation entirely."
@@ -8949,11 +8940,11 @@ msgstr ""
"Näitab, kui kaua animeeritakse üksuse liikumist kaardi vaates. Sisesta "
"väärtuseks 0, et animeerimine välja lülitada."
-#: client/options.c:174
+#: client/options.c:178
msgid "Mapview recentering time (milliseconds)"
msgstr "Kaardivaate tsentreerimise aeg (millisekundites)"
-#: client/options.c:175
+#: client/options.c:179
msgid ""
"When the map view is recentered, it will slide smoothly over the map to its "
"new position. This option controls how long this slide lasts. Set it to 0 "
@@ -8963,11 +8954,11 @@ msgstr ""
"See valik määrab, kui kaua vaate liikumist animeeritakse. Sisesta väärtuseks "
"0, kui soovid vaate sujuvat liikumist keelata."
-#: client/options.c:180 client/gui-sdl/optiondlg.c:1014
+#: client/options.c:184 client/gui-sdl/optiondlg.c:1014
msgid "Show combat animation"
msgstr "Näita animeeritud võitlusi"
-#: client/options.c:181
+#: client/options.c:185
msgid ""
"Disabling this option will turn off combat animation between units on the "
"mapview."
@@ -8975,81 +8966,81 @@ msgstr ""
"Selle keelamine lülitab välja üksustevahelise võitluse animeerimise "
"lahingus, kui on avatud kaardi vaade."
-#: client/options.c:184
+#: client/options.c:188
msgid "Draw the citybar"
msgstr "Joonista linnariba"
-#: client/options.c:185
+#: client/options.c:189
msgid ""
"Setting this option will display a 'citybar' containing useful information "
"beneath each city. Disabling this option will display only the city's name "
"and optionally, production."
msgstr ""
-#: client/options.c:191
+#: client/options.c:195
msgid "Show icons in the technology tree"
msgstr "Näita tehnoloogiapuus ikoone"
-#: client/options.c:192
+#: client/options.c:196
msgid ""
"Setting this option will display icons on the technology tree diagram. "
"Turning this option off makes the technology tree more compact."
msgstr ""
-#: client/options.c:197
+#: client/options.c:201
msgid "Draw shield graphics for units"
msgstr ""
-#: client/options.c:198
+#: client/options.c:202
msgid ""
"Setting this option will draw a shield icon as the flags on units. If "
"unset, the full flag will be drawn."
msgstr ""
-#: client/options.c:202
+#: client/options.c:206
msgid "Manual Turn Done in AI Mode"
msgstr ""
-#: client/options.c:203
+#: client/options.c:207
msgid ""
"Disable this option if you do not want to press the Turn Done button "
"manually when watching an AI player."
msgstr ""
-#: client/options.c:207 client/gui-sdl/optiondlg.c:1121
+#: client/options.c:211 client/gui-sdl/optiondlg.c:1121
msgid "Auto Center on Units"
msgstr "Tsentreeri üksustele"
-#: client/options.c:208
+#: client/options.c:212
msgid ""
"Set this option to have the active unit centered automatically when the unit "
"focus changes."
msgstr ""
-#: client/options.c:211 client/gui-sdl/optiondlg.c:1147
+#: client/options.c:215 client/gui-sdl/optiondlg.c:1147
msgid "Auto Center on Combat"
msgstr "Tsentreeri lahingutele"
-#: client/options.c:212
+#: client/options.c:216
msgid ""
"Set this option to have any combat be centered automatically. Disabled this "
"will speed up the time between turns but may cause you to miss combat "
"entirely."
msgstr ""
-#: client/options.c:217 client/gui-sdl/optiondlg.c:1174
+#: client/options.c:221 client/gui-sdl/optiondlg.c:1174
msgid "Focus on Awakened Units"
msgstr "Fookus ärganud üksustele"
-#: client/options.c:218
+#: client/options.c:222
msgid "Set this option to have newly awoken units be focused automatically."
msgstr ""
-#: client/options.c:221
+#: client/options.c:225
msgid "Allow goto into the unknown"
msgstr "Luba tundmatusse rännata"
-#: client/options.c:222
+#: client/options.c:226
msgid ""
"Setting this option will make the game consider moving into unknown tiles. "
"If not, then goto routes will detour around or be blocked by unknown tiles."
@@ -9058,11 +9049,11 @@ msgstr ""
"minemist. Muidu aga üritatakse minna ümber tundmatute ruutude või siis "
"jäävad tundmatud ruudud teed blokeerima."
-#: client/options.c:226
+#: client/options.c:230
msgid "Center map when Popup city"
msgstr ""
-#: client/options.c:227
+#: client/options.c:231
msgid ""
"Setting this option makes the mapview center on a city when its city dialog "
"is popped up."
@@ -9070,116 +9061,163 @@ msgstr ""
"Selle seade aktiveerimisel liigub kaardivaade automaatselt selle linna "
"peale, mille kohta avati aken."
-#: client/options.c:230
+#: client/options.c:234
msgid "Concise City Production"
msgstr ""
-#: client/options.c:231
+#: client/options.c:235
msgid ""
"Set this option to make the city production (as shown in the city dialog) to "
"be more compact."
msgstr ""
-#: client/options.c:234 client/gui-sdl/optiondlg.c:1252
+#: client/options.c:238 client/gui-sdl/optiondlg.c:1252
msgid "End Turn when done moving"
msgstr "Lõpeta käik, kui liikumine lõpetatud"
-#: client/options.c:235
+#: client/options.c:239
msgid ""
"Setting this option makes your turn end automatically when all your units "
"are done moving."
msgstr ""
"Käik lõpetatakse automaatselt, kui kõik üksused on liikumise lõpetanud."
-#: client/options.c:238 client/gui-sdl/optiondlg.c:1226
+#: client/options.c:242 client/gui-sdl/optiondlg.c:1226
msgid "Prompt for city names"
msgstr "Küsi linnanimesid"
-#: client/options.c:239
+#: client/options.c:243
msgid ""
"Disabling this option will make the names of newly founded cities chosen "
"automatically by the server."
msgstr "Selle valiku keelamisel valib server ise linnadele nimed."
-#: client/options.c:242 client/gui-sdl/optiondlg.c:1200
+#: client/options.c:246 client/gui-sdl/optiondlg.c:1200
msgid "Pop up city dialog for new cities"
msgstr "Hüpikaken uue linna loomisel"
-#: client/options.c:243
+#: client/options.c:247
msgid ""
"Setting this option will pop up a newly-founded city's city dialog "
"automatically."
msgstr "Uue linna loomisel hüppab automaatselt ette uue linna kohta käiv aken."
-#: client/options.c:248
+#: client/options.c:250
+#, fuzzy
+msgid "Pop up caravan actions"
+msgstr "Karavani tegevused"
+
+#: client/options.c:251
+msgid ""
+"If this option is enabled, when caravans arrive at a city where they can "
+"establish a traderoute or help build a wonder, a window will popup asking "
+"which action should be performed. Disabling this option means you will have "
+"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 ""
+
+#: client/options.c:260
+msgid "Enable cursor changing"
+msgstr ""
+
+#: client/options.c:261
+msgid ""
+"This option controls whether the client should try to change the mouse "
+"cursor depending on what is being pointed at, as well as to indicate changes "
+"in the client or server state."
+msgstr ""
+
+#: client/options.c:266
+msgid "Select cities before units"
+msgstr ""
+
+#: 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 ""
+
+#: client/options.c:272
+msgid "Clear unit orders on selection"
+msgstr ""
+
+#: client/options.c:273
+msgid ""
+"Enabling this option will cause unit orders to be cleared whenever one or "
+"more units are selected. If this option is disabled, selecting units will "
+"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 ""
+
+#: client/options.c:282
msgid "Background layer"
msgstr "Tagatausta kiht"
-#: client/options.c:249
+#: client/options.c:283
msgid "The background layer of the overview shows just ocean and land."
msgstr "Tagatausta kiht näitab ülevaates ainult merd ja maad."
-#: client/options.c:252
+#: client/options.c:286
msgid "Terrain relief map layer"
msgstr "Maastikureljeefi kaardi kiht"
-#: client/options.c:253
+#: client/options.c:287
msgid "The relief layer shows all terrains on the map."
msgstr "Reljeefikaardi kiht näitab kaardi maastikke."
-#: client/options.c:256
+#: client/options.c:290
msgid "Borders layer"
msgstr "Piiride kiht"
-#: client/options.c:257
+#: client/options.c:291
msgid ""
"The borders layer of the overview shows which tiles are owned by each player."
msgstr ""
"Piiride kiht näitab ülevaates millised ruudukesed kuuluvad millisel "
"mängijale."
-#: client/options.c:261
+#: client/options.c:295
msgid "Units layer"
msgstr "Ãœksuste kiht"
-#: client/options.c:262
+#: client/options.c:296
msgid "Enabling this will draw units on the overview."
msgstr "Üksusi näidatakse ka ülevaate-aknas."
-#: client/options.c:265
+#: client/options.c:299
msgid "Cities layer"
msgstr "Linnade kiht"
-#: client/options.c:266
+#: client/options.c:300
msgid "Enabling this will draw cities on the overview."
msgstr "Linnu näidatakse ka ülevaate-aknas"
-#: client/options.c:269
+#: client/options.c:303
msgid "Overview fog of war"
msgstr "Sõjaudu ülevaade"
-#: client/options.c:270
+#: client/options.c:304
msgid "Enabling this will show fog of war on the overview."
msgstr "Sõjaudu on ka ülevaate-aknas."
-#: client/options.c:488
+#: client/options.c:526
msgid "If you add a preset by hand, also update \"number_of_presets\""
msgstr "Kui lisad käsitsi uue malli, uuenda ka \"number_of_presets\" väärtust."
-#: client/options.c:516
+#: client/options.c:554
msgid "Cannot find your home directory"
msgstr "Sinu kodukataloogi ei suuda leida."
-#: client/options.c:665 client/options.c:796
+#: client/options.c:703 client/options.c:834
msgid "Save failed, cannot find a filename."
msgstr "Salvestamine ebaõnnestus, faili nime ei suuda leida."
-#: client/options.c:678 client/options.c:859
+#: client/options.c:716 client/options.c:897
#, c-format
msgid "Save failed, cannot write to file %s"
msgstr "Salvestamine ebaõnnestus, ei suutnud kirjutada faili %s"
-#: client/options.c:680 client/options.c:862
+#: client/options.c:718 client/options.c:900
#, c-format
msgid "Saved settings to file %s"
msgstr "Seaded salvestatud faili %s"
@@ -9204,16 +9242,16 @@ msgstr "Serveri oskused: %s"
msgid "Start of turn %d"
msgstr "Käigu %d algus"
-#: client/packhand.c:1590
+#: client/packhand.c:1591
#, c-format
msgid "AI Mode is now %s."
msgstr "Tehisintellekti režiim on nüüd %s"
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "ON"
msgstr "SEES"
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "OFF"
msgstr "VÄLJAS"
@@ -9245,14 +9283,15 @@ msgid "Username"
msgstr "Kasutajanimi"
#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
-#: client/gui-gtk-2.0/pages.c:2085
+#: client/gui-gtk-2.0/pages.c:2157
msgid "Flag"
msgstr "Lipp"
#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
-#: client/gui-gtk-2.0/pages.c:1536 client/gui-gtk-2.0/pages.c:2087
-#: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
-#: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
+#: 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/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr "Rahvus"
@@ -9264,7 +9303,7 @@ msgstr "Piir"
msgid "Score"
msgstr "Skoor"
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
msgid "Team"
msgstr "Meeskond"
@@ -9335,369 +9374,395 @@ msgstr "Ãœhtegi %s ei saanud lahti lasta."
msgid "Could not open temp file."
msgstr "Ei suutnud avada ajutist faili."
-#: client/servers.c:407
+#: client/servers.c:410
msgid "Invalid $http_proxy or metaserver value, must start with 'http://'"
msgstr ""
"Vigane $http_proxy või metaserver, nimi peab algama stringiga 'http://'"
-#: client/servers.c:413
+#: client/servers.c:416
msgid "Failed looking up metaserver's host"
msgstr "Metaserveri hosti lahendamine ebaõnnestus"
-#: client/text.c:85 client/text.c:86 client/text.c:91
+#. TRANS: "AI <player name>"
+#: client/text.c:94
+#, c-format
+msgid "AI %s"
+msgstr ""
+
+#. TRANS: "<nation adjective>, team <team name>"
+#: client/text.c:118
+#, fuzzy, c-format
+msgid "%s, team %s"
+msgstr ", meeskond %s"
+
+#: client/text.c:135 client/text.c:136 client/text.c:141
#: client/gui-sdl/mapview.c:752
msgid "?nation:Neutral"
msgstr "?nation:Neutraalsed"
-#: client/text.c:85 client/gui-sdl/mapview.c:752
+#: client/text.c:135 client/gui-sdl/mapview.c:752
msgid "?nation:Hostile"
msgstr "?nation:Vaenulikud"
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Peaceful"
msgstr "?nation:Rahumeelsed"
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Friendly"
msgstr "?nation:Sõbralikud"
-#: client/text.c:88 client/gui-sdl/mapview.c:755
+#: client/text.c:138 client/gui-sdl/mapview.c:755
msgid "?nation:Mysterious"
msgstr "?nation:Saladuslikud"
-#: client/text.c:88
+#: client/text.c:138
msgid "?nation:Friendly(team)"
msgstr "?nation:Sõbralikud (meeskond)"
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
msgid "?city:Neutral"
msgstr "?city:Neutraalne"
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
msgid "?city:Hostile"
msgstr "?city:Vaenulik"
-#: client/text.c:92 client/gui-sdl/mapview.c:786
+#: client/text.c:142 client/gui-sdl/mapview.c:786
msgid "?city:Peaceful"
msgstr "?city:Rahumeelne"
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Friendly"
msgstr "?city:Sõbralik"
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Mysterious"
msgstr "?city:Saladuslik"
-#: client/text.c:93
+#: client/text.c:143
msgid "?city:Friendly(team)"
msgstr "?city:Sõbralik (meeskond)"
-#: client/text.c:100
+#: client/text.c:151
#, c-format
msgid "Location: (%d, %d) [%d]"
msgstr "Asukoht: (%d, %d) [%d]"
-#: client/text.c:109
+#: client/text.c:153
+#, c-format
+msgid "Native coordinates: (%d, %d)"
+msgstr ""
+
+#: client/text.c:160
#, c-format
msgid "Terrain: %s"
msgstr "Maastik: %s"
-#: client/text.c:110
+#: client/text.c:161
#, c-format
msgid "Food/Prod/Trade: %s"
msgstr "Toit/Tootm/Kaubandus: %s"
-#: client/text.c:113
+#: client/text.c:164
msgid "Minor Tribe Village"
msgstr "Väike höimu küla"
-#: client/text.c:119
+#: client/text.c:173
#, fuzzy
msgid "Our territory"
msgstr "Meie territoorium"
-#. TRANS: "Polish territory"
-#: client/text.c:122
+#. TRANS: "Territory of <username> (<nation + team>)"
+#: client/text.c:176
#, fuzzy, c-format
-msgid "%s territory"
-msgstr "%s-ide territoorium"
+msgid "Territory of %s (%s)"
+msgstr ""
+"\n"
+"Maaomanik %s %s"
-#. TRANS: "Polish territory (5 turn cease-fire)"
-#: client/text.c:131
-#, c-format
-msgid "%s territory (%d turn cease-fire)"
-msgid_plural "%s territory (%d turn cease-fire)"
-msgstr[0] "Rahvuse %s territoorium (%d käigu pikkune vaherahu)"
-msgstr[1] "Rahvuse %s territoorium (%d käigu pikkune vaherahu)"
+#: client/text.c:186
+#, fuzzy, c-format
+msgid "Territory of %s (%s) (%d turn cease-fire)"
+msgid_plural "Territory of %s (%s) (%d turn cease-fire)"
+msgstr[0] "Linn: %s (%s, %d käigu pikkune vaherahu)"
+msgstr[1] "Linn: %s (%s, %d käigu pikkune vaherahu)"
-#. TRANS: "Polish territory (friendly)"
-#: client/text.c:140
+#. TRANS: "Territory of <username>
+#. * (<nation + team> | <diplomatic state>)"
+#: client/text.c:195
#, fuzzy, c-format
-msgid "%s territory (%s)"
-msgstr "Maaomanik %s %s"
+msgid "Territory of %s (%s | %s)"
+msgstr ""
+"\n"
+"Maaomanik %s %s"
-#: client/text.c:145
+#: client/text.c:200
msgid "Unclaimed territory"
msgstr "Omanikuta territoorium"
-#. TRANS: "City: Warsaw (Polish)"
-#: client/text.c:156
-#, c-format
-msgid "City: %s (%s)"
-msgstr "Linn: %s (%s)"
+#. TRANS: "City: <city name> | <username> (<nation + team>)"
+#: client/text.c:214
+#, fuzzy, c-format
+msgid "City: %s | %s (%s)"
+msgstr "Linn: %s (%s, %s)"
-#. TRANS: "City: Warsaw (Polish, 5 turn cease-fire)"
-#: client/text.c:166
-#, c-format
-msgid "City: %s (%s, %d turn cease-fire)"
-msgid_plural "City: %s (%s, %d turn cease-fire)"
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <number> turn cease-fire)"
+#: client/text.c:224
+#, fuzzy, c-format
+msgid "City: %s | %s (%s, %d turn cease-fire)"
+msgid_plural "City: %s | %s (%s, %d turn cease-fire)"
msgstr[0] "Linn: %s (%s, %d käigu pikkune vaherahu)"
msgstr[1] "Linn: %s (%s, %d käigu pikkune vaherahu)"
-#. TRANS: "City: Warsaw (Polish,friendly)"
-#: client/text.c:174
-#, c-format
-msgid "City: %s (%s, %s)"
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <diplomatic state>)"
+#: client/text.c:231
+#, fuzzy, c-format
+msgid "City: %s | %s (%s, %s)"
msgstr "Linn: %s (%s, %s)"
#. TRANS: previous lines gave other information about the city.
-#: client/text.c:189
+#: client/text.c:246
#, fuzzy, c-format
msgid "?clistbegin: with %s"
msgstr " koos %s"
#. TRANS: "Trade from Warsaw: 5"
-#: client/text.c:202
+#: client/text.c:259
#, c-format
msgid "Trade from %s: %d"
msgstr "Kaubandus linnast %s: %d"
-#: client/text.c:210
+#: client/text.c:267
#, c-format
msgid "Infrastructure: %s"
msgstr "Infrastruktuur: %s"
-#: client/text.c:215
+#: client/text.c:272
#, c-format
msgid "Activity: %s"
msgstr "Tegevus: %s"
-#. TRANS: "Unit: Musketeers (Polish, Warsaw)"
-#. TRANS: "Unit: Musketeers (Polish,friendly)"
-#: client/text.c:226 client/text.c:253
-#, c-format
-msgid "Unit: %s (%s, %s)"
+#. TRANS: "Unit: <unit type> | <username>
+#. * (<nation + team>, <homecity>)"
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <diplomatic state>)"
+#: client/text.c:287 client/text.c:313
+#, fuzzy, c-format
+msgid "Unit: %s | %s (%s, %s)"
msgstr "Ãœksus: %s (%s, %s)"
-#. TRANS: "Unit: Musketeers (Polish)"
-#: client/text.c:232
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>)"
+#: client/text.c:292
#, fuzzy, c-format
-msgid "Unit: %s (%s)"
-msgstr "Ãœksus: %s (%s)"
+msgid "Unit: %s | %s (%s)"
+msgstr "Ãœksus: %s (%s, %s)"
-#. TRANS: "Unit: Musketeers (Polish, 5 turn cease-fire)"
-#: client/text.c:245
-#, c-format
-msgid "Unit: %s (%s, %d turn cease-fire)"
-msgid_plural "Unit: %s (%s, %d turn cease-fire)"
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <number> turn cease-fire)"
+#: client/text.c:305
+#, fuzzy, c-format
+msgid "Unit: %s | %s (%s, %d turn cease-fire)"
+msgid_plural "Unit: %s | %s (%s, %d turn cease-fire)"
msgstr[0] "Üksus: %s (%s, %d-käigune sõjategevuse peatamine)"
msgstr[1] "Üksus: %s (%s, %d-käigune sõjategevuse peatamine)"
#. TRANS: "Chance to win: A:95% D:46%"
-#: client/text.c:279
+#: client/text.c:338
#, c-format
msgid "Chance to win: A:%d%% D:%d%%"
msgstr "Võiduvõimalus: R: %d%% K: %d%%"
#. TRANS: A is attack power, D is defense power, FP is firepower,
#. * HP is hitpoints (current and max).
-#: client/text.c:286
+#: client/text.c:345
#, fuzzy, c-format
msgid "A:%d D:%d FP:%d HP:%d/%d (%s)"
msgstr "R: %d K: %d FP: %d HP:%d/%d (%s)"
#. TRANS: "5 more" units on this tile
-#: client/text.c:295
+#: client/text.c:354
#, c-format
msgid " (%d more)"
msgstr " (%d veel)"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:364
+#: client/text.c:423
#, c-format
msgid "far from %s"
msgstr ""
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:367
+#: client/text.c:426
#, c-format
msgid "near %s"
msgstr "lähim %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:370
+#: client/text.c:429
#, c-format
msgid "in %s"
msgstr "%s-s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:403
+#: client/text.c:462
#, c-format
msgid "from %s"
msgstr "%s-lt"
-#: client/text.c:466
+#: client/text.c:525
msgid "Progress: no research"
msgstr "Progress: ei jaksa midagi uurida"
-#: client/text.c:470
+#: client/text.c:529
msgid "Progress: no research target"
msgstr "Progress: pole teadustöö eesmärki"
-#: client/text.c:475
+#: client/text.c:534
#, c-format
msgid "Progress: %d turn/advance"
msgid_plural "Progress: %d turns/advance"
msgstr[0] "Progress: %d käik avastuseni"
msgstr[1] "Progress: %d käiku avastuseni"
-#: client/text.c:480
+#: client/text.c:539
#, c-format
msgid "%d bulb/turn"
msgid_plural "%d bulbs/turn"
msgstr[0] "%d pirn käigus"
msgstr[1] "%d pirni käigus"
-#: client/text.c:485
+#: client/text.c:544
#, c-format
msgid ", %d bulb/turn from team"
msgid_plural ", %d bulbs/turn from team"
msgstr[0] ", %d pirn/käigus meeskonnalt"
msgstr[1] ", %d pirni/käigus meeskonnalt"
-#: client/text.c:512
+#: client/text.c:571
#, c-format
msgid "%d/- (never)"
msgstr "%d/- (iialgi)"
-#: client/text.c:524
+#: client/text.c:583
#, c-format
msgid "%d/%d (%d turn)"
msgid_plural "%d/%d (%d turns)"
msgstr[0] "%d/%d (%d käik)"
msgstr[1] "%d/%d (%d käiku)"
-#: client/text.c:527
+#: client/text.c:586
#, c-format
msgid "%d/%d (never)"
msgstr "%d/%d (iialgi)"
-#: client/text.c:564
+#: client/text.c:623
#, c-format
msgid "%d step"
msgid_plural "%d steps"
msgstr[0] "%d samm"
msgstr[1] "%d sammu"
-#: client/text.c:566
+#: client/text.c:625
#, c-format
msgid "%d bulb"
msgid_plural "%d bulbs"
msgstr[0] "%d pirn"
msgstr[1] "%d pirni"
-#: client/text.c:570 client/agents/cma_fec.c:269 client/agents/cma_fec.c:313
+#: 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
#, c-format
msgid "%d turn"
msgid_plural "%d turns"
-msgstr[0] "%d periood"
-msgstr[1] "%d käik"
+msgstr[0] "%d käik"
+msgstr[1] "%d käiku"
-#: client/text.c:592
+#: client/text.c:651
#, c-format
msgid "Population: %s"
msgstr "Rahvaarv: %s"
-#: client/text.c:595
+#: client/text.c:654
#, c-format
msgid "Year: %s (T%d)"
msgstr "Aasta: %s (K%d)"
-#: client/text.c:598
+#: client/text.c:657
#, c-format
msgid "Gold: %d (%+d)"
msgstr "Kulda: %d (%+d)"
-#: client/text.c:600
+#: client/text.c:659
#, c-format
msgid "Tax: %d Lux: %d Sci: %d"
msgstr "Maksud:%d Hüved:%d Teadus:%d"
-#: client/text.c:607
+#: client/text.c:666
#, fuzzy
msgid "Moving: Nobody"
msgstr "Liigub: %s"
-#: client/text.c:609
+#: client/text.c:668
#, c-format
msgid "Moving: %s"
msgstr "Liigub: %s"
-#: client/text.c:613
+#: client/text.c:672
msgid "(Click for more info)"
msgstr "(Klõpsa rohkema nägemiseks)"
-#: client/text.c:629
+#: client/text.c:688
#, c-format
msgid "%s People"
msgstr "%s kodanikku"
-#: client/text.c:633
+#: client/text.c:692
#, c-format
msgid "Turn: %d"
msgstr "Käik: %d"
-#: client/text.c:635 client/gui-win32/inteldlg.c:111
+#: client/text.c:694 client/gui-win32/inteldlg.c:111
#: client/gui-xaw/inteldlg.c:208
#, c-format
msgid "Gold: %d"
msgstr "Kulda: %d"
-#: client/text.c:636
+#: client/text.c:695
#, c-format
msgid "Net Income: %d"
msgstr "Kogusissetulek: %d"
#. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:639
+#: client/text.c:698
#, c-format
msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
msgstr "Maksumäärad: Kuld:%d%% Hüved:%d%% Teadus:%d%%"
-#: client/text.c:643
+#: client/text.c:702
#, c-format
msgid "Researching %s: %s"
msgstr "Uuritakse %s: %s"
-#: client/text.c:650
+#: client/text.c:709
#, c-format
msgid "Global warming chance: %d%% (%+d%%/turn)"
msgstr "Tõenäosus globaalseks soojenemiseks: %d%% (%+d%%/käik)"
-#: client/text.c:653
+#: client/text.c:712
#, c-format
msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
msgstr "Tõenäosus tuumatalveks: %d%% (%+d%%/käik)"
-#: client/text.c:658 client/gui-win32/inteldlg.c:104
+#: client/text.c:717 client/gui-win32/inteldlg.c:104
#: client/gui-xaw/inteldlg.c:200
#, c-format
msgid "Government: %s"
msgstr "Riigikord: %s"
-#: client/text.c:682
+#: client/text.c:741
#, c-format
msgid "%d unit"
msgid_plural "%d units"
@@ -9705,55 +9770,55 @@ msgstr[0] "%d üksus"
msgstr[1] "%d üksust"
#. TRANS: Impossible to reach goto target tile
-#: client/text.c:715 client/gui-sdl/mapview.c:566
+#: client/text.c:774 client/gui-sdl/mapview.c:566
msgid "?goto:Unreachable"
msgstr ""
-#: client/text.c:717 client/gui-sdl/mapview.c:568
+#: client/text.c:776 client/gui-sdl/mapview.c:568
#, c-format
msgid "Turns to target: %d"
msgstr "Käike sihtmärgini: %d"
-#: client/text.c:719 client/gui-sdl/mapview.c:570
+#: client/text.c:778 client/gui-sdl/mapview.c:570
#, c-format
msgid "Turns to target: %d to %d"
msgstr "Käike sihtmärgini: %d kuni %d"
-#: client/text.c:725 client/gui-sdl/mapview.c:576
+#: client/text.c:784 client/gui-sdl/mapview.c:576
#, c-format
msgid "%d unit selected"
msgid_plural "%d units selected"
msgstr[0] "%d üksus valitud"
msgstr[1] "%d üksust valitud"
-#: client/text.c:730 client/gui-sdl/mapview.c:581
+#: client/text.c:789 client/gui-sdl/mapview.c:581
msgid "No units selected."
msgstr "Ühtegi üksust pole valitud."
-#: client/text.c:804 client/gui-sdl/mapview.c:654
+#: client/text.c:863 client/gui-sdl/mapview.c:654
#, c-format
msgid "Others: %d civil; %d military"
msgstr ""
-#: client/text.c:806 client/gui-sdl/mapview.c:656
+#: client/text.c:865 client/gui-sdl/mapview.c:656
#, c-format
msgid "Others: %d civilian"
msgstr ""
-#: client/text.c:808 client/gui-sdl/mapview.c:658
+#: client/text.c:867 client/gui-sdl/mapview.c:658
#, c-format
msgid "Others: %d military"
msgstr ""
-#: client/text.c:839
+#: client/text.c:898
msgid "No units to upgrade!"
msgstr "Pole ühtki uuendamist vajavat üksust!"
-#: client/text.c:864
+#: client/text.c:923
msgid "None of these units may be upgraded."
msgstr "Neid üksusi ei saa uuendada."
-#: client/text.c:870
+#: client/text.c:929
#, c-format
msgid ""
"Upgrade %d unit for %d gold?\n"
@@ -9768,72 +9833,72 @@ msgstr[1] ""
"Kas uuendada %d üksust %d raha eest?\n"
"Meil on hetkel %d raha."
-#: client/text.c:891
+#: client/text.c:950
msgid "Shows your progress in researching the current technology."
msgstr "Näitab tehnoloogia avastamise hetkeseisu."
-#: client/text.c:897
+#: client/text.c:956
msgid "no research target."
msgstr ""
#. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:900
+#: client/text.c:959
#, c-format
msgid "%s: %d/%d."
msgstr ""
-#: client/text.c:920
+#: client/text.c:979
msgid "Shows the progress of global warming:"
msgstr "Näitab globaalse soojenemise arengut:"
-#: client/text.c:921
+#: client/text.c:980
#, c-format
msgid "Pollution rate: %d%%"
-msgstr "Reostuse määr: %d%%"
+msgstr "Saastamise määr: %d%%"
-#: client/text.c:923
+#: client/text.c:982
#, c-format
msgid "Chance of catastrophic warming each turn: %d%%"
msgstr "Tõenäosus katastroofiliseks soojenemiseks igal käigul: %d%%"
-#: client/text.c:939
+#: client/text.c:998
msgid "Shows the progress of nuclear winter:"
msgstr "Näitab tuumatalve arengut:"
-#: client/text.c:940
+#: client/text.c:999
#, c-format
msgid "Fallout rate: %d%%"
msgstr "Tuumajäätmete määr: %d%%"
-#: client/text.c:942
+#: client/text.c:1001
#, c-format
msgid "Chance of catastrophic winter each turn: %d%%"
msgstr "Tõenäosus katastroofiliseks talveks igal käigul: %d"
-#: client/text.c:957
+#: client/text.c:1016
msgid "Shows your current government:"
msgstr "Näitab su praegust valitsus:"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:981
+#: client/text.c:1040
#, c-format
msgid "Population: %5d"
msgstr "Rahvaarv: %5d"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:1043
#, c-format
msgid "Support: %5d %%"
msgstr ""
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:1047
#, c-format
msgid "Energy: %5d %%"
msgstr ""
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:992
+#: client/text.c:1051
#, c-format
msgid "Mass: %5d ton"
msgid_plural "Mass: %5d tons"
@@ -9841,96 +9906,97 @@ msgstr[0] "Mass: %5d tonn"
msgstr[1] "Mass: %5d tonni"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1057
#, c-format
msgid "Travel time: %5.1f years"
msgstr "Reisu aeg: %5.1f aastat"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1061
msgid "Travel time: N/A "
msgstr "Reisu aeg: Ei tea "
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1065
#, c-format
msgid "Success prob.: %5d %%"
msgstr "Edu võimalus: %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1010
+#: client/text.c:1069
#, c-format
msgid "Year of arrival: %8s"
msgstr "Saabumise aasta %8s"
-#: client/text.c:1030
+#: client/text.c:1089
msgid "?timeout:off"
msgstr "?timeout:väljas"
-#: client/text.c:1054
+#: client/text.c:1113
#, c-format
msgid "?seconds:%02ds"
msgstr "%02ds"
-#: client/text.c:1056
+#: client/text.c:1115
#, c-format
msgid "?mins/secs:%02dm %02ds"
msgstr "%02dm %02ds"
-#: client/text.c:1058
+#: client/text.c:1117
#, c-format
msgid "?hrs/mns:%02dh %02dm"
msgstr "%02dh %02dm"
-#: client/text.c:1060
+#: client/text.c:1119
#, c-format
msgid "?dys/hrs:%02dd %02dh"
msgstr "%02dd %02dh"
-#: client/text.c:1063
+#: client/text.c:1122
msgid "?duration:overflow"
msgstr ""
-#: client/text.c:1084
+#: client/text.c:1143
#, c-format
msgid "%6d.%02d ms"
msgstr "%6d.%02d ms"
-#. TRANS: "Republic of the Poles"
-#: client/text.c:1127
-#, c-format
-msgid "%s of the %s"
-msgstr "%s %s-te hulgast"
+#. TRANS: <nation adjective> <government name>.
+#. * E.g. "Polish Republic".
+#: client/text.c:1188
+#, fuzzy, c-format
+msgid "?nationgovernment:%s %s"
+msgstr "Riigikord: %s"
#. TRANS: "Observer: 1985"
-#: client/text.c:1137
+#: client/text.c:1198
#, c-format
msgid "Observer: %s"
msgstr "Pealtvaataja: %s"
-#: client/text.c:1155
+#: client/text.c:1216
msgid "Buildings: "
msgstr "Ehitised: "
-#: client/text.c:1172 client/text.c:1211
+#: client/text.c:1233 client/text.c:1272
msgid "None. "
msgstr "Puudub."
-#: client/text.c:1174 client/text.c:1213
+#: client/text.c:1235 client/text.c:1274
msgid "?clistend:."
msgstr "."
-#: client/text.c:1192
+#: client/text.c:1253
msgid "Wonders: "
msgstr "Ilmaimed: "
-#: client/text.c:1247
+#: client/text.c:1308
#, c-format
msgid "Cities: %d total, %d over threshold of %d cities."
msgstr ""
#. TRANS: 0-21 content [citizen(s)] ...
-#: client/text.c:1251
+#: client/text.c:1312
#, c-format
msgid "%d content before penalty."
msgid_plural "%d content before penalty."
@@ -9938,45 +10004,41 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1257
+#: client/text.c:1318
#, 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."
-#. TRANS: Martial law opening parenthesis
-#: client/text.c:1279
-msgid "Martial law in effect ("
+#: client/text.c:1339
+#, fuzzy
+msgid "Unlimited martial law in effect."
msgstr "Kehtib sõjaolukord ("
-#. TRANS: no [unit] maximum
-#: client/text.c:1284
-msgid "no maximum, "
-msgstr "maksimumi pole, "
-
-#: client/text.c:1287
-#, c-format
-msgid "%d unit maximum, "
-msgid_plural "%d units maximum, "
-msgstr[0] "%d üksust maks, "
-msgstr[1] "%d üksust maks, "
+#: client/text.c:1341
+#, 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"
-#. TRANS: Martial law closing parenthesis
-#: client/text.c:1294
-#, c-format
-msgid "%d per unit). "
-msgstr "%d üksuse kohta). "
+#: client/text.c:1345
+#, 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:1298
+#: client/text.c:1352
msgid "Military units in the field may cause unhappiness. "
msgstr ""
-#: client/text.c:1301
+#: client/text.c:1355
msgid "Military units have no happiness effect. "
msgstr "Sõjaväeüksusi ei mõjuta meeleolu."
-#: client/text.c:1316
+#: client/text.c:1370
#, c-format
msgid "Luxury: %d total."
msgstr "Hüved: kokku %d."
@@ -9999,7 +10061,7 @@ msgid ""
"instead."
msgstr ""
-#: client/tilespec.c:3968
+#: client/tilespec.c:3966
#, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
@@ -10022,12 +10084,12 @@ msgid ""
"have a look."
msgstr ""
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
-#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:599
+#: client/gui-gtk-2.0/cityrep.c:624 client/gui-sdl/citydlg.c:2009
msgid "none"
msgstr ""
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:645
msgid "custom"
msgstr ""
@@ -10194,7 +10256,7 @@ msgid ""
"Incite a revolt for %d gold?\n"
"Treasury contains %d gold."
msgstr ""
-"Algata %d kulla eest ülestõus?\n"
+"Algata %d raha eest ülestõus?\n"
"Meil on %d raha."
#: client/gui-gtk-2.0/diplomat_dialog.c:552
@@ -10334,7 +10396,7 @@ msgstr "_Ava kaubatee"
msgid "Enter Marketplace"
msgstr "Mine turule"
-#: client/gui-gtk-2.0/chatline.c:144 client/gui-win32/chatline.c:134
+#: client/gui-gtk-2.0/chatline.c:218 client/gui-win32/chatline.c:134
#: client/gui-xaw/chatline.c:120
msgid "Cleared output window."
msgstr "Väljundi aken puhastatud"
@@ -10384,7 +10446,7 @@ msgstr "Jäätmed:"
#: client/gui-gtk-2.0/citydlg.c:588 client/gui-win32/citydlg.c:672
msgid "Pollution:"
-msgstr "Reostus:"
+msgstr "Saast:"
#: client/gui-gtk-2.0/citydlg.c:642 client/gui-gtk-2.0/inteldlg.c:191
msgid "_Overview"
@@ -10415,11 +10477,11 @@ msgid "%d/%d %d turns"
msgstr "%d/%d %d käiku"
#: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:821
+#: client/gui-gtk-2.0/cityrep.c:1027
msgid "_Buy"
msgstr "_Osta"
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:869
msgid "_Production"
msgstr "_Toodang"
@@ -10440,12 +10502,12 @@ msgid "Entertainers"
msgstr "Meelelahutajad"
#: client/gui-gtk-2.0/citydlg.c:1029 client/gui-win32/citydlg.c:1989
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2403
msgid "Scientists"
msgstr "Teadlased"
#: client/gui-gtk-2.0/citydlg.c:1030 client/gui-win32/citydlg.c:1991
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2404
msgid "Taxmen"
msgstr "Maksukogujad"
@@ -10538,7 +10600,7 @@ msgstr "Toetatud väed %d"
msgid "Present units %d"
msgstr "Kohaleolevad väed %d"
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:1019
msgid "Cen_ter"
msgstr "Keskele"
@@ -10588,7 +10650,7 @@ msgid ""
"Buy %s for %d gold?\n"
"Treasury contains %d gold."
msgstr ""
-"Ostan %s %d kulla eest?\n"
+"Ostan %s %d raha eest?\n"
"Meil on %d raha. "
#: client/gui-gtk-2.0/citydlg.c:2429 client/gui-gtk-2.0/citydlg.c:2441
@@ -10611,7 +10673,7 @@ msgstr ""
#: client/gui-win32/citydlg.c:957 client/gui-xaw/citydlg.c:2301
#, c-format
msgid "Sell %s for %d gold?"
-msgstr "Müü %s %d kulla eest?"
+msgstr "Müü %s %d raha eest?"
#: client/gui-gtk-2.0/citydlg.c:2496 client/gui-win32/citydlg.c:962
#: data/Freeciv.in:2239
@@ -10627,31 +10689,60 @@ msgstr "Muuda linna nimi"
msgid "What should we rename the city to?"
msgstr "Millise nime peaksime linnale panema ?"
-#: client/gui-gtk-2.0/cityrep.c:699
+#: client/gui-gtk-2.0/cityrep.c:794
+#, fuzzy
+msgid "(no worklists defined)"
+msgstr "(tööde nimekiri)"
+
+#: client/gui-gtk-2.0/cityrep.c:876
msgid "Chan_ge"
msgstr "Vaheta"
-#: client/gui-gtk-2.0/cityrep.c:703
+#: client/gui-gtk-2.0/cityrep.c:880
msgid "Add _First"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:707
+#: client/gui-gtk-2.0/cityrep.c:884
msgid "Add _Next"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:711
+#: client/gui-gtk-2.0/cityrep.c:888
+msgid "Add _2nd Last"
+msgstr ""
+
+#: client/gui-gtk-2.0/cityrep.c:892
msgid "Add _Last"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:715
+#: client/gui-gtk-2.0/cityrep.c:899
+#, fuzzy
+msgid "Set Worklist"
+msgstr "Tööde nimekiri"
+
+#: client/gui-gtk-2.0/cityrep.c:905
+#, fuzzy
+msgid "Append Worklist"
+msgstr "Nimeta tööde nimekiri ümber"
+
+#: client/gui-gtk-2.0/cityrep.c:911
+#, fuzzy
+msgid "Clear _Worklist"
+msgstr "_Tööde nimekiri:"
+
+#: client/gui-gtk-2.0/cityrep.c:916
+#, fuzzy
+msgid "Gover_nor"
+msgstr "Kuberner"
+
+#: client/gui-gtk-2.0/cityrep.c:921
msgid "_Select"
msgstr "_Vali"
-#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
+#: client/gui-gtk-2.0/cityrep.c:925 client/gui-gtk-2.0/plrdlg.c:521
msgid "_Display"
msgstr "_Näita"
-#: client/gui-gtk-2.0/cityrep.c:800 client/gui-gtk-2.0/menu.c:808
+#: 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-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
#: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -10661,100 +10752,100 @@ msgstr "_Näita"
msgid "Cities"
msgstr "Linnad"
-#: client/gui-gtk-2.0/cityrep.c:817
+#: client/gui-gtk-2.0/cityrep.c:1023
msgid "_Inspect"
msgstr "_Vaata"
-#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
-#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-sdl/helpdlg.c:297 client/gui-win32/menu.c:342
-#: client/gui-xaw/menu.c:241
+#: 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
+#: client/gui-gtk-2.0/cityrep.c:1518 client/gui-gtk-2.0/menu.c:823
+#: client/gui-gtk-2.0/menu.c:825 client/gui-gtk-2.0/menu.c:827
+#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:831
+#: client/gui-gtk-2.0/menu.c:833 client/gui-sdl/helpdlg.c:297
+#: client/gui-win32/menu.c:342 client/gui-xaw/menu.c:241
msgid "Improvements"
msgstr "Ehitised"
-#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
-#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
-#: client/gui-xaw/menu.c:247
+#: client/gui-gtk-2.0/cityrep.c:1441 client/gui-gtk-2.0/cityrep.c:1460
+#: client/gui-gtk-2.0/cityrep.c:1479 client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1522 client/gui-xaw/menu.c:247
msgid "Wonders"
msgstr "Ilmaimed"
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1662 client/gui-win32/cityrep.c:439
#: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
msgid "All Cities"
msgstr "Kõik linnad"
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1667 client/gui-win32/cityrep.c:440
msgid "No Cities"
msgstr "Linnu pole"
-#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1672 client/gui-win32/cityrep.c:441
msgid "Invert Selection"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:1420
+#: client/gui-gtk-2.0/cityrep.c:1682
msgid "Building Units"
msgstr "Ehitavad üksusi"
-#: client/gui-gtk-2.0/cityrep.c:1426
+#: client/gui-gtk-2.0/cityrep.c:1688
msgid "Building Improvements"
msgstr "Ehitavad ehitisi"
-#: client/gui-gtk-2.0/cityrep.c:1432
+#: client/gui-gtk-2.0/cityrep.c:1694
msgid "Building Wonders"
msgstr "Ehitavad imesid"
-#: client/gui-gtk-2.0/cityrep.c:1444
+#: client/gui-gtk-2.0/cityrep.c:1706
msgid "Building Unit"
msgstr "Ehitavad seda üksust"
-#: client/gui-gtk-2.0/cityrep.c:1448
+#: client/gui-gtk-2.0/cityrep.c:1710
msgid "Building Improvement"
msgstr "Ehitavad seda ehitist"
-#: client/gui-gtk-2.0/cityrep.c:1452
+#: client/gui-gtk-2.0/cityrep.c:1714
msgid "Building Wonder"
msgstr "Ehitavad seda imet"
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1722 client/gui-win32/cityrep.c:443
msgid "Coastal Cities"
msgstr "Rannikulinnad"
-#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1727 client/gui-win32/cityrep.c:444
msgid "Same Island"
msgstr "Samal saarel"
-#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1737 client/gui-win32/cityrep.c:447
msgid "Supported Units"
msgstr "Toetatud üksused"
-#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1740 client/gui-win32/cityrep.c:454
msgid "Units Present"
msgstr "Kohalolevad väed"
-#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1744 client/gui-win32/cityrep.c:469
msgid "Improvements in City"
msgstr "Ehitised Linnas"
-#: client/gui-gtk-2.0/cityrep.c:1486
+#: client/gui-gtk-2.0/cityrep.c:1748
msgid "Wonders in City"
msgstr "Ilmaimed linnas"
-#: client/gui-gtk-2.0/cityrep.c:1495
+#: client/gui-gtk-2.0/cityrep.c:1757
msgid "Available Units"
msgstr "Saadaolevad väed"
-#: client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1760
msgid "Available Improvements"
msgstr "Saadaolevad ehitised"
-#: client/gui-gtk-2.0/cityrep.c:1501
+#: client/gui-gtk-2.0/cityrep.c:1763
msgid "Available Wonders"
msgstr "Saadaolevad ilmaimed"
-#: client/gui-gtk-2.0/cityrep.c:1625
+#: client/gui-gtk-2.0/cityrep.c:1882
#, fuzzy, c-format
msgid "Total Buy Cost: %d"
msgstr "Kulud kokku: "
@@ -10823,11 +10914,11 @@ 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:186
+#: client/gui-gtk-2.0/dialogs.c:196 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:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
msgid "Inspect _City"
msgstr "Vaata _linna"
@@ -10855,10 +10946,10 @@ msgstr "Vali mille maha lõhkuda:"
msgid "Unit"
msgstr "Ãœksus"
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
-#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
-#: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
-#: manual/civmanual.c:302 data/Freeciv.in:80
+#: 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-win32/plrdlg.c:335 manual/civmanual.c:302 data/Freeciv.in:80
msgid "Name"
msgstr "Nimi"
@@ -10884,7 +10975,7 @@ 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:1036 data/Freeciv.in:3371
+#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
msgid "Pick Nation"
msgstr "Vali rahvus"
@@ -10964,7 +11055,7 @@ msgstr "_Kaardid"
msgid "_Advances"
msgstr ""
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:910
+#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr "_Linnad"
@@ -11069,29 +11160,29 @@ msgstr "Vali sihtkoht"
msgid "Show _All Cities"
msgstr "Näita kõiki linnu"
-#: client/gui-gtk-2.0/gui_main.c:150
+#: client/gui-gtk-2.0/gui_main.c:162
msgid "Show Map Scrollbars"
msgstr "Näita kaardi kerimisribasid"
-#: client/gui-gtk-2.0/gui_main.c:151
+#: client/gui-gtk-2.0/gui_main.c:163
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:155
+#: client/gui-gtk-2.0/gui_main.c:167
msgid "Keyboardless goto"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:156
+#: client/gui-gtk-2.0/gui_main.c:168
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:161
+#: client/gui-gtk-2.0/gui_main.c:173
msgid "Keep dialogs on top"
msgstr "Hoia aknad kõige peal"
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:174
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."
@@ -11099,31 +11190,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:166
+#: client/gui-gtk-2.0/gui_main.c:178
msgid "Show worklist task icons"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:179
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:171
+#: client/gui-gtk-2.0/gui_main.c:183
msgid "Enable status report tabs"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:172
+#: client/gui-gtk-2.0/gui_main.c:184
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:177 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:189 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:178 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:190 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."
@@ -11132,50 +11223,119 @@ msgstr ""
"joonistamiseks. See meetod ei ole aeglasem, kuid nõuab umbes kaks korda "
"rohkem mälu."
-#: client/gui-gtk-2.0/gui_main.c:277 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:195
+msgid "Show time for each chat message"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:196
+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
+msgid "Split bottom notebook area"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:202
+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
+msgid "New message events go to top of list"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:208
+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
+msgid "Show extra message window buttons"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:214
+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 "
+"is disabled, these buttons will not appear (you can still double-click with "
+"the left mouse button or right-click on a row to inspect or goto "
+"respectively). This option will only take effect once the message window is "
+"closed and reopened."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:224
+msgid "Metaserver tab first in network page"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:225
+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
+msgid "Plain chat messages are sent to allies only"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:231
+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 "
+"messages will be sent as public chat messages. To send a public chat message "
+"with this option enabled, prefix the message with a single colon ':'. This "
+"option can also be set using a toggle button beside the chat entry (only "
+"visible in multiplayer games)."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:340 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:723 client/gui-gtk-2.0/gui_main.c:1345
+#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
msgid "Freeciv"
msgstr "Freeciv"
-#: client/gui-gtk-2.0/gui_main.c:1088 client/gui-gtk-2.0/gui_main.c:1095
+#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
#: 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:1095 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1232 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:1127 client/gui-gtk-2.0/menu.c:770
-#: client/gui-gtk-2.0/menu.c:772 client/gui-gtk-2.0/menu.c:774
-#: client/gui-gtk-2.0/menu.c:776 client/gui-gtk-2.0/menu.c:778
-#: client/gui-gtk-2.0/menu.c:780 client/gui-gtk-2.0/menu.c:782
-#: client/gui-gtk-2.0/menu.c:784 client/gui-gtk-2.0/menu.c:786
-#: client/gui-gtk-2.0/menu.c:788 client/gui-gtk-2.0/menu.c:790
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-gtk-2.0/menu.c:804 client/gui-gtk-2.0/menu.c:806
-#: client/gui-gtk-2.0/menu.c:808 client/gui-gtk-2.0/menu.c:810
-#: client/gui-gtk-2.0/menu.c:812 client/gui-gtk-2.0/menu.c:814
-#: client/gui-gtk-2.0/menu.c:816 client/gui-gtk-2.0/menu.c:818
-#: client/gui-gtk-2.0/menu.c:820 client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/gui_main.c:1266 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
+#: client/gui-gtk-2.0/menu.c:811 client/gui-gtk-2.0/menu.c:813
+#: client/gui-gtk-2.0/menu.c:815 client/gui-gtk-2.0/menu.c:817
+#: client/gui-gtk-2.0/menu.c:819 client/gui-gtk-2.0/menu.c:821
+#: client/gui-gtk-2.0/menu.c:823 client/gui-gtk-2.0/menu.c:825
+#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
+#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
+#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
+#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
+#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
+#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
#: data/Freeciv.in:2028
msgid "View"
msgstr "Vaade"
-#: client/gui-gtk-2.0/gui_main.c:1208
+#: client/gui-gtk-2.0/gui_main.c:1359
msgid "Chat"
msgstr "Loba"
-#: client/gui-gtk-2.0/gui_main.c:1224 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1377 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"
@@ -11186,70 +11346,74 @@ 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:1491
+#: client/gui-gtk-2.0/gui_main.c:1392
+msgid "Allies Only"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:1657
msgid "Not _ready"
msgstr "Pole _valmis"
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
+#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
msgid "_Ready"
msgstr "_Valmis"
-#: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2132
+#: 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
msgid "_Start"
msgstr "_Alusta"
-#: client/gui-gtk-2.0/gui_main.c:1520
+#: client/gui-gtk-2.0/gui_main.c:1686
#, fuzzy
msgid "_Take Player"
msgstr "Vali see mängija"
-#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
+#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
msgid "Pick _Nation"
msgstr "Vali _Rahvus"
-#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
+#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
msgid "_Observe"
msgstr "_Vaatle"
-#: client/gui-gtk-2.0/gui_main.c:1532
+#: client/gui-gtk-2.0/gui_main.c:1698
msgid "Do not _observe"
msgstr "Ära _vaatle"
-#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
msgid "<AI>"
msgstr "<tehismõistus>"
-#: client/gui-gtk-2.0/gui_main.c:1557
+#: client/gui-gtk-2.0/gui_main.c:1723
msgid "<Novice AI>"
msgstr "<Algaja tehismõistus>"
-#: client/gui-gtk-2.0/gui_main.c:1560
+#: client/gui-gtk-2.0/gui_main.c:1726
msgid "<Easy AI>"
msgstr "<Kerge tehismõistus>"
-#: client/gui-gtk-2.0/gui_main.c:1563
+#: client/gui-gtk-2.0/gui_main.c:1729
msgid "<Normal AI>"
msgstr "<Normaalne tehismõistus>"
-#: client/gui-gtk-2.0/gui_main.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1732
msgid "<Hard AI>"
msgstr "<Raske tehismõistus>"
-#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1742 client/gui-win32/dialogs.c:594
#: client/gui-xaw/pages.c:217
msgid "Random"
msgstr "Juhuslik"
-#: client/gui-gtk-2.0/gui_main.c:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
msgid "Observer"
msgstr "Vaatleja"
-#: client/gui-gtk-2.0/gui_main.c:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
msgid "Detached"
msgstr "Lahti ühenduund"
-#: client/gui-gtk-2.0/gui_main.c:1899
+#: client/gui-gtk-2.0/gui_main.c:2073
msgid "Are you sure you want to quit?"
msgstr "Ära välju veel, kogu maailm polegi sinu ideoloogiat täis."
@@ -11481,468 +11645,505 @@ msgstr "_Tehnoloogiad"
msgid "Foreign Intelligence: %s Empire"
msgstr "Välisluure: %s impeerium"
-#: client/gui-gtk-2.0/mapctrl.c:195 client/gui-sdl/mapctrl.c:2565
+#: client/gui-gtk-2.0/mapctrl.c:179 client/gui-sdl/mapctrl.c:2565
#: client/gui-sdl/menu.c:839 client/gui-sdl/menu.c:1021
#: client/gui-win32/mapctrl.c:353
msgid "Build New City"
msgstr "Raja uus linn"
-#: client/gui-gtk-2.0/mapctrl.c:196 client/gui-sdl/mapctrl.c:2594
+#: client/gui-gtk-2.0/mapctrl.c:180 client/gui-sdl/mapctrl.c:2594
#: client/gui-win32/mapctrl.c:354 client/gui-xaw/mapctrl.c:89
msgid "What should we call our new city?"
msgstr "Mis on uue linna nimi?"
-#: client/gui-gtk-2.0/mapview.c:147
+#: client/gui-gtk-2.0/mapview.c:158
msgid "Shows your current luxury/science/tax rates;click to toggle them."
msgstr ""
"Näitab su praegusi hüve/teaduse/maksude määrasid. Klõpsa nende "
"ümberlülitamiseks."
-#: client/gui-gtk-2.0/mapview.c:692 client/gui-win32/canvas.c:275
+#: client/gui-gtk-2.0/mapview.c:702 client/gui-win32/canvas.c:275
msgid "Better fog will only work in truecolor. Disabling it"
msgstr "Parem udu töötab ainult truecolor-režiimis. Lülitan välja"
-#: client/gui-gtk-2.0/menu.c:250
+#: client/gui-gtk-2.0/menu.c:256
msgid "Leaving a local game will end it!"
msgstr "Kohalikust mängust lahkumine lõpetab selle!"
-#: client/gui-gtk-2.0/menu.c:700 client/gui-win32/menu.c:303
+#: client/gui-gtk-2.0/menu.c:727 client/gui-win32/menu.c:303
msgid "_Game"
msgstr "_Mäng"
-#: client/gui-gtk-2.0/menu.c:702 client/gui-gtk-2.0/menu.c:704
-#: client/gui-gtk-2.0/menu.c:706 client/gui-gtk-2.0/menu.c:708
-#: client/gui-gtk-2.0/menu.c:710 client/gui-gtk-2.0/menu.c:712
-#: client/gui-gtk-2.0/menu.c:714 client/gui-gtk-2.0/menu.c:717
-#: client/gui-gtk-2.0/menu.c:720 client/gui-gtk-2.0/menu.c:722
-#: client/gui-gtk-2.0/menu.c:724 client/gui-gtk-2.0/menu.c:726
-#: client/gui-gtk-2.0/menu.c:728 client/gui-gtk-2.0/menu.c:730
-#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:736
-#: client/gui-gtk-2.0/menu.c:738 client/gui-gtk-2.0/menu.c:740
+#: client/gui-gtk-2.0/menu.c:729 client/gui-gtk-2.0/menu.c:731
+#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:735
+#: client/gui-gtk-2.0/menu.c:737 client/gui-gtk-2.0/menu.c:739
+#: client/gui-gtk-2.0/menu.c:741 client/gui-gtk-2.0/menu.c:744
+#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
+#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
+#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
+#: client/gui-gtk-2.0/menu.c:760 client/gui-gtk-2.0/menu.c:763
+#: client/gui-gtk-2.0/menu.c:765 client/gui-gtk-2.0/menu.c:767
#: data/Freeciv.in:2026
msgid "Game"
msgstr "Mäng"
-#: client/gui-gtk-2.0/menu.c:704 client/gui-gtk-2.0/menu.c:706
-#: client/gui-gtk-2.0/menu.c:708
+#: client/gui-gtk-2.0/menu.c:731 client/gui-gtk-2.0/menu.c:733
+#: client/gui-gtk-2.0/menu.c:735
msgid "_Chat"
msgstr "_Loba"
-#: client/gui-gtk-2.0/menu.c:706 client/gui-win32/menu.c:314
+#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:314
msgid "_Clear Log"
msgstr "_Puhasta logi"
-#: client/gui-gtk-2.0/menu.c:708 client/gui-win32/menu.c:313
+#: client/gui-gtk-2.0/menu.c:735 client/gui-win32/menu.c:313
msgid "_Write Log"
msgstr "Kirjuta _logi"
-#: client/gui-gtk-2.0/menu.c:710 client/gui-win32/menu.c:304
+#: client/gui-gtk-2.0/menu.c:737 client/gui-win32/menu.c:304
msgid "Local _Options"
msgstr "Lokaalsed _Seaded"
-#: client/gui-gtk-2.0/menu.c:712 client/gui-win32/menu.c:305
+#: client/gui-gtk-2.0/menu.c:739 client/gui-win32/menu.c:305
msgid "_Message Options"
msgstr "_Teadete seaded"
-#: client/gui-gtk-2.0/menu.c:717
+#: client/gui-gtk-2.0/menu.c:744
msgid "_Reload Tileset"
msgstr "Lae ruudustik uuesti"
-#: client/gui-gtk-2.0/menu.c:720
+#: client/gui-gtk-2.0/menu.c:747
msgid "Save Options on _Exit"
msgstr "Salvesta seaded _Väljumisel."
-#: client/gui-gtk-2.0/menu.c:722
+#: client/gui-gtk-2.0/menu.c:749
msgid "Sa_ve Options"
msgstr "_Salvesta seaded"
-#: client/gui-gtk-2.0/menu.c:726 client/gui-win32/menu.c:308
+#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:308
msgid "Server O_ptions"
msgstr "Serveri v_alikud"
-#: client/gui-gtk-2.0/menu.c:730 client/gui-win32/menu.c:310
+#: client/gui-gtk-2.0/menu.c:757 client/gui-win32/menu.c:310
msgid "_Save Game"
msgstr "_Salvesta mäng"
-#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:311
+#: client/gui-gtk-2.0/menu.c:760 client/gui-win32/menu.c:311
msgid "Save Game _As..."
msgstr "Salvesta mäng _kui..."
-#: client/gui-gtk-2.0/menu.c:738
+#: client/gui-gtk-2.0/menu.c:765
msgid "_Leave"
msgstr "_Lahku"
-#: client/gui-gtk-2.0/menu.c:740 client/gui-win32/menu.c:317
+#: client/gui-gtk-2.0/menu.c:767 client/gui-win32/menu.c:317
msgid "_Quit"
msgstr "_Välju"
-#: client/gui-gtk-2.0/menu.c:745 client/gui-win32/menu.c:321
+#: client/gui-gtk-2.0/menu.c:772 client/gui-win32/menu.c:321
msgid "Gov_ernment"
msgstr "Valitsus"
-#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
-#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
-#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:774 client/gui-gtk-2.0/menu.c:776
+#: client/gui-gtk-2.0/menu.c:778 client/gui-gtk-2.0/menu.c:780
+#: client/gui-gtk-2.0/menu.c:782 client/gui-gtk-2.0/menu.c:784
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
#: client/gui-xaw/menu.c:248 data/Freeciv.in:2027 data/helpdata.txt:1320
msgid "Government"
msgstr "Valitsus"
-#: client/gui-gtk-2.0/menu.c:749 client/gui-win32/menu.c:322
+#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:322
msgid "_Tax Rates"
msgstr "_Maksumäärad"
-#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:324
+#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:324
msgid "_Find City"
msgstr "_Leia linn"
-#: client/gui-gtk-2.0/menu.c:755 client/gui-win32/menu.c:325
+#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:325
msgid "_Worklists"
msgstr "_Tööde nimekirjad"
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
-#: client/gui-gtk-2.0/menu.c:764 client/gui-win32/menu.c:327
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
+#: client/gui-gtk-2.0/menu.c:791 client/gui-win32/menu.c:327
msgid "_Change Government"
msgstr "_Muuda valitsust"
-#: client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:788
msgid "_Revolution..."
msgstr "_Revolutsioon..."
-#: client/gui-gtk-2.0/menu.c:764 client/gui-gtk-2.0/menu.c:970
+#: client/gui-gtk-2.0/menu.c:791 client/gui-gtk-2.0/menu.c:1013
#: client/gui-win32/menu.c:431
msgid "_Government"
msgstr "_Valitsus"
-#: client/gui-gtk-2.0/menu.c:768 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:795 client/gui-gtk-2.0/menu.c:959
#: client/gui-win32/menu.c:334
msgid "_View"
msgstr "_Vaade"
-#: client/gui-gtk-2.0/menu.c:772
+#: client/gui-gtk-2.0/menu.c:799
msgid "City Outlines"
msgstr "Linna piirid"
-#: client/gui-gtk-2.0/menu.c:774 client/gui-win32/menu.c:335
+#: client/gui-gtk-2.0/menu.c:801 client/gui-win32/menu.c:335
msgid "Map _Grid"
msgstr "_Kaardiruudustik"
-#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:336
+#: client/gui-gtk-2.0/menu.c:803 client/gui-win32/menu.c:336
msgid "National _Borders"
msgstr "_Riigipiirid"
-#: client/gui-gtk-2.0/menu.c:778 client/gui-win32/menu.c:337
+#: client/gui-gtk-2.0/menu.c:805 client/gui-win32/menu.c:337
msgid "City _Names"
msgstr "Linna_nimed"
-#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:338
+#: client/gui-gtk-2.0/menu.c:807 client/gui-win32/menu.c:338
msgid "City G_rowth"
msgstr "Linna kasv"
-#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:339
+#: client/gui-gtk-2.0/menu.c:809 client/gui-win32/menu.c:339
msgid "City _Productions"
msgstr "Linna toodang"
-#: client/gui-gtk-2.0/menu.c:784 client/gui-sdl/optiondlg.c:1719
+#: client/gui-gtk-2.0/menu.c:811
+#, fuzzy
+msgid "City Buy Cost"
+msgstr "Kulud kokku: "
+
+#: client/gui-gtk-2.0/menu.c:813
+#, fuzzy
+msgid "City Traderoutes"
+msgstr "Kaubateed : "
+
+#: client/gui-gtk-2.0/menu.c:815 client/gui-sdl/optiondlg.c:1719
msgid "Draw city worker map grid"
msgstr "Joonista linna tööliste kaardiruudud"
-#: client/gui-gtk-2.0/menu.c:788 client/gui-sdl/optiondlg.c:1635
+#: client/gui-gtk-2.0/menu.c:819 client/gui-sdl/optiondlg.c:1635
#: client/gui-win32/menu.c:340 client/gui-xaw/menu.c:148
#: client/gui-xaw/menu.c:246 manual/civmanual.c:220 data/helpdata.txt:1220
msgid "Terrain"
msgstr "Maastik"
-#: client/gui-gtk-2.0/menu.c:790 client/gui-win32/menu.c:341
+#: client/gui-gtk-2.0/menu.c:821 client/gui-win32/menu.c:341
#: client/gui-xaw/menu.c:149
msgid "Coastline"
msgstr "Rannajoon"
-#: client/gui-gtk-2.0/menu.c:796 client/gui-win32/menu.c:343
+#: client/gui-gtk-2.0/menu.c:827 client/gui-win32/menu.c:343
msgid "Roads & Rails"
msgstr "Teed & Raudteed"
-#: client/gui-gtk-2.0/menu.c:800 client/gui-sdl/optiondlg.c:1933
+#: client/gui-gtk-2.0/menu.c:831 client/gui-sdl/optiondlg.c:1933
#: client/gui-win32/menu.c:345 client/gui-xaw/menu.c:152
msgid "Mines"
msgstr "Kaevandused"
-#: client/gui-gtk-2.0/menu.c:802 client/gui-win32/menu.c:346
+#: client/gui-gtk-2.0/menu.c:833 client/gui-win32/menu.c:346
msgid "Fortress & Airbase"
msgstr "Kindlused & Lennubaasid"
-#: client/gui-gtk-2.0/menu.c:804 client/gui-win32/menu.c:348
+#: client/gui-gtk-2.0/menu.c:835 client/gui-win32/menu.c:348
#: client/gui-xaw/menu.c:154
msgid "Specials"
msgstr "Spetsiaalid"
-#: client/gui-gtk-2.0/menu.c:806 client/gui-win32/menu.c:349
+#: client/gui-gtk-2.0/menu.c:837 client/gui-win32/menu.c:349
#: client/gui-xaw/menu.c:155
msgid "Pollution & Fallout"
msgstr "Saast & Tuumajäätmed"
-#: client/gui-gtk-2.0/menu.c:812 client/gui-win32/menu.c:352
+#: client/gui-gtk-2.0/menu.c:843 client/gui-win32/menu.c:352
#: client/gui-xaw/menu.c:158
msgid "Focus Unit"
msgstr "Fokusseeri üksus"
-#: client/gui-gtk-2.0/menu.c:814 client/gui-sdl/optiondlg.c:1854
+#: client/gui-gtk-2.0/menu.c:845 client/gui-sdl/optiondlg.c:1854
#: client/gui-win32/menu.c:353 client/gui-xaw/menu.c:159
msgid "Fog of War"
msgstr "Sõjaudu"
-#: client/gui-gtk-2.0/menu.c:818
+#: client/gui-gtk-2.0/menu.c:849
msgid "_Full Screen"
msgstr "_Täisekraan"
-#: client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/menu.c:853
msgid "_Center View"
msgstr "_Tsentreeri vaade"
-#: client/gui-gtk-2.0/menu.c:825 client/gui-win32/menu.c:358
+#: client/gui-gtk-2.0/menu.c:856 client/gui-win32/menu.c:358
msgid "_Orders"
msgstr "_Käsud"
-#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
-#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
-#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
-#: client/gui-gtk-2.0/menu.c:855 client/gui-gtk-2.0/menu.c:857
-#: client/gui-gtk-2.0/menu.c:859 client/gui-gtk-2.0/menu.c:861
-#: client/gui-gtk-2.0/menu.c:863 client/gui-gtk-2.0/menu.c:865
-#: client/gui-gtk-2.0/menu.c:867 client/gui-gtk-2.0/menu.c:869
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875 client/gui-gtk-2.0/menu.c:877
-#: client/gui-gtk-2.0/menu.c:879 client/gui-gtk-2.0/menu.c:881
-#: client/gui-gtk-2.0/menu.c:883 client/gui-gtk-2.0/menu.c:885
-#: client/gui-gtk-2.0/menu.c:887 client/gui-gtk-2.0/menu.c:889
-#: client/gui-gtk-2.0/menu.c:891 client/gui-gtk-2.0/menu.c:893
-#: client/gui-gtk-2.0/menu.c:895 client/gui-gtk-2.0/menu.c:897
-#: client/gui-gtk-2.0/menu.c:899 client/gui-gtk-2.0/menu.c:901
-#: client/gui-gtk-2.0/menu.c:903 data/Freeciv.in:2029
+#: client/gui-gtk-2.0/menu.c:858 client/gui-gtk-2.0/menu.c:860
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:864
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:868
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:872
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:876
+#: client/gui-gtk-2.0/menu.c:878 client/gui-gtk-2.0/menu.c:880
+#: client/gui-gtk-2.0/menu.c:882 client/gui-gtk-2.0/menu.c:884
+#: client/gui-gtk-2.0/menu.c:886 client/gui-gtk-2.0/menu.c:888
+#: client/gui-gtk-2.0/menu.c:890 client/gui-gtk-2.0/menu.c:892
+#: client/gui-gtk-2.0/menu.c:894 client/gui-gtk-2.0/menu.c:896
+#: client/gui-gtk-2.0/menu.c:898 client/gui-gtk-2.0/menu.c:900
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906 client/gui-gtk-2.0/menu.c:908
+#: client/gui-gtk-2.0/menu.c:910 client/gui-gtk-2.0/menu.c:912
+#: client/gui-gtk-2.0/menu.c:914 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:918 client/gui-gtk-2.0/menu.c:920
+#: client/gui-gtk-2.0/menu.c:922 client/gui-gtk-2.0/menu.c:924
+#: client/gui-gtk-2.0/menu.c:926 client/gui-gtk-2.0/menu.c:928
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
+#: client/gui-gtk-2.0/menu.c:946 data/Freeciv.in:2029
msgid "Orders"
msgstr "Käsud"
-#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:1444
+#: client/gui-gtk-2.0/menu.c:860 client/gui-gtk-2.0/menu.c:1489
#: client/gui-win32/menu.c:359
msgid "_Build City"
msgstr "Raja _linn"
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:1466
-#: client/gui-gtk-2.0/menu.c:1472 client/gui-win32/menu.c:360
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:1511
+#: client/gui-gtk-2.0/menu.c:1517 client/gui-win32/menu.c:360
msgid "Build _Road"
msgstr "Ehita Tee"
-#: client/gui-gtk-2.0/menu.c:833 client/gui-gtk-2.0/menu.c:1360
+#: 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 "_Niisuta maa-ala"
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:1361
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:1406
#: client/gui-win32/menu.c:362
msgid "Build _Mine"
msgstr "Ehita Kaevandus"
-#: client/gui-gtk-2.0/menu.c:837 client/gui-gtk-2.0/menu.c:1362
+#: client/gui-gtk-2.0/menu.c:868 client/gui-gtk-2.0/menu.c:1407
msgid "Transf_orm Terrain"
msgstr "_Muuda maastikku"
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:1508
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:1553
#: client/gui-win32/menu.c:364
msgid "Build _Fortress"
msgstr "Ehita _kindlus"
-#: client/gui-gtk-2.0/menu.c:841 client/gui-win32/menu.c:365
+#: client/gui-gtk-2.0/menu.c:872 client/gui-win32/menu.c:365
msgid "Build Airbas_e"
msgstr "Ehita _lennubaas"
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:1514
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:1559
#: client/gui-win32/menu.c:366
msgid "Clean _Pollution"
-msgstr "_Puhasta reostus"
+msgstr "_Puhasta saast"
-#: client/gui-gtk-2.0/menu.c:845 client/gui-win32/menu.c:367
+#: client/gui-gtk-2.0/menu.c:876 client/gui-win32/menu.c:367
msgid "Clean _Nuclear Fallout"
msgstr "Puhasta _tuumajäätmetest"
-#: client/gui-gtk-2.0/menu.c:849 client/gui-win32/menu.c:369
+#: client/gui-gtk-2.0/menu.c:880 client/gui-win32/menu.c:369
msgid "_Sentry"
msgstr "Pea vahti"
-#: client/gui-gtk-2.0/menu.c:855 client/gui-win32/menu.c:372
+#: client/gui-gtk-2.0/menu.c:886 client/gui-win32/menu.c:372
msgid "Make _Homecity"
msgstr "Tee kodulinnaks"
-#: client/gui-gtk-2.0/menu.c:857 client/gui-win32/menu.c:373
+#: client/gui-gtk-2.0/menu.c:888 client/gui-win32/menu.c:373
msgid "_Load"
msgstr "_Lae"
-#: client/gui-gtk-2.0/menu.c:859
+#: client/gui-gtk-2.0/menu.c:890
msgid "_Unload Transporter"
msgstr "_Lae transporter tühjaks"
-#: client/gui-gtk-2.0/menu.c:861 client/gui-win32/menu.c:374
+#: client/gui-gtk-2.0/menu.c:892 client/gui-win32/menu.c:374
msgid "_Unload"
msgstr "Lae maha"
-#: client/gui-gtk-2.0/menu.c:863 client/gui-win32/menu.c:375
+#: client/gui-gtk-2.0/menu.c:894 client/gui-win32/menu.c:375
msgid "Wake up o_thers"
msgstr "Ärata teised"
-#: client/gui-gtk-2.0/menu.c:867
+#: client/gui-gtk-2.0/menu.c:898
msgid "_Auto Settler"
msgstr "Automaatne asunik"
-#: client/gui-gtk-2.0/menu.c:869 client/gui-win32/menu.c:378
+#: client/gui-gtk-2.0/menu.c:900 client/gui-win32/menu.c:378
msgid "Auto E_xplore"
msgstr "Automaatne avastamin_e"
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906
msgid "_Connect"
msgstr "Ü_henda"
-#: client/gui-gtk-2.0/menu.c:871 client/gui-win32/menu.c:380
+#: client/gui-gtk-2.0/menu.c:902 client/gui-win32/menu.c:380
msgid "_Road"
msgstr "_Tee"
-#: client/gui-gtk-2.0/menu.c:873 client/gui-win32/menu.c:381
+#: client/gui-gtk-2.0/menu.c:904 client/gui-win32/menu.c:381
msgid "Rai_l"
msgstr "_Raudtee"
-#: client/gui-gtk-2.0/menu.c:875 client/gui-win32/menu.c:382
+#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:382
msgid "_Irrigate"
msgstr "_Niisuta"
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
msgid "Go _to"
msgstr "_Mine"
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
msgid "_Build city"
msgstr "Raja _linn"
-#: client/gui-gtk-2.0/menu.c:879
+#: client/gui-gtk-2.0/menu.c:910
msgid "Patrol (_Q)"
msgstr "Patrulli (_Q)"
-#: client/gui-gtk-2.0/menu.c:881 client/gui-win32/menu.c:385
+#: client/gui-gtk-2.0/menu.c:912 client/gui-win32/menu.c:385
msgid "_Go to"
msgstr "_Mine"
-#: client/gui-gtk-2.0/menu.c:883
+#: client/gui-gtk-2.0/menu.c:914
msgid "Go\\/Airlift to City"
msgstr "Mine/lenda linna"
-#: client/gui-gtk-2.0/menu.c:885 client/gui-sdl/menu.c:450
+#: client/gui-gtk-2.0/menu.c:916 client/gui-sdl/menu.c:450
#: client/gui-win32/menu.c:387 client/gui-xaw/menu.c:203
msgid "Return to nearest city"
msgstr "Naase lähimasse linna"
-#: client/gui-gtk-2.0/menu.c:889 client/gui-win32/menu.c:389
+#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:389
#: client/gui-xaw/menu.c:205
msgid "Disband Unit"
msgstr "Saada laiali"
-#: client/gui-gtk-2.0/menu.c:891 client/gui-sdl/citydlg.c:532
+#: client/gui-gtk-2.0/menu.c:922 client/gui-sdl/citydlg.c:532
#: data/Freeciv.in:1186
msgid "Upgrade unit"
msgstr "Uuenda üksust"
-#: client/gui-gtk-2.0/menu.c:893
+#: client/gui-gtk-2.0/menu.c:924
msgid "Diplomat\\/Spy Actions"
msgstr "diplomaadi\\/spiooni tegevused"
-#: client/gui-gtk-2.0/menu.c:895 client/gui-sdl/menu.c:399
+#: client/gui-gtk-2.0/menu.c:926 client/gui-sdl/menu.c:399
#: client/gui-win32/menu.c:391 client/gui-xaw/menu.c:209
msgid "Explode Nuclear"
msgstr "Lõhka tuumapea"
-#: client/gui-gtk-2.0/menu.c:899
-msgid "Select same type"
-msgstr "Vali sama tüüp"
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/cityrep.c:882
+msgid "Select"
+msgstr "Vali"
+
+#: client/gui-gtk-2.0/menu.c:934
+#, fuzzy
+msgid "Single"
+msgstr "Džungel"
+
+#: client/gui-gtk-2.0/menu.c:936
+msgid "Same Type On Tile"
+msgstr ""
-#: client/gui-gtk-2.0/menu.c:901 client/gui-win32/menu.c:393
+#: client/gui-gtk-2.0/menu.c:938
+msgid "All On Tile"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:940
+msgid "Same Type On Continent"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:942
+msgid "Same Type Everywhere"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:393
msgid "_Wait"
msgstr "_Oota"
-#: client/gui-gtk-2.0/menu.c:903 client/gui-win32/menu.c:394
+#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:394
#: client/gui-xaw/menu.c:213
msgid "Done"
msgstr "_Valmis"
-#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:398
+#: client/gui-gtk-2.0/menu.c:949 client/gui-win32/menu.c:398
msgid "_Reports"
msgstr "_Raportid"
-#: client/gui-gtk-2.0/menu.c:908 client/gui-gtk-2.0/menu.c:910
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:914
-#: client/gui-gtk-2.0/menu.c:916 client/gui-gtk-2.0/menu.c:918
-#: client/gui-gtk-2.0/menu.c:920 client/gui-gtk-2.0/menu.c:922
-#: client/gui-gtk-2.0/menu.c:924 client/gui-gtk-2.0/menu.c:926
-#: client/gui-gtk-2.0/menu.c:928 client/gui-gtk-2.0/menu.c:930
-#: client/gui-gtk-2.0/menu.c:932 data/Freeciv.in:2030
+#: client/gui-gtk-2.0/menu.c:951 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:957
+#: client/gui-gtk-2.0/menu.c:959 client/gui-gtk-2.0/menu.c:961
+#: client/gui-gtk-2.0/menu.c:963 client/gui-gtk-2.0/menu.c:965
+#: client/gui-gtk-2.0/menu.c:967 client/gui-gtk-2.0/menu.c:969
+#: client/gui-gtk-2.0/menu.c:971 client/gui-gtk-2.0/menu.c:973
+#: client/gui-gtk-2.0/menu.c:975 data/Freeciv.in:2030
msgid "Reports"
msgstr "Raportid"
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:958
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:1001
#: client/gui-win32/menu.c:400 client/gui-win32/menu.c:425
msgid "_Units"
msgstr "Ãœks_used"
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/menu.c:914 client/gui-win32/menu.c:402
+#: client/gui-gtk-2.0/menu.c:957 client/gui-win32/menu.c:402
msgid "_Nations"
msgstr "_Rahvad"
-#: client/gui-gtk-2.0/menu.c:918 client/gui-win32/menu.c:403
+#: client/gui-gtk-2.0/menu.c:961 client/gui-win32/menu.c:403
msgid "_Economy"
msgstr "M_ajandus"
#. TRANS: Research report action
-#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:405
+#: client/gui-gtk-2.0/menu.c:963 client/gui-win32/menu.c:405
msgid "_Research"
msgstr "_Teadus"
-#: client/gui-gtk-2.0/menu.c:924 client/gui-win32/menu.c:407
+#: client/gui-gtk-2.0/menu.c:967 client/gui-win32/menu.c:407
msgid "_Wonders of the World"
msgstr "_Ilmaimed"
-#: client/gui-gtk-2.0/menu.c:926 client/gui-win32/menu.c:408
+#: client/gui-gtk-2.0/menu.c:969 client/gui-win32/menu.c:408
msgid "_Top Five Cities"
msgstr "_Viis vingeimat linna"
-#: client/gui-gtk-2.0/menu.c:928 client/gui-win32/menu.c:409
+#: client/gui-gtk-2.0/menu.c:971 client/gui-win32/menu.c:409
msgid "_Messages"
msgstr "_Teated"
-#: client/gui-gtk-2.0/menu.c:930 client/gui-win32/menu.c:410
+#: client/gui-gtk-2.0/menu.c:973 client/gui-win32/menu.c:410
msgid "_Demographics"
msgstr "_Demograafia"
-#: client/gui-gtk-2.0/menu.c:932 client/gui-gtk-2.0/plrdlg.c:471
+#: client/gui-gtk-2.0/menu.c:975 client/gui-gtk-2.0/plrdlg.c:354
#: client/gui-win32/menu.c:411
msgid "_Spaceship"
msgstr "Ko_smoselaev"
-#: client/gui-gtk-2.0/menu.c:936 client/gui-win32/menu.c:415
+#: client/gui-gtk-2.0/menu.c:979 client/gui-win32/menu.c:415
msgid "_Help"
msgstr "_Abi"
-#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
-#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
-#: client/gui-gtk-2.0/menu.c:946 client/gui-gtk-2.0/menu.c:948
-#: client/gui-gtk-2.0/menu.c:950 client/gui-gtk-2.0/menu.c:952
-#: client/gui-gtk-2.0/menu.c:954 client/gui-gtk-2.0/menu.c:956
-#: client/gui-gtk-2.0/menu.c:958 client/gui-gtk-2.0/menu.c:960
-#: client/gui-gtk-2.0/menu.c:962 client/gui-gtk-2.0/menu.c:964
-#: client/gui-gtk-2.0/menu.c:966 client/gui-gtk-2.0/menu.c:968
-#: client/gui-gtk-2.0/menu.c:970 client/gui-gtk-2.0/menu.c:972
-#: client/gui-gtk-2.0/menu.c:974 client/gui-gtk-2.0/menu.c:976
-#: client/gui-gtk-2.0/menu.c:978 client/gui-gtk-2.0/menu.c:980
+#: client/gui-gtk-2.0/menu.c:981 client/gui-gtk-2.0/menu.c:983
+#: client/gui-gtk-2.0/menu.c:985 client/gui-gtk-2.0/menu.c:987
+#: client/gui-gtk-2.0/menu.c:989 client/gui-gtk-2.0/menu.c:991
+#: client/gui-gtk-2.0/menu.c:993 client/gui-gtk-2.0/menu.c:995
+#: client/gui-gtk-2.0/menu.c:997 client/gui-gtk-2.0/menu.c:999
+#: client/gui-gtk-2.0/menu.c:1001 client/gui-gtk-2.0/menu.c:1003
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-gtk-2.0/menu.c:1007
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-gtk-2.0/menu.c:1011
+#: client/gui-gtk-2.0/menu.c:1013 client/gui-gtk-2.0/menu.c:1015
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-gtk-2.0/menu.c:1019
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-gtk-2.0/menu.c:1023
#: client/gui-gtk-2.0/repodlgs.c:313 client/gui-win32/citydlg.c:1077
#: client/gui-win32/repodlgs.c:289 client/gui-win32/wldlg.c:846
#: data/Freeciv.in:1466 data/Freeciv.in:2031 data/Freeciv.in:2101
@@ -11950,119 +12151,119 @@ msgstr "_Abi"
msgid "Help"
msgstr "Abi"
-#: client/gui-gtk-2.0/menu.c:940 client/gui-win32/menu.c:416
+#: client/gui-gtk-2.0/menu.c:983 client/gui-win32/menu.c:416
msgid "Language_s"
msgstr "_Keeled"
-#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/menu.c:417
+#: client/gui-gtk-2.0/menu.c:985 client/gui-win32/menu.c:417
msgid "Co_nnecting"
msgstr "Ü_hendumine"
-#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:418
+#: client/gui-gtk-2.0/menu.c:987 client/gui-win32/menu.c:418
msgid "C_ontrols"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:419
+#: client/gui-gtk-2.0/menu.c:989 client/gui-win32/menu.c:419
msgid "C_hatline"
msgstr "Vestlus"
-#: client/gui-gtk-2.0/menu.c:948 client/gui-win32/menu.c:420
+#: client/gui-gtk-2.0/menu.c:991 client/gui-win32/menu.c:420
msgid "_Worklist Editor"
msgstr "_Tööde nimekirja redaktor"
-#: client/gui-gtk-2.0/menu.c:950 client/gui-win32/menu.c:421
+#: client/gui-gtk-2.0/menu.c:993 client/gui-win32/menu.c:421
msgid "Citizen _Management"
msgstr "Kodanike _haldus"
-#: client/gui-gtk-2.0/menu.c:952 client/gui-win32/menu.c:422
+#: client/gui-gtk-2.0/menu.c:995 client/gui-win32/menu.c:422
msgid "_Playing"
msgstr "_Mängimine"
-#: client/gui-gtk-2.0/menu.c:956 client/gui-win32/menu.c:424
+#: client/gui-gtk-2.0/menu.c:999 client/gui-win32/menu.c:424
msgid "City _Improvements"
msgstr "_Ehitised"
-#: client/gui-gtk-2.0/menu.c:960 client/gui-win32/menu.c:426
+#: client/gui-gtk-2.0/menu.c:1003 client/gui-win32/menu.c:426
msgid "Com_bat"
msgstr "Võitlemine"
-#: client/gui-gtk-2.0/menu.c:962 client/gui-win32/menu.c:427
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-win32/menu.c:427
msgid "_ZOC"
msgstr "Kontrollitavad alad"
-#: client/gui-gtk-2.0/menu.c:964 client/gui-win32/menu.c:428
+#: client/gui-gtk-2.0/menu.c:1007 client/gui-win32/menu.c:428
msgid "Techno_logy"
msgstr "Tehno_loogia"
-#: client/gui-gtk-2.0/menu.c:966 client/gui-win32/menu.c:429
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-win32/menu.c:429
msgid "_Terrain"
msgstr "Maas_tik"
-#: client/gui-gtk-2.0/menu.c:968 client/gui-win32/menu.c:430
+#: client/gui-gtk-2.0/menu.c:1011 client/gui-win32/menu.c:430
msgid "Won_ders"
msgstr "Ilmaime_d"
-#: client/gui-gtk-2.0/menu.c:972 client/gui-win32/menu.c:432
+#: client/gui-gtk-2.0/menu.c:1015 client/gui-win32/menu.c:432
msgid "Happin_ess"
msgstr "Õnn"
-#: client/gui-gtk-2.0/menu.c:974 client/gui-win32/menu.c:433
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-win32/menu.c:433
msgid "Space _Race"
msgstr "Kosmose _ralli"
-#: client/gui-gtk-2.0/menu.c:978 client/gui-win32/menu.c:435
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-win32/menu.c:435
msgid "_Copying"
msgstr "Koopiate tegemine"
-#: client/gui-gtk-2.0/menu.c:980 client/gui-win32/menu.c:436
+#: client/gui-gtk-2.0/menu.c:1023 client/gui-win32/menu.c:436
msgid "_About"
msgstr "_Info"
-#: client/gui-gtk-2.0/menu.c:1264
+#: client/gui-gtk-2.0/menu.c:1307
#, c-format
msgid "%s..."
msgstr "%s..."
-#: client/gui-gtk-2.0/menu.c:1352
+#: client/gui-gtk-2.0/menu.c:1397
#, c-format
msgid "Change to %s (_I)"
msgstr "Tekita %s (_I)"
-#: client/gui-gtk-2.0/menu.c:1353
+#: client/gui-gtk-2.0/menu.c:1398
#, c-format
msgid "Change to %s (_M)"
msgstr "Tekita %s (_M)"
-#: client/gui-gtk-2.0/menu.c:1354
+#: client/gui-gtk-2.0/menu.c:1399
#, c-format
msgid "Transf_orm to %s"
msgstr "_Muuda %s-iks"
-#: client/gui-gtk-2.0/menu.c:1427
+#: client/gui-gtk-2.0/menu.c:1472
msgid "Help _Build Wonder"
msgstr "Aita ilmaimet ehitada"
-#: client/gui-gtk-2.0/menu.c:1441
+#: client/gui-gtk-2.0/menu.c:1486
msgid "Add to City (_B)"
msgstr "Ãœhine linnaga (_B)"
-#: client/gui-gtk-2.0/menu.c:1449
+#: client/gui-gtk-2.0/menu.c:1494
msgid "Make Trade _Route"
msgstr "Ava kaubatee"
-#: client/gui-gtk-2.0/menu.c:1463
+#: client/gui-gtk-2.0/menu.c:1508
msgid "Build _Railroad"
msgstr "Ehita _raudtee"
-#: client/gui-gtk-2.0/menu.c:1486
+#: client/gui-gtk-2.0/menu.c:1531
msgid "Bu_ild Farmland"
msgstr "Raja põllumaa"
-#: client/gui-gtk-2.0/menu.c:1506
+#: client/gui-gtk-2.0/menu.c:1551
msgid "_Fortify"
msgstr "_Kindlusta"
-#: client/gui-gtk-2.0/menu.c:1512
+#: client/gui-gtk-2.0/menu.c:1557
msgid "_Paradrop"
msgstr "Viska _langevarjuga"
@@ -12096,13 +12297,31 @@ msgstr "Tea"
msgid "Pop"
msgstr "Uues"
-#: client/gui-gtk-2.0/messagewin.c:155 client/gui-sdl/messagewin.c:247
+#: client/gui-gtk-2.0/messagewin.c:186 client/gui-sdl/messagewin.c:247
#: client/gui-win32/messagewin.c:132 client/gui-xaw/menu.c:228
#: data/Freeciv.in:3273 data/Freeciv.in:3274 data/Freeciv.in:3283
msgid "Messages"
msgstr "Teated"
-#: client/gui-gtk-2.0/plrdlg.c:330
+#: client/gui-gtk-2.0/plrdlg.c:317
+msgid "_Meet"
+msgstr "_Kohta"
+
+#: client/gui-gtk-2.0/plrdlg.c:323
+msgid "Cancel _Treaty"
+msgstr "Katkesta _leping"
+
+#: client/gui-gtk-2.0/plrdlg.c:329
+#, fuzzy
+msgid "_Withdraw Vision"
+msgstr "_Võta vaade tagasi"
+
+#: client/gui-gtk-2.0/plrdlg.c:348
+#, fuzzy
+msgid "_Report"
+msgstr "_Raportid"
+
+#: client/gui-gtk-2.0/plrdlg.c:386
msgid "?show:Dead Players"
msgstr "?show:Surnud mängijad"
@@ -12110,264 +12329,268 @@ msgstr "?show:Surnud mängijad"
#. TRANS: Nations report action
#. TRANS: Nations report title
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/plrdlg.c:350 client/gui-sdl/mapctrl.c:1580
+#: client/gui-gtk-2.0/plrdlg.c:406 client/gui-sdl/mapctrl.c:1580
#: client/gui-sdl/plrdlg.c:608 client/gui-win32/plrdlg.c:344
#: client/gui-xaw/menu.c:221 data/Freeciv.in:3192 data/Freeciv.in:3193
msgid "Nations"
msgstr "Rahvused"
-#: client/gui-gtk-2.0/plrdlg.c:443
+#: client/gui-gtk-2.0/plrdlg.c:511
+#, fuzzy
+msgid "Di_plomacy"
+msgstr "Diplomaatia"
+
+#: client/gui-gtk-2.0/plrdlg.c:516
msgid "_Intelligence"
msgstr "Luure_info"
-#: client/gui-gtk-2.0/plrdlg.c:450
-msgid "_Meet"
-msgstr "_Kohta"
-
-#: client/gui-gtk-2.0/plrdlg.c:457
-msgid "Cancel _Treaty"
-msgstr "Katkesta _leping"
-
-#: client/gui-gtk-2.0/plrdlg.c:464
-msgid "_Withdraw vision"
-msgstr "_Võta vaade tagasi"
-
-#: client/gui-gtk-2.0/plrdlg.c:495
+#: client/gui-gtk-2.0/plrdlg.c:526
msgid "_AI"
msgstr "_Tehismõistus"
-#: client/gui-gtk-2.0/plrdlg.c:501
+#: client/gui-gtk-2.0/plrdlg.c:532
msgid "_Toggle AI Mode"
msgstr "_Lülita tehismõistuseks"
-#: client/gui-gtk-2.0/pages.c:208
+#: client/gui-gtk-2.0/pages.c:221
msgid "Start _New Game"
msgstr "_Alusta uut mängu"
-#: client/gui-gtk-2.0/pages.c:214
+#: client/gui-gtk-2.0/pages.c:227
msgid "Start _Scenario Game"
msgstr "Alusta uut s_tsenaariumi"
-#: client/gui-gtk-2.0/pages.c:220
+#: client/gui-gtk-2.0/pages.c:233
msgid "_Load Saved Game"
msgstr "Lae _salvestatud mäng"
-#: client/gui-gtk-2.0/pages.c:229
+#: client/gui-gtk-2.0/pages.c:239
msgid "C_onnect to Network Game"
msgstr "Ühendu _võrgumängu"
-#: client/gui-gtk-2.0/pages.c:236
+#: client/gui-gtk-2.0/pages.c:247
msgid "Connect to Gaming _Zone"
msgstr "Ãœhendu Gaming _Zone'sse"
-#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:300
#: client/gui-xaw/connectdlg.c:326
msgid "Passwords don't match, enter password."
msgstr "Paroolid ei kattu, sisesta parool."
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:779 client/gui-gtk-2.0/pages.c:820
+#: client/gui-win32/connectdlg.c:916
msgid "Server Name"
msgstr "Serveri nimi"
-#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
+#: 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
+#: data/Freeciv.in:96
msgid "Port"
msgstr "Port"
-#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
+#: client/gui-win32/connectdlg.c:917
msgid "Version"
msgstr "Versioon"
-#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
-#: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
+#: 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
msgid "Status"
msgstr "Staatus"
-#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
-#: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
+#: 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
msgid "Players"
msgstr "Mängijaid"
-#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
+#: client/gui-win32/connectdlg.c:918
msgid "Comment"
msgstr "Kommentaar"
-#: client/gui-gtk-2.0/pages.c:747
+#: client/gui-gtk-2.0/pages.c:786
msgid "Local _Area Network"
msgstr "_Kohtvõrk"
-#: client/gui-gtk-2.0/pages.c:783
+#: client/gui-gtk-2.0/pages.c:827
msgid "Internet _Metaserver"
msgstr "Interneti _metaserver"
-#: client/gui-gtk-2.0/pages.c:817
+#: client/gui-gtk-2.0/pages.c:864
msgid "_Host:"
msgstr "_Host:"
-#: client/gui-gtk-2.0/pages.c:834
+#: client/gui-gtk-2.0/pages.c:881
msgid "_Port:"
msgstr "_Port:"
-#: client/gui-gtk-2.0/pages.c:851
+#: client/gui-gtk-2.0/pages.c:898
msgid "_Login:"
msgstr "K_asutajanimi:"
-#: client/gui-gtk-2.0/pages.c:869
+#: client/gui-gtk-2.0/pages.c:916
msgid "Pass_word:"
msgstr "_Parool:"
-#: client/gui-gtk-2.0/pages.c:887
+#: client/gui-gtk-2.0/pages.c:934
msgid "Conf_irm Password:"
msgstr "Kinnita _parool:"
-#: client/gui-gtk-2.0/pages.c:912
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: 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/wldlg.c:800 client/gui-win32/wldlg.c:806
+msgid "Type"
+msgstr "Tüüp"
+
+#: client/gui-gtk-2.0/pages.c:952 client/gui-win32/plrdlg.c:337
+#: data/Freeciv.in:88
+msgid "Host"
+msgstr "Host"
+
+#: client/gui-gtk-2.0/pages.c:981
msgid "C_onnect"
msgstr "_Ãœhendu"
-#: client/gui-gtk-2.0/pages.c:1142
+#: client/gui-gtk-2.0/pages.c:1211
#, c-format
msgid "Connection name: %s"
msgstr "Ãœhenduse nimi: %s"
-#: client/gui-gtk-2.0/pages.c:1145
+#: client/gui-gtk-2.0/pages.c:1214
#, c-format
msgid "Player name: %s"
msgstr "Mängija nimi: %s"
-#: client/gui-gtk-2.0/pages.c:1150
+#: client/gui-gtk-2.0/pages.c:1219
#, c-format
msgid "Host: %s"
msgstr "Masin: %s"
-#: client/gui-gtk-2.0/pages.c:1158
+#: client/gui-gtk-2.0/pages.c:1227
msgid "Player/conn info"
msgstr "Mängija/ühenduse info"
-#: client/gui-gtk-2.0/pages.c:1185
+#: client/gui-gtk-2.0/pages.c:1254
#, c-format
msgid "%s info"
msgstr "%s info"
-#: client/gui-gtk-2.0/pages.c:1196
+#: client/gui-gtk-2.0/pages.c:1265
msgid "Toggle player ready"
msgstr "Lülita mängija valmidust"
-#: client/gui-gtk-2.0/pages.c:1204
+#: client/gui-gtk-2.0/pages.c:1273
msgid "Pick nation"
msgstr "Vali rahvus"
-#: client/gui-gtk-2.0/pages.c:1214
+#: client/gui-gtk-2.0/pages.c:1283
msgid "Observe this player"
msgstr "Vaatle seda mängijat"
-#: client/gui-gtk-2.0/pages.c:1221
+#: client/gui-gtk-2.0/pages.c:1290
msgid "Take this player"
msgstr "Vali see mängija"
-#: client/gui-gtk-2.0/pages.c:1238
+#: client/gui-gtk-2.0/pages.c:1307
msgid "Cut connection"
msgstr "Katkesta ühendus"
-#: client/gui-gtk-2.0/pages.c:1248
+#: client/gui-gtk-2.0/pages.c:1317
msgid "Aitoggle player"
msgstr "Lülita tehismõistusele"
-#: client/gui-gtk-2.0/pages.c:1257
+#: client/gui-gtk-2.0/pages.c:1326
msgid "Remove player"
msgstr "Eemalda mängija"
-#: client/gui-gtk-2.0/pages.c:1268
+#: client/gui-gtk-2.0/pages.c:1337
msgid "Give info access"
msgstr "Anna käsutase info "
-#: client/gui-gtk-2.0/pages.c:1276
+#: client/gui-gtk-2.0/pages.c:1345
msgid "Give ctrl access"
msgstr "Anna käsutase ctrl"
#. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1338
+#: client/gui-gtk-2.0/pages.c:1407
#, c-format
msgid "Put on %s"
msgstr "Lisa %s hulka"
-#: client/gui-gtk-2.0/pages.c:1442
+#: client/gui-gtk-2.0/pages.c:1511
msgid "Number of _Players (including AI):"
msgstr "_Mängijate arv (tehismõistus kaasa arvatud):"
-#: client/gui-gtk-2.0/pages.c:1465
+#: client/gui-gtk-2.0/pages.c:1534
msgid "AI Skill _Level:"
msgstr "_Tehisintellekti tase:"
-#: client/gui-gtk-2.0/pages.c:1481
+#: client/gui-gtk-2.0/pages.c:1550
msgid "Ruleset _Version:"
msgstr "_Reeglistiku versioon:"
-#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
msgid "_More Game Options..."
msgstr "Rohkem mängu_seadeid..."
-#: client/gui-gtk-2.0/pages.c:1514
+#: client/gui-gtk-2.0/pages.c:1583
msgid "Record"
msgstr "Salvesta"
-#: client/gui-gtk-2.0/pages.c:1519
+#: client/gui-gtk-2.0/pages.c:1588
msgid "Rating"
msgstr "Reiting"
-#: client/gui-gtk-2.0/pages.c:1525
+#: client/gui-gtk-2.0/pages.c:1594
msgid "Ready"
msgstr "Valmis"
-#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
-#: data/nation/slovakian.ruleset:26
-msgid "Leader"
-msgstr "Juht"
+#: client/gui-gtk-2.0/pages.c:1601
+#, fuzzy
+msgid "?player:Leader"
+msgstr "?Player:Nimi"
-#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1732 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:1752
+#: client/gui-gtk-2.0/pages.c:1824
msgid "Choose Saved Game to _Load:"
msgstr "Vali salvestatud mäng _laadimiseks:"
-#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
-#: client/gui-gtk-2.0/pages.c:2375
+#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
+#: client/gui-gtk-2.0/pages.c:2451
msgid "_Browse..."
msgstr "Lehitse..."
-#: client/gui-gtk-2.0/pages.c:1839
+#: client/gui-gtk-2.0/pages.c:1911
msgid "Choose a Scenario"
msgstr "Vali stsenaarium"
-#: client/gui-gtk-2.0/pages.c:1926
+#: client/gui-gtk-2.0/pages.c:1998
msgid "Choose a _Scenario:"
msgstr "Vali _stsenaarium:"
-#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
-#: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
-#: client/gui-win32/wldlg.c:806
-msgid "Type"
-msgstr "Tüüp"
-
-#: client/gui-gtk-2.0/pages.c:2101
+#: client/gui-gtk-2.0/pages.c:2173
msgid "Choose a _nation to play:"
msgstr "Vali _rahvus, mida mängida:"
-#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2363 client/gui-win32/menu.c:581
msgid "Select Location to Save"
msgstr "Vali koht salvestamiseks"
-#: client/gui-gtk-2.0/pages.c:2372 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2448 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr "Salvesta mäng"
-#: client/gui-gtk-2.0/pages.c:2413
+#: client/gui-gtk-2.0/pages.c:2489
msgid "Saved _Games:"
msgstr "_Salvestatud mängud:"
-#: client/gui-gtk-2.0/pages.c:2440
+#: client/gui-gtk-2.0/pages.c:2516
msgid "Save _Filename:"
msgstr "Salvestise _failinimi:"
@@ -12412,11 +12635,11 @@ msgstr "Hind"
#: client/gui-gtk-2.0/repodlgs.c:638 client/gui-sdl/repodlgs.c:2031
#: client/gui-win32/repodlgs.c:468
msgid "U Total"
-msgstr "U Total TÕLGIMIND"
+msgstr "Kogumaksumus"
#: client/gui-gtk-2.0/repodlgs.c:708
msgid "Total Cost:"
-msgstr "Kogu maksumus:"
+msgstr "Kogumaksumus:"
#: client/gui-gtk-2.0/repodlgs.c:714
msgid "Sell _Obsolete"
@@ -12714,7 +12937,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:1094
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
msgid "Back"
msgstr "Tagasi"
@@ -12723,7 +12946,7 @@ msgid "Start"
msgstr "Alusta"
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:775
+#: client/gui-win32/connectdlg.c:777
msgid "Load Game"
msgstr "Lae mäng"
@@ -12761,12 +12984,12 @@ msgid "Make new homecity"
msgstr "Tee uueks kodulinnaks"
#: client/gui-sdl/citydlg.c:546 client/gui-sdl/citydlg.c:1418
-#: client/gui-sdl/connectdlg.c:307 client/gui-sdl/connectdlg.c:616
-#: client/gui-sdl/connectdlg.c:802 client/gui-sdl/connectdlg.c:984
+#: 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/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1039
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
#: 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
@@ -12811,7 +13034,7 @@ msgstr "Ostad?"
#: client/gui-sdl/diplodlg.c:1335 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:2427
+#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
#: client/gui-xaw/cityrep.c:666 client/gui-xaw/cma_fe.c:327
#: client/gui-xaw/cma_fe.c:511 client/gui-xaw/cma_fe.c:765
#: client/gui-xaw/messagedlg.c:72 client/gui-xaw/optiondlg.c:76
@@ -12827,7 +13050,7 @@ msgstr "Ei"
#: client/gui-sdl/diplodlg.c:1345 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:2427 client/gui-xaw/cityrep.c:666
+#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
#: client/gui-xaw/cma_fe.c:327 client/gui-xaw/cma_fe.c:511
#: client/gui-xaw/cma_fe.c:765 client/gui-xaw/messagedlg.c:72
#: client/gui-xaw/optiondlg.c:76 client/gui-xaw/optiondlg.c:304
@@ -12848,9 +13071,8 @@ msgid "Sell"
msgstr "Müü"
#: client/gui-sdl/citydlg.c:1734 client/gui-sdl/citydlg.c:3766
-#, fuzzy
msgid "City options"
-msgstr "Linna suvandid"
+msgstr "Linna seaded"
#: client/gui-sdl/citydlg.c:1779
#, c-format
@@ -12874,7 +13096,7 @@ msgstr "Saast : %d"
#: client/gui-sdl/citydlg.c:1935
msgid "Pollution: none"
-msgstr "Reostus: puudub"
+msgstr "Saast: puudub"
#: client/gui-sdl/citydlg.c:1948
msgid "Trade routes: "
@@ -12980,7 +13202,7 @@ msgstr "Linn kasvab: %d %s"
#: client/gui-sdl/citydlg.c:3019 client/gui-sdl/citydlg.c:3131
msgid "Stock"
-msgstr "Tehtud"
+msgstr "Toiduvaru"
#: client/gui-sdl/citydlg.c:3030 data/default/buildings.ruleset:317
#: data/civ2/buildings.ruleset:296 data/civ1/buildings.ruleset:243
@@ -13106,36 +13328,36 @@ msgstr "Kehtib vaid korra"
msgid "Release city"
msgstr "Vabasta linn"
-#: client/gui-sdl/connectdlg.c:238
+#: client/gui-sdl/connectdlg.c:239
msgid "Creating Server List..."
msgstr "Tekitan serverite nimekirja..."
-#: client/gui-sdl/connectdlg.c:279 client/gui-sdl/connectdlg.c:343
+#: client/gui-sdl/connectdlg.c:280 client/gui-sdl/connectdlg.c:344
msgid "No LAN servers found"
msgstr "Ei leidnud kohtvõrgus servereid"
-#: client/gui-sdl/connectdlg.c:281 client/gui-sdl/connectdlg.c:345
+#: client/gui-sdl/connectdlg.c:282 client/gui-sdl/connectdlg.c:346
msgid "No public servers found"
msgstr "Avalikke servereid ei leitud"
-#: client/gui-sdl/connectdlg.c:555
+#: client/gui-sdl/connectdlg.c:556
msgid "Player Name :"
msgstr "Mängija nimi :"
-#: client/gui-sdl/connectdlg.c:571
+#: client/gui-sdl/connectdlg.c:572
msgid "Freeciv Server :"
msgstr "Freecivi server :"
-#: client/gui-sdl/connectdlg.c:588
+#: client/gui-sdl/connectdlg.c:589
msgid "Port :"
msgstr "Port :"
-#: client/gui-sdl/connectdlg.c:608 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr "Ãœhenda"
-#: client/gui-sdl/connectdlg.c:794 client/gui-sdl/connectdlg.c:977
+#: client/gui-sdl/connectdlg.c:795 client/gui-sdl/connectdlg.c:978
#: client/gui-xaw/connectdlg.c:145
msgid "Next"
msgstr "Järgmine"
@@ -13413,8 +13635,8 @@ msgid "Unable to initialize SDL library: %s"
msgstr "Ei suutnud käivitada SDL librat: %s"
#: client/gui-sdl/graphics.c:1021
-#, c-format
-msgid "Unable to initialize SDL_ttf library: %s"
+#, fuzzy, c-format
+msgid "Unable to initialize SDL_ttf library: %s"
msgstr "Ei suutnud käivitada SDL_ttf librat: %s"
#: client/gui-sdl/graphics.c:1058
@@ -13503,14 +13725,6 @@ msgstr "Initsialiseerin klienti"
msgid "Waiting for the beginning of the game"
msgstr "Ootan mängu algust"
-#: client/gui-sdl/gui_string.c:608
-msgid ""
-"Couldn't find stdfont.ttf file. Please link/copy/move anyunicode ttf font to "
-"data dir as stdfont.ttf"
-msgstr ""
-"Ei leidnud faili stdfont.ttf. Palun lingi/kopeeri/liiguta ükskõik milline "
-"unicode ttf font andmekataloogi selliselt, et ta oleks nimega stdfont.ttf"
-
#. TRANS: Future Technology
#: client/gui-sdl/gui_tilespec.c:506
msgid "FT"
@@ -13907,7 +14121,7 @@ msgstr "Langevarjuta"
#: client/gui-sdl/menu.c:697 client/gui-win32/menu.c:1259
#: client/gui-xaw/menu.c:179
msgid "Clean Pollution"
-msgstr "Puhasta reostusest"
+msgstr "Puhasta saastast"
#: client/gui-sdl/menu.c:709 client/gui-xaw/menu.c:178
msgid "Build Airbase"
@@ -13978,7 +14192,7 @@ msgstr ""
#: client/gui-sdl/menu.c:1094 client/gui-sdl/menu.c:1118
msgid "Irrigate to"
-msgstr "Niisuta kuni"
+msgstr "Tekita siia"
#: client/gui-sdl/menu.c:1128
msgid "Plant Forest"
@@ -13986,7 +14200,7 @@ msgstr "Istuta mets"
#: client/gui-sdl/menu.c:1149
msgid "Transform to"
-msgstr "Muuda"
+msgstr "Tekita siia"
#: client/gui-sdl/optiondlg.c:215 client/gui-win32/wldlg.c:325
#: client/gui-xaw/wldlg.c:676
@@ -14101,12 +14315,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:1098 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1100 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:963
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
msgid "Start New Game"
msgstr "Alusta uut mängu"
@@ -14218,8 +14432,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:1081
-#: client/gui-win32/connectdlg.c:1089 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
+#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
msgid "Update"
msgstr "Värskenda vaadet"
@@ -14257,7 +14471,7 @@ msgstr "Lõppraport:"
#: client/gui-sdl/repodlgs.c:3396 client/gui-win32/repodlgs.c:773
#: client/gui-xaw/repodlgs.c:1162
msgid "The Greatest Civilizations in the world."
-msgstr "Vingeim rahvus maailmas."
+msgstr "Vingeimad rahvused maailmas."
#: client/gui-sdl/spaceshipdlg.c:142
#, c-format
@@ -14446,7 +14660,7 @@ msgstr "%d %s"
#: client/gui-sdl/wldlg.c:1395
msgid "shields into gold"
-msgstr "toodang kullaks"
+msgstr "toodang rahaks"
#: client/gui-sdl/wldlg.c:1474
#, c-format
@@ -14675,10 +14889,6 @@ msgstr "Muuda kõik"
msgid "Refresh"
msgstr "Värskenda"
-#: client/gui-win32/cityrep.c:882
-msgid "Select"
-msgstr "Vali"
-
#: client/gui-win32/cityrep.c:883
msgid "Configure"
msgstr "Seadista"
@@ -14728,55 +14938,55 @@ msgstr "Ei suuda laadida salvestatud mängu: %s"
msgid "Verify Password"
msgstr "Kinnita parool"
-#: client/gui-win32/connectdlg.c:912 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr "Freeciv'i serveri valik"
-#: client/gui-win32/connectdlg.c:913
+#: client/gui-win32/connectdlg.c:915
msgid "Local Area Network"
msgstr "Kohtvõrk"
-#: client/gui-win32/connectdlg.c:947
+#: client/gui-win32/connectdlg.c:949
msgid "Welcome to Freeciv"
msgstr "Tere tulemast Freecivi"
-#: client/gui-win32/connectdlg.c:965
+#: client/gui-win32/connectdlg.c:967
msgid "Load Saved Game"
msgstr "Lae salvestatud mäng"
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
msgid "Connect To Network Game"
msgstr "Ühenda võrgumänguga"
-#: client/gui-win32/connectdlg.c:977
+#: client/gui-win32/connectdlg.c:979
msgid "Choose a nation to play"
msgstr "Vali omale rahvus"
-#: client/gui-win32/connectdlg.c:1012
+#: client/gui-win32/connectdlg.c:1014
msgid "Number of players (Including AI):"
msgstr "Mängijate hulk (kaasa arvatud arvuti):"
-#: client/gui-win32/connectdlg.c:1020
+#: client/gui-win32/connectdlg.c:1022
msgid "AI skill level:"
msgstr "Arvuti mänguoskus:"
-#: client/gui-win32/connectdlg.c:1034 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
msgid "Game Options"
msgstr "Mängu seaded"
-#: client/gui-win32/connectdlg.c:1038
+#: client/gui-win32/connectdlg.c:1040
msgid "Start Game"
msgstr "Alusta mängu"
-#: client/gui-win32/connectdlg.c:1057
+#: client/gui-win32/connectdlg.c:1059
msgid "Login:"
msgstr "Kasutajanimi:"
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
msgid "Host:"
msgstr "Server:"
-#: client/gui-win32/connectdlg.c:1060
+#: client/gui-win32/connectdlg.c:1062
msgid "Port:"
msgstr "Port:"
@@ -15030,10 +15240,6 @@ msgid_plural "(idle %d turns)"
msgstr[0] "(jõude %d käik)"
msgstr[1] "(jõude %d käiku)"
-#: client/gui-win32/plrdlg.c:337 data/Freeciv.in:88
-msgid "Host"
-msgstr "Host"
-
#: client/gui-win32/plrdlg.c:355 data/Freeciv.in:3230
msgid "Intelligence"
msgstr "Luureinfo"
@@ -15134,7 +15340,7 @@ msgstr "Tagasi"
#: client/gui-xaw/citydlg.c:204
#, c-format
msgid "Pollution: %3d"
-msgstr "Reostus: %3d"
+msgstr "Saast: %3d"
#: client/gui-xaw/citydlg.c:224
#, c-format
@@ -15604,7 +15810,7 @@ msgstr "Raudtee[TÕLGIMIND]"
#: manual/civmanual.c:227
msgid "Clean pollution"
-msgstr "Puhasta reostus"
+msgstr "Puhasta saast"
#: manual/civmanual.c:227
msgid "Clean fallout"
@@ -15782,15 +15988,15 @@ msgstr "Eemaldan malli?"
#: data/Freeciv.in:1502
msgid "City Options"
-msgstr "Linna suvandid"
+msgstr "Linna seaded"
#: data/Freeciv.in:1512
msgid "Make new citizens into: "
-msgstr "Uued kodanikud hakkavad ametilt:"
+msgstr "Uued kodanikud hakkavad ametilt: "
#: data/Freeciv.in:1520
msgid "Disband if build settler at size 1:"
-msgstr ""
+msgstr "Koli ära, kui tehakse asunikud suuruse 1 puhul:"
#: data/Freeciv.in:1526
msgid "Auto-attack vs land units: "
@@ -16157,7 +16363,7 @@ msgstr ""
" n: puhasta tuumajäätmed\n"
" N: lõhka tuumapomm\n"
" o: transf(o)rm terrain (engineer unit)\n"
-" p: puhasta reostusest (asunikud/töölised)\n"
+" p: puhasta saastast (asunikud/töölised)\n"
" p: (p)aradrop (paratroop units)\n"
" P: (P)illage terrain alteration\n"
" q: unit patrol (then left-click mouse to select destination)\n"
@@ -16811,13 +17017,14 @@ msgstr ""
"suhteid saab luua diplomaatilisi lepinguid sõlmides."
#: data/helpdata.txt:781
+#, fuzzy
msgid ""
-" To have a diplomatic relationship with another player, you must fist "
-"establish first contact with that player. To establish first contact, you "
-"have to move one of your units next to a city or unit belonging to that "
-"player, or vice versa. Unless you establish an embassy with that player, you "
-"may again lose contact with them after a set number of turns without direct "
-"physical contact."
+" To have a diplomatic relationship with another player, you must first "
+"establish contact with that player. To establish contact, you have to move "
+"one of your units next to a city or unit belonging to that player, or vice "
+"versa. Unless you establish an embassy with that player, you may again lose "
+"contact with them after a set number of turns without direct physical "
+"contact."
msgstr ""
" Et teise mängijaga diplomaatilised suhted luua, pead temaga kõigepealt "
"kokku saama. Selleks pead oma üksusega minema tema linna või üksuse "
@@ -18228,7 +18435,7 @@ msgid ""
"contribute significantly to pollution."
msgstr ""
"Tõstab linna toodangut 50%. Samas võib see tähendada ka päris suurt "
-"reostustaseme tõusu."
+"saastamise tõusu."
#: data/default/buildings.ruleset:331 data/civ2/buildings.ruleset:310
#: data/civ1/buildings.ruleset:257
@@ -18270,7 +18477,7 @@ msgid ""
"can only build a Hydro Plant if it is next to (or on) a Mountain or River "
"tile."
msgstr ""
-"Vähendab linnas tootmisest tulenevat reostust 50%. Samutis suurendab linna "
+"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"
@@ -18311,8 +18518,8 @@ msgid ""
"Neutralizes the pollution generated by the population. The population "
"simply has no effect on the pollution generated in the city."
msgstr ""
-"Neutraliseerib elanike poolt tekitatava reostuse. Elanikud ei mõjuta mitte "
-"kuidagi linnas tekkiva reostuse hulka."
+"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/civ1/buildings.ruleset:358
@@ -18342,8 +18549,8 @@ msgid ""
"\n"
"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant."
msgstr ""
-"Vähendab tootmisest tuleneva reostuse hulka 50%. Samuti suurendab tehase ja "
-"manufaktuuri tootlikkust: vabrik ja tuumaelektrijaam annavad 75% lisa; "
+"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 korraga olla ainult üks elektrijaam - päikese- , hüdro-, tuuma- "
@@ -18437,7 +18644,7 @@ msgid ""
msgstr ""
"Tõstab linnas oleva vabriku või manufaktuuri toodangut. Tehas ja manufaktuur "
"koos annavad 75% toodangulisa; tehas, manufaktuur ja elektrijaam kolmekesi "
-"annavad aga 150% boonuse. Toodangu kasv aga võib tekitada rohkem reostust.\n"
+"annavad aga 150% boonuse. Toodangu kasv aga võib tekitada rohkem saasta.\n"
"\n"
"Linnas saab korraga olla ainult üks elektrijaam - päikese- , hüdro-, tuuma- "
"või tavaline elektrijaam."
@@ -18453,7 +18660,7 @@ msgstr "Ümbertöötlemise keskus"
msgid ""
"Building a Recycling Center reduces the amount of pollution generated by "
"production in a city by 66%."
-msgstr "Ümbertöötlemise keskus vähendab linna poolt tekitatavat reostust 66%."
+msgstr "Ümbertöötlemise keskus vähendab linna poolt tekitatavat saasta 66%."
#: data/default/buildings.ruleset:667 data/civ2/buildings.ruleset:631
msgid "Research Lab"
@@ -19079,7 +19286,7 @@ msgid ""
"can only build a Hydro Plant if it is next to (or on) a Mountain or River "
"tile."
msgstr ""
-"Vähendab linnas tootmisest tulenevat reostust 50%. Samutis suurendab linna "
+"Vähendab linnas tootmisest tulenevat saasta 50%. Samutis suurendab linna "
"tehase ja manufaktuuri kogutoodangut: tehas ja hüdroelektrijaam annavad 100% "
"boonuse, kuid tehas, manufaktuur ja hüdroelektrijaam üheskoos annavad 150%-"
"lise toodanguboonuse.\n"
@@ -19103,7 +19310,7 @@ msgid ""
"\n"
"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant."
msgstr ""
-"Vähendab tootmisest tuleneva reostuse hulka 50%. Samuti suurendab tehase ja "
+"Vähendab tootmisest tuleneva saasta hulka 50%. Samuti suurendab tehase ja "
"manufaktuuri tootlikkust: tehas ja tuumaelektrijaam annavad 100% lisa; "
"tehas, manufaktuur ja tuumaelektrijaam koos annavad 150% lisa.\n"
"\n"
@@ -19143,7 +19350,7 @@ msgid ""
msgstr ""
"Tõstab linnas oleva vabriku või manufaktuuri toodangut. Tehas ja manufaktuur "
"koos annavad 100% toodangulisa; tehas, manufaktuur ja elektrijaam kolmekesi "
-"annavad aga 150% boonuse. Toodangu kasv aga võib tekitada rohkem reostust.\n"
+"annavad aga 150% boonuse. Toodangu kasv aga võib tekitada rohkem saasta.\n"
"\n"
"Linnas saab korraga olla ainult üks elektrijaam - päikese- , hüdro-, tuuma- "
"või tavaline elektrijaam."
@@ -19172,10 +19379,9 @@ msgid ""
"A city can only have one Solar Plant, Hydro Plant, Power Plant, or Nuclear "
"Plant."
msgstr ""
-"Eemaldab kogu reostuse, mis tuleneb linnas tootmisest. Samuti suurendab "
-"tehase ja manufaktuuri toodangut. Tehas ja päikeseelektrijaam lisavad "
-"toodangule 100%; manufaktuur, tehas ja päikeseelektrijaam koos annavad lisa "
-"150%.\n"
+"Eemaldab kogu saasta, mis tuleneb linnas tootmisest. Samuti suurendab tehase "
+"ja manufaktuuri toodangut. Tehas ja päikeseelektrijaam lisavad toodangule "
+"100%; manufaktuur, tehas ja päikeseelektrijaam koos annavad lisa 150%.\n"
"\n"
"Linnas saab korraga olla ainult üks elektrijaam - päikese- , hüdro-, tuuma- "
"või tavaline elektrijaam."
@@ -19545,7 +19751,7 @@ msgid "Communism"
msgstr "Kommunism"
#: data/default/governments.ruleset:121 data/civ2/governments.ruleset:118
-#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:26
+#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:27
msgid "Comrade"
msgstr "Seltsimees"
@@ -20360,7 +20566,7 @@ msgstr "Elevandiluu"
#: data/default/terrain.ruleset:608 data/civ2/terrain.ruleset:532
#: data/civ1/terrain.ruleset:566
msgid "Oil"
-msgstr "Õli"
+msgstr "Nafta"
#: data/default/terrain.ruleset:615 data/civ2/terrain.ruleset:546
#: data/civ1/terrain.ruleset:558
@@ -20501,6 +20707,11 @@ msgstr ""
"raisku minna, samuti on asunike ja/või inseneride grupid vaenlase "
"rünnakutele heaks sihtmärgiks."
+#: data/default/units.ruleset:238
+#, fuzzy
+msgid "?unit:Workers"
+msgstr "Töölised"
+
#: data/default/units.ruleset:264
msgid ""
"Workers are one of the key units in the game. They can be used to irrigate "
@@ -20517,7 +20728,7 @@ msgid ""
msgstr ""
"Töölised on ühed tähtsamad üksused kogu mängus. Asunike abil saab maid "
"niisutada, ehitada teid, raudteid, kindlusi, kaevandusi ja lennuväebaase. "
-"Samuti saavad asunikud maad puhastada reostusest ja tuumajäätmetest. Asunike "
+"Samuti saavad asunikud maad puhastada saastast ja tuumajäätmetest. Asunike "
"ülalpidamiseks kulub nii toitu kui toodangut, asunik võib nälga surra, kui "
"tema kodulinnas saab toit otsa.\n"
"\n"
@@ -21161,6 +21372,11 @@ msgstr "Rändur"
msgid "Explorers are very useful for mapping unknown territory."
msgstr "Rändur on väga kasulik kaardistamata territooriumi avastamiseks."
+#: data/default/units.ruleset:1864
+#, fuzzy
+msgid "?unit:Leader"
+msgstr "Juht"
+
#: data/default/units.ruleset:1892
msgid "This is you. If you lose this unit, you lose the game. So don't."
msgstr ""
@@ -21212,9 +21428,9 @@ msgid ""
msgstr ""
"Asunikud on ühed tähtsamad üksused kogu mängus. Asunike abil saad luua uusi "
"linnu, maid niisutada, ehitada teid, raudteid, kaevandusi, lennuväebaase ja "
-"kindlusi. Samuti saavad asunikud maad puhastada reostusest ja "
-"tuumajäätmetest. Asunike ülalpidamiseks kulub nii toitu kui toodangut, "
-"asunik võib nälga surra, kui tema kodulinnas saab toit otsa.\n"
+"kindlusi. Samuti saavad asunikud maad puhastada saastast ja tuumajäätmetest. "
+"Asunike ülalpidamiseks kulub nii toitu kui toodangut, asunik võib nälga "
+"surra, kui tema kodulinnas saab toit otsa.\n"
"\n"
"Asunikud ja insenerid oskavad suuremate projektide kiirema valmimise huvides "
"koostööd teha. Kui kaks või rohkem asunikku ja/või inseneri töötavad sama "
@@ -21294,9 +21510,9 @@ msgid ""
msgstr ""
"Asunikud on ühed tähtsamad üksused kogu mängus. Asunike abil saad luua uusi "
"linnu, maid niisutada, ehitada teid, raudteid ja kindlusi. Samuti saavad "
-"asunikud maad puhastada reostusest ja tuumajäätmetest. Asunike "
-"ülalpidamiseks kulub nii toitu kui toodangut, asunik võib nälga surra, kui "
-"tema kodulinnas saab toit otsa.\n"
+"asunikud maad puhastada saastast ja tuumajäätmetest. Asunike ülalpidamiseks "
+"kulub nii toitu kui toodangut, asunik võib nälga surra, kui tema kodulinnas "
+"saab toit otsa.\n"
"\n"
"Asunikud oskavad suuremate projektide kiirema valmimise huvides koostööd "
"teha. Kui kaks või rohkem asunikku töötavad sama ruudukese kallal, siis "
@@ -21422,7 +21638,7 @@ msgid "Emir"
msgstr "Emiir"
#: data/nation/afghani.ruleset:25 data/nation/slovakian.ruleset:30
-#: data/nation/soviet.ruleset:27
+#: data/nation/soviet.ruleset:28
msgid "General Secretary"
msgstr "Peasekretär"
@@ -21538,10 +21754,11 @@ msgid "?plural:Armenians"
msgstr "?plural:Armeenlased"
#: 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 "
-"independence from Soviet in 1991 AD"
+"independence from the Soviet Union in 1991."
msgstr ""
"Legendi järgi on armeenlased Haiki (Noa pojapojapojapojapoja) järeltulijad. "
"Tänapäeva Armeenia Vabariik saavutas iseseisvuse NSVList 1991. aastal pKr."
@@ -22596,12 +22813,11 @@ msgstr "?plural:Illüürlased"
#: 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 the Dalmatians to the north, "
-"Corcyra island and Ambracia bay in prehistoric Epirus to the south, mixing "
-"with Thracians in Dardania to the east, and settling Messapia across the "
-"Adriatic Sea. Illyrian kingdoms were independent for centuries, until "
-"conquered by the Roman Republic."
+"Illyrians were Indo-European tribes who appeared in the western part of the "
+"Balkan Peninsula before 1000 BC, including Corcyra island and Ambracia bay "
+"in prehistoric Epirus to the south. They mixed with Thracians in Dardania to "
+"the east, and settled Messapia across the Adriatic Sea. Illyrian kingdoms "
+"were independent for centuries, until conquered by the Roman Republic."
msgstr ""
"Illüürlased olid Indo-Euroopa hõimud, kes asusid veidi enne 1000. a. e.m.a "
"elama Balkani poolsaarele."
@@ -22925,7 +23141,7 @@ msgstr ""
"riigiks, kuid tänapäeval on ikkagi Korea poolsaar jagunenud kaheks eraldi "
"riigiks tänu teravnenud olukorrale pärast Korea sõda 1953. aastal."
-#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:28
+#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:29
msgid "Great Leader"
msgstr "Suur Juht"
@@ -23096,12 +23312,13 @@ msgid "?plural:Malians"
msgstr "Malilased"
#: 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 "
-"called the Sahelian kingdoms. Of these, the Islamic Mali empire with it's "
+"called the Sahelian kingdoms. Of these, the Islamic Mali empire with its "
"capital in Timbuktu was the most influential. This empire reigned from the "
-"14th to the 17th century and was famed for it's wealth and benevolent kings. "
+"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 ""
"Sahhaara kõrbest lõunasse jääv piirkond on juba tuhat aastat olnud erinevate "
@@ -23173,9 +23390,10 @@ msgid "?plural:Mayas"
msgstr "Maiad"
#: data/nation/mayan.ruleset:6
+#, fuzzy
msgid ""
-"The Mayans were a Mesoamerican civilization. Famous for building great "
-"pyramids and palaces in the jungle."
+"The Mayans were a Mesoamerican civilization. They are famous for building "
+"great pyramids and palaces in the jungle."
msgstr ""
"Maiad olid Kesk-Ameerika tsivilisatsioon, tuntud oma hiiglaslike püramiidide "
"ja džunglis asuvate paleede poolest."
@@ -23723,6 +23941,14 @@ msgstr ""
"Slovakkia on riik Euroopa südames. Endine Tšehhoslovakkia osa, samuti oli ta "
"kuni 1918. aastani Austria-Ungari impeeriumi osa."
+#: data/nation/slovakian.ruleset:26
+msgid "?male:Leader"
+msgstr "?male:Juht"
+
+#: data/nation/slovakian.ruleset:26
+msgid "?female:Leader"
+msgstr "?female:Juht"
+
#: data/nation/slovakian.ruleset:29
msgid "Pope"
msgstr "Paavst"
@@ -23769,17 +23995,19 @@ msgstr "Sovjetid"
#: data/nation/soviet.ruleset:6
msgid ""
-"Soviet Union's history starts in November 1917, when under Lenin's "
+"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 "
-"republics integrated into one country. Soviet Union became one of most "
-"powerful states in the 20th century. But by the end of 1991 due to many "
-"social shocks it disintegrated into fifteen independent countries"
+"republics integrated into one country. The Soviet Union became one of most "
+"powerful states in the 20th century, but by the end of 1991 it had "
+"disintegrated into fifteen independent countries due to social and economic "
+"problems."
msgstr ""
"Nõukogude Liidu ajalugu sai alguse 1917. a. novembris, kui Lenini juhtimisel "
"korraldasid bolševikud revolutsiooni. 1922. a. 31. detsembril ühinesid neli "
"Nõukogude vabariiki üheks suureks riigiks. Nõukogude Liidust sai üks 20-nda "
-"sajandi võimsamaid riike. Aga 1991.a. lõpul lagunes Nõukogude Liit mitmete "
-"sotsiaalsete šokkide tagajärjel viietestkümneks iseseisvaks riigiks."
+"sajandi võimsamaid riike, kuid 1991.a. lõpul lagunes Nõukogude Liit mitmete "
+"sotsiaalsete ja majanduslike probleemide tagajärjel viietestkümneks "
+"iseseisvaks riigiks."
#: data/nation/spanish.ruleset:3
msgid "Spanish"
@@ -24209,9 +24437,10 @@ msgid "?plural:Westphalians"
msgstr "?plural:Vestfaallased"
#: data/nation/westphalian.ruleset:6
+#, fuzzy
msgid ""
-"Westphalia, before becoming a Prussian province, was the western region the "
-"duchy of Saxony. Present-day it consists of the Northern part of the largest "
+"Westphalia, before becoming a Prussian province, was the western region of "
+"the duchy of Saxony. Today it makes up the northern part of the largest "
"German federal state, North Rhine-Westphalia."
msgstr ""
"Vestfaal oli enne Preisimaa provintsiks saamist Saksi hertsogiriigi "
@@ -24393,6 +24622,7 @@ msgstr ""
"Kui Kasarmud saavad valmis, hakatakse kohe treenima sõjaüksusi."
#: data/scenario/tutorial.sav:83
+#, fuzzy
msgid ""
"Another city! You are really getting the hang of this. You\n"
"probably have a pretty good idea what to do with new cities by\n"
@@ -24401,7 +24631,7 @@ msgid ""
"The flag and background color indicate what civilization the city\n"
"belongs to (this will be useful when you meet other civilizations).\n"
"The top row of the bar also shows the name and size of the city, and\n"
-"will show one or more starts to indicate if there are units in the\n"
+"will show one or more stars to indicate if there are units in the\n"
"city. The bottom row shows what the city is building, and how long it\n"
"will take; it also shows how long the city will take to grow to the\n"
"next largest size."
@@ -24456,7 +24686,7 @@ msgstr ""
"\n"
"Kui su linn toodab asunikke, siis peaksid praegu mõtlema \n"
"hoopis nende ostmisele. Ava linna dialoogiaken ja vajuta Osta \n"
-"nuppu. Sellega saad tootmise kulla eest (kui sul seda piisavalt \n"
+"nuppu. Sellega saad tootmise raha eest (kui sul seda piisavalt \n"
"on) koheselt lõpule viia."
#: data/scenario/tutorial.sav:127
@@ -24485,7 +24715,7 @@ msgstr ""
"töötatakse ja kui palju toitu, toodangut ja kaubandust ruut pakub.\n"
"Toitu kasutatakse linna kasvamisel, toodang kulub ehitiste ja\n"
"üksuste tootmiseks, kaubandusest saab makse, mida kasutatakse\n"
-"teadustööks, kulla saamiseks või naudinguteks.\n"
+"teadustööks, raha saamiseks või naudinguteks.\n"
"\n"
"Vajuta kasutusel oleval ruudul, et ruut vabastada. Seejärel vajuta\n"
"tühjal ruudul, et tööline sinna tööle saata. Otse loomulikult saad\n"
@@ -24494,12 +24724,12 @@ msgstr ""
"on pakkuda naudinguid (naudingutest pole hetkel kasu, hiljem aga küll)."
#: data/scenario/tutorial.sav:145
-#, c-format
+#, fuzzy, c-format
msgid ""
"Now your city has grown to size five. As cities get larger unrest\n"
"becomes a problem. A city of this size will usually have one unhappy\n"
"citizen unless pacifying effects are used; meaning one entertainer\n"
-"specialist is required to keep your citzens content. This is basically\n"
+"specialist is required to keep your citizens content. This is basically\n"
"a wasted citizen.\n"
"\n"
"There are several things that can be done about this. One quick fix\n"
@@ -24608,6 +24838,7 @@ msgstr ""
"infost maastiku peatükist."
#: data/scenario/tutorial.sav:222
+#, fuzzy
msgid ""
"Your second Settlers should also be used to build a new city.\n"
"Notice how when you move the Settlers away from your existing cities\n"
@@ -24617,7 +24848,7 @@ msgid ""
"existing cities. Generally when building new cities you want to make\n"
"sure that all tiles are covered by at least one city, but after that\n"
"it is best that your cities overlap as little as possible. Spreading\n"
-"out cities properly gives each city access to more resrouces, allowing\n"
+"out cities properly gives each city access to more resources, allowing\n"
"them to grow to larger sizes."
msgstr ""
"Asunikke on mõistlik kasutada linnade rajamiseks. Loodetavasti\n"
@@ -24990,6 +25221,70 @@ msgstr "Meeskond 30"
msgid "Team 31"
msgstr "Meeskond 31"
+#, fuzzy
+#~ msgid "%s territory"
+#~ msgstr "%s-ide territoorium"
+
+#~ msgid "%s territory (%d turn cease-fire)"
+#~ msgid_plural "%s territory (%d turn cease-fire)"
+#~ msgstr[0] "Rahvuse %s territoorium (%d käigu pikkune vaherahu)"
+#~ msgstr[1] "Rahvuse %s territoorium (%d käigu pikkune vaherahu)"
+
+#, fuzzy
+#~ msgid "%s territory (%s)"
+#~ msgstr "Maaomanik %s %s"
+
+#~ msgid "City: %s (%s)"
+#~ msgstr "Linn: %s (%s)"
+
+#, fuzzy
+#~ msgid "Unit: %s (%s)"
+#~ msgstr "Ãœksus: %s (%s)"
+
+#, fuzzy
+#~ msgid "Auth config filename \"%s\" not allowed!"
+#~ msgstr "See nimi pole lubatud."
+
+#~ msgid "The %s of the %s (%s)"
+#~ msgstr "%s rahvusel %s (%s)"
+
+#~ msgid ""
+#~ "Illegal alliance structure detected: %s alliance to %s reduced to peace "
+#~ "treaty."
+#~ msgstr ""
+#~ "Leitud vigane liitlaste struktuur: rahva %s liit rahvaga %s muudeti "
+#~ "rahuleppeks."
+
+#~ msgid "And, became more experienced!"
+#~ msgstr " ja sai kogenumaks!"
+
+#~ msgid "We can't take control of server, attempting to kill it."
+#~ msgstr "Me ei saa serveri üle võimu, üritan maha tappa."
+
+#~ msgid "%s of the %s"
+#~ msgstr "%s %s-te hulgast"
+
+#~ msgid "no maximum, "
+#~ msgstr "maksimumi pole, "
+
+#~ msgid "%d unit maximum, "
+#~ msgid_plural "%d units maximum, "
+#~ msgstr[0] "%d üksust maks, "
+#~ msgstr[1] "%d üksust maks, "
+
+#~ msgid "%d per unit). "
+#~ msgstr "%d üksuse kohta). "
+
+#~ msgid "Select same type"
+#~ msgstr "Vali sama tüüp"
+
+#~ msgid ""
+#~ "Couldn't find stdfont.ttf file. Please link/copy/move anyunicode ttf font "
+#~ "to data dir as stdfont.ttf"
+#~ msgstr ""
+#~ "Ei leidnud faili stdfont.ttf. Palun lingi/kopeeri/liiguta ükskõik milline "
+#~ "unicode ttf font andmekataloogi selliselt, et ta oleks nimega stdfont.ttf"
+
#~ msgid "Units: "
#~ msgstr "Ãœksused: "
@@ -25090,9 +25385,6 @@ msgstr "Meeskond 31"
#~ msgid ", nation %s"
#~ msgstr ", rahvus %s"
-#~ msgid ", team %s"
-#~ msgstr ", meeskond %s"
-
#~ msgid "_Map"
#~ msgstr "_Kaart"
diff --git a/po/fa.gmo b/po/fa.gmo
index 5a49c35..c3d3d4b 100644
Binary files a/po/fa.gmo and b/po/fa.gmo differ
diff --git a/po/fa.po b/po/fa.po
index d1d0d16..494538a 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: fa\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 07:45+0900\n"
+"POT-Creation-Date: 2009-03-29 21:13+0900\n"
"PO-Revision-Date: 2007-08-11 02:17+0300\n"
"Last-Translator: Arman Ordookhani <arman_o71 at Yahoo.com>\n"
"Language-Team: Farsi(Persian)\n"
@@ -638,7 +638,7 @@ msgid "Road"
msgstr "جاده"
#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
-#: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
+#: client/gui-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"
@@ -655,7 +655,7 @@ msgid "Mine"
msgstr "معدن"
#: common/terrain.c:396 common/unit.c:548 server/report.c:124
-#: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
+#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr "آلودگی"
@@ -701,7 +701,7 @@ msgstr "تقویت شده"
msgid "Sentry"
msgstr "نگهبانی"
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:851 client/gui-sdl/menu.c:648
+#: common/unit.c:566 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 "غارت"
@@ -718,7 +718,7 @@ msgstr "گشتن"
msgid "Transform"
msgstr "تبدیل"
-#: common/unit.c:584 client/text.c:106 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:584 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 "ناشناخته"
@@ -791,11 +791,11 @@ msgstr "بمب اتم"
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1406
+#: common/unittype.c:349 client/helpdata.c:1404
msgid " and "
msgstr " Ùˆ "
-#: common/unittype.c:355 client/helpdata.c:1392
+#: common/unittype.c:355 client/helpdata.c:1390
msgid "?and:, "
msgstr "، "
@@ -1345,103 +1345,98 @@ msgstr ""
#: server/auth.c:281
#, c-format
-msgid "Auth config filename \"%s\" not allowed!"
-msgstr ""
-
-#: server/auth.c:286
-#, c-format
msgid "Cannot load auth config file \"%s\"!"
msgstr ""
-#: server/auth.c:397
+#: server/auth.c:392
#, c-format
msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
msgstr ""
-#: server/auth.c:404
+#: server/auth.c:399
msgid "Guests are not allowed on this server. Sorry."
msgstr ""
-#: server/auth.c:406
+#: server/auth.c:401
#, c-format
msgid "%s was rejected: Guests not allowed."
msgstr ""
-#: server/auth.c:425
+#: server/auth.c:420
#, c-format
msgid ""
"There was an error reading the user database, logging in as guest connection "
"'%s'."
msgstr ""
-#: server/auth.c:431
+#: server/auth.c:426
msgid ""
"There was an error reading the user database and guest logins are not "
"allowed. Sorry"
msgstr ""
-#: server/auth.c:434
+#: server/auth.c:429
#, c-format
msgid "%s was rejected: Database error and guests not allowed."
msgstr ""
-#: server/auth.c:441
+#: server/auth.c:436
#, c-format
msgid "Enter password for %s:"
msgstr ""
-#: server/auth.c:450
+#: server/auth.c:445
msgid "Enter a new password (and remember it)."
msgstr ""
-#: server/auth.c:456
+#: server/auth.c:451
msgid "This server allows only preregistered users. Sorry."
msgstr ""
-#: server/auth.c:459
+#: server/auth.c:454
#, c-format
msgid "%s was rejected: Only preregister users allowed."
msgstr ""
-#: server/auth.c:488 server/auth.c:547
+#: server/auth.c:483 server/auth.c:542
msgid "Sorry, too many wrong tries..."
msgstr ""
-#: server/auth.c:489
+#: server/auth.c:484
#, c-format
msgid "%s was rejected: Too many wrong password verifies for new user."
msgstr ""
-#: server/auth.c:505
+#: server/auth.c:500
msgid ""
"Warning: There was an error in saving to the database. Continuing, but your "
"stats will not be saved."
msgstr ""
-#: server/auth.c:549
+#: server/auth.c:544
#, c-format
msgid "%s was rejected: Too many wrong password tries."
msgstr ""
-#: server/auth.c:558
+#: server/auth.c:553
msgid "Your password is incorrect. Try again."
msgstr ""
-#: server/auth.c:569
+#: server/auth.c:564
msgid "Sorry, your connection timed out..."
msgstr ""
-#: server/auth.c:571
+#: server/auth.c:566
#, c-format
msgid "%s was rejected: Connection timeout waiting for password."
msgstr ""
-#: server/auth.c:636
+#: server/auth.c:631
#, c-format
msgid "Your password is too short, the minimum length is %d. Try again."
msgstr ""
-#: server/auth.c:642
+#: server/auth.c:637
#, c-format
msgid ""
"The password must have at least %d capital letters, %d numbers, and be at "
@@ -1923,7 +1918,7 @@ msgstr "این سرور %s است."
msgid "You can learn a lot about Freeciv at %s"
msgstr ""
-#: server/civserver.c:206 client/civclient.c:237 manual/civmanual.c:380
+#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
@@ -1948,12 +1943,12 @@ msgstr ""
msgid " -b --bind ADDR\tListen for clients on ADDR\n"
msgstr ""
-#: server/civserver.c:217 client/civclient.c:241
+#: server/civserver.c:217 client/civclient.c:242
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:245
+#: server/civserver.c:221 client/civclient.c:246
msgid " -d, --debug NUM\tSet debug log level (0 to 3)\n"
msgstr ""
@@ -1961,7 +1956,7 @@ msgstr ""
msgid " -f, --file FILE\tLoad saved game FILE\n"
msgstr ""
-#: server/civserver.c:225 client/civclient.c:248 manual/civmanual.c:382
+#: server/civserver.c:225 client/civclient.c:249 manual/civmanual.c:382
msgid " -h, --help\t\tPrint a summary of the options\n"
msgstr ""
@@ -2009,11 +2004,11 @@ msgstr ""
msgid " -R, --Ranklog FILE\tUse FILE as ranking logfile\n"
msgstr ""
-#: server/civserver.c:247 client/civclient.c:267 manual/civmanual.c:383
+#: server/civserver.c:247 client/civclient.c:268 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:279
+#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, fuzzy, c-format
@@ -3105,7 +3100,7 @@ msgstr ""
msgid "Sea moving start units are not yet supported. Nobody gets %s."
msgstr ""
-#: server/gamehand.c:310 client/text.c:632
+#: server/gamehand.c:310 client/text.c:691
#, c-format
msgid "Year: %s"
msgstr "سال: %s"
@@ -3370,8 +3365,8 @@ msgstr ""
#: server/plrhand.c:1686
#, c-format
msgid ""
-"Your nation is thrust into civil war, %s is declared the leader of the "
-"rebel states."
+"Your nation is thrust into civil war! %s is declared the leader of the rebel "
+"states."
msgstr ""
#: server/plrhand.c:1707
@@ -3466,7 +3461,7 @@ msgstr "سرعت پژوهش"
msgid "Literacy"
msgstr "سواد"
-#: server/report.c:121 client/cityrepdata.c:526 client/cityrepdata.c:527
+#: server/report.c:121 client/cityrepdata.c:524 client/cityrepdata.c:525
#: client/gui-sdl/cityrep.c:174
msgid "Production"
msgstr "Ù…Øصول"
@@ -3616,7 +3611,7 @@ msgstr ""
msgid "Demography string contains invalid characters. Try \"help demography\"."
msgstr ""
-#: server/report.c:743 server/report.c:766
+#: server/report.c:743 server/report.c:768
msgid "Demographics Report:"
msgstr ""
@@ -3624,10 +3619,12 @@ msgstr ""
msgid "Sorry, the Demographics report is unavailable."
msgstr ""
-#: server/report.c:748
-#, c-format
-msgid "The %s of the %s (%s)"
-msgstr "%s %s (%s("
+#. TRANS: <nation adjective> <government name> (<year>).
+#. * E.g. "Polish Despotism (200 AD)".
+#: server/report.c:750
+#, fuzzy, c-format
+msgid "%s %s (%s)"
+msgstr "%s در %s (%s)\n"
#. TRANS: message about an installation error.
#: server/ruleset.c:163
@@ -3674,14 +3671,6 @@ msgstr ""
msgid "%s had invalid nation; changing to %s."
msgstr ""
-#. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4073
-#, c-format
-msgid ""
-"Illegal alliance structure detected: %s alliance to %s reduced to peace "
-"treaty."
-msgstr ""
-
#: server/settings.c:32
msgid "Geological"
msgstr ""
@@ -4615,8 +4604,8 @@ msgstr "پیشوند Ùایل ذخیره"
#: server/settings.c:1016
msgid ""
-"Automatically saved games will have name \"<prefix><year>.sav\". This "
-"setting sets the <prefix> part."
+"Automatically saved games will have name \"<prefix>-T<turn>-Y<year>.sav\". "
+"This setting sets the <prefix> part."
msgstr ""
#: server/settings.c:1023
@@ -4630,11 +4619,11 @@ msgid ""
"the game."
msgstr ""
-#: server/sernet.c:147
+#: server/sernet.c:150
msgid "Server cannot read standard input. Ignoring input."
msgstr ""
-#: server/sernet.c:922
+#: server/sernet.c:929
#, c-format
msgid "Server: bad address: [%s:%d]."
msgstr ""
@@ -4753,112 +4742,112 @@ msgid ""
"alliance with both."
msgstr ""
-#: server/srv_main.c:928
+#: server/srv_main.c:961
#, c-format
msgid "Failed saving game as %s"
msgstr ""
-#: server/srv_main.c:930
+#: server/srv_main.c:963
#, c-format
msgid "Game saved as %s"
msgstr "بازی با نام %s ذخیره شد"
-#: server/srv_main.c:962
+#: server/srv_main.c:994
msgid "The game is already running."
msgstr "بازی از قبل اجرا شده است."
-#: server/srv_main.c:970
+#: server/srv_main.c:1002
#, c-format
msgid "%s lost control cmdlevel on game start. Use voting from now on."
msgstr ""
-#: server/srv_main.c:977
+#: server/srv_main.c:1009
msgid "Starting game."
msgstr "در Øال شروع بازی"
-#: server/srv_main.c:1039
+#: server/srv_main.c:1071
#, c-format
msgid "request for unknown report (type %d)"
msgstr ""
-#: server/srv_main.c:1104
+#: server/srv_main.c:1136
#, c-format
msgid "Warning: rejecting old client %s"
msgstr ""
-#: server/srv_main.c:1206
+#: server/srv_main.c:1238
#, c-format
msgid "Got a packet of type %d from a dead or observer player"
msgstr ""
-#: server/srv_main.c:1306
+#: server/srv_main.c:1338
msgid "Please choose a non-blank name."
msgstr ""
-#: server/srv_main.c:1322
+#: server/srv_main.c:1354
msgid "That nation is already in use."
msgstr ""
-#: server/srv_main.c:1338
+#: server/srv_main.c:1370
#, c-format
msgid "Another player already has the name '%s'. Please choose another name."
msgstr ""
-#: server/srv_main.c:1359
+#: server/srv_main.c:1391
msgid "Please choose a name containing only ASCII characters."
msgstr ""
-#: server/srv_main.c:1458
+#: server/srv_main.c:1490
#, c-format
msgid "%s nation is not available in this scenario."
msgstr ""
-#: server/srv_main.c:1464
+#: server/srv_main.c:1496
#, c-format
msgid "%s nation is already in use."
msgstr ""
-#: server/srv_main.c:1482
+#: server/srv_main.c:1514
#, c-format
msgid "%s is the %s ruler %s."
msgstr "%s Øاکم %sØŒ %s است."
-#: server/srv_main.c:1538
+#: server/srv_main.c:1570
#, c-format
msgid "Waiting to start game: %d out of %d players are ready to start."
msgstr ""
-#: server/srv_main.c:1582 server/srv_main.c:1586
+#: server/srv_main.c:1614 server/srv_main.c:1618
#, c-format
msgid "%s has been added as %s level AI-controlled player."
msgstr "%s به عنوان بازیکن هوش‌مصنوعی Ø³Ø·Ø %s اضاÙÙ‡ شد."
-#: server/srv_main.c:1728
+#: server/srv_main.c:1760
#, c-format
msgid "Player %d"
msgstr "بازیکن %d"
-#: server/srv_main.c:1739 server/srv_main.c:1745
+#: server/srv_main.c:1771 server/srv_main.c:1777
#, c-format
msgid "%s rules the %s."
msgstr "%s بر %s Øکومت می‌کند."
-#: server/srv_main.c:1910
+#: server/srv_main.c:1942
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
msgstr ""
-#: server/srv_main.c:1961
+#: server/srv_main.c:1993
#, c-format
msgid "Sending info to metaserver [%s]"
msgstr ""
-#: server/srv_main.c:1992
+#: server/srv_main.c:2024
msgid "The game is over..."
msgstr "بازی تمام شد..."
-#: server/srv_main.c:2205
+#: server/srv_main.c:2237
msgid "Now accepting new client connections."
msgstr ""
@@ -5651,24 +5640,24 @@ msgid "Barbarian"
msgstr "بیگانه"
#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2030 client/gui-sdl/plrdlg.c:645
+#: client/gui-gtk-2.0/pages.c:2102 client/gui-sdl/plrdlg.c:645
#: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
msgid "AI"
msgstr "ه‌م"
#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
+#: client/gui-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
msgid "Human"
msgstr "انسان"
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
-#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
+#: 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
msgid "Alive"
msgstr "زنده"
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
#: client/gui-win32/connectdlg.c:200
msgid "Dead"
msgstr "مرده"
@@ -5912,9 +5901,9 @@ 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:242
-#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
-#: client/text.c:1201
+#: 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
#, c-format
msgid "?clistmore:, %s"
msgstr ", %s"
@@ -6161,7 +6150,7 @@ msgstr ""
msgid "Cannot attack from sea."
msgstr ""
-#: server/unithand.c:996 server/unittools.c:2103
+#: server/unithand.c:996 server/unittools.c:2137
msgid "Cannot attack unless you declare war first."
msgstr ""
@@ -6257,100 +6246,101 @@ msgid "%s was upgraded for free to %s."
msgstr "%s مجانی به %s ترÙیع یاÙت."
#: server/unittools.c:297
-#, c-format
-msgid "Not enough gold. %s disbanded"
-msgstr ""
+#, fuzzy, c-format
+msgid "Not enough gold to pay upkeep for %s. Unit disbanded."
+msgstr "شهر %s نمی‌تواند از %s نگهداری کند، مهره منØÙ„ شد."
-#: server/unittools.c:342
+#: server/unittools.c:343
#, c-format
msgid "Your %s has run out of hit points."
msgstr ""
-#: server/unittools.c:358
+#: server/unittools.c:359
#, c-format
msgid "Your %s has been lost on the high seas."
msgstr ""
-#: server/unittools.c:365
+#: server/unittools.c:366
#, c-format
msgid "Your %s survived on the high seas and became more experienced!"
msgstr ""
-#: server/unittools.c:376
+#: server/unittools.c:377
#, c-format
msgid "Your %s has been lost on unsafe terrain."
msgstr ""
-#: server/unittools.c:430
+#: server/unittools.c:431
#, c-format
msgid "Your %s has returned to refuel."
msgstr ""
-#: server/unittools.c:454
+#: server/unittools.c:455
#, c-format
msgid "Your %s has run out of fuel."
msgstr ""
-#. TRANS: And, <the unit> became ...
-#: server/unittools.c:616
-msgid "And, became more experienced!"
-msgstr ""
-
#. TRANS: Your <unit> became ...
-#: server/unittools.c:620
+#: server/unittools.c:619
#, c-format
msgid "Your %s became more experienced!"
msgstr ""
-#: server/unittools.c:1011
+#: server/unittools.c:1009
#, c-format
msgid "Teleported your %s to %s."
msgstr ""
-#: server/unittools.c:1041
+#. TRANS: A unit is moved to resolve stack conflicts.
+#: server/unittools.c:1065
+#, fuzzy, c-format
+msgid "Moved your %s."
+msgstr "قیمت Øرکت"
+
+#: server/unittools.c:1076
#, c-format
msgid "Disbanded your %s."
msgstr ""
-#: server/unittools.c:1363
+#: server/unittools.c:1397
#, c-format
msgid "Unable to defend %s, %s has lost the game."
msgstr ""
-#: server/unittools.c:1367
+#: server/unittools.c:1401
#, c-format
msgid "Losing %s meant losing the game! Be more careful next time!"
msgstr ""
-#: server/unittools.c:1469
+#: server/unittools.c:1503
#, c-format
msgid "%s escaped the destruction of %s, and fled to %s."
msgstr ""
-#: server/unittools.c:1478
+#: server/unittools.c:1512
#, c-format
msgid "%s lost when %s was lost."
msgstr ""
-#: server/unittools.c:1527
+#: server/unittools.c:1561
#, c-format
msgid "Barbarian leader captured, %d gold ransom paid."
msgstr ""
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unittools.c:1545
+#: server/unittools.c:1579
#, c-format
msgid "Your attacking %s succeeded against the %s %s!"
msgstr ""
#. TRANS: "Cannon ... the Polish Destroyer."
-#: server/unittools.c:1554 server/unittools.c:1612
+#: server/unittools.c:1588 server/unittools.c:1646
#, 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:1588
+#: server/unittools.c:1622
#, c-format
msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
msgid_plural ""
@@ -6360,14 +6350,14 @@ msgstr[1] ""
#. TRANS: "Cannon lost when the Polish Destroyer
#. * attacked the German Musketeers."
-#: server/unittools.c:1621
+#: server/unittools.c:1655
#, 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:1636
+#: server/unittools.c:1670
#, c-format
msgid "%s (and %s) lost to an attack from the %s %s."
msgstr ""
@@ -6375,7 +6365,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:1646
+#: server/unittools.c:1680
#, 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."
@@ -6385,192 +6375,192 @@ 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:1660
+#: server/unittools.c:1694
#, 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:1928
+#: server/unittools.c:1962
#, c-format
msgid "Your %s was nuked by %s."
msgstr ""
-#: server/unittools.c:1931 server/unittools.c:1947
+#: server/unittools.c:1965 server/unittools.c:1981
msgid "yourself"
msgstr "شما"
-#: server/unittools.c:1935
+#: server/unittools.c:1969
#, c-format
msgid "The %s %s was nuked."
msgstr ""
-#: server/unittools.c:1944
+#: server/unittools.c:1978
#, c-format
msgid "%s was nuked by %s."
msgstr ""
-#: server/unittools.c:1952
+#: server/unittools.c:1986
#, c-format
msgid "You nuked %s."
msgstr ""
-#: server/unittools.c:1993
+#: server/unittools.c:2027
#, c-format
msgid "The %s detonated a nuke!"
msgstr ""
-#: server/unittools.c:2017
+#: server/unittools.c:2051
#, c-format
msgid "%s transported successfully."
msgstr ""
-#: server/unittools.c:2069
+#: server/unittools.c:2103
msgid "This unit type can not be paradropped."
msgstr ""
-#: server/unittools.c:2079
+#: server/unittools.c:2113
msgid "You cannot paradrop a unit that is transporting other units."
msgstr ""
-#: server/unittools.c:2085
+#: server/unittools.c:2119
msgid "The destination location is not known."
msgstr ""
-#: server/unittools.c:2092
+#: server/unittools.c:2126
#, c-format
msgid "This unit cannot paradrop into %s."
msgstr ""
-#: server/unittools.c:2112
+#: server/unittools.c:2146
#, c-format
msgid "The distance to the target (%i) is greater than the unit's range (%i)."
msgstr ""
-#: server/unittools.c:2123
+#: server/unittools.c:2157
#, c-format
msgid "Your %s paradropped into the %s and was lost."
msgstr ""
-#: server/unittools.c:2136
+#: server/unittools.c:2170
#, c-format
msgid "Your %s was killed by enemy units at the paradrop destination."
msgstr ""
-#: server/unittools.c:2158
+#: server/unittools.c:2192
#, c-format
msgid "You found %d gold."
msgstr "شما %d طلا پیدا کردید."
-#: server/unittools.c:2175
+#: server/unittools.c:2209
#, c-format
msgid "You found %s in ancient scrolls of wisdom."
msgstr "شما %s را در نوشته‌های دانشمندان قدیم پیدا کردید."
-#: server/unittools.c:2182
+#: server/unittools.c:2216
#, c-format
msgid "The %s have acquired %s from ancient scrolls of wisdom."
msgstr "بازی: %s %s را از نوشته‌های دانشمندان قدیم پیدا کردند."
-#: server/unittools.c:2196
+#: server/unittools.c:2230
msgid "A band of friendly mercenaries joins your cause."
msgstr "یک مهره‌ی بی‌طر٠به سپاه شما پیوست."
-#: server/unittools.c:2214
+#: server/unittools.c:2248
msgid "An abandoned village is here."
msgstr "یک کلبه متروکه اینجاست."
-#: server/unittools.c:2224
+#: server/unittools.c:2258
msgid "You have unleashed a horde of barbarians!"
msgstr ""
-#: server/unittools.c:2227
+#: server/unittools.c:2261
#, c-format
msgid "Your %s has been killed by barbarians!"
msgstr "%s شما توسط بیگانگان کشته شد!"
-#: server/unittools.c:2243
+#: server/unittools.c:2277
msgid "You found a friendly city."
msgstr "شما یک شهر دوستانه پیدا کردید."
-#: server/unittools.c:2257
+#: server/unittools.c:2291
msgid "Friendly nomads are impressed by you, and join you."
msgstr ""
-#: server/unittools.c:2282
+#: server/unittools.c:2316
msgid "Your overflight frightens the tribe; they scatter in terror."
msgstr ""
-#: server/unittools.c:2540
+#: server/unittools.c:2574
#, c-format
msgid "Orders for %s aborted after enemy movement was spotted."
msgstr ""
-#: server/unittools.c:2989
+#: server/unittools.c:3023
#, c-format
msgid "Orders for %s aborted as there are units nearby."
msgstr ""
-#: server/unittools.c:3041
+#: server/unittools.c:3075
#, c-format
msgid "Orders for %s aborted because building of city failed."
msgstr ""
-#: server/unittools.c:3054
+#: server/unittools.c:3088
#, c-format
msgid "Orders for %s aborted since they give an invalid activity."
msgstr ""
-#: server/unittools.c:3068
+#: server/unittools.c:3102
#, c-format
msgid "Orders for %s aborted since they give an invalid location."
msgstr ""
-#: server/unittools.c:3078
+#: server/unittools.c:3112
#, c-format
msgid "Orders for %s aborted as there are units in the way."
msgstr ""
-#: server/unittools.c:3104
+#: server/unittools.c:3138
#, c-format
msgid "Orders for %s aborted because of failed move."
msgstr ""
-#: server/unittools.c:3145
+#: server/unittools.c:3179
#, c-format
msgid "Attempt to change homecity for %s failed."
msgstr ""
-#: server/unittools.c:3156
+#: server/unittools.c:3190
#, c-format
msgid "Attempt to establish trade route for %s failed."
msgstr ""
-#: server/unittools.c:3168
+#: server/unittools.c:3202
#, c-format
msgid "Attempt to build wonder for %s failed."
msgstr ""
-#: server/unittools.c:3177
+#: server/unittools.c:3211
#, c-format
msgid "Your %s has invalid orders."
msgstr ""
-#: server/generator/mapgen.c:1737
+#: server/generator/mapgen.c:1771
msgid "High landmass - this may take a few seconds."
msgstr ""
-#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
+#: server/generator/mapgen.c:1969 server/generator/mapgen.c:2039
#, c-format
msgid "Falling back to generator %d."
msgstr ""
-#: server/generator/mapgen.c:2025
+#: server/generator/mapgen.c:2059
msgid "Generator 3 didn't place all big islands."
msgstr ""
-#: server/generator/mapgen.c:2054
+#: server/generator/mapgen.c:2088
#, c-format
msgid "Generator 3 left %li landmass unplaced."
msgstr ""
@@ -6673,7 +6663,7 @@ msgid_plural "%3d turns"
msgstr[0] "%3d نوبت"
msgstr[1] "%3d نوبت"
-#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:631
#: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
@@ -6791,349 +6781,349 @@ msgstr ""
msgid "(worklist)"
msgstr "(لیست‌کار)"
-#: client/cityrepdata.c:447
-msgid "Special"
-msgstr "ویژه"
-
-#: client/cityrepdata.c:448
-msgid "?entertainers/scientists/taxmen:E/S/T"
-msgstr "س/د/ث"
+#: client/cityrepdata.c:446
+msgid "?city:Name"
+msgstr "نام"
-#: client/cityrepdata.c:449
-msgid "Entertainers, Scientists, Taxmen"
-msgstr "سرگرم‌گننده، دانشمند، ثروتمند "
+#: client/cityrepdata.c:446 client/gui-sdl/cityrep.c:169
+msgid "City Name"
+msgstr "نام شهر"
-#: client/cityrepdata.c:452
+#: client/cityrepdata.c:448
#, fuzzy
-msgid "Concise + Rapture, - Disorder"
-msgstr "+ Rapture, - مختل شده"
+msgid "?size [short]:Sz"
+msgstr "اندازه"
-#: client/cityrepdata.c:454 client/plrdlg_common.c:261
+#: client/cityrepdata.c:448
+msgid "Size"
+msgstr "اندازه"
+
+#: client/cityrepdata.c:450 client/plrdlg_common.c:261
#: client/gui-win32/plrdlg.c:337
msgid "State"
msgstr "وضعیت"
-#: client/cityrepdata.c:454
+#: client/cityrepdata.c:450
#, fuzzy
msgid "Rapture/Peace/Disorder"
msgstr "././مختل شده"
+#: client/cityrepdata.c:452
+#, fuzzy
+msgid "Concise *=Rapture, X=Disorder"
+msgstr "+ Rapture, - مختل شده"
+
+#: client/cityrepdata.c:456
+msgid "Special"
+msgstr "ویژه"
+
#: client/cityrepdata.c:457
+msgid "?entertainers/scientists/taxmen:E/S/T"
+msgstr "س/د/ث"
+
+#: client/cityrepdata.c:458
+msgid "Entertainers, Scientists, Taxmen"
+msgstr "سرگرم‌گننده، دانشمند، ثروتمند "
+
+#: client/cityrepdata.c:461
msgid "?Happy workers:H"
msgstr "Ø®"
-#: client/cityrepdata.c:457
+#: client/cityrepdata.c:461
msgid "Workers: Happy"
msgstr "کارگران: خوشØال"
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
msgid "?Content workers:C"
msgstr "ر"
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
msgid "Workers: Content"
msgstr "کارگران: راضی"
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
msgid "?Unhappy workers:U"
msgstr "Ù†"
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
msgid "Workers: Unhappy"
msgstr "کارگران: ناراØت"
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
msgid "?Angry workers:A"
msgstr "ع"
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
msgid "Workers: Angry"
msgstr "کارگران: عصبانی"
-#: client/cityrepdata.c:465 client/gui-xaw/citydlg.c:2401
-#: data/default/units.ruleset:238
-msgid "Workers"
+#: client/cityrepdata.c:469 client/gui-xaw/citydlg.c:2402
+#, fuzzy
+msgid "?city:Workers"
msgstr "کارگر"
-#: client/cityrepdata.c:466
+#: client/cityrepdata.c:470
msgid "?happy/content/unhappy/angry:H/C/U/A"
msgstr "خ/ر/ن/ع"
-#: client/cityrepdata.c:467
+#: client/cityrepdata.c:471
msgid "Workers: Happy, Content, Unhappy, Angry"
msgstr "کارگران: خوشØال، راضی، ناراØت، عصبانی"
-#: client/cityrepdata.c:470 client/cityrepdata.c:472
+#: client/cityrepdata.c:474 client/cityrepdata.c:476
msgid "Best"
msgstr "بهترین"
-#: client/cityrepdata.c:470
+#: client/cityrepdata.c:474
msgid "attack"
msgstr "Øمله"
-#: client/cityrepdata.c:471
+#: client/cityrepdata.c:475
msgid "Best attacking units"
msgstr "بهترین مهره‌ برای Øمله"
-#: client/cityrepdata.c:472
+#: client/cityrepdata.c:476
msgid "defense"
msgstr "دÙاع"
-#: client/cityrepdata.c:473
+#: client/cityrepdata.c:477
msgid "Best defending units"
msgstr "بهترین مهره برای دÙاع"
-#: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
-#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
-#: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
-#: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
-#: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
-#: client/gui-win32/menu.c:351 client/gui-win32/repodlgs.c:616
-#: client/gui-win32/repodlgs.c:707 client/gui-win32/repodlgs.c:716
-#: client/gui-xaw/menu.c:157 client/gui-xaw/menu.c:219
-#: client/gui-xaw/menu.c:242 client/gui-xaw/repodlgs.c:881
-#: client/gui-xaw/repodlgs.c:1069 data/Freeciv.in:1895 data/helpdata.txt:909
+#: client/cityrepdata.c:478 client/cityrepdata.c:482
+#: client/gui-gtk-2.0/cityrep.c:1437 client/gui-gtk-2.0/cityrep.c:1456
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-gtk-2.0/cityrep.c:1494
+#: client/gui-gtk-2.0/cityrep.c:1514 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/repodlgs.c:960 client/gui-sdl/helpdlg.c:688
+#: client/gui-sdl/mapctrl.c:1605 client/gui-sdl/optiondlg.c:1827
+#: client/gui-sdl/repodlgs.c:356 client/gui-win32/menu.c:351
+#: client/gui-win32/repodlgs.c:616 client/gui-win32/repodlgs.c:707
+#: client/gui-win32/repodlgs.c:716 client/gui-xaw/menu.c:157
+#: client/gui-xaw/menu.c:219 client/gui-xaw/menu.c:242
+#: client/gui-xaw/repodlgs.c:881 client/gui-xaw/repodlgs.c:1069
+#: data/Freeciv.in:1895 data/helpdata.txt:909
msgid "Units"
msgstr "مهره‌ها"
#. TRANS: Header "Number of units inside city"
-#: client/cityrepdata.c:476
+#: client/cityrepdata.c:480
#, fuzzy
msgid "?Present (units):Here"
msgstr "Øاضر"
-#: client/cityrepdata.c:477
+#: client/cityrepdata.c:481
msgid "Number of units present"
msgstr "تعداد مهره‌هایی Ú©Ù‡ Øاضرند"
#. TRANS: Header "Number of units supported by given city"
-#: client/cityrepdata.c:480
+#: client/cityrepdata.c:484
#, fuzzy
msgid "?Supported (units):Owned"
msgstr "پشتیبانی"
-#: client/cityrepdata.c:481
+#: client/cityrepdata.c:485
msgid "Number of units supported"
msgstr "تعداد مهره‌هایی که پشتیبانی می‌شوند"
#. TRANS: Header "It will take this many turns before city grows"
-#: client/cityrepdata.c:484
+#: client/cityrepdata.c:488
#, fuzzy
msgid "?food (population):Grow"
msgstr "رشد"
-#: client/cityrepdata.c:485 client/cityrepdata.c:530
+#: client/cityrepdata.c:489 client/cityrepdata.c:528
#, fuzzy
msgid "?Stock/Target:(Have/Need)"
msgstr "(ذخیره، هدÙØŒ)"
-#: client/cityrepdata.c:486
+#: client/cityrepdata.c:490
msgid "Turns until growth/famine"
msgstr "نوبت تا رشد/Ù‚ØØ·ÛŒ"
-#: client/cityrepdata.c:488
-#, fuzzy
-msgid "?size [short]:Sz"
-msgstr "اندازه"
-
-#: client/cityrepdata.c:488
-msgid "Size"
-msgstr "اندازه"
-
-#: client/cityrepdata.c:492
-msgid "?city:Name"
-msgstr "نام"
-
-#: client/cityrepdata.c:492 client/gui-sdl/cityrep.c:169
-msgid "City Name"
-msgstr "نام شهر"
-
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
msgid "Surplus"
msgstr "مازاد"
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
msgid "?food/production/trade:F/P/T"
msgstr "غ/م/ت"
-#: client/cityrepdata.c:496
+#: client/cityrepdata.c:494
msgid "Surplus: Food, Production, Trade"
msgstr "مازاد: غذا، Ù…Øصول، تجارت"
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
#, fuzzy
msgid "?Food surplus [short]:+F"
msgstr "+غ"
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
msgid "Surplus: Food"
msgstr "مازاد: غذا"
-#: client/cityrepdata.c:500
+#: client/cityrepdata.c:498
#, fuzzy
msgid "?Production surplus [short]:+P"
msgstr "+Ù…"
-#: client/cityrepdata.c:501
+#: client/cityrepdata.c:499
msgid "Surplus: Production"
msgstr "مازاد: Ù…Øصول"
-#: client/cityrepdata.c:502
+#: client/cityrepdata.c:500
#, fuzzy
msgid "?Production loss (waste) [short]:-P"
msgstr "-Ù…"
-#: client/cityrepdata.c:503
+#: client/cityrepdata.c:501
msgid "Waste"
msgstr "اتلاÙ"
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
#, fuzzy
msgid "?Trade surplus [short]:+T"
msgstr "+ت"
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
msgid "Surplus: Trade"
msgstr "مازاد: تجارت"
-#: client/cityrepdata.c:506
+#: client/cityrepdata.c:504
#, fuzzy
msgid "?Trade loss (corruption) [short]:-T"
msgstr "-ت"
-#: client/cityrepdata.c:507
+#: client/cityrepdata.c:505
msgid "Corruption"
msgstr "تباهی"
-#: client/cityrepdata.c:509 client/gui-gtk-2.0/repodlgs.c:654
+#: client/cityrepdata.c:507 client/gui-gtk-2.0/repodlgs.c:654
#: client/gui-sdl/mapctrl.c:1400 client/gui-win32/repodlgs.c:334
#: client/gui-xaw/menu.c:222 client/gui-xaw/repodlgs.c:644
#: client/gui-xaw/repodlgs.c:773 data/Freeciv.in:1819
msgid "Economy"
msgstr "اقتصاد"
-#: client/cityrepdata.c:509
+#: client/cityrepdata.c:507
msgid "?gold/luxury/science:G/L/S"
msgstr "ط/ر/ع"
-#: client/cityrepdata.c:510
+#: client/cityrepdata.c:508
msgid "Economy: Gold, Luxuries, Science"
msgstr "اقتصاد: طلا، رÙاه،‌ علم"
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
msgid "?Gold:G"
msgstr "Ø·"
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
msgid "Economy: Gold"
msgstr "اقتصاد: طلا"
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
msgid "?Luxury:L"
msgstr "Ù„"
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
msgid "Economy: Luxury"
msgstr "اقتصاد: رÙاه"
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
msgid "?Science:S"
msgstr "ع"
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
msgid "Economy: Science"
msgstr "اقتصاد: علم"
-#: client/cityrepdata.c:518
+#: client/cityrepdata.c:516
#, fuzzy
msgid "?number_trade_routes:n"
msgstr "ر"
-#: client/cityrepdata.c:518
+#: client/cityrepdata.c:516
#, fuzzy
msgid "?number_trade_routes:R"
msgstr "ر"
-#: client/cityrepdata.c:519
+#: client/cityrepdata.c:517
msgid "Number of Trade Routes"
msgstr "تعداد راه‌های تجاری"
-#: client/cityrepdata.c:521
+#: client/cityrepdata.c:519
msgid "?pollution [short]:Pol"
msgstr "آلودگی"
-#: client/cityrepdata.c:523
+#: client/cityrepdata.c:521
msgid "?cma:Governor"
msgstr "Øاکم"
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
-#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
-#: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
-#: data/Freeciv.in:1459 data/helpdata.txt:820
+#: client/cityrepdata.c:521 client/gui-gtk-2.0/cityrep.c:1766
+#: client/gui-sdl/citydlg.c:3809 client/gui-sdl/cma_fe.c:858
+#: client/gui-win32/citydlg.c:726 data/Freeciv.in:1459 data/helpdata.txt:820
msgid "Citizen Governor"
msgstr "Øاکم شهروندان"
-#: client/cityrepdata.c:526
+#: client/cityrepdata.c:524
#, fuzzy
msgid "Turns/Buy"
msgstr "نوبت‌ها خرید"
-#: client/cityrepdata.c:529 client/cityrepdata.c:531
+#: client/cityrepdata.c:527 client/cityrepdata.c:529
msgid "Currently Building"
msgstr "اکنون می‌سازند"
-#: client/cityrepdata.c:575
+#: client/cityrepdata.c:573
msgid "?specialist:S"
msgstr "Ùˆ"
-#: client/cityrepdata.c:578
+#: client/cityrepdata.c:576
#, fuzzy
msgid "Specialists"
msgstr "لیست ویژه‌ها"
-#: client/civclient.c:239
+#: client/civclient.c:240
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr ""
-#: client/civclient.c:249
+#: client/civclient.c:250
msgid " -l, --log FILE\tUse FILE as logfile (spawned server also uses this)\n"
msgstr ""
-#: client/civclient.c:251
+#: client/civclient.c:252
msgid " -m, --meta HOST\tConnect to the metaserver at HOST\n"
msgstr ""
-#: client/civclient.c:253
+#: client/civclient.c:254
msgid " -n, --name NAME\tUse NAME as name\n"
msgstr ""
-#: client/civclient.c:255
+#: client/civclient.c:256
msgid " -p, --port PORT\tConnect to server port PORT (usually with -a)\n"
msgstr ""
-#: client/civclient.c:257
+#: client/civclient.c:258
#, c-format
msgid " -P, --Plugin PLUGIN\tUse PLUGIN for sound output %s\n"
msgstr ""
-#: client/civclient.c:259
+#: client/civclient.c:260
msgid " -r, --read FILE\tRead startup script FILE (for spawned server only)\n"
msgstr ""
-#: client/civclient.c:262
+#: client/civclient.c:263
msgid " -s, --server HOST\tConnect to the server at HOST (usually with -a)\n"
msgstr ""
-#: client/civclient.c:264
+#: client/civclient.c:265
msgid " -S, --Sound FILE\tRead sound tags from FILE\n"
msgstr ""
-#: client/civclient.c:265
+#: client/civclient.c:266
msgid " -t, --tiles FILE\tUse data file FILE.tilespec for tiles\n"
msgstr ""
-#: client/civclient.c:268
+#: client/civclient.c:269
#, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -7141,144 +7131,154 @@ msgid ""
msgstr ""
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:273
+#: client/civclient.c:274
#, fuzzy, c-format
msgid "Report bugs at %s\n"
msgstr "اشکالات را به <%s> گزارش دهید.\n"
-#: client/civclient.c:297
+#: client/civclient.c:298
#, c-format
msgid "Invalid port \"%s\" specified with --port option.\n"
msgstr ""
-#: client/civclient.c:299 client/civclient.c:314
+#: client/civclient.c:300 client/civclient.c:315
msgid "Try using --help.\n"
msgstr ""
-#: client/civclient.c:312
+#: client/civclient.c:313
#, c-format
msgid "Invalid debug level \"%s\" specified with --debug option.\n"
msgstr ""
-#: client/civclient.c:325
+#: client/civclient.c:326
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr ""
-#: client/civclient.c:539
+#: client/civclient.c:391
+#, c-format
+msgid "Updating old metaserver address \"%s\"."
+msgstr ""
+
+#: client/civclient.c:394
+#, fuzzy, c-format
+msgid "Default metaserver has been set to \"%s\"."
+msgstr "Ø³Ø·Ø Ù‡ÙˆØ´ پیشÙرض به '%s' تغییر یاÙت."
+
+#: client/civclient.c:550
msgid "Game started."
msgstr "بازی شروع شد."
-#: client/civclient.c:577
+#: client/civclient.c:588
msgid "There was an error while auto connecting; aborting."
msgstr ""
-#: client/climisc.c:176
+#: client/climisc.c:177
#, c-format
msgid "Changing production of every %s into %s."
msgstr "تغییر تمام Ù…Øصولات %s به %s."
-#: client/climisc.c:214
+#: client/climisc.c:215
msgid "?embassy:Both"
msgstr "هردو"
-#: client/climisc.c:216
+#: client/climisc.c:217
msgid "?embassy:Yes"
msgstr "داریم"
-#: client/climisc.c:219
+#: client/climisc.c:220
msgid "?embassy:With Us"
msgstr "دارد"
-#: client/climisc.c:222
+#: client/climisc.c:223
msgid "?embassy:Contact"
msgstr "ارتباط داریم"
-#: client/climisc.c:224
+#: client/climisc.c:225
msgid "?embassy:No Contact"
msgstr "بدون ارتباط"
-#: client/climisc.c:236
+#: client/climisc.c:237
msgid "?vision:Both"
msgstr "هردو"
-#: client/climisc.c:238
+#: client/climisc.c:239
msgid "?vision:To Them"
msgstr "به آنها"
-#: client/climisc.c:241
+#: client/climisc.c:242
msgid "?vision:To Us"
msgstr "به ما"
-#: client/climisc.c:257 client/climisc.c:264
+#: client/climisc.c:258 client/climisc.c:265
#, c-format
msgid "The %s give %s"
msgstr "%s %s را می‌دهند"
-#: client/climisc.c:268
+#: client/climisc.c:269
#, c-format
msgid "The %s give unknown city."
msgstr "%s شهر ناشناخته می‌دهند."
-#: client/climisc.c:273
+#: client/climisc.c:274
#, c-format
msgid "The %s give %d gold"
msgstr "%s %d طلا می‌دهند"
-#: client/climisc.c:278
+#: client/climisc.c:279
#, c-format
msgid "The %s give their worldmap"
msgstr "%s نقشه جهانشان می‌دهند"
-#: client/climisc.c:282
+#: client/climisc.c:283
#, c-format
msgid "The %s give their seamap"
msgstr "%s نقشه دریا خود را می‌دهند"
-#: client/climisc.c:286
+#: client/climisc.c:287
msgid "The parties agree on a cease-fire"
msgstr "دو طر٠به آتش‌بس راضی هستند."
-#: client/climisc.c:289
+#: client/climisc.c:290
msgid "The parties agree on a peace"
msgstr "دو طر٠به ØµÙ„Ø Ø±Ø§Ø¶ÛŒ هستند."
-#: client/climisc.c:292
+#: client/climisc.c:293
msgid "The parties create an alliance"
msgstr "دو طر٠به اتØاد راضی هستند."
-#: client/climisc.c:295
+#: client/climisc.c:296
#, c-format
msgid "The %s give shared vision"
msgstr "%s دید مشترک می‌دهند"
-#: client/climisc.c:299
+#: client/climisc.c:300
#, c-format
msgid "The %s give an embassy"
msgstr "%s یک سÙارت می‌دهند"
-#: client/climisc.c:902
+#: client/climisc.c:906
msgid "Popup Request"
msgstr ""
-#: client/climisc.c:932
+#: client/climisc.c:936
msgid "Exporting output window to civgame.log ..."
msgstr "صادر کردن پنجره خروجی به civgame.log ..."
-#: client/climisc.c:936
+#: client/climisc.c:940
msgid "Export complete."
msgstr "صدور انجام شد."
-#: client/climisc.c:938
+#: client/climisc.c:942
msgid "Export failed, couldn't write to file."
msgstr "خطا هنگام صدور، نمی‌توان در Ùایل نوشت."
-#: client/climisc.c:1038
+#: client/climisc.c:1042
#, c-format
msgid "You don't buy %s in %s!"
msgstr "شما %s را در %s نخریدید!"
-#: client/climisc.c:1056
+#: client/climisc.c:1060
#, c-format
msgid "%s costs %d gold and you only have %d gold."
msgstr "قیمت %s %d است و شما تنها %d طلا دارید."
@@ -7322,19 +7322,19 @@ msgid ""
"%d times"
msgstr ""
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1289
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
msgid "novice"
msgstr "نوآموز"
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1289
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1358
msgid "easy"
msgstr "آسان"
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1290
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
msgid "normal"
msgstr "متوسط"
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1290
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
msgid "hard"
msgstr "سخت"
@@ -7363,38 +7363,42 @@ msgid "We probably couldn't start it from here."
msgstr ""
#: client/connectdlg_common.c:470
-msgid "We have control of the server (command access level hack)"
+#, fuzzy
+msgid ""
+"Established control over the server. You have command access level 'hack'."
msgstr "ما کنترل سرور را داریم (Ø³Ø·Ø Ú©Ù†ØªØ±Ù„ Ù‡Ú©)"
#: client/connectdlg_common.c:475
-msgid "We can't take control of server, attempting to kill it."
-msgstr "نمی‌توان کنترل سرور را به دست گرÙت، آنرا از بین می‌بریم."
+msgid ""
+"Failed to obtain the required access level to take control of the server. "
+"The server will now be shutdown."
+msgstr ""
-#: client/control.c:1104
+#: client/control.c:1123
msgid "Only transporter units can be unloaded."
msgstr ""
-#: client/control.c:1353
+#: client/control.c:1425
msgid "Only settler units can be put into auto mode."
msgstr ""
-#: client/control.c:1444
+#: client/control.c:1516
msgid "Only nuclear units can do this."
msgstr ""
-#: client/control.c:1473
+#: client/control.c:1545
msgid "Only paratrooper units can do this."
msgstr ""
-#: client/control.c:1921
+#: client/control.c:2020
msgid "Too far for this unit."
msgstr ""
-#: client/control.c:2131 client/control.c:2161 client/control.c:2177
+#: client/control.c:2230 client/control.c:2260 client/control.c:2276
msgid "Didn't find a route to the destination!"
msgstr "راهی برای رسیدن به مقصد وجود ندارد!"
-#: client/control.c:2221
+#: client/control.c:2320
msgid "Oh my! You seem to have no capital!"
msgstr ""
@@ -7462,16 +7466,16 @@ msgid "Allows %s (with %s)."
msgstr "%s را مجاز می‌کند(با %s)."
#. TRANS: preserve single space at beginning
-#: client/helpdata.c:418
+#: client/helpdata.c:416
msgid " Rivers"
msgstr " رودها"
-#: client/helpdata.c:576
+#: client/helpdata.c:574
#, c-format
msgid "Sorry, no help topic for %s.\n"
msgstr ""
-#: client/helpdata.c:580
+#: client/helpdata.c:578
#, c-format
msgid ""
"Sorry, no help topic for %s.\n"
@@ -7479,283 +7483,283 @@ msgid ""
"\n"
msgstr ""
-#: client/helpdata.c:670
+#: client/helpdata.c:668
msgid ""
"Requires: Nothing\n"
"\n"
msgstr ""
-#: client/helpdata.c:675
+#: client/helpdata.c:673
#, c-format
msgid "* The discovery of %s will make %s obsolete.\n"
msgstr "* کش٠%s باعث منسوخ شدن %s می‌شود.\n"
-#: client/helpdata.c:694
+#: client/helpdata.c:692
#, c-format
msgid "* Allows all players with knowledge of %s to build %s units.\n"
msgstr "* به همه بازیکنان با دانسته %s اجازه می‌دهد تا مهره‌های %s بسازند.\n"
-#: client/helpdata.c:706
+#: client/helpdata.c:704
#, c-format
msgid "* Allows %s (with %s).\n"
msgstr "* %s را مجاز می‌کند(با %s).\n"
-#: client/helpdata.c:710
+#: client/helpdata.c:708
#, c-format
msgid "* Allows %s.\n"
msgstr "* %s را مجاز می‌کند.\n"
-#: client/helpdata.c:780
+#: client/helpdata.c:778
#, c-format
msgid "* Can only be built if there is %s in the city.\n"
msgstr ""
-#: client/helpdata.c:786
+#: client/helpdata.c:784
#, c-format
msgid "* Can only be built with %s as government.\n"
msgstr ""
-#: client/helpdata.c:791
+#: client/helpdata.c:789
msgid "* May not be built in cities.\n"
msgstr "* ممکن نیست در شهر‌ها ساخته شود.\n"
-#: client/helpdata.c:794
+#: client/helpdata.c:792
msgid "* Never has a home city.\n"
msgstr "* هیچ وقت شهر خانه ندارد.\n"
-#: client/helpdata.c:797
+#: client/helpdata.c:795
msgid "* Losing this unit will lose you the game!\n"
msgstr "* از دست دادن این مهره باعث باختن بازی می‌شود!\n"
-#: client/helpdata.c:801
+#: client/helpdata.c:799
msgid "* Each player may only have one of this type of unit.\n"
msgstr "* هر بازیکن Ùقط یکی از این نوع مهره دارد.\n"
-#: client/helpdata.c:805
+#: client/helpdata.c:803
#, c-format
msgid "* Requires %d population to build.\n"
msgstr "* برای ساختن نیاز به %d Ù†Ùر جمعیت دارد.\n"
-#: client/helpdata.c:811
+#: client/helpdata.c:809
#, c-format
msgid "* Can carry and refuel %d air unit.\n"
msgid_plural "* Can carry and refuel %d air units.\n"
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:816
+#: client/helpdata.c:814
#, c-format
msgid "* Can carry and refuel %d missile unit.\n"
msgid_plural "* Can carry and refuel %d missile units.\n"
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:821
+#: client/helpdata.c:819
#, c-format
msgid "* Can carry %d ground unit across water.\n"
msgid_plural "* Can carry %d ground units across water.\n"
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:830
+#: client/helpdata.c:828
msgid ""
"* Can establish trade routes (must travel to target city and must be at "
"least 9 tiles [in Manhattan distance] from this unit's home city).\n"
msgstr ""
-#: client/helpdata.c:836
+#: client/helpdata.c:834
#, c-format
msgid "* Can help build wonders (adds %d production).\n"
msgstr "* می‌تواند در ساختن Ø´Ú¯Ùتی Ú©Ù…Ú© کند ( %d امتیاز کالا اضاÙÙ‡ می‌کند).\n"
-#: client/helpdata.c:840
+#: client/helpdata.c:838
msgid "* May not be disbanded.\n"
msgstr "* ممکن نیست منØÙ„ شود.\n"
-#: client/helpdata.c:842
+#: client/helpdata.c:840
#, c-format
msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
msgstr "* می‌تواند منØÙ„ شود تا 50%% امتیاز ساخت را برگرداند. \n"
-#: client/helpdata.c:846
+#: client/helpdata.c:844
msgid "* Can build new cities.\n"
msgstr "* می‌تواند شهر جدید بسازد.\n"
-#: client/helpdata.c:849
+#: client/helpdata.c:847
#, c-format
msgid "* Can add on %d population to cities of no more than size %d.\n"
msgstr ""
"* می‌تواند %d جمعیت به شهرهایی Ú©Ù‡ بیشتر از %d جمعیت ندارند، اضاÙÙ‡ کند.\n"
-#: client/helpdata.c:858
+#: client/helpdata.c:856
msgid "* Can build roads and railroads.\n"
msgstr "* می‌تواند جاده و خط‌آهن بسازد.\n"
-#: client/helpdata.c:859
+#: client/helpdata.c:857
msgid "* Can build mines on tiles.\n"
msgstr "* می‌تواند روی زمین معدن بسازد.\n"
-#: client/helpdata.c:860
+#: client/helpdata.c:858
msgid "* Can build irrigation on tiles.\n"
msgstr "* می‌تواند زمین را آبیاری کند.\n"
-#: client/helpdata.c:865
+#: client/helpdata.c:863
msgid "* Can build farmland.\n"
msgstr "* می‌تواند مزرعه بسازد.\n"
-#: client/helpdata.c:869
+#: client/helpdata.c:867
#, c-format
msgid "* Can build farmland (if %s is known).\n"
msgstr "* می‌تواند مزرعه بسازد (اگر %s را بدانید).\n"
-#: client/helpdata.c:873
+#: client/helpdata.c:871
#, c-format
msgid "* Can build farmland (if any of the following are known: %s).\n"
msgstr "* می‌تواند مزرعه بسازد (اگر این‌ها را بدانید %s).\n"
-#: client/helpdata.c:881
+#: client/helpdata.c:879
msgid "* Can build fortresses.\n"
msgstr "* می‌تواند دژ بسازد.\n"
-#: client/helpdata.c:885
+#: client/helpdata.c:883
#, c-format
msgid "* Can build fortresses (if %s is known).\n"
msgstr "* می‌تواند دژ بسازد.(اگر %s را بدانید)\n"
-#: client/helpdata.c:889
+#: client/helpdata.c:887
#, c-format
msgid "* Can build fortresses (if any of the following are known: %s).\n"
msgstr "* می‌تواند دژ بسازد(اگر این‌ها را بدانید: %s).\n"
-#: client/helpdata.c:895
+#: client/helpdata.c:893
msgid "* Can clean pollution from tiles.\n"
msgstr "* می‌تواند آلودگی را از زمین پاک کند.\n"
-#: client/helpdata.c:896
+#: client/helpdata.c:894
msgid "* Can clean nuclear fallout from tiles.\n"
msgstr "* می‌تواند غبار اتمی را از زمین پاک کند\n"
-#: client/helpdata.c:899
+#: client/helpdata.c:897
msgid "* Can transform tiles.\n"
msgstr "* می‌تواند نوع خانه‌ها را تغییر دهد.\n"
-#: client/helpdata.c:902
+#: client/helpdata.c:900
msgid "* Can build airbases.\n"
msgstr "* می‌تواند پایگاه هوایی بسازد.\n"
-#: client/helpdata.c:906
+#: client/helpdata.c:904
#, c-format
msgid "* May fortify, granting a 50%% defensive bonus.\n"
msgstr "* می‌تواند تقویت شود تا 50%% قدرت دÙاعش اÙزایش یابد.\n"
-#: client/helpdata.c:909
+#: client/helpdata.c:907
msgid "* May pillage to destroy infrastructure from tiles.\n"
msgstr "* می‌تواند غارت کند تا زيرساخت خانه‌ها خراب كند.\n"
-#: client/helpdata.c:913
+#: client/helpdata.c:911
msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
msgstr "* می‌تواند کارهای دیپلماتیک بکند به علاوه‌ی کارهای ویژه جاسوسی.\n"
-#: client/helpdata.c:916
+#: client/helpdata.c:914
msgid "* Can perform diplomatic actions.\n"
msgstr "* می‌تواند Ùعالیت‌های دیپلماتیک انجام دهد.\n"
-#: client/helpdata.c:920
+#: client/helpdata.c:918
msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
msgstr "* هیچ وقت یک جنگ دیپلمات به دیپلمات را نمی‌بازد.\n"
-#: client/helpdata.c:923
+#: client/helpdata.c:921
msgid "* May not be bribed.\n"
msgstr "* ممكن نيست تطميع شود.\n"
-#: client/helpdata.c:926
+#: client/helpdata.c:924
msgid "* Can attack enemy air units.\n"
msgstr "* می‌تواند به مهره‌های هوایی دشمن Øمله کند.\n"
-#: client/helpdata.c:930
+#: client/helpdata.c:928
msgid "* Is invisible except when next to an enemy unit or city.\n"
msgstr "* نامرئی است به جز وقتی که در کنار یک شهر یا مهره دشمن است.\n"
-#: client/helpdata.c:934
+#: client/helpdata.c:932
msgid "* Can only attack units on ocean squares (no land attacks).\n"
msgstr ""
"* Ùقط می‌تواند به مهره‌هایی Ú©Ù‡ روی اقیانوس هستند Øمله کند (Øمله زمینی ندارد).\n"
-#: client/helpdata.c:938
+#: client/helpdata.c:936
msgid ""
"* Can attack from aboard sea units: against enemy cities and onto land "
"squares.\n"
msgstr ""
-#: client/helpdata.c:943
+#: client/helpdata.c:941
#, c-format
msgid "* Can be paradropped from a friendly city (Range: %d).\n"
msgstr ""
-#: client/helpdata.c:949
+#: client/helpdata.c:947
msgid "* Gets double defense against units specified as 'mounted'.\n"
msgstr ""
-#: client/helpdata.c:953
+#: client/helpdata.c:951
msgid "* Counts as 'mounted' against certain defenders.\n"
msgstr ""
-#: client/helpdata.c:957
+#: client/helpdata.c:955
msgid "* A missile unit: gets used up in making an attack.\n"
msgstr ""
-#: client/helpdata.c:960
+#: client/helpdata.c:958
msgid "* Making an attack ends this unit's turn.\n"
msgstr "* در پایان نوبتش Øمله می‌کند.\n"
-#: client/helpdata.c:964
+#: client/helpdata.c:962
msgid "* This unit's attack causes a nuclear explosion!\n"
msgstr "* Øمله این مهره باعث انÙجار هسته‌ای می‌شود\n"
-#: client/helpdata.c:968
+#: client/helpdata.c:966
msgid "* Gets double firepower when attacking cities.\n"
msgstr "* هنگام Øمله به شهر‌ها قدرت آتشش دوبرابر می‌شود.\n"
-#: client/helpdata.c:971
+#: client/helpdata.c:969
msgid "* Ignores the effects of city walls.\n"
msgstr "* دیوار شهر بر آن اثری ندارد.\n"
-#: client/helpdata.c:975
+#: client/helpdata.c:973
#, c-format
msgid ""
"* Does bombard attacks (%d per turn). These attacks will only damage (never "
"kill) the defender, but have no risk for the attacker.\n"
msgstr ""
-#: client/helpdata.c:982
+#: client/helpdata.c:980
msgid "* Gets quintuple defense against missiles and aircraft.\n"
msgstr ""
-#: client/helpdata.c:986
+#: client/helpdata.c:984
msgid "* Ignores terrain effects (treats all squares as roads).\n"
msgstr "* نوع خانه‌ها بر آن اثری ندارد (همه خانه‌ها مانند جاده است).\n"
-#: client/helpdata.c:989
+#: client/helpdata.c:987
msgid "* Ignores zones of control.\n"
msgstr "* Ù…Øدوده کنترل بر آن اثری ندارد.\n"
-#: client/helpdata.c:993
+#: client/helpdata.c:991
msgid "* A non-military unit (cannot attack; no martial law).\n"
msgstr "* یک مهره غیر نظامی (نمی‌تواند Øمله کند; بدون قانون نظامی).\n"
-#: client/helpdata.c:997
+#: client/helpdata.c:995
msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
msgstr ""
-#: client/helpdata.c:1000
+#: client/helpdata.c:998
msgid "* Will never achieve veteran status.\n"
msgstr "* هیچ وقت کارآزموده نمی‌شود.\n"
-#: client/helpdata.c:1002
+#: client/helpdata.c:1000
msgid "* May become veteran through training or combat.\n"
msgstr "* ممکن است در تمرین یا جنگ کارآزموده شود.\n"
-#: client/helpdata.c:1008
+#: client/helpdata.c:1006
#, c-format
msgid ""
"* Must end turn in a city or next to land, or has a 50%% risk of being lost "
@@ -7764,12 +7768,12 @@ msgstr ""
"در پایان نوبتش باید در یک شهر یا در کنار زمین باشد وگرنه ریسک 50%% گمشدندر "
"دریا را دارد.\n"
-#: client/helpdata.c:1012
+#: client/helpdata.c:1010
#, c-format
msgid "* The discovery of %s reduces the risk to 25%%.\n"
msgstr "* کش٠%s ریسک را به 25%% کم می‌کند.\n"
-#: client/helpdata.c:1017
+#: client/helpdata.c:1015
#, c-format
msgid "* %s reduces the risk to 12%%.\n"
msgstr "* %s ریسک را به 12%% کم می‌کند.\n"
@@ -7778,27 +7782,27 @@ msgstr "* %s ریسک را به 12%% کم می‌کند.\n"
#. * last two elements
#. TRANS: List of possible output types has this between
#. * last two elements
-#: client/helpdata.c:1068 client/helpdata.c:1402
+#: client/helpdata.c:1066 client/helpdata.c:1400
msgid " or "
msgstr " یا "
-#: client/helpdata.c:1070 client/helpdata.c:1390
+#: client/helpdata.c:1068 client/helpdata.c:1388
msgid "?or:, "
msgstr "، "
-#: client/helpdata.c:1082
+#: 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"
msgstr[0] "* مهره باید در یک شهر یا در یک %s بعد از %d نوبت باشد.\n"
msgstr[1] "* مهره باید در یک شهر یا در یک %s بعد از %d نوبت باشد.\n"
-#: client/helpdata.c:1124
+#: client/helpdata.c:1122
#, c-format
msgid "If we would now start with %s we would need %d bulbs."
msgstr "اگر مایلید %s را شروع کنید %d امتیاز نیاز دارید."
-#: client/helpdata.c:1129
+#: client/helpdata.c:1127
#, c-format
msgid ""
"To reach %s we need to obtain %d other technologies first. The whole project "
@@ -7807,88 +7811,88 @@ msgstr ""
"برای رسیدن به %s ما نیاز به %d تکنولوژی دیگر داریم. این پروژه %d امتیاز لازم "
"دارد."
-#: client/helpdata.c:1137
+#: client/helpdata.c:1135
msgid "You cannot research this technology."
msgstr ""
-#: client/helpdata.c:1141
+#: client/helpdata.c:1139
msgid " This number may vary depending on what other players will research.\n"
msgstr ""
-#: client/helpdata.c:1153
+#: client/helpdata.c:1151
#, c-format
msgid "* The first player to research %s gets an immediate advance.\n"
msgstr "* اولین بازیکنی Ú©Ù‡ %s را بگیرد آن Ù„Øظه یک تکنولوژی می‌گیرد.\n"
-#: client/helpdata.c:1158
+#: client/helpdata.c:1156
#, c-format
msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
msgstr "* شانس از دست دادن قایق‌ها را در دریای آزاد 25%% کاهش می‌دهد.\n"
-#: client/helpdata.c:1161
+#: client/helpdata.c:1159
#, c-format
msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
msgstr "* شانس از دست دادن قایق‌ها را در دریای آزاد 12%% کاهش می‌دهد.\n"
-#: client/helpdata.c:1165
+#: client/helpdata.c:1163
msgid "* Increases the pollution generated by the population.\n"
msgstr "* آلودگی Øاصل از جمعیت را زیاد می‌کند.\n"
-#: client/helpdata.c:1170
+#: client/helpdata.c:1168
#, c-format
msgid "* Allows %s to build roads on river squares.\n"
msgstr "* به %s اجازه ساخت جاده را روی رودخانه می‌دهد.\n"
-#: client/helpdata.c:1177
+#: client/helpdata.c:1175
#, c-format
msgid "* Allows %s to build fortresses.\n"
msgstr "* به %s اجازه می‌دهد تا دژ بسازد.\n"
-#: client/helpdata.c:1185
+#: client/helpdata.c:1183
#, c-format
msgid "* Allows %s to build airbases.\n"
msgstr "* به %s اجازه می‌دهد پایگاه هوایی بسازد.\n"
-#: client/helpdata.c:1194
+#: client/helpdata.c:1192
#, c-format
msgid "* Allows %s to upgrade roads to railroads.\n"
msgstr "* به %s اجازه می‌دهد تا جاده‌ها را به خط‌آهن تبدیل کند.\n"
-#: client/helpdata.c:1202
+#: client/helpdata.c:1200
#, c-format
msgid "* Allows %s to upgrade irrigation to farmland.\n"
msgstr "* به %s اجازه می‌دهد تا زمین‌های آبیاری را به مزرعه تبدیل کند.\n"
-#: client/helpdata.c:1236
+#: client/helpdata.c:1234
msgid "* Pollution cannot be generated on this terrain."
msgstr "* در این خانه آلودگی تولید نمی‌شود."
-#: client/helpdata.c:1241
+#: client/helpdata.c:1239
msgid "* You cannot build cities on this terrain."
msgstr "* نمی‌توان روی این خانه شهر ساخت."
-#: client/helpdata.c:1247
+#: client/helpdata.c:1245
msgid "* The coastline of this terrain is unsafe."
msgstr ""
-#: client/helpdata.c:1252
+#: client/helpdata.c:1250
msgid "* This terrain is unsafe for units to travel on."
msgstr ""
-#: client/helpdata.c:1257
+#: client/helpdata.c:1255
msgid "* Land units cannot travel on oceanic terrains."
msgstr ""
-#: client/helpdata.c:1307
+#: client/helpdata.c:1305
msgid "Features:\n"
msgstr ""
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1413 client/helpdata.c:1414
+#: client/helpdata.c:1411 client/helpdata.c:1412
msgid "?outputlist: Nothing "
msgstr ""
-#: client/helpdata.c:1421
+#: client/helpdata.c:1419
#, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
@@ -7899,7 +7903,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:1431
+#: client/helpdata.c:1429
#, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -7907,48 +7911,48 @@ msgid ""
msgstr ""
#. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1439
+#: client/helpdata.c:1437
#, c-format
msgid "* You pay %d times normal %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1444
+#: client/helpdata.c:1442
#, 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:1449
+#: client/helpdata.c:1447
#, c-format
msgid "* You pay no %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1453
+#: client/helpdata.c:1451
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:1462
+#: client/helpdata.c:1460
#, 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:1470
+#: client/helpdata.c:1468
#, c-format
msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
msgstr ""
-#: client/helpdata.c:1477
+#: client/helpdata.c:1475
#, 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:1484
+#: client/helpdata.c:1482
#, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -7956,23 +7960,23 @@ msgid ""
msgstr ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1491
+#: client/helpdata.c:1489
#, 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:1499
+#: client/helpdata.c:1497
#, c-format
msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
msgstr ""
-#: client/helpdata.c:1504
+#: client/helpdata.c:1502
msgid "Has unlimited science/gold/luxuries rates.\n"
msgstr ""
-#: client/helpdata.c:1509
+#: client/helpdata.c:1507
#, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
@@ -7983,7 +7987,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:1521
+#: client/helpdata.c:1519
#, 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"
@@ -7991,60 +7995,60 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1532
+#: client/helpdata.c:1530
#, 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:1538
+#: client/helpdata.c:1536
msgid "* Your units cannot be bribed.\n"
msgstr ""
-#: client/helpdata.c:1541
+#: client/helpdata.c:1539
msgid "* Your cities cannot be incited.\n"
msgstr ""
-#: client/helpdata.c:1545
+#: client/helpdata.c:1543
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:1551
+#: client/helpdata.c:1549
msgid "* Has a senate that may prevent declaration of war.\n"
msgstr ""
-#: client/helpdata.c:1555
+#: client/helpdata.c:1553
msgid "* Allows partisans when cities are taken by the enemy.\n"
msgstr ""
-#: client/helpdata.c:1559
+#: client/helpdata.c:1557
msgid ""
"* Buildings that normally confer bonuses against unhappiness will instead "
"give gold.\n"
msgstr ""
-#: client/helpdata.c:1563
+#: client/helpdata.c:1561
msgid "* Pays no upkeep for fanatics.\n"
msgstr ""
-#: client/helpdata.c:1566
+#: client/helpdata.c:1564
msgid "* Has no unhappy citizens.\n"
msgstr ""
-#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
+#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
#, c-format
msgid "* Veteran %s units.\n"
msgstr ""
-#: client/helpdata.c:1587
+#: client/helpdata.c:1585
msgid "* Veteran units.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1593
+#: client/helpdata.c:1591
#, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8052,7 +8056,7 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1602
+#: client/helpdata.c:1600
#, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8060,439 +8064,486 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1610
+#: client/helpdata.c:1608
#, 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:1619
+#: client/helpdata.c:1617
#, c-format
msgid "* %s production is increased %d%%.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1627
+#: client/helpdata.c:1625
#, c-format
msgid "* %s production will suffer massive waste.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1632
+#: client/helpdata.c:1630
#, c-format
msgid "* %s production will suffer some waste.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1637
+#: client/helpdata.c:1635
#, 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:1645
+#: client/helpdata.c:1643
#, 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:1651
+#: client/helpdata.c:1649
#, 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:1657
+#: client/helpdata.c:1655
#, c-format
msgid "* %s waste will increase slowly with distance from capital.\n"
msgstr ""
-#: client/helpdata.c:1674
+#: client/helpdata.c:1672
#, c-format
msgid "* Allows you to build %s.\n"
msgstr ""
#. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1701
+#: client/helpdata.c:1699
#, c-format
msgid "%s%d %s"
msgstr "%s%d %s"
-#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1700 client/helpdata.c:1708 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:1709
+#: client/helpdata.c:1707
#, c-format
msgid "%s%d unhappy"
msgstr "%s%d ناراØت"
-#: client/mapctrl_common.c:382
+#: client/mapctrl_common.c:399
#, c-format
msgid "You don't know how to build %s!"
msgstr "شما نمی‌دانید چگونه %s را بسازید!"
-#: client/mapctrl_common.c:392
+#: client/mapctrl_common.c:409
#, c-format
msgid "Copy %s to clipboard."
msgstr "کپی %s به clipboard."
-#: client/mapctrl_common.c:408
+#: client/mapctrl_common.c:425
msgid "Clipboard is empty."
msgstr "Clipboard خالی است."
-#: client/options.c:98
+#: client/options.c:102
msgid "Graphics"
msgstr "گراÙیک"
-#: client/options.c:99
+#: client/options.c:103
msgid "Overview"
msgstr "نمای‌کلی"
-#: client/options.c:100
+#: client/options.c:104
msgid "Sound"
msgstr "صدا"
-#: client/options.c:101
+#: client/options.c:105
msgid "Interface"
msgstr "صورت"
-#: client/options.c:102
+#: client/options.c:106
msgid "Network"
msgstr "شبکه"
-#: client/options.c:107
+#: client/options.c:111
msgid "Login name"
msgstr "نام کاربری"
-#: client/options.c:108
+#: client/options.c:112
msgid ""
"This is the default login username that will be used in the connection "
"dialogs or with the -a command-line parameter."
msgstr ""
-#: client/options.c:113
+#: client/options.c:117
msgid "Server"
msgstr "سرور"
-#: client/options.c:114
+#: client/options.c:118
msgid ""
"This is the default server hostname that will be used in the connection "
"dialogs or with the -a command-line parameter."
msgstr ""
-#: client/options.c:119
+#: client/options.c:123
msgid "Server port"
msgstr "پرت سرور"
-#: client/options.c:120
+#: client/options.c:124
msgid ""
"This is the default server port that will be used in the connection dialogs "
"or with the -a command-line parameter."
msgstr ""
-#: client/options.c:125 client/gui-win32/connectdlg.c:912 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
msgid "Metaserver"
msgstr ""
-#: client/options.c:126
+#: client/options.c:130
msgid ""
"The metaserver is a host that the client contacts to find out about games on "
"the internet. Don't change this from its default value unless you know what "
"you're doing."
msgstr ""
-#: client/options.c:132
+#: client/options.c:136
msgid "Soundset"
msgstr "مجموعه صدا"
-#: client/options.c:133
+#: client/options.c:137
msgid ""
"This is the soundset that will be used. Changing this is the same as using "
"the -S command-line parameter."
msgstr ""
-#: client/options.c:138
+#: client/options.c:142
msgid "Sound plugin"
msgstr ""
-#: client/options.c:139
+#: client/options.c:143
msgid ""
"If you have a problem with sound, try changing the sound plugin. The new "
"plugin won't take effect until you restart Freeciv. Changing this is the "
"same as using the -P command-line option."
msgstr ""
-#: client/options.c:144 client/gui-sdl/gui_main.c:162
+#: client/options.c:148 client/gui-sdl/gui_main.c:162
#, fuzzy
msgid "Theme"
msgstr "معبد"
-#: client/options.c:145
+#: client/options.c:149
msgid "By changing this option you change the active theme."
msgstr ""
-#: client/options.c:148
+#: client/options.c:152
msgid "Tileset"
msgstr "مجموعه خانه"
-#: client/options.c:149
+#: client/options.c:153
msgid ""
"By changing this option you change the active tileset. This is the same as "
"using the -t command-line parameter."
msgstr ""
-#: client/options.c:156
+#: client/options.c:160
msgid "Solid unit background color"
msgstr ""
-#: client/options.c:157
+#: client/options.c:161
msgid ""
"Setting this option will cause units on the map view to be drawn with a "
"solid background color instead of the flag backdrop."
msgstr ""
-#: client/options.c:161 client/gui-sdl/optiondlg.c:960
+#: client/options.c:165 client/gui-sdl/optiondlg.c:960
msgid "Sound bell at new turn"
msgstr "زنگ در ابتدای نوبت"
-#: client/options.c:162
+#: client/options.c:166
msgid ""
"Set this option to have a \"bell\" event be generated at the start of a new "
"turn. You can control the behavior of the \"bell\" event by editing the "
"message options."
msgstr ""
-#: client/options.c:168
+#: client/options.c:172
msgid "Unit movement animation time (milliseconds)"
msgstr "سرعت Øرکت مهره‌ها (میلی ثانیه)"
-#: client/options.c:169
+#: client/options.c:173
msgid ""
"This option controls how long unit \"animation\" takes when a unit moves on "
"the map view. Set it to 0 to disable animation entirely."
msgstr ""
-#: client/options.c:174
+#: client/options.c:178
msgid "Mapview recentering time (milliseconds)"
msgstr ""
-#: client/options.c:175
+#: client/options.c:179
msgid ""
"When the map view is recentered, it will slide smoothly over the map to its "
"new position. This option controls how long this slide lasts. Set it to 0 "
"to disable mapview sliding entirely."
msgstr ""
-#: client/options.c:180 client/gui-sdl/optiondlg.c:1014
+#: client/options.c:184 client/gui-sdl/optiondlg.c:1014
msgid "Show combat animation"
msgstr "نشان دادن انیمیشن جنگ"
-#: client/options.c:181
+#: client/options.c:185
msgid ""
"Disabling this option will turn off combat animation between units on the "
"mapview."
msgstr ""
-#: client/options.c:184
+#: client/options.c:188
msgid "Draw the citybar"
msgstr "کشیدن "
-#: client/options.c:185
+#: client/options.c:189
msgid ""
"Setting this option will display a 'citybar' containing useful information "
"beneath each city. Disabling this option will display only the city's name "
"and optionally, production."
msgstr ""
-#: client/options.c:191
+#: client/options.c:195
msgid "Show icons in the technology tree"
msgstr ""
-#: client/options.c:192
+#: client/options.c:196
msgid ""
"Setting this option will display icons on the technology tree diagram. "
"Turning this option off makes the technology tree more compact."
msgstr ""
-#: client/options.c:197
+#: client/options.c:201
msgid "Draw shield graphics for units"
msgstr ""
-#: client/options.c:198
+#: client/options.c:202
msgid ""
"Setting this option will draw a shield icon as the flags on units. If "
"unset, the full flag will be drawn."
msgstr ""
-#: client/options.c:202
+#: client/options.c:206
msgid "Manual Turn Done in AI Mode"
msgstr ""
-#: client/options.c:203
+#: client/options.c:207
msgid ""
"Disable this option if you do not want to press the Turn Done button "
"manually when watching an AI player."
msgstr ""
-#: client/options.c:207 client/gui-sdl/optiondlg.c:1121
+#: client/options.c:211 client/gui-sdl/optiondlg.c:1121
msgid "Auto Center on Units"
msgstr "تمرکز اتوماتیک روی مهره‌ها"
-#: client/options.c:208
+#: client/options.c:212
msgid ""
"Set this option to have the active unit centered automatically when the unit "
"focus changes."
msgstr ""
-#: client/options.c:211 client/gui-sdl/optiondlg.c:1147
+#: client/options.c:215 client/gui-sdl/optiondlg.c:1147
msgid "Auto Center on Combat"
msgstr "تمرکز اتوماتیک روی جنگ‌ها"
-#: client/options.c:212
+#: client/options.c:216
msgid ""
"Set this option to have any combat be centered automatically. Disabled this "
"will speed up the time between turns but may cause you to miss combat "
"entirely."
msgstr ""
-#: client/options.c:217 client/gui-sdl/optiondlg.c:1174
+#: client/options.c:221 client/gui-sdl/optiondlg.c:1174
msgid "Focus on Awakened Units"
msgstr ""
-#: client/options.c:218
+#: client/options.c:222
msgid "Set this option to have newly awoken units be focused automatically."
msgstr ""
-#: client/options.c:221
+#: client/options.c:225
msgid "Allow goto into the unknown"
msgstr ""
-#: client/options.c:222
+#: client/options.c:226
msgid ""
"Setting this option will make the game consider moving into unknown tiles. "
"If not, then goto routes will detour around or be blocked by unknown tiles."
msgstr ""
-#: client/options.c:226
+#: client/options.c:230
msgid "Center map when Popup city"
msgstr ""
-#: client/options.c:227
+#: client/options.c:231
msgid ""
"Setting this option makes the mapview center on a city when its city dialog "
"is popped up."
msgstr ""
-#: client/options.c:230
+#: client/options.c:234
msgid "Concise City Production"
msgstr ""
-#: client/options.c:231
+#: client/options.c:235
msgid ""
"Set this option to make the city production (as shown in the city dialog) to "
"be more compact."
msgstr ""
-#: client/options.c:234 client/gui-sdl/optiondlg.c:1252
+#: client/options.c:238 client/gui-sdl/optiondlg.c:1252
msgid "End Turn when done moving"
msgstr ""
-#: client/options.c:235
+#: client/options.c:239
msgid ""
"Setting this option makes your turn end automatically when all your units "
"are done moving."
msgstr ""
-#: client/options.c:238 client/gui-sdl/optiondlg.c:1226
+#: client/options.c:242 client/gui-sdl/optiondlg.c:1226
msgid "Prompt for city names"
msgstr "نام شهر‌ها را بپرس"
-#: client/options.c:239
+#: client/options.c:243
msgid ""
"Disabling this option will make the names of newly founded cities chosen "
"automatically by the server."
msgstr ""
-#: client/options.c:242 client/gui-sdl/optiondlg.c:1200
+#: client/options.c:246 client/gui-sdl/optiondlg.c:1200
msgid "Pop up city dialog for new cities"
msgstr ""
-#: client/options.c:243
+#: client/options.c:247
msgid ""
"Setting this option will pop up a newly-founded city's city dialog "
"automatically."
msgstr ""
-#: client/options.c:248
+#: client/options.c:250
+#, fuzzy
+msgid "Pop up caravan actions"
+msgstr "کارهای کاروان"
+
+#: client/options.c:251
+msgid ""
+"If this option is enabled, when caravans arrive at a city where they can "
+"establish a traderoute or help build a wonder, a window will popup asking "
+"which action should be performed. Disabling this option means you will have "
+"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 ""
+
+#: client/options.c:260
+msgid "Enable cursor changing"
+msgstr ""
+
+#: client/options.c:261
+msgid ""
+"This option controls whether the client should try to change the mouse "
+"cursor depending on what is being pointed at, as well as to indicate changes "
+"in the client or server state."
+msgstr ""
+
+#: client/options.c:266
+msgid "Select cities before units"
+msgstr ""
+
+#: 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 ""
+
+#: client/options.c:272
+msgid "Clear unit orders on selection"
+msgstr ""
+
+#: client/options.c:273
+msgid ""
+"Enabling this option will cause unit orders to be cleared whenever one or "
+"more units are selected. If this option is disabled, selecting units will "
+"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 ""
+
+#: client/options.c:282
msgid "Background layer"
msgstr ""
-#: client/options.c:249
+#: client/options.c:283
msgid "The background layer of the overview shows just ocean and land."
msgstr ""
-#: client/options.c:252
+#: client/options.c:286
msgid "Terrain relief map layer"
msgstr ""
-#: client/options.c:253
+#: client/options.c:287
msgid "The relief layer shows all terrains on the map."
msgstr ""
-#: client/options.c:256
+#: client/options.c:290
msgid "Borders layer"
msgstr ""
-#: client/options.c:257
+#: client/options.c:291
msgid ""
"The borders layer of the overview shows which tiles are owned by each player."
msgstr ""
-#: client/options.c:261
+#: client/options.c:295
msgid "Units layer"
msgstr "لایه مهره‌ها"
-#: client/options.c:262
+#: client/options.c:296
msgid "Enabling this will draw units on the overview."
msgstr ""
-#: client/options.c:265
+#: client/options.c:299
msgid "Cities layer"
msgstr "لایه شهرها"
-#: client/options.c:266
+#: client/options.c:300
msgid "Enabling this will draw cities on the overview."
msgstr ""
-#: client/options.c:269
+#: client/options.c:303
msgid "Overview fog of war"
msgstr ""
-#: client/options.c:270
+#: client/options.c:304
msgid "Enabling this will show fog of war on the overview."
msgstr ""
-#: client/options.c:488
+#: client/options.c:526
msgid "If you add a preset by hand, also update \"number_of_presets\""
msgstr ""
-#: client/options.c:516
+#: client/options.c:554
msgid "Cannot find your home directory"
msgstr ""
-#: client/options.c:665 client/options.c:796
+#: client/options.c:703 client/options.c:834
msgid "Save failed, cannot find a filename."
msgstr ""
-#: client/options.c:678 client/options.c:859
+#: client/options.c:716 client/options.c:897
#, c-format
msgid "Save failed, cannot write to file %s"
msgstr ""
-#: client/options.c:680 client/options.c:862
+#: client/options.c:718 client/options.c:900
#, c-format
msgid "Saved settings to file %s"
msgstr ""
@@ -8516,16 +8567,16 @@ msgstr ""
msgid "Start of turn %d"
msgstr "شروع نوبت %d"
-#: client/packhand.c:1590
+#: client/packhand.c:1591
#, c-format
msgid "AI Mode is now %s."
msgstr ""
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "ON"
msgstr "روشن"
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "OFF"
msgstr "خاموش"
@@ -8557,14 +8608,15 @@ msgid "Username"
msgstr "نام کاربری"
#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
-#: client/gui-gtk-2.0/pages.c:2085
+#: client/gui-gtk-2.0/pages.c:2157
msgid "Flag"
msgstr "پرچم"
#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
-#: client/gui-gtk-2.0/pages.c:1536 client/gui-gtk-2.0/pages.c:2087
-#: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
-#: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
+#: 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/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr "ملت"
@@ -8576,7 +8628,7 @@ msgstr "Ù…Øدوده"
msgid "Score"
msgstr "امتیاز"
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
msgid "Team"
msgstr "تیم"
@@ -8647,278 +8699,304 @@ msgstr ""
msgid "Could not open temp file."
msgstr ""
-#: client/servers.c:407
+#: client/servers.c:410
msgid "Invalid $http_proxy or metaserver value, must start with 'http://'"
msgstr ""
-#: client/servers.c:413
+#: client/servers.c:416
msgid "Failed looking up metaserver's host"
msgstr ""
-#: client/text.c:85 client/text.c:86 client/text.c:91
+#. TRANS: "AI <player name>"
+#: client/text.c:94
+#, c-format
+msgid "AI %s"
+msgstr ""
+
+#. TRANS: "<nation adjective>, team <team name>"
+#: client/text.c:118
+#, fuzzy, c-format
+msgid "%s, team %s"
+msgstr "%s از %s"
+
+#: client/text.c:135 client/text.c:136 client/text.c:141
#: client/gui-sdl/mapview.c:752
msgid "?nation:Neutral"
msgstr "طبیعی"
-#: client/text.c:85 client/gui-sdl/mapview.c:752
+#: client/text.c:135 client/gui-sdl/mapview.c:752
msgid "?nation:Hostile"
msgstr "دشمن"
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Peaceful"
msgstr "صلØ‌آمیز"
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Friendly"
msgstr "دوستانه"
-#: client/text.c:88 client/gui-sdl/mapview.c:755
+#: client/text.c:138 client/gui-sdl/mapview.c:755
msgid "?nation:Mysterious"
msgstr ""
-#: client/text.c:88
+#: client/text.c:138
msgid "?nation:Friendly(team)"
msgstr "دوستانه(تیم)"
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
msgid "?city:Neutral"
msgstr "طبیعی"
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
msgid "?city:Hostile"
msgstr "دشمن"
-#: client/text.c:92 client/gui-sdl/mapview.c:786
+#: client/text.c:142 client/gui-sdl/mapview.c:786
msgid "?city:Peaceful"
msgstr "صلØ‌آمیز"
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Friendly"
msgstr "دوستانه"
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Mysterious"
msgstr ""
-#: client/text.c:93
+#: client/text.c:143
msgid "?city:Friendly(team)"
msgstr "دوستانه (تیم)"
-#: client/text.c:100
+#: client/text.c:151
#, c-format
msgid "Location: (%d, %d) [%d]"
msgstr "Ù…ØÙ„: (%d, %d) [%d]"
-#: client/text.c:109
+#: client/text.c:153
+#, c-format
+msgid "Native coordinates: (%d, %d)"
+msgstr ""
+
+#: client/text.c:160
#, c-format
msgid "Terrain: %s"
msgstr "نوع خانه: %s"
-#: client/text.c:110
+#: client/text.c:161
#, c-format
msgid "Food/Prod/Trade: %s"
msgstr "تجارت/تولید/غذا: %s"
-#: client/text.c:113
+#: client/text.c:164
msgid "Minor Tribe Village"
msgstr ""
-#: client/text.c:119
+#: client/text.c:173
#, fuzzy
msgid "Our territory"
msgstr "خانه‌ی ما"
-#. TRANS: "Polish territory"
-#: client/text.c:122
+#. TRANS: "Territory of <username> (<nation + team>)"
+#: client/text.c:176
#, fuzzy, c-format
-msgid "%s territory"
-msgstr "خانه‌ی %s"
+msgid "Territory of %s (%s)"
+msgstr ""
+"\n"
+"خانه‌ی %s %s"
-#. TRANS: "Polish territory (5 turn cease-fire)"
-#: client/text.c:131
-#, c-format
-msgid "%s territory (%d turn cease-fire)"
-msgid_plural "%s territory (%d turn cease-fire)"
-msgstr[0] "خانه %s (%d نوبت آتش‌بس)"
-msgstr[1] "خانه %s (%d نوبت آتش‌بس)"
+#: client/text.c:186
+#, fuzzy, c-format
+msgid "Territory of %s (%s) (%d turn cease-fire)"
+msgid_plural "Territory of %s (%s) (%d turn cease-fire)"
+msgstr[0] "شهر: %s (%s, %d نوبت آتش‌بس)"
+msgstr[1] "شهر: %s (%s, %d نوبت آتش‌بس)"
-#. TRANS: "Polish territory (friendly)"
-#: client/text.c:140
+#. TRANS: "Territory of <username>
+#. * (<nation + team> | <diplomatic state>)"
+#: client/text.c:195
#, fuzzy, c-format
-msgid "%s territory (%s)"
-msgstr "خانه‌ی %s %s"
+msgid "Territory of %s (%s | %s)"
+msgstr ""
+"\n"
+"خانه‌ی %s %s"
-#: client/text.c:145
+#: client/text.c:200
msgid "Unclaimed territory"
msgstr "خانه بی مالک"
-#. TRANS: "City: Warsaw (Polish)"
-#: client/text.c:156
-#, c-format
-msgid "City: %s (%s)"
-msgstr "شهر: %s (%s)"
+#. TRANS: "City: <city name> | <username> (<nation + team>)"
+#: client/text.c:214
+#, fuzzy, c-format
+msgid "City: %s | %s (%s)"
+msgstr "شهر: %s (%s,%s)"
-#. TRANS: "City: Warsaw (Polish, 5 turn cease-fire)"
-#: client/text.c:166
-#, c-format
-msgid "City: %s (%s, %d turn cease-fire)"
-msgid_plural "City: %s (%s, %d turn cease-fire)"
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <number> turn cease-fire)"
+#: client/text.c:224
+#, fuzzy, c-format
+msgid "City: %s | %s (%s, %d turn cease-fire)"
+msgid_plural "City: %s | %s (%s, %d turn cease-fire)"
msgstr[0] "شهر: %s (%s, %d نوبت آتش‌بس)"
msgstr[1] "شهر: %s (%s, %d نوبت آتش‌بس)"
-#. TRANS: "City: Warsaw (Polish,friendly)"
-#: client/text.c:174
-#, c-format
-msgid "City: %s (%s, %s)"
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <diplomatic state>)"
+#: client/text.c:231
+#, fuzzy, c-format
+msgid "City: %s | %s (%s, %s)"
msgstr "شهر: %s (%s,%s)"
#. TRANS: previous lines gave other information about the city.
-#: client/text.c:189
+#: client/text.c:246
#, fuzzy, c-format
msgid "?clistbegin: with %s"
msgstr " با %s"
#. TRANS: "Trade from Warsaw: 5"
-#: client/text.c:202
+#: client/text.c:259
#, c-format
msgid "Trade from %s: %d"
msgstr "تجارت از %s: %d"
-#: client/text.c:210
+#: client/text.c:267
#, c-format
msgid "Infrastructure: %s"
msgstr "زیرساخت: %s"
-#: client/text.c:215
+#: client/text.c:272
#, c-format
msgid "Activity: %s"
msgstr "Ùعالیت: %s"
-#. TRANS: "Unit: Musketeers (Polish, Warsaw)"
-#. TRANS: "Unit: Musketeers (Polish,friendly)"
-#: client/text.c:226 client/text.c:253
-#, c-format
-msgid "Unit: %s (%s, %s)"
+#. TRANS: "Unit: <unit type> | <username>
+#. * (<nation + team>, <homecity>)"
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <diplomatic state>)"
+#: client/text.c:287 client/text.c:313
+#, fuzzy, c-format
+msgid "Unit: %s | %s (%s, %s)"
msgstr "مهره: %s (%s,%s)"
-#. TRANS: "Unit: Musketeers (Polish)"
-#: client/text.c:232
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>)"
+#: client/text.c:292
#, fuzzy, c-format
-msgid "Unit: %s (%s)"
-msgstr "مهره: %s (%s)"
+msgid "Unit: %s | %s (%s)"
+msgstr "مهره: %s (%s,%s)"
-#. TRANS: "Unit: Musketeers (Polish, 5 turn cease-fire)"
-#: client/text.c:245
-#, c-format
-msgid "Unit: %s (%s, %d turn cease-fire)"
-msgid_plural "Unit: %s (%s, %d turn cease-fire)"
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <number> turn cease-fire)"
+#: client/text.c:305
+#, fuzzy, c-format
+msgid "Unit: %s | %s (%s, %d turn cease-fire)"
+msgid_plural "Unit: %s | %s (%s, %d turn cease-fire)"
msgstr[0] "مهره: %s (%s, %d نوبت آتش‌بس)"
msgstr[1] "مهره: %s (%s, %d نوبت آتش‌بس)"
#. TRANS: "Chance to win: A:95% D:46%"
-#: client/text.c:279
+#: client/text.c:338
#, c-format
msgid "Chance to win: A:%d%% D:%d%%"
msgstr "شانس برد: Ø:%d%% د:%d%%"
#. TRANS: A is attack power, D is defense power, FP is firepower,
#. * HP is hitpoints (current and max).
-#: client/text.c:286
+#: client/text.c:345
#, c-format
msgid "A:%d D:%d FP:%d HP:%d/%d (%s)"
msgstr "Ø:%d د:%d ق‌آ:%d ا‌ض:%d/%d (%s)"
#. TRANS: "5 more" units on this tile
-#: client/text.c:295
+#: client/text.c:354
#, c-format
msgid " (%d more)"
msgstr " (%d بیشتر)"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:364
+#: client/text.c:423
#, c-format
msgid "far from %s"
msgstr "دور از %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:367
+#: client/text.c:426
#, c-format
msgid "near %s"
msgstr "نزدیک %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:370
+#: client/text.c:429
#, c-format
msgid "in %s"
msgstr "در %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:403
+#: client/text.c:462
#, c-format
msgid "from %s"
msgstr "از %s"
-#: client/text.c:466
+#: client/text.c:525
msgid "Progress: no research"
msgstr "پیشرÙت: بدون جستجو"
-#: client/text.c:470
+#: client/text.c:529
msgid "Progress: no research target"
msgstr "پیشرÙت: بدون هد٠پژوهش"
-#: client/text.c:475
+#: client/text.c:534
#, c-format
msgid "Progress: %d turn/advance"
msgid_plural "Progress: %d turns/advance"
msgstr[0] "پیشرÙت: %d نوبت/ترقی"
msgstr[1] "پیشرÙت: %d نوبت/ترقی"
-#: client/text.c:480
+#: client/text.c:539
#, c-format
msgid "%d bulb/turn"
msgid_plural "%d bulbs/turn"
msgstr[0] "%d امتیاز/نوبت"
msgstr[1] "%d امتیاز/نوبت"
-#: client/text.c:485
+#: client/text.c:544
#, c-format
msgid ", %d bulb/turn from team"
msgid_plural ", %d bulbs/turn from team"
msgstr[0] "، %d امتیاز/نوبت از تیم"
msgstr[1] "، %d امتیاز/نوبت از تیم"
-#: client/text.c:512
+#: client/text.c:571
#, c-format
msgid "%d/- (never)"
msgstr "%d/- (هیچ وقت)"
-#: client/text.c:524
+#: client/text.c:583
#, c-format
msgid "%d/%d (%d turn)"
msgid_plural "%d/%d (%d turns)"
msgstr[0] "%d/%d (%d نوبت)"
msgstr[1] "%d/%d (%d نوبت)"
-#: client/text.c:527
+#: client/text.c:586
#, c-format
msgid "%d/%d (never)"
msgstr "%d/%d (هیچ وقت)"
-#: client/text.c:564
+#: client/text.c:623
#, c-format
msgid "%d step"
msgid_plural "%d steps"
msgstr[0] "%d مرØله"
msgstr[1] "%d مرØله"
-#: client/text.c:566
+#: client/text.c:625
#, c-format
msgid "%d bulb"
msgid_plural "%d bulbs"
msgstr[0] "%d امتیاز"
msgstr[1] "%d امتیاز"
-#: client/text.c:570 client/agents/cma_fec.c:269 client/agents/cma_fec.c:313
+#: 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
#, c-format
msgid "%d turn"
@@ -8926,89 +9004,89 @@ msgid_plural "%d turns"
msgstr[0] "%d نوبت"
msgstr[1] "%d نوبت"
-#: client/text.c:592
+#: client/text.c:651
#, c-format
msgid "Population: %s"
msgstr "جمعیت: %s"
-#: client/text.c:595
+#: client/text.c:654
#, c-format
msgid "Year: %s (T%d)"
msgstr "سال: %s (ن%d)"
-#: client/text.c:598
+#: client/text.c:657
#, c-format
msgid "Gold: %d (%+d)"
msgstr "طلا: %d (%+d)"
-#: client/text.c:600
+#: client/text.c:659
#, c-format
msgid "Tax: %d Lux: %d Sci: %d"
msgstr "مالیات: %d رÙاه: %d علم: %d"
-#: client/text.c:607
+#: client/text.c:666
#, fuzzy
msgid "Moving: Nobody"
msgstr "متØرک: %s"
-#: client/text.c:609
+#: client/text.c:668
#, c-format
msgid "Moving: %s"
msgstr "متØرک: %s"
-#: client/text.c:613
+#: client/text.c:672
msgid "(Click for more info)"
msgstr "(برای اطلاعات بیشتر کلیک کنید)"
-#: client/text.c:629
+#: client/text.c:688
#, c-format
msgid "%s People"
msgstr "جمعیت %s"
-#: client/text.c:633
+#: client/text.c:692
#, c-format
msgid "Turn: %d"
msgstr "نوبت: %d"
-#: client/text.c:635 client/gui-win32/inteldlg.c:111
+#: client/text.c:694 client/gui-win32/inteldlg.c:111
#: client/gui-xaw/inteldlg.c:208
#, c-format
msgid "Gold: %d"
msgstr "طلا: %d"
-#: client/text.c:636
+#: client/text.c:695
#, c-format
msgid "Net Income: %d"
msgstr "درآمد خالص: %d"
#. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:639
+#: client/text.c:698
#, c-format
msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
msgstr "درجه‌ها: طلا: %d%% رÙاه %d%% علم %d%%"
-#: client/text.c:643
+#: client/text.c:702
#, c-format
msgid "Researching %s: %s"
msgstr "پژوهش %s: %s"
-#: client/text.c:650
+#: client/text.c:709
#, c-format
msgid "Global warming chance: %d%% (%+d%%/turn)"
msgstr "اØتمال گرمای عمومی: %d%% (%+d%%/نوبت)"
-#: client/text.c:653
+#: client/text.c:712
#, c-format
msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
msgstr "اØتمال زمستان اتمی: %d%% (%+d%%/نوبت)"
-#: client/text.c:658 client/gui-win32/inteldlg.c:104
+#: client/text.c:717 client/gui-win32/inteldlg.c:104
#: client/gui-xaw/inteldlg.c:200
#, c-format
msgid "Government: %s"
msgstr "Øکومت: %s"
-#: client/text.c:682
+#: client/text.c:741
#, c-format
msgid "%d unit"
msgid_plural "%d units"
@@ -9016,55 +9094,55 @@ msgstr[0] "%d مهره"
msgstr[1] "%d مهره"
#. TRANS: Impossible to reach goto target tile
-#: client/text.c:715 client/gui-sdl/mapview.c:566
+#: client/text.c:774 client/gui-sdl/mapview.c:566
msgid "?goto:Unreachable"
msgstr ""
-#: client/text.c:717 client/gui-sdl/mapview.c:568
+#: client/text.c:776 client/gui-sdl/mapview.c:568
#, c-format
msgid "Turns to target: %d"
msgstr "%d نوبت تا هدÙ"
-#: client/text.c:719 client/gui-sdl/mapview.c:570
+#: client/text.c:778 client/gui-sdl/mapview.c:570
#, c-format
msgid "Turns to target: %d to %d"
msgstr "نوبت تا هدÙ: %d تا %d"
-#: client/text.c:725 client/gui-sdl/mapview.c:576
+#: client/text.c:784 client/gui-sdl/mapview.c:576
#, c-format
msgid "%d unit selected"
msgid_plural "%d units selected"
msgstr[0] "%d مهره انتخاب شده"
msgstr[1] "%d مهره انتخاب شده"
-#: client/text.c:730 client/gui-sdl/mapview.c:581
+#: client/text.c:789 client/gui-sdl/mapview.c:581
msgid "No units selected."
msgstr "هیچ مهره‌ای انتخاب نشده"
-#: client/text.c:804 client/gui-sdl/mapview.c:654
+#: client/text.c:863 client/gui-sdl/mapview.c:654
#, c-format
msgid "Others: %d civil; %d military"
msgstr ""
-#: client/text.c:806 client/gui-sdl/mapview.c:656
+#: client/text.c:865 client/gui-sdl/mapview.c:656
#, c-format
msgid "Others: %d civilian"
msgstr ""
-#: client/text.c:808 client/gui-sdl/mapview.c:658
+#: client/text.c:867 client/gui-sdl/mapview.c:658
#, c-format
msgid "Others: %d military"
msgstr ""
-#: client/text.c:839
+#: client/text.c:898
msgid "No units to upgrade!"
msgstr ""
-#: client/text.c:864
+#: client/text.c:923
msgid "None of these units may be upgraded."
msgstr ""
-#: client/text.c:870
+#: client/text.c:929
#, c-format
msgid ""
"Upgrade %d unit for %d gold?\n"
@@ -9079,72 +9157,72 @@ msgstr[1] ""
"%d مهره با %d طلا ترÙیع بشود؟\n"
"خزانه %d طلا دارد."
-#: client/text.c:891
+#: client/text.c:950
msgid "Shows your progress in researching the current technology."
msgstr "پیشرÙت شما را در تکنولوژی Øاضر نسان می‌دهد."
-#: client/text.c:897
+#: client/text.c:956
msgid "no research target."
msgstr "بدون هد٠پژوهش."
#. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:900
+#: client/text.c:959
#, c-format
msgid "%s: %d/%d."
msgstr ""
-#: client/text.c:920
+#: client/text.c:979
msgid "Shows the progress of global warming:"
msgstr "جریان گرمای جهانی را نشان می‌دهد:"
-#: client/text.c:921
+#: client/text.c:980
#, c-format
msgid "Pollution rate: %d%%"
msgstr "درجه آلودگی: %d%%"
-#: client/text.c:923
+#: client/text.c:982
#, c-format
msgid "Chance of catastrophic warming each turn: %d%%"
msgstr ""
-#: client/text.c:939
+#: client/text.c:998
msgid "Shows the progress of nuclear winter:"
msgstr "جریان زمستان اتمی را نشان می‌دهد:"
-#: client/text.c:940
+#: client/text.c:999
#, c-format
msgid "Fallout rate: %d%%"
msgstr "درجه غبار اتمی: %d%%"
-#: client/text.c:942
+#: client/text.c:1001
#, c-format
msgid "Chance of catastrophic winter each turn: %d%%"
msgstr ""
-#: client/text.c:957
+#: client/text.c:1016
msgid "Shows your current government:"
msgstr "Øکومت Ùعلی شما را نشان می‌دهد:"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:981
+#: client/text.c:1040
#, c-format
msgid "Population: %5d"
msgstr "جمعیت: %5d"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:1043
#, c-format
msgid "Support: %5d %%"
msgstr "پشتیبانی : %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:1047
#, c-format
msgid "Energy: %5d %%"
msgstr "انرژی : %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:992
+#: client/text.c:1051
#, c-format
msgid "Mass: %5d ton"
msgid_plural "Mass: %5d tons"
@@ -9152,96 +9230,97 @@ msgstr[0] "جرم: %5d تن"
msgstr[1] "جرم: %5d تن"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1057
#, c-format
msgid "Travel time: %5.1f years"
msgstr "زمان مساÙرت: %5.1f سال"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1061
msgid "Travel time: N/A "
msgstr "زمان مساÙر ت: نامشخص"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1065
#, c-format
msgid "Success prob.: %5d %%"
msgstr ""
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1010
+#: client/text.c:1069
#, c-format
msgid "Year of arrival: %8s"
msgstr "سال رسیدن : %8s"
-#: client/text.c:1030
+#: client/text.c:1089
msgid "?timeout:off"
msgstr "خاموش"
-#: client/text.c:1054
+#: client/text.c:1113
#, c-format
msgid "?seconds:%02ds"
msgstr "%02d"
-#: client/text.c:1056
+#: client/text.c:1115
#, c-format
msgid "?mins/secs:%02dm %02ds"
msgstr "%02dد %02dث"
-#: client/text.c:1058
+#: client/text.c:1117
#, c-format
msgid "?hrs/mns:%02dh %02dm"
msgstr "%02dس %02dد"
-#: client/text.c:1060
+#: client/text.c:1119
#, c-format
msgid "?dys/hrs:%02dd %02dh"
msgstr "?dys/hrs:%02dر %02dس"
-#: client/text.c:1063
+#: client/text.c:1122
msgid "?duration:overflow"
msgstr "بالاتر از Øد"
-#: client/text.c:1084
+#: client/text.c:1143
#, c-format
msgid "%6d.%02d ms"
msgstr "%6d.%02d م‌ث"
-#. TRANS: "Republic of the Poles"
-#: client/text.c:1127
-#, c-format
-msgid "%s of the %s"
-msgstr "%s از %s"
+#. TRANS: <nation adjective> <government name>.
+#. * E.g. "Polish Republic".
+#: client/text.c:1188
+#, fuzzy, c-format
+msgid "?nationgovernment:%s %s"
+msgstr "Øکومت: %s"
#. TRANS: "Observer: 1985"
-#: client/text.c:1137
+#: client/text.c:1198
#, c-format
msgid "Observer: %s"
msgstr "ناظر: %s"
-#: client/text.c:1155
+#: client/text.c:1216
msgid "Buildings: "
msgstr "ساختمان‌ها: "
-#: client/text.c:1172 client/text.c:1211
+#: client/text.c:1233 client/text.c:1272
msgid "None. "
msgstr "هیچ. "
-#: client/text.c:1174 client/text.c:1213
+#: client/text.c:1235 client/text.c:1274
msgid "?clistend:."
msgstr "?clistend:."
-#: client/text.c:1192
+#: client/text.c:1253
msgid "Wonders: "
msgstr "Ø´Ú¯Ùتی‌ها: "
-#: client/text.c:1247
+#: client/text.c:1308
#, 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:1251
+#: client/text.c:1312
#, fuzzy, c-format
msgid "%d content before penalty."
msgid_plural "%d content before penalty."
@@ -9249,45 +9328,40 @@ msgstr[0] "%d قبل از جزا با "
msgstr[1] "%d قبل از جزا با "
#. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1257
+#: client/text.c:1318
#, fuzzy, c-format
msgid "%d additional unhappy citizen."
msgid_plural "%d additional unhappy citizens."
msgstr[0] "%d شهر ناراضی اضاÙÙ‡."
msgstr[1] "%d شهر ناراضی اضاÙÙ‡."
-#. TRANS: Martial law opening parenthesis
-#: client/text.c:1279
-msgid "Martial law in effect ("
+#: client/text.c:1339
+msgid "Unlimited martial law in effect."
msgstr ""
-#. TRANS: no [unit] maximum
-#: client/text.c:1284
-msgid "no maximum, "
-msgstr ""
+#: client/text.c:1341
+#, 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:1287
+#: client/text.c:1345
#, c-format
-msgid "%d unit maximum, "
-msgid_plural "%d units maximum, "
+msgid "Each military unit makes %d unhappy citizen content."
+msgid_plural "Each military unit makes %d unhappy citizens content."
msgstr[0] ""
msgstr[1] ""
-#. TRANS: Martial law closing parenthesis
-#: client/text.c:1294
-#, c-format
-msgid "%d per unit). "
-msgstr ""
-
-#: client/text.c:1298
+#: client/text.c:1352
msgid "Military units in the field may cause unhappiness. "
msgstr ""
-#: client/text.c:1301
+#: client/text.c:1355
msgid "Military units have no happiness effect. "
msgstr ""
-#: client/text.c:1316
+#: client/text.c:1370
#, c-format
msgid "Luxury: %d total."
msgstr "رÙاه: مجموعا %d."
@@ -9307,7 +9381,7 @@ msgid ""
"instead."
msgstr ""
-#: client/tilespec.c:3968
+#: client/tilespec.c:3966
#, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
@@ -9328,12 +9402,12 @@ msgid ""
"have a look."
msgstr ""
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
-#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:599
+#: client/gui-gtk-2.0/cityrep.c:624 client/gui-sdl/citydlg.c:2009
msgid "none"
msgstr "هیچ"
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:645
msgid "custom"
msgstr "سÙارشی"
@@ -9640,7 +9714,7 @@ msgstr "Ùراهم کردن راه تجاری"
msgid "Enter Marketplace"
msgstr "ورود به بازار"
-#: client/gui-gtk-2.0/chatline.c:144 client/gui-win32/chatline.c:134
+#: client/gui-gtk-2.0/chatline.c:218 client/gui-win32/chatline.c:134
#: client/gui-xaw/chatline.c:120
msgid "Cleared output window."
msgstr "پنجره خروجی پاک شده."
@@ -9721,11 +9795,11 @@ msgid "%d/%d %d turns"
msgstr "%d/%d %d نوبت"
#: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:821
+#: client/gui-gtk-2.0/cityrep.c:1027
msgid "_Buy"
msgstr "خرید"
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:869
#, fuzzy
msgid "_Production"
msgstr "Ù…Øصول"
@@ -9747,12 +9821,12 @@ msgid "Entertainers"
msgstr "سرگرم‌کننده"
#: client/gui-gtk-2.0/citydlg.c:1029 client/gui-win32/citydlg.c:1989
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2403
msgid "Scientists"
msgstr "دانشمندان"
#: client/gui-gtk-2.0/citydlg.c:1030 client/gui-win32/citydlg.c:1991
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2404
msgid "Taxmen"
msgstr "ثروتمندان"
@@ -9845,7 +9919,7 @@ msgstr "پشتیبانی شده %d"
msgid "Present units %d"
msgstr "مهره‌های Øاضر %d"
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:1019
msgid "Cen_ter"
msgstr "تمرکز"
@@ -9934,32 +10008,62 @@ msgstr "تغییر نام شهر"
msgid "What should we rename the city to?"
msgstr "نام شهر را به چه تغییر دهیم؟"
-#: client/gui-gtk-2.0/cityrep.c:699
+#: client/gui-gtk-2.0/cityrep.c:794
+#, fuzzy
+msgid "(no worklists defined)"
+msgstr "(لیست‌کار)"
+
+#: client/gui-gtk-2.0/cityrep.c:876
msgid "Chan_ge"
msgstr "تغییر"
-#: client/gui-gtk-2.0/cityrep.c:703
+#: client/gui-gtk-2.0/cityrep.c:880
msgid "Add _First"
msgstr "در ابتدا اضاÙÙ‡ Ú©Ù†"
-#: client/gui-gtk-2.0/cityrep.c:707
+#: client/gui-gtk-2.0/cityrep.c:884
msgid "Add _Next"
msgstr "برای بعد اضاÙÙ‡ Ú©Ù†"
-#: client/gui-gtk-2.0/cityrep.c:711
+#: client/gui-gtk-2.0/cityrep.c:888
+#, fuzzy
+msgid "Add _2nd Last"
+msgstr "در آخر اضاÙÙ‡ Ú©Ù†"
+
+#: client/gui-gtk-2.0/cityrep.c:892
msgid "Add _Last"
msgstr "در آخر اضاÙÙ‡ Ú©Ù†"
-#: client/gui-gtk-2.0/cityrep.c:715
+#: client/gui-gtk-2.0/cityrep.c:899
+#, fuzzy
+msgid "Set Worklist"
+msgstr "لیست کار"
+
+#: client/gui-gtk-2.0/cityrep.c:905
+#, fuzzy
+msgid "Append Worklist"
+msgstr "لیست کار"
+
+#: client/gui-gtk-2.0/cityrep.c:911
+#, fuzzy
+msgid "Clear _Worklist"
+msgstr "لیست کارها:"
+
+#: client/gui-gtk-2.0/cityrep.c:916
+#, fuzzy
+msgid "Gover_nor"
+msgstr "Øاکم"
+
+#: client/gui-gtk-2.0/cityrep.c:921
msgid "_Select"
msgstr "انتخاب"
-#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
+#: client/gui-gtk-2.0/cityrep.c:925 client/gui-gtk-2.0/plrdlg.c:521
#, fuzzy
msgid "_Display"
msgstr "نشان بده"
-#: client/gui-gtk-2.0/cityrep.c:800 client/gui-gtk-2.0/menu.c:808
+#: 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-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
#: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -9969,101 +10073,101 @@ msgstr "نشان بده"
msgid "Cities"
msgstr "شهرها"
-#: client/gui-gtk-2.0/cityrep.c:817
+#: client/gui-gtk-2.0/cityrep.c:1023
#, fuzzy
msgid "_Inspect"
msgstr "باز کردن"
-#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
-#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-sdl/helpdlg.c:297 client/gui-win32/menu.c:342
-#: client/gui-xaw/menu.c:241
+#: 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
+#: client/gui-gtk-2.0/cityrep.c:1518 client/gui-gtk-2.0/menu.c:823
+#: client/gui-gtk-2.0/menu.c:825 client/gui-gtk-2.0/menu.c:827
+#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:831
+#: client/gui-gtk-2.0/menu.c:833 client/gui-sdl/helpdlg.c:297
+#: client/gui-win32/menu.c:342 client/gui-xaw/menu.c:241
msgid "Improvements"
msgstr "اصلاØات"
-#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
-#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
-#: client/gui-xaw/menu.c:247
+#: client/gui-gtk-2.0/cityrep.c:1441 client/gui-gtk-2.0/cityrep.c:1460
+#: client/gui-gtk-2.0/cityrep.c:1479 client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1522 client/gui-xaw/menu.c:247
msgid "Wonders"
msgstr "Ø´Ú¯Ùتی‌ها"
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1662 client/gui-win32/cityrep.c:439
#: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
msgid "All Cities"
msgstr "همه شهرها"
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1667 client/gui-win32/cityrep.c:440
msgid "No Cities"
msgstr "هیچ شهری"
-#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1672 client/gui-win32/cityrep.c:441
msgid "Invert Selection"
msgstr "انتخاب معکوس"
-#: client/gui-gtk-2.0/cityrep.c:1420
+#: client/gui-gtk-2.0/cityrep.c:1682
msgid "Building Units"
msgstr "ساختمان"
-#: client/gui-gtk-2.0/cityrep.c:1426
+#: client/gui-gtk-2.0/cityrep.c:1688
msgid "Building Improvements"
msgstr "ساخت اصلاØات"
-#: client/gui-gtk-2.0/cityrep.c:1432
+#: client/gui-gtk-2.0/cityrep.c:1694
msgid "Building Wonders"
msgstr "ساخت Ø´Ú¯Ùتی"
-#: client/gui-gtk-2.0/cityrep.c:1444
+#: client/gui-gtk-2.0/cityrep.c:1706
msgid "Building Unit"
msgstr "ساخت مهره"
-#: client/gui-gtk-2.0/cityrep.c:1448
+#: client/gui-gtk-2.0/cityrep.c:1710
msgid "Building Improvement"
msgstr "ساخت اصلاØات"
-#: client/gui-gtk-2.0/cityrep.c:1452
+#: client/gui-gtk-2.0/cityrep.c:1714
msgid "Building Wonder"
msgstr "ساخت Ø´Ú¯Ùتی"
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1722 client/gui-win32/cityrep.c:443
msgid "Coastal Cities"
msgstr "شهر ساØÙ„ÛŒ"
-#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1727 client/gui-win32/cityrep.c:444
msgid "Same Island"
msgstr "جزیره یکسان"
-#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1737 client/gui-win32/cityrep.c:447
msgid "Supported Units"
msgstr "مهره‌های پشتیبانی شده"
-#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1740 client/gui-win32/cityrep.c:454
msgid "Units Present"
msgstr "مهره‌های Øاضر"
-#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1744 client/gui-win32/cityrep.c:469
msgid "Improvements in City"
msgstr "اصلاØات در شهر"
-#: client/gui-gtk-2.0/cityrep.c:1486
+#: client/gui-gtk-2.0/cityrep.c:1748
msgid "Wonders in City"
msgstr "Ø´Ú¯Ùتی‌ها در شهرها"
-#: client/gui-gtk-2.0/cityrep.c:1495
+#: client/gui-gtk-2.0/cityrep.c:1757
msgid "Available Units"
msgstr "مهره‌های موجود"
-#: client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1760
msgid "Available Improvements"
msgstr "اصلاØات موجود"
-#: client/gui-gtk-2.0/cityrep.c:1501
+#: client/gui-gtk-2.0/cityrep.c:1763
msgid "Available Wonders"
msgstr "Ø´Ú¯Ùتی‌های موجود"
-#: client/gui-gtk-2.0/cityrep.c:1625
+#: client/gui-gtk-2.0/cityrep.c:1882
#, fuzzy, c-format
msgid "Total Buy Cost: %d"
msgstr "قیمت کل: "
@@ -10129,11 +10233,11 @@ msgstr ""
msgid "Remove this preset?"
msgstr ""
-#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:186
+#: client/gui-gtk-2.0/dialogs.c:196 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:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
#, fuzzy
msgid "Inspect _City"
msgstr "باز کردن"
@@ -10162,10 +10266,10 @@ msgstr "چیزی را که می‌خواهید غارت کنید، انتخاب
msgid "Unit"
msgstr "مهره"
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
-#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
-#: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
-#: manual/civmanual.c:302 data/Freeciv.in:80
+#: 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-win32/plrdlg.c:335 manual/civmanual.c:302 data/Freeciv.in:80
msgid "Name"
msgstr "نام"
@@ -10191,7 +10295,7 @@ 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:1036 data/Freeciv.in:3371
+#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
msgid "Pick Nation"
msgstr "انتخاب ملیت"
@@ -10273,7 +10377,7 @@ msgstr "نقشه‌ها"
msgid "_Advances"
msgstr "تکنولوژی‌ها"
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:910
+#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr "شهرها"
@@ -10379,108 +10483,177 @@ msgstr "انتخاب مقصد"
msgid "Show _All Cities"
msgstr "نشان دادن همه شهرها"
-#: client/gui-gtk-2.0/gui_main.c:150
+#: client/gui-gtk-2.0/gui_main.c:162
msgid "Show Map Scrollbars"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:151
+#: client/gui-gtk-2.0/gui_main.c:163
msgid "Disable this option to hide the scrollbars on the map view."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:155
+#: client/gui-gtk-2.0/gui_main.c:167
msgid "Keyboardless goto"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:156
+#: client/gui-gtk-2.0/gui_main.c:168
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:161
+#: client/gui-gtk-2.0/gui_main.c:173
msgid "Keep dialogs on top"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:174
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:166
+#: client/gui-gtk-2.0/gui_main.c:178
msgid "Show worklist task icons"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:179
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:171
+#: client/gui-gtk-2.0/gui_main.c:183
msgid "Enable status report tabs"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:172
+#: client/gui-gtk-2.0/gui_main.c:184
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:177 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:189 client/gui-win32/gui_main.c:110
msgid "Better fog-of-war drawing"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:178 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:190 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:277 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:195
+msgid "Show time for each chat message"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:196
+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
+msgid "Split bottom notebook area"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:202
+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
+msgid "New message events go to top of list"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:208
+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
+msgid "Show extra message window buttons"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:214
+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 "
+"is disabled, these buttons will not appear (you can still double-click with "
+"the left mouse button or right-click on a row to inspect or goto "
+"respectively). This option will only take effect once the message window is "
+"closed and reopened."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:224
+msgid "Metaserver tab first in network page"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:225
+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
+msgid "Plain chat messages are sent to allies only"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:231
+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 "
+"messages will be sent as public chat messages. To send a public chat message "
+"with this option enabled, prefix the message with a single colon ':'. This "
+"option can also be set using a toggle button beside the chat entry (only "
+"visible in multiplayer games)."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:340 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:723 client/gui-gtk-2.0/gui_main.c:1345
+#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
msgid "Freeciv"
msgstr "Freeciv"
-#: client/gui-gtk-2.0/gui_main.c:1088 client/gui-gtk-2.0/gui_main.c:1095
+#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
#: 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:1095 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1232 client/gui-sdl/mapctrl.c:1566
#: client/gui-sdl/mapview.c:1082
msgid "Shift+Return"
msgstr "Ø´ÛŒÙت+اینتر"
-#: client/gui-gtk-2.0/gui_main.c:1127 client/gui-gtk-2.0/menu.c:770
-#: client/gui-gtk-2.0/menu.c:772 client/gui-gtk-2.0/menu.c:774
-#: client/gui-gtk-2.0/menu.c:776 client/gui-gtk-2.0/menu.c:778
-#: client/gui-gtk-2.0/menu.c:780 client/gui-gtk-2.0/menu.c:782
-#: client/gui-gtk-2.0/menu.c:784 client/gui-gtk-2.0/menu.c:786
-#: client/gui-gtk-2.0/menu.c:788 client/gui-gtk-2.0/menu.c:790
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-gtk-2.0/menu.c:804 client/gui-gtk-2.0/menu.c:806
-#: client/gui-gtk-2.0/menu.c:808 client/gui-gtk-2.0/menu.c:810
-#: client/gui-gtk-2.0/menu.c:812 client/gui-gtk-2.0/menu.c:814
-#: client/gui-gtk-2.0/menu.c:816 client/gui-gtk-2.0/menu.c:818
-#: client/gui-gtk-2.0/menu.c:820 client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/gui_main.c:1266 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
+#: client/gui-gtk-2.0/menu.c:811 client/gui-gtk-2.0/menu.c:813
+#: client/gui-gtk-2.0/menu.c:815 client/gui-gtk-2.0/menu.c:817
+#: client/gui-gtk-2.0/menu.c:819 client/gui-gtk-2.0/menu.c:821
+#: client/gui-gtk-2.0/menu.c:823 client/gui-gtk-2.0/menu.c:825
+#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
+#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
+#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
+#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
+#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
+#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
#: data/Freeciv.in:2028
msgid "View"
msgstr "نمایش"
-#: client/gui-gtk-2.0/gui_main.c:1208
+#: client/gui-gtk-2.0/gui_main.c:1359
msgid "Chat"
msgstr "Ú¯Ùتگو"
-#: client/gui-gtk-2.0/gui_main.c:1224 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1377 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"
@@ -10491,71 +10664,75 @@ msgstr ""
"از آنرا توزیع کنید؛ گزینه‌ی کپی‌کردن را از منو راهنما بخوانید.\n"
"Øالا... اونارو بÙرستین به جهنم!"
-#: client/gui-gtk-2.0/gui_main.c:1491
+#: client/gui-gtk-2.0/gui_main.c:1392
+msgid "Allies Only"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:1657
msgid "Not _ready"
msgstr "نا آماده"
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
+#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
msgid "_Ready"
msgstr "آماده"
-#: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2132
+#: 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
msgid "_Start"
msgstr "شروع"
-#: client/gui-gtk-2.0/gui_main.c:1520
+#: client/gui-gtk-2.0/gui_main.c:1686
#, fuzzy
msgid "_Take Player"
msgstr "انتخاب این بازیکن"
-#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
+#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
msgid "Pick _Nation"
msgstr "انتخاب ملیت"
-#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
+#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
msgid "_Observe"
msgstr "ناظر"
-#: client/gui-gtk-2.0/gui_main.c:1532
+#: client/gui-gtk-2.0/gui_main.c:1698
#, fuzzy
msgid "Do not _observe"
msgstr "نا ناظر"
-#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
msgid "<AI>"
msgstr "<ه‌م>"
-#: client/gui-gtk-2.0/gui_main.c:1557
+#: client/gui-gtk-2.0/gui_main.c:1723
msgid "<Novice AI>"
msgstr "<ه‌م نوآموز>"
-#: client/gui-gtk-2.0/gui_main.c:1560
+#: client/gui-gtk-2.0/gui_main.c:1726
msgid "<Easy AI>"
msgstr "<ه‌م آسان>"
-#: client/gui-gtk-2.0/gui_main.c:1563
+#: client/gui-gtk-2.0/gui_main.c:1729
msgid "<Normal AI>"
msgstr "<ه‌م متوسط>"
-#: client/gui-gtk-2.0/gui_main.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1732
msgid "<Hard AI>"
msgstr "<ه‌م سخت>"
-#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1742 client/gui-win32/dialogs.c:594
#: client/gui-xaw/pages.c:217
msgid "Random"
msgstr "تصادÙÛŒ"
-#: client/gui-gtk-2.0/gui_main.c:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
msgid "Observer"
msgstr "ناظر"
-#: client/gui-gtk-2.0/gui_main.c:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
msgid "Detached"
msgstr "جدا شده"
-#: client/gui-gtk-2.0/gui_main.c:1899
+#: client/gui-gtk-2.0/gui_main.c:2073
msgid "Are you sure you want to quit?"
msgstr "آیا مطمئنید که می‌خواهید خارج شود؟"
@@ -10787,469 +10964,506 @@ msgstr "تکنولوژیها"
msgid "Foreign Intelligence: %s Empire"
msgstr ""
-#: client/gui-gtk-2.0/mapctrl.c:195 client/gui-sdl/mapctrl.c:2565
+#: client/gui-gtk-2.0/mapctrl.c:179 client/gui-sdl/mapctrl.c:2565
#: client/gui-sdl/menu.c:839 client/gui-sdl/menu.c:1021
#: client/gui-win32/mapctrl.c:353
msgid "Build New City"
msgstr "ساختن شهر جدید"
-#: client/gui-gtk-2.0/mapctrl.c:196 client/gui-sdl/mapctrl.c:2594
+#: client/gui-gtk-2.0/mapctrl.c:180 client/gui-sdl/mapctrl.c:2594
#: client/gui-win32/mapctrl.c:354 client/gui-xaw/mapctrl.c:89
msgid "What should we call our new city?"
msgstr "شهر جدیدمان را چه باید بنامیم؟"
-#: client/gui-gtk-2.0/mapview.c:147
+#: client/gui-gtk-2.0/mapview.c:158
msgid "Shows your current luxury/science/tax rates;click to toggle them."
msgstr "درجات مالیات/علم/رÙاه شما را نشان می‌دهد؛ برای تغییر کلیک کنید."
-#: client/gui-gtk-2.0/mapview.c:692 client/gui-win32/canvas.c:275
+#: client/gui-gtk-2.0/mapview.c:702 client/gui-win32/canvas.c:275
msgid "Better fog will only work in truecolor. Disabling it"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:250
+#: client/gui-gtk-2.0/menu.c:256
msgid "Leaving a local game will end it!"
msgstr "ترک یک بازی Ù…ØÙ„ÛŒ آنرا پایان می‌دهد!"
-#: client/gui-gtk-2.0/menu.c:700 client/gui-win32/menu.c:303
+#: client/gui-gtk-2.0/menu.c:727 client/gui-win32/menu.c:303
msgid "_Game"
msgstr "بازی"
-#: client/gui-gtk-2.0/menu.c:702 client/gui-gtk-2.0/menu.c:704
-#: client/gui-gtk-2.0/menu.c:706 client/gui-gtk-2.0/menu.c:708
-#: client/gui-gtk-2.0/menu.c:710 client/gui-gtk-2.0/menu.c:712
-#: client/gui-gtk-2.0/menu.c:714 client/gui-gtk-2.0/menu.c:717
-#: client/gui-gtk-2.0/menu.c:720 client/gui-gtk-2.0/menu.c:722
-#: client/gui-gtk-2.0/menu.c:724 client/gui-gtk-2.0/menu.c:726
-#: client/gui-gtk-2.0/menu.c:728 client/gui-gtk-2.0/menu.c:730
-#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:736
-#: client/gui-gtk-2.0/menu.c:738 client/gui-gtk-2.0/menu.c:740
+#: client/gui-gtk-2.0/menu.c:729 client/gui-gtk-2.0/menu.c:731
+#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:735
+#: client/gui-gtk-2.0/menu.c:737 client/gui-gtk-2.0/menu.c:739
+#: client/gui-gtk-2.0/menu.c:741 client/gui-gtk-2.0/menu.c:744
+#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
+#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
+#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
+#: client/gui-gtk-2.0/menu.c:760 client/gui-gtk-2.0/menu.c:763
+#: client/gui-gtk-2.0/menu.c:765 client/gui-gtk-2.0/menu.c:767
#: data/Freeciv.in:2026
msgid "Game"
msgstr "یازی"
-#: client/gui-gtk-2.0/menu.c:704 client/gui-gtk-2.0/menu.c:706
-#: client/gui-gtk-2.0/menu.c:708
+#: client/gui-gtk-2.0/menu.c:731 client/gui-gtk-2.0/menu.c:733
+#: client/gui-gtk-2.0/menu.c:735
msgid "_Chat"
msgstr "Ú¯Ùتگو"
-#: client/gui-gtk-2.0/menu.c:706 client/gui-win32/menu.c:314
+#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:314
msgid "_Clear Log"
msgstr "پاک کردن سیاهه"
-#: client/gui-gtk-2.0/menu.c:708 client/gui-win32/menu.c:313
+#: client/gui-gtk-2.0/menu.c:735 client/gui-win32/menu.c:313
#, fuzzy
msgid "_Write Log"
msgstr "صدور سیاهه"
-#: client/gui-gtk-2.0/menu.c:710 client/gui-win32/menu.c:304
+#: client/gui-gtk-2.0/menu.c:737 client/gui-win32/menu.c:304
msgid "Local _Options"
msgstr "تنظیمات Ù…ØÙ„ÛŒ"
-#: client/gui-gtk-2.0/menu.c:712 client/gui-win32/menu.c:305
+#: client/gui-gtk-2.0/menu.c:739 client/gui-win32/menu.c:305
msgid "_Message Options"
msgstr "تنظیمات پیام‌ها"
-#: client/gui-gtk-2.0/menu.c:717
+#: client/gui-gtk-2.0/menu.c:744
msgid "_Reload Tileset"
msgstr "دوبارگذاری مجموعه خانه"
-#: client/gui-gtk-2.0/menu.c:720
+#: client/gui-gtk-2.0/menu.c:747
msgid "Save Options on _Exit"
msgstr "ذخیره تنظیمات هنگام خروج"
-#: client/gui-gtk-2.0/menu.c:722
+#: client/gui-gtk-2.0/menu.c:749
msgid "Sa_ve Options"
msgstr "ذخیره تنظیمات"
-#: client/gui-gtk-2.0/menu.c:726 client/gui-win32/menu.c:308
+#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:308
msgid "Server O_ptions"
msgstr "تنظیمات سرور"
-#: client/gui-gtk-2.0/menu.c:730 client/gui-win32/menu.c:310
+#: client/gui-gtk-2.0/menu.c:757 client/gui-win32/menu.c:310
msgid "_Save Game"
msgstr "ذخیره بازی"
-#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:311
+#: client/gui-gtk-2.0/menu.c:760 client/gui-win32/menu.c:311
msgid "Save Game _As..."
msgstr "ذخیره بازی یه نام ..."
-#: client/gui-gtk-2.0/menu.c:738
+#: client/gui-gtk-2.0/menu.c:765
msgid "_Leave"
msgstr "ترک"
-#: client/gui-gtk-2.0/menu.c:740 client/gui-win32/menu.c:317
+#: client/gui-gtk-2.0/menu.c:767 client/gui-win32/menu.c:317
msgid "_Quit"
msgstr "خروج"
-#: client/gui-gtk-2.0/menu.c:745 client/gui-win32/menu.c:321
+#: client/gui-gtk-2.0/menu.c:772 client/gui-win32/menu.c:321
msgid "Gov_ernment"
msgstr "Øکومت"
-#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
-#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
-#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:774 client/gui-gtk-2.0/menu.c:776
+#: client/gui-gtk-2.0/menu.c:778 client/gui-gtk-2.0/menu.c:780
+#: client/gui-gtk-2.0/menu.c:782 client/gui-gtk-2.0/menu.c:784
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
#: client/gui-xaw/menu.c:248 data/Freeciv.in:2027 data/helpdata.txt:1320
msgid "Government"
msgstr "Øکومت"
-#: client/gui-gtk-2.0/menu.c:749 client/gui-win32/menu.c:322
+#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:322
msgid "_Tax Rates"
msgstr "درجات مالیات‌ها"
-#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:324
+#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:324
msgid "_Find City"
msgstr "پیدا کردن شهر"
-#: client/gui-gtk-2.0/menu.c:755 client/gui-win32/menu.c:325
+#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:325
msgid "_Worklists"
msgstr "لیست کارها"
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
-#: client/gui-gtk-2.0/menu.c:764 client/gui-win32/menu.c:327
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
+#: client/gui-gtk-2.0/menu.c:791 client/gui-win32/menu.c:327
msgid "_Change Government"
msgstr "تغییر Øکومت"
-#: client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:788
msgid "_Revolution..."
msgstr "انقلاب..."
-#: client/gui-gtk-2.0/menu.c:764 client/gui-gtk-2.0/menu.c:970
+#: client/gui-gtk-2.0/menu.c:791 client/gui-gtk-2.0/menu.c:1013
#: client/gui-win32/menu.c:431
msgid "_Government"
msgstr "Øکومت"
-#: client/gui-gtk-2.0/menu.c:768 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:795 client/gui-gtk-2.0/menu.c:959
#: client/gui-win32/menu.c:334
msgid "_View"
msgstr "نمایش"
-#: client/gui-gtk-2.0/menu.c:772
+#: client/gui-gtk-2.0/menu.c:799
msgid "City Outlines"
msgstr "Ù…Øدوده شهرها"
-#: client/gui-gtk-2.0/menu.c:774 client/gui-win32/menu.c:335
+#: client/gui-gtk-2.0/menu.c:801 client/gui-win32/menu.c:335
msgid "Map _Grid"
msgstr "خطوط نقشه"
-#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:336
+#: client/gui-gtk-2.0/menu.c:803 client/gui-win32/menu.c:336
msgid "National _Borders"
msgstr "Øدود کشور"
-#: client/gui-gtk-2.0/menu.c:778 client/gui-win32/menu.c:337
+#: client/gui-gtk-2.0/menu.c:805 client/gui-win32/menu.c:337
msgid "City _Names"
msgstr "اسامی شهرها"
-#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:338
+#: client/gui-gtk-2.0/menu.c:807 client/gui-win32/menu.c:338
msgid "City G_rowth"
msgstr "بزرگ شدن شهرها"
-#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:339
+#: client/gui-gtk-2.0/menu.c:809 client/gui-win32/menu.c:339
msgid "City _Productions"
msgstr "Ù…Øصول شهرها"
-#: client/gui-gtk-2.0/menu.c:784 client/gui-sdl/optiondlg.c:1719
+#: client/gui-gtk-2.0/menu.c:811
+#, fuzzy
+msgid "City Buy Cost"
+msgstr "قیمت کل: "
+
+#: client/gui-gtk-2.0/menu.c:813
+#, fuzzy
+msgid "City Traderoutes"
+msgstr "راه‌های تجاری:"
+
+#: client/gui-gtk-2.0/menu.c:815 client/gui-sdl/optiondlg.c:1719
msgid "Draw city worker map grid"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:788 client/gui-sdl/optiondlg.c:1635
+#: client/gui-gtk-2.0/menu.c:819 client/gui-sdl/optiondlg.c:1635
#: client/gui-win32/menu.c:340 client/gui-xaw/menu.c:148
#: client/gui-xaw/menu.c:246 manual/civmanual.c:220 data/helpdata.txt:1220
msgid "Terrain"
msgstr "نوع خانه"
-#: client/gui-gtk-2.0/menu.c:790 client/gui-win32/menu.c:341
+#: client/gui-gtk-2.0/menu.c:821 client/gui-win32/menu.c:341
#: client/gui-xaw/menu.c:149
msgid "Coastline"
msgstr "خط ساØÙ„ÛŒ"
-#: client/gui-gtk-2.0/menu.c:796 client/gui-win32/menu.c:343
+#: client/gui-gtk-2.0/menu.c:827 client/gui-win32/menu.c:343
msgid "Roads & Rails"
msgstr "جاده‌ها و خطوط‌آهن"
-#: client/gui-gtk-2.0/menu.c:800 client/gui-sdl/optiondlg.c:1933
+#: client/gui-gtk-2.0/menu.c:831 client/gui-sdl/optiondlg.c:1933
#: client/gui-win32/menu.c:345 client/gui-xaw/menu.c:152
msgid "Mines"
msgstr "معدن‌ها"
-#: client/gui-gtk-2.0/menu.c:802 client/gui-win32/menu.c:346
+#: client/gui-gtk-2.0/menu.c:833 client/gui-win32/menu.c:346
msgid "Fortress & Airbase"
msgstr "دژ و پایگاه هوایی"
-#: client/gui-gtk-2.0/menu.c:804 client/gui-win32/menu.c:348
+#: client/gui-gtk-2.0/menu.c:835 client/gui-win32/menu.c:348
#: client/gui-xaw/menu.c:154
msgid "Specials"
msgstr "ویژه‌ها"
-#: client/gui-gtk-2.0/menu.c:806 client/gui-win32/menu.c:349
+#: client/gui-gtk-2.0/menu.c:837 client/gui-win32/menu.c:349
#: client/gui-xaw/menu.c:155
msgid "Pollution & Fallout"
msgstr "آلودگی و غبار اتمی"
-#: client/gui-gtk-2.0/menu.c:812 client/gui-win32/menu.c:352
+#: client/gui-gtk-2.0/menu.c:843 client/gui-win32/menu.c:352
#: client/gui-xaw/menu.c:158
msgid "Focus Unit"
msgstr "تمرکز مهره"
-#: client/gui-gtk-2.0/menu.c:814 client/gui-sdl/optiondlg.c:1854
+#: client/gui-gtk-2.0/menu.c:845 client/gui-sdl/optiondlg.c:1854
#: client/gui-win32/menu.c:353 client/gui-xaw/menu.c:159
msgid "Fog of War"
msgstr "غبار جنگ"
-#: client/gui-gtk-2.0/menu.c:818
+#: client/gui-gtk-2.0/menu.c:849
msgid "_Full Screen"
msgstr "تمام صÙØÙ‡"
-#: client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/menu.c:853
msgid "_Center View"
msgstr "تمرکز نما"
-#: client/gui-gtk-2.0/menu.c:825 client/gui-win32/menu.c:358
+#: client/gui-gtk-2.0/menu.c:856 client/gui-win32/menu.c:358
msgid "_Orders"
msgstr "دستورات"
-#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
-#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
-#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
-#: client/gui-gtk-2.0/menu.c:855 client/gui-gtk-2.0/menu.c:857
-#: client/gui-gtk-2.0/menu.c:859 client/gui-gtk-2.0/menu.c:861
-#: client/gui-gtk-2.0/menu.c:863 client/gui-gtk-2.0/menu.c:865
-#: client/gui-gtk-2.0/menu.c:867 client/gui-gtk-2.0/menu.c:869
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875 client/gui-gtk-2.0/menu.c:877
-#: client/gui-gtk-2.0/menu.c:879 client/gui-gtk-2.0/menu.c:881
-#: client/gui-gtk-2.0/menu.c:883 client/gui-gtk-2.0/menu.c:885
-#: client/gui-gtk-2.0/menu.c:887 client/gui-gtk-2.0/menu.c:889
-#: client/gui-gtk-2.0/menu.c:891 client/gui-gtk-2.0/menu.c:893
-#: client/gui-gtk-2.0/menu.c:895 client/gui-gtk-2.0/menu.c:897
-#: client/gui-gtk-2.0/menu.c:899 client/gui-gtk-2.0/menu.c:901
-#: client/gui-gtk-2.0/menu.c:903 data/Freeciv.in:2029
+#: client/gui-gtk-2.0/menu.c:858 client/gui-gtk-2.0/menu.c:860
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:864
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:868
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:872
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:876
+#: client/gui-gtk-2.0/menu.c:878 client/gui-gtk-2.0/menu.c:880
+#: client/gui-gtk-2.0/menu.c:882 client/gui-gtk-2.0/menu.c:884
+#: client/gui-gtk-2.0/menu.c:886 client/gui-gtk-2.0/menu.c:888
+#: client/gui-gtk-2.0/menu.c:890 client/gui-gtk-2.0/menu.c:892
+#: client/gui-gtk-2.0/menu.c:894 client/gui-gtk-2.0/menu.c:896
+#: client/gui-gtk-2.0/menu.c:898 client/gui-gtk-2.0/menu.c:900
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906 client/gui-gtk-2.0/menu.c:908
+#: client/gui-gtk-2.0/menu.c:910 client/gui-gtk-2.0/menu.c:912
+#: client/gui-gtk-2.0/menu.c:914 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:918 client/gui-gtk-2.0/menu.c:920
+#: client/gui-gtk-2.0/menu.c:922 client/gui-gtk-2.0/menu.c:924
+#: client/gui-gtk-2.0/menu.c:926 client/gui-gtk-2.0/menu.c:928
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
+#: client/gui-gtk-2.0/menu.c:946 data/Freeciv.in:2029
msgid "Orders"
msgstr "دستورات"
-#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:1444
+#: client/gui-gtk-2.0/menu.c:860 client/gui-gtk-2.0/menu.c:1489
#: client/gui-win32/menu.c:359
msgid "_Build City"
msgstr "ساخت شهر"
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:1466
-#: client/gui-gtk-2.0/menu.c:1472 client/gui-win32/menu.c:360
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:1511
+#: client/gui-gtk-2.0/menu.c:1517 client/gui-win32/menu.c:360
msgid "Build _Road"
msgstr "ساخت جاده"
-#: client/gui-gtk-2.0/menu.c:833 client/gui-gtk-2.0/menu.c:1360
+#: 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 "آبیاری کردن"
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:1361
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:1406
#: client/gui-win32/menu.c:362
msgid "Build _Mine"
msgstr "ساخت معدن"
-#: client/gui-gtk-2.0/menu.c:837 client/gui-gtk-2.0/menu.c:1362
+#: client/gui-gtk-2.0/menu.c:868 client/gui-gtk-2.0/menu.c:1407
msgid "Transf_orm Terrain"
msgstr "تغییر دادن زمین"
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:1508
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:1553
#: client/gui-win32/menu.c:364
msgid "Build _Fortress"
msgstr "ساخت دژ"
-#: client/gui-gtk-2.0/menu.c:841 client/gui-win32/menu.c:365
+#: client/gui-gtk-2.0/menu.c:872 client/gui-win32/menu.c:365
msgid "Build Airbas_e"
msgstr "ساخت پایگاه هوایی"
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:1514
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:1559
#: client/gui-win32/menu.c:366
msgid "Clean _Pollution"
msgstr "پاک کردن آلودگی"
-#: client/gui-gtk-2.0/menu.c:845 client/gui-win32/menu.c:367
+#: client/gui-gtk-2.0/menu.c:876 client/gui-win32/menu.c:367
msgid "Clean _Nuclear Fallout"
msgstr "پاک کردن غبار اتمی"
-#: client/gui-gtk-2.0/menu.c:849 client/gui-win32/menu.c:369
+#: client/gui-gtk-2.0/menu.c:880 client/gui-win32/menu.c:369
msgid "_Sentry"
msgstr "نگهبانی"
-#: client/gui-gtk-2.0/menu.c:855 client/gui-win32/menu.c:372
+#: client/gui-gtk-2.0/menu.c:886 client/gui-win32/menu.c:372
msgid "Make _Homecity"
msgstr "تغییر دادن شهر خانه"
-#: client/gui-gtk-2.0/menu.c:857 client/gui-win32/menu.c:373
+#: client/gui-gtk-2.0/menu.c:888 client/gui-win32/menu.c:373
msgid "_Load"
msgstr "سوار کردن"
-#: client/gui-gtk-2.0/menu.c:859
+#: client/gui-gtk-2.0/menu.c:890
msgid "_Unload Transporter"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:861 client/gui-win32/menu.c:374
+#: client/gui-gtk-2.0/menu.c:892 client/gui-win32/menu.c:374
msgid "_Unload"
msgstr "پیاده کردن"
-#: client/gui-gtk-2.0/menu.c:863 client/gui-win32/menu.c:375
+#: client/gui-gtk-2.0/menu.c:894 client/gui-win32/menu.c:375
msgid "Wake up o_thers"
msgstr "بیدار کردن دیگران"
-#: client/gui-gtk-2.0/menu.c:867
+#: client/gui-gtk-2.0/menu.c:898
msgid "_Auto Settler"
msgstr "آباد‌کردن اتوماتیک"
-#: client/gui-gtk-2.0/menu.c:869 client/gui-win32/menu.c:378
+#: client/gui-gtk-2.0/menu.c:900 client/gui-win32/menu.c:378
msgid "Auto E_xplore"
msgstr "گشتن اتوماتیک"
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906
msgid "_Connect"
msgstr "وصل کردن"
-#: client/gui-gtk-2.0/menu.c:871 client/gui-win32/menu.c:380
+#: client/gui-gtk-2.0/menu.c:902 client/gui-win32/menu.c:380
msgid "_Road"
msgstr "جاده"
-#: client/gui-gtk-2.0/menu.c:873 client/gui-win32/menu.c:381
+#: client/gui-gtk-2.0/menu.c:904 client/gui-win32/menu.c:381
msgid "Rai_l"
msgstr "خط‌آهن"
-#: client/gui-gtk-2.0/menu.c:875 client/gui-win32/menu.c:382
+#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:382
msgid "_Irrigate"
msgstr "آبیاری"
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
msgid "Go _to"
msgstr "برو به"
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
msgid "_Build city"
msgstr "ساخت شه "
-#: client/gui-gtk-2.0/menu.c:879
+#: client/gui-gtk-2.0/menu.c:910
msgid "Patrol (_Q)"
msgstr "گشت"
-#: client/gui-gtk-2.0/menu.c:881 client/gui-win32/menu.c:385
+#: client/gui-gtk-2.0/menu.c:912 client/gui-win32/menu.c:385
msgid "_Go to"
msgstr "برو به"
-#: client/gui-gtk-2.0/menu.c:883
+#: client/gui-gtk-2.0/menu.c:914
msgid "Go\\/Airlift to City"
msgstr "برو\\/پروازکن به شهر"
-#: client/gui-gtk-2.0/menu.c:885 client/gui-sdl/menu.c:450
+#: client/gui-gtk-2.0/menu.c:916 client/gui-sdl/menu.c:450
#: client/gui-win32/menu.c:387 client/gui-xaw/menu.c:203
msgid "Return to nearest city"
msgstr "به نزدیکترین شهر برگرد"
-#: client/gui-gtk-2.0/menu.c:889 client/gui-win32/menu.c:389
+#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:389
#: client/gui-xaw/menu.c:205
msgid "Disband Unit"
msgstr "از بین بردن"
-#: client/gui-gtk-2.0/menu.c:891 client/gui-sdl/citydlg.c:532
+#: client/gui-gtk-2.0/menu.c:922 client/gui-sdl/citydlg.c:532
#: data/Freeciv.in:1186
msgid "Upgrade unit"
msgstr "ترÙیع مهره"
-#: client/gui-gtk-2.0/menu.c:893
+#: client/gui-gtk-2.0/menu.c:924
msgid "Diplomat\\/Spy Actions"
msgstr "Ùعالیت‌های دیپلمات/جاسوس"
-#: client/gui-gtk-2.0/menu.c:895 client/gui-sdl/menu.c:399
+#: client/gui-gtk-2.0/menu.c:926 client/gui-sdl/menu.c:399
#: client/gui-win32/menu.c:391 client/gui-xaw/menu.c:209
msgid "Explode Nuclear"
msgstr "انÙجار اتمی"
-#: client/gui-gtk-2.0/menu.c:899
-msgid "Select same type"
-msgstr "انتخاب هم نوعان"
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/cityrep.c:882
+msgid "Select"
+msgstr ""
-#: client/gui-gtk-2.0/menu.c:901 client/gui-win32/menu.c:393
+#: client/gui-gtk-2.0/menu.c:934
+#, fuzzy
+msgid "Single"
+msgstr "جنگل"
+
+#: client/gui-gtk-2.0/menu.c:936
+msgid "Same Type On Tile"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:938
+msgid "All On Tile"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:940
+msgid "Same Type On Continent"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:942
+msgid "Same Type Everywhere"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:393
msgid "_Wait"
msgstr "صبر"
-#: client/gui-gtk-2.0/menu.c:903 client/gui-win32/menu.c:394
+#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:394
#: client/gui-xaw/menu.c:213
msgid "Done"
msgstr "تمام"
-#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:398
+#: client/gui-gtk-2.0/menu.c:949 client/gui-win32/menu.c:398
msgid "_Reports"
msgstr "گزارشات"
-#: client/gui-gtk-2.0/menu.c:908 client/gui-gtk-2.0/menu.c:910
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:914
-#: client/gui-gtk-2.0/menu.c:916 client/gui-gtk-2.0/menu.c:918
-#: client/gui-gtk-2.0/menu.c:920 client/gui-gtk-2.0/menu.c:922
-#: client/gui-gtk-2.0/menu.c:924 client/gui-gtk-2.0/menu.c:926
-#: client/gui-gtk-2.0/menu.c:928 client/gui-gtk-2.0/menu.c:930
-#: client/gui-gtk-2.0/menu.c:932 data/Freeciv.in:2030
+#: client/gui-gtk-2.0/menu.c:951 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:957
+#: client/gui-gtk-2.0/menu.c:959 client/gui-gtk-2.0/menu.c:961
+#: client/gui-gtk-2.0/menu.c:963 client/gui-gtk-2.0/menu.c:965
+#: client/gui-gtk-2.0/menu.c:967 client/gui-gtk-2.0/menu.c:969
+#: client/gui-gtk-2.0/menu.c:971 client/gui-gtk-2.0/menu.c:973
+#: client/gui-gtk-2.0/menu.c:975 data/Freeciv.in:2030
msgid "Reports"
msgstr "گزارشات"
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:958
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:1001
#: client/gui-win32/menu.c:400 client/gui-win32/menu.c:425
msgid "_Units"
msgstr "مهره‌ها"
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/menu.c:914 client/gui-win32/menu.c:402
+#: client/gui-gtk-2.0/menu.c:957 client/gui-win32/menu.c:402
#, fuzzy
msgid "_Nations"
msgstr "_ملیت ها"
-#: client/gui-gtk-2.0/menu.c:918 client/gui-win32/menu.c:403
+#: client/gui-gtk-2.0/menu.c:961 client/gui-win32/menu.c:403
msgid "_Economy"
msgstr "اقتصاد"
#. TRANS: Research report action
-#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:405
+#: client/gui-gtk-2.0/menu.c:963 client/gui-win32/menu.c:405
#, fuzzy
msgid "_Research"
msgstr "_پژوهش"
-#: client/gui-gtk-2.0/menu.c:924 client/gui-win32/menu.c:407
+#: client/gui-gtk-2.0/menu.c:967 client/gui-win32/menu.c:407
msgid "_Wonders of the World"
msgstr "Ø´Ú¯Ùتی‌های جهان"
-#: client/gui-gtk-2.0/menu.c:926 client/gui-win32/menu.c:408
+#: client/gui-gtk-2.0/menu.c:969 client/gui-win32/menu.c:408
msgid "_Top Five Cities"
msgstr "پنج شهر برتر"
-#: client/gui-gtk-2.0/menu.c:928 client/gui-win32/menu.c:409
+#: client/gui-gtk-2.0/menu.c:971 client/gui-win32/menu.c:409
msgid "_Messages"
msgstr "پیام‌ها"
-#: client/gui-gtk-2.0/menu.c:930 client/gui-win32/menu.c:410
+#: client/gui-gtk-2.0/menu.c:973 client/gui-win32/menu.c:410
msgid "_Demographics"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:932 client/gui-gtk-2.0/plrdlg.c:471
+#: client/gui-gtk-2.0/menu.c:975 client/gui-gtk-2.0/plrdlg.c:354
#: client/gui-win32/menu.c:411
msgid "_Spaceship"
msgstr "سÙینه Ùضایی"
-#: client/gui-gtk-2.0/menu.c:936 client/gui-win32/menu.c:415
+#: client/gui-gtk-2.0/menu.c:979 client/gui-win32/menu.c:415
msgid "_Help"
msgstr "راهنما"
-#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
-#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
-#: client/gui-gtk-2.0/menu.c:946 client/gui-gtk-2.0/menu.c:948
-#: client/gui-gtk-2.0/menu.c:950 client/gui-gtk-2.0/menu.c:952
-#: client/gui-gtk-2.0/menu.c:954 client/gui-gtk-2.0/menu.c:956
-#: client/gui-gtk-2.0/menu.c:958 client/gui-gtk-2.0/menu.c:960
-#: client/gui-gtk-2.0/menu.c:962 client/gui-gtk-2.0/menu.c:964
-#: client/gui-gtk-2.0/menu.c:966 client/gui-gtk-2.0/menu.c:968
-#: client/gui-gtk-2.0/menu.c:970 client/gui-gtk-2.0/menu.c:972
-#: client/gui-gtk-2.0/menu.c:974 client/gui-gtk-2.0/menu.c:976
-#: client/gui-gtk-2.0/menu.c:978 client/gui-gtk-2.0/menu.c:980
+#: client/gui-gtk-2.0/menu.c:981 client/gui-gtk-2.0/menu.c:983
+#: client/gui-gtk-2.0/menu.c:985 client/gui-gtk-2.0/menu.c:987
+#: client/gui-gtk-2.0/menu.c:989 client/gui-gtk-2.0/menu.c:991
+#: client/gui-gtk-2.0/menu.c:993 client/gui-gtk-2.0/menu.c:995
+#: client/gui-gtk-2.0/menu.c:997 client/gui-gtk-2.0/menu.c:999
+#: client/gui-gtk-2.0/menu.c:1001 client/gui-gtk-2.0/menu.c:1003
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-gtk-2.0/menu.c:1007
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-gtk-2.0/menu.c:1011
+#: client/gui-gtk-2.0/menu.c:1013 client/gui-gtk-2.0/menu.c:1015
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-gtk-2.0/menu.c:1019
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-gtk-2.0/menu.c:1023
#: client/gui-gtk-2.0/repodlgs.c:313 client/gui-win32/citydlg.c:1077
#: client/gui-win32/repodlgs.c:289 client/gui-win32/wldlg.c:846
#: data/Freeciv.in:1466 data/Freeciv.in:2031 data/Freeciv.in:2101
@@ -11257,119 +11471,119 @@ msgstr "راهنما"
msgid "Help"
msgstr "راهنما"
-#: client/gui-gtk-2.0/menu.c:940 client/gui-win32/menu.c:416
+#: client/gui-gtk-2.0/menu.c:983 client/gui-win32/menu.c:416
msgid "Language_s"
msgstr "زبان‌ها"
-#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/menu.c:417
+#: client/gui-gtk-2.0/menu.c:985 client/gui-win32/menu.c:417
msgid "Co_nnecting"
msgstr "اتصال"
-#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:418
+#: client/gui-gtk-2.0/menu.c:987 client/gui-win32/menu.c:418
msgid "C_ontrols"
msgstr "کنترل‌ها"
-#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:419
+#: client/gui-gtk-2.0/menu.c:989 client/gui-win32/menu.c:419
msgid "C_hatline"
msgstr "خط Ú¯Ùتگو"
-#: client/gui-gtk-2.0/menu.c:948 client/gui-win32/menu.c:420
+#: client/gui-gtk-2.0/menu.c:991 client/gui-win32/menu.c:420
msgid "_Worklist Editor"
msgstr "ویرایش‌گر لیست کار"
-#: client/gui-gtk-2.0/menu.c:950 client/gui-win32/menu.c:421
+#: client/gui-gtk-2.0/menu.c:993 client/gui-win32/menu.c:421
msgid "Citizen _Management"
msgstr "مدریت شهروندان"
-#: client/gui-gtk-2.0/menu.c:952 client/gui-win32/menu.c:422
+#: client/gui-gtk-2.0/menu.c:995 client/gui-win32/menu.c:422
msgid "_Playing"
msgstr "بازی‌کردن"
-#: client/gui-gtk-2.0/menu.c:956 client/gui-win32/menu.c:424
+#: client/gui-gtk-2.0/menu.c:999 client/gui-win32/menu.c:424
msgid "City _Improvements"
msgstr "اصلاØات شهرها"
-#: client/gui-gtk-2.0/menu.c:960 client/gui-win32/menu.c:426
+#: client/gui-gtk-2.0/menu.c:1003 client/gui-win32/menu.c:426
msgid "Com_bat"
msgstr "جنگ"
-#: client/gui-gtk-2.0/menu.c:962 client/gui-win32/menu.c:427
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-win32/menu.c:427
msgid "_ZOC"
msgstr "Ù…Øدوده کنترل"
-#: client/gui-gtk-2.0/menu.c:964 client/gui-win32/menu.c:428
+#: client/gui-gtk-2.0/menu.c:1007 client/gui-win32/menu.c:428
msgid "Techno_logy"
msgstr "تکنولوژی"
-#: client/gui-gtk-2.0/menu.c:966 client/gui-win32/menu.c:429
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-win32/menu.c:429
msgid "_Terrain"
msgstr "نوع خانه"
-#: client/gui-gtk-2.0/menu.c:968 client/gui-win32/menu.c:430
+#: client/gui-gtk-2.0/menu.c:1011 client/gui-win32/menu.c:430
msgid "Won_ders"
msgstr "عجایب"
-#: client/gui-gtk-2.0/menu.c:972 client/gui-win32/menu.c:432
+#: client/gui-gtk-2.0/menu.c:1015 client/gui-win32/menu.c:432
msgid "Happin_ess"
msgstr "خوشی"
-#: client/gui-gtk-2.0/menu.c:974 client/gui-win32/menu.c:433
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-win32/menu.c:433
msgid "Space _Race"
msgstr "مسابقه Ùضایی"
-#: client/gui-gtk-2.0/menu.c:978 client/gui-win32/menu.c:435
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-win32/menu.c:435
msgid "_Copying"
msgstr "کپی کردن"
-#: client/gui-gtk-2.0/menu.c:980 client/gui-win32/menu.c:436
+#: client/gui-gtk-2.0/menu.c:1023 client/gui-win32/menu.c:436
msgid "_About"
msgstr "درباره"
-#: client/gui-gtk-2.0/menu.c:1264
+#: client/gui-gtk-2.0/menu.c:1307
#, c-format
msgid "%s..."
msgstr "%s..."
-#: client/gui-gtk-2.0/menu.c:1352
+#: client/gui-gtk-2.0/menu.c:1397
#, c-format
msgid "Change to %s (_I)"
msgstr "تبدیل به %s"
-#: client/gui-gtk-2.0/menu.c:1353
+#: client/gui-gtk-2.0/menu.c:1398
#, c-format
msgid "Change to %s (_M)"
msgstr "تبدیل به %s"
-#: client/gui-gtk-2.0/menu.c:1354
+#: client/gui-gtk-2.0/menu.c:1399
#, c-format
msgid "Transf_orm to %s"
msgstr "تبدیل به %s"
-#: client/gui-gtk-2.0/menu.c:1427
+#: client/gui-gtk-2.0/menu.c:1472
msgid "Help _Build Wonder"
msgstr "Ú©Ù…Ú© در ساخت Ø´Ú¯Ùتی"
-#: client/gui-gtk-2.0/menu.c:1441
+#: client/gui-gtk-2.0/menu.c:1486
msgid "Add to City (_B)"
msgstr "اضاÙÙ‡ کردن به شهر (_B)"
-#: client/gui-gtk-2.0/menu.c:1449
+#: client/gui-gtk-2.0/menu.c:1494
msgid "Make Trade _Route"
msgstr "ساخت راه تجاری"
-#: client/gui-gtk-2.0/menu.c:1463
+#: client/gui-gtk-2.0/menu.c:1508
msgid "Build _Railroad"
msgstr "ساخت خط‌آهن"
-#: client/gui-gtk-2.0/menu.c:1486
+#: client/gui-gtk-2.0/menu.c:1531
msgid "Bu_ild Farmland"
msgstr "ساخت مزرعه"
-#: client/gui-gtk-2.0/menu.c:1506
+#: client/gui-gtk-2.0/menu.c:1551
msgid "_Fortify"
msgstr "تقویت"
-#: client/gui-gtk-2.0/menu.c:1512
+#: client/gui-gtk-2.0/menu.c:1557
msgid "_Paradrop"
msgstr "پرتاب‌چترباز"
@@ -11401,13 +11615,32 @@ msgstr "پبام"
msgid "Pop"
msgstr ""
-#: client/gui-gtk-2.0/messagewin.c:155 client/gui-sdl/messagewin.c:247
+#: client/gui-gtk-2.0/messagewin.c:186 client/gui-sdl/messagewin.c:247
#: client/gui-win32/messagewin.c:132 client/gui-xaw/menu.c:228
#: data/Freeciv.in:3273 data/Freeciv.in:3274 data/Freeciv.in:3283
msgid "Messages"
msgstr "پیام‌ها"
-#: client/gui-gtk-2.0/plrdlg.c:330
+#: client/gui-gtk-2.0/plrdlg.c:317
+msgid "_Meet"
+msgstr "ملاقات"
+
+#: client/gui-gtk-2.0/plrdlg.c:323
+#, fuzzy
+msgid "Cancel _Treaty"
+msgstr "لغو قرارداد"
+
+#: client/gui-gtk-2.0/plrdlg.c:329
+#, fuzzy
+msgid "_Withdraw Vision"
+msgstr "برداشتن دید مشترک"
+
+#: client/gui-gtk-2.0/plrdlg.c:348
+#, fuzzy
+msgid "_Report"
+msgstr "گزارشات"
+
+#: client/gui-gtk-2.0/plrdlg.c:386
msgid "?show:Dead Players"
msgstr "بازیکنان مرده"
@@ -11415,268 +11648,271 @@ msgstr "بازیکنان مرده"
#. TRANS: Nations report action
#. TRANS: Nations report title
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/plrdlg.c:350 client/gui-sdl/mapctrl.c:1580
+#: client/gui-gtk-2.0/plrdlg.c:406 client/gui-sdl/mapctrl.c:1580
#: client/gui-sdl/plrdlg.c:608 client/gui-win32/plrdlg.c:344
#: client/gui-xaw/menu.c:221 data/Freeciv.in:3192 data/Freeciv.in:3193
msgid "Nations"
msgstr "ملل"
-#: client/gui-gtk-2.0/plrdlg.c:443
-msgid "_Intelligence"
-msgstr "اخبار"
-
-#: client/gui-gtk-2.0/plrdlg.c:450
-msgid "_Meet"
-msgstr "ملاقات"
-
-#: client/gui-gtk-2.0/plrdlg.c:457
+#: client/gui-gtk-2.0/plrdlg.c:511
#, fuzzy
-msgid "Cancel _Treaty"
-msgstr "لغو قرارداد"
+msgid "Di_plomacy"
+msgstr "دیپلماسی"
-#: client/gui-gtk-2.0/plrdlg.c:464
-msgid "_Withdraw vision"
-msgstr "برداشتن دید مشترک"
+#: client/gui-gtk-2.0/plrdlg.c:516
+msgid "_Intelligence"
+msgstr "اخبار"
-#: client/gui-gtk-2.0/plrdlg.c:495
+#: client/gui-gtk-2.0/plrdlg.c:526
msgid "_AI"
msgstr "هوش‌مصنوعی"
-#: client/gui-gtk-2.0/plrdlg.c:501
+#: client/gui-gtk-2.0/plrdlg.c:532
msgid "_Toggle AI Mode"
msgstr "تغییر هوش‌مصنوعی/انسان"
-#: client/gui-gtk-2.0/pages.c:208
+#: client/gui-gtk-2.0/pages.c:221
msgid "Start _New Game"
msgstr "شروع بازی جدید"
-#: client/gui-gtk-2.0/pages.c:214
+#: client/gui-gtk-2.0/pages.c:227
msgid "Start _Scenario Game"
msgstr "شروع بازی سناریو"
-#: client/gui-gtk-2.0/pages.c:220
+#: client/gui-gtk-2.0/pages.c:233
msgid "_Load Saved Game"
msgstr "شروع بازی ذخیره شده"
-#: client/gui-gtk-2.0/pages.c:229
+#: client/gui-gtk-2.0/pages.c:239
msgid "C_onnect to Network Game"
msgstr "وصل شدن به بازی شبکه"
-#: client/gui-gtk-2.0/pages.c:236
+#: client/gui-gtk-2.0/pages.c:247
msgid "Connect to Gaming _Zone"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:300
#: client/gui-xaw/connectdlg.c:326
msgid "Passwords don't match, enter password."
msgstr "رمز عبور مطابقت نمی‌کند.رمز را وارد کنید."
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:779 client/gui-gtk-2.0/pages.c:820
+#: client/gui-win32/connectdlg.c:916
msgid "Server Name"
msgstr "نام سرور"
-#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
+#: 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
+#: data/Freeciv.in:96
msgid "Port"
msgstr "پرت"
-#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
+#: client/gui-win32/connectdlg.c:917
msgid "Version"
msgstr "نسخه"
-#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
-#: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
+#: 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
msgid "Status"
msgstr "وضعیت"
-#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
-#: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
+#: 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
msgid "Players"
msgstr "بازیکنان"
-#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
+#: client/gui-win32/connectdlg.c:918
msgid "Comment"
msgstr "توضیØ"
-#: client/gui-gtk-2.0/pages.c:747
+#: client/gui-gtk-2.0/pages.c:786
msgid "Local _Area Network"
msgstr "شبکه Ù…ØÙ„ÛŒ"
-#: client/gui-gtk-2.0/pages.c:783
+#: client/gui-gtk-2.0/pages.c:827
msgid "Internet _Metaserver"
msgstr "اینترنت"
-#: client/gui-gtk-2.0/pages.c:817
+#: client/gui-gtk-2.0/pages.c:864
msgid "_Host:"
msgstr "میزبان:"
-#: client/gui-gtk-2.0/pages.c:834
+#: client/gui-gtk-2.0/pages.c:881
msgid "_Port:"
msgstr "پرت:"
-#: client/gui-gtk-2.0/pages.c:851
+#: client/gui-gtk-2.0/pages.c:898
msgid "_Login:"
msgstr "نام کاربری:"
-#: client/gui-gtk-2.0/pages.c:869
+#: client/gui-gtk-2.0/pages.c:916
msgid "Pass_word:"
msgstr "رمز:"
-#: client/gui-gtk-2.0/pages.c:887
+#: client/gui-gtk-2.0/pages.c:934
msgid "Conf_irm Password:"
msgstr "تکرار رمز:"
-#: client/gui-gtk-2.0/pages.c:912
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: 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/wldlg.c:800 client/gui-win32/wldlg.c:806
+msgid "Type"
+msgstr "نوع"
+
+#: client/gui-gtk-2.0/pages.c:952 client/gui-win32/plrdlg.c:337
+#: data/Freeciv.in:88
+msgid "Host"
+msgstr ""
+
+#: client/gui-gtk-2.0/pages.c:981
msgid "C_onnect"
msgstr "اتصال"
-#: client/gui-gtk-2.0/pages.c:1142
+#: client/gui-gtk-2.0/pages.c:1211
#, c-format
msgid "Connection name: %s"
msgstr "نام اتصال: %s"
-#: client/gui-gtk-2.0/pages.c:1145
+#: client/gui-gtk-2.0/pages.c:1214
#, c-format
msgid "Player name: %s"
msgstr "نام بازیکن: %s"
-#: client/gui-gtk-2.0/pages.c:1150
+#: client/gui-gtk-2.0/pages.c:1219
#, c-format
msgid "Host: %s"
msgstr "میزبان: %s"
-#: client/gui-gtk-2.0/pages.c:1158
+#: client/gui-gtk-2.0/pages.c:1227
msgid "Player/conn info"
msgstr "اطلاعات بازیکن/اتصال"
-#: client/gui-gtk-2.0/pages.c:1185
+#: client/gui-gtk-2.0/pages.c:1254
#, c-format
msgid "%s info"
msgstr "اطلاعات %s"
-#: client/gui-gtk-2.0/pages.c:1196
+#: client/gui-gtk-2.0/pages.c:1265
msgid "Toggle player ready"
msgstr "تغییر آمادگی بازیکن"
-#: client/gui-gtk-2.0/pages.c:1204
+#: client/gui-gtk-2.0/pages.c:1273
msgid "Pick nation"
msgstr "انتخاب ملیت"
-#: client/gui-gtk-2.0/pages.c:1214
+#: client/gui-gtk-2.0/pages.c:1283
msgid "Observe this player"
msgstr "ناظر کردن این بازیکن"
-#: client/gui-gtk-2.0/pages.c:1221
+#: client/gui-gtk-2.0/pages.c:1290
msgid "Take this player"
msgstr "انتخاب این بازیکن"
-#: client/gui-gtk-2.0/pages.c:1238
+#: client/gui-gtk-2.0/pages.c:1307
msgid "Cut connection"
msgstr "بریدن اتصال"
-#: client/gui-gtk-2.0/pages.c:1248
+#: client/gui-gtk-2.0/pages.c:1317
msgid "Aitoggle player"
msgstr "تغییر هوش‌مصنوعی بازیکن"
-#: client/gui-gtk-2.0/pages.c:1257
+#: client/gui-gtk-2.0/pages.c:1326
msgid "Remove player"
msgstr "برداشتن بازیکن"
-#: client/gui-gtk-2.0/pages.c:1268
+#: client/gui-gtk-2.0/pages.c:1337
msgid "Give info access"
msgstr "دادن دسترسی اطلاعات"
-#: client/gui-gtk-2.0/pages.c:1276
+#: client/gui-gtk-2.0/pages.c:1345
msgid "Give ctrl access"
msgstr "دادن دسترسی کنترل"
#. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1338
+#: client/gui-gtk-2.0/pages.c:1407
#, c-format
msgid "Put on %s"
msgstr "گذاشتن به %s"
-#: client/gui-gtk-2.0/pages.c:1442
+#: client/gui-gtk-2.0/pages.c:1511
#, fuzzy
msgid "Number of _Players (including AI):"
msgstr "تعداد بازیکنان (با هوش‌مصنوعی)"
-#: client/gui-gtk-2.0/pages.c:1465
+#: client/gui-gtk-2.0/pages.c:1534
#, fuzzy
msgid "AI Skill _Level:"
msgstr "Ø³Ø·Ø Ø¨Ø§Ø²ÛŒ هوش‌مصنوعی:"
-#: client/gui-gtk-2.0/pages.c:1481
+#: client/gui-gtk-2.0/pages.c:1550
#, fuzzy
msgid "Ruleset _Version:"
msgstr "مجموعه قوانین"
-#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
msgid "_More Game Options..."
msgstr "تنظیمات دیگر..."
-#: client/gui-gtk-2.0/pages.c:1514
+#: client/gui-gtk-2.0/pages.c:1583
msgid "Record"
msgstr "رکورد"
-#: client/gui-gtk-2.0/pages.c:1519
+#: client/gui-gtk-2.0/pages.c:1588
msgid "Rating"
msgstr "درجه"
-#: client/gui-gtk-2.0/pages.c:1525
+#: client/gui-gtk-2.0/pages.c:1594
msgid "Ready"
msgstr "آماده"
-#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
-#: data/nation/slovakian.ruleset:26
-msgid "Leader"
-msgstr "رهبر"
+#: client/gui-gtk-2.0/pages.c:1601
+#, fuzzy
+msgid "?player:Leader"
+msgstr "نام"
-#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1732 client/gui-sdl/chatline.c:185
msgid "Choose Saved Game to Load"
msgstr "بازی ذخیره شده را برای بارگذاری انتخاب کنید"
-#: client/gui-gtk-2.0/pages.c:1752
+#: client/gui-gtk-2.0/pages.c:1824
msgid "Choose Saved Game to _Load:"
msgstr "بازی ذخیره شده را برای بارگذاری انتخاب کنید"
-#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
-#: client/gui-gtk-2.0/pages.c:2375
+#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
+#: client/gui-gtk-2.0/pages.c:2451
msgid "_Browse..."
msgstr "گشتن..."
-#: client/gui-gtk-2.0/pages.c:1839
+#: client/gui-gtk-2.0/pages.c:1911
msgid "Choose a Scenario"
msgstr "یک سناریو انتخاب کنید"
-#: client/gui-gtk-2.0/pages.c:1926
+#: client/gui-gtk-2.0/pages.c:1998
msgid "Choose a _Scenario:"
msgstr "یک سناریو انتخاب کنید:"
-#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
-#: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
-#: client/gui-win32/wldlg.c:806
-msgid "Type"
-msgstr "نوع"
-
-#: client/gui-gtk-2.0/pages.c:2101
+#: client/gui-gtk-2.0/pages.c:2173
msgid "Choose a _nation to play:"
msgstr "یک ملت را برای بازی انتخاب کنید:"
-#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2363 client/gui-win32/menu.c:581
msgid "Select Location to Save"
msgstr "Ù…ØÙ„ ذخیره را انتخاب کنید"
-#: client/gui-gtk-2.0/pages.c:2372 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2448 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr "ذخیره بازی"
-#: client/gui-gtk-2.0/pages.c:2413
+#: client/gui-gtk-2.0/pages.c:2489
msgid "Saved _Games:"
msgstr "بازی‌های ذخیره شده:"
-#: client/gui-gtk-2.0/pages.c:2440
+#: client/gui-gtk-2.0/pages.c:2516
msgid "Save _Filename:"
msgstr "نام Ùایل ذخیره:"
@@ -12027,7 +12263,7 @@ msgstr ""
msgid "Total users logged in : %d"
msgstr ""
-#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1094
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
msgid "Back"
msgstr ""
@@ -12036,7 +12272,7 @@ msgid "Start"
msgstr "شروع"
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:775
+#: client/gui-win32/connectdlg.c:777
msgid "Load Game"
msgstr "بارگذاری بازی"
@@ -12074,12 +12310,12 @@ msgid "Make new homecity"
msgstr ""
#: client/gui-sdl/citydlg.c:546 client/gui-sdl/citydlg.c:1418
-#: client/gui-sdl/connectdlg.c:307 client/gui-sdl/connectdlg.c:616
-#: client/gui-sdl/connectdlg.c:802 client/gui-sdl/connectdlg.c:984
+#: 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/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1039
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
#: 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
@@ -12129,7 +12365,7 @@ msgstr "آنرا بخریم؟"
#: client/gui-sdl/diplodlg.c:1335 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:2427
+#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
#: client/gui-xaw/cityrep.c:666 client/gui-xaw/cma_fe.c:327
#: client/gui-xaw/cma_fe.c:511 client/gui-xaw/cma_fe.c:765
#: client/gui-xaw/messagedlg.c:72 client/gui-xaw/optiondlg.c:76
@@ -12145,7 +12381,7 @@ msgstr "خیر"
#: client/gui-sdl/diplodlg.c:1345 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:2427 client/gui-xaw/cityrep.c:666
+#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
#: client/gui-xaw/cma_fe.c:327 client/gui-xaw/cma_fe.c:511
#: client/gui-xaw/cma_fe.c:765 client/gui-xaw/messagedlg.c:72
#: client/gui-xaw/optiondlg.c:76 client/gui-xaw/optiondlg.c:304
@@ -12430,36 +12666,36 @@ msgstr ""
msgid "Release city"
msgstr ""
-#: client/gui-sdl/connectdlg.c:238
+#: client/gui-sdl/connectdlg.c:239
msgid "Creating Server List..."
msgstr "ساختن لیست سرورها..."
-#: client/gui-sdl/connectdlg.c:279 client/gui-sdl/connectdlg.c:343
+#: client/gui-sdl/connectdlg.c:280 client/gui-sdl/connectdlg.c:344
msgid "No LAN servers found"
msgstr ""
-#: client/gui-sdl/connectdlg.c:281 client/gui-sdl/connectdlg.c:345
+#: client/gui-sdl/connectdlg.c:282 client/gui-sdl/connectdlg.c:346
msgid "No public servers found"
msgstr ""
-#: client/gui-sdl/connectdlg.c:555
+#: client/gui-sdl/connectdlg.c:556
msgid "Player Name :"
msgstr "نام بازیکن :"
-#: client/gui-sdl/connectdlg.c:571
+#: client/gui-sdl/connectdlg.c:572
msgid "Freeciv Server :"
msgstr "سرور Freeciv:"
-#: client/gui-sdl/connectdlg.c:588
+#: client/gui-sdl/connectdlg.c:589
msgid "Port :"
msgstr "پرت :"
-#: client/gui-sdl/connectdlg.c:608 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr ""
-#: client/gui-sdl/connectdlg.c:794 client/gui-sdl/connectdlg.c:977
+#: client/gui-sdl/connectdlg.c:795 client/gui-sdl/connectdlg.c:978
#: client/gui-xaw/connectdlg.c:145
msgid "Next"
msgstr "بعدی"
@@ -12737,7 +12973,7 @@ msgstr ""
#: client/gui-sdl/graphics.c:1021
#, c-format
-msgid "Unable to initialize SDL_ttf library: %s"
+msgid "Unable to initialize SDL_ttf library: %s"
msgstr ""
#: client/gui-sdl/graphics.c:1058
@@ -12824,12 +13060,6 @@ msgstr ""
msgid "Waiting for the beginning of the game"
msgstr ""
-#: client/gui-sdl/gui_string.c:608
-msgid ""
-"Couldn't find stdfont.ttf file. Please link/copy/move anyunicode ttf font to "
-"data dir as stdfont.ttf"
-msgstr ""
-
#. TRANS: Future Technology
#: client/gui-sdl/gui_tilespec.c:506
msgid "FT"
@@ -13410,12 +13640,12 @@ msgid "Leave Game"
msgstr "ذخیره بازی"
#: client/gui-sdl/optiondlg.c:2302 client/gui-sdl/pages.c:255
-#: client/gui-win32/connectdlg.c:1098 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1100 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:963
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
msgid "Start New Game"
msgstr "شروع بازی جدید"
@@ -13531,8 +13761,8 @@ msgstr ""
msgid "%s max rate : %d%%"
msgstr "%s Øداکثر مقدار : %d%%"
-#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1081
-#: client/gui-win32/connectdlg.c:1089 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
+#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
msgid "Update"
msgstr "بروزرسانی"
@@ -13973,10 +14203,6 @@ msgstr ""
msgid "Refresh"
msgstr "نوسازی"
-#: client/gui-win32/cityrep.c:882
-msgid "Select"
-msgstr ""
-
#: client/gui-win32/cityrep.c:883
msgid "Configure"
msgstr ""
@@ -14026,55 +14252,55 @@ msgstr ""
msgid "Verify Password"
msgstr ""
-#: client/gui-win32/connectdlg.c:912 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr ""
-#: client/gui-win32/connectdlg.c:913
+#: client/gui-win32/connectdlg.c:915
msgid "Local Area Network"
msgstr ""
-#: client/gui-win32/connectdlg.c:947
+#: client/gui-win32/connectdlg.c:949
msgid "Welcome to Freeciv"
msgstr ""
-#: client/gui-win32/connectdlg.c:965
+#: client/gui-win32/connectdlg.c:967
msgid "Load Saved Game"
msgstr ""
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
msgid "Connect To Network Game"
msgstr ""
-#: client/gui-win32/connectdlg.c:977
+#: client/gui-win32/connectdlg.c:979
msgid "Choose a nation to play"
msgstr ""
-#: client/gui-win32/connectdlg.c:1012
+#: client/gui-win32/connectdlg.c:1014
msgid "Number of players (Including AI):"
msgstr ""
-#: client/gui-win32/connectdlg.c:1020
+#: client/gui-win32/connectdlg.c:1022
msgid "AI skill level:"
msgstr ""
-#: client/gui-win32/connectdlg.c:1034 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
msgid "Game Options"
msgstr "تنظیمات بازی"
-#: client/gui-win32/connectdlg.c:1038
+#: client/gui-win32/connectdlg.c:1040
msgid "Start Game"
msgstr "شروع بازی"
-#: client/gui-win32/connectdlg.c:1057
+#: client/gui-win32/connectdlg.c:1059
msgid "Login:"
msgstr ""
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
msgid "Host:"
msgstr "میزبان:"
-#: client/gui-win32/connectdlg.c:1060
+#: client/gui-win32/connectdlg.c:1062
msgid "Port:"
msgstr ""
@@ -14327,10 +14553,6 @@ msgid_plural "(idle %d turns)"
msgstr[0] ""
msgstr[1] ""
-#: client/gui-win32/plrdlg.c:337 data/Freeciv.in:88
-msgid "Host"
-msgstr ""
-
#: client/gui-win32/plrdlg.c:355 data/Freeciv.in:3230
msgid "Intelligence"
msgstr ""
@@ -15765,12 +15987,12 @@ msgstr ""
#: data/helpdata.txt:781
msgid ""
-" To have a diplomatic relationship with another player, you must fist "
-"establish first contact with that player. To establish first contact, you "
-"have to move one of your units next to a city or unit belonging to that "
-"player, or vice versa. Unless you establish an embassy with that player, you "
-"may again lose contact with them after a set number of turns without direct "
-"physical contact."
+" To have a diplomatic relationship with another player, you must first "
+"establish contact with that player. To establish contact, you have to move "
+"one of your units next to a city or unit belonging to that player, or vice "
+"versa. Unless you establish an embassy with that player, you may again lose "
+"contact with them after a set number of turns without direct physical "
+"contact."
msgstr ""
#: data/helpdata.txt:788
@@ -17960,7 +18182,7 @@ msgid "Communism"
msgstr "کمنیسم"
#: data/default/governments.ruleset:121 data/civ2/governments.ruleset:118
-#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:26
+#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:27
msgid "Comrade"
msgstr "رÙيق"
@@ -18827,6 +19049,11 @@ msgid ""
"attacks."
msgstr ""
+#: data/default/units.ruleset:238
+#, fuzzy
+msgid "?unit:Workers"
+msgstr "کارگر"
+
#: data/default/units.ruleset:264
msgid ""
"Workers are one of the key units in the game. They can be used to irrigate "
@@ -19387,6 +19614,11 @@ msgstr "جست‌وجوگر"
msgid "Explorers are very useful for mapping unknown territory."
msgstr ""
+#: data/default/units.ruleset:1864
+#, fuzzy
+msgid "?unit:Leader"
+msgstr "رهبر"
+
#: data/default/units.ruleset:1892
msgid "This is you. If you lose this unit, you lose the game. So don't."
msgstr ""
@@ -19584,7 +19816,7 @@ msgid "Emir"
msgstr "امیر"
#: data/nation/afghani.ruleset:25 data/nation/slovakian.ruleset:30
-#: data/nation/soviet.ruleset:27
+#: data/nation/soviet.ruleset:28
msgid "General Secretary"
msgstr ""
@@ -19699,7 +19931,7 @@ msgstr "آرمنی‌ها"
msgid ""
"According to legend, the Armenian people are the descendants of Haik - the "
"great-great-grandson of Noah. The modern Republic of Armenia gained "
-"independence from Soviet in 1991 AD"
+"independence from the Soviet Union in 1991."
msgstr ""
#: data/nation/assyrian.ruleset:3
@@ -20646,12 +20878,11 @@ msgstr "ایلیریانی‌ها"
#: data/nation/illyrian.ruleset:6
msgid ""
-"Illyrians were Indo-European tribes who appeared in the western part of the "
-"Balkan Peninsula before 1000 BC, including the Dalmatians to the north, "
-"Corcyra island and Ambracia bay in prehistoric Epirus to the south, mixing "
-"with Thracians in Dardania to the east, and settling Messapia across the "
-"Adriatic Sea. Illyrian kingdoms were independent for centuries, until "
-"conquered by the Roman Republic."
+"Illyrians were Indo-European tribes who appeared in the western part of the "
+"Balkan Peninsula before 1000 BC, including Corcyra island and Ambracia bay "
+"in prehistoric Epirus to the south. They mixed with Thracians in Dardania to "
+"the east, and settled Messapia across the Adriatic Sea. Illyrian kingdoms "
+"were independent for centuries, until conquered by the Roman Republic."
msgstr ""
#: data/nation/inca.ruleset:3
@@ -20938,7 +21169,7 @@ msgid ""
"1953."
msgstr ""
-#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:28
+#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:29
msgid "Great Leader"
msgstr "گریت لیدر"
@@ -21095,9 +21326,9 @@ msgstr "مالیانی‌ها"
msgid ""
"Sub-Saharan Africa has been a cultural and ethnical melting pot for "
"millennia. In medieval times, the region was home to a succession of empires "
-"called the Sahelian kingdoms. Of these, the Islamic Mali empire with it's "
+"called the Sahelian kingdoms. Of these, the Islamic Mali empire with its "
"capital in Timbuktu was the most influential. This empire reigned from the "
-"14th to the 17th century and was famed for it's wealth and benevolent kings. "
+"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 ""
@@ -21157,8 +21388,8 @@ msgstr "مایانی‌ها"
#: data/nation/mayan.ruleset:6
msgid ""
-"The Mayans were a Mesoamerican civilization. Famous for building great "
-"pyramids and palaces in the jungle."
+"The Mayans were a Mesoamerican civilization. They are famous for building "
+"great pyramids and palaces in the jungle."
msgstr ""
#: data/nation/mayan.ruleset:19
@@ -21647,6 +21878,16 @@ msgid ""
"Czechoslovakia, until 1918 it was part of the Austro-Hungarian Empire."
msgstr ""
+#: data/nation/slovakian.ruleset:26
+#, fuzzy
+msgid "?male:Leader"
+msgstr "رهبر"
+
+#: data/nation/slovakian.ruleset:26
+#, fuzzy
+msgid "?female:Leader"
+msgstr "رÙیق"
+
#: data/nation/slovakian.ruleset:29
msgid "Pope"
msgstr "پاپ"
@@ -21685,11 +21926,12 @@ msgstr "سÙویتی‌ها"
#: data/nation/soviet.ruleset:6
msgid ""
-"Soviet Union's history starts in November 1917, when under Lenin's "
+"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 "
-"republics integrated into one country. Soviet Union became one of most "
-"powerful states in the 20th century. But by the end of 1991 due to many "
-"social shocks it disintegrated into fifteen independent countries"
+"republics integrated into one country. The Soviet Union became one of most "
+"powerful states in the 20th century, but by the end of 1991 it had "
+"disintegrated into fifteen independent countries due to social and economic "
+"problems."
msgstr ""
#: data/nation/spanish.ruleset:3
@@ -22056,8 +22298,8 @@ msgstr "ویتÙالی‌ها"
#: data/nation/westphalian.ruleset:6
msgid ""
-"Westphalia, before becoming a Prussian province, was the western region the "
-"duchy of Saxony. Present-day it consists of the Northern part of the largest "
+"Westphalia, before becoming a Prussian province, was the western region of "
+"the duchy of Saxony. Today it makes up the northern part of the largest "
"German federal state, North Rhine-Westphalia."
msgstr ""
@@ -22202,7 +22444,7 @@ msgid ""
"The flag and background color indicate what civilization the city\n"
"belongs to (this will be useful when you meet other civilizations).\n"
"The top row of the bar also shows the name and size of the city, and\n"
-"will show one or more starts to indicate if there are units in the\n"
+"will show one or more stars to indicate if there are units in the\n"
"city. The bottom row shows what the city is building, and how long it\n"
"will take; it also shows how long the city will take to grow to the\n"
"next largest size."
@@ -22258,7 +22500,7 @@ msgid ""
"Now your city has grown to size five. As cities get larger unrest\n"
"becomes a problem. A city of this size will usually have one unhappy\n"
"citizen unless pacifying effects are used; meaning one entertainer\n"
-"specialist is required to keep your citzens content. This is basically\n"
+"specialist is required to keep your citizens content. This is basically\n"
"a wasted citizen.\n"
"\n"
"There are several things that can be done about this. One quick fix\n"
@@ -22330,7 +22572,7 @@ msgid ""
"existing cities. Generally when building new cities you want to make\n"
"sure that all tiles are covered by at least one city, but after that\n"
"it is best that your cities overlap as little as possible. Spreading\n"
-"out cities properly gives each city access to more resrouces, allowing\n"
+"out cities properly gives each city access to more resources, allowing\n"
"them to grow to larger sizes."
msgstr ""
@@ -22613,6 +22855,35 @@ msgstr "تیم ۳۰"
msgid "Team 31"
msgstr "تیم ۳۱"
+#~ msgid "The %s of the %s (%s)"
+#~ msgstr "%s %s (%s("
+
+#~ msgid "We can't take control of server, attempting to kill it."
+#~ msgstr "نمی‌توان کنترل سرور را به دست گرÙت، آنرا از بین می‌بریم."
+
+#, fuzzy
+#~ msgid "%s territory"
+#~ msgstr "خانه‌ی %s"
+
+#~ msgid "%s territory (%d turn cease-fire)"
+#~ msgid_plural "%s territory (%d turn cease-fire)"
+#~ msgstr[0] "خانه %s (%d نوبت آتش‌بس)"
+#~ msgstr[1] "خانه %s (%d نوبت آتش‌بس)"
+
+#, fuzzy
+#~ msgid "%s territory (%s)"
+#~ msgstr "خانه‌ی %s %s"
+
+#~ msgid "City: %s (%s)"
+#~ msgstr "شهر: %s (%s)"
+
+#, fuzzy
+#~ msgid "Unit: %s (%s)"
+#~ msgstr "مهره: %s (%s)"
+
+#~ msgid "Select same type"
+#~ msgstr "انتخاب هم نوعان"
+
#~ msgid "Units: "
#~ msgstr "مهره‌ها: "
diff --git a/po/fi.gmo b/po/fi.gmo
index 8044da6..6b12d71 100644
Binary files a/po/fi.gmo and b/po/fi.gmo differ
diff --git a/po/fi.po b/po/fi.po
index b345ddc..973003c 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,18 +1,22 @@
# Finnish translation
-# Copyright (C) 2002 2003 2005 2006 2007
+# Copyright (C) 2002 2003 2005 2006 2007 2008 2009
# Sini Ruohomaa <sini.ruohomaa at iki.fi>, Jarkko Siekkinen
# <jarkko.siekkinen at evl.fi>, Juhani Heino <juhani.heino at vtt.fi>,
# Timo Jyrinki <timo.jyrinki at iki.fi> & helpers.
# This translation is covered by the GNU General Public License Version 2.
#
# Prioritizing stable branch for translations; merge to trunk when feeling
-# like it. On consistency todo list: klikkaa -> napsauta cleanup.
+# like it. Merge with
+# msgmerge --compendium=fi.po.trunk fi.po.s2_1 freeciv.pot -o fi.po.newtrunk
+# where fi.po.trunk is current trunk version, fi.po.s2_1 the improved branch
+# version, freeciv.pot an up-to-date POT for the trunk. Then upload the resulting
+# fi.po.newtrunk to trunk.
msgid ""
msgstr ""
"Project-Id-Version: freeciv 2.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 07:45+0900\n"
-"PO-Revision-Date: 2008-10-29 15:58+0200\n"
+"POT-Creation-Date: 2009-03-29 21:13+0900\n"
+"PO-Revision-Date: 2009-03-05 15:43+0200\n"
"Last-Translator: Sini Ruohomaa <sini.ruohomaa at iki.fi>\n"
"Language-Team: Finnish <laatu at lokalisointi.org>\n"
"MIME-Version: 1.0\n"
@@ -28,7 +32,7 @@ msgstr "Ruoka"
#: common/city.c:57 client/gui-gtk-2.0/repodlgs.c:937
#: client/gui-win32/repodlgs.c:699
msgid "Shield"
-msgstr "Kulutus"
+msgstr "Tuotanto"
#: common/city.c:58 data/Freeciv.in:3060 data/default/techs.ruleset:734
#: data/civ2/techs.ruleset:719 data/civ1/techs.ruleset:715
@@ -176,7 +180,7 @@ msgstr "Sivilisaatio: Ensimmäinen yhteys"
#: common/events.c:64
msgid "Civ: Learned New Government"
-msgstr "Sivilisaatio: Uusi hallitusmuoto opittu"
+msgstr "Sivilisaatio: Uusi hallintomuoto opittu"
#: common/events.c:65
msgid "Civ: Low Funds"
@@ -310,43 +314,43 @@ msgstr "Vuosi edistysaskel"
#: common/events.c:97
msgid "Global: Eco-Disaster"
-msgstr ""
+msgstr "Maailma: Luonnonkatastrofi"
#: common/events.c:98
msgid "Global: Nuke Detonated"
-msgstr ""
+msgstr "Maailma: Ydinase laukaistu"
#: common/events.c:99
msgid "Hut: Barbarians in a Hut Roused"
-msgstr ""
+msgstr "Maja: Barbaarihyökkäys majasta"
#: common/events.c:100
msgid "Hut: City Founded from Hut"
-msgstr ""
+msgstr "Maja: Kaupunki perustettu majasta"
#: common/events.c:101
msgid "Hut: Gold Found in Hut"
-msgstr ""
+msgstr "Maja: Kultaa saatu majasta"
#: common/events.c:102
msgid "Hut: Killed by Barbarians in a Hut"
-msgstr ""
+msgstr "Maja: Majan barbaarit tappoivat"
#: common/events.c:103
msgid "Hut: Mercenaries Found in Hut"
-msgstr ""
+msgstr "Maja: Palkkasoturi saatu majasta"
#: common/events.c:104
msgid "Hut: Settler Found in Hut"
-msgstr ""
+msgstr "Maja: Uudisraivaaja saatu majasta"
#: common/events.c:105
msgid "Hut: Tech Found in Hut"
-msgstr ""
+msgstr "Maja: Teknologiaa saatu majasta"
#: common/events.c:106
msgid "Hut: Unit Spared by Barbarians"
-msgstr ""
+msgstr "Maja: barbaarit eivät tappaneet yksikköä"
#: common/events.c:107
msgid "Improvement: Bought"
@@ -644,7 +648,7 @@ msgid "Road"
msgstr "Tie"
#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
-#: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
+#: client/gui-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"
@@ -663,7 +667,7 @@ 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
-#: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
+#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr "Saastetta"
@@ -710,7 +714,7 @@ msgstr "Linnoittautunut"
msgid "Sentry"
msgstr "Leiriydy"
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:851 client/gui-sdl/menu.c:648
+#: common/unit.c:566 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"
@@ -727,7 +731,7 @@ msgstr "Tutki"
msgid "Transform"
msgstr "Muokkaa"
-#: common/unit.c:584 client/text.c:106 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:584 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"
@@ -798,11 +802,11 @@ msgstr "Ydinohjus"
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1406
+#: common/unittype.c:349 client/helpdata.c:1404
msgid " and "
msgstr " ja "
-#: common/unittype.c:355 client/helpdata.c:1392
+#: common/unittype.c:355 client/helpdata.c:1390
msgid "?and:, "
msgstr ", "
@@ -1396,13 +1400,13 @@ msgstr ""
#: server/auth.c:170
#, c-format
msgid "Auth option \"%s\":"
-msgstr ""
+msgstr "Kirjautumisasetus \"%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 "puuttuu asetustiedostosta (käytetään oletusta)"
#. TRANS: auth option originates from internal default
#: server/auth.c:186
@@ -1422,33 +1426,28 @@ msgstr " (asetettu)"
#: server/auth.c:234
#, c-format
msgid "Illegal value for auth port: \"%s\""
-msgstr ""
+msgstr "Epäkelpo arvo autentikointiportille: \"%s\""
#: server/auth.c:281
#, c-format
-msgid "Auth config filename \"%s\" not allowed!"
-msgstr "Antamasi asetustiedoston nimi \"%s\" ei ole sallittu."
-
-#: server/auth.c:286
-#, c-format
msgid "Cannot load auth config file \"%s\"!"
-msgstr "Asetustiedoston \"%s\" lataaminen ei onnistu!"
+msgstr "Kirjautumisasetustiedoston \"%s\" lataaminen ei onnistu!"
-#: server/auth.c:397
+#: server/auth.c:392
#, c-format
msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
msgstr "Varoitus: vierailijanimi '%s' on varattu, vaihdan käyttäjänimeen '%s'."
-#: server/auth.c:404
+#: server/auth.c:399
msgid "Guests are not allowed on this server. Sorry."
msgstr "Vierailijoita ei sallita tällä palvelimella, pahoittelen."
-#: server/auth.c:406
+#: server/auth.c:401
#, c-format
msgid "%s was rejected: Guests not allowed."
msgstr "%s jätetty ulkopuolelle: vierailijoita ei sallita."
-#: server/auth.c:425
+#: server/auth.c:420
#, c-format
msgid ""
"There was an error reading the user database, logging in as guest connection "
@@ -1456,7 +1455,7 @@ msgid ""
msgstr ""
"Käyttäjätietokannan luku epäonnistui, kirjaudun sisään vierailijana '%s'."
-#: server/auth.c:431
+#: server/auth.c:426
msgid ""
"There was an error reading the user database and guest logins are not "
"allowed. Sorry"
@@ -1464,42 +1463,42 @@ msgstr ""
"Käyttäjätietokannan lukeminen epäonnistui, ja vierailijakirjautumisia ei "
"sallita. Pahoittelen"
-#: server/auth.c:434
+#: server/auth.c:429
#, c-format
msgid "%s was rejected: Database error and guests not allowed."
msgstr ""
"%s jätettiin ulkopuolelle: Tietokantavirhe, ja vierailijoita ei sallita."
-#: server/auth.c:441
+#: server/auth.c:436
#, c-format
msgid "Enter password for %s:"
msgstr "Anna käyttäjän %s salasana:"
-#: server/auth.c:450
+#: server/auth.c:445
msgid "Enter a new password (and remember it)."
msgstr "Anna uusi salasana (ja muista se)."
-#: server/auth.c:456
+#: server/auth.c:451
msgid "This server allows only preregistered users. Sorry."
msgstr "Pahoittelen, palvelin sallii vain ennalta rekisteröityjä käyttäjiä."
-#: server/auth.c:459
+#: server/auth.c:454
#, c-format
msgid "%s was rejected: Only preregister users allowed."
msgstr ""
"%s jätettiin ulkopuolelle: Vain ennalta rekisteröidyt käyttäjät sallittu."
-#: server/auth.c:488 server/auth.c:547
+#: server/auth.c:483 server/auth.c:542
msgid "Sorry, too many wrong tries..."
msgstr "Pahoittelen, liian monta yritystä meni vikaan..."
-#: server/auth.c:489
+#: server/auth.c:484
#, c-format
msgid "%s was rejected: Too many wrong password verifies for new user."
msgstr ""
"%s jätetty ulkopuolelle: Liian monta salasanavahvistusta uudelle käyttäjälle."
-#: server/auth.c:505
+#: server/auth.c:500
msgid ""
"Warning: There was an error in saving to the database. Continuing, but your "
"stats will not be saved."
@@ -1507,30 +1506,30 @@ msgstr ""
"Varoitus: Virhe tallentaessa tietokantaan. Jatkan, mutta tietosi eivät "
"tallennu."
-#: server/auth.c:549
+#: server/auth.c:544
#, c-format
msgid "%s was rejected: Too many wrong password tries."
msgstr "%s jätetty ulkopuolelle: Liian monta epäonnistunutta salasanayritystä."
-#: server/auth.c:558
+#: server/auth.c:553
msgid "Your password is incorrect. Try again."
msgstr "Annoit väärän salasanan, yritä uudelleen."
-#: server/auth.c:569
+#: server/auth.c:564
msgid "Sorry, your connection timed out..."
msgstr "Pahoittelen, yhteytesi aikakatkaistiin..."
-#: server/auth.c:571
+#: server/auth.c:566
#, c-format
msgid "%s was rejected: Connection timeout waiting for password."
msgstr "%s jätettiin ulkopuolelle: Yhteyden aikakatkaisu salasanaa odottaessa."
-#: server/auth.c:636
+#: server/auth.c:631
#, c-format
msgid "Your password is too short, the minimum length is %d. Try again."
msgstr "Salasanasi on liian lyhyt, alaraja on %d merkkiä. Anna uusi salasana."
-#: server/auth.c:642
+#: server/auth.c:637
#, c-format
msgid ""
"The password must have at least %d capital letters, %d numbers, and be at "
@@ -2041,7 +2040,7 @@ msgstr "Tällä palvelimella pyörii %s."
msgid "You can learn a lot about Freeciv at %s"
msgstr "Voit oppia paljon Freecivistä osoitteessa %s"
-#: server/civserver.c:206 client/civclient.c:237 manual/civmanual.c:380
+#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
@@ -2070,18 +2069,17 @@ msgstr ""
# *** "Expect client-connections to port.." ***
#: server/civserver.c:215
-#, fuzzy
msgid " -b --bind ADDR\tListen for clients on ADDR\n"
-msgstr " -p, --port PORT\tOdota client-yhteydenottoja porttiin PORT\n"
+msgstr " -b --bind ADDR\tOdota asiakasyhteydenottoja osoitteessa ADDR\n"
-#: server/civserver.c:217 client/civclient.c:241
+#: server/civserver.c:217 client/civclient.c:242
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:245
+#: server/civserver.c:221 client/civclient.c:246
msgid " -d, --debug NUM\tSet debug log level (0 to 3)\n"
msgstr " -d --debug NUM\tAseta debug-lokitarkkuus (0 - 3)\n"
@@ -2089,7 +2087,7 @@ msgstr " -d --debug NUM\tAseta debug-lokitarkkuus (0 - 3)\n"
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:248 manual/civmanual.c:382
+#: server/civserver.c:225 client/civclient.c:249 manual/civmanual.c:382
msgid " -h, --help\t\tPrint a summary of the options\n"
msgstr " -h, --help\t\tNäytä valintojen yhteenveto\n"
@@ -2139,11 +2137,11 @@ msgstr " -r, --read FILE\tLue käynnistysskripti tiedostosta FILE\n"
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:267 manual/civmanual.c:383
+#: server/civserver.c:247 client/civclient.c:268 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:279
+#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, c-format
@@ -2322,7 +2320,7 @@ msgid "Cast a vote."
msgstr "Anna ääni."
#: server/commands.c:111
-#, fuzzy, no-c-format
+#, 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 "
@@ -2332,14 +2330,12 @@ msgid ""
"for it, or fail immediately if at least half of the players vote against it."
msgstr ""
"Pelaaja, joka on info-komentotasolla ja ajaa kontrollitason komennon, "
-"aloittaa äänestyksen komennosta. /vote-komento, jonka parametriksi annetaan "
+"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ä "
-"komentoa. Voit ehdottaa vain yhtä äänestystä kerrallaan. Äänestyksen tulos "
+"antaa äänen. Jos äänestyksen numeroa ei anneta, ääni koskee viimeisintä "
+"komentoa. Voit ehdottaa vain yhtä äänestystä kerrallaan. Äänestyksen tulos "
"on myönteinen välittömästi jos yli puolet pelaajista äänestää sen puolesta, "
-"tai kielteinen mikäli ainakin puolet pelaajista äänestävät sitä vastaan. Jos "
-"yhden vuoron aikana kukaan ei äänestä vastaan, äänestyksen tulos voi olla "
-"myönteinen."
+"tai kielteinen mikäli ainakin puolet pelaajista äänestää sitä vastaan."
#: server/commands.c:121
msgid ""
@@ -2403,7 +2399,7 @@ msgid ""
"Choose new ruleset directory or modpack. Calling this\n"
" without any arguments will show you the currently selected ruleset."
msgstr ""
-"Valitse uusi hakemisto säännöstökokoelmalle tai mod-paketti.\n"
+"Valitse uusi hakemisto sääntökokoelmalle tai mod-paketti.\n"
"Jos uutta hakemistoa ei anneta, tämänhetkinen hakemisto näytetään."
#. TRANS: translate text between <> only
@@ -2422,6 +2418,10 @@ msgid ""
"user defined metamessage will be used instead of automatically\n"
"generated messages, if it is available."
msgstr ""
+"Muuta käyttäjän määriteltäväksi jätettyä metapalvelimen infotekstiä. Jos \n"
+"tekstirivi on tyhjä, viimeksi asetettu infoteksti poistetaan. Yleensä\n"
+"tätä käyttäjän määrittelemää metaviestiä käytetään automaattisesti\n"
+"luotavien viestien sijaan, jos sellainen on saatavilla."
#. TRANS: translate text between <> only
#: server/commands.c:158
@@ -2474,7 +2474,6 @@ msgid "Take over a player's place in the game."
msgstr "Ota pelaajan paikka pelissä."
#: server/commands.c:184
-#, fuzzy
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 "
@@ -2483,8 +2482,9 @@ msgid ""
"assigned to the connection."
msgstr ""
"Vain konsoli ja komentotason 'hack' yhteydet voivat pakottaa toisen yhteyden "
-"tarkkailemaan pelaajaa. Jos et ole yksi näistä, vain parametri <pelaajanimi> "
-"on sallittu"
+"ottaamaan pelaajan hallintaansa. Jos et ole yksi näistä, vain parametri "
+"<pelaajan nimi> on sallittu. Jos pelaajan nimeksi annetaan '-' ja yhteys ei "
+"ennestään hallitse pelaajaa, yhteyden hallintaan luodaan uusi pelaaja."
#. TRANS: translate text between [] only
#: server/commands.c:192
@@ -2939,32 +2939,28 @@ msgid "(%d) %s rejected: mismatched capabilities!"
msgstr "(%d) %s katkaistu: epäyhteensopivat ohjelmistot."
#: server/connecthand.c:277
-#, fuzzy
msgid "This server is missing a capability that the client needs."
-msgstr "Palvelimesta puuttuu client-ohjelman vaatima ominaisuus."
+msgstr "Palvelimesta puuttuu asiakasohjelman vaatima ominaisuus."
#: server/connecthand.c:290
msgid "The username is invalid!"
msgstr "Käyttäjätunnus ei kelpaa!"
-# Unliteral translation.
#. TRANS: (connection) identifier: ... [network address]
#: server/connecthand.c:292
-#, fuzzy, c-format
+#, c-format
msgid "(%d) %s rejected: invalid username [%s]"
-msgstr "(%d) %s jätetty ulkopuolelle: epäyhteensopivat ohjelmistot [%s]"
+msgstr "(%d) %s jätetty ulkopuolelle: epäkelpo käyttäjänimi [%s]"
#: server/connecthand.c:303
-#, fuzzy
msgid "Your username is already connected!"
-msgstr "on jo yhteydessä palvelimeen."
+msgstr "Käyttäjänimesi on jo yhteydessä palvelimeen!"
-# Unliteral translation.
#. TRANS: (connection) identifier: ... [network address]
#: server/connecthand.c:305
-#, fuzzy, c-format
+#, c-format
msgid "(%d) %s rejected: duplicate username [%s]"
-msgstr "(%d) %s jätetty ulkopuolelle: epäyhteensopivat ohjelmistot [%s]"
+msgstr "(%d) %s jätetty ulkopuolelle: käyttäjänimi käytössä [%s]"
#: server/connecthand.c:335 server/connecthand.c:344
#, c-format
@@ -3012,11 +3008,11 @@ 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
-#, fuzzy, c-format
+#, c-format
msgid "A treaty containing %d clause was agreed upon."
msgid_plural "A treaty containing %d clauses was agreed upon."
-msgstr[0] "Peli: %d-kohtainen sopimus hyväksyttiin."
-msgstr[1] "Peli: %d-kohtainen sopimus hyväksyttiin."
+msgstr[0] "%d-kohtainen sopimus hyväksyttiin."
+msgstr[1] "%d-kohtainen sopimus hyväksyttiin."
#: server/diplhand.c:277 server/diplhand.c:281
#, c-format
@@ -3095,7 +3091,11 @@ 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] ""
+"Sinä ja %s sovitte aselevosta. %d vuoron jälkeen siitä tulee rauhansopimus. "
+"Siirrä yksikkösi pois %s alueelta."
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
#, c-format
@@ -3159,18 +3159,18 @@ msgid "The %s have established an embassy in %s."
msgstr "%s ovat perustaneet lähetystön kaupunkiin %s."
#: server/diplomats.c:333
-#, fuzzy, c-format
+#, c-format
msgid "Your %s could not sabotage the %s %s."
-msgstr "Lähettämäsi %1$s ei onnistunut sabotoimaan yksikköä %3$s (%2$s)."
+msgstr "Lähettämäsi %s ei onnistunut sabotoimaan %s yksikköä %s."
#: server/diplomats.c:355
-#, fuzzy, c-format
+#, c-format
msgid "Your %s succeeded in sabotaging the %s %s."
-msgstr "Lähettämäsi %1$s sabotoi yksikön %3$s (%2$s)."
+msgstr "Lähettämäsi %s sabotoi %s yksikön %s."
#. TRANS: ... the Poles!
#: server/diplomats.c:362
-#, fuzzy, c-format
+#, c-format
msgid "Your %s was sabotaged by the %s!"
msgstr "Yksikkösi %s on sabotoitu - mokomat %s!"
@@ -3179,24 +3179,24 @@ msgid "You can't bribe a unit from this nation."
msgstr "Et voi lahjoa tämän valtion yksikköjä."
#: server/diplomats.c:422
-#, fuzzy, c-format
+#, c-format
msgid "You don't have enough gold to bribe the %s %s."
-msgstr "Sinulla ei ole tarpeeksi varoja lahjoa yksikköä %2$s (%1$s)."
+msgstr "Sinulla ei ole tarpeeksi varoja lahjoa %s yksikköä %s."
#: server/diplomats.c:432
-#, fuzzy, c-format
+#, c-format
msgid "You cannot bribe the %s!"
msgstr "%s ei ole lahjottavissa!"
#. TRANS: <diplomat> ... <unit>
#: server/diplomats.c:455
-#, fuzzy, c-format
+#, c-format
msgid "Your %s succeeded in bribing the %s."
msgstr "Lähettämäsi %s onnistui lahjomaan yksikön %s."
#. TRANS: <unit> ... <Poles>
#: server/diplomats.c:463
-#, fuzzy, c-format
+#, c-format
msgid "Your %s was bribed by the %s."
msgstr "Yksikkösi, %s, lahjottiin vihollisen (%s) puolelle."
@@ -3216,10 +3216,9 @@ msgstr ""
"Lähettämäsi %s jäi kiinni yrittäessään varastaa teknologiaa kaupungissa %s."
#: server/diplomats.c:606
-#, fuzzy, c-format
+#, c-format
msgid "The %s %s failed to steal technology from %s."
-msgstr ""
-"%1$s ei saanut varastettua teknologiaa kaupungissa %3$s - %2$s jäi kiinni."
+msgstr "%s %s ei saanut varastettua teknologiaa - %s pitävät salaisuutensa."
#: server/diplomats.c:620
#, c-format
@@ -3316,9 +3315,9 @@ msgstr "%s tuhosivat kohteen %s kaupungissa %s."
#. TRANS: <unit> ... <diplomat>
#: server/diplomats.c:1091
-#, fuzzy, c-format
+#, c-format
msgid "An enemy %s has been eliminated by your %s."
-msgstr "Vihollisen yksikkö %s tuhoutui puolustaessaan kaupunkia %s."
+msgstr "Yksikkösi %2$s eliminoi vihollisen yksikön %1$s."
#. TRANS: <unit> ... <city> ... <diplomat>
#: server/diplomats.c:1098
@@ -3328,7 +3327,7 @@ msgstr "Puolustava %s kaupungissa %s tuhoutui, kun %s yritti tunkeutua sinne."
#. TRANS: <unit> ... <diplomat>
#: server/diplomats.c:1106
-#, fuzzy, c-format
+#, c-format
msgid "Your %s has been eliminated defending against a %s."
msgstr "Puolustava %s kaupungissa tuhoutui, kun %s yritti tunkeutua sinne."
@@ -3348,7 +3347,7 @@ msgid "Eliminated %s %s while infiltrating our troops."
msgstr "%s %s tuhoutui yrittäessään soluttautua joukkoihimme."
#: server/diplomats.c:1185
-#, fuzzy, c-format
+#, c-format
msgid ""
"Your %s has successfully completed the mission and returned unharmed to %s."
msgstr ""
@@ -3356,20 +3355,19 @@ msgstr ""
"kaupunkiin %s."
#: server/diplomats.c:1204
-#, fuzzy, c-format
+#, 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
-#, fuzzy, c-format
+#, 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
-#, fuzzy, c-format
+#, c-format
msgid "You have caused an incident while bribing the %s %s."
-msgstr ""
-"Olet aiheuttanut selkkauksen - %s syyttää sinua yksikön %s lahjonnasta."
+msgstr "Olet aiheuttanut selkkauksen %s yksikön %s lahjontayrityksellä."
#: server/diplomats.c:1247
#, c-format
@@ -3403,7 +3401,7 @@ msgid "Sea moving start units are not yet supported. Nobody gets %s."
msgstr ""
"Merellä liikkuvia aloitusyksiköitä ei vielä tueta. Kukaan ei saa yksikköä %s."
-#: server/gamehand.c:310 client/text.c:632
+#: server/gamehand.c:310 client/text.c:691
#, c-format
msgid "Year: %s"
msgstr "Vuosi: %s"
@@ -3418,12 +3416,12 @@ msgstr "Vuoron aikaraja on nollaa pienempi ja muutetaan nollaksi."
#: server/ggzserver.c:123
msgid "Unable to make temporary directory for GGZ game.\n"
-msgstr ""
+msgstr "Väliaikaisen hakemiston luonti GGZ-peliä varten epäonnistui.\n"
#: server/ggzserver.c:131
#, c-format
msgid "Unable to change into temporary server directory %s.\n"
-msgstr ""
+msgstr "Väliaikaiseen palvelinhakemistoon %s vaihtaminen epäonnistui.\n"
#: server/ggzserver.c:266 client/ggzclient.c:109
msgid "Only the GGZ client must call civclient in ggz mode!\n"
@@ -3448,7 +3446,7 @@ msgstr "%s on anonyyminimi. Käytä yhteysnimeä"
msgid "You are not attached to a player."
msgstr "Et ole yhteydessä pelaajaan."
-# Hallitusmuoto.
+# hallintomuoto.
#: server/handchat.c:194
#, c-format
msgid "%s to allies: %s"
@@ -3577,7 +3575,7 @@ msgstr "Vallankumous: palataan anarkiaan."
#: server/plrhand.c:398
msgid "You should choose a new government from the government menu."
-msgstr "Valitse uusi hallitusmuoto hallitusmuotovalikosta."
+msgstr "Valitse uusi hallintomuoto hallintomuotovalikosta."
#: server/plrhand.c:424
#, c-format
@@ -3605,6 +3603,9 @@ msgid ""
"The senate will not allow you to break treaty with the %s. You must either "
"dissolve the senate or wait until a more timely moment."
msgstr ""
+"Senaatti ei salli sinun rikkovan sopimusta jonka sinä ja %s olette "
+"allekirjoittaneet. Sinun on joko hajotettava senaatti tai odotettava "
+"parempaa hetkeä."
#: server/plrhand.c:553
#, c-format
@@ -3618,6 +3619,8 @@ msgid ""
"The senate refuses to break treaty with the %s, but you have no trouble "
"finding a new senate."
msgstr ""
+"Senaatti kieltäytyy rikkomasta sopimusta, jonka sinä ja %s olette "
+"allekirjoittaneet, mutta sinulla ei ole ongelmia uuden senaatin löytämisessä."
#: server/plrhand.c:590
#, c-format
@@ -3684,35 +3687,34 @@ msgstr ""
"%s kansakunta ei voi vajota sisällissotaan - pelissä on liikaa pelaajia"
#: server/plrhand.c:1663
-#, fuzzy, c-format
+#, c-format
msgid "Could not throw %s into civil war - no available nations"
-msgstr ""
-"%s kansakunta ei voi vajota sisällissotaan - pelissä on liikaa pelaajia"
+msgstr "%s eivät voi vajota sisällissotaan - pelissä on liikaa pelaajia"
#: server/plrhand.c:1686
#, 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 kapinallisten valtioiden johtajaksi."
+"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!"
#: server/plrhand.c:1707
-#, fuzzy, c-format
+#, c-format
msgid "%s declares allegiance to %s."
-msgstr "Peli: %s julistaa, että %s on sen liittolainen."
+msgstr "%s vannoo uskollisuutta uudelle hallitsijalle (%s)."
#: server/plrhand.c:1722
-#, fuzzy, c-format
+#, 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 ""
-"Kun %s menetti pääkaupunkinsa ja valtakunnan hallintorakenteet tuhoutuivat,\n"
-" sisällissota syttyi. Opportunistit tukevat vallankumousta ja %s,\n"
-" nousukas, on saanut valtaansa %d kapinoivaa maakuntaa."
+"Kun %s pääkaupunki kaapattiin ja valtakunnan hallintorakenteet tuhoutuivat,\n"
+" sisällissota syttyi. Opportunistit tukevat vallankumousta ja "
+"nousukas \n"
+" %s on saanut valtaansa %d kapinoivaa maakuntaa."
#: server/report.c:56
#, c-format
@@ -3793,7 +3795,7 @@ msgstr "Tutkimuksen nopeus"
msgid "Literacy"
msgstr "Lukutaito"
-#: server/report.c:121 client/cityrepdata.c:526 client/cityrepdata.c:527
+#: server/report.c:121 client/cityrepdata.c:524 client/cityrepdata.c:525
#: client/gui-sdl/cityrep.c:174
msgid "Production"
msgstr "Tuotanto"
@@ -3947,7 +3949,7 @@ 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:766
+#: server/report.c:743 server/report.c:768
msgid "Demographics Report:"
msgstr "Väestökatsaus:"
@@ -3955,20 +3957,22 @@ msgstr "Väestökatsaus:"
msgid "Sorry, the Demographics report is unavailable."
msgstr "Ikävä kyllä väestökatsaus ei ole saatavilla."
-#: server/report.c:748
-#, fuzzy, c-format
-msgid "The %s of the %s (%s)"
-msgstr "%2$s ja hallintomuotonsa %1$s"
+#. TRANS: <nation adjective> <government name> (<year>).
+#. * E.g. "Polish Despotism (200 AD)".
+#: server/report.c:750
+#, c-format
+msgid "%s %s (%s)"
+msgstr "%s %s (%s)"
#. TRANS: message about an installation error.
#: server/ruleset.c:163
-#, fuzzy, c-format
+#, c-format
msgid "Could not find a readable \"%s.%s\" ruleset file."
-msgstr "En löytänyt lukukelpoista \"%s\"-sääntökokoelmatiedostoa."
+msgstr "En löytänyt lukukelpoista \"%s.%s\"-sääntökokoelmatiedostoa."
#: server/ruleset.c:2356
msgid "No barbarian nation in rulesets, at least one required!"
-msgstr ""
+msgstr "Sääntökokoelmista puuttuu barbaarivaltio, joita oltava ainakin yksi!"
#: server/ruleset.c:3166
msgid "Loading rulesets"
@@ -3976,7 +3980,6 @@ msgstr "Lataan sääntökokoelmaa"
#. 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 "
@@ -3987,17 +3990,15 @@ msgstr ""
"vastuullasi."
#: server/savegame.c:3588
-#, fuzzy
msgid "Saved game is too old, at least version 1.9.0 required."
msgstr "Tallennettu peli on liian vanha, tarvitaan vähintään versio 1.9.0."
#. TRANS: Fatal error message.
#: server/savegame.c:3815
-#, fuzzy
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."
+"Tallennettu peli käyttää \"klassista\" maastosäännöstöä, jota ei enää tueta."
#: server/savegame.c:3824
#, c-format
@@ -4005,22 +4006,14 @@ msgid ""
"Warning: Different rulesetdirs ('%s' and '%s') are no longer supported. "
"Using '%s'."
msgstr ""
-"Varoitus: Eri säännöstöhakemistoja ('%s' ja '%s') ei enää tueta. Käytetään "
-"hakemistoa '%s'."
+"Varoitus: Eri sääntökokoelmahakemistoja ('%s' ja '%s') ei enää tueta. "
+"Käytetään hakemistoa '%s'."
#. TRANS: Minor error message: <Leader> ... <Poles>.
#: server/savegame.c:4051
#, c-format
msgid "%s had invalid nation; changing to %s."
-msgstr ""
-
-#. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4073
-#, fuzzy, c-format
-msgid ""
-"Illegal alliance structure detected: %s alliance to %s reduced to peace "
-"treaty."
-msgstr "Laiton liittorakenne havaittu: %s ja %s asetettu rauhaan keskenään."
+msgstr "%s johtaa epäkelpoa kansakuntaa; vaihdetaan tilalle %s."
#: server/settings.c:32
msgid "Geological"
@@ -4056,23 +4049,20 @@ msgid "All"
msgstr "Kaikki"
#: server/settings.c:43
-#, fuzzy
msgid "Vital"
-msgstr "Varasta"
+msgstr "Elintärkeät"
#: server/settings.c:44
-#, fuzzy
msgid "Situational"
-msgstr "Puhtaanapito"
+msgstr "Tilanneriippuvaiset"
#: server/settings.c:45
-#, fuzzy
msgid "Rare"
-msgstr "Veroasteet"
+msgstr "Harvinaiset"
#: server/settings.c:46
msgid "Changed"
-msgstr "Vaihdettu"
+msgstr "Muuttuneet"
#: server/settings.c:83
msgid ""
@@ -4084,14 +4074,12 @@ msgstr ""
"Ks. \"help allowtake\"."
#: server/settings.c:119
-#, fuzzy
msgid ""
"Starting units string contains invalid\n"
"characters. Try \"help startunits\"."
msgstr ""
-"Sallitussa ottomerkkijonossa on \n"
-"kelvottomia merkkejä. \n"
-"Ks. \"help allowtake\"."
+"Aloitusyksikkömerkkijonossa on kelvottomia \n"
+"merkkejä. Ks. \"help startunits\"."
#: server/settings.c:125
msgid ""
@@ -4105,23 +4093,23 @@ msgstr ""
#: server/settings.c:143
msgid "Cannot set endyear earlier than current year."
-msgstr ""
+msgstr "Lopetusvuosi ei voi olla ennen kuluvaa vuotta."
#: server/settings.c:160
msgid "Cannot change maxplayers in GGZ mode."
-msgstr ""
+msgstr "Maksimipelaajamäärää ei voi muuttaa GGZ-tilassa."
#: server/settings.c:165
-#, fuzzy
msgid ""
"Number of players is higher than requested value;\n"
"Keeping old value."
-msgstr "Pelaajien lukumäärä on pyydettyä suurempi, pidän vanhan arvon"
+msgstr ""
+"Pelaajien lukumäärä on pyydettyä suurempi;\n"
+"pidän vanhan arvon."
#: server/settings.c:181
-#, fuzzy
msgid "You are not allowed to set timeout values less than 30 seconds."
-msgstr "Sinulla ei ole tarvittavia oikeuksia tämän asetuksen muuttamiseen."
+msgstr "Sinulla ei ole valtuuksia asettaa aikarajoja alle 30 sekunnin."
#: server/settings.c:227
msgid "Map size (in thousands of tiles)"
@@ -4237,9 +4225,8 @@ msgstr ""
"generaattorin perusteella. Ks. \"startpos\"-asetus."
#: server/settings.c:292
-#, fuzzy
msgid "Method used to choose start positions"
-msgstr "Kartanluontitapa"
+msgstr "Aloitussijaintien valintatapa"
#: server/settings.c:293
msgid ""
@@ -4263,7 +4250,6 @@ msgstr ""
"tähän ja pelaajamäärän asetukseen"
#: server/settings.c:306
-#, fuzzy
msgid "Presence of 1x1 islands"
msgstr "Sallitaanko 1x1-saaret"
@@ -4276,9 +4262,9 @@ msgid "Whether the poles are separate continents"
msgstr "Ovatko navat erillisiä mantereita"
#: server/settings.c:313
-#, fuzzy
msgid "0 = continents may attach to poles; 1 = poles will usually be separate"
-msgstr "0 = muut mantereet voivat ulottua napoihin; 1 = navat ovat erillään"
+msgstr ""
+"0 = muut mantereet voivat ulottua napoihin; 1 = navat ovat yleensä erillään"
#: server/settings.c:319
msgid "All the map is temperate"
@@ -4341,13 +4327,12 @@ msgid "Amount of hills/mountains"
msgstr "Kukkuloiden/vuorien määrä"
#: server/settings.c:351
-#, fuzzy
msgid ""
"Small values give flat maps, while higher values give a steeper map with "
"more hills and mountains."
msgstr ""
-"Pienet arvot luovat tasaisia karttoja, korkeat arvot lisäävät "
-"epätasaisuuksia."
+"Pienet arvot luovat tasaisia karttoja, korkeat arvot jyrkempiä karttoja, "
+"joissa on enemmän kukkuloita ja vuoria."
#: server/settings.c:357
msgid "Amount of water on lands"
@@ -4366,26 +4351,26 @@ msgid "Map generation random seed"
msgstr "Kartanluonnin sattumanvaraisuustekijä ('seed')"
#: server/settings.c:366
-#, fuzzy
msgid ""
"The same seed will always produce the same map; for zero (the default) a "
"seed will be chosen based on the time to give a random map. This setting is "
"usually only of interest while debugging the game."
msgstr ""
"Sama arvo tuottaa aina saman kartan; valinnalla 0 (oletus) arvo valitaan "
-"kellonajan perusteella sattumanvaraisen kartan luomiseksi."
+"kellonajan perusteella sattumanvaraisen kartan luomiseksi. Tämä asetus on "
+"yleensä mielenkiintoinen vain pelin toimintaa tutkittaessa."
#: server/settings.c:379
-#, fuzzy
msgid "Game random seed"
msgstr "Yleinen sattumanvaraisuustekijä ('seed')"
#: server/settings.c:380
-#, fuzzy
msgid ""
"For zero (the default) a seed will be chosen based on the time. This setting "
"is usually only of interest while debugging the game"
-msgstr "Valinnalla 0 (oletus) tekijä valitaan kellonajan perusteella."
+msgstr ""
+"Valinnalla 0 (oletus) tekijä valitaan kellonajan perusteella. Tämä asetus on "
+"yleensä mielenkiintoinen vain pelin toimintaa tutkittaessa."
#: server/settings.c:387
msgid "Amount of \"special\" resource squares"
@@ -4441,13 +4426,12 @@ msgid "Total number of players (including AI players)"
msgstr "Lopullinen pelaajamäärä (AI-pelaajat mukaanlukien)"
#: server/settings.c:427
-#, fuzzy
msgid ""
"If set to a positive value, then AI players will be automatically created or "
"removed to keep the total number of players at this amount."
msgstr ""
-"Jos pelaajia on vähemmän kuin tämä arvo, peli luo AI-pelaajia kunnes "
-"pelaajien kokonaismäärä on tämä."
+"Jos arvo on positiivinen, peli luo ja poistaa AI-pelaajia automaattisesti "
+"pitääkseen pelaajien kokonaismäärän tässä arvossa."
#: server/settings.c:439
msgid "List of players' initial units"
@@ -4486,11 +4470,9 @@ msgid "Area where initial units are located"
msgstr "Aloitusyksiköiden hajonta-alue"
#: server/settings.c:458
-#, fuzzy
msgid "This is the radius within which the initial units are dispersed."
msgstr ""
-"Tämän arvon tulisi olla puolet aloitusyksiköiden hajonta-alueen (neliö) "
-"sivun pituudesta - yksiköt päätyvät tämän neliön sisälle."
+"Aloitusyksiköt hajautetaan alueelle, jonka säde on tämän asetuksen mukainen."
#: server/settings.c:464
msgid "Starting gold per player"
@@ -4501,38 +4483,41 @@ msgid "At the beginning of the game, each player is given this much gold."
msgstr "Kullekin pelaajalle annetaan arvon mukainen määrä kultaa pelin alussa."
#: server/settings.c:471
-#, fuzzy
msgid "Number of initial techs per player"
-msgstr "Uudisraivaajien määrä pelaajaa kohti pelin alussa"
+msgstr "Pelaajien aloitusteknologioiden määrä"
#: server/settings.c:472
-#, fuzzy
msgid ""
"At the beginning of the game, each player is given this many technologies. "
"The technologies chosen are random for each player. Depending on the value "
"of tech_cost_style in the ruleset, a big value for techlevel can make the "
"next techs really expensive."
-msgstr "Kullekin pelaajalle annetaan arvon mukainen määrä kultaa pelin alussa."
+msgstr ""
+"Pelin alussa jokaiselle pelaajalle annetaan näin monta teknologiaa "
+"(edistysaskelta). Valitut teknologiat ovat satunnaisia kullekin pelaajalle. "
+"Sääntökokoelman tech_cost_style-arvosta riippuen korkea techlevel-arvo voi "
+"tehdä seuraavista teknologioista erittäin kalliita."
#: server/settings.c:481
msgid "Technology cost multiplier percentage"
-msgstr ""
+msgstr "Teknologiahinnan kerrannaisprosentti"
#: server/settings.c:482
-#, fuzzy
msgid ""
"This affects how quickly players can research new technology. All tech costs "
"are multiplied by this amount (as a percentage). The base tech costs are "
"determined by the ruleset or other game settings."
msgstr ""
-"Tämä vaikuttaa nopeuteen jolla pelaajat voivat kehittää uutta teknologiaa."
+"Tämä vaikuttaa nopeuteen jolla pelaajat voivat kehittää uutta teknologiaa. "
+"Kaikkien edistysaskeleiden hinnat kerrotaan tällä arvolla (tulkittuna "
+"prosenttiluvuksi). Perusteknologiakustannukset määritetään sääntökokoelmassa "
+"tai muiden pelin asetusten kautta."
#: server/settings.c:491
msgid "Percentage penalty when changing tech"
msgstr "Prosentuaalinen menetys tutkimuskohdetta muutettaessa"
#: server/settings.c:492
-#, fuzzy
msgid ""
"If you change your current research technology, and you have positive "
"research points, you lose this percentage of those research points. This "
@@ -4540,15 +4525,13 @@ msgid ""
msgstr ""
"Jos vaihdat tämänhetkistä tutkimuskohdettasi ja tutkimuspisteesi ovat "
"positiivisia, menetät näin monta prosenttia tutkimuspisteistäsi. Menetystä "
-"ei tapahdu jos olet juuri löytänyt uutta teknologiaa tällä vuorolla."
+"ei tapahdu jos olet juuri tehnyt uuden edistysaskeleen tällä vuorolla."
#: server/settings.c:501
-#, fuzzy
msgid "Penalty when getting tech or gold from treaty"
-msgstr "Prosentuaalinen menetys diplomatian kautta saadun teknologian takia"
+msgstr "Sopimuksesta saadun teknologian tai kullan menetys"
#: 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 "
@@ -4557,14 +4540,15 @@ msgid ""
msgstr ""
"Jokaista diplomaattisen sopimuksen kautta saatua teknologista edistysaskelta "
"kohden menetät näin monta prosenttia uuden edistysaskeleen vaatimista "
-"tutkimuspisteistä - voit siis päätyä pakkasen puolelle tutkimuspisteissäsi."
+"tutkimuspisteistä - voit siis päätyä pakkasen puolelle tutkimuspisteissäsi, "
+"jos asetus ei ole 0. Samaa asetusta käytetään saat kultaa diplomaattisten "
+"sopimusten seurauksena."
#: server/settings.c:512
msgid "Penalty when getting tech from conquering"
msgstr "Prosentuaalinen menetys valloituksen kautta saadun teknologian takia"
#: server/settings.c:513
-#, fuzzy
msgid ""
"For each technology you gain by conquering an enemy city, you lose research "
"points equal to this percentage of the cost to research a new technology. If "
@@ -4572,7 +4556,7 @@ msgid ""
msgstr ""
"Jokaista valloittamalla saatua teknologista edistysaskelta kohden menetät "
"näin monta prosenttia uuden edistysaskeleen vaatimista tutkimuspisteistä - "
-"voit siis päätyä pakkasen puolelle tutkimuspisteissäsi."
+"voit siis päätyä pakkasen puolelle tutkimuspisteissäsi, jos arvo ei ole 0."
#: server/settings.c:523
msgid "Penalty when getting a free tech"
@@ -4606,9 +4590,8 @@ msgstr ""
"sääntökokoelman määräämällä tekijällä, joka riippuu kaupungin koosta."
#: server/settings.c:544
-#, fuzzy
msgid "Percentage food lost when building needed"
-msgstr "Prosentuaalinen ruokavarojen menetys kun kaupunki ei voi kasvaa"
+msgstr "Prosentuaalinen ruokavarojen menetys kun tarvittava rakennus puuttuu"
#: server/settings.c:545
msgid ""
@@ -4638,7 +4621,6 @@ msgid "Minimum city size to get full trade"
msgstr "Kaupungin minimikoko kaupan maksimoinniksi"
#: server/settings.c:570
-#, fuzzy
msgid ""
"There is a trade penalty in all cities smaller than this. The penalty is "
"100% (no trade at all) for sizes up to notradesize, and decreases gradually "
@@ -4647,26 +4629,24 @@ msgid ""
msgstr ""
"Jos kaupunki on tätä pienempi, se ei tuota täyttä kauppaa. Jos kaupunki on "
"pienempi kuin minimi, 'notradesize', se ei tuota lainkaan, ja tuotanto "
-"kasvaa vähitellen kunnes tässä koossa kohtaa maksiminsa (lukuunottamatta "
-"tavallista korruptiota). Ks. myös 'notradesize'."
+"kasvaa vähitellen kunnes tässä 'fulltradesize'-koossa kohtaa maksiminsa "
+"(lukuunottamatta tavallista korruptiota). Ks. myös 'notradesize'."
#: server/settings.c:580
msgid "Maximum size of a city without trade"
msgstr "Kaupattoman kaupungin maksimikoko"
#: server/settings.c:581
-#, fuzzy
msgid ""
"Cities do not produce any trade at all unless their size is larger than this "
"amount. The produced trade increases gradually for cities larger than "
"notradesize and smaller than fulltradesize. See also fulltradesize."
msgstr ""
"Vain tätä suuremmat kaupungit tuottavat kauppaa. Tuotetun kaupan määrä "
-"lisääntyy vähitellen kunnes 'fulltradesize', maksimikoko, saavutetaan. Ks. "
-"myös 'fulltradesize'."
+"lisääntyy vähitellen kunnes 'fulltradesize', täyden kaupan tuottava koko, "
+"saavutetaan. Ks. myös 'fulltradesize'."
#: server/settings.c:590
-#, fuzzy
msgid "City size before people become unhappy"
msgstr "Kaupungin koko ennen kuin väestöstä tulee tyytymätöntä"
@@ -4675,10 +4655,13 @@ msgid ""
"Before other adjustments, the first unhappysize citizens in a city are "
"content, and subsequent citizens are unhappy. See also cityfactor."
msgstr ""
+"Ennen muiden säätöjen tekemistä, ensimmäiset 'unhappysize' asukasta "
+"kaupungissa ovat tyytyväisiä, ja tätä seuraavat tyytymättömiä. Ks. myös "
+"'cityfactor'."
#: server/settings.c:599
msgid "Number of cities for higher unhappiness"
-msgstr ""
+msgstr "Tyytymättömyyttä lisäävä kaupunkien määrä"
#: server/settings.c:600
msgid ""
@@ -4687,6 +4670,10 @@ msgid ""
"This assumes a Democracy; for other governments the effect occurs at smaller "
"numbers of cities."
msgstr ""
+"Kun pelaajan omistamien kaupunkien määrä on suurempi kuin 'cityfactor', yksi "
+"ylimääräinen asukas on tyytymätön ennen muita säätöjä; ks. myös "
+"'unhappysize'. Tässä oletuksena on Demokratia; muilla hallitusmuodoilla "
+"vaikutus astuu voimaan pienemmällä kaupunkien määrällä."
#: server/settings.c:609
msgid "Minimum distance between cities"
@@ -4702,7 +4689,7 @@ msgstr ""
"Kun pelaaja perustaa uuden kaupungin, tätä lähempänä ei saa olla muita "
"kaupunkeja. Esim. jos tämä arvo on 3, vähintään 2 tyhjää ruutua pitää olla "
"jokaisen kaupunkiparin välissä joka suunnassa. Jos arvo on 0 (oletus), se "
-"määräytyy pelin alkaessa senhetkisen säännöstökokoelman mukaiseksi."
+"määräytyy pelin alkaessa senhetkisen sääntökokoelman mukaiseksi."
#: server/settings.c:621
msgid "Number of turns between rapture effect"
@@ -4910,7 +4897,7 @@ msgstr ""
#: server/settings.c:764
msgid "Base chance for diplomats and spies to succeed."
-msgstr ""
+msgstr "Perustodennäköisyys sille, että diplomaatit ja vakoojat onnistuvat."
#: server/settings.c:766
#, no-c-format
@@ -4918,13 +4905,14 @@ msgid ""
"The chance of a spy returning from a successful mission and the base chance "
"of success for diplomats and spies."
msgstr ""
+"Todennäköisyys sille, että vakooja palaa onnistuneen tehtävän jälkeen, ja "
+"perustodennäköisyys diplomaattien ja vakoojien tehtävien onnistumiselle."
#: server/settings.c:773
msgid "Whether to allow space race"
msgstr "Sallitaanko avaruuden kilpajuoksu"
#: server/settings.c:774
-#, fuzzy
msgid "If this option is set to 1, players can build spaceships."
msgstr "Jos tämä arvo on 1, pelaajat voivat rakentaa avaruusaluksia"
@@ -4933,7 +4921,6 @@ msgid "Minimum number of cities for civil war"
msgstr "Pienin määrä kaupunkeja sisällissodan syttymiseen"
#: server/settings.c:781
-#, fuzzy
msgid ""
"A civil war is triggered when a player has at least this many cities and the "
"player's capital is captured. If this option is set to the maximum value, "
@@ -4948,32 +4935,31 @@ msgid "Turns until player contact is lost"
msgstr "Vuororaja ennen kuin pelaajayhteys menetetään"
#: server/settings.c:791
-#, fuzzy
msgid ""
"Players may meet for diplomacy this number of turns after their units have "
"last met, even when they do not have an embassy. If set to zero, then "
"players cannot meet unless they have an embassy."
msgstr ""
-"Pelaajat voivat pitää diplomaattisen tapaamisen, näin monta vuoroa sen "
-"jälkeen kun heidän yksikkönsä ovat viimeksi tavanneet. Aseta tämä arvo "
-"nollaksi poistaaksesi tämän mahdollisuuden kokonaan käytöstä."
+"Pelaajat voivat pitää diplomaattisen tapaamisen näin monta vuoroa sen "
+"jälkeen kun heidän yksikkönsä ovat viimeksi tavanneet, vaikkei heillä olisi "
+"lähetystöä. Aseta tämä arvo nollaksi poistaaksesi tämän mahdollisuuden "
+"kokonaan käytöstä."
#: server/settings.c:801
-#, fuzzy
msgid "Rebuild palace whenever capital is conquered"
msgstr "Rakenna palatsi uudelleen jos pääkaupunki vallataan"
#: server/settings.c:802
-#, fuzzy
msgid ""
"If this is set to 1, when the capital is conquered the palace is "
"automatically rebuilt for free in another randomly choosen city. This is "
"significant because the technology requirement for building a palace will be "
"ignored."
msgstr ""
-"Jos tämä arvo on 1, palatsi rakennetaan uudelleen automaattisesti ja "
-"ilmaiseksi johonkin toiseen kaupunkiin, riippumatta siitä onko Muuraus "
-"keksitty."
+"Jos tämä arvo on 1 ja pääkaupunki vallataan, palatsi rakennetaan uudelleen "
+"automaattisesti ja ilmaiseksi satunnaiseen toiseen kaupunkiin. Asetukselle "
+"antaa lisäpainoa se, että palatsin rakentamisen teknologiavaatimukset "
+"jätetään huomiotta."
#: server/settings.c:811
msgid "Whether to use natural city names"
@@ -4992,7 +4978,6 @@ msgid "Players that users are allowed to take"
msgstr "Pelaajat joita käyttäjät voivat ottaa haltuunsa"
#: server/settings.c:826
-#, fuzzy
msgid ""
"This should be a string of characters, each of which specifies a type or "
"status of a civilization (player). Clients will only be permitted to take or "
@@ -5026,29 +5011,31 @@ msgid ""
"\n"
msgstr ""
"Tämän listan pitäisi olla merkkijono, jossa eri merkit viittaavat "
-"sivilisaation tai \"pelaajan\" tyyppiin tai tilaan. Yhteydenotot sallitaan "
-"vain pelaajiin, jotka sopivat kuvaukseen. Asetus ei vaikuta jo "
-"muodostettuihin yhteyksiin. Merkit ja niiden merkitykset ovat:\n"
-" H,h = ihmispelaajat\n"
-" A,a = tekoälypelaajat\n"
-" d = kuolleet pelaajat\n"
+"kansakunnan (pelaajan) tyyppiin tai tilaan. Vain kuvaukseen sopivien "
+"pelaajien tarkkailu on sallittu. Asetus ei vaikuta takautuvasti; vain tämän "
+"jälkeen tehdyt 'take'- ja 'observe'-komennot ovat sen alaisia. Merkit ja "
+"niiden merkitykset ovat:\n"
+" o,O = yleinen tarkkailija\n"
" b = barbaaripelaajat\n"
-"Tarkkuus lisääntyy listalla ylöspäin mentäessä, esimerkiksi 'd' ei kata "
-"barbaaripelaajia ja 'a' ei kata kuolleita tekoälypelaajia. Isot kirjaimet "
-"vaikuttavat ennen pelin alkua, pienet kirjaimet pelin jo alettua.\n"
+" d = kuolleet pelaajat\n"
+" A,a = tekoälypelaajat\n"
+" H,h = ihmispelaajat\n"
+"Tämän listan ensimmäinen pelaajaan täsmäävä arvo tulkitaan pelaajan "
+"tyypiksi, eli esimerkiksi 'd' ei kata kuolleita barbaaripelaajia ja 'a' ei "
+"kata kuolleita tekoälypelaajia. Isot kirjaimet vaikuttavat ennen pelin "
+"alkua, pienet kirjaimet pelin jo alettua.\n"
+"\n"
"Jokaisen yllämainitun merkin jälkeen voidaan lisätä yksi seuraavista "
-"numeroista, mikäli halutaan sallia tai rajoittaa monipeluu- ja "
-"tarkkailijayhteyksiä:\n"
-" (ei mitään) = 'ohjaaja' sallitaan, tarkkailijat sallitaan, yhteyksiä voi\n"
-" syrjäyttää.\n"
-" 1 = 'ohjaaja' sallitaan, tarkkailijat sallitaan, yhteyksiä ei voi \n"
-" syrjäyttää;\n"
-" 2 = 'ohjaaja' sallitaan, tarkkailijoita ei, yhteyksiä voi syrjäyttää;\n"
-" 3 = 'ohjaaja' sallitaan, tarkkailijoita ei, yhteyksiä ei voi syrjäyttää;\n"
-" 4 = 'ohjaajaa' ei sallita, tarkkailijat sallitaan;\n"
-"\"Yhteyden syrjäyttämisellä\" tarkoitetaan jonkun toisen käyttäjän "
-"kontrolloiman\n"
-"pelaajan käyttöönottamista."
+"numeroista, mikäli halutaan sallia tai rajoittaa yhteyden muotoa:\n"
+"\n"
+"(ei mitään) = hallinta sallitaan, tarkkailijat sallitaan, yhteyksiä voi "
+"syrjäyttää. (Syrjäytys tarkoittaa, että voit ottaa pelaajan hallintaan "
+"vaikka joku toinen jo hallitsisi sitä.)\n"
+"1 = hallinta sallitaan, tarkkailijat sallitaan, yhteyksiä ei voi "
+"syrjäyttää;\n"
+"2 = hallinta sallitaan, tarkkailijoita ei, yhteyksiä voi syrjäyttää;\n"
+"3 = hallinta sallitaan, tarkkailijoita ei, yhteyksiä ei voi syrjäyttää;\n"
+"4 = hallintaa ei sallita, tarkkailijat sallitaan;\n"
#: server/settings.c:861
msgid "Whether AI-status toggles with connection"
@@ -5075,7 +5062,6 @@ msgid "Maximum seconds per turn"
msgstr "Suurin sallittu aika kierrosta kohti (sekunteina)"
#: 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 "
@@ -5085,10 +5071,11 @@ msgid ""
"timer."
msgstr ""
"Jos kaikki pelaajat eivät ole valinneet \"Vuoro päättyy\" ennen kuin tämä "
-"aika on loppunut, vuoro päättyy automaattisesti. Arvolla 0 aikarajoitusta ei "
-"ole. DEBUG-palvelimissa aikarajoituksen arvo -1 asettaa automaattisen pelin "
-"testitilaan. Käytä tätä komennon \"timeoutincrease\" kanssa luodaksesi "
-"dynaamisen ajastimen."
+"aika on kulunut, vuoro päättyy automaattisesti. Arvolla 0 aikarajoitusta ei "
+"ole. Debug-asetuksin käännetyissä palvelimissa aikarajoituksen arvo -1 "
+"asettaa automaattipelin testitilaan. Vain yhteydet joilla on 'hack'-"
+"komentotason pääsy voivat asettaa tämän arvon alle 30 sekuntiin. Käytä tätä "
+"asetusta komennon \"timeoutincrease\" kanssa luodaksesi dynaamisen ajastimen."
#: server/settings.c:888
msgid "Timeout at least n seconds when enemy moved"
@@ -5099,50 +5086,48 @@ msgid ""
"Any time a unit moves while in sight of an enemy player, the remaining "
"timeout is increased to this value."
msgstr ""
+"Aina kun yksikkö liikkuu vihollispelaajan näköpiirissä, jäljellä olevaa "
+"siirtoaikaa korotetaan tähän arvoon."
#: server/settings.c:898
-#, fuzzy
msgid "Whether to have simultaneous player phases."
-msgstr "Pidetäänkö pelaajatilastoista kirjaa"
+msgstr "Pidetäänkö pelaajien vuorot yhtäaikaisina."
#: server/settings.c:899
msgid ""
"If true, all players' movement phases will occur simultaneously; if false, "
"then players will alternate movement."
msgstr ""
+"Jos tämä asetus valitaan, kaikkien pelaajien liikkuminen tapahtuu yhtä "
+"aikaa; jos asetusta ei ole valittu, pelaajat liikkuvat vuorotellen."
#: server/settings.c:906
-#, fuzzy
msgid "Seconds to let a client's network connection block"
-msgstr "Aika jonka yhteys saa olla lukossa (block) (s)."
+msgstr "Kuinka kauan asiakkaan verkkoyhteyttä odotetaan (s)."
#: server/settings.c:907
-#, fuzzy
msgid ""
"If a network connection is blocking for a time greater than this value, then "
"the connection is closed. Zero means there is no timeout (although "
"connections will be automatically disconnected eventually)."
msgstr ""
-"Jos TCP-yhteys on lukossa (blocking) kauemmin kuin tämän ajan sekunteina, "
+"Jos TCP-yhteys seisoo ('blocking') kauemmin kuin tämän ajan sekunteina, "
"yhteys suljetaan. Jos arvo on nolla, yhteyttä ei suljeta tällä perusteella "
-"ellei TCP-protokollan toteutus sitä itse tee."
+"(tosin yhteydet sulkeutuvat automaattisesti lopulta joka tapauksessa)."
-# At best a half-educated guess..
#: server/settings.c:916
-#, fuzzy
msgid "Max seconds for network buffers to drain"
-msgstr "Maksimiaika ennen kuin TCP-puskurit katsotaan tyhjiksi (s)"
+msgstr "Verkkopuskureiden tyhjenemisen maksimiodotusaika sekunteina"
#: server/settings.c:917
-#, fuzzy
msgid ""
"The server will wait for up to the value of this parameter in seconds, for "
"all client connection network buffers to unblock. Zero means the server will "
"not wait at all."
msgstr ""
-"Civ-palvelin odottaa korkeintaan näin monta sekuntia kaikkien pelaajayhteys-"
-"TCP-puskureiden aukeamista (unblock). Jos arvo on nolla, palvelin ei odota "
-"lainkaan."
+"Palvelin odottaa korkeintaan näin monta sekuntia kaikkien pelaajayhteyksien "
+"verkkopuskureiden vapautumista (unblock). Jos arvo on nolla, palvelin ei "
+"odota lainkaan."
#: server/settings.c:925
msgid "Seconds between PINGs"
@@ -5161,43 +5146,39 @@ msgid "Time to cut a client"
msgstr "Aika clientin leikkaamiseen"
#: server/settings.c:934
-#, fuzzy
msgid ""
"If a client doesn't reply to a PING in this time the client is disconnected."
-msgstr "Jos client-ohjelma ei vastaa PONGiin tässä ajassa, yhteys katkaistaan."
+msgstr "Jos client-ohjelma ei vastaa PINGiin tässä ajassa, yhteys katkaistaan."
#: server/settings.c:940
msgid "Turn-blocking game play mode"
msgstr "Kierroksen vaihtumisen esto"
#: 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 ""
"Jos tämä arvo on 1, pelikierros ei vaihdu ennen kuin kaikki pelaajat ovat "
-"päättäneet vuoronsa (mukaanlukien pelaajat joiden yhteys on poikki)."
+"päättäneet vuoronsa, mukaanlukien pelaajat joiden yhteys on poikki."
#: server/settings.c:948
msgid "Fixed-length turns play mode"
msgstr "Tasapitkät kierrokset"
#: 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 ""
"Jos tämä arvo on 1, uusi kierros ei ala ennen kuin asetettu kierrosaika on "
-"kulunut, riippumatta siitä ovatko kaikki painaneet \"Vuoro päättyy\"."
+"kulunut, vaikka kaikki olisivat painaneet \"Vuoro päättyy\"."
#: server/settings.c:956
msgid "What is in the Demographics report"
msgstr "Mitä väestökatsaus sisältää"
#: server/settings.c:957
-#, fuzzy
msgid ""
"This should be a string of characters, each of which specifies the inclusion "
"of a line of information in the Demographics report.\n"
@@ -5221,15 +5202,20 @@ msgstr ""
"Tämän tulisi olla kirjainjono. Kirjaimet määrittävät, mitkä tiedot "
"väestökatsaukseen sisällytetään.\n"
"Kirjaimet merkityksineen:\n"
-" N = väkiluku mukaan P = tuotanto mukaan\n"
-" A = pinta-ala mukaan E = talous mukaan\n"
-" S = asutettu ala mukaan M = asepalvelus mukaan\n"
-" R = tutkimuksen nopeus mukaan O = saasteet mukaan\n"
-" L = lukutaitoisuus mukaan<\n"
+" N = väkiluku mukaan \n"
+" P = tuotanto mukaan\n"
+" A = pinta-ala mukaan \n"
+" L = lukutaitoisuus mukaan\n"
+" R = tutkimuksen nopeus mukaan \n"
+" S = asutettu ala mukaan \n"
+" E = talous mukaan\n"
+" M = asepalvelus mukaan\n"
+" O = saasteet mukaan\n"
"Lisäksi seuraavat kirjaimet määrittävät, mitkä vertailuarvot kullekin "
"tiedolle näytetään:\n"
-" q = näytä 'määrä' ('quantity') r = näytä 'sijoitus'\n"
-" b = näytä 'paras valtio'\n"
+" q = näytä määrä ('quantity') \n"
+" r = näytä sijoitus\n"
+" b = näytä paras valtio\n"
"(Kirjainten järjestyksellä ei ole merkitystä, mutta niiden koolla (P/p) on.)"
#: server/settings.c:981
@@ -5237,20 +5223,18 @@ msgid "Turns per auto-save"
msgstr "Vuoroja automaattista tallennusta kohden"
#: server/settings.c:982
-#, fuzzy
msgid ""
"The game will be automatically saved per this number of turns. Zero means "
"never auto-save."
msgstr ""
-"Peli tallennetaan automaattisesti näin monen vuoron välein. \n"
-"Jos arvo on 0, automaattista tallennusta ei tapahdu."
+"Peli tallennetaan automaattisesti näin monen vuoron välein. Jos arvo on 0, "
+"automaattista tallennusta ei tehdä."
#: server/settings.c:992 server/settings.c:1003
msgid "Savegame compression level"
msgstr "Tallennetun pelin pakkaustaso"
#: server/settings.c:993 server/settings.c:1004
-#, fuzzy
msgid ""
"If non-zero, saved games will be compressed using zlib (gzip format). Larger "
"values will give better compression but take longer. If the maximum is zero "
@@ -5258,29 +5242,26 @@ msgid ""
msgstr ""
"Jos arvo ei ole 0, tallennetut pelit pakataan käyttäen zlib:iä (gzip-"
"muodossa). Suuremmilla arvoilla tallennukset vievät vähemmän tilaa mutta "
-"tallentamiseen kuluu enemmän aikaa. Jos suurin mahdollinen arvo on 0, "
-"palvelin on käännetty ('compiled') niin että zlibin käyttöä ei "
-"mahdollistettu."
+"tallentamiseen kuluu enemmän aikaa. Jos suurin mahdollinen arvo on 0, zlibin "
+"käyttöä ei mahdollistettu palvelinta käännettäessä."
#: server/settings.c:1015
msgid "Auto-save name prefix"
msgstr "Automaattisen tallennustiedoston nimen alku"
#: server/settings.c:1016
-#, fuzzy
msgid ""
-"Automatically saved games will have name \"<prefix><year>.sav\". This "
-"setting sets the <prefix> part."
+"Automatically saved games will have name \"<prefix>-T<turn>-Y<year>.sav\". "
+"This setting sets the <prefix> part."
msgstr ""
-"Automaattisesti tallennettujen pelien nimeksi tulee \"<alku><vuosi>.sav\".\n"
-"Tässä asetetaan <alku>:n arvo."
+"Automaattisesti tallennettujen pelien nimeksi tulee \"<alku>-T<vuoro>-"
+"Y<vuosi>.sav\". Tässä asetetaan <alku>:n arvo."
#: server/settings.c:1023
msgid "Whether to log player statistics"
msgstr "Pidetäänkö pelaajatilastoista kirjaa"
#: server/settings.c:1024
-#, fuzzy
msgid ""
"If this is set to 1, player statistics are appended to the file \"civscore."
"log\" every turn. These statistics can be used to create power graphs after "
@@ -5290,16 +5271,16 @@ msgstr ""
"vuoro. Näitä tilastoja voidaan käyttää valta/voima-kuvaajien luomiseen pelin "
"päätyttyä."
-#: server/sernet.c:147
+#: server/sernet.c:150
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:922
-#, fuzzy, c-format
+#: server/sernet.c:929
+#, c-format
msgid "Server: bad address: [%s:%d]."
-msgstr "Välipalvelin: epäkelpo osoite: [%s:%d]."
+msgstr "Palvelin: epäkelpo osoite: [%s:%d]."
#: server/spacerace.c:165
msgid "You need to have a capital in order to launch your spaceship."
@@ -5400,7 +5381,7 @@ msgstr "Peli päättyi tasapeliin"
#: server/srv_main.c:461 server/srv_main.c:472
#, c-format
msgid "Your %s was disbanded in accordance with your peace treaty with the %s."
-msgstr ""
+msgstr "%s lakkautettu rauhansopimuksen perusteella - %s arvostavat."
#: server/srv_main.c:512 server/srv_main.c:516
#, c-format
@@ -5416,125 +5397,127 @@ msgstr ""
"%s ilmoittaa, että tulitauko on päättynyt. %s ja sinä olette nyt sodassa."
#: server/srv_main.c:542
-#, fuzzy, c-format
+#, c-format
msgid ""
"Ceasefire between %s and %s has run out. They are at war. You cancel your "
"alliance with both."
msgstr ""
-"Peli: Joukkuetoverisi %s ja liittolaisesi %s ovat nyt sodassa. Sinulla ei "
-"ole vaihtoehtoa, %s ei voi enää olla liittolaisesi."
+"%s ja %s ovat nyt sodassa tulitauon päätyttyä. Purat liittosi molempien "
+"kanssa."
-#: server/srv_main.c:928
+#: server/srv_main.c:961
#, c-format
msgid "Failed saving game as %s"
msgstr "Pelin tallennus tiedostoon %s epäonnistui"
-#: server/srv_main.c:930
+#: server/srv_main.c:963
#, c-format
msgid "Game saved as %s"
msgstr "Peli tallennettu tiedostoon %s"
-#: server/srv_main.c:962
+#: server/srv_main.c:994
msgid "The game is already running."
msgstr "Peli on jo käynnissä."
-#: server/srv_main.c:970
+#: server/srv_main.c:1002
#, 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:977
+#: server/srv_main.c:1009
msgid "Starting game."
msgstr "Aloitan pelin."
-#: server/srv_main.c:1039
+#: server/srv_main.c:1071
#, c-format
msgid "request for unknown report (type %d)"
msgstr "tuntemattoman raporttityypin pyyntö (tyyppi %d)"
-#: server/srv_main.c:1104
+#: server/srv_main.c:1136
#, c-format
msgid "Warning: rejecting old client %s"
msgstr "Varoitus: hylättiin vanha asiakasohjelma %s\""
-#: server/srv_main.c:1206
+#: server/srv_main.c:1238
#, 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:1306
+#: server/srv_main.c:1338
msgid "Please choose a non-blank name."
msgstr "Ole hyvä ja valitse nimi joka ei ole tyhjä."
-#: server/srv_main.c:1322
+#: server/srv_main.c:1354
msgid "That nation is already in use."
msgstr "Valitsemasi kansakunta on jo käytössä."
-#: server/srv_main.c:1338
+#: server/srv_main.c:1370
#, 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:1359
+#: server/srv_main.c:1391
msgid "Please choose a name containing only ASCII characters."
msgstr "Ole hyvä ja valitse nimi jossa on vain ASCII-kirjaimia."
-#: server/srv_main.c:1458
+#: server/srv_main.c:1490
#, c-format
msgid "%s nation is not available in this scenario."
msgstr "Kansakunta (%s) ei ole saatavilla tässä skenaariossa."
-#: server/srv_main.c:1464
+#: server/srv_main.c:1496
#, 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:1482
+#: server/srv_main.c:1514
#, c-format
msgid "%s is the %s ruler %s."
msgstr "%s on %s hallitsija %s."
-#: server/srv_main.c:1538
+#: server/srv_main.c:1570
#, 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:1582 server/srv_main.c:1586
+#: server/srv_main.c:1614 server/srv_main.c:1618
#, 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:1728
+#: server/srv_main.c:1760
#, c-format
msgid "Player %d"
msgstr "Pelaaja %d"
-#: server/srv_main.c:1739 server/srv_main.c:1745
+#: server/srv_main.c:1771 server/srv_main.c:1777
#, c-format
msgid "%s rules the %s."
msgstr "%s sai johtaakseen %s."
-#: server/srv_main.c:1910
+#: server/srv_main.c:1942
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
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:1961
+#: server/srv_main.c:1993
#, c-format
msgid "Sending info to metaserver [%s]"
msgstr "Lähetän tietoa metapalvelimelle [%s]"
-#: server/srv_main.c:1992
+#: server/srv_main.c:2024
msgid "The game is over..."
msgstr "Peli päättyy..."
-#: server/srv_main.c:2205
+#: server/srv_main.c:2237
msgid "Now accepting new client connections."
msgstr "Vastaanotan nyt uusia client-yhteydenottoja."
@@ -5845,7 +5828,7 @@ msgstr "Joku muu on jo pelinohjaaja."
#: server/stdinhand.c:1416
#, c-format
msgid "Connection %s has opted to become the game organizer."
-msgstr ""
+msgstr "Yhteys %s on tarjoutunut pelinohjaajaksi."
#: server/stdinhand.c:1467
#, c-format
@@ -5939,7 +5922,7 @@ msgstr "Käyttö: away"
#: server/stdinhand.c:1865
msgid "Only players may use the away command."
-msgstr ""
+msgstr "Vain pelaajat voivat käyttää away-komentoa."
#: server/stdinhand.c:1869
#, c-format
@@ -6116,9 +6099,8 @@ msgid "%s tech debugged"
msgstr "Pelaajan %s teknologiaa debugataan"
#: server/stdinhand.c:2352 server/stdinhand.c:2382
-#, fuzzy
msgid "Value 2 & 3 must be integer."
-msgstr "Arvon pitää olla kokonaisluku."
+msgstr "Arvojen 2 ja 3 pitää olla kokonaislukuja."
#: server/stdinhand.c:2356 server/stdinhand.c:2386
msgid "Bad map coordinates."
@@ -6134,14 +6116,14 @@ msgid "%s no longer debugged"
msgstr "Kohdetta %s ei enää debugata"
#: server/stdinhand.c:2392 server/stdinhand.c:2422
-#, fuzzy, c-format
+#, c-format
msgid "%s %s no longer debugged."
-msgstr "Pelaajan %s %s ei ole enää debugattavana."
+msgstr "%s %s ei ole enää debugattavana."
#: server/stdinhand.c:2397 server/stdinhand.c:2427
-#, fuzzy, c-format
+#, c-format
msgid "%s %s debugged."
-msgstr "Pelaajan %s %s on debugattavana."
+msgstr "%s %s debugattu."
#: server/stdinhand.c:2413
msgid "Value 2 must be integer."
@@ -6171,7 +6153,7 @@ msgstr "Arvon pitää olla kokonaisluku."
#: server/stdinhand.c:2512
#, c-format
msgid "The parameter %s should only contain digits 0-1."
-msgstr ""
+msgstr "Parametrin %s tulisi sisältää vain numeroita 0 ja 1."
#: server/stdinhand.c:2519
msgid "Value out of range (minimum: 0, maximum: 1)."
@@ -6185,7 +6167,7 @@ msgstr "Asetus: %s on muutettu arvoon %d."
#: server/stdinhand.c:2554
#, c-format
msgid "The parameter %s should only contain +- and 0-9."
-msgstr ""
+msgstr "Parametrin %s tulisi sisältää vain +- ja numeroita 0-9."
#: server/stdinhand.c:2561
#, c-format
@@ -6202,19 +6184,16 @@ msgid "Option: %s has been set to \"%s\"."
msgstr "Asetus: %s on asetettu arvoon \"%s\"."
#: server/stdinhand.c:2658
-#, fuzzy
msgid "Sorry, one can't observe globally in this game."
-msgstr "Tässä pelissä ei voi tarkkailla."
+msgstr "Tässä pelissä ei voi tarkkailla koko maailmaa."
#: server/stdinhand.c:2661
-#, fuzzy
msgid "Sorry, you can't take a global observer. Observe it instead."
-msgstr "Tässä pelissä ei kontrolloida kuolleita pelaajia."
+msgstr "Et voi ottaa yleistä tarkkailijaa hallintaasi: tarkkaile sitä."
#: server/stdinhand.c:2671
-#, fuzzy
msgid "You cannot take a new player at this time."
-msgstr "Ihmispelaajia ei voi kontrolloida tässä pelissä."
+msgstr "Et voi ottaa hallintaasi uutta pelaajaa tässä vaiheessa peliä."
#. TRANS: Do not translate "maxplayers".
#: server/stdinhand.c:2679
@@ -6226,66 +6205,61 @@ msgid_plural ""
"You cannot take a new player because the maximum of %d players has already "
"been reached (maxplayers setting)."
msgstr[0] ""
+"Et voi ottaa uutta pelaajaa hallintaasi, koska %d pelaajan maksimi on jo "
+"saavutettu (maxplayers-asetus)."
msgstr[1] ""
+"Et voi ottaa uutta pelaajaa hallintaasi, koska %d pelaajan maksimi on jo "
+"saavutettu (maxplayers-asetus)."
#: server/stdinhand.c:2691
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
-#, fuzzy
msgid "Sorry, one can't observe barbarians in this game."
-msgstr "Pahoittelen, tässä pelissä ei voi seurata barbaareja."
+msgstr "Tässä pelissä ei voi tarkkailla barbaareja."
#: server/stdinhand.c:2705
-#, fuzzy
msgid "Sorry, one can't take barbarians in this game."
-msgstr "Pahoittelen, tässä pelissä ei voi kontrolloida barbaareja."
+msgstr "Tässä pelissä ei voi hallita barbaareja."
#: server/stdinhand.c:2713
-#, fuzzy
msgid "Sorry, one can't observe dead players in this game."
-msgstr "Tässä pelissä ei seurata kuolleita pelaajia."
+msgstr "Tässä pelissä ei voi seurata kuolleita pelaajia."
#: server/stdinhand.c:2716
-#, fuzzy
msgid "Sorry, one can't take dead players in this game."
-msgstr "Tässä pelissä ei kontrolloida kuolleita pelaajia."
+msgstr "Tässä pelissä ei voi hallita kuolleita pelaajia."
#: server/stdinhand.c:2724
-#, fuzzy
msgid "Sorry, one can't observe AI players in this game."
-msgstr "AI-pelaajia ei seurata tässä pelissä."
+msgstr "Tässä pelissä ei voi tarkkailla AI-pelaajia."
#: server/stdinhand.c:2727
-#, fuzzy
msgid "Sorry, one can't take AI players in this game."
-msgstr "AI-pelaajia ei kontrolloida tässä pelissä."
+msgstr "Tässä pelissä ei voi hallita AI-pelaajia."
#: server/stdinhand.c:2736
-#, fuzzy
msgid "Sorry, one can't observe human players in this game."
-msgstr "Ihmispelaajia ei seurata tässä pelissä."
+msgstr "Tässä pelissä ei voi tarkkailla ihmispelaajia."
#: server/stdinhand.c:2739
-#, fuzzy
msgid "Sorry, one can't take human players in this game."
-msgstr "Ihmispelaajia ei voi kontrolloida tässä pelissä."
+msgstr "Tässä pelissä ei voi ottaa hallintaan ihmispelaajia."
#: server/stdinhand.c:2749
-#, fuzzy
msgid "Sorry, one can't observe in this game."
msgstr "Tässä pelissä ei voi tarkkailla."
#: server/stdinhand.c:2754
-#, fuzzy
msgid "Sorry, one can't take players in this game."
-msgstr "Tässä pelissä ei voi ottaa pelaajia haltuun."
+msgstr "Tässä pelissä ei voi ottaa pelaajia hallintaan."
#: server/stdinhand.c:2760
-#, fuzzy
msgid "Sorry, one can't take players already connected in this game."
-msgstr "Jo yhdistettyjä pelaajia ei voi ottaa haltuun."
+msgstr "Tässä pelissä ei voi ottaa hallintaan jo yhdistettyjä pelaajia."
#: server/stdinhand.c:2791
msgid "Usage: observe [connection-name [player-name]]"
@@ -6334,14 +6308,14 @@ msgid "Usage: take [connection-name] <player-name>"
msgstr "Käyttö: take [yhteyden nimi] <pelaajan nimi>"
#: server/stdinhand.c:3010
-#, fuzzy, c-format
+#, c-format
msgid "%s already controls %s."
-msgstr "%s hallitsee jo pelaajaa %s"
+msgstr "%s hallitsee jo pelaajaa %s."
#: server/stdinhand.c:3024
-#, fuzzy, c-format
+#, c-format
msgid "There is no free player slot for %s."
-msgstr "En löydä pelaajaa enkä yhteyttä nimellä %s."
+msgstr "Vapaata paikkaa pelaajalle %s ei ole."
#: server/stdinhand.c:3059
#, c-format
@@ -6349,9 +6323,9 @@ msgid "being detached from %s."
msgstr "irroittaudutaan pelaajasta %s."
#: server/stdinhand.c:3135
-#, fuzzy, c-format
+#, c-format
msgid "%s now controls %s (%s, %s)."
-msgstr "%s hallitsee nyt pelaajaa %s."
+msgstr "%s hallitsee nyt pelaajaa %s (%s, %s)."
#: server/stdinhand.c:3139 server/stdinhand.c:4260
#: data/nation/barbarian.ruleset:3
@@ -6359,34 +6333,32 @@ msgid "Barbarian"
msgstr "Barbaari"
#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2030 client/gui-sdl/plrdlg.c:645
+#: client/gui-gtk-2.0/pages.c:2102 client/gui-sdl/plrdlg.c:645
#: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
msgid "AI"
msgstr "AI"
#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
+#: 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
msgid "Human"
-msgstr "Ihminen"
+msgstr "ihminen"
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
-#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
+#: 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
-#, fuzzy
msgid "Alive"
-msgstr "Toiminnassa"
+msgstr "elossa"
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
#: client/gui-win32/connectdlg.c:200
-#, fuzzy
msgid "Dead"
-msgstr ", kuollut"
+msgstr "kuollut"
#: server/stdinhand.c:3147
-#, fuzzy, c-format
+#, c-format
msgid "%s failed to attach to any player."
-msgstr "%s ei ole yhteydessä pelaajiin."
+msgstr "%s ei saanut kytkeydyttyä yhteenkään pelaajaan."
#: server/stdinhand.c:3182
msgid "Usage: detach <connection-name>"
@@ -6407,9 +6379,9 @@ msgid "%s detaching from %s"
msgstr "%s irrottautuu pelaajasta %s"
#: server/stdinhand.c:3240
-#, fuzzy, c-format
+#, c-format
msgid "%s no longer observing."
-msgstr "Kohdetta %s ei enää debugata"
+msgstr "%s ei enää tarkkaile."
#: server/stdinhand.c:3259
#, c-format
@@ -6417,24 +6389,22 @@ msgid "detaching from %s."
msgstr "irrottaudutaan pelaajasta %s."
#: server/stdinhand.c:3345
-#, fuzzy
msgid "Usage: load <game name>"
-msgstr "Käyttö: load <tiedosto>"
+msgstr "Käyttö: load <pelin nimi>"
#: server/stdinhand.c:3350
-#, fuzzy
msgid "Cannot load a game while another is running."
msgstr "Peliä ei voi ladata kun toinen peli on käynnissä."
#: server/stdinhand.c:3372
#, c-format
msgid "Cannot find savegame or scenario with the name \"%s\"."
-msgstr ""
+msgstr "En löydä tallennettua peliä tai skenaariota nimellä \"%s\"."
#: server/stdinhand.c:3389
-#, fuzzy, c-format
+#, c-format
msgid "Could not load savefile: %s"
-msgstr "Tallennetun pelin lataaminen tiedostosta %s ei onnistunut."
+msgstr "Tallennustiedoston avaaminen epäonnistui: %s"
#: server/stdinhand.c:3458
#, c-format
@@ -6444,17 +6414,17 @@ msgstr "Tämänhetkinen hakemistopolku sääntökokoelmille on: \"%s\""
#: server/stdinhand.c:3478
#, c-format
msgid "Ruleset directory \"%s\" not found"
-msgstr "Säännöstökokoelmahakemistoa \"%s\" ei löydy"
+msgstr "Sääntökokoelmahakemistoa \"%s\" ei löydy"
#: server/stdinhand.c:3484
-#, fuzzy, c-format
+#, c-format
msgid "Ruleset directory is already \"%s\""
-msgstr "%s asetettu säännöstökokoelmahakemistoksi"
+msgstr "Sääntökokoelmahakemistoksi on jo asetettu \"%s\""
#: server/stdinhand.c:3488
#, c-format
msgid "Ruleset directory set to \"%s\""
-msgstr "%s asetettu säännöstökokoelmahakemistoksi"
+msgstr "%s asetettu sääntökokoelmahakemistoksi"
#: server/stdinhand.c:3536
msgid "Goodbye."
@@ -6477,19 +6447,18 @@ msgid "Unknown command. Try '%shelp'."
msgstr "Tuntematon käsky. Ks. '%shelp'."
#: server/stdinhand.c:3625
-#, fuzzy
msgid "Your new vote canceled your previous vote."
msgstr "Uusi äänesi peruutti edellisen äänesi."
#: server/stdinhand.c:3633
-#, fuzzy, c-format
+#, c-format
msgid "New vote (number %d) by %s: %s."
-msgstr "Uuden äänen, nro %d, antoi %s: %s"
+msgstr "Uuden äänen (nro %d), antoi %s: %s."
#: server/stdinhand.c:3645
#, c-format
msgid "Your new vote (\"%s\") was not legal or was not recognized."
-msgstr ""
+msgstr "Uusi äänesi (\"%s\") oli epäkelpo tai sitä ei tunnustettu."
#: server/stdinhand.c:3655
msgid "You are not allowed to use this command."
@@ -6500,9 +6469,8 @@ msgid "(server prompt)"
msgstr "(palvelinkehote)"
#: server/stdinhand.c:3787
-#, fuzzy
msgid "Game ended in a draw."
-msgstr "Peli päättyi tasapeliin"
+msgstr "Peli päättyi tasapeliin."
#: server/stdinhand.c:3791
msgid ""
@@ -6518,26 +6486,23 @@ msgstr "En voi lopettaa peliä: yhtään peliä ei ole käynnissä."
#: server/stdinhand.c:3812
#, c-format
msgid "%s has conceded the game and can no longer win."
-msgstr ""
+msgstr "%s on luovuttanut pelin eikä voi enää voittaa."
#: server/stdinhand.c:3817
msgid "You cannot surrender now."
msgstr "Et voi antautua nyt."
#: server/stdinhand.c:3883
-#, fuzzy
msgid "Not enough human players, game will not start."
msgstr "Pelaajia ei ole tarpeeksi, peliä ei aloiteta."
#: server/stdinhand.c:3888
-#, fuzzy
msgid "No players, game will not start."
-msgstr "Pelaajia ei ole tarpeeksi, peliä ei aloiteta."
+msgstr "Pelaajia ei ole, peliä ei aloiteta."
#: server/stdinhand.c:3892
-#, fuzzy
msgid "Not enough nations for all players, game will not start."
-msgstr "Pelaajia ei ole tarpeeksi, peliä ei aloiteta."
+msgstr "Pelaajille ei ole tarpeeksi kansakuntia, peliä ei aloiteta."
#: server/stdinhand.c:3901
msgid "All players are ready; starting game."
@@ -6654,9 +6619,9 @@ 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:242
-#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
-#: client/text.c:1201
+#: 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
#, c-format
msgid "?clistmore:, %s"
msgstr ", %s"
@@ -6892,15 +6857,15 @@ msgstr "Ohjustorjuntajärjestelmä pilasi ydiniskusi - %s ei vahingoittunut."
#. TRANS: "Your Cannon ... the Polish Destroyer."
#: server/unithand.c:901
-#, fuzzy, c-format
+#, c-format
msgid "Your %s survived the pathetic attack from the %s %s."
-msgstr "%s selviytyi surkeasta hyökkäyksestä jota %s yritti yksiköllään %s."
+msgstr "Yksikkösi %s selviytyi %s yksikön (%s) surkeasta hyökkäyksestä."
#. TRANS: "... Cannon ... the Polish Destroyer."
#: server/unithand.c:910
-#, fuzzy, c-format
+#, c-format
msgid "Your attacking %s failed against the %s %s!"
-msgstr "Hyökännyt yksikkösi %s hävisi - %s ja tämän %s voittivat."
+msgstr "Hyökännyt yksikkösi %s hävisi - %s yksikkö %s voitti."
#: server/unithand.c:983
#, c-format
@@ -6911,7 +6876,7 @@ msgstr "Vain %s voi hyökätä mereltä."
msgid "Cannot attack from sea."
msgstr "Merihyökkäys ei onnistu."
-#: server/unithand.c:996 server/unittools.c:2103
+#: server/unithand.c:996 server/unittools.c:2137
msgid "Cannot attack unless you declare war first."
msgstr "Et voi hyökätä ennen sodanjulistusta."
@@ -6931,9 +6896,8 @@ msgid "This unit has no moves left."
msgstr "Tällä yksiköllä ei ole liikepisteitä jäljellä."
#: server/unithand.c:1107
-#, fuzzy
msgid "Unit must be on land to perform diplomatic action."
-msgstr "Peli: Yksikön pitää olla maissa toimiakseen diplomaattina."
+msgstr "Yksikön pitää olla maissa toimiakseen diplomaattina."
#: server/unithand.c:1109
msgid "No diplomat action possible."
@@ -6980,18 +6944,17 @@ msgstr ""
#, c-format
msgid ""
"Sorry, your %s cannot establish a trade route because it has no home city"
-msgstr ""
-"Yksikkösi %s ei voi luoda kauppareittiä, koska sillä ei ole kotikaupunkia"
+msgstr "%s ei voi luoda kauppareittiä, koska sillä ei ole kotikaupunkia"
#: server/unithand.c:1296
#, c-format
msgid "Sorry, your %s cannot establish a trade route between %s and %s"
-msgstr "Yksikkösi %s ei voi luoda %s - %s -kauppareittiä"
+msgstr "%s ei voi luoda %s - %s -kauppareittiä"
#: server/unithand.c:1325 server/unithand.c:1344
#, c-format
msgid "Sorry, your %s cannot establish a trade route here!"
-msgstr "Yksikkösi %s ei voi luoda kauppareittiä tänne!"
+msgstr "%s ei voi luoda kauppareittiä tänne!"
#: server/unithand.c:1329 server/unithand.c:1348
#, c-format
@@ -7009,357 +6972,351 @@ msgid ""
"Your %s from %s has arrived in %s, and revenues amount to %d in gold and "
"research."
msgstr ""
-"Yksikkösi %s kaupungista %s saapui kaupunkiin %s. Matka tuotti %d yksikköä "
-"rahana ja tutkimuspanoksena."
+"%s kaupungista %s saapui kaupunkiin %s. Matka tuotti %d yksikköä rahana ja "
+"tutkimuspanoksena."
-# Second-last %s of %s%ss is location, as for example 'near' or 'in' a city.
#: server/unittools.c:253
-#, fuzzy, c-format
+#, c-format
msgid "%s was upgraded for free to %s."
-msgstr "%s on ajanmukaistettu yksiköksi %s."
+msgstr "%s on ajanmukaistettu kustannuksetta yksiköksi %s."
#: server/unittools.c:297
#, c-format
-msgid "Not enough gold. %s disbanded"
-msgstr "Rahasi eivät riitä. %s on lakkautettu"
+msgid "Not enough gold to pay upkeep for %s. Unit disbanded."
+msgstr "Rahasi eivät riitä. %s on lakkautettu."
-#: server/unittools.c:342
+#: server/unittools.c:343
#, c-format
msgid "Your %s has run out of hit points."
msgstr "Yksikösi %s voimapisteet loppuivat."
# Assuming this happens only to triremes so I dare to bend it..
-#: server/unittools.c:358
+#: server/unittools.c:359
#, c-format
msgid "Your %s has been lost on the high seas."
msgstr "%ssi on uponnut avomerellä."
-#: server/unittools.c:365
+#: server/unittools.c:366
#, c-format
msgid "Your %s survived on the high seas and became more experienced!"
msgstr "%s selviytyi avomerestä ja on nyt kokeneempi!"
-#: server/unittools.c:376
+#: server/unittools.c:377
#, c-format
msgid "Your %s has been lost on unsafe terrain."
msgstr "%s on kadonnut turvattomaan maastoon."
-#: server/unittools.c:430
+#: server/unittools.c:431
#, c-format
msgid "Your %s has returned to refuel."
-msgstr "Yksikkösi %s on palannut tankkaamaan."
+msgstr "%s on palannut tankkaamaan."
-#: server/unittools.c:454
+#: server/unittools.c:455
#, c-format
msgid "Your %s has run out of fuel."
-msgstr "Yksikkösi %s polttoaine loppui."
-
-#. TRANS: And, <the unit> became ...
-#: server/unittools.c:616
-#, fuzzy
-msgid "And, became more experienced!"
-msgstr " ja tämän %s%s hävisivät."
+msgstr "%syksikkösi polttoaine loppui."
#. TRANS: Your <unit> became ...
-#: server/unittools.c:620
+#: server/unittools.c:619
#, c-format
msgid "Your %s became more experienced!"
msgstr "%s on nyt kokeneempi!"
-#: server/unittools.c:1011
+#: server/unittools.c:1009
#, c-format
msgid "Teleported your %s to %s."
msgstr "%s siirrettiin kaupunkiin %s."
-#: server/unittools.c:1041
+#. TRANS: A unit is moved to resolve stack conflicts.
+#: server/unittools.c:1065
+#, c-format
+msgid "Moved your %s."
+msgstr "%s siirrettiin."
+
+#: server/unittools.c:1076
#, c-format
msgid "Disbanded your %s."
msgstr "%s lakkautettiin."
-#: server/unittools.c:1363
+#: server/unittools.c:1397
#, 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:1367
+#: server/unittools.c:1401
#, 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:1469
+#: server/unittools.c:1503
#, 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:1478
+#: server/unittools.c:1512
#, c-format
msgid "%s lost when %s was lost."
msgstr "%s menetetty yksikön %s mukana."
-#: server/unittools.c:1527
+#: server/unittools.c:1561
#, 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:1545
-#, fuzzy, c-format
+#: server/unittools.c:1579
+#, c-format
msgid "Your attacking %s succeeded against the %s %s!"
-msgstr "Hyökännyt yksikkösi %s onnistui, %s ja tämän %s hävisivät."
+msgstr "Hyökännyt yksikkösi %s onnistui, %s %s kukistettiin!"
#. TRANS: "Cannon ... the Polish Destroyer."
-#: server/unittools.c:1554 server/unittools.c:1612
-#, fuzzy, c-format
+#: server/unittools.c:1588 server/unittools.c:1646
+#, c-format
msgid "%s lost to an attack by the %s %s."
-msgstr "%s menetettiin, kun %s hyökkäsi yksiköllä %s."
+msgstr "%s menetettiin %s hyökättyä yksiköllään %s."
#. TRANS: "... Cannon ... the Polish Destroyer ...."
-#: server/unittools.c:1588
-#, fuzzy, c-format
+#: server/unittools.c:1622
+#, 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)!"
msgstr[0] ""
-"Hyökännyt yksikkösi %s onnistui, %s ja tämän %s (ja %d muu yksikkö) "
-"hävisivät."
+"Hyökännyt yksikkösi %s onnistui, %s %s (ja %d muu yksikkö) kukistettiin!"
msgstr[1] ""
-"Hyökännyt yksikkösi %s onnistui, %s ja tämän %s (ja %d muuta yksikköä) "
-"hävisivät."
+"Hyökännyt yksikkösi %s onnistui, %s %s (ja %d muuta yksikköä) kukistettiin!"
#. TRANS: "Cannon lost when the Polish Destroyer
#. * attacked the German Musketeers."
-#: server/unittools.c:1621
-#, fuzzy, c-format
+#: server/unittools.c:1655
+#, c-format
msgid "%s lost when the %s %s attacked the %s %s."
-msgstr "%s menetetty kun %s (%s) hyökkäsi kohteen %s yksikön %s kimppuun."
+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:1636
-#, fuzzy, c-format
+#: server/unittools.c:1670
+#, c-format
msgid "%s (and %s) lost to an attack from the %s %s."
-msgstr "%s (ja %s) menetetty kun %s hyökkäsi yksiköllä %s."
+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:1646
-#, fuzzy, c-format
+#: server/unittools.c:1680
+#, c-format
msgid "%s and %d other unit lost to an attack from the %s %s."
msgid_plural "%s and %d other units lost to an attack from the %s %s."
-msgstr[0] "%s ja %d lisäyksikkö menetetty kun %s hyökkäsi yksiköllä %s."
-msgstr[1] "%s ja %d lisäyksikköä menetetty kun %s hyökkäsi yksiköllä %s."
+msgstr[0] "%s ja %d lisäyksikkö menetetty kun %s %s hyökkäsi."
+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:1660
-#, fuzzy, c-format
+#: server/unittools.c:1694
+#, 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 hyökkäsi yksiköllä %s, kohteena %s ja tämän %s."
-msgstr[1] ""
-"%d yksikköä menetettiin kun %s hyökkäsi yksiköllä %s, kohteena %s ja tämän %"
-"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:1928
+#: server/unittools.c:1962
#, c-format
msgid "Your %s was nuked by %s."
msgstr "Yksikkösi %s pamautettiin tuusannuuskaksi, %s ydiniskun takana."
-#: server/unittools.c:1931 server/unittools.c:1947
+#: server/unittools.c:1965 server/unittools.c:1981
msgid "yourself"
msgstr "sinä itse"
-#: server/unittools.c:1935
-#, fuzzy, c-format
+#: server/unittools.c:1969
+#, c-format
msgid "The %s %s was nuked."
-msgstr "%s menetti yksikkönsä %s ydiniskussa."
+msgstr "%s %s tuhottiin ydiniskussa."
-#: server/unittools.c:1944
+#: server/unittools.c:1978
#, c-format
msgid "%s was nuked by %s."
msgstr "%s pamautettiin tuusannuuskaksi, %s ydiniskun takana."
-#: server/unittools.c:1952
+#: server/unittools.c:1986
#, c-format
msgid "You nuked %s."
-msgstr "Kohde %s on pamautettu tuusannuuskaksi."
+msgstr "Olet pamauttanut kohteen %s tuusannuuskaksi ydiniskussa."
-#: server/unittools.c:1993
-#, fuzzy, c-format
+#: server/unittools.c:2027
+#, c-format
msgid "The %s detonated a nuke!"
-msgstr "%s räjäytti ydinohjuksen!"
+msgstr "%s räjäyttivät ydinohjuksen!"
-#: server/unittools.c:2017
+#: server/unittools.c:2051
#, c-format
msgid "%s transported successfully."
msgstr "%s on turvallisesti siirretty kohteeseensa."
-#: server/unittools.c:2069
+#: server/unittools.c:2103
msgid "This unit type can not be paradropped."
msgstr "Tämä yksikkö ei sovellu laskuvarjohyppelyyn."
-#: server/unittools.c:2079
+#: server/unittools.c:2113
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:2085
+#: server/unittools.c:2119
msgid "The destination location is not known."
msgstr "Kohderuutu on tuntematon."
-#: server/unittools.c:2092
+#: server/unittools.c:2126
#, c-format
msgid "This unit cannot paradrop into %s."
msgstr "%s on sopimaton laskuvarjohypyn laskeutumispaikka tälle yksikölle."
-#: server/unittools.c:2112
+#: server/unittools.c:2146
#, 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:2123
+#: server/unittools.c:2157
#, 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:2136
+#: server/unittools.c:2170
#, 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:2158
+#: server/unittools.c:2192
#, c-format
msgid "You found %d gold."
msgstr "Löysit %d kultaa."
-#: server/unittools.c:2175
+#: server/unittools.c:2209
#, c-format
msgid "You found %s in ancient scrolls of wisdom."
-msgstr "Edistysaskel %s löytyi vanhoista tietäjien kirjoituksista."
+msgstr "%s opittiin vanhoista tietäjien kirjoituksista."
-#: server/unittools.c:2182
+#: server/unittools.c:2216
#, c-format
msgid "The %s have acquired %s from ancient scrolls of wisdom."
msgstr "%s ovat oppineet teknologian %s muinaisista kirjoituksista."
-#: server/unittools.c:2196
+#: server/unittools.c:2230
msgid "A band of friendly mercenaries joins your cause."
msgstr "Ryhmä palkkasotureita liittyy joukkoihisi."
-#: server/unittools.c:2214
+#: server/unittools.c:2248
msgid "An abandoned village is here."
msgstr "Täällä on vain hylätty kylä."
-#: server/unittools.c:2224
+#: server/unittools.c:2258
msgid "You have unleashed a horde of barbarians!"
msgstr "Olet joutunut keskelle barbaarijoukon leiriä!"
-#: server/unittools.c:2227
+#: server/unittools.c:2261
#, c-format
msgid "Your %s has been killed by barbarians!"
msgstr "Barbaarit tappoivat yksikkösi %s!"
-#: server/unittools.c:2243
+#: server/unittools.c:2277
msgid "You found a friendly city."
msgstr "Löysit kannattajakaupungin."
-#: server/unittools.c:2257
+#: server/unittools.c:2291
msgid "Friendly nomads are impressed by you, and join you."
msgstr "Joukko paimentolaisia liittyy seurueeseesi."
-#: server/unittools.c:2282
+#: server/unittools.c:2316
msgid "Your overflight frightens the tribe; they scatter in terror."
msgstr "Ylilentosi pelottaa alkukantaista heimoa; he hajaantuvat kauhuissaan."
-#: server/unittools.c:2540
+#: server/unittools.c:2574
#, c-format
msgid "Orders for %s aborted after enemy movement was spotted."
msgstr "%s keskeytti toimintansa havaittuaan vihollisen liikehdintää."
-#: server/unittools.c:2989
+#: server/unittools.c:3023
#, 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:3041
+#: server/unittools.c:3075
#, c-format
msgid "Orders for %s aborted because building of city failed."
msgstr "%s keskeytti toimintansa, koska kaupungin rakentaminen epäonnistui."
-#: server/unittools.c:3054
+#: server/unittools.c:3088
#, 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:3068
+#: server/unittools.c:3102
#, c-format
msgid "Orders for %s aborted since they give an invalid location."
msgstr "%s keskeytti liikkumisensa, koska kohdepaikka on sopimaton."
-#: server/unittools.c:3078
+#: server/unittools.c:3112
#, 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:3104
+#: server/unittools.c:3138
#, c-format
msgid "Orders for %s aborted because of failed move."
msgstr "%s keskeytti toimintansa, koska sen liikkuminen epäonnistui."
-#: server/unittools.c:3145
+#: server/unittools.c:3179
#, c-format
msgid "Attempt to change homecity for %s failed."
msgstr "Yksikön %s kotipaikan muutos epäonnistui."
-#: server/unittools.c:3156
+#: server/unittools.c:3190
#, c-format
msgid "Attempt to establish trade route for %s failed."
-msgstr ""
+msgstr "Yritys perustaa kauppareitti yksiköllä %s epäonnistui."
-#: server/unittools.c:3168
+#: server/unittools.c:3202
#, c-format
msgid "Attempt to build wonder for %s failed."
-msgstr "Yritys rakentaa ihme kaupunkiin %s epäonnistui."
+msgstr "Yritys rakentaa ihme yksiköllä %s epäonnistui."
-#: server/unittools.c:3177
+#: server/unittools.c:3211
#, c-format
msgid "Your %s has invalid orders."
msgstr "Yksikkösi %s ohjeet ovat kelvottomat."
-#: server/generator/mapgen.c:1737
+#: server/generator/mapgen.c:1771
msgid "High landmass - this may take a few seconds."
msgstr "Paljon maa-alaa - tässä voi mennä jonkin aikaa."
-#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
+#: server/generator/mapgen.c:1969 server/generator/mapgen.c:2039
#, c-format
msgid "Falling back to generator %d."
msgstr "Palaan generaattoriin %d."
-#: server/generator/mapgen.c:2025
+#: server/generator/mapgen.c:2059
msgid "Generator 3 didn't place all big islands."
msgstr "3-generaattori ei asettanut kaikkia suuria saaria paikalleen."
-#: server/generator/mapgen.c:2054
+#: server/generator/mapgen.c:2088
#, c-format
msgid "Generator 3 left %li landmass unplaced."
msgstr "Generaattori 3 jätti %li maa-alasta sijoittamatta."
#: server/generator/startpos.c:381
-#, fuzzy, c-format
+#, c-format
msgid ""
"The server appears to have gotten into an infinite loop in the allocation of "
"starting positions.\n"
"Maybe the number of players is too high for this map.\n"
"Please report this bug at %s."
msgstr ""
-"Palvelin vaikuttaa jääneen ikuiseen silmukkaan asettaessaan aloituspaikkoja, "
-"toiminto keskeytetään.\n"
-"Kenties pelaajia (tai AI-pelaajia) on liikaa tälle kartalle.\n"
+"Palvelin vaikuttaa jääneen ikuiseen silmukkaan asettaessaan "
+"aloituspaikkoja.\n"
+"Kenties pelaajia on liikaa tälle kartalle?\n"
"Ole hyvä ja raportoi tämä virhe osoitteessa %s."
#: client/attribute.c:363
@@ -7392,7 +7349,7 @@ msgstr ""
#: client/audio.c:197
msgid "No real audio plugin present."
-msgstr ""
+msgstr "Varsinaista ääniliitännäistä ei ole saatavilla."
#: client/audio.c:198 client/audio.c:215 client/audio.c:247 client/audio.c:258
msgid "Proceeding with sound support disabled"
@@ -7455,7 +7412,7 @@ msgid_plural "%3d turns"
msgstr[0] "%3d vuoro"
msgstr[1] "%3d vuoroa"
-#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:631
#: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
@@ -7573,343 +7530,340 @@ msgstr "?city_state:Rauhallinen"
msgid "(worklist)"
msgstr "(työlista)"
-#: client/cityrepdata.c:447
-msgid "Special"
-msgstr "Erikoistuneet"
+#: client/cityrepdata.c:446
+msgid "?city:Name"
+msgstr "Nimi"
-#: client/cityrepdata.c:448
-msgid "?entertainers/scientists/taxmen:E/S/T"
-msgstr "Vi/T/Ve"
+#: client/cityrepdata.c:446 client/gui-sdl/cityrep.c:169
+msgid "City Name"
+msgstr "Kaupungin nimi"
-#: client/cityrepdata.c:449
-msgid "Entertainers, Scientists, Taxmen"
-msgstr "Viihdyttäjät, Tutkijat, Verottajat"
+#: client/cityrepdata.c:448
+msgid "?size [short]:Sz"
+msgstr "Ko"
-#: client/cityrepdata.c:452
-msgid "Concise + Rapture, - Disorder"
-msgstr "Lyhenne + Hurmoksessa, - Levoton"
+#: client/cityrepdata.c:448
+msgid "Size"
+msgstr "Koko"
-#: client/cityrepdata.c:454 client/plrdlg_common.c:261
+#: client/cityrepdata.c:450 client/plrdlg_common.c:261
#: client/gui-win32/plrdlg.c:337
msgid "State"
msgstr "Tila"
-#: client/cityrepdata.c:454
+#: client/cityrepdata.c:450
msgid "Rapture/Peace/Disorder"
msgstr "Hurmoksessa/Rauhallinen/Levoton"
+#: client/cityrepdata.c:452
+#, fuzzy
+msgid "Concise *=Rapture, X=Disorder"
+msgstr "Lyhenne + Hurmoksessa, - Levoton"
+
+#: client/cityrepdata.c:456
+msgid "Special"
+msgstr "Erikoistuneet"
+
#: client/cityrepdata.c:457
+msgid "?entertainers/scientists/taxmen:E/S/T"
+msgstr "Vi/T/Ve"
+
+#: client/cityrepdata.c:458
+msgid "Entertainers, Scientists, Taxmen"
+msgstr "Viihdyttäjät, Tutkijat, Verottajat"
+
+#: client/cityrepdata.c:461
msgid "?Happy workers:H"
msgstr "O"
-#: client/cityrepdata.c:457
+#: client/cityrepdata.c:461
msgid "Workers: Happy"
msgstr "Työläiset: Onnellisia"
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
msgid "?Content workers:C"
msgstr "R"
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
msgid "Workers: Content"
msgstr "Työläiset: Rauhallisia"
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
msgid "?Unhappy workers:U"
msgstr "T"
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
msgid "Workers: Unhappy"
msgstr "Työläiset: Tyytymättömiä"
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
msgid "?Angry workers:A"
msgstr "V"
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
msgid "Workers: Angry"
msgstr "Työläiset: Vihaisia"
-#: client/cityrepdata.c:465 client/gui-xaw/citydlg.c:2401
-#: data/default/units.ruleset:238
-msgid "Workers"
+#: client/cityrepdata.c:469 client/gui-xaw/citydlg.c:2402
+msgid "?city:Workers"
msgstr "Työläiset"
-#: client/cityrepdata.c:466
+#: client/cityrepdata.c:470
msgid "?happy/content/unhappy/angry:H/C/U/A"
msgstr "O/R/T/V"
-#: client/cityrepdata.c:467
+#: client/cityrepdata.c:471
msgid "Workers: Happy, Content, Unhappy, Angry"
msgstr "Työläiset: Onnellisia, Rauhallisia, Tyytymättömiä, Vihaisia"
-#: client/cityrepdata.c:470 client/cityrepdata.c:472
+#: client/cityrepdata.c:474 client/cityrepdata.c:476
msgid "Best"
msgstr "Paras"
-#: client/cityrepdata.c:470
+#: client/cityrepdata.c:474
msgid "attack"
msgstr "hyökkäyskyky"
-#: client/cityrepdata.c:471
+#: client/cityrepdata.c:475
msgid "Best attacking units"
msgstr "Parhaat hyökkäysyksiköt"
-#: client/cityrepdata.c:472
+#: client/cityrepdata.c:476
msgid "defense"
msgstr "puolustuskyky"
-#: client/cityrepdata.c:473
+#: client/cityrepdata.c:477
msgid "Best defending units"
msgstr "Parhaat puolustusyksiköt"
-#: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
-#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
-#: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
-#: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
-#: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
-#: client/gui-win32/menu.c:351 client/gui-win32/repodlgs.c:616
-#: client/gui-win32/repodlgs.c:707 client/gui-win32/repodlgs.c:716
-#: client/gui-xaw/menu.c:157 client/gui-xaw/menu.c:219
-#: client/gui-xaw/menu.c:242 client/gui-xaw/repodlgs.c:881
-#: client/gui-xaw/repodlgs.c:1069 data/Freeciv.in:1895 data/helpdata.txt:909
+#: client/cityrepdata.c:478 client/cityrepdata.c:482
+#: client/gui-gtk-2.0/cityrep.c:1437 client/gui-gtk-2.0/cityrep.c:1456
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-gtk-2.0/cityrep.c:1494
+#: client/gui-gtk-2.0/cityrep.c:1514 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/repodlgs.c:960 client/gui-sdl/helpdlg.c:688
+#: client/gui-sdl/mapctrl.c:1605 client/gui-sdl/optiondlg.c:1827
+#: client/gui-sdl/repodlgs.c:356 client/gui-win32/menu.c:351
+#: client/gui-win32/repodlgs.c:616 client/gui-win32/repodlgs.c:707
+#: client/gui-win32/repodlgs.c:716 client/gui-xaw/menu.c:157
+#: client/gui-xaw/menu.c:219 client/gui-xaw/menu.c:242
+#: client/gui-xaw/repodlgs.c:881 client/gui-xaw/repodlgs.c:1069
+#: data/Freeciv.in:1895 data/helpdata.txt:909
msgid "Units"
msgstr "Yksiköt"
#. TRANS: Header "Number of units inside city"
-#: client/cityrepdata.c:476
+#: client/cityrepdata.c:480
msgid "?Present (units):Here"
msgstr "Sis."
-#: client/cityrepdata.c:477
+#: client/cityrepdata.c:481
msgid "Number of units present"
msgstr "Paikalla olevien yksiköiden lkm"
#. TRANS: Header "Number of units supported by given city"
-#: client/cityrepdata.c:480
+#: client/cityrepdata.c:484
msgid "?Supported (units):Owned"
msgstr "Omat"
-#: client/cityrepdata.c:481
+#: client/cityrepdata.c:485
msgid "Number of units supported"
msgstr "Ylläpidettyjen yksiköiden lkm"
#. TRANS: Header "It will take this many turns before city grows"
-#: client/cityrepdata.c:484
+#: client/cityrepdata.c:488
msgid "?food (population):Grow"
msgstr "Kasvu"
-#: client/cityrepdata.c:485 client/cityrepdata.c:530
+#: client/cityrepdata.c:489 client/cityrepdata.c:528
msgid "?Stock/Target:(Have/Need)"
msgstr "(On/Tavoite)"
-#: client/cityrepdata.c:486
+#: client/cityrepdata.c:490
msgid "Turns until growth/famine"
msgstr "Vuoroa kasvuun/nälänhätään"
-#: client/cityrepdata.c:488
-msgid "?size [short]:Sz"
-msgstr "Ko"
-
-#: client/cityrepdata.c:488
-msgid "Size"
-msgstr "Koko"
-
-#: client/cityrepdata.c:492
-msgid "?city:Name"
-msgstr "Nimi"
-
-#: client/cityrepdata.c:492 client/gui-sdl/cityrep.c:169
-msgid "City Name"
-msgstr "Kaupungin nimi"
-
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
msgid "Surplus"
msgstr "Ylijäämä"
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
msgid "?food/production/trade:F/P/T"
msgstr "R/T/K"
-#: client/cityrepdata.c:496
+#: client/cityrepdata.c:494
msgid "Surplus: Food, Production, Trade"
msgstr "Ylijäämä: Ruoka, Tuotanto, Kauppa"
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
msgid "?Food surplus [short]:+F"
msgstr "+R"
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
msgid "Surplus: Food"
msgstr "Ylijäämä: Ruokaa"
-#: client/cityrepdata.c:500
+#: client/cityrepdata.c:498
msgid "?Production surplus [short]:+P"
msgstr "+T"
-#: client/cityrepdata.c:501
+#: client/cityrepdata.c:499
msgid "Surplus: Production"
msgstr "Ylijäämä: Tuotanto"
-#: client/cityrepdata.c:502
+#: client/cityrepdata.c:500
msgid "?Production loss (waste) [short]:-P"
msgstr "-T"
-#: client/cityrepdata.c:503
+#: client/cityrepdata.c:501
msgid "Waste"
msgstr "Hukkaan"
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
msgid "?Trade surplus [short]:+T"
msgstr "+K"
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
msgid "Surplus: Trade"
msgstr "Ylijäämä: Kauppa"
-#: client/cityrepdata.c:506
+#: client/cityrepdata.c:504
msgid "?Trade loss (corruption) [short]:-T"
msgstr "-K"
-#: client/cityrepdata.c:507
+#: client/cityrepdata.c:505
msgid "Corruption"
msgstr "Korruptio"
-#: client/cityrepdata.c:509 client/gui-gtk-2.0/repodlgs.c:654
+#: client/cityrepdata.c:507 client/gui-gtk-2.0/repodlgs.c:654
#: client/gui-sdl/mapctrl.c:1400 client/gui-win32/repodlgs.c:334
#: client/gui-xaw/menu.c:222 client/gui-xaw/repodlgs.c:644
#: client/gui-xaw/repodlgs.c:773 data/Freeciv.in:1819
msgid "Economy"
msgstr "Talous"
-#: client/cityrepdata.c:509
+#: client/cityrepdata.c:507
msgid "?gold/luxury/science:G/L/S"
msgstr "K/L/T"
-#: client/cityrepdata.c:510
+#: client/cityrepdata.c:508
msgid "Economy: Gold, Luxuries, Science"
msgstr "Talous: Kultaa, luksusta, tutkimuspanosta"
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
msgid "?Gold:G"
msgstr "?Rahaa:R"
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
msgid "Economy: Gold"
msgstr "Talous: Rahaa"
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
msgid "?Luxury:L"
msgstr "?Luksus:L"
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
msgid "Economy: Luxury"
msgstr "Talous: Luksus"
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
msgid "?Science:S"
msgstr "?Tutkimus:T"
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
msgid "Economy: Science"
msgstr "Talous: Tutkimuspanosta"
-#: client/cityrepdata.c:518
-#, fuzzy
+# The column is shown as "n over R". Doh.
+#: client/cityrepdata.c:516
msgid "?number_trade_routes:n"
-msgstr "m"
+msgstr "K"
-#: client/cityrepdata.c:518
-#, fuzzy
+#: client/cityrepdata.c:516
msgid "?number_trade_routes:R"
-msgstr "K"
+msgstr "R"
-#: client/cityrepdata.c:519
+#: client/cityrepdata.c:517
msgid "Number of Trade Routes"
msgstr "Kauppareittien määrä"
-#: client/cityrepdata.c:521
+#: client/cityrepdata.c:519
msgid "?pollution [short]:Pol"
msgstr "Saa"
-#: client/cityrepdata.c:523
+#: client/cityrepdata.c:521
msgid "?cma:Governor"
msgstr "Käskynhaltija"
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
-#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
-#: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
-#: data/Freeciv.in:1459 data/helpdata.txt:820
+#: client/cityrepdata.c:521 client/gui-gtk-2.0/cityrep.c:1766
+#: client/gui-sdl/citydlg.c:3809 client/gui-sdl/cma_fe.c:858
+#: client/gui-win32/citydlg.c:726 data/Freeciv.in:1459 data/helpdata.txt:820
msgid "Citizen Governor"
msgstr "Käskynhaltija"
-#: client/cityrepdata.c:526
+#: client/cityrepdata.c:524
msgid "Turns/Buy"
msgstr "Vuoroa/ostohinta"
-#: client/cityrepdata.c:529 client/cityrepdata.c:531
+#: client/cityrepdata.c:527 client/cityrepdata.c:529
msgid "Currently Building"
msgstr "Tuottaa parhaillaan"
-#: client/cityrepdata.c:575
-#, fuzzy
+# TODO: Hmm, consider using some handy UTF-8 symbols for some of these.
+#: client/cityrepdata.c:573
msgid "?specialist:S"
msgstr "E"
-#: client/cityrepdata.c:578
-#, fuzzy
+#: client/cityrepdata.c:576
msgid "Specialists"
-msgstr "Erikoistuneet"
+msgstr "Erikoistujat"
-#: client/civclient.c:239
+#: client/civclient.c:240
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr " -a, --autoconnect\tOhita liittymisikkuna\n"
-#: client/civclient.c:249
+#: client/civclient.c:250
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:251
+#: client/civclient.c:252
msgid " -m, --meta HOST\tConnect to the metaserver at HOST\n"
msgstr " -m, --meta HOST\tYhdistä välipalvelimeen osoitteessa HOST\n"
-#: client/civclient.c:253
+#: client/civclient.c:254
msgid " -n, --name NAME\tUse NAME as name\n"
msgstr " -n, --name NAME\tkäytä nimeä NAME\n"
-#: client/civclient.c:255
-#, fuzzy
+#: client/civclient.c:256
msgid " -p, --port PORT\tConnect to server port PORT (usually with -a)\n"
-msgstr " -p, --port PORT\tYhdistä palvelimen porttiin PORT\n"
+msgstr " -p, --port PORT\tYhdistä palvelimen porttiin PORT (yleensä -a:lla)\n"
-#: client/civclient.c:257
+#: client/civclient.c:258
#, 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:259
+#: client/civclient.c:260
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:262
-#, fuzzy
+#: client/civclient.c:263
msgid " -s, --server HOST\tConnect to the server at HOST (usually with -a)\n"
-msgstr " -s, --server HOST\tYhdistä palvelimeen osoitteessa HOST\n"
+msgstr ""
+" -s, --server HOST\tYhdistä palvelimeen osoitteessa HOST (yleensä -a:lla)\n"
-#: client/civclient.c:264
+#: client/civclient.c:265
msgid " -S, --Sound FILE\tRead sound tags from FILE\n"
msgstr " -S, --Sound TIED\tLue äänitiedot tiedostosta TIED\n"
-#: client/civclient.c:265
+#: client/civclient.c:266
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:268
+#: client/civclient.c:269
#, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -7919,148 +7873,157 @@ msgstr ""
"\t\t\tKs. myös \"%s -- --help\".\n"
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:273
-#, fuzzy, c-format
+#: client/civclient.c:274
+#, c-format
msgid "Report bugs at %s\n"
-msgstr "Lähetä virheraportit osoitteeseen <%s>.\n"
+msgstr "Jätä virheraportti osoitteessa %s\n"
-#: client/civclient.c:297
+#: client/civclient.c:298
#, c-format
msgid "Invalid port \"%s\" specified with --port option.\n"
msgstr "Epäkelpo portti \"%s\" --port-parametrille.\n"
-#: client/civclient.c:299 client/civclient.c:314
+#: client/civclient.c:300 client/civclient.c:315
msgid "Try using --help.\n"
msgstr "Kokeile parametriä --help.\n"
-#: client/civclient.c:312
+#: client/civclient.c:313
#, c-format
msgid "Invalid debug level \"%s\" specified with --debug option.\n"
msgstr "Epäkelpo debug-taso \"%s\" --debug-parametrille.\n"
-#: client/civclient.c:325
+#: client/civclient.c:326
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr "Tunnistamaton asetus: \"%s\"\n"
-#: client/civclient.c:539
+#: client/civclient.c:391
+#, fuzzy, c-format
+msgid "Updating old metaserver address \"%s\"."
+msgstr "metaserver <osoite>"
+
+#: client/civclient.c:394
+#, fuzzy, c-format
+msgid "Default metaserver has been set to \"%s\"."
+msgstr "Asetus: %s on asetettu arvoon \"%s\"."
+
+#: client/civclient.c:550
msgid "Game started."
msgstr "Peli on käynnissä."
-#: client/civclient.c:577
+#: client/civclient.c:588
msgid "There was an error while auto connecting; aborting."
msgstr "Automaattisen liittymisen aikana tapahtui virhe, lopetan."
-#: client/climisc.c:176
-#, fuzzy, c-format
+#: client/climisc.c:177
+#, c-format
msgid "Changing production of every %s into %s."
-msgstr "Peli: Vaihdettu tuotanto: %s -> %s."
+msgstr "Vaihdettu tuotanto kaikkialla: %s -> %s."
-#: client/climisc.c:214
+#: client/climisc.c:215
msgid "?embassy:Both"
msgstr "?embassy:Molemmat"
-#: client/climisc.c:216
+#: client/climisc.c:217
msgid "?embassy:Yes"
msgstr "?embassy:On"
-#: client/climisc.c:219
+#: client/climisc.c:220
msgid "?embassy:With Us"
msgstr "?embassy:Meidän kanssamme"
-#: client/climisc.c:222
+#: client/climisc.c:223
msgid "?embassy:Contact"
msgstr "?embassy:Yhteys"
-#: client/climisc.c:224
-#, fuzzy
+#: client/climisc.c:225
msgid "?embassy:No Contact"
-msgstr "?embassy:Yhteys"
+msgstr "Ei yhteyttä"
-#: client/climisc.c:236
+#: client/climisc.c:237
msgid "?vision:Both"
msgstr "?vision:Molemmat"
-#: client/climisc.c:238
+#: client/climisc.c:239
msgid "?vision:To Them"
msgstr "?vision:Heille"
-#: client/climisc.c:241
+#: client/climisc.c:242
msgid "?vision:To Us"
msgstr "?vision:Meille"
-#: client/climisc.c:257 client/climisc.c:264
+#: client/climisc.c:258 client/climisc.c:265
#, c-format
msgid "The %s give %s"
msgstr "%s antavat %s"
-#: client/climisc.c:268
+#: client/climisc.c:269
#, c-format
msgid "The %s give unknown city."
msgstr "%s antavat tuntemattoman kaupungin"
-#: client/climisc.c:273
+#: client/climisc.c:274
#, c-format
msgid "The %s give %d gold"
msgstr "%s antavat %d kultaa"
-#: client/climisc.c:278
+#: client/climisc.c:279
#, c-format
msgid "The %s give their worldmap"
msgstr "%s antavat maailmankarttansa"
-#: client/climisc.c:282
+#: client/climisc.c:283
#, c-format
msgid "The %s give their seamap"
msgstr "%s antavat merikarttansa"
-#: client/climisc.c:286
+#: client/climisc.c:287
msgid "The parties agree on a cease-fire"
msgstr "Osapuolet sopivat tulitauosta"
-#: client/climisc.c:289
+#: client/climisc.c:290
msgid "The parties agree on a peace"
msgstr "Rauhansopimuksesta sovitaan"
-#: client/climisc.c:292
+#: client/climisc.c:293
msgid "The parties create an alliance"
msgstr "Osapuolet muodostavat liiton"
-#: client/climisc.c:295
+#: client/climisc.c:296
#, c-format
msgid "The %s give shared vision"
msgstr "%s jakavat näkymänsä"
-#: client/climisc.c:299
-#, fuzzy, c-format
+#: client/climisc.c:300
+#, c-format
msgid "The %s give an embassy"
-msgstr "%s antavat %s"
+msgstr "%s myöntävät lähetystön"
-#: client/climisc.c:902
+#: client/climisc.c:906
msgid "Popup Request"
msgstr "Ikkunapyyntö"
-#: client/climisc.c:932
+#: client/climisc.c:936
msgid "Exporting output window to civgame.log ..."
msgstr "Tulostusikkunan sisältö tallennetaan tiedostoon civgame.log ..."
-#: client/climisc.c:936
+#: client/climisc.c:940
msgid "Export complete."
msgstr "Tallennettu."
-#: client/climisc.c:938
+#: client/climisc.c:942
msgid "Export failed, couldn't write to file."
msgstr "Tallennus epäonnistui, tiedostoon ei voi kirjoittaa."
-#: client/climisc.c:1038
-#, fuzzy, c-format
+#: client/climisc.c:1042
+#, c-format
msgid "You don't buy %s in %s!"
-msgstr "Peli: %s ei ole ostettavissa kaupungissa %s!"
+msgstr "%s ei ole ostettavissa kaupungissa %s!"
-#: client/climisc.c:1056
-#, fuzzy, c-format
+#: client/climisc.c:1060
+#, c-format
msgid "%s costs %d gold and you only have %d gold."
-msgstr "Peli: %s maksaa %d ja sinulla on vain %d ."
+msgstr "%s maksaa %d ja sinulla on vain %d ."
#: client/clinet.c:143
msgid "Lost connection to server!"
@@ -8099,27 +8062,27 @@ msgstr ""
"%s\n"
#: client/clinet.c:514
-#, fuzzy, c-format
+#, c-format
msgid ""
"Auto-connecting to server \"%s\" at port %d as \"%s\" every %f second(s) for "
"%d times"
msgstr ""
-"Automaattinen yhdistäminen palvelimeen \"%s\", portti %d, nimellä \"%s\" %d.%"
-"d sekunnin välein %d kertaa"
+"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:1289
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
msgid "novice"
msgstr "aloittelija"
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1289
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1358
msgid "easy"
msgstr "helppo"
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1290
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
msgid "normal"
msgstr "tavallinen"
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1290
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
msgid "hard"
msgstr "vaikea"
@@ -8148,38 +8111,43 @@ 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
-msgid "We have control of the server (command access level hack)"
-msgstr "Me hallitsemme palvelinta (komentotaso hack)."
+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
-msgid "We can't take control of server, attempting to kill it."
-msgstr "Palvelinta ei saada hallintaan, yritetään tappaa prosessi pois."
+msgid ""
+"Failed to obtain the required access level to take control of the server. "
+"The server will now be shutdown."
+msgstr ""
+"Palvelimen hallintaan ottamiseen tarvittavan komentotason saaminen "
+"epäonnistui. Suljen palvelimen."
-#: client/control.c:1104
+#: client/control.c:1123
msgid "Only transporter units can be unloaded."
msgstr "Vain kuljetusyksiköt pystyvät purkamaan lastinsa."
-#: client/control.c:1353
+#: client/control.c:1425
msgid "Only settler units can be put into auto mode."
msgstr "Vain uudisraivaajat voidaan automatisoida."
-#: client/control.c:1444
+#: client/control.c:1516
msgid "Only nuclear units can do this."
msgstr "Vain ydinaseet pystyvät tähän."
-#: client/control.c:1473
+#: client/control.c:1545
msgid "Only paratrooper units can do this."
msgstr "Vain laskuvarjojääkärit pystyvät tähän."
-#: client/control.c:1921
+#: client/control.c:2020
msgid "Too far for this unit."
msgstr "Välimatka on liian pitkä tälle yksikölle."
-#: client/control.c:2131 client/control.c:2161 client/control.c:2177
+#: client/control.c:2230 client/control.c:2260 client/control.c:2276
msgid "Didn't find a route to the destination!"
msgstr "Kohteeseen ei löytynyt käyttökelpoista reittiä!"
-#: client/control.c:2221
+#: client/control.c:2320
msgid "Oh my! You seem to have no capital!"
msgstr "Katsohan mokomaa, sinulla ei näköjään ole pääkaupunkia!"
@@ -8249,16 +8217,16 @@ msgid "Allows %s (with %s)."
msgstr "%s mahdollistuu (lisäksi tarvitaan %s)."
#. TRANS: preserve single space at beginning
-#: client/helpdata.c:418
+#: client/helpdata.c:416
msgid " Rivers"
msgstr " joet"
-#: client/helpdata.c:576
+#: client/helpdata.c:574
#, c-format
msgid "Sorry, no help topic for %s.\n"
msgstr "%s: Valitettavasti tälle ei ole ohjetta.\n"
-#: client/helpdata.c:580
+#: client/helpdata.c:578
#, c-format
msgid ""
"Sorry, no help topic for %s.\n"
@@ -8269,88 +8237,87 @@ msgstr ""
"Tämä sivu on luotu automaattisesti.\n"
"\n"
-#: client/helpdata.c:670
-#, fuzzy
+#: client/helpdata.c:668
msgid ""
"Requires: Nothing\n"
"\n"
msgstr ""
-"Edellyttää perusparannuksen %s.\n"
+"Edellyttää: Ei mitään\n"
"\n"
-#: client/helpdata.c:675
+#: client/helpdata.c:673
#, c-format
msgid "* The discovery of %s will make %s obsolete.\n"
msgstr "* Kun %s keksitään, %s vanhentuu.\n"
-#: client/helpdata.c:694
+#: client/helpdata.c:692
#, c-format
msgid "* Allows all players with knowledge of %s to build %s units.\n"
msgstr "* Sallii pelaajien joilla on %s tuottaa %s-yksiköitä.\n"
-#: client/helpdata.c:706
+#: client/helpdata.c:704
#, c-format
msgid "* Allows %s (with %s).\n"
msgstr "* %s mahdollistuu (lisäksi tarvitaan %s).\n"
-#: client/helpdata.c:710
+#: client/helpdata.c:708
#, c-format
msgid "* Allows %s.\n"
msgstr "* Mahdollistaa: %s.\n"
-#: client/helpdata.c:780
-#, fuzzy, c-format
+#: client/helpdata.c:778
+#, c-format
msgid "* Can only be built if there is %s in the city.\n"
-msgstr "Et voi tutkia tätä teknologiaa."
+msgstr "* Voidaan rakentaa vain kun kaupungissa on %s.\n"
-#: client/helpdata.c:786
+#: client/helpdata.c:784
#, c-format
msgid "* Can only be built with %s as government.\n"
msgstr "* Voidaan rakentaa vain hallitusmuodolla %s.\n"
-#: client/helpdata.c:791
+#: client/helpdata.c:789
msgid "* May not be built in cities.\n"
msgstr "* Ei voida rakentaa kaupungeissa.\n"
-#: client/helpdata.c:794
+#: client/helpdata.c:792
msgid "* Never has a home city.\n"
msgstr "* Aina kotikaupungiton.\n"
-#: client/helpdata.c:797
+#: client/helpdata.c:795
msgid "* Losing this unit will lose you the game!\n"
msgstr "* Jos tämä yksikkö on menetetty, häviät pelin!\n"
-#: client/helpdata.c:801
+#: client/helpdata.c:799
msgid "* Each player may only have one of this type of unit.\n"
msgstr "* Kullakin pelaajalla voi olla vain yksi tämäntyyppinen yksikkö.\n"
-#: client/helpdata.c:805
+#: client/helpdata.c:803
#, c-format
msgid "* Requires %d population to build.\n"
msgstr "* Tuottaminen vaatii väkiluvun %d.\n"
-#: client/helpdata.c:811
-#, fuzzy, c-format
+#: client/helpdata.c:809
+#, c-format
msgid "* Can carry and refuel %d air unit.\n"
msgid_plural "* Can carry and refuel %d air units.\n"
-msgstr[0] "* Voi kantaa ja tankata %d ohjuksen.\n"
-msgstr[1] "* Voi kantaa ja tankata %d ohjusta.\n"
+msgstr[0] "* Voi kantaa ja tankata %d ilma-aluksen.\n"
+msgstr[1] "* Voi kantaa ja tankata %d ilma-alusta.\n"
-#: client/helpdata.c:816
+#: client/helpdata.c:814
#, c-format
msgid "* Can carry and refuel %d missile unit.\n"
msgid_plural "* Can carry and refuel %d missile units.\n"
msgstr[0] "* Voi kantaa ja tankata %d ohjuksen.\n"
msgstr[1] "* Voi kantaa ja tankata %d ohjusta.\n"
-#: client/helpdata.c:821
+#: client/helpdata.c:819
#, c-format
msgid "* Can carry %d ground unit across water.\n"
msgid_plural "* Can carry %d ground units across water.\n"
msgstr[0] "* Voi kuljettaa %d maayksikön veden yli.\n"
msgstr[1] "* Voi kuljettaa %d maayksikköä veden yli.\n"
-#: client/helpdata.c:830
+#: client/helpdata.c:828
msgid ""
"* Can establish trade routes (must travel to target city and must be at "
"least 9 tiles [in Manhattan distance] from this unit's home city).\n"
@@ -8359,127 +8326,127 @@ msgstr ""
"vähintään 9 ruudun päässä Manhattan-etäisyydellä (ruutujen reunoja, ei "
"diagonaaleja pitkin laskien) yksikön kotikaupungista.\n"
-#: client/helpdata.c:836
+#: client/helpdata.c:834
#, c-format
msgid "* Can help build wonders (adds %d production).\n"
msgstr "* Voi auttaa ihmeen valmistelussa (lisää %d tuotantoa).\n"
-#: client/helpdata.c:840
+#: client/helpdata.c:838
msgid "* May not be disbanded.\n"
msgstr "* Ei voida lakkauttaa.\n"
-#: client/helpdata.c:842
+#: client/helpdata.c:840
#, c-format
msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
msgstr ""
"* Voidaan lakkauttaa kaupungissa, jolloin 50%% tuotantokuluista saadaan "
"takaisin.\n"
-#: client/helpdata.c:846
+#: client/helpdata.c:844
msgid "* Can build new cities.\n"
msgstr "* Voi perustaa uusia kaupunkeja.\n"
-#: client/helpdata.c:849
+#: client/helpdata.c:847
#, c-format
msgid "* Can add on %d population to cities of no more than size %d.\n"
msgstr "* Voi lisätä %d asukasta kaupunkiin, joiden koko on korkeintaan %d.\n"
-#: client/helpdata.c:858
+#: client/helpdata.c:856
msgid "* Can build roads and railroads.\n"
msgstr "* Voi rakentaa teitä ja rautateitä.\n"
-#: client/helpdata.c:859
+#: client/helpdata.c:857
msgid "* Can build mines on tiles.\n"
msgstr "* Voi rakentaa kaivoksia ruutuihin.\n"
-#: client/helpdata.c:860
+#: client/helpdata.c:858
msgid "* Can build irrigation on tiles.\n"
msgstr "* Voi rakentaa kastelujärjestelmän ruutuihin.\n"
-#: client/helpdata.c:865
+#: client/helpdata.c:863
msgid "* Can build farmland.\n"
msgstr "* Voi rakentaa viljelysmaata.\n"
-#: client/helpdata.c:869
+#: client/helpdata.c:867
#, c-format
msgid "* Can build farmland (if %s is known).\n"
msgstr "* Voi rakentaa viljelysmaata (jos %s tunnetaan).\n"
-#: client/helpdata.c:873
+#: client/helpdata.c:871
#, c-format
msgid "* Can build farmland (if any of the following are known: %s).\n"
msgstr "* Voi rakentaa peltomaata, jos jokin seuraavista tunnetaan: %s.\n"
-#: client/helpdata.c:881
+#: client/helpdata.c:879
msgid "* Can build fortresses.\n"
msgstr "* Voi rakentaa linnakkeita.\n"
-#: client/helpdata.c:885
+#: client/helpdata.c:883
#, c-format
msgid "* Can build fortresses (if %s is known).\n"
msgstr "* Voi rakentaa linnakkeita, jos %s tunnetaan.\n"
-#: client/helpdata.c:889
+#: client/helpdata.c:887
#, c-format
msgid "* Can build fortresses (if any of the following are known: %s).\n"
msgstr "* Voi rakentaa linnakkeita, jos jokin seuraavista tunnetaan: %s.\n"
-#: client/helpdata.c:895
+#: client/helpdata.c:893
msgid "* Can clean pollution from tiles.\n"
msgstr "* Voi siivota saastetta ruuduista.\n"
-#: client/helpdata.c:896
+#: client/helpdata.c:894
msgid "* Can clean nuclear fallout from tiles.\n"
msgstr "* Voi puhdistaa ydinlaskeumaa ruuduista.\n"
-#: client/helpdata.c:899
+#: client/helpdata.c:897
msgid "* Can transform tiles.\n"
msgstr "* Voi muuntaa ruutuja.\n"
-#: client/helpdata.c:902
+#: client/helpdata.c:900
msgid "* Can build airbases.\n"
msgstr "* Voi rakentaa lentotukikohtia.\n"
-#: client/helpdata.c:906
+#: client/helpdata.c:904
#, c-format
msgid "* May fortify, granting a 50%% defensive bonus.\n"
msgstr "* Voi linnoittautua ja saada täten 50%% bonuksen puolustukseensa.\n"
-#: client/helpdata.c:909
+#: client/helpdata.c:907
msgid "* May pillage to destroy infrastructure from tiles.\n"
msgstr "* Voi turmella ruutuja, tuhoten niihin rakennettua infrastruktuuria.\n"
-#: client/helpdata.c:913
+#: client/helpdata.c:911
msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
msgstr ""
"* Pystyy normaalien diplomaattitoimien lisäksi erityisiin vakoilutehtäviin.\n"
-#: client/helpdata.c:916
+#: client/helpdata.c:914
msgid "* Can perform diplomatic actions.\n"
msgstr "* Voi hoitaa diplomaattisia tehtäviä.\n"
-#: client/helpdata.c:920
+#: client/helpdata.c:918
msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
msgstr "* Ei koskaan häviä diplomaattien välisiä taisteluja.\n"
-#: client/helpdata.c:923
+#: client/helpdata.c:921
msgid "* May not be bribed.\n"
msgstr "* Ei voida lahjoa.\n"
-#: client/helpdata.c:926
+#: client/helpdata.c:924
msgid "* Can attack enemy air units.\n"
msgstr "* Voi hyökätä vihollisen ilmavoimia vastaan.\n"
-#: client/helpdata.c:930
+#: client/helpdata.c:928
msgid "* Is invisible except when next to an enemy unit or city.\n"
msgstr ""
"* On näkymätön paitsi aivan vihollisen yksikön tai kaupungin vieressä.\n"
-#: client/helpdata.c:934
+#: client/helpdata.c:932
msgid "* Can only attack units on ocean squares (no land attacks).\n"
msgstr "* Voi hyökätä vain vesillä olevia yksiköitä vastaan (ei rannikolle).\n"
-#: client/helpdata.c:938
+#: client/helpdata.c:936
msgid ""
"* Can attack from aboard sea units: against enemy cities and onto land "
"squares.\n"
@@ -8487,43 +8454,42 @@ msgstr ""
"* Voi hyökätä suoraan alukselta maissa olevaa kohdetta tai kaupunkia "
"vastaan.\n"
-#: client/helpdata.c:943
+#: client/helpdata.c:941
#, c-format
msgid "* Can be paradropped from a friendly city (Range: %d).\n"
msgstr ""
"* Voidaan pudottaa laskuvarjolla ystävällismielisestä kaupungista "
"(toimintasäde: %d).\n"
-#: client/helpdata.c:949
+#: client/helpdata.c:947
msgid "* Gets double defense against units specified as 'mounted'.\n"
msgstr "* Kaksinkertaistaa puolustusvoimansa ratsastavia yksiköitä vastaan.\n"
-#: client/helpdata.c:953
+#: client/helpdata.c:951
msgid "* Counts as 'mounted' against certain defenders.\n"
msgstr "* Lasketaan ratsastavaksi yksiköksi tiettyjä puolustajia vastaan.\n"
-#: client/helpdata.c:957
-#, fuzzy
+#: client/helpdata.c:955
msgid "* A missile unit: gets used up in making an attack.\n"
-msgstr " * Tuhoutuu hyökkäyksessä.\n"
+msgstr "* Ohjusyksikkö: Tuhoutuu hyökkäyksessä.\n"
-#: client/helpdata.c:960
+#: client/helpdata.c:958
msgid "* Making an attack ends this unit's turn.\n"
msgstr "* Hyökkäys päättää tämän yksikön vuoron.\n"
-#: client/helpdata.c:964
+#: client/helpdata.c:962
msgid "* This unit's attack causes a nuclear explosion!\n"
msgstr "* Tällä yksiköllä hyökkääminen aiheuttaa ydinräjähdyksen!\n"
-#: client/helpdata.c:968
+#: client/helpdata.c:966
msgid "* Gets double firepower when attacking cities.\n"
msgstr "* Saa kaksinkertaisen tulivoiman kaupunkeja vastaan.\n"
-#: client/helpdata.c:971
+#: client/helpdata.c:969
msgid "* Ignores the effects of city walls.\n"
msgstr "* Ei piittaa kaupunginmuureista.\n"
-#: client/helpdata.c:975
+#: client/helpdata.c:973
#, c-format
msgid ""
"* Does bombard attacks (%d per turn). These attacks will only damage (never "
@@ -8533,38 +8499,38 @@ msgstr ""
"vain aiheuttaa vahinkoa (eivät ole kuolemaksi) puolustajalle ja ne ovat "
"hyökkääjän kannalta riskittömiä.\n"
-#: client/helpdata.c:982
+#: client/helpdata.c:980
msgid "* Gets quintuple defense against missiles and aircraft.\n"
msgstr "* Saa viisinkertaisen puolustustehon kaikkea lentävää vastaan.\n"
-#: client/helpdata.c:986
+#: client/helpdata.c:984
msgid "* Ignores terrain effects (treats all squares as roads).\n"
msgstr "* On kotonaan maastossa kuin maastossa (kulkee kuten tiellä).\n"
-#: client/helpdata.c:989
+#: client/helpdata.c:987
msgid "* Ignores zones of control.\n"
msgstr "* Ei piittaa valvonta-alueista.\n"
-#: client/helpdata.c:993
+#: client/helpdata.c:991
msgid "* A non-military unit (cannot attack; no martial law).\n"
msgstr "* Siviiliyksikkö (ei voi hyökätä; ei 'sotalakeja').\n"
-#: client/helpdata.c:997
+#: client/helpdata.c:995
msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
msgstr ""
"* Hyökkäysase: aiheuttaa tyytymättömyyttä vaikkei olisikaan aggressiivinen.\n"
-#: client/helpdata.c:1000
+#: client/helpdata.c:998
msgid "* Will never achieve veteran status.\n"
msgstr "* Ei koskaan muutu konkariksi.\n"
-#: client/helpdata.c:1002
+#: client/helpdata.c:1000
msgid "* May become veteran through training or combat.\n"
msgstr ""
"* Voi oppia konkariksi kerättyään kokemusta koulutuksen tai taistelun "
"kautta.\n"
-#: client/helpdata.c:1008
+#: client/helpdata.c:1006
#, c-format
msgid ""
"* Must end turn in a city or next to land, or has a 50%% risk of being lost "
@@ -8573,12 +8539,12 @@ msgstr ""
"* Joutuu päättämään vuoronsa kaupunkiin tai rannikon läheisyyteen, tai "
"katoaa merelle 50%% todennäköisyydellä.\n"
-#: client/helpdata.c:1012
+#: client/helpdata.c:1010
#, c-format
msgid "* The discovery of %s reduces the risk to 25%%.\n"
msgstr "* Kun %s on tunnettu, riski pienenee 25%%:ksi.\n"
-#: client/helpdata.c:1017
+#: client/helpdata.c:1015
#, c-format
msgid "* %s reduces the risk to 12%%.\n"
msgstr "* %s vähentää riskin 12%%:iin.\n"
@@ -8587,15 +8553,15 @@ msgstr "* %s vähentää riskin 12%%:iin.\n"
#. * last two elements
#. TRANS: List of possible output types has this between
#. * last two elements
-#: client/helpdata.c:1068 client/helpdata.c:1402
+#: client/helpdata.c:1066 client/helpdata.c:1400
msgid " or "
msgstr " tai "
-#: client/helpdata.c:1070 client/helpdata.c:1390
+#: client/helpdata.c:1068 client/helpdata.c:1388
msgid "?or:, "
msgstr ", "
-#: client/helpdata.c:1082
+#: 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"
@@ -8604,12 +8570,12 @@ msgstr[0] ""
msgstr[1] ""
"* Yksikön tulee olla kaupungissa (%s riittää myös) %d vuoron jälkeen.\n"
-#: client/helpdata.c:1124
+#: client/helpdata.c:1122
#, 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:1129
+#: client/helpdata.c:1127
#, c-format
msgid ""
"To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8618,91 +8584,91 @@ msgstr ""
"Jotta %s saavutettaisiin, %d muuta teknologiaa pitää keksiä ensin. Koko "
"projekti vaatii %d lamppua."
-#: client/helpdata.c:1137
+#: client/helpdata.c:1135
msgid "You cannot research this technology."
msgstr "Et voi tutkia tätä teknologiaa."
-#: client/helpdata.c:1141
+#: client/helpdata.c:1139
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:1153
+#: client/helpdata.c:1151
#, 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:1158
+#: client/helpdata.c:1156
#, 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:1161
+#: client/helpdata.c:1159
#, 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:1165
+#: client/helpdata.c:1163
msgid "* Increases the pollution generated by the population.\n"
msgstr "* Lisää väestön aiheuttamaa saastumista.\n"
-#: client/helpdata.c:1170
+#: client/helpdata.c:1168
#, 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:1177
+#: client/helpdata.c:1175
#, c-format
msgid "* Allows %s to build fortresses.\n"
msgstr "* Sallii %s-yksiköiden rakentaa linnakkeita.\n"
-#: client/helpdata.c:1185
+#: client/helpdata.c:1183
#, c-format
msgid "* Allows %s to build airbases.\n"
msgstr "* Sallii %s-yksiköiden rakentaa lentotukikohtia.\n"
-#: client/helpdata.c:1194
+#: client/helpdata.c:1192
#, c-format
msgid "* Allows %s to upgrade roads to railroads.\n"
msgstr "* Sallii %s-yksiköiden parantaa tiet rautateiksi.\n"
-#: client/helpdata.c:1202
+#: client/helpdata.c:1200
#, c-format
msgid "* Allows %s to upgrade irrigation to farmland.\n"
msgstr "* Mahdollistaa %s-yksiköille kastellun maan muuttamisen pelloksi.\n"
-#: client/helpdata.c:1236
+#: client/helpdata.c:1234
msgid "* Pollution cannot be generated on this terrain."
msgstr "* Tälle maastotyypille ei voi kehittyä saastetta."
-#: client/helpdata.c:1241
+#: client/helpdata.c:1239
msgid "* You cannot build cities on this terrain."
msgstr "* Tälle maastotyypille ei voi rakentaa kaupunkeja."
-#: client/helpdata.c:1247
+#: client/helpdata.c:1245
msgid "* The coastline of this terrain is unsafe."
msgstr "* Tämä maastotyypin rannikko on turvaton."
-#: client/helpdata.c:1252
+#: client/helpdata.c:1250
msgid "* This terrain is unsafe for units to travel on."
msgstr "* Yksiköiden ei ole turvallista kulkea tällä maastotyypillä."
-#: client/helpdata.c:1257
+#: client/helpdata.c:1255
msgid "* Land units cannot travel on oceanic terrains."
msgstr "* Maayksiköt eivät voi kulkea merellisillä maastotyypeillä."
-#: client/helpdata.c:1307
+#: client/helpdata.c:1305
msgid "Features:\n"
msgstr "Ominaisuuksia:\n"
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1413 client/helpdata.c:1414
+#: client/helpdata.c:1411 client/helpdata.c:1412
msgid "?outputlist: Nothing "
-msgstr ""
+msgstr "Ei mitään "
-#: client/helpdata.c:1421
-#, fuzzy, c-format
+#: client/helpdata.c:1419
+#, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
"become unhappy.\n"
@@ -8710,13 +8676,13 @@ msgid_plural ""
"* Military units away from home and field units will cause %d citizens to "
"become unhappy.\n"
msgstr[0] ""
-"* Poissa kotoa olevat sotilasyksiköt ja kenttäyksiköt tekevät %d asukasta "
+"* Poissa kotoa olevat sotilasyksiköt ja kenttäyksiköt tekevät %d asukkaan "
"tyytymättömäksi.\n"
msgstr[1] ""
"* Poissa kotoa olevat sotilasyksiköt ja kenttäyksiköt tekevät %d asukasta "
"tyytymättömäksi.\n"
-#: client/helpdata.c:1431
+#: client/helpdata.c:1429
#, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8726,30 +8692,30 @@ msgstr ""
"muuten aiheuttaisivat.\n"
#. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1439
+#: client/helpdata.c:1437
#, 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:1444
+#: client/helpdata.c:1442
#, 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:1449
+#: client/helpdata.c:1447
#, c-format
msgid "* You pay no %s upkeep for your units.\n"
-msgstr ""
+msgstr "* Yksikköjen ylläpito ei maksa yhtään %s.\n"
-#: client/helpdata.c:1453
+#: client/helpdata.c:1451
msgid "* You pay no upkeep for your units.\n"
-msgstr ""
+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:1462
+#: client/helpdata.c:1460
#, c-format
msgid "* Each of your cities will avoid paying %d %s towards unit upkeep.\n"
msgstr ""
@@ -8758,18 +8724,18 @@ msgstr ""
#. TRANS: Amount is subtracted from upkeep cost
#. * for each upkeep type.
-#: client/helpdata.c:1470
+#: client/helpdata.c:1468
#, 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:1477
+#: client/helpdata.c:1475
#, 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:1484
+#: client/helpdata.c:1482
#, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -8779,8 +8745,8 @@ msgstr ""
"kaupunkiin kun sinulla on niitä %d.\n"
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1491
-#, fuzzy, c-format
+#: client/helpdata.c:1489
+#, c-format
msgid ""
"* After the first unhappy citizen due to city size, for each %d additional "
"cities, another unhappy citizen will appear.\n"
@@ -8788,17 +8754,17 @@ 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:1499
+#: client/helpdata.c:1497
#, 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:1504
+#: client/helpdata.c:1502
msgid "Has unlimited science/gold/luxuries rates.\n"
msgstr "Tieteen/veron/luksuksen osuuksia ei ole rajoitettu.\n"
-#: client/helpdata.c:1509
-#, fuzzy, c-format
+#: client/helpdata.c:1507
+#, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
"force %d unhappy citizen to become content.\n"
@@ -8806,25 +8772,25 @@ msgid_plural ""
"* Your units may impose martial law. Each military unit inside a city will "
"force %d unhappy citizens to become content.\n"
msgstr[0] ""
-"* Yksikkösi voivat osallistua sotilashallintoon. Kukin sotayksikkö "
-"kaupungissa pakottaa %d tyytymätöntä asukasta tyytyväiseksi.\n"
+"* Yksikkösi voivat ylläpitää sotilashallintoa. Kukin sotayksikkö kaupungissa "
+"pakottaa %d tyytymättömän asukkaan tyytyväiseksi.\n"
msgstr[1] ""
-"* Yksikkösi voivat osallistua sotilashallintoon. Kukin sotayksikkö "
-"kaupungissa pakottaa %d tyytymätöntä asukasta tyytyväiseksi.\n"
+"* Yksikkösi voivat ylläpitää sotilashallintoa. Kukin sotayksikkö kaupungissa "
+"pakottaa %d tyytymätöntä asukasta tyytyväiseksi.\n"
-#: client/helpdata.c:1521
-#, fuzzy, c-format
+#: client/helpdata.c:1519
+#, 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] ""
-"* Korkeintaan %d yksikköä voi osallistua sotilashallintoon kussakin "
+"* Korkeintaan %d yksikkö voi osallistua sotilashallintoon kussakin "
"kaupungissa.\n"
msgstr[1] ""
"* Korkeintaan %d yksikköä voi osallistua sotilashallintoon kussakin "
"kaupungissa.\n"
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1532
+#: client/helpdata.c:1530
#, c-format
msgid ""
"* You may grow your cities by means of celebrations. Your cities must be at "
@@ -8833,32 +8799,32 @@ 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:1538
+#: client/helpdata.c:1536
msgid "* Your units cannot be bribed.\n"
msgstr "* Yksikköjäsi ei voi lahjoa.\n"
-#: client/helpdata.c:1541
+#: client/helpdata.c:1539
msgid "* Your cities cannot be incited.\n"
msgstr "* Kaupungeissasi ei voi lietsoa kapinaa.\n"
-#: client/helpdata.c:1545
+#: client/helpdata.c:1543
msgid ""
"* Government will fall into anarchy if any city is in disorder for more than "
"two turns in a row.\n"
msgstr ""
-"* Hallitusmuoto muuttuu anarkiaksi jos mikään kaupunki on rauhaton enemmän "
+"* Hallintomuoto muuttuu anarkiaksi jos mikään kaupunki on rauhaton enemmän "
"kuin kaksi vuoroa peräkkäin.\n"
-#: client/helpdata.c:1551
+#: client/helpdata.c:1549
msgid "* Has a senate that may prevent declaration of war.\n"
-msgstr "* Hallitusmuotoon kuuluva edustajisto voi estää sodanjulistuksen.\n"
+msgstr "* Hallintomuotoon kuuluva edustajisto voi estää sodanjulistuksen.\n"
-#: client/helpdata.c:1555
+#: client/helpdata.c:1553
msgid "* Allows partisans when cities are taken by the enemy.\n"
msgstr ""
"* Mahdollistaa partisaanien vastustuksen kun vihollinen valtaa kaupungin.\n"
-#: client/helpdata.c:1559
+#: client/helpdata.c:1557
msgid ""
"* Buildings that normally confer bonuses against unhappiness will instead "
"give gold.\n"
@@ -8866,149 +8832,154 @@ msgstr ""
"* Rakennukset jotka tavallisesti poistavat tyytymättömyyttä tuottavat sen "
"sijaan rahaa.\n"
-#: client/helpdata.c:1563
+#: client/helpdata.c:1561
msgid "* Pays no upkeep for fanatics.\n"
msgstr "* Fanaatikkojen ylläpito ei maksa mitään.\n"
-#: client/helpdata.c:1566
+#: client/helpdata.c:1564
msgid "* Has no unhappy citizens.\n"
msgstr "* Tyytymättömiä asukkaita ei ole.\n"
-#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
+#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
#, c-format
msgid "* Veteran %s units.\n"
msgstr "* Tekee %s yksiköstä konkareita.\n"
-#: client/helpdata.c:1587
+#: client/helpdata.c:1585
msgid "* Veteran units.\n"
msgstr "* Tekee yksiköistä konkareita.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1593
+#: client/helpdata.c:1591
#, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
"not celebrating.\n"
msgstr ""
+"* Jokainen työstetty ruutu joka antaa yli %d x %s kärsii -1 yksikön kokoisen "
+"leikkauksen kun kaupunki ei juhli.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1602
+#: client/helpdata.c:1600
#, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
"celebrating.\n"
msgstr ""
+"* Jokainen työstetty ruutu josta saadaan vähintään 1 x %s tuottaa %d "
+"yksikköä lisää kun kaupunki juhlii.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1610
+#: client/helpdata.c:1608
#, c-format
msgid "* Each worked tile with at least 1 %s will yield %d more of it.\n"
msgstr ""
+"* Jokainen työstetty ruutu josta saadaan vähintään 1 x %s tuottaa %d "
+"yksikköä lisää.\n"
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1619
+#: client/helpdata.c:1617
#, c-format
msgid "* %s production is increased %d%%.\n"
-msgstr ""
+msgstr "* %stuotanto lisääntyy %d%%.\n"
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1627
+#: client/helpdata.c:1625
#, 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:1632
+#: client/helpdata.c:1630
#, 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:1637
+#: client/helpdata.c:1635
#, 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:1645
+#: client/helpdata.c:1643
#, 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:1651
+#: client/helpdata.c:1649
#, 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:1657
+#: client/helpdata.c:1655
#, 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:1674
+#: client/helpdata.c:1672
#, 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:1701
+#: client/helpdata.c:1699
#, c-format
msgid "%s%d %s"
msgstr "%s%d %s"
-#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1700 client/helpdata.c:1708 client/gui-sdl/mapview.c:810
#: client/gui-sdl/mapview.c:816 client/gui-sdl/mapview.c:822
-#, fuzzy
msgid "?blistmore:, "
msgstr ", "
#. TRANS: "2 unhappy" or ", 1 unhappy"
-#: client/helpdata.c:1709
+#: client/helpdata.c:1707
#, c-format
msgid "%s%d unhappy"
msgstr "%s%d tyytymätöntä"
-#: client/mapctrl_common.c:382
+#: client/mapctrl_common.c:399
#, c-format
msgid "You don't know how to build %s!"
msgstr "Et tiedä miten %s rakennetaan!"
-#: client/mapctrl_common.c:392
+#: client/mapctrl_common.c:409
#, c-format
msgid "Copy %s to clipboard."
msgstr "Kopioi %s leikepöydälle."
-#: client/mapctrl_common.c:408
+#: client/mapctrl_common.c:425
msgid "Clipboard is empty."
msgstr "Leikepöytä on tyhjä."
-#: client/options.c:98
+#: client/options.c:102
msgid "Graphics"
msgstr "Grafiikka"
-#: client/options.c:99
+#: client/options.c:103
msgid "Overview"
msgstr "Yleiskuva"
-#: client/options.c:100
+#: client/options.c:104
msgid "Sound"
msgstr "Ääni"
-#: client/options.c:101
+#: client/options.c:105
msgid "Interface"
msgstr "Käyttöliittymä"
-#: client/options.c:102
+#: client/options.c:106
msgid "Network"
msgstr "Verkko"
-#: client/options.c:107
+#: client/options.c:111
msgid "Login name"
msgstr "Käyttäjätunnus"
-#: client/options.c:108
+#: client/options.c:112
msgid ""
"This is the default login username that will be used in the connection "
"dialogs or with the -a command-line parameter."
@@ -9016,11 +8987,11 @@ msgstr ""
"Tätä käyttäjätunnusta käytetään oletuksena yhteysdialogeissa tai "
"komentoriviparametrin -a kanssa."
-#: client/options.c:113
+#: client/options.c:117
msgid "Server"
msgstr "Palvelin"
-#: client/options.c:114
+#: client/options.c:118
msgid ""
"This is the default server hostname that will be used in the connection "
"dialogs or with the -a command-line parameter."
@@ -9028,11 +8999,11 @@ msgstr ""
"Tätä palvelinosoitetta käytetään oletuksena yhteysdialogeissa tai "
"komentoriviparametrin -a kanssa."
-#: client/options.c:119
+#: client/options.c:123
msgid "Server port"
msgstr "Palvelimen portti"
-#: client/options.c:120
+#: client/options.c:124
msgid ""
"This is the default server port that will be used in the connection dialogs "
"or with the -a command-line parameter."
@@ -9040,11 +9011,11 @@ msgstr ""
"Tämä on palvelimen portti jota käytetään oletuksena yhteysdialogeissa tai "
"komentoriviparametrin -a kanssa."
-#: client/options.c:125 client/gui-win32/connectdlg.c:912 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
msgid "Metaserver"
msgstr "Välipalvelin"
-#: client/options.c:126
+#: client/options.c:130
msgid ""
"The metaserver is a host that the client contacts to find out about games on "
"the internet. Don't change this from its default value unless you know what "
@@ -9054,11 +9025,11 @@ msgstr ""
"käynnissä olevista peleistä Internetissä. Älä muuta tätä oletusarvoa ellet "
"tiedä tarkkaan mitä olet tekemässä."
-#: client/options.c:132
+#: client/options.c:136
msgid "Soundset"
msgstr "Äänistö"
-#: client/options.c:133
+#: client/options.c:137
msgid ""
"This is the soundset that will be used. Changing this is the same as using "
"the -S command-line parameter."
@@ -9066,11 +9037,11 @@ msgstr ""
"Tämä on käytettävä äänistö. Asetuksen muuttamisella on sama vaikutus kuin "
"komentoriviparametrin -S käytöllä."
-#: client/options.c:138
+#: client/options.c:142
msgid "Sound plugin"
msgstr "Ääniliitännäinen"
-#: client/options.c:139
+#: client/options.c:143
msgid ""
"If you have a problem with sound, try changing the sound plugin. The new "
"plugin won't take effect until you restart Freeciv. Changing this is the "
@@ -9081,19 +9052,19 @@ msgstr ""
"Asetuksen muuttamisella on sama vaikutus kuin komentoriviparametrin -P "
"käytöllä."
-#: client/options.c:144 client/gui-sdl/gui_main.c:162
+#: client/options.c:148 client/gui-sdl/gui_main.c:162
msgid "Theme"
msgstr "Teema"
-#: client/options.c:145
+#: client/options.c:149
msgid "By changing this option you change the active theme."
-msgstr ""
+msgstr "Tämän asetuksen kautta voit vaihtaa käytössä olevaa teemaa."
-#: client/options.c:148
+#: client/options.c:152
msgid "Tileset"
msgstr "Ruutuasetus"
-#: client/options.c:149
+#: client/options.c:153
msgid ""
"By changing this option you change the active tileset. This is the same as "
"using the -t command-line parameter."
@@ -9101,11 +9072,11 @@ msgstr ""
"Tämän asetuksen muutos vaihtaa käytössä olevaa ruudustoa, ja sen vaikutus on "
"sama kuin komentoriviparametrin -t käytöllä."
-#: client/options.c:156
+#: client/options.c:160
msgid "Solid unit background color"
msgstr "Yksivärinen yksikön tausta"
-#: client/options.c:157
+#: client/options.c:161
msgid ""
"Setting this option will cause units on the map view to be drawn with a "
"solid background color instead of the flag backdrop."
@@ -9113,11 +9084,11 @@ msgstr ""
"Jos tämä asetus on käytössä, yksiköt karttanäkymässä piirretään tasaisen "
"yksivärisellä taustalla lipputaustan sijaan."
-#: client/options.c:161 client/gui-sdl/optiondlg.c:960
+#: client/options.c:165 client/gui-sdl/optiondlg.c:960
msgid "Sound bell at new turn"
msgstr "Merkkiääni pelivuoron vaihtuessa"
-#: client/options.c:162
+#: client/options.c:166
msgid ""
"Set this option to have a \"bell\" event be generated at the start of a new "
"turn. You can control the behavior of the \"bell\" event by editing the "
@@ -9126,11 +9097,11 @@ msgstr ""
"Jos tämä asetus on käytössä, kellotapahtuma luodaan uuden vuoron alkuun. "
"Kellon vaikutukseen voidaan vaikuttaa viestiasetusten kautta."
-#: client/options.c:168
+#: client/options.c:172
msgid "Unit movement animation time (milliseconds)"
msgstr "Yksikön liikkeen animointiaika millisekunneissa"
-#: client/options.c:169
+#: client/options.c:173
msgid ""
"This option controls how long unit \"animation\" takes when a unit moves on "
"the map view. Set it to 0 to disable animation entirely."
@@ -9138,11 +9109,11 @@ msgstr ""
"Tämä asetus hallinnoi miten pitkään yksikön siirron \"animointi\" kestää sen "
"liikkuessa karttanäkymällä. Jos asetus on 0, animointia ei käytetä lainkaan."
-#: client/options.c:174
+#: client/options.c:178
msgid "Mapview recentering time (milliseconds)"
msgstr "Karttanäkymän uudelleenkeskittämisen aika millisekunneissa"
-#: client/options.c:175
+#: client/options.c:179
msgid ""
"When the map view is recentered, it will slide smoothly over the map to its "
"new position. This option controls how long this slide lasts. Set it to 0 "
@@ -9152,11 +9123,11 @@ msgstr ""
"lähtöpisteestä kohteeseen. Tämä asetus määrittää siirtymän keston; jos arvo "
"on 0, siirtymä on välitön."
-#: client/options.c:180 client/gui-sdl/optiondlg.c:1014
+#: client/options.c:184 client/gui-sdl/optiondlg.c:1014
msgid "Show combat animation"
msgstr "Näytä taisteluanimaatio"
-#: client/options.c:181
+#: client/options.c:185
msgid ""
"Disabling this option will turn off combat animation between units on the "
"mapview."
@@ -9164,11 +9135,11 @@ msgstr ""
"Tämä asetus määrittää, animoidaanko yksiköiden väliset taistelut "
"karttanäkymässä."
-#: client/options.c:184
+#: client/options.c:188
msgid "Draw the citybar"
msgstr "Piirrä kaupunkipalkki"
-#: client/options.c:185
+#: client/options.c:189
msgid ""
"Setting this option will display a 'citybar' containing useful information "
"beneath each city. Disabling this option will display only the city's name "
@@ -9178,11 +9149,11 @@ msgstr ""
"kaupunkipalkki kunkin kaupungin alapuolella. Jos asetus on pois käytöstä, "
"vain kaupungin nimi ja mahdollisesti sen tuotanto näytetään."
-#: client/options.c:191
+#: client/options.c:195
msgid "Show icons in the technology tree"
msgstr "Näytä kuvakkeet teknologiapuussa"
-#: client/options.c:192
+#: client/options.c:196
msgid ""
"Setting this option will display icons on the technology tree diagram. "
"Turning this option off makes the technology tree more compact."
@@ -9190,11 +9161,11 @@ msgstr ""
"Kun tämä asetus on päällä, teknologiapuukaaviossa näytetään kuvakkeet. "
"Asetuksen säätäminen pois päältä saa puun mahtumaan pienempään tilaan."
-#: client/options.c:197
+#: client/options.c:201
msgid "Draw shield graphics for units"
msgstr "Piirrä kilpikuvio yksiköille"
-#: client/options.c:198
+#: client/options.c:202
msgid ""
"Setting this option will draw a shield icon as the flags on units. If "
"unset, the full flag will be drawn."
@@ -9202,11 +9173,11 @@ msgstr ""
"Jos asetus on päällä, kilpikuvat piirretään yksiköiden lippujen sijaan. Jos "
"asetus on pois päältä, yksikölle piirretään koko lippu."
-#: client/options.c:202
+#: client/options.c:206
msgid "Manual Turn Done in AI Mode"
msgstr "Vuoron päättäminen käsin AI-moodissa"
-#: client/options.c:203
+#: client/options.c:207
msgid ""
"Disable this option if you do not want to press the Turn Done button "
"manually when watching an AI player."
@@ -9214,11 +9185,11 @@ msgstr ""
"Jos tämä asetus on pois päältä, sinun ei tarvitse painaa vuoron päättämisen "
"nappia käsin seuratessasi AI-pelaajaa."
-#: client/options.c:207 client/gui-sdl/optiondlg.c:1121
+#: client/options.c:211 client/gui-sdl/optiondlg.c:1121
msgid "Auto Center on Units"
msgstr "Keskitä yksiköihin automaattisesti"
-#: client/options.c:208
+#: client/options.c:212
msgid ""
"Set this option to have the active unit centered automatically when the unit "
"focus changes."
@@ -9226,11 +9197,11 @@ msgstr ""
"Jos tämä asetus on päällä, kartta keskitetään yksikköön automaattisesti kun "
"se tulee aktiiviseksi."
-#: client/options.c:211 client/gui-sdl/optiondlg.c:1147
+#: client/options.c:215 client/gui-sdl/optiondlg.c:1147
msgid "Auto Center on Combat"
msgstr "Keskitä taisteluihin automaattisesti"
-#: client/options.c:212
+#: client/options.c:216
msgid ""
"Set this option to have any combat be centered automatically. Disabled this "
"will speed up the time between turns but may cause you to miss combat "
@@ -9240,21 +9211,21 @@ msgstr ""
"Jos asetus on pois päältä, vuorojen välinen aika kuluu nopeammin, mutta "
"taistelut voivat jäädä täysin huomaamatta."
-#: client/options.c:217 client/gui-sdl/optiondlg.c:1174
+#: client/options.c:221 client/gui-sdl/optiondlg.c:1174
msgid "Focus on Awakened Units"
msgstr "Keskitä heränneisiin yksiköihin"
-#: client/options.c:218
+#: client/options.c:222
msgid "Set this option to have newly awoken units be focused automatically."
msgstr ""
"Jos tämä asetus on päällä, kartta keskitetään juuri heränneisiin yksiköihin "
"automaattisesti."
-#: client/options.c:221
+#: client/options.c:225
msgid "Allow goto into the unknown"
msgstr "Salli meno tuntemattomaan."
-#: client/options.c:222
+#: client/options.c:226
msgid ""
"Setting this option will make the game consider moving into unknown tiles. "
"If not, then goto routes will detour around or be blocked by unknown tiles."
@@ -9263,11 +9234,11 @@ msgstr ""
"siirtymistä. Jos asetus on pois päältä, mene-komennon reitti kiertää "
"tuntemattomat ruudut tai pysähtyy niiden reunalle."
-#: client/options.c:226
+#: client/options.c:230
msgid "Center map when Popup city"
msgstr "Keskitä kartta kaupungin tietoja katseltaessa"
-#: client/options.c:227
+#: client/options.c:231
msgid ""
"Setting this option makes the mapview center on a city when its city dialog "
"is popped up."
@@ -9275,11 +9246,11 @@ msgstr ""
"Jos asetus on päällä, kartta keskitetään kaupunkiin kun kaupunki-ikkuna "
"avataan."
-#: client/options.c:230
+#: client/options.c:234
msgid "Concise City Production"
msgstr "Supista kaupungin tuotantokuvaus"
-#: client/options.c:231
+#: client/options.c:235
msgid ""
"Set this option to make the city production (as shown in the city dialog) to "
"be more compact."
@@ -9287,11 +9258,11 @@ msgstr ""
"Jos tämä asetus on päällä, kaupungin tuotanto kaupunki-ikkunassa esitetään "
"tiiviimmin."
-#: client/options.c:234 client/gui-sdl/optiondlg.c:1252
+#: client/options.c:238 client/gui-sdl/optiondlg.c:1252
msgid "End Turn when done moving"
msgstr "Päätä pelivuoro kun kaikkia yksiköitä on liikutettu"
-#: client/options.c:235
+#: client/options.c:239
msgid ""
"Setting this option makes your turn end automatically when all your units "
"are done moving."
@@ -9299,11 +9270,11 @@ msgstr ""
"Jos tämä asetus on päällä, vuorosi päättyy automaattisesti kun kaikkia "
"yksiköitä on liikutettu."
-#: client/options.c:238 client/gui-sdl/optiondlg.c:1226
+#: client/options.c:242 client/gui-sdl/optiondlg.c:1226
msgid "Prompt for city names"
msgstr "Kysy kaupunkien nimiä"
-#: client/options.c:239
+#: client/options.c:243
msgid ""
"Disabling this option will make the names of newly founded cities chosen "
"automatically by the server."
@@ -9311,11 +9282,11 @@ msgstr ""
"Jos tämä asetus on pois päältä, palvelin valitsee perustamiesi kaupunkien "
"nimet puolestasi."
-#: client/options.c:242 client/gui-sdl/optiondlg.c:1200
+#: client/options.c:246 client/gui-sdl/optiondlg.c:1200
msgid "Pop up city dialog for new cities"
msgstr "Avaa kaupunki-ikkuna uusille kaupungeille"
-#: client/options.c:243
+#: client/options.c:247
msgid ""
"Setting this option will pop up a newly-founded city's city dialog "
"automatically."
@@ -9323,83 +9294,134 @@ msgstr ""
"Jos asetus on päällä, kaupunkia perustettaessa kaupunki-ikkuna avautuu "
"automaattisesti."
-#: client/options.c:248
+#: client/options.c:250
+#, fuzzy
+msgid "Pop up caravan actions"
+msgstr "Karavaanitapahtumat"
+
+#: client/options.c:251
+msgid ""
+"If this option is enabled, when caravans arrive at a city where they can "
+"establish a traderoute or help build a wonder, a window will popup asking "
+"which action should be performed. Disabling this option means you will have "
+"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 ""
+
+#: client/options.c:260
+msgid "Enable cursor changing"
+msgstr "Salli kohdistimen muuttuminen"
+
+#: client/options.c:261
+msgid ""
+"This option controls whether the client should try to change the mouse "
+"cursor depending on what is being pointed at, as well as to indicate changes "
+"in the client or server state."
+msgstr ""
+"Tämä asetus määrittää, pitäisikö asiakasohjelman yrittää muuttaa hiiren "
+"kohdistinta toisaalta sen mukaan mitä sillä osoitetaan, ja toisaalta "
+"asiakas- tai palvelinohjelmien tilan muutosten havainnollistamiseksi."
+
+#: client/options.c:266
+msgid "Select cities before units"
+msgstr "Valitse kaupungit ennen yksiköitä"
+
+#: 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 ""
+"Jos tämä asetus on valittuna ja valintaruudun sisällä on sekä kaupunkeja "
+"että yksiköitä, vain kaupungit valitaan."
+
+#: client/options.c:272
+msgid "Clear unit orders on selection"
+msgstr ""
+
+#: client/options.c:273
+msgid ""
+"Enabling this option will cause unit orders to be cleared whenever one or "
+"more units are selected. If this option is disabled, selecting units will "
+"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 ""
+
+#: client/options.c:282
msgid "Background layer"
msgstr "Taustakerros"
-#: client/options.c:249
+#: client/options.c:283
msgid "The background layer of the overview shows just ocean and land."
msgstr "Yleiskuvan taustakerros näyttää vain meren ja maan."
-#: client/options.c:252
+#: client/options.c:286
msgid "Terrain relief map layer"
msgstr "Maastokarttakerros"
-#: client/options.c:253
+#: client/options.c:287
msgid "The relief layer shows all terrains on the map."
msgstr "Maastokerros näyttää maastotyypit kartalla."
-#: client/options.c:256
+#: client/options.c:290
msgid "Borders layer"
msgstr "Rajakerros"
-#: client/options.c:257
+#: client/options.c:291
msgid ""
"The borders layer of the overview shows which tiles are owned by each player."
msgstr "Rajakerros näyttää, mitkä ruudut omistaa mikäkin pelaaja."
-#: client/options.c:261
+#: client/options.c:295
msgid "Units layer"
msgstr "Yksikkökerros"
-#: client/options.c:262
+#: client/options.c:296
msgid "Enabling this will draw units on the overview."
msgstr "Yksikkökerros näyttää yksiköiden sijainnin kartalla."
-#: client/options.c:265
+#: client/options.c:299
msgid "Cities layer"
msgstr "Kaupunkikerros"
-#: client/options.c:266
+#: client/options.c:300
msgid "Enabling this will draw cities on the overview."
msgstr "Kaupunkikerros näyttää kaupunkien sijainnin kartalla."
-#: client/options.c:269
+#: client/options.c:303
msgid "Overview fog of war"
msgstr "Yleiskatsauksen näkyvyysrajat"
-#: client/options.c:270
+#: client/options.c:304
msgid "Enabling this will show fog of war on the overview."
msgstr ""
"Jos tämä asetus on käytössä, näkyvyysrajat näytetään yleiskatsauksessa."
-#: client/options.c:488
+#: client/options.c:526
msgid "If you add a preset by hand, also update \"number_of_presets\""
msgstr ""
"Jos lisäät toimintamallin käsin, päivitä myös arvoa \"number_of_presets\""
-#: client/options.c:516
+#: client/options.c:554
msgid "Cannot find your home directory"
msgstr "Kotihakemistoasi ei löydy"
-#: client/options.c:665 client/options.c:796
+#: client/options.c:703 client/options.c:834
msgid "Save failed, cannot find a filename."
msgstr "Tallennus epäonnistui, tiedostonimeä ei löydy."
-#: client/options.c:678 client/options.c:859
+#: client/options.c:716 client/options.c:897
#, c-format
msgid "Save failed, cannot write to file %s"
msgstr "Tallennus epäonnistui, tiedostoon %s ei voi kirjoittaa"
-#: client/options.c:680 client/options.c:862
+#: client/options.c:718 client/options.c:900
#, c-format
msgid "Saved settings to file %s"
msgstr "Asetukset tallennettu tiedostoon %s"
#: client/packhand.c:211 client/packhand.c:217
-#, fuzzy
msgid "You were rejected from the game...."
-msgstr "Sinut poistettiin pelistä:"
+msgstr "Sinut poistettiin pelistä..."
#: client/packhand.c:229
#, c-format
@@ -9416,16 +9438,16 @@ msgstr "Palvelimen toimintomuuttuja: %s"
msgid "Start of turn %d"
msgstr "Vuoron %d alku"
-#: client/packhand.c:1590
+#: client/packhand.c:1591
#, c-format
msgid "AI Mode is now %s."
msgstr "AI-moodi on nyt %s."
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "ON"
msgstr "päällä"
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "OFF"
msgstr "pois päältä"
@@ -9457,14 +9479,15 @@ 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:2085
+#: client/gui-gtk-2.0/pages.c:2157
msgid "Flag"
msgstr "Lippu"
#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
-#: client/gui-gtk-2.0/pages.c:1536 client/gui-gtk-2.0/pages.c:2087
-#: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
-#: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
+#: 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/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr "Kansakunta"
@@ -9476,7 +9499,7 @@ msgstr "Raja"
msgid "Score"
msgstr "Pisteet"
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
msgid "Team"
msgstr "Joukkue"
@@ -9547,278 +9570,304 @@ msgstr "Yhtään %s-yksikköä ei voitu lakkauttaa."
msgid "Could not open temp file."
msgstr "Väliaikaistiedoston avaaminen epäonnistui."
-#: client/servers.c:407
+#: client/servers.c:410
msgid "Invalid $http_proxy or metaserver value, must start with 'http://'"
msgstr ""
"Epätäydellinen $http_proxy- tai metapalvelinarvo, alussa on oltava 'http://'"
-#: client/servers.c:413
+#: client/servers.c:416
msgid "Failed looking up metaserver's host"
msgstr "Metapalvelinta ei löytynyt"
-#: client/text.c:85 client/text.c:86 client/text.c:91
+#. TRANS: "AI <player name>"
+#: client/text.c:94
+#, c-format
+msgid "AI %s"
+msgstr ""
+
+#. TRANS: "<nation adjective>, team <team name>"
+#: client/text.c:118
+#, fuzzy, c-format
+msgid "%s, team %s"
+msgstr ", joukkue %s"
+
+#: client/text.c:135 client/text.c:136 client/text.c:141
#: client/gui-sdl/mapview.c:752
msgid "?nation:Neutral"
msgstr "Neutraali"
-#: client/text.c:85 client/gui-sdl/mapview.c:752
+#: client/text.c:135 client/gui-sdl/mapview.c:752
msgid "?nation:Hostile"
msgstr "Vihamielinen"
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Peaceful"
msgstr "Rauhanomainen"
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Friendly"
msgstr "Ystävällinen"
-#: client/text.c:88 client/gui-sdl/mapview.c:755
+#: client/text.c:138 client/gui-sdl/mapview.c:755
msgid "?nation:Mysterious"
msgstr "Mystinen"
-#: client/text.c:88
+#: client/text.c:138
msgid "?nation:Friendly(team)"
msgstr "Ystävällinen(joukkue)"
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
msgid "?city:Neutral"
msgstr "Neutraali"
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
msgid "?city:Hostile"
msgstr "Vihollinen"
-#: client/text.c:92 client/gui-sdl/mapview.c:786
+#: client/text.c:142 client/gui-sdl/mapview.c:786
msgid "?city:Peaceful"
msgstr "Rauhallinen"
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Friendly"
msgstr "Ystävällinen"
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Mysterious"
msgstr "Mystinen"
-#: client/text.c:93
+#: client/text.c:143
msgid "?city:Friendly(team)"
msgstr "Ystävällinen(joukkue)"
-#: client/text.c:100
+#: client/text.c:151
#, c-format
msgid "Location: (%d, %d) [%d]"
msgstr "Sijainti: (%d, %d) [%d]"
-#: client/text.c:109
+#: client/text.c:153
+#, c-format
+msgid "Native coordinates: (%d, %d)"
+msgstr ""
+
+#: client/text.c:160
#, c-format
msgid "Terrain: %s"
msgstr "Maasto: %s"
-#: client/text.c:110
+#: client/text.c:161
#, c-format
msgid "Food/Prod/Trade: %s"
msgstr "Ruoka/raaka-aineet/kauppa: %s"
-#: client/text.c:113
+#: client/text.c:164
msgid "Minor Tribe Village"
msgstr "Pieni heimokylä"
-#: client/text.c:119
+#: client/text.c:173
msgid "Our territory"
msgstr "Meidän aluetta"
-#. TRANS: "Polish territory"
-#: client/text.c:122
-#, c-format
-msgid "%s territory"
-msgstr "%s-aluetta"
+#. TRANS: "Territory of <username> (<nation + team>)"
+#: client/text.c:176
+#, fuzzy, c-format
+msgid "Territory of %s (%s)"
+msgstr ""
+"\n"
+"%s %s hallitsevat aluetta"
-#. TRANS: "Polish territory (5 turn cease-fire)"
-#: client/text.c:131
+#: client/text.c:186
#, fuzzy, c-format
-msgid "%s territory (%d turn cease-fire)"
-msgid_plural "%s territory (%d turn cease-fire)"
-msgstr[0] "%s alue (%d vuoron tulitauko)"
-msgstr[1] "%s alue (%d vuoron tulitauko)"
+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)"
-#. TRANS: "Polish territory (friendly)"
-#: client/text.c:140
-#, c-format
-msgid "%s territory (%s)"
-msgstr "%s-aluetta (%s)"
+#. TRANS: "Territory of <username>
+#. * (<nation + team> | <diplomatic state>)"
+#: client/text.c:195
+#, fuzzy, c-format
+msgid "Territory of %s (%s | %s)"
+msgstr ""
+"\n"
+"%s %s hallitsevat aluetta"
-#: client/text.c:145
+#: client/text.c:200
msgid "Unclaimed territory"
msgstr "Valtaamatonta aluetta"
-#. TRANS: "City: Warsaw (Polish)"
-#: client/text.c:156
-#, c-format
-msgid "City: %s (%s)"
-msgstr "Kaupunki: %s (%s)"
+#. TRANS: "City: <city name> | <username> (<nation + team>)"
+#: client/text.c:214
+#, fuzzy, c-format
+msgid "City: %s | %s (%s)"
+msgstr "Kaupunki: %s (%s, %s)"
-#. TRANS: "City: Warsaw (Polish, 5 turn cease-fire)"
-#: client/text.c:166
-#, c-format
-msgid "City: %s (%s, %d turn cease-fire)"
-msgid_plural "City: %s (%s, %d turn cease-fire)"
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <number> turn cease-fire)"
+#: client/text.c:224
+#, fuzzy, 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)"
-#. TRANS: "City: Warsaw (Polish,friendly)"
-#: client/text.c:174
-#, c-format
-msgid "City: %s (%s, %s)"
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <diplomatic state>)"
+#: client/text.c:231
+#, fuzzy, c-format
+msgid "City: %s | %s (%s, %s)"
msgstr "Kaupunki: %s (%s, %s)"
#. TRANS: previous lines gave other information about the city.
-#: client/text.c:189
-#, fuzzy, c-format
+#: client/text.c:246
+#, c-format
msgid "?clistbegin: with %s"
msgstr " jossa %s"
#. TRANS: "Trade from Warsaw: 5"
-#: client/text.c:202
+#: client/text.c:259
#, c-format
msgid "Trade from %s: %d"
msgstr "Kauppa kaupungista %s: %d"
-#: client/text.c:210
+#: client/text.c:267
#, c-format
msgid "Infrastructure: %s"
msgstr "Infrastruktuuri: %s"
-#: client/text.c:215
+#: client/text.c:272
#, c-format
msgid "Activity: %s"
msgstr "Toiminta: %s"
-#. TRANS: "Unit: Musketeers (Polish, Warsaw)"
-#. TRANS: "Unit: Musketeers (Polish,friendly)"
-#: client/text.c:226 client/text.c:253
-#, c-format
-msgid "Unit: %s (%s, %s)"
+#. TRANS: "Unit: <unit type> | <username>
+#. * (<nation + team>, <homecity>)"
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <diplomatic state>)"
+#: client/text.c:287 client/text.c:313
+#, fuzzy, c-format
+msgid "Unit: %s | %s (%s, %s)"
msgstr "Yksikkö: %s (%s, %s)"
-#. TRANS: "Unit: Musketeers (Polish)"
-#: client/text.c:232
-#, c-format
-msgid "Unit: %s (%s)"
-msgstr "Yksikkö: %s (%s)"
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>)"
+#: client/text.c:292
+#, fuzzy, c-format
+msgid "Unit: %s | %s (%s)"
+msgstr "Yksikkö: %s (%s, %s)"
-#. TRANS: "Unit: Musketeers (Polish, 5 turn cease-fire)"
-#: client/text.c:245
-#, c-format
-msgid "Unit: %s (%s, %d turn cease-fire)"
-msgid_plural "Unit: %s (%s, %d turn cease-fire)"
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <number> turn cease-fire)"
+#: client/text.c:305
+#, fuzzy, 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)"
#. TRANS: "Chance to win: A:95% D:46%"
-#: client/text.c:279
+#: client/text.c:338
#, c-format
msgid "Chance to win: A:%d%% D:%d%%"
msgstr "Vaihda ikkunaan: A:%d%% D:%d%%"
#. TRANS: A is attack power, D is defense power, FP is firepower,
#. * HP is hitpoints (current and max).
-#: client/text.c:286
+#: client/text.c:345
#, c-format
msgid "A:%d D:%d FP:%d HP:%d/%d (%s)"
msgstr "H:%d P:%d TV:%d VP:%d/%d (%s)"
#. TRANS: "5 more" units on this tile
-#: client/text.c:295
+#: client/text.c:354
#, c-format
msgid " (%d more)"
msgstr " (%d muuta)"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:364
+#: client/text.c:423
#, c-format
msgid "far from %s"
msgstr "kaukana kaupungista %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:367
+#: client/text.c:426
#, c-format
msgid "near %s"
msgstr "lähellä kaupunkia %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:370
+#: client/text.c:429
#, c-format
msgid "in %s"
msgstr "kaupungissa %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:403
+#: client/text.c:462
#, c-format
msgid "from %s"
msgstr "kaupungista %s"
-#: client/text.c:466
+#: client/text.c:525
msgid "Progress: no research"
msgstr "Tutkimuksen nopeus: ei tutkimusta"
-#: client/text.c:470
+#: client/text.c:529
msgid "Progress: no research target"
msgstr "Tutkimuksen nopeus: ei tutkimuskohdetta"
-#: client/text.c:475
+#: client/text.c:534
#, c-format
msgid "Progress: %d turn/advance"
msgid_plural "Progress: %d turns/advance"
msgstr[0] "Tutkimuksen nopeus: %d vuoro/edistysaskel"
msgstr[1] "Tutkimuksen nopeus: %d vuoroa/edistysaskel"
-#: client/text.c:480
+#: client/text.c:539
#, c-format
msgid "%d bulb/turn"
msgid_plural "%d bulbs/turn"
msgstr[0] "%d lamppu/vuoro"
msgstr[1] "%d lamppua/vuoro"
-#: client/text.c:485
+#: client/text.c:544
#, c-format
msgid ", %d bulb/turn from team"
msgid_plural ", %d bulbs/turn from team"
msgstr[0] "%d lamppu/vuoro joukkueelta"
msgstr[1] "%d lamppua/vuoro joukkueelta"
-#: client/text.c:512
+#: client/text.c:571
#, c-format
msgid "%d/- (never)"
msgstr "%d/- (ei koskaan)"
-#: client/text.c:524
+#: client/text.c:583
#, c-format
msgid "%d/%d (%d turn)"
msgid_plural "%d/%d (%d turns)"
msgstr[0] "%d/%d (%d vuoro)"
msgstr[1] "%d/%d (%d vuoroa)"
-#: client/text.c:527
+#: client/text.c:586
#, c-format
msgid "%d/%d (never)"
msgstr "%d/%d (ei koskaan)"
-#: client/text.c:564
+#: client/text.c:623
#, c-format
msgid "%d step"
msgid_plural "%d steps"
msgstr[0] "%d vaihe"
msgstr[1] "%d vaihetta"
-#: client/text.c:566
+#: client/text.c:625
#, c-format
msgid "%d bulb"
msgid_plural "%d bulbs"
msgstr[0] "%d lamppu"
msgstr[1] "%d lamppua"
-#: client/text.c:570 client/agents/cma_fec.c:269 client/agents/cma_fec.c:313
+#: 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
#, c-format
msgid "%d turn"
@@ -9826,89 +9875,88 @@ msgid_plural "%d turns"
msgstr[0] "%d vuoro"
msgstr[1] "%d vuoroa"
-#: client/text.c:592
+#: client/text.c:651
#, c-format
msgid "Population: %s"
msgstr "Väkiluku: %s"
-#: client/text.c:595
+#: client/text.c:654
#, c-format
msgid "Year: %s (T%d)"
msgstr "Vuosi: %s (T%d)"
-#: client/text.c:598
+#: client/text.c:657
#, c-format
msgid "Gold: %d (%+d)"
msgstr "Kultaa: %d (%+d)"
-#: client/text.c:600
+#: client/text.c:659
#, c-format
msgid "Tax: %d Lux: %d Sci: %d"
-msgstr "Vero: %d Luksus:%d Tiede:%d"
+msgstr "Vero: %d Luksus: %d Tiede: %d"
-#: client/text.c:607
-#, fuzzy
+#: client/text.c:666
msgid "Moving: Nobody"
-msgstr "Liikkuu: %s"
+msgstr "Liikkuu: Ei kukaan"
-#: client/text.c:609
+#: client/text.c:668
#, c-format
msgid "Moving: %s"
msgstr "Liikkuu: %s"
-#: client/text.c:613
+#: client/text.c:672
msgid "(Click for more info)"
msgstr "(Napsauttamalla lisätietoa)"
-#: client/text.c:629
+#: client/text.c:688
#, c-format
msgid "%s People"
msgstr "%s kansalaista"
-#: client/text.c:633
+#: client/text.c:692
#, c-format
msgid "Turn: %d"
msgstr "Vuoro: %d"
-#: client/text.c:635 client/gui-win32/inteldlg.c:111
+#: client/text.c:694 client/gui-win32/inteldlg.c:111
#: client/gui-xaw/inteldlg.c:208
#, c-format
msgid "Gold: %d"
msgstr "Kultaa: %d"
-#: client/text.c:636
+#: client/text.c:695
#, c-format
msgid "Net Income: %d"
msgstr "Nettotulo: %d"
#. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:639
+#: client/text.c:698
#, c-format
msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
msgstr "Verot: Kulta:%d%% Luksus:%d%% Tiede:%d%%"
-#: client/text.c:643
+#: client/text.c:702
#, c-format
msgid "Researching %s: %s"
msgstr "Tutkittavana %s: %s"
-#: client/text.c:650
+#: client/text.c:709
#, c-format
msgid "Global warming chance: %d%% (%+d%%/turn)"
msgstr "Ilmaston lämpenemisen todennäköisyys: %d%% (%+d%%/vuoro)"
-#: client/text.c:653
+#: client/text.c:712
#, c-format
msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
msgstr "Ydintalven mahdollisuus: %d%% (%+d%%/vuoro)"
-#: client/text.c:658 client/gui-win32/inteldlg.c:104
+#: client/text.c:717 client/gui-win32/inteldlg.c:104
#: client/gui-xaw/inteldlg.c:200
#, c-format
msgid "Government: %s"
-msgstr "Hallitusmuoto: %s"
+msgstr "Hallintomuoto: %s"
-#: client/text.c:682
+#: client/text.c:741
#, c-format
msgid "%d unit"
msgid_plural "%d units"
@@ -9916,56 +9964,56 @@ msgstr[0] "%d yksikkö"
msgstr[1] "%d yksikköä"
#. TRANS: Impossible to reach goto target tile
-#: client/text.c:715 client/gui-sdl/mapview.c:566
+#: client/text.c:774 client/gui-sdl/mapview.c:566
msgid "?goto:Unreachable"
msgstr "Saavuttamaton"
-#: client/text.c:717 client/gui-sdl/mapview.c:568
+#: client/text.c:776 client/gui-sdl/mapview.c:568
#, c-format
msgid "Turns to target: %d"
msgstr "Vuoroja kohteeseen: %d"
-#: client/text.c:719 client/gui-sdl/mapview.c:570
+#: client/text.c:778 client/gui-sdl/mapview.c:570
#, c-format
msgid "Turns to target: %d to %d"
msgstr "Vuoroja kohteeseen: %d - %d"
-#: client/text.c:725 client/gui-sdl/mapview.c:576
+#: client/text.c:784 client/gui-sdl/mapview.c:576
#, c-format
msgid "%d unit selected"
msgid_plural "%d units selected"
msgstr[0] "%d yksikkö valittu"
msgstr[1] "%d yksikköä valittu"
-#: client/text.c:730 client/gui-sdl/mapview.c:581
+#: client/text.c:789 client/gui-sdl/mapview.c:581
msgid "No units selected."
msgstr "Ei valittua yksikköä."
-#: client/text.c:804 client/gui-sdl/mapview.c:654
+#: client/text.c:863 client/gui-sdl/mapview.c:654
#, c-format
msgid "Others: %d civil; %d military"
msgstr "Muut: %d siviiliä; %d sotayksikköä"
-#: client/text.c:806 client/gui-sdl/mapview.c:656
+#: client/text.c:865 client/gui-sdl/mapview.c:656
#, c-format
msgid "Others: %d civilian"
msgstr "Muut: %d siviiliä"
-#: client/text.c:808 client/gui-sdl/mapview.c:658
+#: client/text.c:867 client/gui-sdl/mapview.c:658
#, c-format
msgid "Others: %d military"
msgstr "Muut: %d sotayksikköä"
-#: client/text.c:839
+#: client/text.c:898
msgid "No units to upgrade!"
msgstr "Yhtään ajanmukaistettavaa yksikköä ei ole."
-#: client/text.c:864
+#: client/text.c:923
msgid "None of these units may be upgraded."
msgstr "Yhtään yksikköä ei voitu ajanmukaistaa."
-#: client/text.c:870
-#, fuzzy, c-format
+#: client/text.c:929
+#, c-format
msgid ""
"Upgrade %d unit for %d gold?\n"
"Treasury contains %d gold."
@@ -9973,78 +10021,78 @@ msgid_plural ""
"Upgrade %d units for %d gold?\n"
"Treasury contains %d gold."
msgstr[0] ""
-"Ajanmukaista %s yksiköksi %s hintaan %d ?\n"
+"Ajanmukaista %d yksikkö hintaan %d ?\n"
"Valtion kassassa on %d."
msgstr[1] ""
-"Ajanmukaista %s yksiköksi %s hintaan %d ?\n"
+"Ajanmukaista %d yksikköä hintaan %d?\n"
"Valtion kassassa on %d."
-#: client/text.c:891
+#: client/text.c:950
msgid "Shows your progress in researching the current technology."
msgstr "Näyttää edistyksesi uusimman tutkimuskohteen kanssa."
-#: client/text.c:897
+#: client/text.c:956
msgid "no research target."
msgstr "ei tutkimuskohdetta."
#. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:900
+#: client/text.c:959
#, c-format
msgid "%s: %d/%d."
-msgstr ""
+msgstr "%s: %d/%d."
-#: client/text.c:920
+#: client/text.c:979
msgid "Shows the progress of global warming:"
msgstr "Näyttää maailmanlaajuisen lämpenemisen etenemisen:"
-#: client/text.c:921
+#: client/text.c:980
#, c-format
msgid "Pollution rate: %d%%"
msgstr "Saastumisaste: %d%%"
-#: client/text.c:923
+#: client/text.c:982
#, c-format
msgid "Chance of catastrophic warming each turn: %d%%"
-msgstr ""
+msgstr "Katastrofaalisen lämpenemisen todennäköisyys joka vuoro: %d%%"
-#: client/text.c:939
+#: client/text.c:998
msgid "Shows the progress of nuclear winter:"
msgstr "Näyttää ydintalven etenemisen:"
-#: client/text.c:940
+#: client/text.c:999
#, c-format
msgid "Fallout rate: %d%%"
msgstr "Laskeuman määrä: %d%%"
-#: client/text.c:942
+#: client/text.c:1001
#, c-format
msgid "Chance of catastrophic winter each turn: %d%%"
msgstr "Katastrofitalven mahdollisuus vuorossa: %d%%"
-#: client/text.c:957
+#: client/text.c:1016
msgid "Shows your current government:"
-msgstr "Näyttää nykyisen hallitusmuotosi:"
+msgstr "Näyttää nykyisen hallintomuotosi:"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:981
+#: client/text.c:1040
#, c-format
msgid "Population: %5d"
msgstr "Väkiluku: %5d"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:1043
#, c-format
msgid "Support: %5d %%"
msgstr "Ylläpito: %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:1047
#, c-format
msgid "Energy: %5d %%"
msgstr "Energia: %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:992
+#: client/text.c:1051
#, c-format
msgid "Mass: %5d ton"
msgid_plural "Mass: %5d tons"
@@ -10052,142 +10100,140 @@ msgstr[0] "Massa: %5d t"
msgstr[1] "Massa: %5d t"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1057
#, c-format
msgid "Travel time: %5.1f years"
msgstr "Matka-aika: %5.1f vuotta"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1061
msgid "Travel time: N/A "
msgstr "Matka-aika: ei tiedossa"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1065
#, c-format
msgid "Success prob.: %5d %%"
msgstr "Onnistumis-tn.: %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1010
+#: client/text.c:1069
#, c-format
msgid "Year of arrival: %8s"
msgstr "Saapumisvuosi: %8s"
-#: client/text.c:1030
+#: client/text.c:1089
msgid "?timeout:off"
msgstr "?timeout:off"
-#: client/text.c:1054
+#: client/text.c:1113
#, c-format
msgid "?seconds:%02ds"
msgstr "?seconds:%02ds"
-#: client/text.c:1056
+#: client/text.c:1115
#, c-format
msgid "?mins/secs:%02dm %02ds"
msgstr "?mins/secs:%02dmin %02ds"
-#: client/text.c:1058
+#: client/text.c:1117
#, c-format
msgid "?hrs/mns:%02dh %02dm"
msgstr "?hrs/mns:%02dh %02dmin"
-#: client/text.c:1060
+#: client/text.c:1119
#, c-format
msgid "?dys/hrs:%02dd %02dh"
msgstr "?dys/hrs:%02dpv %02dh"
-#: client/text.c:1063
+#: client/text.c:1122
msgid "?duration:overflow"
msgstr "?duration:ylivuoto"
-#: client/text.c:1084
+#: client/text.c:1143
#, c-format
msgid "%6d.%02d ms"
msgstr "%6d.%02d ms"
-#. TRANS: "Republic of the Poles"
-#: client/text.c:1127
-#, fuzzy, c-format
-msgid "%s of the %s"
-msgstr "%2$s ja hallintomuotonsa %1$s"
+#. TRANS: <nation adjective> <government name>.
+#. * E.g. "Polish Republic".
+#: client/text.c:1188
+#, c-format
+msgid "?nationgovernment:%s %s"
+msgstr "%s %s"
#. TRANS: "Observer: 1985"
-#: client/text.c:1137
-#, fuzzy, c-format
+#: client/text.c:1198
+#, c-format
msgid "Observer: %s"
-msgstr " (tarkkailija)"
+msgstr "Tarkkailija: %s"
-#: client/text.c:1155
+#: client/text.c:1216
msgid "Buildings: "
msgstr "Rakennukset: "
-#: client/text.c:1172 client/text.c:1211
+#: client/text.c:1233 client/text.c:1272
msgid "None. "
msgstr "Ei yhtään. "
-#: client/text.c:1174 client/text.c:1213
+#: client/text.c:1235 client/text.c:1274
msgid "?clistend:."
-msgstr ". "
+msgstr "."
-#: client/text.c:1192
+#: client/text.c:1253
msgid "Wonders: "
msgstr "Ihmeet: "
-#: client/text.c:1247
+#: client/text.c:1308
#, 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:1251
-#, fuzzy, c-format
+#: client/text.c:1312
+#, c-format
msgid "%d content before penalty."
msgid_plural "%d content before penalty."
-msgstr[0] "%d rauhallista ennen vähennyksiä: "
-msgstr[1] "%d rauhallista ennen vähennyksiä: "
+msgstr[0] "%d rauhallinen ennen vähennyksiä."
+msgstr[1] "%d rauhallista ennen vähennyksiä."
#. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1257
-#, fuzzy, c-format
+#: client/text.c:1318
+#, c-format
msgid "%d additional unhappy citizen."
msgid_plural "%d additional unhappy citizens."
-msgstr[0] "%d tyytymätöntä lisää."
+msgstr[0] "%d tyytymätön lisää."
msgstr[1] "%d tyytymätöntä lisää."
-#. TRANS: Martial law opening parenthesis
-#: client/text.c:1279
-msgid "Martial law in effect ("
-msgstr "Armeija pitää kuria ("
+#: client/text.c:1339
+msgid "Unlimited martial law in effect."
+msgstr "Rajoittamaton armeijan kurinpito käytössä."
-#. TRANS: no [unit] maximum
-#: client/text.c:1284
-msgid "no maximum, "
-msgstr "ei maksimia, "
-
-#: client/text.c:1287
+#: client/text.c:1341
#, c-format
-msgid "%d unit maximum, "
-msgid_plural "%d units maximum, "
-msgstr[0] "enintään %d yksikkö, "
-msgstr[1] "enintään %d yksikköä"
+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."
-#. TRANS: Martial law closing parenthesis
-#: client/text.c:1294
+#: client/text.c:1345
#, c-format
-msgid "%d per unit). "
-msgstr "%d yksikköä kohden). "
+msgid "Each military unit makes %d unhappy citizen content."
+msgid_plural "Each military unit makes %d unhappy citizens content."
+msgstr[0] ""
+"Jokainen sotilasyksikkö tekee %d tyytymättömästä asukkaasta rauhallisen."
+msgstr[1] ""
+"Jokainen sotilasyksikkö tekee %d tyytymättömästä asukkaasta rauhallisia."
-#: client/text.c:1298
+#: client/text.c:1352
msgid "Military units in the field may cause unhappiness. "
msgstr "Sotilasyksiköt poissa kotoa voivat aiheuttaa tyytymättömyyttä. "
-#: client/text.c:1301
+#: client/text.c:1355
msgid "Military units have no happiness effect. "
msgstr "Sotilasyksiköillä ei ole vaikutusta onnellisuuteen. "
-#: client/text.c:1316
+#: client/text.c:1370
#, c-format
msgid "Luxury: %d total."
msgstr "Luksus: %d kaikkiaan."
@@ -10209,14 +10255,14 @@ msgid ""
msgstr ""
"Asiakasohjelma ei tue ylhäältä nähtävää kuvitusta. Käytetään oletusasetuksia."
-#: client/tilespec.c:3968
-#, fuzzy, c-format
+#: client/tilespec.c:3966
+#, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
"Report this bug at %s"
msgstr ""
"99 vuoroa pidempiä polkuja ei tueta.\n"
-"Raportoi tämä bugi: bugs at freeciv.org."
+"Raportoi tämä bugi: %s"
#: client/agents/cma_core.c:400
#, c-format
@@ -10236,12 +10282,12 @@ msgstr ""
"Käskynhaltija on hämmentynyt, käsittelyssä %s. Halunnet katsoa mitä on "
"tekeillä."
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
-#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:599
+#: client/gui-gtk-2.0/cityrep.c:624 client/gui-sdl/citydlg.c:2009
msgid "none"
msgstr "ei mitään"
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:645
msgid "custom"
msgstr "oma valinta"
@@ -10549,7 +10595,7 @@ msgstr "Vakinaista kaupparei_tti"
msgid "Enter Marketplace"
msgstr "Astu torille"
-#: client/gui-gtk-2.0/chatline.c:144 client/gui-win32/chatline.c:134
+#: client/gui-gtk-2.0/chatline.c:218 client/gui-win32/chatline.c:134
#: client/gui-xaw/chatline.c:120
msgid "Cleared output window."
msgstr "Tulostusikkuna tyhjennetty."
@@ -10618,7 +10664,7 @@ msgstr "Kaupungin kartta"
#: client/gui-gtk-2.0/citydlg.c:772
msgid "Press ENTER or double-click to sell an improvement."
-msgstr "Paina ENTER tai tuplaklikkaa myydäksesi rakennuksen."
+msgstr "Paina ENTER tai kaksoisnapsauta myydäksesi rakennuksen."
#: client/gui-gtk-2.0/citydlg.c:790 client/gui-gtk-2.0/citydlg.c:910
msgid "Production:"
@@ -10630,11 +10676,11 @@ msgid "%d/%d %d turns"
msgstr "%d/%d %d vuoroa"
#: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:821
+#: client/gui-gtk-2.0/cityrep.c:1027
msgid "_Buy"
msgstr "O_sta"
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:869
msgid "_Production"
msgstr "_Tuotanto"
@@ -10655,12 +10701,12 @@ msgid "Entertainers"
msgstr "Viihdyttäjiä"
#: client/gui-gtk-2.0/citydlg.c:1029 client/gui-win32/citydlg.c:1989
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2403
msgid "Scientists"
msgstr "Tutkijoita"
#: client/gui-gtk-2.0/citydlg.c:1030 client/gui-win32/citydlg.c:1991
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2404
msgid "Taxmen"
msgstr "Verottajia"
@@ -10753,7 +10799,7 @@ msgstr "Ylläpidettyjä yksiköitä %d"
msgid "Present units %d"
msgstr "Paikallaolevia yksiköitä %d"
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:1019
msgid "Cen_ter"
msgstr "Keskitä"
@@ -10843,31 +10889,60 @@ msgstr "Nimeä kaupunki uudelleen"
msgid "What should we rename the city to?"
msgstr "Mikä annetaan kaupungin uudeksi nimeksi?"
-#: client/gui-gtk-2.0/cityrep.c:699
+#: client/gui-gtk-2.0/cityrep.c:794
+#, fuzzy
+msgid "(no worklists defined)"
+msgstr "(työlista)"
+
+#: client/gui-gtk-2.0/cityrep.c:876
msgid "Chan_ge"
msgstr "Vai_hda"
-#: client/gui-gtk-2.0/cityrep.c:703
+#: client/gui-gtk-2.0/cityrep.c:880
msgid "Add _First"
msgstr "Lisää _ensimmäinen"
-#: client/gui-gtk-2.0/cityrep.c:707
+#: client/gui-gtk-2.0/cityrep.c:884
msgid "Add _Next"
msgstr "Lisää _seuraava"
-#: client/gui-gtk-2.0/cityrep.c:711
+#: client/gui-gtk-2.0/cityrep.c:888
+#, fuzzy
+msgid "Add _2nd Last"
+msgstr "Lisää _viimeinen"
+
+#: client/gui-gtk-2.0/cityrep.c:892
msgid "Add _Last"
msgstr "Lisää _viimeinen"
-#: client/gui-gtk-2.0/cityrep.c:715
+#: client/gui-gtk-2.0/cityrep.c:899
+#, fuzzy
+msgid "Set Worklist"
+msgstr "Työlista"
+
+#: client/gui-gtk-2.0/cityrep.c:905
+#, fuzzy
+msgid "Append Worklist"
+msgstr "Nimeä työlista"
+
+#: client/gui-gtk-2.0/cityrep.c:911
+#, fuzzy
+msgid "Clear _Worklist"
+msgstr "Kohdetyölista"
+
+#: client/gui-gtk-2.0/cityrep.c:916
+msgid "Gover_nor"
+msgstr "_Käskynhaltija"
+
+#: client/gui-gtk-2.0/cityrep.c:921
msgid "_Select"
msgstr "Va_litse"
-#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
+#: client/gui-gtk-2.0/cityrep.c:925 client/gui-gtk-2.0/plrdlg.c:521
msgid "_Display"
msgstr "_Näytä"
-#: client/gui-gtk-2.0/cityrep.c:800 client/gui-gtk-2.0/menu.c:808
+#: 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-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
#: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -10877,103 +10952,103 @@ msgstr "_Näytä"
msgid "Cities"
msgstr "Kaupungit"
-#: client/gui-gtk-2.0/cityrep.c:817
+#: client/gui-gtk-2.0/cityrep.c:1023
msgid "_Inspect"
msgstr "_Tarkasta"
-#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
-#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-sdl/helpdlg.c:297 client/gui-win32/menu.c:342
-#: client/gui-xaw/menu.c:241
+#: 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
+#: client/gui-gtk-2.0/cityrep.c:1518 client/gui-gtk-2.0/menu.c:823
+#: client/gui-gtk-2.0/menu.c:825 client/gui-gtk-2.0/menu.c:827
+#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:831
+#: client/gui-gtk-2.0/menu.c:833 client/gui-sdl/helpdlg.c:297
+#: client/gui-win32/menu.c:342 client/gui-xaw/menu.c:241
msgid "Improvements"
msgstr "rakennushankkeet"
-#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
-#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
-#: client/gui-xaw/menu.c:247
+#: client/gui-gtk-2.0/cityrep.c:1441 client/gui-gtk-2.0/cityrep.c:1460
+#: client/gui-gtk-2.0/cityrep.c:1479 client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1522 client/gui-xaw/menu.c:247
msgid "Wonders"
msgstr "Ihmeet"
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1662 client/gui-win32/cityrep.c:439
#: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
msgid "All Cities"
msgstr "Kaikki kaupungit"
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1667 client/gui-win32/cityrep.c:440
msgid "No Cities"
msgstr "Ei yhtään kaupunkia"
-#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1672 client/gui-win32/cityrep.c:441
msgid "Invert Selection"
msgstr "Käänteinen valinta"
-#: client/gui-gtk-2.0/cityrep.c:1420
+#: client/gui-gtk-2.0/cityrep.c:1682
msgid "Building Units"
msgstr "Yksiköiden teko"
-#: client/gui-gtk-2.0/cityrep.c:1426
+#: client/gui-gtk-2.0/cityrep.c:1688
msgid "Building Improvements"
msgstr "Rakennushankkeet"
-#: client/gui-gtk-2.0/cityrep.c:1432
+#: client/gui-gtk-2.0/cityrep.c:1694
msgid "Building Wonders"
msgstr "Ihmeiden rakennus"
-#: client/gui-gtk-2.0/cityrep.c:1444
+#: client/gui-gtk-2.0/cityrep.c:1706
msgid "Building Unit"
msgstr "Tekee yksikköä"
-#: client/gui-gtk-2.0/cityrep.c:1448
+#: client/gui-gtk-2.0/cityrep.c:1710
msgid "Building Improvement"
msgstr "Rakentaa"
-#: client/gui-gtk-2.0/cityrep.c:1452
+#: client/gui-gtk-2.0/cityrep.c:1714
msgid "Building Wonder"
msgstr "Rakentaa ihmettä"
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1722 client/gui-win32/cityrep.c:443
msgid "Coastal Cities"
msgstr "Rannikkokaupungit"
-#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1727 client/gui-win32/cityrep.c:444
msgid "Same Island"
msgstr "Samalla saarella olevat kaupungit"
-#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1737 client/gui-win32/cityrep.c:447
msgid "Supported Units"
msgstr "Ylläpidetyt yksiköt"
-#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1740 client/gui-win32/cityrep.c:454
msgid "Units Present"
msgstr "Läsnäolevat yksiköt"
-#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1744 client/gui-win32/cityrep.c:469
msgid "Improvements in City"
msgstr "Kaupungissa toteutetut hankkeet"
-#: client/gui-gtk-2.0/cityrep.c:1486
+#: client/gui-gtk-2.0/cityrep.c:1748
msgid "Wonders in City"
msgstr "Kaupungin ihmeet"
-#: client/gui-gtk-2.0/cityrep.c:1495
+#: client/gui-gtk-2.0/cityrep.c:1757
msgid "Available Units"
msgstr "Yksiköt saatavilla"
-#: client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1760
msgid "Available Improvements"
msgstr "Rakennushankkeet saatavilla"
-#: client/gui-gtk-2.0/cityrep.c:1501
+#: client/gui-gtk-2.0/cityrep.c:1763
msgid "Available Wonders"
msgstr "Ihmeet saatavilla"
-#: client/gui-gtk-2.0/cityrep.c:1625
-#, fuzzy, c-format
+#: client/gui-gtk-2.0/cityrep.c:1882
+#, c-format
msgid "Total Buy Cost: %d"
-msgstr "Kokonaismenot: "
+msgstr "Kokonaismenot: %d"
#: client/gui-gtk-2.0/cma_fe.c:253 client/gui-xaw/cma_fe.c:78
msgid ""
@@ -11040,11 +11115,11 @@ 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:186
+#: client/gui-gtk-2.0/dialogs.c:196 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:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
msgid "Inspect _City"
msgstr "_Tutki kaupunkia"
@@ -11072,10 +11147,10 @@ msgstr "Valitse mitä haluat turmella:"
msgid "Unit"
msgstr "Yksikkö"
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
-#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
-#: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
-#: manual/civmanual.c:302 data/Freeciv.in:80
+#: 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-win32/plrdlg.c:335 manual/civmanual.c:302 data/Freeciv.in:80
msgid "Name"
msgstr "Nimi"
@@ -11100,7 +11175,7 @@ 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:1036 data/Freeciv.in:3371
+#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
msgid "Pick Nation"
msgstr "Kansakunnan valinta"
@@ -11114,19 +11189,19 @@ msgstr "Valitse kansakunta"
#: client/gui-gtk-2.0/dialogs.c:804
msgid "_Properties"
-msgstr "Ominaisuudet"
+msgstr "_Ominaisuudet"
#: client/gui-gtk-2.0/dialogs.c:824
msgid "_Leader:"
-msgstr "Johtaja:"
+msgstr "_Johtaja:"
#: client/gui-gtk-2.0/dialogs.c:831
msgid "_Female"
-msgstr "Nainen"
+msgstr "_Nainen"
#: client/gui-gtk-2.0/dialogs.c:836
msgid "_Male"
-msgstr "Mies"
+msgstr "_Mies"
#: client/gui-gtk-2.0/dialogs.c:863
msgid "City _Styles:"
@@ -11179,7 +11254,7 @@ msgstr "Kartat"
msgid "_Advances"
msgstr "Edistysaskeleet"
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:910
+#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr "Kaupungit"
@@ -11189,7 +11264,6 @@ msgid "_Give shared vision"
msgstr "Jaa näkymä"
#: client/gui-gtk-2.0/diplodlg.c:346
-#, fuzzy
msgid "Give _embassy"
msgstr "Lähetystö"
@@ -11200,7 +11274,7 @@ msgstr "Sopimukset"
#: client/gui-gtk-2.0/diplodlg.c:466
#, c-format
msgid "Diplomacy: %s"
-msgstr "Diplomaatia: %s"
+msgstr "Diplomatia: %s"
#: client/gui-gtk-2.0/diplodlg.c:473
msgid "_Cancel meeting"
@@ -11285,33 +11359,33 @@ msgstr "Valitse kohde"
msgid "Show _All Cities"
msgstr "Näytä kaikki kaupungit"
-#: client/gui-gtk-2.0/gui_main.c:150
+#: client/gui-gtk-2.0/gui_main.c:162
msgid "Show Map Scrollbars"
msgstr "Näytä kartan vierityspalkit"
-#: client/gui-gtk-2.0/gui_main.c:151
+#: client/gui-gtk-2.0/gui_main.c:163
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:155
+#: client/gui-gtk-2.0/gui_main.c:167
msgid "Keyboardless goto"
msgstr "Näppäimistötön meno"
-#: client/gui-gtk-2.0/gui_main.c:156
+#: client/gui-gtk-2.0/gui_main.c:168
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 ""
"Jos tämä asetus on käytössä, yksikölle voidaan antaa kulkukomento "
-"klikkaamalla sitä vasemmalla hiiren napilla ja pitäen nappia alhaalla ja "
+"napsauttamalla sitä vasemmalla hiiren napilla, pitäen nappia alhaalla ja "
"raahaten osoittimen kohderuutuun."
-#: client/gui-gtk-2.0/gui_main.c:161
+#: client/gui-gtk-2.0/gui_main.c:173
msgid "Keep dialogs on top"
msgstr "Pidä dialogit päällimmäisenä"
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:174
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."
@@ -11320,11 +11394,11 @@ msgstr ""
"pääikkunan yläpuolella. Asetuksen poistolla ei ole vaikutusta "
"kokoruututilassa."
-#: client/gui-gtk-2.0/gui_main.c:166
+#: client/gui-gtk-2.0/gui_main.c:178
msgid "Show worklist task icons"
msgstr "Näytä työlistan tehtäväkuvakkeet"
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:179
msgid ""
"Disabling this will turn off the unit and building icons in the worklist "
"dialog and the production tab of the city dialog."
@@ -11332,21 +11406,23 @@ 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:171
+#: client/gui-gtk-2.0/gui_main.c:183
msgid "Enable status report tabs"
msgstr "Käytä tilanneraporttivälilehtiä"
-#: client/gui-gtk-2.0/gui_main.c:172
+#: client/gui-gtk-2.0/gui_main.c:184
msgid ""
"If this option is enabled then report dialogs will be shown as separate tabs "
"rather than in popup dialogs."
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:177 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:189 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:178 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:190 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."
@@ -11355,50 +11431,123 @@ msgstr ""
"vaativan näkyvyysrajapiirtotyylin käyttöä. Tyyli ei ole suoritustehollisesti "
"hitaampi."
-#: client/gui-gtk-2.0/gui_main.c:277 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:195
+msgid "Show time for each chat message"
+msgstr "Näytä aika jokaiselle keskustelun viestille"
+
+#: client/gui-gtk-2.0/gui_main.c:196
+msgid ""
+"If this option is enabled then all chat messages will be prefixed by a time "
+"string of the form [hour:minute:second]."
+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
+msgid "Split bottom notebook area"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:202
+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
+msgid "New message events go to top of list"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:208
+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
+msgid "Show extra message window buttons"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:214
+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 "
+"is disabled, these buttons will not appear (you can still double-click with "
+"the left mouse button or right-click on a row to inspect or goto "
+"respectively). This option will only take effect once the message window is "
+"closed and reopened."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:224
+msgid "Metaserver tab first in network page"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:225
+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
+msgid "Plain chat messages are sent to allies only"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:231
+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 "
+"messages will be sent as public chat messages. To send a public chat message "
+"with this option enabled, prefix the message with a single colon ':'. This "
+"option can also be set using a toggle button beside the chat entry (only "
+"visible in multiplayer games)."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:340 client/gui-xaw/gui_main.c:245
msgid ""
"This client has no special command line options\n"
"\n"
msgstr ""
+"Tässä asiakasohjelmassa ei ole erityisiä komentoriviasetuksia\n"
+"\n"
-#: client/gui-gtk-2.0/gui_main.c:723 client/gui-gtk-2.0/gui_main.c:1345
+#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
msgid "Freeciv"
msgstr "Freeciv"
-#: client/gui-gtk-2.0/gui_main.c:1088 client/gui-gtk-2.0/gui_main.c:1095
+#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
#: 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:1095 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1232 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:1127 client/gui-gtk-2.0/menu.c:770
-#: client/gui-gtk-2.0/menu.c:772 client/gui-gtk-2.0/menu.c:774
-#: client/gui-gtk-2.0/menu.c:776 client/gui-gtk-2.0/menu.c:778
-#: client/gui-gtk-2.0/menu.c:780 client/gui-gtk-2.0/menu.c:782
-#: client/gui-gtk-2.0/menu.c:784 client/gui-gtk-2.0/menu.c:786
-#: client/gui-gtk-2.0/menu.c:788 client/gui-gtk-2.0/menu.c:790
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-gtk-2.0/menu.c:804 client/gui-gtk-2.0/menu.c:806
-#: client/gui-gtk-2.0/menu.c:808 client/gui-gtk-2.0/menu.c:810
-#: client/gui-gtk-2.0/menu.c:812 client/gui-gtk-2.0/menu.c:814
-#: client/gui-gtk-2.0/menu.c:816 client/gui-gtk-2.0/menu.c:818
-#: client/gui-gtk-2.0/menu.c:820 client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/gui_main.c:1266 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
+#: client/gui-gtk-2.0/menu.c:811 client/gui-gtk-2.0/menu.c:813
+#: client/gui-gtk-2.0/menu.c:815 client/gui-gtk-2.0/menu.c:817
+#: client/gui-gtk-2.0/menu.c:819 client/gui-gtk-2.0/menu.c:821
+#: client/gui-gtk-2.0/menu.c:823 client/gui-gtk-2.0/menu.c:825
+#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
+#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
+#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
+#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
+#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
+#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
#: data/Freeciv.in:2028
msgid "View"
msgstr "Näkymä"
-#: client/gui-gtk-2.0/gui_main.c:1208
+#: client/gui-gtk-2.0/gui_main.c:1359
msgid "Chat"
msgstr "Keskustelu"
-#: client/gui-gtk-2.0/gui_main.c:1224 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1377 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"
@@ -11414,70 +11563,73 @@ 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:1491
+#: client/gui-gtk-2.0/gui_main.c:1392
+msgid "Allies Only"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:1657
msgid "Not _ready"
msgstr "_Ei valmis"
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
+#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
msgid "_Ready"
msgstr "_Valmis"
-#: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2132
+#: 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
msgid "_Start"
msgstr "_Aloita"
-#: client/gui-gtk-2.0/gui_main.c:1520
-#, fuzzy
+#: client/gui-gtk-2.0/gui_main.c:1686
msgid "_Take Player"
-msgstr "Ota tämä pelaaja"
+msgstr "Ota pelaaja hallintaan"
-#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
+#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
msgid "Pick _Nation"
msgstr "Valitse ka_nsakunta"
-#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
+#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
msgid "_Observe"
msgstr "_Tarkkaile"
-#: client/gui-gtk-2.0/gui_main.c:1532
+#: client/gui-gtk-2.0/gui_main.c:1698
msgid "Do not _observe"
msgstr "Älä _tarkkaile"
-#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
msgid "<AI>"
msgstr "<AI>"
-#: client/gui-gtk-2.0/gui_main.c:1557
+#: client/gui-gtk-2.0/gui_main.c:1723
msgid "<Novice AI>"
-msgstr "<Aloittelija AI>"
+msgstr "<Aloittelija-AI>"
-#: client/gui-gtk-2.0/gui_main.c:1560
+#: client/gui-gtk-2.0/gui_main.c:1726
msgid "<Easy AI>"
msgstr "<Helppo AI>"
-#: client/gui-gtk-2.0/gui_main.c:1563
+#: client/gui-gtk-2.0/gui_main.c:1729
msgid "<Normal AI>"
msgstr "<Tavallinen AI>"
-#: client/gui-gtk-2.0/gui_main.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1732
msgid "<Hard AI>"
msgstr "<Vaikea AI>"
-#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1742 client/gui-win32/dialogs.c:594
#: client/gui-xaw/pages.c:217
msgid "Random"
msgstr "Satunnainen"
-#: client/gui-gtk-2.0/gui_main.c:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
msgid "Observer"
msgstr "Tarkkailija"
-#: client/gui-gtk-2.0/gui_main.c:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
msgid "Detached"
msgstr "Irrotettu"
-#: client/gui-gtk-2.0/gui_main.c:1899
+#: client/gui-gtk-2.0/gui_main.c:2073
msgid "Are you sure you want to quit?"
msgstr "Haluatko todella lopettaa?"
@@ -11709,57 +11861,57 @@ msgstr "_Teknologiat"
msgid "Foreign Intelligence: %s Empire"
msgstr "Ulkomaantiedustelun raportti: %s-valtakunta"
-#: client/gui-gtk-2.0/mapctrl.c:195 client/gui-sdl/mapctrl.c:2565
+#: client/gui-gtk-2.0/mapctrl.c:179 client/gui-sdl/mapctrl.c:2565
#: client/gui-sdl/menu.c:839 client/gui-sdl/menu.c:1021
#: client/gui-win32/mapctrl.c:353
msgid "Build New City"
msgstr "Perusta uusi kaupunki"
-#: client/gui-gtk-2.0/mapctrl.c:196 client/gui-sdl/mapctrl.c:2594
+#: client/gui-gtk-2.0/mapctrl.c:180 client/gui-sdl/mapctrl.c:2594
#: client/gui-win32/mapctrl.c:354 client/gui-xaw/mapctrl.c:89
msgid "What should we call our new city?"
msgstr "Mikä annetaan uudelle kaupungille nimeksi?"
-#: client/gui-gtk-2.0/mapview.c:147
+#: client/gui-gtk-2.0/mapview.c:158
msgid "Shows your current luxury/science/tax rates;click to toggle them."
msgstr "Näyttää nykyisen luksus/tutkimus/vero -tasosi, napsauta muuttaaksesi."
-#: client/gui-gtk-2.0/mapview.c:692 client/gui-win32/canvas.c:275
+#: client/gui-gtk-2.0/mapview.c:702 client/gui-win32/canvas.c:275
msgid "Better fog will only work in truecolor. Disabling it"
msgstr ""
"Kauniimpi näkymän rajoitus toimii vain täysvärisyystilassa, poistan käytöstä."
-#: client/gui-gtk-2.0/menu.c:250
+#: client/gui-gtk-2.0/menu.c:256
msgid "Leaving a local game will end it!"
msgstr "Jos lähdet paikallispelistä, peli päättyy!"
-#: client/gui-gtk-2.0/menu.c:700 client/gui-win32/menu.c:303
+#: client/gui-gtk-2.0/menu.c:727 client/gui-win32/menu.c:303
msgid "_Game"
msgstr "_Peli"
-#: client/gui-gtk-2.0/menu.c:702 client/gui-gtk-2.0/menu.c:704
-#: client/gui-gtk-2.0/menu.c:706 client/gui-gtk-2.0/menu.c:708
-#: client/gui-gtk-2.0/menu.c:710 client/gui-gtk-2.0/menu.c:712
-#: client/gui-gtk-2.0/menu.c:714 client/gui-gtk-2.0/menu.c:717
-#: client/gui-gtk-2.0/menu.c:720 client/gui-gtk-2.0/menu.c:722
-#: client/gui-gtk-2.0/menu.c:724 client/gui-gtk-2.0/menu.c:726
-#: client/gui-gtk-2.0/menu.c:728 client/gui-gtk-2.0/menu.c:730
-#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:736
-#: client/gui-gtk-2.0/menu.c:738 client/gui-gtk-2.0/menu.c:740
+#: client/gui-gtk-2.0/menu.c:729 client/gui-gtk-2.0/menu.c:731
+#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:735
+#: client/gui-gtk-2.0/menu.c:737 client/gui-gtk-2.0/menu.c:739
+#: client/gui-gtk-2.0/menu.c:741 client/gui-gtk-2.0/menu.c:744
+#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
+#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
+#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
+#: client/gui-gtk-2.0/menu.c:760 client/gui-gtk-2.0/menu.c:763
+#: client/gui-gtk-2.0/menu.c:765 client/gui-gtk-2.0/menu.c:767
#: data/Freeciv.in:2026
msgid "Game"
msgstr "Peli"
-#: client/gui-gtk-2.0/menu.c:704 client/gui-gtk-2.0/menu.c:706
-#: client/gui-gtk-2.0/menu.c:708
+#: client/gui-gtk-2.0/menu.c:731 client/gui-gtk-2.0/menu.c:733
+#: client/gui-gtk-2.0/menu.c:735
msgid "_Chat"
msgstr "K_eskustele"
-#: client/gui-gtk-2.0/menu.c:706 client/gui-win32/menu.c:314
+#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:314
msgid "_Clear Log"
msgstr "Tyhjennä lokitiedosto"
-#: client/gui-gtk-2.0/menu.c:708 client/gui-win32/menu.c:313
+#: client/gui-gtk-2.0/menu.c:735 client/gui-win32/menu.c:313
msgid "_Write Log"
msgstr "_Tallenna loki"
@@ -11771,416 +11923,453 @@ msgstr "_Tallenna loki"
# german translation.
#
# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-#: client/gui-gtk-2.0/menu.c:710 client/gui-win32/menu.c:304
+#: client/gui-gtk-2.0/menu.c:737 client/gui-win32/menu.c:304
msgid "Local _Options"
msgstr "Paikalliset _asetukset"
-#: client/gui-gtk-2.0/menu.c:712 client/gui-win32/menu.c:305
+#: client/gui-gtk-2.0/menu.c:739 client/gui-win32/menu.c:305
msgid "_Message Options"
msgstr "_Viestiasetukset"
-#: client/gui-gtk-2.0/menu.c:717
-#, fuzzy
+#: client/gui-gtk-2.0/menu.c:744
msgid "_Reload Tileset"
-msgstr "Ruutuasetus"
+msgstr "Lataa maapalag_rafiikka uudelleen"
-#: client/gui-gtk-2.0/menu.c:720
+#: client/gui-gtk-2.0/menu.c:747
msgid "Save Options on _Exit"
msgstr "Tallenna valinnat _poistuttaessa"
-#: client/gui-gtk-2.0/menu.c:722
+#: client/gui-gtk-2.0/menu.c:749
msgid "Sa_ve Options"
msgstr "Tallenn_usasetukset"
-#: client/gui-gtk-2.0/menu.c:726 client/gui-win32/menu.c:308
+#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:308
msgid "Server O_ptions"
msgstr "_Palvelimen asetukset"
-#: client/gui-gtk-2.0/menu.c:730 client/gui-win32/menu.c:310
+#: client/gui-gtk-2.0/menu.c:757 client/gui-win32/menu.c:310
msgid "_Save Game"
msgstr "_Tallenna peli"
-#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:311
+#: client/gui-gtk-2.0/menu.c:760 client/gui-win32/menu.c:311
msgid "Save Game _As..."
msgstr "Tallenna peli _nimellä..."
-#: client/gui-gtk-2.0/menu.c:738
+#: client/gui-gtk-2.0/menu.c:765
msgid "_Leave"
msgstr "_Poistu"
-#: client/gui-gtk-2.0/menu.c:740 client/gui-win32/menu.c:317
+#: client/gui-gtk-2.0/menu.c:767 client/gui-win32/menu.c:317
msgid "_Quit"
msgstr "Lopeta"
-#: client/gui-gtk-2.0/menu.c:745 client/gui-win32/menu.c:321
+#: client/gui-gtk-2.0/menu.c:772 client/gui-win32/menu.c:321
msgid "Gov_ernment"
msgstr "Hal_lintomuoto"
-#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
-#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
-#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:774 client/gui-gtk-2.0/menu.c:776
+#: client/gui-gtk-2.0/menu.c:778 client/gui-gtk-2.0/menu.c:780
+#: client/gui-gtk-2.0/menu.c:782 client/gui-gtk-2.0/menu.c:784
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
#: client/gui-xaw/menu.c:248 data/Freeciv.in:2027 data/helpdata.txt:1320
msgid "Government"
msgstr "Hallintomuoto"
-#: client/gui-gtk-2.0/menu.c:749 client/gui-win32/menu.c:322
+#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:322
msgid "_Tax Rates"
msgstr "Vero_asteet"
-#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:324
+#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:324
msgid "_Find City"
msgstr "_Etsi kaupunki"
-#: client/gui-gtk-2.0/menu.c:755 client/gui-win32/menu.c:325
+#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:325
msgid "_Worklists"
msgstr "_Työlistat:"
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
-#: client/gui-gtk-2.0/menu.c:764 client/gui-win32/menu.c:327
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
+#: client/gui-gtk-2.0/menu.c:791 client/gui-win32/menu.c:327
msgid "_Change Government"
-msgstr "Va_ihda hallitusmuotoa"
+msgstr "Va_ihda hallintomuotoa"
-#: client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:788
msgid "_Revolution..."
msgstr "_Vallankumous..."
-#: client/gui-gtk-2.0/menu.c:764 client/gui-gtk-2.0/menu.c:970
+#: client/gui-gtk-2.0/menu.c:791 client/gui-gtk-2.0/menu.c:1013
#: client/gui-win32/menu.c:431
msgid "_Government"
-msgstr "_Hallitusmuoto"
+msgstr "_Hallintomuoto"
-#: client/gui-gtk-2.0/menu.c:768 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:795 client/gui-gtk-2.0/menu.c:959
#: client/gui-win32/menu.c:334
msgid "_View"
msgstr "_Näytä"
-#: client/gui-gtk-2.0/menu.c:772
+#: client/gui-gtk-2.0/menu.c:799
msgid "City Outlines"
msgstr "Kaupunkien ääriviivat"
-#: client/gui-gtk-2.0/menu.c:774 client/gui-win32/menu.c:335
+#: client/gui-gtk-2.0/menu.c:801 client/gui-win32/menu.c:335
msgid "Map _Grid"
msgstr "Koordinaatisto"
-#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:336
+#: client/gui-gtk-2.0/menu.c:803 client/gui-win32/menu.c:336
msgid "National _Borders"
msgstr "Valtioiden rajat"
-#: client/gui-gtk-2.0/menu.c:778 client/gui-win32/menu.c:337
+#: client/gui-gtk-2.0/menu.c:805 client/gui-win32/menu.c:337
msgid "City _Names"
msgstr "Kaupunkien nimet"
-#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:338
+#: client/gui-gtk-2.0/menu.c:807 client/gui-win32/menu.c:338
msgid "City G_rowth"
msgstr "Kaupunkien kasvu"
-#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:339
+#: client/gui-gtk-2.0/menu.c:809 client/gui-win32/menu.c:339
msgid "City _Productions"
msgstr "Kaupunkien tuotanto"
-#: client/gui-gtk-2.0/menu.c:784 client/gui-sdl/optiondlg.c:1719
+#: client/gui-gtk-2.0/menu.c:811
+#, fuzzy
+msgid "City Buy Cost"
+msgstr "Kokonaismenot: %d"
+
+#: client/gui-gtk-2.0/menu.c:813
+msgid "City Traderoutes"
+msgstr "Kaupunkien kauppareitit"
+
+#: client/gui-gtk-2.0/menu.c:815 client/gui-sdl/optiondlg.c:1719
msgid "Draw city worker map grid"
msgstr "Piirrä kaupungin työläiskartan ruudukko"
-#: client/gui-gtk-2.0/menu.c:788 client/gui-sdl/optiondlg.c:1635
+#: client/gui-gtk-2.0/menu.c:819 client/gui-sdl/optiondlg.c:1635
#: client/gui-win32/menu.c:340 client/gui-xaw/menu.c:148
#: client/gui-xaw/menu.c:246 manual/civmanual.c:220 data/helpdata.txt:1220
msgid "Terrain"
msgstr "Maasto"
-#: client/gui-gtk-2.0/menu.c:790 client/gui-win32/menu.c:341
+#: client/gui-gtk-2.0/menu.c:821 client/gui-win32/menu.c:341
#: client/gui-xaw/menu.c:149
msgid "Coastline"
msgstr "Rantaviiva"
-#: client/gui-gtk-2.0/menu.c:796 client/gui-win32/menu.c:343
+#: client/gui-gtk-2.0/menu.c:827 client/gui-win32/menu.c:343
msgid "Roads & Rails"
msgstr "Tiet ja rautatiet"
-#: client/gui-gtk-2.0/menu.c:800 client/gui-sdl/optiondlg.c:1933
+#: client/gui-gtk-2.0/menu.c:831 client/gui-sdl/optiondlg.c:1933
#: client/gui-win32/menu.c:345 client/gui-xaw/menu.c:152
msgid "Mines"
msgstr "Kaivokset"
-#: client/gui-gtk-2.0/menu.c:802 client/gui-win32/menu.c:346
+#: client/gui-gtk-2.0/menu.c:833 client/gui-win32/menu.c:346
msgid "Fortress & Airbase"
msgstr "Tukikohdat"
-#: client/gui-gtk-2.0/menu.c:804 client/gui-win32/menu.c:348
+#: client/gui-gtk-2.0/menu.c:835 client/gui-win32/menu.c:348
#: client/gui-xaw/menu.c:154
msgid "Specials"
msgstr "Erityispiirteet"
# *** Depends too much on the context, phenomenom pollution & 'substance' pollution
# aren't the same. ***
-#: client/gui-gtk-2.0/menu.c:806 client/gui-win32/menu.c:349
+#: client/gui-gtk-2.0/menu.c:837 client/gui-win32/menu.c:349
#: client/gui-xaw/menu.c:155
msgid "Pollution & Fallout"
msgstr "Saasteet & laskeuma"
-#: client/gui-gtk-2.0/menu.c:812 client/gui-win32/menu.c:352
+#: client/gui-gtk-2.0/menu.c:843 client/gui-win32/menu.c:352
#: client/gui-xaw/menu.c:158
msgid "Focus Unit"
msgstr "Keskitä yksikköön"
-#: client/gui-gtk-2.0/menu.c:814 client/gui-sdl/optiondlg.c:1854
+#: client/gui-gtk-2.0/menu.c:845 client/gui-sdl/optiondlg.c:1854
#: client/gui-win32/menu.c:353 client/gui-xaw/menu.c:159
msgid "Fog of War"
msgstr "Rajoitettu näkymä"
-#: client/gui-gtk-2.0/menu.c:818
+#: client/gui-gtk-2.0/menu.c:849
msgid "_Full Screen"
msgstr "_Kokoruututila"
-#: client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/menu.c:853
msgid "_Center View"
msgstr "Keskitä näyttö"
-#: client/gui-gtk-2.0/menu.c:825 client/gui-win32/menu.c:358
+#: client/gui-gtk-2.0/menu.c:856 client/gui-win32/menu.c:358
msgid "_Orders"
msgstr "_Komennot"
-#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
-#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
-#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
-#: client/gui-gtk-2.0/menu.c:855 client/gui-gtk-2.0/menu.c:857
-#: client/gui-gtk-2.0/menu.c:859 client/gui-gtk-2.0/menu.c:861
-#: client/gui-gtk-2.0/menu.c:863 client/gui-gtk-2.0/menu.c:865
-#: client/gui-gtk-2.0/menu.c:867 client/gui-gtk-2.0/menu.c:869
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875 client/gui-gtk-2.0/menu.c:877
-#: client/gui-gtk-2.0/menu.c:879 client/gui-gtk-2.0/menu.c:881
-#: client/gui-gtk-2.0/menu.c:883 client/gui-gtk-2.0/menu.c:885
-#: client/gui-gtk-2.0/menu.c:887 client/gui-gtk-2.0/menu.c:889
-#: client/gui-gtk-2.0/menu.c:891 client/gui-gtk-2.0/menu.c:893
-#: client/gui-gtk-2.0/menu.c:895 client/gui-gtk-2.0/menu.c:897
-#: client/gui-gtk-2.0/menu.c:899 client/gui-gtk-2.0/menu.c:901
-#: client/gui-gtk-2.0/menu.c:903 data/Freeciv.in:2029
+#: client/gui-gtk-2.0/menu.c:858 client/gui-gtk-2.0/menu.c:860
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:864
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:868
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:872
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:876
+#: client/gui-gtk-2.0/menu.c:878 client/gui-gtk-2.0/menu.c:880
+#: client/gui-gtk-2.0/menu.c:882 client/gui-gtk-2.0/menu.c:884
+#: client/gui-gtk-2.0/menu.c:886 client/gui-gtk-2.0/menu.c:888
+#: client/gui-gtk-2.0/menu.c:890 client/gui-gtk-2.0/menu.c:892
+#: client/gui-gtk-2.0/menu.c:894 client/gui-gtk-2.0/menu.c:896
+#: client/gui-gtk-2.0/menu.c:898 client/gui-gtk-2.0/menu.c:900
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906 client/gui-gtk-2.0/menu.c:908
+#: client/gui-gtk-2.0/menu.c:910 client/gui-gtk-2.0/menu.c:912
+#: client/gui-gtk-2.0/menu.c:914 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:918 client/gui-gtk-2.0/menu.c:920
+#: client/gui-gtk-2.0/menu.c:922 client/gui-gtk-2.0/menu.c:924
+#: client/gui-gtk-2.0/menu.c:926 client/gui-gtk-2.0/menu.c:928
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
+#: client/gui-gtk-2.0/menu.c:946 data/Freeciv.in:2029
msgid "Orders"
msgstr "Komennot"
-#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:1444
+#: client/gui-gtk-2.0/menu.c:860 client/gui-gtk-2.0/menu.c:1489
#: client/gui-win32/menu.c:359
msgid "_Build City"
msgstr "Perusta kaupunki"
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:1466
-#: client/gui-gtk-2.0/menu.c:1472 client/gui-win32/menu.c:360
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:1511
+#: client/gui-gtk-2.0/menu.c:1517 client/gui-win32/menu.c:360
msgid "Build _Road"
msgstr "Rakenna tie"
-#: client/gui-gtk-2.0/menu.c:833 client/gui-gtk-2.0/menu.c:1360
+#: 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 "Rakenna kasteluverkosto"
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:1361
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:1406
#: client/gui-win32/menu.c:362
msgid "Build _Mine"
msgstr "Perusta kaivos"
-#: client/gui-gtk-2.0/menu.c:837 client/gui-gtk-2.0/menu.c:1362
+#: client/gui-gtk-2.0/menu.c:868 client/gui-gtk-2.0/menu.c:1407
msgid "Transf_orm Terrain"
msgstr "Muokkaa maastoa"
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:1508
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:1553
#: client/gui-win32/menu.c:364
msgid "Build _Fortress"
msgstr "Rakenna linnoitus"
-#: client/gui-gtk-2.0/menu.c:841 client/gui-win32/menu.c:365
+#: client/gui-gtk-2.0/menu.c:872 client/gui-win32/menu.c:365
msgid "Build Airbas_e"
msgstr "Rakenna lentokenttä"
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:1514
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:1559
#: client/gui-win32/menu.c:366
msgid "Clean _Pollution"
msgstr "Puhdista saasteet"
-#: client/gui-gtk-2.0/menu.c:845 client/gui-win32/menu.c:367
+#: client/gui-gtk-2.0/menu.c:876 client/gui-win32/menu.c:367
msgid "Clean _Nuclear Fallout"
msgstr "Puhdista ydinlaskeuma"
-#: client/gui-gtk-2.0/menu.c:849 client/gui-win32/menu.c:369
+#: client/gui-gtk-2.0/menu.c:880 client/gui-win32/menu.c:369
msgid "_Sentry"
msgstr "Leiriydy"
-#: client/gui-gtk-2.0/menu.c:855 client/gui-win32/menu.c:372
+#: client/gui-gtk-2.0/menu.c:886 client/gui-win32/menu.c:372
msgid "Make _Homecity"
msgstr "Vaihda kotikaupungiksi"
-#: client/gui-gtk-2.0/menu.c:857 client/gui-win32/menu.c:373
+#: client/gui-gtk-2.0/menu.c:888 client/gui-win32/menu.c:373
msgid "_Load"
msgstr "_Lastaa"
-#: client/gui-gtk-2.0/menu.c:859
+#: client/gui-gtk-2.0/menu.c:890
msgid "_Unload Transporter"
msgstr "_Pura rahtilaiva"
-#: client/gui-gtk-2.0/menu.c:861 client/gui-win32/menu.c:374
+#: client/gui-gtk-2.0/menu.c:892 client/gui-win32/menu.c:374
msgid "_Unload"
msgstr "Pura lasti"
-#: client/gui-gtk-2.0/menu.c:863 client/gui-win32/menu.c:375
+#: client/gui-gtk-2.0/menu.c:894 client/gui-win32/menu.c:375
msgid "Wake up o_thers"
msgstr "Herätä toiset"
-#: client/gui-gtk-2.0/menu.c:867
+#: client/gui-gtk-2.0/menu.c:898
msgid "_Auto Settler"
msgstr "Automaattinen uudisraivaaja"
-#: client/gui-gtk-2.0/menu.c:869 client/gui-win32/menu.c:378
+#: client/gui-gtk-2.0/menu.c:900 client/gui-win32/menu.c:378
msgid "Auto E_xplore"
msgstr "Kartoita automaattisesti"
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906
msgid "_Connect"
msgstr "Yhdistä"
-#: client/gui-gtk-2.0/menu.c:871 client/gui-win32/menu.c:380
+#: client/gui-gtk-2.0/menu.c:902 client/gui-win32/menu.c:380
msgid "_Road"
msgstr "_Tie"
-#: client/gui-gtk-2.0/menu.c:873 client/gui-win32/menu.c:381
+#: client/gui-gtk-2.0/menu.c:904 client/gui-win32/menu.c:381
msgid "Rai_l"
msgstr "R_autatie"
-#: client/gui-gtk-2.0/menu.c:875 client/gui-win32/menu.c:382
+#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:382
msgid "_Irrigate"
msgstr "_Kastele"
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
msgid "Go _to"
msgstr "Mene koh_teeseen"
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
msgid "_Build city"
msgstr "_Perusta kaupunki"
-#: client/gui-gtk-2.0/menu.c:879
+#: client/gui-gtk-2.0/menu.c:910
msgid "Patrol (_Q)"
msgstr "Partioi"
-#: client/gui-gtk-2.0/menu.c:881 client/gui-win32/menu.c:385
+#: client/gui-gtk-2.0/menu.c:912 client/gui-win32/menu.c:385
msgid "_Go to"
msgstr "Mene"
-#: client/gui-gtk-2.0/menu.c:883
+#: client/gui-gtk-2.0/menu.c:914
msgid "Go\\/Airlift to City"
msgstr "Mene tai lennätä kaupunkiin"
-#: client/gui-gtk-2.0/menu.c:885 client/gui-sdl/menu.c:450
+#: client/gui-gtk-2.0/menu.c:916 client/gui-sdl/menu.c:450
#: client/gui-win32/menu.c:387 client/gui-xaw/menu.c:203
msgid "Return to nearest city"
msgstr "Palaa lähimpään kaupunkiin"
-#: client/gui-gtk-2.0/menu.c:889 client/gui-win32/menu.c:389
+#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:389
#: client/gui-xaw/menu.c:205
msgid "Disband Unit"
msgstr "Lakkauta yksikkö"
-#: client/gui-gtk-2.0/menu.c:891 client/gui-sdl/citydlg.c:532
+#: client/gui-gtk-2.0/menu.c:922 client/gui-sdl/citydlg.c:532
#: data/Freeciv.in:1186
msgid "Upgrade unit"
msgstr "Ajanmukaista yksikkö"
-#: client/gui-gtk-2.0/menu.c:893
+#: client/gui-gtk-2.0/menu.c:924
msgid "Diplomat\\/Spy Actions"
msgstr "Diplomaatin tai vakoojan toiminta"
-#: client/gui-gtk-2.0/menu.c:895 client/gui-sdl/menu.c:399
+#: client/gui-gtk-2.0/menu.c:926 client/gui-sdl/menu.c:399
#: client/gui-win32/menu.c:391 client/gui-xaw/menu.c:209
msgid "Explode Nuclear"
msgstr "Räjäytä ydinlataus"
-#: client/gui-gtk-2.0/menu.c:899
-msgid "Select same type"
-msgstr "Valitse sama tyyppi"
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/cityrep.c:882
+msgid "Select"
+msgstr "Valitse"
-#: client/gui-gtk-2.0/menu.c:901 client/gui-win32/menu.c:393
+#: client/gui-gtk-2.0/menu.c:934
+#, fuzzy
+msgid "Single"
+msgstr "viidakko"
+
+#: client/gui-gtk-2.0/menu.c:936
+#, fuzzy
+msgid "Same Type On Tile"
+msgstr "Valitse sama tyyppi kohdassa"
+
+#: client/gui-gtk-2.0/menu.c:938
+msgid "All On Tile"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:940
+#, fuzzy
+msgid "Same Type On Continent"
+msgstr "Valitse sama tyyppi kohdassa"
+
+#: client/gui-gtk-2.0/menu.c:942
+msgid "Same Type Everywhere"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:393
msgid "_Wait"
msgstr "Odota"
-#: client/gui-gtk-2.0/menu.c:903 client/gui-win32/menu.c:394
+#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:394
#: client/gui-xaw/menu.c:213
msgid "Done"
msgstr "Valmis"
-#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:398
+#: client/gui-gtk-2.0/menu.c:949 client/gui-win32/menu.c:398
msgid "_Reports"
msgstr "_Raportit"
-#: client/gui-gtk-2.0/menu.c:908 client/gui-gtk-2.0/menu.c:910
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:914
-#: client/gui-gtk-2.0/menu.c:916 client/gui-gtk-2.0/menu.c:918
-#: client/gui-gtk-2.0/menu.c:920 client/gui-gtk-2.0/menu.c:922
-#: client/gui-gtk-2.0/menu.c:924 client/gui-gtk-2.0/menu.c:926
-#: client/gui-gtk-2.0/menu.c:928 client/gui-gtk-2.0/menu.c:930
-#: client/gui-gtk-2.0/menu.c:932 data/Freeciv.in:2030
+#: client/gui-gtk-2.0/menu.c:951 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:957
+#: client/gui-gtk-2.0/menu.c:959 client/gui-gtk-2.0/menu.c:961
+#: client/gui-gtk-2.0/menu.c:963 client/gui-gtk-2.0/menu.c:965
+#: client/gui-gtk-2.0/menu.c:967 client/gui-gtk-2.0/menu.c:969
+#: client/gui-gtk-2.0/menu.c:971 client/gui-gtk-2.0/menu.c:973
+#: client/gui-gtk-2.0/menu.c:975 data/Freeciv.in:2030
msgid "Reports"
msgstr "Raportit"
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:958
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:1001
#: client/gui-win32/menu.c:400 client/gui-win32/menu.c:425
msgid "_Units"
msgstr "_Yksiköt"
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/menu.c:914 client/gui-win32/menu.c:402
+#: client/gui-gtk-2.0/menu.c:957 client/gui-win32/menu.c:402
msgid "_Nations"
msgstr "_Kansakunnat"
-#: client/gui-gtk-2.0/menu.c:918 client/gui-win32/menu.c:403
+#: client/gui-gtk-2.0/menu.c:961 client/gui-win32/menu.c:403
msgid "_Economy"
msgstr "_Talous"
#. TRANS: Research report action
-#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:405
+#: client/gui-gtk-2.0/menu.c:963 client/gui-win32/menu.c:405
msgid "_Research"
msgstr "_Tutkimus"
-#: client/gui-gtk-2.0/menu.c:924 client/gui-win32/menu.c:407
+#: client/gui-gtk-2.0/menu.c:967 client/gui-win32/menu.c:407
msgid "_Wonders of the World"
msgstr "Maailman _ihmeet"
-#: client/gui-gtk-2.0/menu.c:926 client/gui-win32/menu.c:408
+#: client/gui-gtk-2.0/menu.c:969 client/gui-win32/menu.c:408
msgid "_Top Five Cities"
msgstr "_Tärkeimmät kaupungit"
-#: client/gui-gtk-2.0/menu.c:928 client/gui-win32/menu.c:409
+#: client/gui-gtk-2.0/menu.c:971 client/gui-win32/menu.c:409
msgid "_Messages"
msgstr "_Viestit"
-#: client/gui-gtk-2.0/menu.c:930 client/gui-win32/menu.c:410
+#: client/gui-gtk-2.0/menu.c:973 client/gui-win32/menu.c:410
msgid "_Demographics"
msgstr "_Tilastotietoa"
-#: client/gui-gtk-2.0/menu.c:932 client/gui-gtk-2.0/plrdlg.c:471
+#: client/gui-gtk-2.0/menu.c:975 client/gui-gtk-2.0/plrdlg.c:354
#: client/gui-win32/menu.c:411
msgid "_Spaceship"
msgstr "_Avaruusalus"
-#: client/gui-gtk-2.0/menu.c:936 client/gui-win32/menu.c:415
+#: client/gui-gtk-2.0/menu.c:979 client/gui-win32/menu.c:415
msgid "_Help"
msgstr "O_hje"
-#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
-#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
-#: client/gui-gtk-2.0/menu.c:946 client/gui-gtk-2.0/menu.c:948
-#: client/gui-gtk-2.0/menu.c:950 client/gui-gtk-2.0/menu.c:952
-#: client/gui-gtk-2.0/menu.c:954 client/gui-gtk-2.0/menu.c:956
-#: client/gui-gtk-2.0/menu.c:958 client/gui-gtk-2.0/menu.c:960
-#: client/gui-gtk-2.0/menu.c:962 client/gui-gtk-2.0/menu.c:964
-#: client/gui-gtk-2.0/menu.c:966 client/gui-gtk-2.0/menu.c:968
-#: client/gui-gtk-2.0/menu.c:970 client/gui-gtk-2.0/menu.c:972
-#: client/gui-gtk-2.0/menu.c:974 client/gui-gtk-2.0/menu.c:976
-#: client/gui-gtk-2.0/menu.c:978 client/gui-gtk-2.0/menu.c:980
+#: client/gui-gtk-2.0/menu.c:981 client/gui-gtk-2.0/menu.c:983
+#: client/gui-gtk-2.0/menu.c:985 client/gui-gtk-2.0/menu.c:987
+#: client/gui-gtk-2.0/menu.c:989 client/gui-gtk-2.0/menu.c:991
+#: client/gui-gtk-2.0/menu.c:993 client/gui-gtk-2.0/menu.c:995
+#: client/gui-gtk-2.0/menu.c:997 client/gui-gtk-2.0/menu.c:999
+#: client/gui-gtk-2.0/menu.c:1001 client/gui-gtk-2.0/menu.c:1003
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-gtk-2.0/menu.c:1007
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-gtk-2.0/menu.c:1011
+#: client/gui-gtk-2.0/menu.c:1013 client/gui-gtk-2.0/menu.c:1015
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-gtk-2.0/menu.c:1019
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-gtk-2.0/menu.c:1023
#: client/gui-gtk-2.0/repodlgs.c:313 client/gui-win32/citydlg.c:1077
#: client/gui-win32/repodlgs.c:289 client/gui-win32/wldlg.c:846
#: data/Freeciv.in:1466 data/Freeciv.in:2031 data/Freeciv.in:2101
@@ -12188,119 +12377,119 @@ msgstr "O_hje"
msgid "Help"
msgstr "Ohje"
-#: client/gui-gtk-2.0/menu.c:940 client/gui-win32/menu.c:416
+#: client/gui-gtk-2.0/menu.c:983 client/gui-win32/menu.c:416
msgid "Language_s"
msgstr "_Kielet"
-#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/menu.c:417
+#: client/gui-gtk-2.0/menu.c:985 client/gui-win32/menu.c:417
msgid "Co_nnecting"
msgstr "Yhdistämi_nen"
-#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:418
+#: client/gui-gtk-2.0/menu.c:987 client/gui-win32/menu.c:418
msgid "C_ontrols"
msgstr "K_ontrollit"
-#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:419
+#: client/gui-gtk-2.0/menu.c:989 client/gui-win32/menu.c:419
msgid "C_hatline"
msgstr "C_hattilinja"
-#: client/gui-gtk-2.0/menu.c:948 client/gui-win32/menu.c:420
+#: client/gui-gtk-2.0/menu.c:991 client/gui-win32/menu.c:420
msgid "_Worklist Editor"
msgstr "_Työlista"
-#: client/gui-gtk-2.0/menu.c:950 client/gui-win32/menu.c:421
+#: client/gui-gtk-2.0/menu.c:993 client/gui-win32/menu.c:421
msgid "Citizen _Management"
msgstr "Kaupunkiapuri"
-#: client/gui-gtk-2.0/menu.c:952 client/gui-win32/menu.c:422
+#: client/gui-gtk-2.0/menu.c:995 client/gui-win32/menu.c:422
msgid "_Playing"
msgstr "_Pelaaminen"
-#: client/gui-gtk-2.0/menu.c:956 client/gui-win32/menu.c:424
+#: client/gui-gtk-2.0/menu.c:999 client/gui-win32/menu.c:424
msgid "City _Improvements"
msgstr "Rakennushankkeet"
-#: client/gui-gtk-2.0/menu.c:960 client/gui-win32/menu.c:426
+#: client/gui-gtk-2.0/menu.c:1003 client/gui-win32/menu.c:426
msgid "Com_bat"
msgstr "Taisteleminen"
-#: client/gui-gtk-2.0/menu.c:962 client/gui-win32/menu.c:427
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-win32/menu.c:427
msgid "_ZOC"
msgstr "_Valvonta-alueet"
-#: client/gui-gtk-2.0/menu.c:964 client/gui-win32/menu.c:428
+#: client/gui-gtk-2.0/menu.c:1007 client/gui-win32/menu.c:428
msgid "Techno_logy"
msgstr "Tekno_logiat"
-#: client/gui-gtk-2.0/menu.c:966 client/gui-win32/menu.c:429
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-win32/menu.c:429
msgid "_Terrain"
msgstr "_Maasto"
-#: client/gui-gtk-2.0/menu.c:968 client/gui-win32/menu.c:430
+#: client/gui-gtk-2.0/menu.c:1011 client/gui-win32/menu.c:430
msgid "Won_ders"
msgstr "I_hmeet"
-#: client/gui-gtk-2.0/menu.c:972 client/gui-win32/menu.c:432
+#: client/gui-gtk-2.0/menu.c:1015 client/gui-win32/menu.c:432
msgid "Happin_ess"
msgstr "Onn_ellisuus"
-#: client/gui-gtk-2.0/menu.c:974 client/gui-win32/menu.c:433
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-win32/menu.c:433
msgid "Space _Race"
msgstr "Ava_ruuden kilpajuoksu"
-#: client/gui-gtk-2.0/menu.c:978 client/gui-win32/menu.c:435
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-win32/menu.c:435
msgid "_Copying"
msgstr "_Kopiointi"
-#: client/gui-gtk-2.0/menu.c:980 client/gui-win32/menu.c:436
+#: client/gui-gtk-2.0/menu.c:1023 client/gui-win32/menu.c:436
msgid "_About"
msgstr "_Pelistä"
-#: client/gui-gtk-2.0/menu.c:1264
-#, fuzzy, c-format
+#: client/gui-gtk-2.0/menu.c:1307
+#, c-format
msgid "%s..."
-msgstr "Hupsista..."
+msgstr "%s..."
-#: client/gui-gtk-2.0/menu.c:1352
+#: client/gui-gtk-2.0/menu.c:1397
#, c-format
msgid "Change to %s (_I)"
msgstr "Tee tästä %s"
-#: client/gui-gtk-2.0/menu.c:1353
+#: client/gui-gtk-2.0/menu.c:1398
#, c-format
msgid "Change to %s (_M)"
msgstr "Tee tästä %s"
-#: client/gui-gtk-2.0/menu.c:1354
+#: client/gui-gtk-2.0/menu.c:1399
#, c-format
msgid "Transf_orm to %s"
msgstr "Muunna tästä %s"
-#: client/gui-gtk-2.0/menu.c:1427
+#: client/gui-gtk-2.0/menu.c:1472
msgid "Help _Build Wonder"
msgstr "Auta ihmeen toteuttamisessa"
-#: client/gui-gtk-2.0/menu.c:1441
+#: client/gui-gtk-2.0/menu.c:1486
msgid "Add to City (_B)"
msgstr "Lisää tähän kaupunkiin"
-#: client/gui-gtk-2.0/menu.c:1449
+#: client/gui-gtk-2.0/menu.c:1494
msgid "Make Trade _Route"
msgstr "Perusta kauppareitti"
-#: client/gui-gtk-2.0/menu.c:1463
+#: client/gui-gtk-2.0/menu.c:1508
msgid "Build _Railroad"
msgstr "Rakenna rautatie"
-#: client/gui-gtk-2.0/menu.c:1486
+#: client/gui-gtk-2.0/menu.c:1531
msgid "Bu_ild Farmland"
msgstr "Raivaa peltomaaksi"
-#: client/gui-gtk-2.0/menu.c:1506
+#: client/gui-gtk-2.0/menu.c:1551
msgid "_Fortify"
msgstr "Linnoittaudu"
-#: client/gui-gtk-2.0/menu.c:1512
+#: client/gui-gtk-2.0/menu.c:1557
msgid "_Paradrop"
msgstr "Pudota laskuvarjolla"
@@ -12310,15 +12499,16 @@ msgid "Message Options"
msgstr "Viestiasetukset"
# Do not translate tag contents.
+# ? Is this a comment of ours? Can't be. The elements are translated below!
#: client/gui-gtk-2.0/messagedlg.c:71
-#, fuzzy
msgid ""
"Where to display messages?\n"
"<b>Out</b>put window ; <b>Mes</b>sages window ; <b>Pop</b>up individual "
"window"
msgstr ""
"Missä viestit näytetään?\n"
-"<b>Tek</b>sti-ikkunassa; <b>Vie</b>sti-ikkunassa; <b>Eri<b>llisessä ikkunassa"
+"<b>Tek</b>sti-ikkunassa; <b>Vie</b>sti-ikkunassa; <b>Eri</b>llisessä "
+"ikkunassa"
#: client/gui-gtk-2.0/messagedlg.c:117
msgid "Event"
@@ -12336,13 +12526,31 @@ msgstr "Vie"
msgid "Pop"
msgstr "Eri"
-#: client/gui-gtk-2.0/messagewin.c:155 client/gui-sdl/messagewin.c:247
+#: client/gui-gtk-2.0/messagewin.c:186 client/gui-sdl/messagewin.c:247
#: client/gui-win32/messagewin.c:132 client/gui-xaw/menu.c:228
#: data/Freeciv.in:3273 data/Freeciv.in:3274 data/Freeciv.in:3283
msgid "Messages"
msgstr "Viestit"
-#: client/gui-gtk-2.0/plrdlg.c:330
+#: client/gui-gtk-2.0/plrdlg.c:317
+msgid "_Meet"
+msgstr "Tapaa"
+
+#: client/gui-gtk-2.0/plrdlg.c:323
+msgid "Cancel _Treaty"
+msgstr "Pura _sopimus"
+
+#: client/gui-gtk-2.0/plrdlg.c:329
+#, fuzzy
+msgid "_Withdraw Vision"
+msgstr "Lopeta näkymä"
+
+#: client/gui-gtk-2.0/plrdlg.c:348
+#, fuzzy
+msgid "_Report"
+msgstr "_Raportit"
+
+#: client/gui-gtk-2.0/plrdlg.c:386
msgid "?show:Dead Players"
msgstr "Kuolleet pelaajat"
@@ -12350,267 +12558,269 @@ msgstr "Kuolleet pelaajat"
#. TRANS: Nations report action
#. TRANS: Nations report title
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/plrdlg.c:350 client/gui-sdl/mapctrl.c:1580
+#: client/gui-gtk-2.0/plrdlg.c:406 client/gui-sdl/mapctrl.c:1580
#: client/gui-sdl/plrdlg.c:608 client/gui-win32/plrdlg.c:344
#: client/gui-xaw/menu.c:221 data/Freeciv.in:3192 data/Freeciv.in:3193
msgid "Nations"
msgstr "Kansakunnat"
-#: client/gui-gtk-2.0/plrdlg.c:443
+#: client/gui-gtk-2.0/plrdlg.c:511
+#, fuzzy
+msgid "Di_plomacy"
+msgstr "Diplomatia"
+
+#: client/gui-gtk-2.0/plrdlg.c:516
msgid "_Intelligence"
msgstr "Tiedustelupalvelu"
-#: client/gui-gtk-2.0/plrdlg.c:450
-msgid "_Meet"
-msgstr "Tapaa"
-
-#: client/gui-gtk-2.0/plrdlg.c:457
-msgid "Cancel _Treaty"
-msgstr "Pura _sopimus"
-
-#: client/gui-gtk-2.0/plrdlg.c:464
-msgid "_Withdraw vision"
-msgstr "Lopeta näkymä"
-
-#: client/gui-gtk-2.0/plrdlg.c:495
+#: client/gui-gtk-2.0/plrdlg.c:526
msgid "_AI"
msgstr "_AI"
-#: client/gui-gtk-2.0/plrdlg.c:501
+#: client/gui-gtk-2.0/plrdlg.c:532
msgid "_Toggle AI Mode"
msgstr "Aseta AI-_tila"
-#: client/gui-gtk-2.0/pages.c:208
+#: client/gui-gtk-2.0/pages.c:221
msgid "Start _New Game"
msgstr "Aloita _uusi peli"
-#: client/gui-gtk-2.0/pages.c:214
+#: client/gui-gtk-2.0/pages.c:227
msgid "Start _Scenario Game"
msgstr "Aloita _skenaariopeli"
-#: client/gui-gtk-2.0/pages.c:220
+#: client/gui-gtk-2.0/pages.c:233
msgid "_Load Saved Game"
msgstr "_Lataa tallennettu peli"
-#: client/gui-gtk-2.0/pages.c:229
+#: client/gui-gtk-2.0/pages.c:239
msgid "C_onnect to Network Game"
msgstr "_Yhdistä verkkopeliin"
-#: client/gui-gtk-2.0/pages.c:236
+#: client/gui-gtk-2.0/pages.c:247
msgid "Connect to Gaming _Zone"
msgstr "Yhdistä verkkopeliin"
-#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:300
#: client/gui-xaw/connectdlg.c:326
msgid "Passwords don't match, enter password."
msgstr "Salasanat eivät täsmää, anna salasana."
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:779 client/gui-gtk-2.0/pages.c:820
+#: client/gui-win32/connectdlg.c:916
msgid "Server Name"
msgstr "Palvelimen nimi"
-#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
+#: 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
+#: data/Freeciv.in:96
msgid "Port"
msgstr "Portti"
-#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
+#: client/gui-win32/connectdlg.c:917
msgid "Version"
msgstr "Versio"
-#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
-#: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
+#: 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
msgid "Status"
msgstr "Tila"
-#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
-#: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
+#: 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
msgid "Players"
msgstr "Pelaajat"
-#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
+#: client/gui-win32/connectdlg.c:918
msgid "Comment"
msgstr "Lisätiedot"
-#: client/gui-gtk-2.0/pages.c:747
+#: client/gui-gtk-2.0/pages.c:786
msgid "Local _Area Network"
msgstr "Paikallisverkko (_LAN)"
-#: client/gui-gtk-2.0/pages.c:783
+#: client/gui-gtk-2.0/pages.c:827
msgid "Internet _Metaserver"
msgstr "Internet-metapalvelin"
-#: client/gui-gtk-2.0/pages.c:817
+#: client/gui-gtk-2.0/pages.c:864
msgid "_Host:"
msgstr "Palvelin:"
-#: client/gui-gtk-2.0/pages.c:834
+#: client/gui-gtk-2.0/pages.c:881
msgid "_Port:"
msgstr "_Portti:"
-#: client/gui-gtk-2.0/pages.c:851
+#: client/gui-gtk-2.0/pages.c:898
msgid "_Login:"
msgstr "Kirjaudu sisään:"
-#: client/gui-gtk-2.0/pages.c:869
+#: client/gui-gtk-2.0/pages.c:916
msgid "Pass_word:"
msgstr "Sala_sana:"
-#: client/gui-gtk-2.0/pages.c:887
+#: client/gui-gtk-2.0/pages.c:934
msgid "Conf_irm Password:"
msgstr "Vahv_ista salasana:"
-#: client/gui-gtk-2.0/pages.c:912
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: 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/wldlg.c:800 client/gui-win32/wldlg.c:806
+msgid "Type"
+msgstr "Yksikön tyyppi"
+
+#: client/gui-gtk-2.0/pages.c:952 client/gui-win32/plrdlg.c:337
+#: data/Freeciv.in:88
+msgid "Host"
+msgstr "Palvelin"
+
+#: client/gui-gtk-2.0/pages.c:981
msgid "C_onnect"
msgstr "_Yhdistä"
-#: client/gui-gtk-2.0/pages.c:1142
+#: client/gui-gtk-2.0/pages.c:1211
#, c-format
msgid "Connection name: %s"
msgstr "Yhteyden nimi: %s"
-#: client/gui-gtk-2.0/pages.c:1145
+#: client/gui-gtk-2.0/pages.c:1214
#, c-format
msgid "Player name: %s"
msgstr "Pelaajan nimi: %s"
-#: client/gui-gtk-2.0/pages.c:1150
+#: client/gui-gtk-2.0/pages.c:1219
#, c-format
msgid "Host: %s"
msgstr "Palvelin: %s"
-#: client/gui-gtk-2.0/pages.c:1158
+#: client/gui-gtk-2.0/pages.c:1227
msgid "Player/conn info"
msgstr "Pelaaja/yht-tiedot"
-#: client/gui-gtk-2.0/pages.c:1185
+#: client/gui-gtk-2.0/pages.c:1254
#, c-format
msgid "%s info"
msgstr "%s-tiedot"
-#: client/gui-gtk-2.0/pages.c:1196
+#: client/gui-gtk-2.0/pages.c:1265
msgid "Toggle player ready"
msgstr "Vaihda pelaajan valmiustilaa"
-#: client/gui-gtk-2.0/pages.c:1204
+#: client/gui-gtk-2.0/pages.c:1273
msgid "Pick nation"
msgstr "Valitse kansakunta"
-#: client/gui-gtk-2.0/pages.c:1214
+#: client/gui-gtk-2.0/pages.c:1283
msgid "Observe this player"
msgstr "Tarkkaile tätä pelaajaa"
-#: client/gui-gtk-2.0/pages.c:1221
+#: client/gui-gtk-2.0/pages.c:1290
msgid "Take this player"
msgstr "Ota tämä pelaaja"
-#: client/gui-gtk-2.0/pages.c:1238
+#: client/gui-gtk-2.0/pages.c:1307
msgid "Cut connection"
msgstr "Katkaise yhteys"
-#: client/gui-gtk-2.0/pages.c:1248
-#, fuzzy
+#: client/gui-gtk-2.0/pages.c:1317
msgid "Aitoggle player"
-msgstr "aitoggle <pelaajan nimi>"
+msgstr "Vaihda pelaaja AI-hallintaan/hallinnasta"
-#: client/gui-gtk-2.0/pages.c:1257
+#: client/gui-gtk-2.0/pages.c:1326
msgid "Remove player"
msgstr "Poista pelaaja"
-#: client/gui-gtk-2.0/pages.c:1268
+#: client/gui-gtk-2.0/pages.c:1337
msgid "Give info access"
-msgstr ""
+msgstr "Anna 'info'-tason pääsy"
-#: client/gui-gtk-2.0/pages.c:1276
+#: client/gui-gtk-2.0/pages.c:1345
msgid "Give ctrl access"
-msgstr ""
+msgstr "Anna 'ctrl'-tason pääsy"
#. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1338
-#, fuzzy, c-format
+#: client/gui-gtk-2.0/pages.c:1407
+#, c-format
msgid "Put on %s"
-msgstr "Väkiluku: %s"
+msgstr "Aseta ryhmäksi %s"
-#: client/gui-gtk-2.0/pages.c:1442
+#: client/gui-gtk-2.0/pages.c:1511
msgid "Number of _Players (including AI):"
-msgstr "AI-pelaajat sisältävät pelaajamäärä"
+msgstr "Pelaajamäärä, mukaanlukien AI-pelaajat:"
-#: client/gui-gtk-2.0/pages.c:1465
+#: client/gui-gtk-2.0/pages.c:1534
msgid "AI Skill _Level:"
msgstr "AI:n vaikeus_taso:"
-#: client/gui-gtk-2.0/pages.c:1481
+#: client/gui-gtk-2.0/pages.c:1550
msgid "Ruleset _Version:"
-msgstr "Säännöstön _versio:"
+msgstr "Sääntökokoelman _versio:"
-#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
msgid "_More Game Options..."
msgstr "_Lisää peliasetuksia..."
-#: client/gui-gtk-2.0/pages.c:1514
-#, fuzzy
+# (Guess... 17 Jan 09)
+#: client/gui-gtk-2.0/pages.c:1583
msgid "Record"
-msgstr "Raportti"
+msgstr "Ennätys"
-#: client/gui-gtk-2.0/pages.c:1519
-#, fuzzy
+#: client/gui-gtk-2.0/pages.c:1588
msgid "Rating"
-msgstr "Odottaa"
+msgstr "Luokitus"
-#: client/gui-gtk-2.0/pages.c:1525
+#: client/gui-gtk-2.0/pages.c:1594
msgid "Ready"
msgstr "Valmis"
-#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
-#: data/nation/slovakian.ruleset:26
-msgid "Leader"
-msgstr "Johtaja"
+#: client/gui-gtk-2.0/pages.c:1601
+#, fuzzy
+msgid "?player:Leader"
+msgstr "Nimi"
-#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1732 client/gui-sdl/chatline.c:185
msgid "Choose Saved Game to Load"
msgstr "Valitse ladattava peli"
-#: client/gui-gtk-2.0/pages.c:1752
+#: client/gui-gtk-2.0/pages.c:1824
msgid "Choose Saved Game to _Load:"
msgstr "Valitse _ladattava peli:"
-#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
-#: client/gui-gtk-2.0/pages.c:2375
+#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
+#: client/gui-gtk-2.0/pages.c:2451
msgid "_Browse..."
msgstr "_Selaa..."
-#: client/gui-gtk-2.0/pages.c:1839
+#: client/gui-gtk-2.0/pages.c:1911
msgid "Choose a Scenario"
msgstr "Valitse skenaario"
-#: client/gui-gtk-2.0/pages.c:1926
+#: client/gui-gtk-2.0/pages.c:1998
msgid "Choose a _Scenario:"
msgstr "Valitse _skenaario"
-#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
-#: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
-#: client/gui-win32/wldlg.c:806
-msgid "Type"
-msgstr "Yksikön tyyppi"
-
-#: client/gui-gtk-2.0/pages.c:2101
+#: client/gui-gtk-2.0/pages.c:2173
msgid "Choose a _nation to play:"
msgstr "Valitse pelattava _kansakunta:"
-#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2363 client/gui-win32/menu.c:581
msgid "Select Location to Save"
msgstr "Valitse sijainti johon tallennetaan"
-#: client/gui-gtk-2.0/pages.c:2372 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2448 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr "Tallenna peli"
-#: client/gui-gtk-2.0/pages.c:2413
+#: client/gui-gtk-2.0/pages.c:2489
msgid "Saved _Games:"
msgstr "Tallennetut _pelit:"
-#: client/gui-gtk-2.0/pages.c:2440
+#: client/gui-gtk-2.0/pages.c:2516
msgid "Save _Filename:"
msgstr "Tallenna _tiedostoon:"
@@ -12692,9 +12902,8 @@ msgid "Unit Type"
msgstr "Yksikön tyyppi"
#: client/gui-gtk-2.0/repodlgs.c:934 client/gui-win32/repodlgs.c:696
-#, fuzzy
msgid "?Upgradable unit [short]:U"
-msgstr "Y"
+msgstr "↑"
#: client/gui-gtk-2.0/repodlgs.c:935 client/gui-win32/repodlgs.c:697
msgid "In-Prog"
@@ -12817,16 +13026,15 @@ msgstr "Pelin asetukset"
#: client/gui-gtk-2.0/repodlgs.c:1583 client/gui-xaw/repodlgs.c:1399
msgid "true"
-msgstr ""
+msgstr "tosi"
#: client/gui-gtk-2.0/repodlgs.c:1583 client/gui-xaw/repodlgs.c:1399
-#, fuzzy
msgid "false"
-msgstr "Mies"
+msgstr "epätosi"
#: client/gui-gtk-2.0/repodlgs.c:1593 client/gui-xaw/repodlgs.c:1409
msgid "(hidden)"
-msgstr ""
+msgstr "(piilotettu)"
#: client/gui-gtk-2.0/spaceshipdlg.c:221
msgid "_Launch"
@@ -12850,6 +13058,8 @@ msgid ""
"Tileset suggests using %s theme.\n"
"You are currently using %s."
msgstr ""
+"Maapalagrafiikka suosittaa teemaa %s.\n"
+"Tällä hetkellä käytössä on %s."
#: client/gui-gtk-2.0/tileset_dlg.c:51
msgid "Prefered tileset"
@@ -12962,7 +13172,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:1094
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
msgid "Back"
msgstr "Palaa"
@@ -12971,7 +13181,7 @@ msgid "Start"
msgstr "Aloita"
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:775
+#: client/gui-win32/connectdlg.c:777
msgid "Load Game"
msgstr "Lataa peli"
@@ -13008,12 +13218,12 @@ msgid "Make new homecity"
msgstr "Tee tästä uusi kotikaupunki"
#: client/gui-sdl/citydlg.c:546 client/gui-sdl/citydlg.c:1418
-#: client/gui-sdl/connectdlg.c:307 client/gui-sdl/connectdlg.c:616
-#: client/gui-sdl/connectdlg.c:802 client/gui-sdl/connectdlg.c:984
+#: 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/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1039
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
#: 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
@@ -13060,7 +13270,7 @@ msgstr "Ostetaanko?"
#: client/gui-sdl/diplodlg.c:1335 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:2427
+#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
#: client/gui-xaw/cityrep.c:666 client/gui-xaw/cma_fe.c:327
#: client/gui-xaw/cma_fe.c:511 client/gui-xaw/cma_fe.c:765
#: client/gui-xaw/messagedlg.c:72 client/gui-xaw/optiondlg.c:76
@@ -13076,7 +13286,7 @@ msgstr "Ei"
#: client/gui-sdl/diplodlg.c:1345 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:2427 client/gui-xaw/cityrep.c:666
+#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
#: client/gui-xaw/cma_fe.c:327 client/gui-xaw/cma_fe.c:511
#: client/gui-xaw/cma_fe.c:765 client/gui-xaw/messagedlg.c:72
#: client/gui-xaw/optiondlg.c:76 client/gui-xaw/optiondlg.c:304
@@ -13353,36 +13563,36 @@ msgstr "Käytä kerran"
msgid "Release city"
msgstr "Siirrä käsinhallintaan"
-#: client/gui-sdl/connectdlg.c:238
+#: client/gui-sdl/connectdlg.c:239
msgid "Creating Server List..."
msgstr "Luodaan palvelinluetteloa..."
-#: client/gui-sdl/connectdlg.c:279 client/gui-sdl/connectdlg.c:343
+#: client/gui-sdl/connectdlg.c:280 client/gui-sdl/connectdlg.c:344
msgid "No LAN servers found"
msgstr "Yhtään LAN-palvelinta ei löytynyt"
-#: client/gui-sdl/connectdlg.c:281 client/gui-sdl/connectdlg.c:345
+#: client/gui-sdl/connectdlg.c:282 client/gui-sdl/connectdlg.c:346
msgid "No public servers found"
msgstr "Yhtään julkista palvelinta ei löytynyt"
-#: client/gui-sdl/connectdlg.c:555
+#: client/gui-sdl/connectdlg.c:556
msgid "Player Name :"
msgstr "Pelaajan nimi :"
-#: client/gui-sdl/connectdlg.c:571
+#: client/gui-sdl/connectdlg.c:572
msgid "Freeciv Server :"
msgstr "Freeciv-palvelin :"
-#: client/gui-sdl/connectdlg.c:588
+#: client/gui-sdl/connectdlg.c:589
msgid "Port :"
msgstr "Portti :"
-#: client/gui-sdl/connectdlg.c:608 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr "Yhdistä"
-#: client/gui-sdl/connectdlg.c:794 client/gui-sdl/connectdlg.c:977
+#: client/gui-sdl/connectdlg.c:795 client/gui-sdl/connectdlg.c:978
#: client/gui-xaw/connectdlg.c:145
msgid "Next"
msgstr "Seuraava"
@@ -13479,7 +13689,7 @@ msgstr "Näytä Civiliopedia-artikkeli aiheesta %s"
#: client/gui-sdl/dialogs.c:1969
msgid "Choose Your New Government"
-msgstr "Valitse uusi hallitusmuotosi"
+msgstr "Valitse uusi hallintomuotosi"
#: client/gui-sdl/dialogs.c:2073
msgid "REVOLUTION!"
@@ -13564,7 +13774,7 @@ msgstr "Hyväksy sopimus"
#: client/gui-sdl/diplodlg.c:1304
#, c-format
msgid "%s incident !"
-msgstr ""
+msgstr "%s selkkaus!"
#: client/gui-sdl/diplodlg.c:1322
msgid "Shall we declare WAR on them?"
@@ -13633,56 +13843,57 @@ msgstr "Sabotoi vihollisen yksikkö"
#: client/gui-sdl/graphics.c:283
#, c-format
msgid "load_surf: Failed to load graphic file %s!"
-msgstr ""
+msgstr "load_surf: Grafiikkatiedoston %s lataaminen epäonnistui!"
#: client/gui-sdl/graphics.c:291
#, c-format
msgid "load_surf: Unable to convert file %s into screen's format!"
-msgstr ""
+msgstr "load_surf: Tiedoston %s muuntaminen ruudun formaattiin epäonnistui!"
#: client/gui-sdl/graphics.c:313
#, c-format
msgid "load_surf_with_flags: Unable to load file %s."
-msgstr ""
+msgstr "load_surf_with_flags: Tiedoston %s lataaminen epäonnistui."
#: client/gui-sdl/graphics.c:319
#, c-format
msgid "Unable to convert image from file %s into format %d."
-msgstr ""
+msgstr "Kuvatiedoston %s muotoon %d muuntaminen epäonnistui."
#: client/gui-sdl/graphics.c:344
#, c-format
msgid "Unable to create Sprite (Surface) of size %d x %d %d Bits in format %d"
msgstr ""
+"Hahmon (pinta-sprite) (koko %d x %d %d bittiä) luonti muodossa %d epäonnistui"
#: client/gui-sdl/graphics.c:1012
#, c-format
msgid "Unable to initialize SDL library: %s"
-msgstr ""
+msgstr "SDL-kirjaston valmistelu epäonnistui: %s"
#: client/gui-sdl/graphics.c:1021
#, c-format
-msgid "Unable to initialize SDL_ttf library: %s"
-msgstr ""
+msgid "Unable to initialize SDL_ttf library: %s"
+msgstr "SDL_ttf-kirjaston valmistelu epäonnistui: %s"
#: client/gui-sdl/graphics.c:1058
#, c-format
msgid "No available mode for this resolution : %d x %d %d bpp"
-msgstr ""
+msgstr "Tälle tarkkuudelle (%d x %d %d bpp) ei ole saatavilla moodia"
#: client/gui-sdl/graphics.c:1061
msgid "Setting default resolution to : 640 x 480 16 bpp SW"
-msgstr ""
+msgstr "Asetan oletustarkkuuden arvoon 640 x 480 16 bpp SW"
#: client/gui-sdl/graphics.c:1068
#, c-format
msgid "Unable to set this resolution: %d x %d %d bpp %s"
-msgstr ""
+msgstr "Tarkkuuden %d x %d %d bpp %s asettaminen epäonnistui"
#: client/gui-sdl/graphics.c:1075
#, c-format
msgid "Setting resolution to: %d x %d %d bpp"
-msgstr ""
+msgstr "Asetan tarkkuudeksi %d x %d %d bpp"
#: client/gui-sdl/gui_main.c:150
msgid "Full Screen"
@@ -13714,6 +13925,8 @@ msgid ""
"By changing this option you change the active theme. This is the same as "
"using the -- --theme command-line parameter."
msgstr ""
+"Muuttamalla tätä asetusta vaihdat aktiivista teemaa. Tämä tarkoittaa samaa "
+"kuin -- --theme -komentoriviparametrin käyttö."
#: client/gui-sdl/gui_main.c:204
msgid " -f, --fullscreen\tStart Client in Fullscreen mode\n"
@@ -13724,20 +13937,22 @@ msgid ""
" -e, --eventthread\tInit Event Subsystem in other thread (only Linux and "
"BeOS)\n"
msgstr ""
+" -e, --eventthread\tValmistele tapahtuma-alijärjestelmä erillisessä "
+"säikeessä (vain Linux ja BeOS)\n"
#: client/gui-sdl/gui_main.c:207
msgid " -t, --theme THEME\tUse GUI theme THEME\n"
-msgstr ""
+msgstr " -t, --theme THEME\tKäytä käyttöliittymäteemaa THEME\n"
#: client/gui-sdl/gui_main.c:665
#, c-format
msgid "Making screenshot fc_%05d.bmp"
-msgstr ""
+msgstr "Luon näyttökaappausta fc_%05d.bmp"
#: client/gui-sdl/gui_main.c:798
#, c-format
msgid "Using Video Output: %s"
-msgstr ""
+msgstr "Käytän video-ulostuloa %s"
#: client/gui-sdl/gui_main.c:851
msgid "Initializing Client"
@@ -13747,12 +13962,6 @@ msgstr "Alustan asiakasohjelmaa"
msgid "Waiting for the beginning of the game"
msgstr "Odotan pelin alkamista"
-#: client/gui-sdl/gui_string.c:608
-msgid ""
-"Couldn't find stdfont.ttf file. Please link/copy/move anyunicode ttf font to "
-"data dir as stdfont.ttf"
-msgstr ""
-
#. TRANS: Future Technology
#: client/gui-sdl/gui_tilespec.c:506
msgid "FT"
@@ -13936,6 +14145,9 @@ msgid ""
"as a result. If you see this message often, please\n"
"report it at %s. Thank you."
msgstr ""
+"SDL-tapahtumapuskuri on täynnä; saatat nähdä piirtovirheitä\n"
+"tämän seurauksena. Jos näet tämän viestin usein, ole hyvä ja\n"
+"raportoi se osoitteessa %s. Kiitos!"
#: client/gui-sdl/mapview.c:412
#, c-format
@@ -13981,6 +14193,8 @@ msgid ""
"\n"
"Territory of the %s %s"
msgstr ""
+"\n"
+"%s %s hallitsevat aluetta"
#: client/gui-sdl/mapview.c:773
msgid ""
@@ -14020,7 +14234,7 @@ msgstr "Kaupunginmuuri"
#: client/gui-sdl/mapview.c:829
msgid "?blistend:"
-msgstr ""
+msgstr "?blistend:"
#. TRANS: (<nation>,<diplomatic_state>)"
#: client/gui-sdl/mapview.c:835
@@ -14241,6 +14455,8 @@ msgid ""
"Current Setup\n"
"Fullscreen %dx%d"
msgstr ""
+"Nykyasetus\n"
+"Kokoruutu %dx%d"
#: client/gui-sdl/optiondlg.c:443 client/gui-sdl/optiondlg.c:628
#, c-format
@@ -14248,14 +14464,16 @@ msgid ""
"Current Setup\n"
"%dx%d"
msgstr ""
+"Nykyasetus\n"
+"%dx%d"
#: client/gui-sdl/optiondlg.c:604
msgid "No modes available!"
-msgstr ""
+msgstr "Käytettävissä ei ole yhtään moodia!"
#: client/gui-sdl/optiondlg.c:610
msgid "All resolutions available."
-msgstr ""
+msgstr "Kaikki tarkkuudet käytettävissä."
#: client/gui-sdl/optiondlg.c:646
msgid "Fullscreen Mode"
@@ -14335,12 +14553,12 @@ msgid "Leave Game"
msgstr "Poistu pelistä"
#: client/gui-sdl/optiondlg.c:2302 client/gui-sdl/pages.c:255
-#: client/gui-win32/connectdlg.c:1098 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1100 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:963
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
msgid "Start New Game"
msgstr "Aloita uusi peli"
@@ -14358,7 +14576,7 @@ msgstr "Liity LAN-palvelimelle"
#: client/gui-sdl/pages.c:308
msgid "SDLClient welcomes you..."
-msgstr ""
+msgstr "SDL-asiakasohjelma toivottaa sinut tervetulleeksi..."
#: client/gui-sdl/pages.c:309
msgid ""
@@ -14457,8 +14675,8 @@ msgstr "Nettotulo: "
msgid "%s max rate : %d%%"
msgstr "%s maksimitaso: %d%%"
-#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1081
-#: client/gui-win32/connectdlg.c:1089 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
+#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
msgid "Update"
msgstr "Päivitä"
@@ -14511,9 +14729,8 @@ msgstr "Laukaisu"
#: client/gui-sdl/sprite.c:60
#, c-format
msgid "load_gfxfile: Unable to load graphic file %s!"
-msgstr ""
+msgstr "load_gfxfile: Grafiikkatiedoston %s lataaminen epäonnistui!"
-# Koodi ilmoittaa: param 1 on "tilespec" or "spec"
#: client/gui-sdl/themespec.c:252
#, c-format
msgid ""
@@ -14915,10 +15132,6 @@ msgstr "Vaihda kaikki"
msgid "Refresh"
msgstr "Virkistä"
-#: client/gui-win32/cityrep.c:882
-msgid "Select"
-msgstr "Valitse"
-
#: client/gui-win32/cityrep.c:883
msgid "Configure"
msgstr "Asetukset"
@@ -14968,55 +15181,55 @@ msgstr "Tallennetun pelin lataaminen epäonnistui."
msgid "Verify Password"
msgstr "Vahvista salasana"
-#: client/gui-win32/connectdlg.c:912 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr "Freeciv-palvelimen valinta"
-#: client/gui-win32/connectdlg.c:913
+#: client/gui-win32/connectdlg.c:915
msgid "Local Area Network"
msgstr "Paikallisverkko (LAN)"
-#: client/gui-win32/connectdlg.c:947
+#: client/gui-win32/connectdlg.c:949
msgid "Welcome to Freeciv"
msgstr "Tervetuloa pelaamaan Freeciviä"
-#: client/gui-win32/connectdlg.c:965
+#: client/gui-win32/connectdlg.c:967
msgid "Load Saved Game"
msgstr "Lataa tallennettu peli"
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
msgid "Connect To Network Game"
msgstr "Yhdistä verkkopeliin"
-#: client/gui-win32/connectdlg.c:977
+#: client/gui-win32/connectdlg.c:979
msgid "Choose a nation to play"
msgstr "Valitse pelattava kansakunta"
-#: client/gui-win32/connectdlg.c:1012
+#: client/gui-win32/connectdlg.c:1014
msgid "Number of players (Including AI):"
msgstr "Pelaajien määrä (mukaanlukien AI-pelaajat):"
-#: client/gui-win32/connectdlg.c:1020
+#: client/gui-win32/connectdlg.c:1022
msgid "AI skill level:"
msgstr "AI:n vaikeustaso:"
-#: client/gui-win32/connectdlg.c:1034 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
msgid "Game Options"
msgstr "Pelin asetukset"
-#: client/gui-win32/connectdlg.c:1038
+#: client/gui-win32/connectdlg.c:1040
msgid "Start Game"
msgstr "Aloita peli"
-#: client/gui-win32/connectdlg.c:1057
+#: client/gui-win32/connectdlg.c:1059
msgid "Login:"
msgstr "Kirjaudu sisään:"
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
msgid "Host:"
msgstr "Palvelin:"
-#: client/gui-win32/connectdlg.c:1060
+#: client/gui-win32/connectdlg.c:1062
msgid "Port:"
msgstr "Portti:"
@@ -15086,7 +15299,7 @@ msgstr "Valitse kaupunki:"
#: client/gui-win32/gui_main.c:116
msgid "Enable alpha blending"
-msgstr ""
+msgstr "Käytä alfa-sekoitusta"
#: client/gui-win32/gui_main.c:117
msgid ""
@@ -15094,6 +15307,9 @@ msgid ""
"of an ordered dither. If there is no hardware support for alpha blending, "
"this is much slower."
msgstr ""
+"Jos tämä asetus on valittu, renderöinnissä käytetään alfasekoitusta (alpha "
+"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
@@ -15276,10 +15492,6 @@ msgid_plural "(idle %d turns)"
msgstr[0] "(toimeton %d vuoron)"
msgstr[1] "(toimeton %d vuoroa)"
-#: client/gui-win32/plrdlg.c:337 data/Freeciv.in:88
-msgid "Host"
-msgstr "Palvelin"
-
#: client/gui-win32/plrdlg.c:355 data/Freeciv.in:3230
msgid "Intelligence"
msgstr "Tiedustelu"
@@ -15706,7 +15918,7 @@ msgid "Could not write manual file %s."
msgstr "Opastiedoston %s kirjoittaminen epäonnistui."
#: manual/civmanual.c:128
-#, fuzzy, c-format
+#, c-format
msgid ""
"<h1>Freeciv %s server options</h1>\n"
"\n"
@@ -15756,7 +15968,7 @@ msgid ""
msgstr "<p class=\"changed\">Arvo asetettu %d:ksi</p>\n"
#: manual/civmanual.c:167
-#, fuzzy, c-format
+#, c-format
msgid ""
"<p class=\"bounds\">Minimum: %d, Default: %d, Maximum: %d</p>\n"
"\n"
@@ -16124,7 +16336,7 @@ msgstr "Vahingoita teollisuutta"
#: data/Freeciv.in:2492
msgid "Your New Government"
-msgstr "Uusi hallitusmuotosi"
+msgstr "Uusi hallintomuotosi"
#: data/Freeciv.in:2494
msgid "Select government type:"
@@ -16262,7 +16474,6 @@ msgid "Freeciv is covered by the GPL, which is included here: "
msgstr "Freeciv on GPL:n alainen ohjelma, lisenssi mukana: "
#: 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 "
@@ -16282,18 +16493,21 @@ msgid ""
"\n"
" freeciv-i18n at gna.org"
msgstr ""
-"Freeciv tukee useita eri kieliä. Lisätietoja README-tiedostossa.\n"
+"Freeciv tukee useita eri kieliä. Lisätietoja eri kielten käyttöönotosta on "
+"README-tiedoston Native Language Support -osiossa.\n"
"\n"
"Jos haluat lisätä käännöksen omalle kielellesi, lue ohjeet netistä "
"osoitteessa \n"
"\n"
-" http://www.freeciv.org/l10n.phtml\n"
+" http://www.freeciv.org/wiki/Localization\n"
+"\n"
+"Tarkista ensin täältä, onko käännöstyö jo käynnissä kielellesi:\n"
"\n"
-"(Tarkista ensin täältä, tiedä vaikka käännöstyö olisi jo käynnissä.)\n"
+" http://www.freeciv.org/wiki/Translations\n"
"\n"
-"Voit myös lähettää kysymyksiä postituslistallemme, jonka osoite on \n"
+"Voit myös lähettää kysymyksiä postituslistallemme osoitteessa\n"
"\n"
-" freeciv-dev at freeciv.org"
+" freeciv-i18n at gna.org"
#: data/helpdata.txt:402
msgid ""
@@ -16343,7 +16557,6 @@ msgstr ""
"löytyvät sieltä."
#: data/helpdata.txt:430
-#, fuzzy
msgid ""
"Unit Orders:\n"
"============\n"
@@ -16390,41 +16603,49 @@ msgid ""
msgstr ""
"Näppäimistö:\n"
"============\n"
-" a: (a)uto-asuttaja (uudisasukasyksiköt/teknikot)<\n"
-" a: (a)uto-hyökkäys (aseistetut yksiköt)\n"
-" b: rakenna kaupunki (uudisasukasyksiköt/teknikot)\n"
+" a: (a)uto-asuttaja (uudisasukkaat/työläiset)<\n"
+" b: rakenna kaupunki (uudisasukkaat)\n"
" b: auta rakentamaan ihmettä (karavaanit)\n"
" C: yhdistä (valitse sitten kohde vasemmalla hiiren napilla)\n"
" d: (d)iplomaatti/vakoojatoimet (diplomaatit/vakoojat)\n"
" D: lakkauta yksikkö\n"
-" e: rakenna lentotukikohta (lentotukikohtayksiköt)\n"
+" e: rakenna l(e)ntotukikohta (lentotukikohtayksiköt)\n"
" f: linnoittaudu (aseistetut yksiköt)\n"
-" f: rakenna linnoitus (uudisasukasyksiköt/teknikot)\n"
+" f: rakenna linnoitus (uudisasukkaat/työläiset)\n"
" g: mene (valitse sitten kohde vasemmalla hiiren napilla)\n"
" g: lisää reittipiste (mene-tilassa)\n"
-" h: vai(h)da kotikaupunki (täksi kaupungiksi)\n"
-" i: kastele/v(i)ljele (uudisasukkaat/teknikot)\n"
+" G: mene/palaa lähimpään kaupunkiin\n"
+" h: vai(h)da kotikaupunki (kaupungiksi jossa olet nyt)\n"
+" i: kastele/v(i)ljele (uudisasukkaat/työläiset)\n"
" l: (l)astaa yksikkö alukseen\n"
-" L: mene/(l)ennätä kaupunkiin\n"
-" m: rakenna kaivos (uudisasukkaat/teknikot)\n"
+" L: mene/(L)ennätä kaupunkiin\n"
+" m: rakenna kaivos tai muunna maastoa (uudisasukkaat/työläiset)\n"
" n: siivoa ydi(n)laskeumaa\n"
-" N: räjäytä ydi(n)ase\n"
-" o: muuta maastoa (teknikot)\n"
-" p: siivoa saasteita (uudisasukasyksiköt/teknikot)\n"
+" N: räjäytä ydi(N)ase\n"
+" o: muuta maast(o)a (teknikot)\n"
+" p: siivoa saasteita (uudisasukkaat/työläiset)\n"
" p: hy(p)pää (laskuvarjohyppääjät)\n"
-" P: turmele maanparannus\n"
+" P: turmele maan(P)arannus\n"
" q: partioi (valitse sitten kohde vasemmalla hiiren napilla)\n"
" q: lisää partioinnin reittipiste (partiointitilassa)\n"
-" r: rakenna tie/(r)autatie (uudisasukasyksiköt/teknikot)\n"
+" r: rakenna tie/(r)autatie (uudisasukkaat/työläiset)\n"
" r: aseta kauppa(r)eitti (karavaanit)\n"
-" s: leiriydy (yksikkö herää jos sen lähellä tapahtuu)\n"
+" s: leiriydy\n"
" u: p(u)ra aluksen lastista\n"
-" U: p(u)ra aluksen koko lasti\n"
+" U: p(U)ra aluksen koko lasti\n"
+" W: herätä ruudussa olevat muut yksiköt\n"
" x: tutki ympäristöä itseksesi (auto-hortoile)\n"
+" y: valitse kaikki toimettomat, valitun yksikön tyyppiset yksiköt\n"
"välilyönti: pysy paikallasi\n"
+"\n"
+" Ctrl-U: ajanm(u)kaista yksikkö\n"
+"Shift-Ctrl-B: mene ja rakenna kaupunki kohteeseen\n"
+"Shift-Ctrl-R: yhdistä nykyruutu ja kohderuutu tiellä\n"
+"Shift-Ctrl-L: yhdistä nykyruutu ja kohderuutu rautatiellä\n"
+"Shift-Ctrl-I: yhdistä nykyruutu ja kohderuutu kastelujärjestelmällä/v(i)"
+"ljele\n"
#: data/helpdata.txt:473
-#, fuzzy
msgid ""
"Unit Movement:\n"
"==============\n"
@@ -16454,7 +16675,6 @@ msgstr ""
"\n"
" 5: keskitä edelliseen yksikköön\n"
" w: keskitä seuraavaan yksikköön (odota)\n"
-" W: herätä ruudulla olevat muut yksiköt\n"
" c: keskitä näkymä yksikköön\n"
#: data/helpdata.txt:488
@@ -16509,24 +16729,24 @@ msgid ""
msgstr ""
"Pääkartta (hiiri):\n"
"==================\n"
-" Vasen-klikkaa kaupunkia: Näytä kaupunkidialogi\n"
-" Vasen-klikkaa yksikköä: Aktivoi yksikkö\n"
-" Vasen-klikkaa-ja-raahaa yksikköä: Mene-komento yksikölle\n"
-" Keski-klikkaa: Näytä ruudun tiedot\n"
-" Oikea-klikkaa: Keskitä näkymä ruutuun\n"
+" Vasen-napsauta kaupunkia: Näytä kaupunkidialogi\n"
+" Vasen-napsauta yksikköä: Aktivoi yksikkö\n"
+" Vasen-napsauta-ja-raahaa yksikköä: Mene-komento yksikölle\n"
+" Keski-napsauta: Näytä ruudun tiedot\n"
+" Oikea-napsauta: Keskitä näkymä ruutuun\n"
"\n"
-" Shift-vasen-klikkaa: Kopioi tuotanto (GTK)\n"
-" Shift-oikea-klikkaa kaupunkia: Liitä tuotanto kaupunkiin (GTK)\n"
+" Shift-vasen-napsauta: Kopioi tuotanto (GTK)\n"
+" Shift-oikea-napsauta kaupunkia: Liitä tuotanto kaupunkiin (GTK)\n"
"\n"
-" Shift-Ctrl-vasen-klikkaa: Muokkaa kaupungin työläisiä\n"
-" Ctrl-keski-klikkaa: Herätä leiriytyneet yksiköt\n"
+" Shift-Ctrl-vasen-napsauta: Muokkaa kaupungin työläisiä\n"
+" Ctrl-keski-napsauta: Herätä leiriytyneet yksiköt\n"
"\n"
" Alueenvalintamoodi (GTK):\n"
" =========================\n"
-" Oikea-klikkaa-ja-raahaa: Siirry aluevalintamoodiin\n"
-" Vasen-klikkaa: Ruudun korostus päälle/pois\n"
-" Shift-oikea-klikkaa: Liitä tuotanto korostettuihin kaupunkeihin\n"
-" Oikea-klikkaa: Peruuta aluevalintamoodi\n"
+" Oikea-napsauta-ja-raahaa: Siirry aluevalintamoodiin\n"
+" Vasen-napsauta: Ruudun korostus päälle/pois\n"
+" Shift-oikea-napsauta: Liitä tuotanto korostettuihin kaupunkeihin\n"
+" Oikea-napsauta: Peruuta aluevalintamoodi\n"
"\n"
" Kartalla korostetut kaupungit korostuvat myös kaupunkiraportissa."
@@ -16580,14 +16800,12 @@ msgstr ""
"lähetetään kaikille pelaajille, paitsi:"
#: data/helpdata.txt:550
-#, fuzzy
msgid ""
" - Messages starting with '/' are interpreted as server commands and "
"executed, if you have the required access level."
msgstr ""
-" - Rivit, joiden alussa on '/'tulkitaan palvelinkomennoiksi (jos palvelimen "
-"versio on tarpeeksi uusi; normaali 1.8.0-palvelin ei ole) ja suoritetaan, "
-"mikäli sinulla on riittävän korkea komentotaso."
+" - Rivit, joiden alussa on '/', tulkitaan palvelinkomennoiksi ja "
+"suoritetaan, mikäli sinulla on riittävän korkea komentotaso."
#: data/helpdata.txt:553
msgid ""
@@ -16595,19 +16813,19 @@ msgid ""
"be abbreviated. The server looks for players named 'John' and if that fails "
"tries to match a username beginning with 'John' (like 'Johnathan')."
msgstr ""
-" - 'Pekka:'-alkuiset viestit ovat yksityisviestejä 'Pekalle'. Nimet voi "
-"lyhentää. Palvelin etsii Pekka-nimisiä pelaajia, ja jos heitä ei löydy, se "
-"yrittää löytää vastineen Pekka-alkuisista käyttäjänimistä (kuten esimerkiksi "
-"Pekkarinen)."
+" - 'Erkki:'-alkuiset viestit ovat yksityisviestejä 'Erkille'. Nimet voi "
+"lyhentää. Palvelin etsii Erkki-nimisiä pelaajia, ja jos heitä ei löydy, se "
+"yrittää löytää vastineen Erkki-alkuisista käyttäjänimistä (kuten esimerkiksi "
+"'Erkkinen')."
#: data/helpdata.txt:558
-#, fuzzy
msgid ""
" - Messages starting with 'John::' are private messages as above, but will "
"match only users (not players) named 'John'. 'Johnathan' will still match."
msgstr ""
-" - Rivit, jotka alkavat esim. 'erkki:' ovat yksityisiä viestejä pelaajalle "
-"nimeltä 'erkki'; pelaajien nimiä voi lyhentää."
+" - Rivit, jotka alkavat esim. 'Erkki::' ovat yksityisiä viestejä kuten yllä, "
+"mutta täsmäävät vain käyttäjiin (ei pelaajiin), joien nimi on 'Erkki'. Nimiä "
+"voi yhä lyhentää, esim. 'Erkki-Jooseppi' täsmää."
#: data/helpdata.txt:562
msgid " - Messages starting with '.' will be sent only to all your allies."
@@ -16633,7 +16851,7 @@ msgid ""
"available items. You can also press the Help button to get help on the "
"selected item. Pressing Help with no item selected will display this page."
msgstr ""
-"Lisätäksesi jotakin työlistaan, kaksoisklikkaa sitä saatavilla olevien "
+"Lisätäksesi jotakin työlistaan, kaksoisnapsauta sitä saatavilla olevien "
"projektien listalla. Voit myös painaa Apua-nappia saadaksesi lisätietoa "
"projektista. Jos painat Apua-nappia valitsematta ensin projektia, näet tämän "
"sivun."
@@ -16643,8 +16861,8 @@ msgid ""
"To remove an item from the worklist simply double-click the item to remove. "
"Use the buttons below the worklist to move items up and/or down in the list."
msgstr ""
-"Poistaaksesi projektin työlistalta kaksoisklikkaa sitä. Käytä nappeja listan "
-"alla siirtääksesi projektia ylös ja/tai alas listalla."
+"Poistaaksesi projektin työlistalta kaksoisnapsauta sitä. Käytä nappeja "
+"listan alla siirtääksesi projektia ylös ja/tai alas listalla."
#: data/helpdata.txt:579
msgid ""
@@ -16783,7 +17001,7 @@ msgid ""
"When a new city is built, the city starts to build the best available "
"defensive unit from the above list."
msgstr ""
-" Muista, että joissain hallitusmuodoissa sotilasyksiköt kaupunkien "
+" Muista, että joissain hallintomuodoissa sotilasyksiköt kaupunkien "
"sisällä tai ulkopuolella saattavat lisätä tai vähentää tyytymättömien "
"asukkaiden määrää. Muista myös, että kun yksikkö on kaupungin sisällä, sen "
"puolustuskyky on 50% suurempi, kuten linnoittautuneena. Kun uusi kaupunki "
@@ -16862,7 +17080,7 @@ msgstr ""
" 6. Kaupungeista huolehtiminen.\n"
"\n"
" Jokaisella kaupungilla on joukko asukkaita. Asukkaiden määrä riippuu "
-"väkimäärästä. Kun klikkaat kaupunkia, näet, kuinka viljelysmaita kaupungin "
+"väkimäärästä. Kun napsautat kaupunkia, näet, kuinka viljelysmaita kaupungin "
"ympärillä käytetään. Voit ohjata asukkaasi töihin viljelysmaille, tai he "
"voivat olla tutkijoita, viihdyttäjiä tai verottajia. Erityisesti pelin "
"alussa on pidettävä huolta, että kaikki asukkaat ovat työllistettyjä, niin "
@@ -16875,8 +17093,8 @@ msgid ""
"be transferred to the other duties mentioned previously."
msgstr ""
" Jos ruokaa tuotetaan liikaa, asukas voidaan ottaa pois peltotöistä "
-"klikkaamalla ko. peltoruutua. Sen jälkeen tämä asukas voidaan siirtää edellä "
-"mainittuihin muihin tehtäviin."
+"napsauttamalla ko. peltoruutua. Sen jälkeen tämä asukas voidaan siirtää "
+"edellä mainittuihin muihin tehtäviin."
# Moving citizens seems to be unnecessary.
#: data/helpdata.txt:690
@@ -16885,8 +17103,8 @@ msgid ""
"central tile of the farmland, the citizens will be rearranged to maximise "
"food production."
msgstr ""
-" Jos klikkaat oikealla napilla keskimmäistä ruutua, asukkaat järjestetään "
-"ruuantuotannon maksimoimiseksi."
+" Jos napsautat oikealla napilla keskimmäistä ruutua, asukkaat "
+"järjestetään ruuantuotannon maksimoimiseksi."
#: data/helpdata.txt:696
msgid ""
@@ -16968,7 +17186,6 @@ msgstr ""
"pelaajien kanssa."
#: data/helpdata.txt:734
-#, fuzzy
msgid ""
" 10. Interacting with other players (Diplomacy).\n"
"\n"
@@ -16979,14 +17196,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 ""
-" Jos sinulla on lähetystö toisen ihmispelaajan luona, voit järjestää "
+"10. Kanssakäynti muiden pelaajien kanssa (diplomatia).\n"
+"\n"
+" Jos sinulla on lähetystö toisen ihmispelaajan luona tai olet ollut "
+"häneen viime aikoina muuten yhteydessä, voit järjestää "
"diplomaattitapaamisen. Tämä tapahtuu valitsemalla 'Raportit'-valikosta "
-"'Pelaajat' ja klikkaamalla sitä pelaajaa, jonka haluat tavata. Jos sinulla "
-"on lähetystö (jonka merkkinä on 'X') ja toinen pelaaja on yhdistetty "
-"palvelimeen, neuvotteluvalikko avautuu."
+"'Pelaajat' ja napsauttamalla pelaajaa, jonka haluat tavata. Jos sinulla on "
+"lähetystö (jonka merkkinä on 'X') ja toinen pelaaja on yhdistetty "
+"palvelimeen (tai on AI-pelaaja palvelimella), neuvotteluvalikko avautuu."
#: data/helpdata.txt:744
-#, fuzzy
msgid ""
" In this menu you can choose to:\n"
"\n"
@@ -17004,14 +17223,20 @@ msgid ""
"\n"
" - and Give Gold."
msgstr ""
-" Tästä valikosta käsin voit:\n"
+" Tästä valikosta voit:\n"
"\n"
" - Vaihtaa karttoja (meri- tai maailmankartta),\n"
"\n"
-" - Vaihtaa edistysaskelia,\n"
+" - Vaihtaa teknologiaa,\n"
"\n"
" - Vaihtaa kaupunkeja,\n"
"\n"
+" - Jakaa näkymän,\n"
+"\n"
+" - Perustaa lähetystöjä,\n"
+"\n"
+" - Luoda sopimuksia, ja\n"
+"\n"
" - Antaa rahaa."
#: data/helpdata.txt:760
@@ -17058,16 +17283,25 @@ msgid ""
"Armistice, Peace, and Alliance. The first is the default state, while the "
"others can be achieved by signing diplomatic treaties."
msgstr ""
+" Pelaajien diplomaattiset välit voivat olla yhdessä viidestä eri "
+"tilasta: sota, tulitauko, aselepo, rauha ja liittouma. Ensimmäinen on "
+"oletustila, ja muihin päästään allekirjoittamalla diplomaattisia sopimuksia."
#: data/helpdata.txt:781
msgid ""
-" To have a diplomatic relationship with another player, you must fist "
-"establish first contact with that player. To establish first contact, you "
-"have to move one of your units next to a city or unit belonging to that "
-"player, or vice versa. Unless you establish an embassy with that player, you "
-"may again lose contact with them after a set number of turns without direct "
-"physical contact."
+" To have a diplomatic relationship with another player, you must first "
+"establish contact with that player. To establish contact, you have to move "
+"one of your units next to a city or unit belonging to that player, or vice "
+"versa. Unless you establish an embassy with that player, you may again lose "
+"contact with them after a set number of turns without direct physical "
+"contact."
msgstr ""
+" Luodaksesi diplomaattisuhteet toiseen pelaajaan sinun tulee ensin saada "
+"yhteys häneen. Tämän ensiyhteyden saavuttamiseksi sinun tulee siirtää jokin "
+"yksikkösi lähelle pelaajalle kuuluvaa kaupunkia tai yksikköä, tai hänen "
+"päinvastoin. Ellet perusta lähetystöä pelaajan kanssa, voit menettää "
+"yhteyden kun tietty määrä vuoroja kuluu ilman, että yksikkönne törmäävät "
+"toisiinsa."
#: data/helpdata.txt:788
msgid ""
@@ -17075,6 +17309,9 @@ msgid ""
"can freely move you units inside enemy territory and attack their units and "
"cities at will."
msgstr ""
+" Sota on oletustila kahden pelaajien välillä. Sodassa voit siirtää "
+"yksikköjäsi vapaasti vihollisalueella sekä hyökätä vastustajan yksiköiden ja "
+"kaupunkien kimppuun vapaasti."
#: data/helpdata.txt:792
msgid ""
@@ -17083,6 +17320,10 @@ msgid ""
"lead back to War. Upon first contact with an AI player, it will "
"automatically offer you a Cease-fire treaty."
msgstr ""
+" Kun pelaajat päättävät lopettaa sotatoimet välillään, he voivat "
+"allekirjoittaa tulitaukosopimuksen. Tietyn vuoromäärän kuluttua tulitauko "
+"purkautuu jälleen sodaksi. Kun tapaat AI-pelaajan ensimmäistä kertaa, se "
+"tarjoaa sinulle automaattisesti sinulle tulitaukosopimusta."
#: data/helpdata.txt:797
msgid ""
@@ -17091,6 +17332,10 @@ msgid ""
"will turn into a permanent Peace treaty. Breaking an Armistice will drop you "
"directly back to War."
msgstr ""
+" Jos janoat pysyvämpää rauhallista yhteiseloatoisen pelaajan kanssa, "
+"voit solmia aselevon, joka tietyn vuoromäärän kuluttua muuttuu pysyväksi "
+"rauhansopimukseksi. Aselevon rikkominen pudottaa diplomaattiset välinne "
+"suoraan takaisin sodaksi."
#: data/helpdata.txt:802
msgid ""
@@ -17101,6 +17346,11 @@ msgid ""
"declare War, or forge an Alliance. Breaking a Peace treaty will drop you "
"directly back to War."
msgstr ""
+" Sinä hetkenä kun pelaajat solmivat rauhan, kaikki yksiköt toisen "
+"pelaajan rajojen sisäpuolella lakkautetaan automaattisesti sopimuksen "
+"mukaan. Tämän jälkeen et voi siirtää yksikköjä sopimuskumppanisi alueelle "
+"ennen kuin joko julistat sodan tai liittouman. Rauhansopimuksen rikkominen "
+"pudottaa diplomaattiset välinne suoraan takaisin sodaksi."
#: data/helpdata.txt:809
msgid ""
@@ -17112,9 +17362,16 @@ msgid ""
"draw you into to any wars your ally enters against other players. Breaking "
"an Alliance will drop you to an Armistice treaty."
msgstr ""
+" Liittouma on paras mahdollinen diplomaattinen tila kahden pelaajan "
+"välillä. Tässä tilassa voit siirtää yksiköitä toistenne kaupunkeihin, ja "
+"yksikkönne voivat seistä samoissa ruuduissa. Liittoutuneet AI-pelaajat "
+"antavat sinulle vapaan pääsyn karttanäkymiinsä ja jaetun näkymän, sekä "
+"harkitsevat vakavasti teknologioiden ja kaupunkien vaihdantaa. Liittouman "
+"ainoa huoon puoli on siinä, että se vetää sinut mukaan sotiin joihin "
+"kumppanisi hankkiutuu muiden pelaajien kanssa. Liittouman rikkominen "
+"pudottaa diplomaattiset välinne aselevoksi."
#: data/helpdata.txt:821
-#, fuzzy
msgid ""
"The Citizen Governor (formerly called the CMA) helps you manage your cities. "
"It deploys the available workers on the free tiles around the city to "
@@ -17179,16 +17436,16 @@ msgstr ""
"ylijäämää. Käytä sen sijaan kertoimia ohjataksesi tavoitetilaa.\n"
"\n"
"Juhli-valinta antaa kaupunkisi... juhlia. Tämä onnistuu vain korkealla "
-"luksustasolla. Katso kohtaa 'Onnellisuus'.\n"
+"luksustasolla. Lisätietoa on ohjeien kohdassa 'Onnellisuus'.\n"
"\n"
"'Johda kaupunkia' siirtää kaupungin käskynhaltijan valtaan. 'Siirrä "
"käsinhallintaan' antaa hallinnan takaisin sinulle.\n"
"\n"
-"Voit tallentaa säätimien asetukset toimintamalliksi. Paina 'Luo malli' ja "
-"anna mallille nimi. Voit käyttää tällaisia malleja joka kaupungissa "
-"valitsemalla nimen. Asetukset näkee myös kaupunkiraportissa Käskynhaltija-"
-"sarakkeessa, ja niitä voi vaihtaa ('vaihda' --> 'Käskynhaltija'), jos "
-"käyttää tallennettua mallia.\n"
+"Voit tallentaa säätimien asetukset nimetyksi toimintamalliksi. Napsauta 'Luo "
+"malli' -nappia ja anna mallille nimi. Voit käyttää mallia joka kaupungissa "
+"valitsemalla sen nimen listasta. Asetuksia voi hallita myös "
+"kaupunkiraportissa Käskynhaltija-sarakkeessa, ja niitä voi vaihtaa ('vaihda' "
+"--> 'Käskynhaltija'), jos käytät tallennettua mallia.\n"
"\n"
"Voit tallentaa mallisi pysyvästi valitsemalla 'Peli' --> 'Tallenna "
"asetukset'.\n"
@@ -17196,8 +17453,8 @@ msgstr ""
"Huomaa! Jos käytät käskynhaltijaa joissakin kaupungeissa, läheisten "
"kaupunkien käsinhallinta hankaloituu. On paras hallita joko käsin tai "
"käskynhaltijalla kaikkia saman saaren kaupunkeja. Lisää vihjeitä, "
-"taustatietoa ja esimerkkejä on Freecivin mukana tulevassa tiedostossa README."
-"cma.\n"
+"taustatietoa ja esimerkkejä on Freecivin mukana tulevassa ohjetiedostossa "
+"README.cma.\n"
#: data/helpdata.txt:870
msgid "City Improvements"
@@ -17607,15 +17864,14 @@ msgid " Combat example 1"
msgstr " Taisteluesimerkki 1"
#: data/helpdata.txt:1090
-#, fuzzy
msgid ""
"Suppose a Cannon (A:8, D:1, HP:20, F:1) attacks a Musketeer (A:3, D:3, "
"HP:20, F:1) inside a city with City Walls built on a Forest tile. Neither "
"are veteran."
msgstr ""
-"Oletetaan, että konkari-kanuuna (H:8, P:1, VP:20, TV:1), jonka "
-"liikepisteistä 2/3 on jäljellä, hyökkää musketöörin (H:3, P:3, VP:20, TV:1), "
-"joka on muurein suojatussa, metsäruudulle rakennetussa kaupungissa, kimppuun."
+"Oletetaan, että kanuuna (H:8, P:1, VP:20, TV:1) hyökkää musketöörin (H:3, "
+"P:3, VP:20, TV:1), joka on muurein suojatussa, metsäruudulle rakennetussa "
+"kaupungissa, kimppuun. Kumpikaan ei ole konkareita."
#: data/helpdata.txt:1094
msgid ""
@@ -17863,7 +18119,7 @@ msgid ""
"The net benefit of a square for your city depends on your government type as "
"well as city improvements and wonders."
msgstr ""
-"Jonkin ruudun nettohyöty kaupungillesi riippuu niin hallitusmuodostasi kuin "
+"Jonkin ruudun nettohyöty kaupungillesi riippuu niin hallintomuodostasi kuin "
"kaupungissa toteutetuista rakennushankkeista ja ihmeistäkin."
#: data/helpdata.txt:1235
@@ -18047,7 +18303,7 @@ msgid ""
"Your government type influences your cities' productivity and commerce, your "
"citizens' happiness, and many other game factors."
msgstr ""
-"Hallitusmuotosi vaikuttaa kaupunkiesi tuottavuuteen ja talouteen, "
+"Hallintomuotosi vaikuttaa kaupunkiesi tuottavuuteen ja talouteen, "
"kansalaistesi tyytyväisyyteen ja moniin muihin pelin kulkuun vaikuttaviin "
"seikkoihin."
@@ -18060,9 +18316,9 @@ msgid ""
"at the end of this time, you will be able to choose your new government."
msgstr ""
"Sivilisaatiosi aloittaa yksinvaltana. Kun teknologiasi kehittyy, voit valita "
-"muita hallitusmuotoja (lueteltu alempana). Vaihtaaksesi hallitusmuotoa sinun "
+"muita hallintomuotoja (lueteltu alempana). Vaihtaaksesi hallintomuotoa sinun "
"on tehtävä vallankumous. Tämä johtaa sivilisaatiosi anarkiaan, jota kestää 1-"
-"5 pelivuoroa. Tämän jakson lopulla voit valita uuden hallitusmuotosi."
+"5 pelivuoroa. Tämän jakson lopulla voit valita uuden hallintomuotosi."
#: data/helpdata.txt:1331
msgid ""
@@ -18100,10 +18356,10 @@ msgid ""
"switch to one of the more militant styles of government."
msgstr ""
"VIHJE 1: Hyökkäävät sotilasoperaatiot ovat vaikeita toteuttaa, jos "
-"hallitusmuotosi on tasavalta tai demokratia, paitsi jos tarjoat kansalle "
+"hallintomuotosi on tasavalta tai demokratia, paitsi jos tarjoat kansalle "
"paljon sirkushuveja pitääksesi sen tyytyväisenä. Valloittaessasi muita "
"sivilisaatioita saattaa olla edullista vaihtaa vähän sotilaallisempaan "
-"hallitusmuotoon."
+"hallintomuotoon."
#: data/helpdata.txt:1351
msgid ""
@@ -18160,8 +18416,8 @@ msgid ""
"civil war. Governments with universal franchise are far less likely to "
"revolt than those more despotic in nature."
msgstr ""
-"Lisäksi hallitusmuotosi vaikuttaa suoraan sisällissodan todennäköisyyteen. "
-"Mitä yksinvaltaisempi hallitusmuotosi on, sitä suurempi on todennäköisyys, "
+"Lisäksi hallintomuotosi vaikuttaa suoraan sisällissodan todennäköisyyteen. "
+"Mitä yksinvaltaisempi hallintomuotosi on, sitä suurempi on todennäköisyys, "
"että kansa alkaa kapinoimaan."
#: data/helpdata.txt:1380
@@ -18201,7 +18457,7 @@ msgstr ""
"sekasorto. Sekasortoinen kaupunki ei tuota mitään, ja vihollisen diplomaatit "
"ja vakoojat saavat sen yllytettyä kapinaan helpommin. Pitkään jatkunut "
"epäjärjestys saattaa johtaa kapinaan ja spontaaniin vallankumoukseen, mikäli "
-"hallitusmuotosi on demokratia."
+"hallintomuotosi on demokratia."
#: data/helpdata.txt:1406
msgid ""
@@ -18275,7 +18531,7 @@ msgid ""
msgstr ""
"Poistaaksesi tyytymättömyyttä sinä voit käynnistää rakennushankkeita, jotka "
"valmistuessaan lisäävät tyytyväisyyttä (kuten temppeli, areena tai "
-"katedraali - tai jopa käräjätalo, jos hallitusmuotosi on demokratia), ja/tai "
+"katedraali - tai jopa käräjätalo, jos hallintomuotosi on demokratia), ja/tai "
"tuottaa vastaavia ihmeitä, ja/tai muuttaa osaa kaupankäynnistäsi "
"luksukseksi. Kaksi yksikköä tuotettua luksusta tekee yhden rauhallisen "
"asukkaan onnelliseksi. Jos rauhallisia ei enää ole, muutetaan tyytymättömiä "
@@ -18300,7 +18556,7 @@ msgstr ""
"Monissa hallitusmuodoissa läsnäolevat sotilasyksiköt luovat tyytyväisyyttä "
"(vahvemman valta). Tasavaltaisessa ja demokraattisessa hallinnossa "
"sotilasyksiköt voivat kuitenkin aiheuttaa tyytymättömyyttä (katso "
-"hallitusmuotojen ohjeita). On huomattava, että tässä tapauksessa esim. "
+"hallintomuotojen ohjeita). On huomattava, että tässä tapauksessa esim. "
"edellä mainitut rakennushankkeet eivät vaikuta asukkaiden tyytymättömyyteen. "
"Tämänkaltaista tyytymättömyyttä voidaan torjua rakentamalla poliisiasema, "
"vastaavia ihmeitä (esimerkiksi riippuvat puutarhat, J.S. Bachin katedraali, "
@@ -18345,7 +18601,7 @@ msgid ""
msgstr ""
"Aloitettuasi avaruusaluksen rakentamisen, voit nähdä sen komennolla "
"\"Avaruusalus\" valikossa Raportit. Nähdäksesi toisten pelaajien "
-"avaruusalukset, valitse pelaaja valikosta Peli/Pelaajat ja klikkaa kohtaa "
+"avaruusalukset, valitse pelaaja valikosta Peli/Pelaajat ja napsauta kohtaa "
"\"Avaruusalus\"."
#: data/helpdata.txt:1484
@@ -18401,15 +18657,13 @@ msgstr ""
msgid "Aqueduct"
msgstr "Vesijohto"
-# problem
#: data/default/buildings.ruleset:85 data/civ2/buildings.ruleset:68
-#, fuzzy
msgid ""
"Allows a city to grow larger than size 8. A Sewer System is also required "
"for a city to grow larger than size 12."
msgstr ""
-"Sallii kaupungin kasvaa suuremmaksi kuin 12. Ensin tosin tarvitaan "
-"vesijohtoverkosto, jotta kaupunki voisi kasvaa suuremmaksi kuin 8."
+"Sallii kaupungin kasvaa suuremmaksi kuin 8. Lisäksi tarvitaan "
+"viemäriverkosto, jotta kaupunki voisi kasvaa suuremmaksi kuin 12."
#: data/default/buildings.ruleset:91 data/civ2/buildings.ruleset:74
#: data/civ1/buildings.ruleset:47
@@ -18590,9 +18844,9 @@ msgid "Library"
msgstr "Kirjasto"
#: data/default/buildings.ruleset:412
-#, fuzzy, no-c-format
+#, no-c-format
msgid "Increases the science output in a city by 100%."
-msgstr "Kasvattaa kaupungin tutkimustyötä 50%."
+msgstr "Kasvattaa kaupungin tutkimustuotantoa 100%."
#: data/default/buildings.ruleset:417 data/civ2/buildings.ruleset:393
#: data/civ1/buildings.ruleset:317
@@ -18671,7 +18925,7 @@ msgid "Palace"
msgstr "Palatsi"
#: data/default/buildings.ruleset:552
-#, fuzzy, no-c-format
+#, no-c-format
msgid ""
"Makes a city the capital and the center of your government. Corruption in "
"other cities is related to how far away from the capital they are, except "
@@ -18686,14 +18940,17 @@ msgid ""
"Under Despotism the palace gives you a +75% production bonus, and under "
"Monarchy a +50% production bonus."
msgstr ""
-"Tekee kaupungista valtakuntasi pääkaupungin. Korruption määrä muissa "
-"kaupungeissa riippuu niiden etäisyydestä pääkaupunkiin, paitsi Demokratiassa "
-"ja Kommunismissa. Myös kapinan kustannukset riippuvat tästä etäisyydestä "
-"(kaikissa hallitusmuodoissa).\n"
+"Tekee kaupungista valtakuntasi pääkaupungin ja hallintosi keskuksen. "
+"Korruption määrä muissa kaupungeissa riippuu niiden etäisyydestä "
+"pääkaupunkiin, paitsi demokratiassa ja kommunismissa. Myös kapinan "
+"kustannukset riippuvat tästä etäisyydestä (kaikissa hallitusmuodoissa).\n"
"\n"
"Pidä hyvää huolta pääkaupungistasi, sillä sen menettäminen saattaa syöstä "
"valtakuntasi sisällissotaan. Palatsisi menetys johtaa myös avaruusaluksesi "
-"menettämiseen, mikäli sinulla sellainen on."
+"menettämiseen, mikäli sinulla sellainen on.\n"
+"\n"
+"Yksinvaltiuden alla palatsi antaa myös +75% tuotantobonuksen, monarkian alla "
+"taas +50% tuotantobonuksen."
#: data/default/buildings.ruleset:569 data/civ2/buildings.ruleset:539
msgid "Police Station"
@@ -18764,15 +19021,14 @@ msgid "Research Lab"
msgstr "Tutkimuslaitos"
#: data/default/buildings.ruleset:682
-#, fuzzy
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 ""
"Tutkimuslaitos lisää, yhdessä Kirjaston kanssa, tutkimuspanosta kaupungissa "
-"100%. Tutkimuslaitos yhdessä Kirjaston ja Yliopiston kanssa lisää "
-"tutkimuspanosta 150%."
+"200%. Tutkimuslaitos yhdessä Kirjaston ja Yliopiston kanssa lisää "
+"tutkimuspanosta 450%."
#: data/default/buildings.ruleset:690 data/civ2/buildings.ruleset:654
msgid "SAM Battery"
@@ -18805,7 +19061,6 @@ msgstr ""
msgid "Sewer System"
msgstr "Viemäriverkosto"
-# problem
#: data/default/buildings.ruleset:748 data/civ2/buildings.ruleset:712
msgid ""
"Allows a city to grow larger than size 12. An Aqueduct is first required "
@@ -18953,11 +19208,12 @@ msgid "University"
msgstr "Yliopisto"
#: data/default/buildings.ruleset:942
-#, fuzzy, no-c-format
+#, no-c-format
msgid ""
"Together with a Library, a University increases the science production of a "
"city by 250%."
-msgstr "Yhdessä Kirjaston kanssa lisää tutkimuspanosta kaupungissa 100%"
+msgstr ""
+"Yliopisto yhdessä Kirjaston kanssa lisää tutkimuspanosta kaupungissa 250%"
#: data/default/buildings.ruleset:948 data/civ2/buildings.ruleset:938
#: data/civ1/buildings.ruleset:636
@@ -18978,7 +19234,6 @@ msgid "A.Smith's Trading Co."
msgstr "Adam Smithin kauppakomppania"
#: data/default/buildings.ruleset:983
-#, fuzzy
msgid ""
"City improvements which would normally have an upkeep of 1 are free of "
"upkeep, for all your cities."
@@ -19044,13 +19299,12 @@ msgid "Eiffel Tower"
msgstr "Eiffel-torni"
#: data/default/buildings.ruleset:1087
-#, fuzzy, no-c-format
+#, no-c-format
msgid ""
"Your reputation and goodwill among other nations is recovered twice as fast."
msgstr ""
-"Maineesi muiden kansojen keskuudessa ja näiden hyväntahtoisuus lisääntyy, "
-"kun omistat tämän ihmeen. Maineesi palautuu kaksi kertaa tavallista "
-"nopeammin."
+"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/civ1/buildings.ruleset:736
@@ -19073,9 +19327,8 @@ msgid "Great Wall"
msgstr "Kiinan muuri"
#: data/default/buildings.ruleset:1127
-#, fuzzy
msgid "Works as a City Wall in all your cities."
-msgstr "Vaikuttaa kuin kaupunginmuuri kaikissa kaupungeissa."
+msgstr "Vaikuttaa kuin kaupunginmuuri kaikissa kaupungeissasi."
#: data/default/buildings.ruleset:1135 data/civ2/buildings.ruleset:1122
#: data/civ1/buildings.ruleset:777
@@ -19115,11 +19368,13 @@ msgid "Isaac Newton's College"
msgstr "Isaac Newtonin yliopisto"
#: data/default/buildings.ruleset:1194
-#, fuzzy, no-c-format
+#, no-c-format
msgid ""
"Boosts science production by 100% in every city you control that has a "
"University."
-msgstr "Lisää tutkimuspanosta kaupungissaan 100%."
+msgstr ""
+"Lisää tutkimuspanosta 100%:lla jokaisessa hallitsemassasi kaupungissa, jossa "
+"on Yliopisto."
#: data/default/buildings.ruleset:1200 data/civ2/buildings.ruleset:1185
#: data/civ1/buildings.ruleset:842
@@ -19155,7 +19410,6 @@ msgid "Lighthouse"
msgstr "Majakka"
#: data/default/buildings.ruleset:1273
-#, fuzzy
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 "
@@ -19171,7 +19425,6 @@ msgid "Magellan's Expedition"
msgstr "Magalhaesin tutkimukset"
#: data/default/buildings.ruleset:1295
-#, fuzzy
msgid "Gives all your sea units 2 additional movement points."
msgstr "Kaikki laivastoyksiköt saavat 2 ylimääräistä liikepistettä."
@@ -19214,9 +19467,10 @@ msgid "Oracle"
msgstr "Delfoin oraakkeli"
#: data/default/buildings.ruleset:1375
-#, fuzzy
msgid "Makes two of your unhappy citizens content in every city with a temple."
-msgstr "Muuttaa kaksi tyytymätöntä asukasta rauhalliseksi joka kaupungissa."
+msgstr ""
+"Muuttaa kaksi tyytymätöntä asukasta rauhalliseksi joka kaupungissa, jossa on "
+"Temppeli."
#: data/default/buildings.ruleset:1380 data/civ2/buildings.ruleset:1363
#: data/civ1/buildings.ruleset:960
@@ -19224,14 +19478,14 @@ msgid "Pyramids"
msgstr "Pyramidi"
#: data/default/buildings.ruleset:1394
-#, fuzzy
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 ""
-"Ruokavarastot ovat puolillaan aina kun kaupunki kasvaa tai kutistuu. "
-"Kaupungin on helpompi kasvaa nopeasti ja kestää paremmin nälänhätää."
+"Ruokavarastojen menetys kaupungin kasvaessa tai kutistuessa vähenee 25%. "
+"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/civ1/buildings.ruleset:981
@@ -19239,9 +19493,9 @@ msgid "SETI Program"
msgstr "SETI-ohjelma"
#: data/default/buildings.ruleset:1415
-#, fuzzy
msgid "Boosts science production in each city with a Research Lab by 100%. "
-msgstr "Lisää tutkimuspanosta kaikissa kaupungeissa 50%."
+msgstr ""
+"Lisää tutkimuspanosta 100% kaikissa kaupungeissa, joissa on Tutkimuslaitos."
#: data/default/buildings.ruleset:1420 data/civ2/buildings.ruleset:1402
#: data/civ1/buildings.ruleset:1001
@@ -19272,13 +19526,13 @@ msgid "Sun Tzu's War Academy"
msgstr "Sun Tzun sotakorkeakoulu"
#: data/default/buildings.ruleset:1474
-#, 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 ""
-"Kaikki uudet maavoimien yksikkösi (kaikissa kaupungeissa) ovat konkareita. "
-"Jokainen taistelusta selviävä yksikkösi muuttuu konkariksi."
+"Kaikki uudet maavoimien yksikkösi aloittavat 1. konkaritasolla. "
+"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/civ1/buildings.ruleset:1020
@@ -19286,10 +19540,10 @@ msgid "United Nations"
msgstr "Yhdistyneet Kansakunnat"
#: data/default/buildings.ruleset:1495
-#, fuzzy
msgid "All your units regain two extra hitpoints per turn."
msgstr ""
-"Yksiköidesi palautumisnopeus kiihtyy kahdella pisteellä pelivuoroa kohti."
+"Yksiköidesi voimapisteiden palautumisnopeus kiihtyy kahdella pisteellä "
+"pelivuoroa kohti."
#: data/default/buildings.ruleset:1508 data/civ2/buildings.ruleset:1490
#: data/civ1/buildings.ruleset:1046
@@ -19517,14 +19771,13 @@ msgstr ""
"asukkaan rauhalliseksi kaikissa kaupungeissa."
#: 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 ""
-"Maineesi muiden kansojen keskuudessa ja näiden hyväntahtoisuus lisääntyy, "
-"kun omistat tämän ihmeen. Maineesi palautuu kaksi kertaa tavallista "
-"nopeammin."
+"Maineesi muiden kansojen keskuudessa ja näiden hyväntahtoisuus palautuu "
+"neljä kertaa tavallista nopeammin."
#: data/civ2/buildings.ruleset:1115 data/civ1/buildings.ruleset:770
msgid "Works as a City Wall in all cities."
@@ -19782,6 +20035,13 @@ msgid ""
"Anarchy offers slightly less corruption than Despotism, but slightly more "
"unhappiness."
msgstr ""
+"Anarkia on yksinkertaisuudessaan minkäänlaisen tunnistettavissa olevan "
+"hallinnon puutostila. Kansalaiset ovat hajallaan ja tuottavat huonosti, ja "
+"käyttävät tulonsa mahdollisimman nopeasti sen sijaan että maksaisivat veroja "
+"tai sijoittaisivat tutkimukseen.\n"
+"\n"
+"Anarkiassa korruptiota esiintyy hiukan vähemmän kuin yksinvallassa, mutta "
+"tyytymättömyys on yleisempää."
#: data/default/governments.ruleset:72 data/civ2/governments.ruleset:69
#: data/civ1/governments.ruleset:71
@@ -19855,7 +20115,7 @@ msgid "Communism"
msgstr "Kommunismi"
#: data/default/governments.ruleset:121 data/civ2/governments.ruleset:118
-#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:26
+#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:27
msgid "Comrade"
msgstr "Toveri"
@@ -19865,7 +20125,6 @@ msgid "?female:Comrade"
msgstr "Toveri"
#: data/default/governments.ruleset:124 data/civ1/governments.ruleset:123
-#, fuzzy
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 "
@@ -19878,27 +20137,9 @@ msgstr ""
"Kaiken omaisuuden omistaa valtio, eivätkä yksityiset kansalaiset. Kommunismi "
"on eräänlainen sotilaallisen ja taloudellisen hallitusmuodon välimuoto.\n"
"\n"
-"Kommunistivaltiossa lahjonnan määrä ei ole riippuvainen etäisyydestä "
-"pääkaupunkiin; kaikki kaupungit (myös pääkaupunki) kärsivät hieman. Lisäksi "
-"kaikki yli kymmenen ruudun päässä pääkaupungista sijaitsevat kaupungit "
-"tulkitaan vain kymmenen ruudun päässä sijaitseviksi, kun lasketaan kapinaan "
-"yllyttämisen kustannuksia (Katso diplomaatin ohjetta).\n"
-"\n"
-"Uudisraivaajat kuluttavat yhden yksikön ruokaa.\n"
-"\n"
-"Juhliva kommunistikaupunki saa yhden yksikön verran kauppabonusta jokaiselta "
-"ruudulta, joka ennestään tuottaa vähintään yhden yksikön verran kauppaa. "
-"Katso ohjeen kohtaa onnellisuus.\n"
-"\n"
-"Kaikki kommunistien kouluttamat diplomaatit ja vakoojat ovat konkareita.\n"
-"\n"
-"Kommunistisessa hallinnossa kaupungit voivat ylläpitää kolmea "
-"sotilasyksikköä ilman ylläpitokustannuksia. (Lisäyksiköt kuluttavat yhden "
-"raaka-aineyksikön kukin.)\n"
-"\n"
-"Vahvemman laki toimii rajoitetusti, mutta tehokkaasti. Jokainen kaupungissa "
-"oleva sotilasyksikkö (kolmeen saakka) pystyy pitämään kaksi tyytymätöntä "
-"asukasta rauhallisena."
+"Kommunistivaltiossa korruption määrä ei ole riippuvainen etäisyydestä "
+"pääkaupunkiin; kaikki kaupungit (myös pääkaupunki) kärsivät siitä vähäisessä "
+"määrin."
#: data/default/governments.ruleset:138 data/civ2/governments.ruleset:163
#: data/civ1/governments.ruleset:137
@@ -19924,6 +20165,11 @@ msgid ""
"freedom. Citizens under the Republic become unhappy easily, but the self-"
"sufficiency of your citizens allows high levels of trade."
msgstr ""
+"Tasavaltalaishallinnon alla kansalaiset valitsevat hallitsijansa vaaleilla; "
+"koska valittujen johtajien tulee pysyä kansan suosiossa säilyttääkseen "
+"valtansa, kansalaisille annetaan enemmän vapauksia. Tasavallan aikana "
+"kansalaiset tulevat helposti tyytymättömiksi, mutta heidän omavaraisuutensa "
+"mahdollistaa korkean kaupan tason."
#: data/default/governments.ruleset:160 data/civ2/governments.ruleset:185
#: data/civ1/governments.ruleset:159 data/default/techs.ruleset:216
@@ -19959,6 +20205,10 @@ msgid ""
"potential for unhappiness. There is no corruption during Democracy, but "
"citizens become very upset during wars."
msgstr ""
+"Demokratiassa kansalaiset hallitsevat suoraan äänestämällä käsiteltävistä "
+"asioista. Demokratia tarjoaa korkeimman mahdollisen kaupan tason, mutta myös "
+"suurimman tyytymättömyyden uhkan. Demokratiassa korruptiota ei ole, mutta "
+"sotiminen korpeaa kansalaisia huomattavassa määrin."
#: data/civ2/governments.ruleset:56
msgid ""
@@ -19969,6 +20219,13 @@ msgid ""
"Anarchy offers slightly less corruption and waste than Despotism, but "
"slightly more unhappiness."
msgstr ""
+"Anarkia on yksinkertaisuudessaan minkäänlaisen tunnistettavissa olevan "
+"hallinnon puutostila. Kansalaiset ovat hajallaan ja tuottavat huonosti, ja "
+"käyttävät tulonsa mahdollisimman nopeasti sen sijaan että maksaisivat veroja "
+"tai sijoittaisivat tutkimukseen.\n"
+"\n"
+"Anarkiassa korruptiota ja hukkatuotantoa esiintyy hiukan vähemmän kuin "
+"yksinvallassa, mutta tyytymättömyys on yleisempää."
#: data/civ2/governments.ruleset:78
msgid ""
@@ -19978,6 +20235,11 @@ msgid ""
"Despotism suffers the highest level of corruption and waste of all forms of "
"government."
msgstr ""
+"Yksinvallan aikana olet kansasi absoluuttinen hallitsija. Kontrolloit "
+"kansalaisia lähinnä sotatilalain kautta.\n"
+"\n"
+"Yksinvalta aiheuttaa kaikkiin muihin hallintomuotoihin verrattuna kovimman "
+"korruption ja hukkatuotannon."
#: data/civ2/governments.ruleset:100
msgid ""
@@ -19987,9 +20249,13 @@ msgid ""
"Monarchy suffers the same small amount of corruption and waste that the "
"Republic does."
msgstr ""
+"Monarkian aikana kuningas tai kuningatar toimii perinnöllisenä johtohahmona "
+"hallituksellesi.\n"
+"\n"
+"Monarkia kärsii samasta korruption ja hukkatuotannon pienestä määrästä kuin "
+"Tasavalta."
#: data/civ2/governments.ruleset:121
-#, fuzzy
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 "
@@ -20003,27 +20269,9 @@ msgstr ""
"Kaiken omaisuuden omistaa valtio, eivätkä yksityiset kansalaiset. Kommunismi "
"on eräänlainen sotilaallisen ja taloudellisen hallitusmuodon välimuoto.\n"
"\n"
-"Kommunistivaltiossa lahjonnan määrä ei ole riippuvainen etäisyydestä "
-"pääkaupunkiin; kaikki kaupungit (myös pääkaupunki) kärsivät hieman. Lisäksi "
-"kaikki yli kymmenen ruudun päässä pääkaupungista sijaitsevat kaupungit "
-"tulkitaan vain kymmenen ruudun päässä sijaitseviksi, kun lasketaan kapinaan "
-"yllyttämisen kustannuksia (Katso diplomaatin ohjetta).\n"
-"\n"
-"Uudisraivaajat kuluttavat yhden yksikön ruokaa.\n"
-"\n"
-"Juhliva kommunistikaupunki saa yhden yksikön verran kauppabonusta jokaiselta "
-"ruudulta, joka ennestään tuottaa vähintään yhden yksikön verran kauppaa. "
-"Katso ohjeen kohtaa onnellisuus.\n"
-"\n"
-"Kaikki kommunistien kouluttamat diplomaatit ja vakoojat ovat konkareita.\n"
-"\n"
-"Kommunistisessa hallinnossa kaupungit voivat ylläpitää kolmea "
-"sotilasyksikköä ilman ylläpitokustannuksia. (Lisäyksiköt kuluttavat yhden "
-"raaka-aineyksikön kukin.)\n"
-"\n"
-"Vahvemman laki toimii rajoitetusti, mutta tehokkaasti. Jokainen kaupungissa "
-"oleva sotilasyksikkö (kolmeen saakka) pystyy pitämään kaksi tyytymätöntä "
-"asukasta rauhallisena."
+"Kommunistivaltiossa korruption ja hukkatuotannon määrä ei ole riippuvainen "
+"etäisyydestä pääkaupunkiin; kaikki kaupungit (myös pääkaupunki) kärsivät "
+"siitä vähäisessä määrin."
#: data/civ2/governments.ruleset:135 data/default/techs.ruleset:297
#: data/civ2/techs.ruleset:284 data/civ1/techs.ruleset:282
@@ -20039,7 +20287,6 @@ msgid "High Priestess"
msgstr "Ylipapitar"
#: data/civ2/governments.ruleset:145
-#, fuzzy
msgid ""
"Fundamentalism is a form of government organized around a central set of "
"beliefs. The beliefs, usually religious in nature, form a rigid guideline "
@@ -20052,31 +20299,14 @@ msgid ""
"produces `tithes' (gold) equivalent to the number of people they would "
"convert, and require no maintenance."
msgstr ""
-"Fundamentalismi on hallitusmuoto joka perustuu keskeisille uskomuksille. "
-"Nämä useimmiten uskonnolliset uskomukset muodostavat jäykän sääntöjen "
-"verkoston, joka rajoittaa sekä hallitsijan että kansalaisten toimia ja "
-"vastatoimia.\n"
+"Fundamentalismi on hallintomuoto joka perustuu joukolle keskeisiä dogmeja. "
+"Nämä useimmiten uskonnolliset dogmit muodostavat jäykän sääntöjen verkoston, "
+"joka rajoittaa sekä hallitsijan että kansalaisten toimia ja vastatoimia.\n"
"\n"
"Fundamentalistisessa yhteiskunnassa kansa ja sen hallitsijat ovat täysin "
"omistautuneita uskomuksilleen ja ovat usein valmiita kuolemaan uskonsa "
"puolesta.\n"
"\n"
-"Fundamentalismin aikana kaupunkisi voivat ylläpitää jopa 10 yksikköä "
-"tuotannon lainkaan kärsimättä. (Sitä useammat yksiköt vähentävät "
-"tuotantopanosta yksikön verran kukin, poikkeuksena fanaatikot.)\n"
-"\n"
-"Uudisraivaajat tarvitsevat 2 ruokaa/vuoro. \n"
-"\n"
-"Kun kaupunki juhlii, se saa bonuksena 1 pisteen kauppaa joka ruudulta jossa "
-"jo tuotetaan vähintään 1 piste. Ks. myös Onnellisuus.\n"
-"\n"
-"Tieteen, verojen ja viihteen maksimitaso on 80%.\n"
-"\n"
-"Tieteen suurin mahdollinen taso käytännössä on 50%, loput käytetään verojen "
-"keräämiseen. Tieteen tuotanto puolittuu tämän lisäksi.\n"
-"\n"
-"Fundamentalismin aikana kaupungit kärsivät vähäisestä lahjonnasta.\n"
-"\n"
"Rakennukset jotka tavallisesti muuttavat tyytymättömiä asukkaita "
"rauhallisiksi, tuottavat 'kymmenyksiä' (kultaa), joiden määrä vastaa sitä "
"kuinka monen asukkaan mieltä ne muuttaisivat. Näillä rakennuksilla ei ole "
@@ -20094,6 +20324,16 @@ msgid ""
"cannot be bribed, and Democratic cities cannot be incited to revolt by enemy "
"Diplomats and Spies."
msgstr ""
+"Demokratiassa kansalaiset hallitsevat suoraan äänestämällä käsiteltävistä "
+"asioista. Demokratia tarjoaa korkeimman mahdollisen kaupan tason, mutta myös "
+"suurimman tyytymättömyyden uhkan. Demokratiassa korruptiota tai "
+"hukkatuotantoa ei ole, mutta sotiminen korpeaa kansalaisia huomattavassa "
+"määrin.\n"
+"\n"
+"Koska demokratiassa (onnelliset) kansalaiset uskovat vakaasti hallintoonsa, "
+"heidän uskollisuutensa on vankkumatonta. Demokraattisen hallinnon alaiset "
+"sotilasyksiköt eivät ole lahjottavissa, eivätkä vihollisdiplomaatit tai -"
+"vakoojat voi yllyttää demokraattisia kaupunkeja kapinaan."
#: data/civ1/governments.ruleset:169
msgid ""
@@ -20107,6 +20347,15 @@ msgid ""
"cannot be bribed, and Democratic cities cannot be incited to revolt by enemy "
"Diplomats and Spies."
msgstr ""
+"Demokratiassa kansalaiset hallitsevat suoraan äänestämällä käsiteltävistä "
+"asioista. Demokratia tarjoaa korkeimman mahdollisen kaupan tason, mutta myös "
+"suurimman tyytymättömyyden uhkan. Demokratiassa korruptiota ei ole, mutta "
+"sotiminen korpeaa kansalaisia huomattavassa määrin.\n"
+"\n"
+"Koska demokratiassa (onnelliset) kansalaiset uskovat vakaasti hallintoonsa, "
+"heidän uskollisuutensa on vankkumatonta. Demokraattisen hallinnon alaiset "
+"sotilasyksiköt eivät ole lahjottavissa, eivätkä vihollisdiplomaatit tai -"
+"vakoojat voi yllyttää demokraattisia kaupunkeja kapinaan."
#: data/default/techs.ruleset:55 data/civ2/techs.ruleset:42
#: data/civ1/techs.ruleset:42
@@ -20775,9 +21024,8 @@ msgid "Furs"
msgstr "turkiseläimiä"
#: data/civ2/terrain.ruleset:539
-#, fuzzy
msgid "Petroleum"
-msgstr "Partioi"
+msgstr "raakaöljyä"
#: data/civ1/terrain.ruleset:153
msgid "Arctic"
@@ -20801,9 +21049,8 @@ msgstr "hylkeitä"
#: data/default/units.ruleset:24 data/civ2/units.ruleset:18
#: data/civ1/units.ruleset:18
-#, fuzzy
msgid "green"
-msgstr "Aikaista"
+msgstr "kokematon"
#: data/default/units.ruleset:24
msgid "hardened"
@@ -20813,13 +21060,13 @@ msgstr "karaistunut"
msgid "elite"
msgstr "eliitti"
+# NOTE: All unit names are now transformed to singular or something that can be with only mild ridicule be treated as singular, to facilitate more sensible use in sentences. Words like 'ryhmä' refer to civillian groups, '-väki' is used where possible, 'joukkue' and 'joukko' for cannon fodder, 'partio' for anything mounted, and other words for suitable other special cases.
#: data/default/units.ruleset:194 data/civ2/units.ruleset:89
#: data/civ1/units.ruleset:97
msgid "Settlers"
-msgstr "Uudisraivaajat"
+msgstr "Uudisraivaajaryhmä"
#: data/default/units.ruleset:220
-#, fuzzy
msgid ""
"Settlers are one of the key units in the game. They can be used to found "
"new cities, irrigate land, build roads, railroads, fortresses and mines, and "
@@ -20836,22 +21083,23 @@ msgid ""
"attacks."
msgstr ""
"Uudisraivaajat ovat pelin tärkeimpiä yksikköjä. Niiden avulla perustetaan "
-"uusia kaupunkeja, viljellään maata, rakennetaan teitä, rautateitä ja "
+"uusia kaupunkeja, viljellään maata, rakennetaan teitä, rautateitä, "
"linnoituksia, lentotukikohtia ja kaivoksia, sekä puhdistetaan saasteita ja "
-"ydinlaskeumaa. Uudisraivaajien ylläpito kuluttaa sekä ruokaa että raaka-"
-"aineita, ja uudisraivaajat kuolevat, mikäli niitä ylläpitävä kaupunki kärsii "
-"ruokapulasta.\n"
+"ydinlaskeumaa.\n"
"\n"
"Uudisraivaajat ja teknikot voivat työskennellä yhdessä lyhentääkseen pitkään "
"projektiin vaadittavaa aikaa. Jos kaksi tai useampia näitä yksiköitä "
"työskentelee samalla ruudulla samassa tehtävässä, heidän ponnistelunsa "
"lasketaan yhteen kunnes tehtävä on saatu loppuun. Varo kuitenkin, ettet "
-"käytä liian montaa työläistä yhteen tehtävään; ylimääräinen työpanos valuu "
+"käytä liian montaa työläistä yhteen tehtävään; ylijäävä työpanos valuu "
"hukkaan ja ryhmä uudisraivaajia ja/tai teknikkoja on erittäin haavoittuva "
"vihollisen hyökkäyksille."
+#: data/default/units.ruleset:238
+msgid "?unit:Workers"
+msgstr "Työläisjoukko"
+
#: data/default/units.ruleset:264
-#, fuzzy
msgid ""
"Workers are one of the key units in the game. They can be used to irrigate "
"land, build roads, railroads, fortresses, airbases and mines, and clean up "
@@ -20865,27 +21113,23 @@ msgid ""
"and a group of Workers, Settlers and/or Engineers is highly vulnerable to "
"enemy attacks."
msgstr ""
-"Uudisraivaajat ovat pelin tärkeimpiä yksikköjä. Niiden avulla perustetaan "
-"uusia kaupunkeja, viljellään maata, rakennetaan teitä, rautateitä ja "
-"linnoituksia, lentotukikohtia ja kaivoksia, sekä puhdistetaan saasteita ja "
-"ydinlaskeumaa. Uudisraivaajien ylläpito kuluttaa sekä ruokaa että raaka-"
-"aineita, ja uudisraivaajat kuolevat, mikäli niitä ylläpitävä kaupunki kärsii "
-"ruokapulasta.\n"
+"Työläiset ovat pelin tärkeimpiä yksikköjä. Niiden avulla viljellään maata, "
+"rakennetaan teitä, rautateitä ja linnoituksia, lentotukikohtia ja kaivoksia, "
+"sekä puhdistetaan saasteita ja ydinlaskeumaa. \n"
"\n"
-"Uudisraivaajat ja teknikot voivat työskennellä yhdessä lyhentääkseen pitkään "
-"projektiin vaadittavaa aikaa. Jos kaksi tai useampia näitä yksiköitä "
-"työskentelee samalla ruudulla samassa tehtävässä, heidän ponnistelunsa "
-"lasketaan yhteen kunnes tehtävä on saatu loppuun. Varo kuitenkin, ettet "
-"käytä liian montaa työläistä yhteen tehtävään; ylimääräinen työpanos valuu "
-"hukkaan ja ryhmä uudisraivaajia ja/tai teknikkoja on erittäin haavoittuva "
-"vihollisen hyökkäyksille."
+"Uudisraivaajat, työläiset ja teknikot voivat työskennellä yhdessä "
+"lyhentääkseen pitkään projektiin vaadittavaa aikaa. Jos kaksi tai useampia "
+"näitä yksiköitä työskentelee samalla ruudulla samassa tehtävässä, heidän "
+"ponnistelunsa lasketaan yhteen kunnes tehtävä on saatu loppuun. Varo "
+"kuitenkin, ettet käytä liian montaa työläistä yhteen tehtävään; ylijäävä "
+"työpanos valuu hukkaan ja ryhmä työläisiä, uudisraivaajia ja/tai teknikkoja "
+"on erittäin haavoittuva vihollisen hyökkäyksille."
#: data/default/units.ruleset:279 data/civ2/units.ruleset:133
msgid "Engineers"
-msgstr "Teknikot"
+msgstr "Teknikkoryhmä"
#: data/default/units.ruleset:305
-#, fuzzy
msgid ""
"Engineers are similar to Workers, but they work twice as fast and move twice "
"as fast. Engineers may also perform major terrain transformations (for "
@@ -20899,22 +21143,21 @@ msgid ""
"before the Workshop becomes obsolete. This way, your Workers units will be "
"upgraded for free."
msgstr ""
-"Teknikot ovat muuten samanlaisia kuin uudisraivaajat, mutta ne "
-"työskentelevät ja liikkuvat kaksinkertaisella nopeudella. Teknikot voivat "
-"myös tehdä suuria maastonmuokkauksia (esimerkiksi muuttaa tundran "
-"autiomaaksi) jotka ovat liian vaativia uudisraivaajille.\n"
+"Teknikot ovat muuten samanlaisia kuin työläiset, mutta ne työskentelevät ja "
+"liikkuvat kaksinkertaisella nopeudella. Teknikot voivat myös tehdä suuria "
+"maastonmuokkauksia (esimerkiksi muuttaa tundran autiomaaksi) jotka ovat "
+"liian vaativia työläisille.\n"
"\n"
-"VIHJE 1: Ajanmukaista uudisraivaajat teknikoiksi heti kun se on "
-"mahdollista, koska teknikkojen ylläpitokustannukset ovat samat kuin "
-"uudisraivaajien, mutta työteho kaksinkertainen.\n"
+"VIHJE 1: Ajanmukaista työläiset teknikoiksi heti kun se on mahdollista, "
+"koska teknikkojen ylläpitokustannukset ovat samat kuin työläisten.\n"
"\n"
"VIHJE 2: Jos onnistut rakentamaan Leonardon työpajan, opettele "
-"valmistamaan räjähteitä ennenkuin työpaja vanhentuu. Näin uudisraivaajasi "
+"valmistamaan räjähteitä ennenkuin työpaja vanhentuu. Näin työläisesi "
"ajanmukaistetaan ilman kustannuksia."
#: data/default/units.ruleset:320 data/civ2/units.ruleset:174
msgid "Warriors"
-msgstr "Soturit"
+msgstr "Soturijoukko"
#: data/default/units.ruleset:346 data/civ2/units.ruleset:200
#: data/civ1/units.ruleset:167
@@ -20927,22 +21170,25 @@ msgstr ""
#: data/default/units.ruleset:352 data/civ2/units.ruleset:206
#: data/civ1/units.ruleset:173
msgid "Phalanx"
-msgstr "Falangit"
+msgstr "Falangi"
#: 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 ""
+"Falangi on haarniskoitua jalkaväkeä, ja soveltuu kaupunkiesi puolustamiseen."
#: data/default/units.ruleset:383 data/civ2/units.ruleset:237
msgid "Archers"
-msgstr "Jousimiehet"
+msgstr "Jousimiespartio"
#: data/default/units.ruleset:409 data/civ2/units.ruleset:263
msgid ""
"Archers fight with bows and arrows and has a good offensive value as well as "
"decent defense."
msgstr ""
+"Jousimiehet taistelevat jousin ja nuolin. Niiden hyökkäysteho on hyvä, ja "
+"puolustusteho kelvollinen."
#: data/default/units.ruleset:415 data/civ2/units.ruleset:269
#: data/civ1/units.ruleset:204
@@ -20955,28 +21201,34 @@ msgid ""
"Legions are heavily armed and well disciplined infantry units with an "
"excellent offensive value."
msgstr ""
+"Legioonalaiset ovat paksulti haarniskoitua ja kurinalaista jalkaväkeä, "
+"joiden hyökkäysteho on erinomainen."
# Perhaps peitsimiehet? This seems too much like ordinary warriors.
#: data/default/units.ruleset:447 data/civ2/units.ruleset:301
msgid "Pikemen"
-msgstr "Keihäsmiehet"
+msgstr "Keihäsjoukkue"
#: data/default/units.ruleset:473 data/civ2/units.ruleset:327
msgid ""
"Equipped with long pikes, Pikemen replaces Phalanx as the preferred city "
"defender."
msgstr ""
+"Pitkin keihäin varustetut keihäsmiehet korvaavat Falangin suositeltuna "
+"kaupunginpuolustajana."
#: data/default/units.ruleset:479 data/civ2/units.ruleset:333
#: data/civ1/units.ruleset:236
msgid "Musketeers"
-msgstr "Musketöörit"
+msgstr "Muskettijoukkue"
#: data/default/units.ruleset:506 data/civ2/units.ruleset:360
msgid ""
"Musketeers are infantry equipped with early firearms and replace Pikemen as "
"the preferred city defender."
msgstr ""
+"Muskettijoukkue on jalkaväkeä, joka on varustettu varhaisilla tuliaseilla. "
+"Ne korvaavat keihäsmiehet suositeltuna kaupunginpuolustajana."
#: data/default/units.ruleset:513 data/civ2/units.ruleset:400
msgid "Partisan"
@@ -21004,15 +21256,17 @@ msgstr ""
"\n"
" - Sinun on tunnettava kommunismi ja ruuti.\n"
"\n"
-" - Hallitusmuotosi on oltava joko kommunismi tai demokratia."
+" - hallintomuotosi on oltava joko kommunismi tai demokratia."
#: data/default/units.ruleset:553 data/civ2/units.ruleset:440
msgid "Alpine Troops"
-msgstr "Alppijääkärit"
+msgstr "Alppijääkäripartio"
#: data/default/units.ruleset:579 data/civ2/units.ruleset:466
msgid "Alpine Troops are highly mobile units as well as excellent defenders."
msgstr ""
+"Alppijääkäripartiot ovat nopeasti liikkuvia yksiköitä ja erinomaisia "
+"puolustautujia."
#: data/default/units.ruleset:585 data/civ2/units.ruleset:472
#: data/civ1/units.ruleset:270
@@ -21024,6 +21278,8 @@ msgstr "Jalkaväki"
msgid ""
"Riflemen are World War-era infantry, very good at defending your cities."
msgstr ""
+"Ensimmäisen maailmansodan ajan jalkaväki on omiaan kaupunkiesi "
+"puolustamiseen."
#: data/default/units.ruleset:617 data/civ2/units.ruleset:504
msgid "Marines"
@@ -21031,20 +21287,21 @@ msgstr "Merijalkaväki"
#: data/default/units.ruleset:643 data/civ2/units.ruleset:530
msgid "Marines are infantry who are experts at marine warfare."
-msgstr ""
+msgstr "Merijalkaväki erikoistuu merelliseen sodankäyntiin."
#: data/default/units.ruleset:648 data/civ2/units.ruleset:535
msgid "Paratroopers"
-msgstr "Laskuvarjojääkärit"
+msgstr "Laskuvarjojääkäripartio"
#: data/default/units.ruleset:674 data/civ2/units.ruleset:561
msgid "Paratroopers are experts at airborne attacks."
-msgstr ""
+msgstr "Laskuvarjojääkärit ovat ilmahyökkäysten erikoisosaajia."
+# Liberal translation
#: data/default/units.ruleset:683 data/civ2/units.ruleset:570
#: data/civ1/units.ruleset:302
msgid "Mech. Inf."
-msgstr "Miehistönkuljetusvaunu"
+msgstr "Panssarivoimat"
#: data/default/units.ruleset:709 data/civ2/units.ruleset:596
#: data/civ1/units.ruleset:328
@@ -21052,23 +21309,25 @@ msgid ""
"Mechanized Infantry; this unit has the strongest defence strength of any "
"land unit, but is only available near the end of the technology tree."
msgstr ""
-"Panssaroitu jalkaväki; tämän yksikön puolustuskyky on maavoimien suurin, "
-"mutta se on käytettävissä vasta aivan pelin loppuvaiheessa."
+"Panssarivoimien puolustuskyky on maavoimien suurin, mutta se on "
+"käytettävissä vasta aivan pelin loppuvaiheessa."
#: data/default/units.ruleset:716 data/civ2/units.ruleset:603
msgid "Horsemen"
-msgstr "Hevosmiehet"
+msgstr "Hevospartio"
#: data/default/units.ruleset:742 data/civ2/units.ruleset:629
msgid ""
"Horsemen are mounted warriors and an early shock-troop that can penetrate "
"deep into enemy territory."
msgstr ""
+"Hevospartiot ovat ratsuineen varhainen hyökkäyksiä johtava joukko, joka voi "
+"edetä nopeasti syvälle vihollisalueelle."
#: data/default/units.ruleset:749 data/civ2/units.ruleset:636
#: data/civ1/units.ruleset:368
msgid "Chariot"
-msgstr "Sotavaunut"
+msgstr "Sotavaunu"
#: data/default/units.ruleset:775 data/civ2/units.ruleset:662
#: data/civ1/units.ruleset:394
@@ -21076,24 +21335,26 @@ msgid ""
"Chariots are horse-pulled war wagons, stronger but more expensive than "
"horsemen."
msgstr ""
+"Hevosten vetämät sotavaunut ovat tavallisia ratsumiehiä vahvempia mutta myös "
+"kalliimpia."
#: data/default/units.ruleset:781 data/civ2/units.ruleset:732
#: data/civ1/units.ruleset:400
msgid "Knights"
-msgstr "Ritarit"
+msgstr "Ritarikaarti"
#: data/default/units.ruleset:808 data/civ2/units.ruleset:759
#: data/civ1/units.ruleset:427
msgid "Knights are mounted and heavily armored warriors."
-msgstr ""
+msgstr "Ritarit ovat raskaasti haarniskoitua ratsuväkeä."
#: data/default/units.ruleset:813 data/civ2/units.ruleset:764
msgid "Dragoons"
-msgstr "Rakuunat"
+msgstr "Rakuunapartio"
#: data/default/units.ruleset:840 data/civ2/units.ruleset:791
msgid "Dragoons are mounted warriors carrying early firearms."
-msgstr ""
+msgstr "Rakuunat ovat varhaisia tuliaseita käyttäviä ratsumiehiä."
#: data/default/units.ruleset:845 data/civ2/units.ruleset:796
#: data/civ1/units.ruleset:335
@@ -21102,7 +21363,7 @@ msgstr "Ratsuväki"
#: data/default/units.ruleset:871 data/civ2/units.ruleset:822
msgid "Cavalry are mounted and highly trained soldiers."
-msgstr ""
+msgstr "Ratsuväki on tarkkaan koulutettua."
#: data/default/units.ruleset:876 data/civ2/units.ruleset:827
#: data/civ1/units.ruleset:432
@@ -21115,6 +21376,9 @@ msgid ""
"Armors are motorized war wagons that are faster, stronger, and can take more "
"damage than any mounted unit."
msgstr ""
+"Panssarivaunut ovat moottoroituja sotavaunuja jotka ovat nopeampia, "
+"vahvempia ja paremmin räimimistä sietäviä kuin mikä tahansa yhden "
+"hevosvoiman ratsuyksikkö."
#: data/default/units.ruleset:909 data/civ2/units.ruleset:860
#: data/civ1/units.ruleset:465
@@ -21127,6 +21391,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 ""
+"Katapultit ovat suuria kiviä heittäviä sotakoneita. Ne ovat vahvoja "
+"hyökkääjiä, mutta toivottomia puolustajia, ja tarvitsevat siksi tukijoukkoja "
+"ollakseen tehokkaita."
#: data/default/units.ruleset:942 data/civ2/units.ruleset:893
#: data/civ1/units.ruleset:498
@@ -21140,6 +21407,9 @@ msgid ""
"distances. They are very strong attackers but equally weak defenders and "
"will need an escort to be effective."
msgstr ""
+"Kanuunat ovat suuria tykkejä jotka voivat ampua painavia ammuksia kauas. Ne "
+"ovat erinomaisien vahvoja hyökkääjiä, mutta toivottomia puolustajia, ja "
+"tarvitsevat siksi tukijoukkoja ollakseen tehokkaita."
#: data/default/units.ruleset:976 data/civ2/units.ruleset:927
#: data/civ1/units.ruleset:532
@@ -21151,6 +21421,9 @@ 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 ""
+"Tykistö on käytännössä parannettu versio kanuunasta. Se on erinomaisen vahva "
+"hyökkääjä mutta toivoton puolustaja, ja tarvitsee siksi tukijoukon ollakseen "
+"tehokas."
#: data/default/units.ruleset:1009 data/civ2/units.ruleset:960
msgid "Howitzer"
@@ -21161,6 +21434,8 @@ msgid ""
"Howitzers are upgraded artillery with improved defensive as well as "
"offensive capabilities."
msgstr ""
+"Haupitsi on parannettu versio tykistöstä, ja sen hyökkäys- ja puolustusteho "
+"on parempi."
#: data/default/units.ruleset:1041 data/civ2/units.ruleset:992
#: data/civ1/units.ruleset:564
@@ -21173,6 +21448,8 @@ msgid ""
"Fighters are your first airborne units. They can move anywhere and attack "
"any unit."
msgstr ""
+"Hävittäjät ovat ensimmäisiä ilmavoimiasi. Ne voivat liikkua mihin tahansa, "
+"ja hyökätä minkä tahansa yksikön kimppuun."
#: data/default/units.ruleset:1073 data/civ2/units.ruleset:1024
#: data/civ1/units.ruleset:596
@@ -21185,6 +21462,9 @@ msgid ""
"Bombers are specialized airborne units that may only attack ground targets, "
"not other airborne units."
msgstr ""
+"Pommikoneet ovat erikoistuneita ilmavoimia, jotka voivat hyökätä vain maassa "
+"olevien kohteiden kimppuun - niistä ei ole vastusta toisille ilmassa "
+"liikkujille."
#: data/default/units.ruleset:1132 data/civ2/units.ruleset:1083
msgid ""
@@ -21205,7 +21485,7 @@ msgstr "Stealth-hävittäjä"
#: data/default/units.ruleset:1166 data/civ2/units.ruleset:1117
msgid "An improved Fighter, with improved attack and a higher movement radius."
msgstr ""
-"Kehittynyt hävittäjä, jonka toimintaetäisyys ja tulivoima ovat lisääntyneet."
+"Kehittynyt hävittäjä, jonka toimintaetäisyys ja tulivoima ovat paranneltuja."
#: data/default/units.ruleset:1172 data/civ2/units.ruleset:1123
msgid "Stealth Bomber"
@@ -21214,7 +21494,8 @@ msgstr "Stealth-pommikone"
#: data/default/units.ruleset:1198 data/civ2/units.ruleset:1149
msgid "An improved Bomber, with improved attack and a higher movement radius."
msgstr ""
-"Kehittynyt pommikone, jonka toimintaetäisyys ja tulivoima ovat lisääntyneet."
+"Kehittynyt pommikone, jonka toimintaetäisyys ja tulivoima ovat aina vain "
+"parempia."
# Finnish translations of some naval units based on Jussi Mannerberg's book (JARKKO)
#: data/default/units.ruleset:1204 data/civ2/units.ruleset:1155
@@ -21228,6 +21509,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 ""
+"Kaleeri on ensimmäinen laivayksikkösi. Se voi toimia kuljetusaluksena ja "
+"kykenee jossain määrin myös hyökkäykseen; sen sijaan se ei saa eksyä liian "
+"kauas rannikosta."
#: data/default/units.ruleset:1237 data/civ2/units.ruleset:1188
msgid "Caravel"
@@ -21236,7 +21520,7 @@ msgstr "Karaveli"
#: data/default/units.ruleset:1263 data/civ2/units.ruleset:1214
msgid ""
"The Caravel replaces the Trireme and is much more reliable on the open seas."
-msgstr ""
+msgstr "Karaveli korvaa kaleerin ja on paljon luotettavampi avomerellä."
#: data/default/units.ruleset:1269 data/civ2/units.ruleset:1220
msgid "Galleon"
@@ -21247,6 +21531,8 @@ msgid ""
"The Galleon is a pure transport ship and cannot attack other ships, though "
"it may still defend itself when attacked."
msgstr ""
+"Kaljuuna on puhdas kuljetusalus eikä voi hyökätä toisten laivojen kimppuun; "
+"se kykenee silti tosin puolustautumaan hyökkäykseltä."
#: data/default/units.ruleset:1302 data/civ2/units.ruleset:1253
#: data/civ1/units.ruleset:694
@@ -21259,6 +21545,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 ""
+"Fregatti on monipuolinen alus, joka on sekä vahva hyökkääjä että kelvollinen "
+"kuljetusalus."
#: data/default/units.ruleset:1335 data/civ2/units.ruleset:1286
#: data/civ1/units.ruleset:727
@@ -21271,6 +21559,8 @@ msgid ""
"The Ironclad is an armored ship that is much more sturdy than the Frigate "
"but loses the latter's transport capability."
msgstr ""
+"Panssarilaiva on panssaroitu alus joka on paljon kestävämpi kuin fregatti, "
+"muttei kykene sen tavoin kuljettamaan yksiköitä."
#: data/default/units.ruleset:1368 data/civ2/units.ruleset:1319
msgid "Destroyer"
@@ -21281,7 +21571,7 @@ msgid ""
"TIP: A very fast unit, which is very useful for hunting down enemy "
"Transports."
msgstr ""
-"VIHJE: Erittäin nopea alus, joka sopii hyvin vihollisen kuljetusalusten "
+"VIHJE: Erittäin nopea alus, joka sopii hyvin vihollisen rahtilaivojen "
"tuhoamiseen."
#: data/default/units.ruleset:1400 data/civ2/units.ruleset:1351
@@ -21292,7 +21582,7 @@ msgstr "Risteilijä"
#: 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 "Risteilijä on hyökkäysteholtaan vahva alus."
#: data/default/units.ruleset:1431 data/civ2/units.ruleset:1382
msgid "AEGIS Cruiser"
@@ -21302,6 +21592,8 @@ msgstr "Ohjusristeilijä"
msgid ""
"The AEGIS Cruiser is equipped with an advanced defensive missile system."
msgstr ""
+"Ohjusristeilijä on varustettu korkealuokkaisella "
+"ohjuspuolustusjärjestelmällä."
#: data/default/units.ruleset:1463 data/civ2/units.ruleset:1414
#: data/civ1/units.ruleset:791
@@ -21314,6 +21606,8 @@ msgid ""
"The Battleship is the supreme naval unit with excellent offensive and "
"defensive values."
msgstr ""
+"Taistelulaiva on laivaston aatelia, ja sen hyökkäys- ja puolustusteho ovat "
+"erinomaiset."
#: data/default/units.ruleset:1495 data/civ2/units.ruleset:1446
#: data/civ1/units.ruleset:823
@@ -21353,6 +21647,7 @@ msgid ""
"The Transport cannot attack on its own but may defend itself when under "
"attack."
msgstr ""
+"Rahtilaiva ei voi hyökätä itse, mutta voi puolustautua hyökkäystä vastaan."
#: data/default/units.ruleset:1593 data/civ2/units.ruleset:1544
msgid "Cruise Missile"
@@ -21409,7 +21704,6 @@ msgstr "Diplomaatti"
#: 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 "
@@ -21430,29 +21724,31 @@ msgid ""
"the enemy. Little wonder that Diplomats are often viewed with suspicion and "
"fear!"
msgstr ""
-" - Diplomaatit voivat perustaa lähetystöjä muihin sivilisaatioihin menemällä "
-"toisten pelaajien kaupunkeihin.\n"
+"Diplomaatti on virkamies, joka kantaa viestejäsi ja jolla on valtuus "
+"käsitellä ulkomaisia arvohenkilöitä. Hän voi myös suorittaa erilaisia "
+"peiteoperaatioita, joiden tavoitteena on vastustajiesi vahingoittaminen.\n"
"\n"
-" - Diplomaatit voivat myös yrittää sabotoida vihollisen tuotantoa tai "
-"varastaa teknologiaa vihollisen kaupungista. (Teknologiaa voidaan varastaa "
-"yhdestä kaupungista vain kerran).\n"
+"Jos vihollisyksikkö on yksin ruudulla, voit yrittää lahjoa sen "
+"diplomaatillasi. Lahjonnan onnistuessa menetät jonkin verran kultaa, ja "
+"yksikkö siirtyy sinulle välittömästi.\n"
"\n"
-" - Diplomaatti voi myös lahjoa vihollisen sotilasyksikön, jos se on ainoa "
-"yksikkö ruudullaan.\n"
+"Diplomaatti voi myös tehdä erinäisiä toimia toisen pelaajan kaupungissa:\n"
+"- \"Tutki kaupunkia\" - paljasta yksityiskohtaisia tietoja kaupungista.\n"
+"- \"Perusta lähetystö\" - varmista pysyvä tiedonsaanti pelaajasta.\n"
+"- \"Sabotoi\" - tuhoa kaupungin rakennusprojekti.\n"
+"- \"Varasta teknologiaa\" - opi teknologiaa kaupungin omistajalta.\n"
+"- \"Lietso kapinaa\" - käännytä kaupunki omaksesi maksamalla kultaa. Huomioi "
+"kuitenkin, ettet voi lietsoa kapinaa pääkaupungissa.\n"
"\n"
-" - Diplomaatti voi jopa käännyttää vihollisen kaupungin omaksesi, jos "
-"sinulla on tarpeeksi rahaa tehtävän toteuttamiseksi!\n"
-"\n"
-" - Joissakin pelistrategioissa diplomaattilaumoja käytetään tekemään "
-"tuhojaan vihollisen keskuudessa. Eipä ihmekään, että diplomaatteja usein "
-"katsotaan epäillen ja pelolla!"
+"Joissakin pelistrategioissa diplomaattilaumoja käytetään tekemään tuhojaan "
+"vihollisen keskuudessa. Eipä ihmekään, että diplomaatteja usein herättävät "
+"epäilystä ja pelkoa!"
#: data/default/units.ruleset:1723 data/civ2/units.ruleset:1674
msgid "Spy"
msgstr "Vakooja"
#: 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"
@@ -21469,13 +21765,10 @@ msgid ""
"A Spy can also be of aid on the battlefield - sabotaging enemy units as well "
"as bribing them to change allegiance."
msgstr ""
-"Vakooja on täysammattilainen ja sellaisena paljon taitavampi vakoilun alalla "
-"kuin edeltäjänsä diplomaatti.\n"
+"Vakooja on taitavampi vakoilun alalla kuin edeltäjänsä diplomaatti.\n"
"\n"
-"Harmittomimpia vakoojan taidoista ovat kyky tutkia kaupunkeja paljastaen "
-"tarkkoja tietoja niistä, ja taito perustaa lähetystöjä. Kuitenkin, mikäli "
-"vakoojasi on ehtinyt saada vaarallisen maineen, hänet teloitetaan, mikäli "
-"hän yrittää perustaa lähetystön.\n"
+"Vakooja voi tehdä kaikkea mitä diplomaattikin, mutta onnistuu siinä "
+"todennäköisemmin. Ks. myös diplomaatin kykyluettelo.\n"
"\n"
"Vakoojaa voidaan käyttää myös viholliskaupungin vesivarastojen "
"myrkyttämiseen väkiluvun pienentämiseksi, halutun teknologian varastamiseen "
@@ -21526,9 +21819,16 @@ msgstr ""
"Seikkailijat ovat erittäin hyödyllisiä tuntemattomien alueiden "
"kartoituksessa."
+#: data/default/units.ruleset:1864
+#, fuzzy
+msgid "?unit:Leader"
+msgstr "Johtaja"
+
#: data/default/units.ruleset:1892
msgid "This is you. If you lose this unit, you lose the game. So don't."
msgstr ""
+"Tämä yksikkö on sinä. Jos menetät tämän yksikön, häviät pelin. Älä siis "
+"menetä sitä."
#: data/default/units.ruleset:1897 data/civ2/units.ruleset:1815
#: data/civ1/units.ruleset:1054
@@ -21617,37 +21917,39 @@ msgstr ""
#: data/civ2/units.ruleset:367
msgid "Fanatics"
-msgstr "Fanaatikot"
+msgstr "Fanaatikkolauma"
#: data/civ2/units.ruleset:394
-#, fuzzy
msgid ""
"Fundamentalist nations can maintain Fanatic units without having to pay any "
"shields for upkeep."
msgstr ""
-"Vain fundamentalistivaltiot voivat rakentaa fanaatikkoyksiköitä.\n"
-"\n"
"Fundamentalistivaltioiden ei tarvitse maksaa ylläpitokustannuksia "
"fanaatikkoyksiköistä."
#: data/civ2/units.ruleset:668
msgid "Elephants"
-msgstr "Sotanorsut"
+msgstr "Sotanorsupartio"
#: data/civ2/units.ruleset:694
msgid ""
"Elephants are towering animals trained for war that are often used as "
"powerful shock troops, but defend poorly against most other units."
msgstr ""
+"Sotanorsut ovat jättiläismäisiä eläimiä, jotka on koulutettu sotaan. Niitä "
+"käytetään usein voimakkaina hyökkäystä johtavina joukkoina, mutta ne "
+"puolustautuvat huonosti useimpia muita yksiköitä vastaan."
#: data/civ2/units.ruleset:700
msgid "Crusaders"
-msgstr "Ristiretkeläiset"
+msgstr "Ristiretkeläiskunta"
#: data/civ2/units.ruleset:726
msgid ""
"Crusaders are highly disciplined mounted warriors driven by a higher cause."
msgstr ""
+"Ristiretkeläiset ovat äärimmäisen kurinalaista ratsuväkeä, jota ajaa "
+"eteenäin elämää suurempi tehtävä."
#: data/civ1/units.ruleset:123
msgid ""
@@ -21688,18 +21990,24 @@ msgid ""
"Musketeers are infantry equipped with early firearms and replace Phalanx as "
"the preferred city defender."
msgstr ""
+"Muskettijoukkue on jalkaväkeä, joka on varustettu varhaisilla tuliaseilla. "
+"Ne korvaavat falangin suositeltuna kaupunginpuolustajana."
#: data/civ1/units.ruleset:361
msgid ""
"Cavalry are mounted warriors and an early shock-troop that can penetrate "
"deep into enemy territory."
msgstr ""
+"Ratsuväki on varhainen hyökkäyksiä johtava joukko, joka voi edetä nopeasti "
+"syvälle vihollisalueelle."
#: data/civ1/units.ruleset:558
msgid ""
"The artillery is an upgraded cannon with improved defensive as well as "
"offensive capabilities."
msgstr ""
+"Tykistö on käytännössä parannettu versio kanuunasta, ja sen hyökkäys- ja "
+"puolustuskyky on parempi."
#: data/civ1/units.ruleset:662
msgid "Sail"
@@ -21708,7 +22016,7 @@ msgstr "Purjelaiva"
#: data/civ1/units.ruleset:688
msgid ""
"The Sail replaces the Trireme and is much more reliable on the open seas."
-msgstr ""
+msgstr "Purjelaiva korvaa kaleerin, ja on paljon luotettavampi avomerellä."
#: data/civ1/units.ruleset:946
msgid ""
@@ -21755,14 +22063,12 @@ msgstr ""
"maksetaan hänestä sadan yksikön lunnaat, mutta vain maavoimien yksiköille."
#: data/nation/aborigines.ruleset:3
-#, fuzzy
msgid "Australian Aboriginal"
-msgstr "australialaisten"
+msgstr "Australian aboriginaalien"
#: data/nation/aborigines.ruleset:4
-#, fuzzy
msgid "?plural:Aborigines"
-msgstr "?plural:argentiinalaiset"
+msgstr "aboriginaalit"
#: data/nation/aborigines.ruleset:6
msgid ""
@@ -21771,15 +22077,17 @@ msgid ""
"to themselves with different names, including Koori, Yamaji, Nunga, and "
"Murri."
msgstr ""
+"Australian aboriginaalit on yhteisnimitys Australian mantereen "
+"alkuperäisasukkaille. Eri Australian osista kotoisin olevat aboriginaalit "
+"kutsuvat itseään eri nimillä, kuten Koori, Yamaji, Nunga ja Murri."
#: data/nation/afghani.ruleset:3
msgid "Afghani"
msgstr "afgaanien"
#: data/nation/afghani.ruleset:4
-#, fuzzy
msgid "?plural:Afghanis"
-msgstr "?plural:thait"
+msgstr "afgaanit"
#: data/nation/afghani.ruleset:6
msgid ""
@@ -21789,20 +22097,25 @@ msgid ""
"The Afghanistan nation-state as it is known today came into existence in "
"1746 when Ahmad Shah founded the Durrani Empire."
msgstr ""
+"Afganistania on usein kutsuttu Keski-Aasian tienristeykseksi. Sen historia "
+"on myrskyisä: maata ovat miehittäneet aikojen saatossa useat eri vallat, "
+"mukaanlukien Persia, TÅ¡ingis-kaani ja Aleksanteri Suuri. Nykyinen "
+"Afganistanin kansallisvaltio syntyi vuonna 1746, kun Ahmad Shad Durran "
+"perusti Durranin valtakunnan."
#: data/nation/afghani.ruleset:24
msgid "Emir"
-msgstr ""
+msgstr "Emiiri"
#: data/nation/afghani.ruleset:25 data/nation/slovakian.ruleset:30
-#: data/nation/soviet.ruleset:27
-#, fuzzy
+#: data/nation/soviet.ruleset:28
msgid "General Secretary"
msgstr "Pääsihteeri"
+# 15 Jan 09: 'Mullah' also used in Finnish according to wikipedia.
#: data/nation/afghani.ruleset:26
msgid "Mullah"
-msgstr ""
+msgstr "Mulla"
#: data/nation/afghani.ruleset:27 data/nation/australian.ruleset:25
#: data/nation/british.ruleset:22 data/nation/burmese.ruleset:24
@@ -21822,20 +22135,20 @@ msgid "Prime Minister"
msgstr "Pääministeri"
#: data/nation/algerian.ruleset:3
-#, fuzzy
msgid "Algerian"
-msgstr "yhdysvaltalaisten"
+msgstr "algerialaisten"
#: data/nation/algerian.ruleset:4
-#, fuzzy
msgid "?plural:Algerians"
-msgstr "?plural:persialaiset"
+msgstr "algerialaiset"
#: data/nation/algerian.ruleset:6
msgid ""
"Algeria is an Arabic nation in North Africa. It is historically inhabited by "
"the Berber people."
msgstr ""
+"Algeria on Pohjois-Afrikassa sijaitseva arabivaltio, jota ovat "
+"historiallisesti asuttaneet berberit."
#: data/nation/american.ruleset:3
msgid "American"
@@ -21846,7 +22159,6 @@ msgid "?plural:Americans"
msgstr "?plural:yhdysvaltalaiset"
#: data/nation/american.ruleset:6
-#, fuzzy
msgid ""
"Formally named the United States of America. Independent from Great Britain "
"after a revolution in 1776-1783AD."
@@ -21863,18 +22175,16 @@ msgid "Reverend"
msgstr "kunnianarvoisa"
#: data/nation/antarctican.ruleset:3
-#, fuzzy
msgid "Antarctican"
-msgstr "arktinen alue"
+msgstr "etelänapaattien"
#: data/nation/antarctican.ruleset:4
-#, fuzzy
msgid "?plural:Antarcticans"
-msgstr "?plural:latvialaiset"
+msgstr "etelänapaatit"
#: data/nation/antarctican.ruleset:6
msgid "Independent South Pole, land of penguins."
-msgstr ""
+msgstr "Itsenäinen Etelänapa, pingviinien maa."
#: data/nation/arab.ruleset:3
msgid "Arab"
@@ -21893,62 +22203,59 @@ msgid "Caliph"
msgstr "Kalifi"
#: data/nation/aramean.ruleset:3
-#, fuzzy
msgid "Aramean"
-msgstr "yhdysvaltalaisten"
+msgstr "aramealaisten"
#: data/nation/aramean.ruleset:4
-#, fuzzy
msgid "?plural:Arameans"
-msgstr "?plural:yhdysvaltalaiset"
+msgstr "aramealaiset"
#: data/nation/aramean.ruleset:6
msgid ""
"According to legend, the Aramean people are the descendants of Aram, the "
"grandson of Noah."
msgstr ""
+"Tarinan mukaan aramealaiset polveutuvat Aramista, joka oli Nooan pojanpoika."
#: data/nation/armenian.ruleset:3
-#, fuzzy
msgid "Armenian"
-msgstr "yhdysvaltalaisten"
+msgstr "armenialaisten"
#: data/nation/armenian.ruleset:4
-#, fuzzy
msgid "?plural:Armenians"
-msgstr "?plural:yhdysvaltalaiset"
+msgstr "armenialaiset"
#: data/nation/armenian.ruleset:6
msgid ""
"According to legend, the Armenian people are the descendants of Haik - the "
"great-great-grandson of Noah. The modern Republic of Armenia gained "
-"independence from Soviet in 1991 AD"
+"independence from the Soviet Union in 1991."
msgstr ""
+"Tarinan mukaan armenialaiset polveutuvat Haikista, jonka isoisoisä oli Nooa. "
+"Nykyinen Armenian tasavalta itsenäistyi Neuvostoliitosta 1991 jKr."
#: data/nation/assyrian.ruleset:3
-#, fuzzy
msgid "Assyrian"
-msgstr "Aasialainen"
+msgstr "assyrialaisten"
#: data/nation/assyrian.ruleset:4
-#, fuzzy
msgid "?plural:Assyrians"
-msgstr "?plural:venäläiset"
+msgstr "assyrialaiset"
#: data/nation/assyrian.ruleset:6
msgid ""
"Assyria was an empire in northern Mesopotamia, named after its capital Ashur."
msgstr ""
+"Assyria oli keisarikunta Pohjois-Mesopotamiassa. Se on nimetty "
+"pääkaupunkinsa Ashurin mukaan."
#: data/nation/assyrian.ruleset:21
-#, fuzzy
msgid "Malka"
-msgstr "Mies"
+msgstr "Malka"
#: data/nation/assyrian.ruleset:21
-#, fuzzy
msgid "Malikta"
-msgstr "Miliisi"
+msgstr "Malikta"
#: data/nation/argentine.ruleset:3
msgid "Argentine"
@@ -21969,6 +22276,11 @@ msgid ""
"politics was dominated by Juan Peron and his charismatic wife Eva \"Evita\" "
"Peron."
msgstr ""
+"Argentiina sijaitsee Etelä-Amerikan kaakkoisrannikolla. Itsenäistyttyään "
+"Espanjasta 1816 Argentiina on kärsinyt useista sisäisistä ja ulkoisista "
+"konflikteista. Toista maailmansotaa seuranneina vuosikymmeninä maan "
+"politiikkaa dominoivat Juan Perón ja hänen karismaattinen vaimonsa Eva "
+"\"Evita\" Perón."
#: data/nation/australian.ruleset:3
msgid "Australian"
@@ -22012,25 +22324,24 @@ msgid "?plural:Aztecs"
msgstr "?plural:atsteekit"
#: data/nation/aztec.ruleset:6
-#, fuzzy
msgid ""
"The Azteca, a Nahuatl speaking people from the Sonoran desert, seized "
"control of the Toltec-derived civilizations of Central Mexico during the "
"15th century AD, reviving the practice of human sacrifice. They were "
"conquered by the Spanish under Cortez in 1524."
msgstr ""
-"Atsteekit, barbaariryhmä Sonoran aavikolta, kaappasi vallan Keski-Meksikon "
-"tolteekkiperustaisilta kulttuureilta 1400-luvulla jKr. ja otti uudelleen "
-"käyttöön ihmisuhrit. Cortezin johtamat espanjalaiset valloittivat maan "
-"heiltä vuonna 1524."
+"Atsteekit, nahuatlia puhuva Sonoran aavikolla asuva kansa, kaappasi vallan "
+"Keski-Meksikon tolteekkiperustaisilta kansoilta 1400-luvulla jKr. ja otti "
+"uudelleen käyttöön ihmisuhrit. Cortezin johtamat espanjalaiset valloittivat "
+"maan heiltä vuonna 1524."
#: data/nation/aztec.ruleset:21
msgid "Tlatoani"
-msgstr ""
+msgstr "Tlatoani"
#: data/nation/aztec.ruleset:22
msgid "Huey Tlatoani"
-msgstr ""
+msgstr "Huey Tlatoani"
#: data/nation/babylonian.ruleset:3
msgid "Babylonian"
@@ -22062,6 +22373,8 @@ msgid ""
"Since the dawn of civilization, barbarians have been a threat to cultured "
"peoples everywhere."
msgstr ""
+"Barbaarit ovat jo ammoisista ajoista lähtien olleet uhka sivistyneille "
+"kansoille kaikkialla."
#: data/nation/bavarian.ruleset:3
msgid "Bavarian"
@@ -22080,14 +22393,12 @@ msgstr ""
"yhdistymistä yhdeksi valtioksi 1870 jKr."
#: data/nation/belgian.ruleset:3
-#, fuzzy
msgid "Belgian"
-msgstr "Uskonto"
+msgstr "belgialaisten"
#: data/nation/belgian.ruleset:4
-#, fuzzy
msgid "?plural:Belgians"
-msgstr "?plural:brasilialaiset"
+msgstr "belgialaiset"
#: data/nation/belgian.ruleset:6
msgid ""
@@ -22101,14 +22412,12 @@ msgstr ""
"valloonien välisten (melkeinpä) rauhanomaisten taistelujen myötä."
#: data/nation/bengali.ruleset:3
-#, fuzzy
msgid "Bengali"
-msgstr "?plural:englantilaiset"
+msgstr "bengalilaisten"
#: data/nation/bengali.ruleset:4
-#, fuzzy
msgid "?plural:Bengalis"
-msgstr "?plural:englantilaiset"
+msgstr "bengalilaiset"
#: data/nation/bengali.ruleset:6
msgid ""
@@ -22118,15 +22427,18 @@ msgid ""
"eastern part of the region, while the western part is the Indian state of "
"West Bengal."
msgstr ""
+"Bengal on alue Intian osamantereen itäreunalla. Ensimmäinen kirjattu "
+"itsenäisen Bengalin kuningas on Shashanka, joka hallitsi noin vuonna 606 "
+"jKr. Nykyään alueen itäosa kuuluu Bangladeshin kansantasavallalle, kun taas "
+"länsiosa on Intian aluetta, Länsi-Bengalin osavaltio."
#: data/nation/bengali.ruleset:25
msgid "Nabob"
-msgstr ""
+msgstr "Nabob"
#: data/nation/bengali.ruleset:26
-#, fuzzy
msgid "Major"
-msgstr "Sissiryhmä"
+msgstr "Majuri"
#: data/nation/boer.ruleset:3
msgid "Boer"
@@ -22137,37 +22449,37 @@ msgid "?plural:Boers"
msgstr "?plural:buurit"
#: data/nation/boer.ruleset:6
-#, fuzzy
msgid ""
"The Boers were Dutch settlers in British-controlled South Africa from "
"1650AD. They briefly controlled two republics, the Transvaal and the Orange "
"Free State, before being defeated by the British in the war of 1899-1902."
msgstr ""
"Buurit olivat hollantilaisia uudisraivaajia brittien hallitsemassa Etelä-"
-"Afrikassa vuonna 1650 jKr. He hallitsivat lyhyen ajan kahta tasavaltaa, "
+"Afrikassa vuonna 1650 jKr. He hallitsivat lyhyen ajan kahta tasavaltaa, "
"Transvaalia ja Oranjen vapaavaltiota, ennen häviötään briteille vuosien 1899-"
"1902 sodassa."
+# 15 Jan 09: Most of the population calls themselves 'bosnialainen' despite 44% being actual bosniaks.
#: data/nation/bosnia.ruleset:3
-#, fuzzy
msgid "Bosnia & Herzegovina"
-msgstr "bosnia-hertsegovinalaisten"
+msgstr "bosnialaisten"
#: data/nation/bosnia.ruleset:4
-#, fuzzy
msgid "?plural:Bosnians"
-msgstr "?plural:babylonialaiset"
+msgstr "bosnialaiset"
#: data/nation/bosnia.ruleset:6
msgid ""
"Bosnia and Herzegovina is a country in south-east Europe, and the home of "
"three constituent peoples: Bosniaks, Serbs, and Croats."
msgstr ""
+"Bosnia-Hertsegovina on valtio Kaakkois-Euroopassa, ja sitä asuttaa kolme "
+"valtakansaa: bosniakit, serbit ja kroaatit. Suurin osa väestöstä kutsuu "
+"itseään uskontotaustasta riippumattomasti bosnialaisiksi."
#: data/nation/bosnia.ruleset:26
-#, fuzzy
msgid "Ban"
-msgstr "Pankki"
+msgstr "Ban"
#: data/nation/brazilian.ruleset:3
msgid "Brazilian"
@@ -22217,14 +22529,12 @@ msgid "Director-President"
msgstr "Johtaja-Presidentti"
#: data/nation/british.ruleset:3
-#, fuzzy
msgid "British"
-msgstr "irlantilaisten"
+msgstr "brittien"
#: data/nation/british.ruleset:4
-#, fuzzy
msgid "?plural:Britons"
-msgstr "?plural:baijerilaiset"
+msgstr "britit"
#: data/nation/british.ruleset:6
msgid ""
@@ -22233,42 +22543,43 @@ msgid ""
"Great Britain - became the leading industrial and maritime power in the 19th "
"century."
msgstr ""
+"Yhdistynyt kuningaskunta syntyi 1707 Englannin ja Skotlannin kuningaskuntien "
+"neuvotteleman sopimuksen pohjalta. Tästä myös Iso-Britanniana tunnetusta "
+"maasta tuli johtava teollisuus- ja merimahti 1800-luvulla."
+# 'Bolgaarit' are the historical people, 'bulgarialaiset' the current residents of Bulgaria. Freeciv uses the current Bulgarian flag for the nation, so we'll go with that.
#: data/nation/bulgarian.ruleset:3
-#, fuzzy
msgid "Bulgarian"
-msgstr "unkarilaisten"
+msgstr "bulgarialaisten"
#: data/nation/bulgarian.ruleset:4
-#, fuzzy
msgid "?plural:Bulgarians"
-msgstr "?plural:unkarilaiset"
+msgstr "bulgarialaiset"
#: data/nation/bulgarian.ruleset:6
msgid ""
"Bulgar leader Khan Asparukh led his people into the northern Balkans, and "
"founded Bulgaria in 681. This was the first Slavic nation-state in history."
msgstr ""
+"Bolgaarijohtaja Khan Asparukh johti kansansa Balkanin pohjoisosiin ja "
+"perusti sinne Bulgarian 681. Bulgaria oli historian ensimmäinen slaavilainen "
+"kansallisvaltio."
#: data/nation/bulgarian.ruleset:31
-#, fuzzy
msgid "Tzar"
msgstr "Tsaari"
#: data/nation/bulgarian.ruleset:31
-#, fuzzy
msgid "Tzaritza"
msgstr "Tsaarinna"
#: data/nation/bulgarian.ruleset:34
-#, fuzzy
msgid "Drugariat"
-msgstr "unkarilaisten"
+msgstr "Drugariat"
#: data/nation/bulgarian.ruleset:34
-#, fuzzy
msgid "Drugarkata"
-msgstr "unkarilaisten"
+msgstr "Drugarkata"
#: data/nation/bulgarian.ruleset:35 data/nation/byzantium.ruleset:26
#: data/nation/russian.ruleset:49
@@ -22277,47 +22588,43 @@ msgstr "Patriarkka"
#: data/nation/bulgarian.ruleset:35
msgid "Sveta Maika"
-msgstr ""
+msgstr "Sveta Maika"
#: data/nation/burmese.ruleset:3
-#, fuzzy
msgid "Burmese"
-msgstr "?plural:turkkilaiset"
+msgstr "burmalaisten"
#: data/nation/burmese.ruleset:4
-#, fuzzy
msgid "?plural:Burmese"
-msgstr "?plural:turkkilaiset"
+msgstr "burmalaisten"
#: data/nation/burmese.ruleset:6
msgid ""
"The Union of Burma (officially \"Myanmar\") is the largest country in "
"mainland Southeast Asia."
msgstr ""
+"Burman liitto (virallisesti \"Myanmar\") on suurin valtio Kaakkois-Aasian "
+"mantereella."
#: data/nation/burmese.ruleset:21
msgid "Bohmugyi"
-msgstr ""
+msgstr "Bohmugyi"
#: data/nation/burmese.ruleset:22
-#, fuzzy
msgid "Saya"
-msgstr "Puheenjohtaja"
+msgstr "Saya"
#: data/nation/burmese.ruleset:22
-#, fuzzy
msgid "Sayama"
-msgstr "Puheenjohtaja"
+msgstr "Sayama"
#: data/nation/byzantium.ruleset:3
-#, fuzzy
msgid "Byzantine"
-msgstr "Pankkitoiminta"
+msgstr "bysanttilaisten"
#: data/nation/byzantium.ruleset:4
-#, fuzzy
msgid "?plural:Byzantines"
-msgstr "?plural:argentiinalaiset"
+msgstr "bysanttilaiset"
#: data/nation/byzantium.ruleset:6
msgid ""
@@ -22328,11 +22635,16 @@ msgid ""
"I, the Byzanines controlled nearly all of Middle East, nothern Africa, Italy "
"and parts of Spain."
msgstr ""
+"Vanhan Rooman valtakunnan hiipuessa keisari Konsantinus siirsi sen "
+"pääkaupungin Byzantioniin ja perusti uuden valtakunnan, joka tunnetaan "
+"useimmin nimellä Itä-Rooma tai Bysantin valtakunta. Valtakunta säilyi "
+"vuoteen 1453, jolloin osmanit kukistivat sen pääkaupungin. Justinianus I:n "
+"valtakaudella bysanttilaiset hallitsivat lähes koko Keski-Itää, pohjoista "
+"Afrikkaa, Italiaa ja osia Espanjasta."
#: data/nation/byzantium.ruleset:27
-#, fuzzy
msgid "Basileus"
-msgstr "keidas"
+msgstr "Basileus"
#: data/nation/canadian.ruleset:3
msgid "Canadian"
@@ -22347,6 +22659,8 @@ msgid ""
"Canada is the geographically northernmost country in world: The Magnetic "
"North Pole currently lies on Canadian territory."
msgstr ""
+"Kanada on maantieteellisesti pohjoisin valtio maailmassa: magneettinen "
+"pohjoisnapa on tällä hetkellä Kanadan alueella."
#: data/nation/carthaginian.ruleset:3
msgid "Carthaginian"
@@ -22542,7 +22856,7 @@ msgid ""
"home of the legendary King Arthur."
msgstr ""
"Cornwall on Englannin lounaiskärki, ja sen uskotaan perinteisesti olevan "
-"legendaarisen kuningas Arthurin kotipaikka."
+"legendojen kuningas Arthurin kotipaikka."
#: data/nation/cornish.ruleset:20 data/nation/french.ruleset:25
#: data/nation/gallic.ruleset:22 data/nation/irish.ruleset:44
@@ -22589,18 +22903,18 @@ msgstr ""
#: data/nation/czech.ruleset:3
msgid "Czech"
-msgstr "tsekkien"
+msgstr "tšekkien"
#: data/nation/czech.ruleset:4
msgid "?plural:Czechs"
-msgstr "?plural:tsekit"
+msgstr "tšekit"
#: data/nation/czech.ruleset:6
msgid ""
"Today's Czech Republic was until 1993 part of Czechoslovakia, which had been "
"until 1918 part of the Austro-Hungarian Empire."
msgstr ""
-"Nykyinen Tsekin tasavalta oli vuoteen 1993 asti osa Tsekkoslovakiaa, joka "
+"Nykyinen TÅ¡ekin tasavalta oli vuoteen 1993 asti osa TÅ¡ekkoslovakiaa, joka "
"taas oli vuoteen 1918 asti ollut Itävalta-Unkarin osa."
# Male despot - was something between general and landowner? --Juhani
@@ -22646,6 +22960,9 @@ msgid ""
"forming the Union of Utrecht in 1579. The Netherlands grew to be a dominant "
"maritime and economic power in the 17th century."
msgstr ""
+"Kun pyhä Rooman keisari tuomitsi koko Alankomaiden alueen väestön kuolemaan, "
+"kansa nousi kapinaan, julistautui itsenäiseksi ja muodosti Utrechtin liiton "
+"1579. Alankomaat kasvoi huomattavaksi meri- ja talousmahdiksi 1600-luvulla."
#: data/nation/egyptian.ruleset:3
msgid "Egyptian"
@@ -22732,9 +23049,8 @@ msgstr ""
"eurooppalaisen siirtomaavallan aikana."
#: data/nation/ethiopian.ruleset:24
-#, fuzzy
msgid "Emporer"
-msgstr "Seikkailija"
+msgstr "Keisari"
#: data/nation/filipino.ruleset:3
msgid "Filipino"
@@ -22765,7 +23081,7 @@ msgid ""
"Finland is a small, cold country on the northern fringe of Europe, noted for "
"exporting timber, cellular phones, and world-class operating systems."
msgstr ""
-"Suomi on pieni kylmä maa Euroopan pohjoislaidalla, ja se tunnetaan "
+"Suomi on pieni kylmä maa Euroopan pohjoislaidalla, joka tunnetaan "
"puunviennistä, kännyköistä ja huippuluokan käyttöjärjestelmistä."
#: data/nation/french.ruleset:3
@@ -22777,15 +23093,14 @@ msgid "?plural:French"
msgstr "?plural:ranskalaiset"
#: data/nation/french.ruleset:6
-#, fuzzy
msgid ""
"France has long been a major power in Europe. French conquerer kings like "
"Napoleon and Charlemagne each united large parts of Europe under the French "
"flag."
msgstr ""
-"Ranska on pitkään ollut suurvalta Euroopassa. Ranskalaiset valloittajat, "
-"kuten keisari Napoleon ja kuningas Kaarle Suuri yhdistivät laajoja Euroopan "
-"alueita Ranskan lipun alle."
+"Ranska on pitkään ollut huomattava mahti Euroopassa. Ranskalaiset "
+"valloittajakuninkaat, kuten Napoleon ja Kaarle Suuri, yhdistivät laajoja "
+"Euroopan alueita Ranskan lipun alle."
#: data/nation/french.ruleset:26
msgid "Premier"
@@ -22853,7 +23168,7 @@ msgstr ""
#: data/nation/gallic.ruleset:23
msgid "Druid"
-msgstr "druidi"
+msgstr "Druidi"
#: data/nation/georgian.ruleset:3
msgid "Georgian"
@@ -22916,30 +23231,28 @@ msgid "Despot"
msgstr "Yksinvaltias"
#: data/nation/hellenic.ruleset:3
-#, fuzzy
msgid "Hellenic"
-msgstr "Tiedustelu"
+msgstr "helleenien"
#: data/nation/hellenic.ruleset:4
-#, fuzzy
msgid "?plural:Hellenes"
-msgstr "?plural:inkat"
+msgstr "helleenit"
#: data/nation/hellenic.ruleset:6
msgid ""
"The Hellenic Republic - also known as Greece - was created when the Hellenic "
"people gained independence from the Ottoman Empire in 1832."
msgstr ""
+"Helleenien tasavalta - joka myös Kreikkana tunnetaan - luotiin kun "
+"helleenien kansa itsenäistyi Osmanien valtakunnasta 1832."
#: data/nation/hittite.ruleset:3
-#, fuzzy
msgid "Hittite"
-msgstr "Aktivoi"
+msgstr "heettiläisten"
#: data/nation/hittite.ruleset:4
-#, fuzzy
msgid "?plural:Hittites"
-msgstr "?plural:skotit"
+msgstr "heettiläiset"
#: data/nation/hittite.ruleset:6
msgid ""
@@ -22948,6 +23261,10 @@ msgid ""
"controlled central Anatolia, north-western Syria and Mesopotamia down to "
"Babylon."
msgstr ""
+"Heettiläisten kuningaskunta kesti noin vuodesta 1680 eKr. noin vuoteen 1180 "
+"eKr. Heettiläiset olivat ensimmäinen kansa joka keksi raudan työstämisen. "
+"Parhaimmillaan heettiläiset hallitsivat Keski-Anatoliaa, Luoteis-Syyriaa ja "
+"Mesopotamiaa alas Babyloniin asti."
#: data/nation/hungarian.ruleset:3
msgid "Hungarian"
@@ -22959,16 +23276,15 @@ msgstr "?plural:unkarilaiset"
#: data/nation/hungarian.ruleset:6
msgid "Legend says that Hungary was founded by Arpad in the 9th century."
-msgstr ""
+msgstr "Tarinan mukaan Ãrpád perusti Unkarin 800-luvulla."
#: data/nation/icelandic.ruleset:3
msgid "Icelandic"
msgstr "islantilaisten"
#: data/nation/icelandic.ruleset:4
-#, fuzzy
msgid "?plural:Icelanders"
-msgstr "?plural:inkat"
+msgstr "islantilaiset"
#: data/nation/icelandic.ruleset:6
msgid ""
@@ -22977,26 +23293,34 @@ msgid ""
"kept initially under the Norwegian and later the Danish crown until "
"independence from Denmark in 1944."
msgstr ""
+"Islanti oli pitkään yksi maailman suurimmista asuttamattomista saarista, "
+"kunnes norjalaiste viikingit asettuivat sinne 800-luvun lopulla. Saari oli "
+"alunperin Norjan ja myöhemmin Tanskan kruunun alaisuudessa, kunnes "
+"itsenäistyi Tanskasta 1944."
#: data/nation/illyrian.ruleset:3
-#, fuzzy
msgid "Illyrian"
-msgstr "italialaisten"
+msgstr "illyrialaisten"
#: data/nation/illyrian.ruleset:4
-#, fuzzy
msgid "?plural:Illyrians"
-msgstr "?plural:italialaiset"
+msgstr "illyrialaiset"
#: data/nation/illyrian.ruleset:6
msgid ""
-"Illyrians were Indo-European tribes who appeared in the western part of the "
-"Balkan Peninsula before 1000 BC, including the Dalmatians to the north, "
-"Corcyra island and Ambracia bay in prehistoric Epirus to the south, mixing "
-"with Thracians in Dardania to the east, and settling Messapia across the "
-"Adriatic Sea. Illyrian kingdoms were independent for centuries, until "
-"conquered by the Roman Republic."
+"Illyrians were Indo-European tribes who appeared in the western part of the "
+"Balkan Peninsula before 1000 BC, including Corcyra island and Ambracia bay "
+"in prehistoric Epirus to the south. They mixed with Thracians in Dardania to "
+"the east, and settled Messapia across the Adriatic Sea. Illyrian kingdoms "
+"were independent for centuries, until conquered by the Roman Republic."
msgstr ""
+"Illyrialaiset olivat joukko indoeurooppalaisia heimoja, jotka saapuivat "
+"Balkanin niemimaan länsiosiin ennen 1000 eKr. Alueeseen kuului Dalmatia "
+"pohjoisessa sekä etelässä Korfun saari ja Ambrakian lahti "
+"esihistoriallisessa Epeiroksessa. Illyrialaiset sekoittuivat traakialaisiin "
+"idässä, Dardaniassa, ja asuttivat Messapiaa Adrianmeren toisella rannalla. "
+"Illyrian kuningaskunnat olivat itsenäisiä vuosisatojen ajan, kunnes Rooman "
+"tasavalta valloitti ne."
#: data/nation/inca.ruleset:3
msgid "Inca"
@@ -23007,7 +23331,6 @@ msgid "?plural:Incas"
msgstr "?plural:inkat"
#: data/nation/inca.ruleset:6
-#, fuzzy
msgid ""
"The Inca were an Amerind people of the Northern Andes who conquered an "
"empire stretching along the west coast of South America from what is now "
@@ -23015,20 +23338,19 @@ msgid ""
"a few decades before the Spanish conquistadors arrived in their part of the "
"world in the mid-1500s AD."
msgstr ""
-"Inkat olivat intiaanikansa pohjois-Andeilta joiden imperiumi kattoi lopulta "
-"Etelä-Amerikan länsirannikon nykyisestä etelä-Chilestä lähes "
-"päiväntasaajalle. Vahinko että vain muutaman kymmenen vuoden kuluttua, 1500-"
-"luvun puolivälissä, espanjalaiset konkistadorit saapuivat."
+"Inkat olivat pohjois-Andien intiaanikansa, jotka valloittivat imperiumikseen "
+"Etelä-Amerikan länsirannikon nykyisestä Etelä-Chilestä lähes "
+"päiväntasaajalle. Ajoitus vain oli huono - muutaman vuosikymmenen kuluttua, "
+"1500-luvun puolivälissä, espanjalaiset konkistadorit saapuivat tähän "
+"maailmankolkkaan."
#: data/nation/inca.ruleset:23
-#, fuzzy
msgid "?title:Inca"
-msgstr "Kansansurmahenkinen"
+msgstr "Inka"
#: data/nation/inca.ruleset:24
-#, fuzzy
msgid "Sapa Inca"
-msgstr "inkojen"
+msgstr "Sapa Inka"
#: data/nation/indian.ruleset:3
msgid "Indian"
@@ -23043,30 +23365,28 @@ msgid ""
"The cradle of Ancient Indian civilization lay in the Indus river valley in "
"modern-day Pakistan."
msgstr ""
+"Muinaisintialaisen sivilisaation kehto oli Indus-jokilaaksossa nykyisen "
+"Pakistanin alueella."
#: data/nation/indian.ruleset:19
-#, fuzzy
msgid "Raja"
-msgstr "Kuningatar"
+msgstr "Raja"
#: data/nation/indian.ruleset:20
msgid "Maharaja"
msgstr "Maharadja"
#: data/nation/indian.ruleset:21
-#, fuzzy
msgid "Mahatma"
-msgstr "Maharadja"
+msgstr "Mahatma"
#: data/nation/indonesian.ruleset:3
-#, fuzzy
msgid "Indonesian"
-msgstr "intialaisten"
+msgstr "indonesialaisten"
#: data/nation/indonesian.ruleset:4
-#, fuzzy
msgid "?plural:Indonesians"
-msgstr "?plural:intialaiset"
+msgstr "indonesialaiset"
#: data/nation/indonesian.ruleset:6
msgid ""
@@ -23074,16 +23394,17 @@ msgid ""
"government on the island of Java. The country has a Muslim majority and is "
"one of the most populous in the world."
msgstr ""
+"Indonesia on suuri valtio Malaijien saaristossa, ja sen keskushallinto on "
+"Jaavan saarella. Se on väkiluvultaan suurimpia valtioita maailmassa; "
+"väestöstä valtaosa on muslimeja."
#: data/nation/inuit.ruleset:3
-#, fuzzy
msgid "Inuit"
-msgstr "Lopeta"
+msgstr "inuittien"
#: data/nation/inuit.ruleset:4
-#, fuzzy
msgid "?plural:Inuits"
-msgstr "?plural:intialaiset"
+msgstr "inuitit"
#: data/nation/inuit.ruleset:6
msgid ""
@@ -23092,26 +23413,25 @@ msgid ""
"coast of Greenland in the 10th century. All Inuit of today are descendents "
"of the Thule culture."
msgstr ""
+"Inuitit asuttavat pohjoista Kanadaa ja Grönlantia. Tarinan mukaan "
+"Suuršamaani Qitdlarssuaq johti kansansa Thuleen (Qaanaaq) Grönlannin "
+"länsirannikolla 900-luvulla. Nykyinuiitit polveutuvat Thulen kulttuurista."
#: data/nation/inuit.ruleset:20
-#, fuzzy
msgid "Shaman"
-msgstr "Puheenjohtaja"
+msgstr "Å amaani"
#: data/nation/inuit.ruleset:21
-#, fuzzy
msgid "Great Shaman"
-msgstr "Suurkaani"
+msgstr "Suuršamaani"
#: data/nation/iraqi.ruleset:3
-#, fuzzy
msgid "Iraqi"
-msgstr "israelilaisten"
+msgstr "irakilaisten"
#: data/nation/iraqi.ruleset:4
-#, fuzzy
msgid "?plural:Iraqis"
-msgstr "?plural:irlantilaiset"
+msgstr "irakilaiset"
#: data/nation/iraqi.ruleset:6
msgid ""
@@ -23119,6 +23439,8 @@ msgid ""
"the ancient region of Mesopotamia at the confluence of the Tigris and "
"Euphrates rivers."
msgstr ""
+"Irak perustettiin Osmanien valtakunnan kukistuttua. Se kattaa muinaisen "
+"Mesopotamian alueen Tigris- ja Eufrat-jokien yhtymäkohdassa."
#: data/nation/irish.ruleset:3
msgid "Irish"
@@ -23129,7 +23451,6 @@ msgid "?plural:Irish"
msgstr "?plural:irlantilaiset"
#: data/nation/irish.ruleset:6
-#, fuzzy
msgid ""
"Ireland held out against the Romans and Vikings but was conquered by the "
"Normans in 1171. It was ruled by the English until 1922 when most of the "
@@ -23138,21 +23459,19 @@ msgid ""
"planters and is now part of the United Kingdom."
msgstr ""
"Irlanti kesti roomalaisten ja viikinkien hyökkäykset, mutta normannit "
-"valloittivat sen 1171. Englantilaiset hallitsivat maata vuoteen 1922 asti, "
-"jolloin valtaosalle maata myönnettiin rajoitettu autonomia. Irlannista tuli "
+"valloittivat sen 1171. Englantilaiset hallitsivat maata vuoteen 1922 asti, "
+"jolloin valtaosalle maata myönnettiin rajoitettu autonomia. Irlannista tuli "
"tasavalta vuonna 1949. Skotlantilaiset ja englantilaiset uudisasukkaat (ns. "
-"istuttajat, planters) levittäytyivät Pohjois-Irlannin 1600-luvulla, ja alue "
+"istuttajat, planters) levittäytyivät Pohjois-Irlantiin 1600-luvulla, ja alue "
"kuuluu nykyään Iso-Britanniaan."
#: data/nation/irish.ruleset:45
-#, fuzzy
msgid "High King"
-msgstr "Kuningas"
+msgstr "Korkea kuningas"
#: data/nation/irish.ruleset:45
-#, fuzzy
msgid "High Queen"
-msgstr "Kuningatar"
+msgstr "Korkea kuningatar"
#: data/nation/irish.ruleset:46
msgid "Mother Superior"
@@ -23161,17 +23480,15 @@ msgstr "Abbedissa"
# Taoiseach *vastaa* pääministeriä, mutta sille ei liene suomenkielistä nimeä.
#: data/nation/irish.ruleset:47
msgid "Taoiseach"
-msgstr "Pääministeri"
+msgstr "Taoiseach"
#: data/nation/iroquois.ruleset:3
-#, fuzzy
msgid "Iroquois"
-msgstr "irlantilaisten"
+msgstr "irokeesien"
#: data/nation/iroquois.ruleset:4
-#, fuzzy
msgid "?plural:Iroquois"
-msgstr "?plural:irlantilaiset"
+msgstr "irokeesit"
#: data/nation/iroquois.ruleset:6
msgid ""
@@ -23182,6 +23499,13 @@ msgid ""
"written constitution and a currency system making them the most advanced "
"state in North America upon the arrival of the Europeans."
msgstr ""
+"Irokeesien liittokunta, alkuperäiskielellä Haudenotounee (pitkien talojen "
+"kansa), oli Pohjois-Amerikkalainen joukko kansakuntia, joita yhteinen kieli "
+"ja kulttuuri yhdistivät. Liiton alueet sijaitsivat New Yorkin osavaltion "
+"pohjoisosissa. Alunperin liitto koostui viidestä kansakunnasta: senecat, "
+"cayugat, onondagat, oneidat ja mohawkit. Liitolla oli kirjallinen "
+"perustuslaki ja valuuttajärjestelmä, mikä teki siitä edistyneimmän Pohjois-"
+"Amerikkalaisen valtakunnan Eurooppalaisten rantautumisen aikaan."
#: data/nation/iroquois.ruleset:27 data/nation/sioux.ruleset:29
msgid "Great Chief"
@@ -23242,11 +23566,14 @@ msgstr "japanilaisten"
msgid "?plural:Japanese"
msgstr "?plural:japanilaiset"
+# Sic. Jinmu.
#: data/nation/japanese.ruleset:6
msgid ""
"According to traditional Japanese mythology, Japan was founded in the 7th "
"century BC by the ancestral Emperor Jimmu."
msgstr ""
+"Muinaisen Japanilaisen mytologian mukaan Japanin perusti 600-luvulla eKr. "
+"keisari Jinmu."
#: data/nation/japanese.ruleset:20 data/nation/manchu.ruleset:21
#: data/nation/vietnamese.ruleset:23
@@ -23259,32 +23586,31 @@ msgstr "Shogun"
#: data/nation/kampuchean.ruleset:3
msgid "Kampuchean"
-msgstr "kamputsealaisten"
+msgstr "kambodžalaisten"
#: data/nation/kampuchean.ruleset:4
-#, fuzzy
msgid "?plural:Kampucheans"
-msgstr "?plural:korealaiset"
+msgstr "kambodžalaiset"
#: data/nation/kampuchean.ruleset:6
msgid ""
"Kampuchea is the modern successor state of the mighty Khmer Empire, which "
"ruled most of the Indochinese Peninsula between the 11th and 14th centuries."
msgstr ""
+"Nykyinen Kambodža periytyy mahtavasta Khmer-valtakunnasta, joka hallitsi "
+"suurinta osaa Indokiinan niemimaata 1000-1300-luvuilla."
#: data/nation/kampuchean.ruleset:20 data/nation/manchu.ruleset:20
msgid "Warlord"
msgstr "Sotapäällikkö"
#: data/nation/kampuchean.ruleset:21
-#, fuzzy
msgid "Brother"
-msgstr "buurien"
+msgstr "Veli"
#: data/nation/kampuchean.ruleset:21
-#, fuzzy
msgid "Sister"
-msgstr "Hävittäjä"
+msgstr "Sisar"
#: data/nation/kenyan.ruleset:3
msgid "Kenyan"
@@ -23296,12 +23622,11 @@ msgstr "?plural:kenialaiset"
#: data/nation/kenyan.ruleset:6
msgid "Kenya gained independence from Britain in December 1963."
-msgstr ""
+msgstr "Kenia itsenäistyi Britanniasta joulukuussa 1963."
#: data/nation/kenyan.ruleset:18
-#, fuzzy
msgid "Nabongo"
-msgstr "Kansakunta"
+msgstr "Nabongo"
#: data/nation/korean.ruleset:3
msgid "Korean"
@@ -23319,21 +23644,24 @@ msgid ""
"North and South Korea as a result of the stalemate after the Korean war in "
"1953."
msgstr ""
+"Tarinan mukaan ammoisina aikoina Dangun perusti ensimmäisen Korean "
+"kuningaskunnan eteläiseen Mantšuriaan. Kuningas Munmu yhdisti Korean "
+"kuningaskunnat vuonna 668. Nykyään Korean niemimaa on jaettu kahdeksi "
+"valtioksi, Pohjois- ja Etelä-Koreaksi, Korean sodan päätyttyä "
+"pattitilanteeseen 1953."
-#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:28
-#, fuzzy
+#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:29
msgid "Great Leader"
-msgstr "Ihme"
+msgstr "Suuri johtaja"
+# Lankese? Whut? Singaleesi is the largest ethnic group.
#: data/nation/lankese.ruleset:3
-#, fuzzy
msgid "Lankese"
-msgstr "japanilaisten"
+msgstr "srilankalaisten"
#: data/nation/lankese.ruleset:4
-#, fuzzy
msgid "?plural:Lankese"
-msgstr "?plural:tanskalaiset"
+msgstr "srilankalaiset"
#: data/nation/lankese.ruleset:6
msgid ""
@@ -23341,16 +23669,19 @@ msgid ""
"the 6th century BC and founded the Sinhalese kingdom there. During British "
"colonialism the country was known as Ceylon."
msgstr ""
+"Prinssi Viljaya saapui Sri Lankaan koillisen Intian Orisasta 500-luvulla "
+"eKr, ja perusti sinne Singaleesien kuningaskunnan. Britannian "
+"siirtomaavallan aikaan maa tunnettiin nimellä Ceylon."
#: data/nation/lankese.ruleset:20 data/nation/silesian.ruleset:21
#: data/nation/welsh.ruleset:26
msgid "Prince"
-msgstr "Ruhtinas"
+msgstr "Prinssi"
#: data/nation/lankese.ruleset:20 data/nation/silesian.ruleset:21
#: data/nation/welsh.ruleset:26
msgid "Princess"
-msgstr "Ruhtinatar"
+msgstr "Prinsessa"
#: data/nation/lankese.ruleset:21 data/nation/quebecois.ruleset:20
#: data/nation/texan.ruleset:19
@@ -23375,6 +23706,9 @@ msgid ""
"1940, Latvia was forcibly occupied by the Soviet Union. After the collapse "
"of Soviet Union in 1991 Latvia restored its independence."
msgstr ""
+"Ensimmäisen maailmansodan jälkimainingeissa Latvia julistautui itsenäiseksi "
+"Venäjästä. Vuonna 1940 Neuvostoliitto miehitti maan väkivalloin. "
+"Neuvostoliiton kaaduttua 1991 Latvia palasi itsenäiseksi."
#: data/nation/libyan.ruleset:3
msgid "Libyan"
@@ -23391,16 +23725,18 @@ msgid ""
"of Italy and after the Second World War Libya was granted independence as a "
"condition of the Allied peace treaty with Italy."
msgstr ""
+"Libyana nykyään tunnettu alue oli Rooman siirtokunta, kunnes "
+"arabisivilisaatio valloitti sen 600-luvulla. Vuonna 1912 se siirtyi Italian "
+"hallintaan, ja toisen maailmansodan jälkeen Libya sai itsenäisyyden osana "
+"liittoutuneiden valtioiden ja Italian välistä rauhansopimusta."
#: data/nation/libyan.ruleset:23
-#, fuzzy
msgid "Dey"
-msgstr "Osta"
+msgstr "Dey"
#: data/nation/libyan.ruleset:24
-#, fuzzy
msgid "Colonel"
-msgstr "Sulje"
+msgstr "Eversti"
#: data/nation/lithuanian.ruleset:3
msgid "Lithuanian"
@@ -23411,15 +23747,14 @@ msgid "?plural:Lithuanians"
msgstr "?plural:liettualaiset"
#: data/nation/lithuanian.ruleset:6
-#, fuzzy
msgid ""
"Lithuania is a small country on the south coast of the Baltic Sea, northeast "
"of Poland. Lithuanian is the most archaic and complex of the northern Indo-"
"European languages"
msgstr ""
-"Liettua on pieni maa Itämeren kaakkoisrannalla, koilliseen Puolasta. "
-"Liettuan kieli on vanhakantaisin ja monimutkaisin pohjoisista "
-"indoeurooppalaisista kielistä."
+"Liettua on pieni maa Itämeren etelärannalla, koilliseen Puolasta. Liettuan "
+"kieli on vanhakantaisin ja monimutkaisin pohjoisista indoeurooppalaisista "
+"kielistä."
#: data/nation/lithuanian.ruleset:28
msgid "Great Duke"
@@ -23430,107 +23765,111 @@ msgid "Great Duchess"
msgstr "Suurherttuatar"
#: data/nation/malagasy.ruleset:3
-#, fuzzy
msgid "Malagasy"
-msgstr "Mies"
+msgstr "malagassien"
#: data/nation/malagasy.ruleset:4
-#, fuzzy
msgid "?plural:Malagasies"
-msgstr "?plural:italialaiset"
+msgstr "malagassit"
#: data/nation/malagasy.ruleset:6
msgid ""
"The Malagasy are the people of Madagascar. For centuries, tribes from "
"Indonesia, East Africa and the Arab world have gathered on the island."
msgstr ""
+"Malagassit ovat Madagaskarin väestöä. Vuosisatojen ajan saarelle on "
+"kokoontunut heimoja Indonesiasta, Itä-Afrikasta ja arabimaailmasta."
#: data/nation/malagasy.ruleset:22
msgid "High Commissioner"
-msgstr ""
+msgstr "Ylikomissaari"
+# Alkuperäisasukkaat: malajit
#: data/nation/malaysian.ruleset:3
-#, fuzzy
msgid "Malaysian"
-msgstr "Pelaaminen"
+msgstr "malesialaisten"
#: data/nation/malaysian.ruleset:4
-#, fuzzy
msgid "?plural:Malaysians"
-msgstr "?plural:italialaiset"
+msgstr "malesialaiset"
#: data/nation/malaysian.ruleset:6
msgid ""
"Malaysia was started with the founding of Malacca (Melaka) by Parameswara in "
"the early 14th century."
msgstr ""
+"Malesia pohjautuu Malakan sulttaanikuntaan, jonka perusti Parameswara 1300-"
+"luvun alussa."
#: data/nation/malaysian.ruleset:22 data/nation/singaporean.ruleset:31
#: data/nation/turk.ruleset:23
msgid "Sultan"
msgstr "Sulttaani"
+# Nolo.
#: data/nation/malaysian.ruleset:22 data/nation/turk.ruleset:23
-#, fuzzy
msgid "Sultana"
-msgstr "Sulttaani"
+msgstr "Sulttaanitar"
#: data/nation/malaysian.ruleset:23
-#, fuzzy
msgid "Tun"
-msgstr "Vuoroa"
+msgstr "Tun"
#: data/nation/malian.ruleset:3
-#, fuzzy
msgid "Malian"
-msgstr "Pelaaminen"
+msgstr "malilaisten"
#: data/nation/malian.ruleset:4
-#, fuzzy
msgid "?plural:Malians"
-msgstr "?plural:italialaiset"
+msgstr "malilaiset"
#: data/nation/malian.ruleset:6
msgid ""
"Sub-Saharan Africa has been a cultural and ethnical melting pot for "
"millennia. In medieval times, the region was home to a succession of empires "
-"called the Sahelian kingdoms. Of these, the Islamic Mali empire with it's "
+"called the Sahelian kingdoms. Of these, the Islamic Mali empire with its "
"capital in Timbuktu was the most influential. This empire reigned from the "
-"14th to the 17th century and was famed for it's wealth and benevolent kings. "
+"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 ""
+"Saharan eteläpuolinen Afrikka on ollut kulttuurien ja etnisten ryhmien "
+"sulatusuuni vuosituhansia. Keskiajalla alueella hallitsi sarja valtakuntia, "
+"jotka tunnettiin nimellä Sahelin kuningaskunnat. Näistä islamilainen Malin "
+"kuningaskunta Timbuktussa sijaitsevine pääkaupunkeineen oli kaikkein "
+"vaikutusvaltaisin. 1300-1600-luvuilla vallinnut kuningaskunta tunnettiin "
+"rikkauksistaan ja hyväntahtoisista kuninkaistaan. Nykyisen Malin "
+"kansantasavallan nimi johtuu tästä keskiaikaisesta kuningaskunnasta."
#: data/nation/malian.ruleset:27
-#, fuzzy
msgid "Mansa"
-msgstr "Merijalkaväki"
+msgstr "Mansa"
#: data/nation/manchu.ruleset:3
-#, fuzzy
msgid "Manchu"
-msgstr "maaliskuu"
+msgstr "mantšujen"
#: data/nation/manchu.ruleset:4
-#, fuzzy
msgid "?plural:Manchus"
-msgstr "?plural:inkat"
+msgstr "mantšut"
+# Luova käännös, vältetään "Mantsu-keisarikunta"-käsitteen pähkäily.
#: data/nation/manchu.ruleset:6
msgid ""
"The Manchus were a semi-nomadic people originating from the region called "
"Manchuria in Northeast Asia. In the 17th century they conquered and ruled "
"China as the Manchu Empire until 1911."
msgstr ""
+"Mantšut olivat Mantšuria-nimiseltä Koillis-Aasian alueelta kotoisin oleva "
+"paimentolaiskansa. 1600-luvulla mantšut valloittivat Kiinan, ja heidän "
+"perustamansa Qing-dynastia hallitsi keisarikuntaa vuoteen 1911 asti."
#: data/nation/maori.ruleset:3
-#, fuzzy
msgid "Maori"
-msgstr "Sissiryhmä"
+msgstr "maorien"
#: data/nation/maori.ruleset:4
-#, fuzzy
msgid "?plural:Maori"
-msgstr "?plural:latvialaiset"
+msgstr "maorit"
#: data/nation/maori.ruleset:6
msgid ""
@@ -23538,55 +23877,56 @@ msgid ""
"group that is now New Zealand. According to archeological evidence, the "
"migration commenced in the 900s and continued until the 1400s."
msgstr ""
+"Maorit ovat polynesialainen kansa, joka asutti nykyisen Uuden Seelannin "
+"muodostavan saariryhmän. Arkeologisen näytön perusteella maorien muutto "
+"saarille alkoi 900-luvulla ja jatkui 1400-luvulle asti."
#: data/nation/martian.ruleset:3
-#, fuzzy
msgid "Martian"
-msgstr "Sissiryhmä"
+msgstr "marsilaisten"
#: data/nation/martian.ruleset:4
-#, fuzzy
msgid "?plural:Martians"
-msgstr "?plural:latvialaiset"
+msgstr "marsilaiset"
#: data/nation/martian.ruleset:6
msgid "Marsmen landed on Earth in 4000 BC!"
-msgstr ""
+msgstr "Marsilaiset laskeutuivat Maahan 4000 eKr!"
#: data/nation/mayan.ruleset:3
-#, fuzzy
msgid "Mayan"
-msgstr "toukokuu"
+msgstr "mayojen"
#: data/nation/mayan.ruleset:4
-#, fuzzy
msgid "?plural:Mayas"
-msgstr "?plural:italialaiset"
+msgstr "mayat"
#: data/nation/mayan.ruleset:6
msgid ""
-"The Mayans were a Mesoamerican civilization. Famous for building great "
-"pyramids and palaces in the jungle."
+"The Mayans were a Mesoamerican civilization. They are famous for building "
+"great pyramids and palaces in the jungle."
msgstr ""
+"Mayat olivat mesoamerikkalainen kansakunta, joka oli kuuluisa viidakkoon "
+"rakentamistaan pyramideista ja palatseista."
#: data/nation/mayan.ruleset:19
msgid "Ajaw"
-msgstr ""
+msgstr "Ajaw"
#: data/nation/mexican.ruleset:3
-#, fuzzy
msgid "Mexican"
-msgstr "yhdysvaltalaisten"
+msgstr "meksikolaisten"
#: data/nation/mexican.ruleset:4
-#, fuzzy
msgid "?plural:Mexicans"
-msgstr "?plural:yhdysvaltalaiset"
+msgstr "meksikolaiset"
#: data/nation/mexican.ruleset:6
msgid ""
"Mexico borrows its name from the Mexica people, another name for the Aztecs."
msgstr ""
+"Meksikon nimi juontuu alueella eläneistä asteekeista, jotka käyttivät "
+"itsestään nimitystä mexica."
#: data/nation/mongol.ruleset:3
msgid "Mongol"
@@ -23603,7 +23943,7 @@ msgid ""
"continent of Asia. They became notorious for the utter ruthlessness in "
"warfare."
msgstr ""
-"Tsingis-kaanin yhdistettyä mongolit he valloittivat seuraavina vuosisatoina "
+"Tšingis-kaanin yhdistettyä mongolit he valloittivat seuraavina vuosisatoina "
"suurimman imperiumin ihmiskunnan historiassa: se käsitti suurimman osan "
"Aasiasta. He olivat kuuluisia armottomuudestaan sodankäynnissä."
@@ -23612,19 +23952,16 @@ msgid "Khan"
msgstr "Kaani"
#: data/nation/mongol.ruleset:30 data/nation/uyghur.ruleset:30
-#, fuzzy
msgid "Khagan"
-msgstr "Kaani"
+msgstr "Suurkaani"
#: data/nation/newzealand.ruleset:3
-#, fuzzy
msgid "New Zealand"
-msgstr "?plural:inkat"
+msgstr "uusiseelantilaisten"
#: data/nation/newzealand.ruleset:4
-#, fuzzy
msgid "?plural:New Zealanders"
-msgstr "?plural:inkat"
+msgstr "uusiseelantilaiset"
#: data/nation/newzealand.ruleset:7
msgid ""
@@ -23632,30 +23969,29 @@ msgid ""
"royal proclamation in 1907, the country became an independent dominion "
"within the Commonwealth of Nations."
msgstr ""
+"Uuden Seelannin saariryhmä liitettiin osaksi Britanniaa 1840. Vuoden 1907 "
+"kuninkaallisen julistuksen perusteella maasta tuli itsenäinen maa-alue "
+"Brittiläisen kansanyhteisön osana."
#: data/nation/nigerian.ruleset:3
-#, fuzzy
msgid "Nigerian"
-msgstr "serbien"
+msgstr "nigerialaisten"
#: data/nation/nigerian.ruleset:4
-#, fuzzy
msgid "?plural:Nigerians"
-msgstr "?plural:persialaiset"
+msgstr "nigerialaiset"
#: data/nation/nigerian.ruleset:6
msgid "Nigeria won full independence from British rule in 1960."
-msgstr ""
+msgstr "Nigeria itsenäistyi Iso-Britanniasta 1960."
#: data/nation/norwegian.ruleset:3
-#, fuzzy
msgid "Norwegian"
-msgstr "korealaisten"
+msgstr "norjalaisten"
#: data/nation/norwegian.ruleset:4
-#, fuzzy
msgid "?plural:Norwegians"
-msgstr "?plural:korealaiset"
+msgstr "norjalaiset"
#: data/nation/norwegian.ruleset:6
msgid ""
@@ -23663,16 +23999,18 @@ msgid ""
"in Eidsvoll, 1814AD. Finally, in 1905AD the Norwegians got their "
"independence after a union with Sweden."
msgstr ""
+"Vuosisatojen tanskalaisvallan jälkeen norjalaiset vahvistivat oman "
+"perustuslakinsa Eidsvollissa 1814 jKr. Jouduttuaan kuitenkin väkisin "
+"personaaliunioniin Ruotsin kanssa Norja julistautui unionin hajottua vihdoin "
+"itsenäiseksi 1905 jKr."
#: data/nation/ottoman.ruleset:3
-#, fuzzy
msgid "Ottoman"
-msgstr "roomalaisten"
+msgstr "osmanien"
#: data/nation/ottoman.ruleset:4
-#, fuzzy
msgid "?plural:Ottomans"
-msgstr "?plural:roomalaiset"
+msgstr "osmanit"
#: data/nation/ottoman.ruleset:6
msgid ""
@@ -23684,39 +24022,42 @@ msgid ""
"Africa, making it a regional superpower until its dissolution in the "
"aftermath of WWI."
msgstr ""
+"1300-luvun alussa Osman, pienen länsianatolialaisen turkkilaisheimon "
+"johtaja, 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, "
+"islamilaisesta arabimaailmasta ja Egyptistä sekä huomattavan viilun Pohjois-"
+"Afrikkaa, mikä teki valtakunnasta paikallisen suurvallan ennen kuin se "
+"hajotettiin ensimmäisen maailmansodan jälkipyykeissä."
#: data/nation/ottoman.ruleset:27 data/nation/tunisian.ruleset:28
-#, fuzzy
msgid "Bey"
-msgstr "Osta"
+msgstr "Bey"
#: data/nation/ottoman.ruleset:28
-#, fuzzy
msgid "Hakan"
-msgstr "toukokuu"
+msgstr "Hakan"
#: data/nation/ottoman.ruleset:29
-#, fuzzy
msgid "Padisah"
-msgstr "Sissiryhmä"
+msgstr "Padisah"
#: data/nation/ottoman.ruleset:30
msgid "Imparator"
msgstr "Imparaattori"
#: data/nation/papuan.ruleset:3
-#, fuzzy
msgid "Papuan"
-msgstr "Väkiluku"
+msgstr "papualaisten"
#: data/nation/papuan.ruleset:4
-#, fuzzy
msgid "?plural:Papuans"
-msgstr "?plural:japanilaiset"
+msgstr "papualaiset"
#: data/nation/papuan.ruleset:6
msgid "The Papuans are a Melanesian people on the island of New Guinea."
-msgstr ""
+msgstr "Papualaiset ovat melanesialainen kansa Uuden-Guinean saarella."
#: data/nation/papuan.ruleset:16
msgid "Governor-General"
@@ -23751,35 +24092,36 @@ msgid "Ayatollah"
msgstr "Ajatollah"
#: data/nation/phoenician.ruleset:3
-#, fuzzy
msgid "Phoenician"
-msgstr "sloveenien"
+msgstr "foinikialaisten"
#: data/nation/phoenician.ruleset:4
-#, fuzzy
msgid "?plural:Phoenicians"
-msgstr "?plural:sloveenit"
+msgstr "foinikialaiset"
#: data/nation/phoenician.ruleset:6
msgid ""
"Phoenicia was an ancient civilization, based in what is now the coastal "
"regions of Lebanon and Syria."
msgstr ""
+"Foinikia oli esihistoriallinen kansakunta nykyisten Libanonin ja Syyrian "
+"rannikkoalueilla."
#: data/nation/polish.ruleset:3
msgid "Polish"
msgstr "puolalaisten"
#: data/nation/polish.ruleset:4
-#, fuzzy
msgid "?plural:Poles"
-msgstr "?plural:puolalaiset"
+msgstr "puolalaiset"
#: data/nation/polish.ruleset:6
msgid ""
"The Polish state was formed about a millennium ago, and reached its Golden "
"Age near the end of the 16th century."
msgstr ""
+"Puolan valtio muodostettiin noin vuosituhat sitten, ja se nousi suurimpaan "
+"kukoistukseensa 1500-luvun lopulla."
#: data/nation/polish.ruleset:26
msgid "Dyktator"
@@ -23846,28 +24188,29 @@ msgid ""
"Rome. It's history is convoluted as it was always at the borders of great "
"empires: Roman, Ottoman, Austro-Hungarian, and Russian."
msgstr ""
+"Kansakuntana Romania muodostettiin 1900-luvun alussa, kun Transilvanian, "
+"Valakian ja Moldavian ruhtinaskunnat yhdistyivät. Maan väestö puhuu kieltä, "
+"joka muistuttaa mieleen muinaisen Rooman ajat. Maan historia on "
+"monikäänteinen, koska sitä ovat aina ympäröineet suurvallat: Rooma, Osmanien "
+"valtakunta, Itävalta-Unkari ja Venäjä."
#: data/nation/romanian.ruleset:33
msgid "Voievod"
-msgstr ""
+msgstr "Voievod"
#: data/nation/romanian.ruleset:33
-#, fuzzy
msgid "Doamna"
-msgstr "Alas"
+msgstr "Doamna"
#: data/nation/romanian.ruleset:34
-#, fuzzy
msgid "Rege"
-msgstr "Poista"
+msgstr "Rege"
#: data/nation/romanian.ruleset:34
-#, fuzzy
msgid "Regina"
-msgstr "Kuningatar"
+msgstr "Regina"
#: data/nation/romanian.ruleset:35
-#, fuzzy
msgid "Presedinte"
msgstr "Presidentti"
@@ -23892,7 +24235,7 @@ msgid ""
"Rome was, in legend, founded by Romulus in 753 BC. At its height, Rome "
"controlled nearly all of Europe, northern Africa and Mesopotamia."
msgstr ""
-"Legendan mukaan Romulus perusti Rooman 753 eaa. Kulta-aikanaan Rooma\n"
+"Legendan mukaan Romulus perusti Rooman 753 eKr. Kulta-aikanaan Rooma "
"hallitsi lähes koko Eurooppaa, pohjois-Afrikkaa ja Mesopotamiaa."
#: data/nation/russian.ruleset:3
@@ -23916,6 +24259,16 @@ msgid ""
"dissolution in 1991 Russia appeared on world map again, now as a federative "
"republic."
msgstr ""
+"Tarinan mukaan Novrogodin slaavi- ja fenniheimot kutsuivat varjagien "
+"(viikinkien) kuningas Rurikin tuomaan järjestystä maahansa. Rurik perusti "
+"alueelle Kiovan Venäjän (Kiovan Rusj), josta tuli ensimmäinen venäläinen "
+"valtio. 1000-luvulle tultaessa Kiovan Venäjä oli hajonnut pienempiin "
+"ruhtinaskuntiin, jotka Iivana III yhdisti uudelleen yhdeksi valtioksi 1400-"
+"luvulla. Voitettuaan Ruotsilta laajoja alueita Pietari I julisti maansa "
+"Venäjän keisarikunnaksi 1721. Keisarikunnan aikaa kesti vuoteen 1917, "
+"jolloin sosialistinen vallankumous syöksi viimeisen venäläisen keisarin "
+"vallasta. Neuvostoliiton hajottua 1991 Venäjä ilmestyi takaisin "
+"maailmankartalle, tällä kertaa liittotasavaltana."
#: data/nation/russian.ruleset:47 data/nation/serbian.ruleset:36
msgid "Duke"
@@ -23938,20 +24291,21 @@ msgid "Matriarch"
msgstr "Matriarkka"
#: data/nation/ryukyuan.ruleset:3
-#, fuzzy
msgid "Ryukyuan"
-msgstr "?plural:venäläiset"
+msgstr "ryūkyūlaisten"
#: data/nation/ryukyuan.ruleset:4
-#, fuzzy
msgid "?plural:Ryukyuans"
-msgstr "?plural:venäläiset"
+msgstr "ryūkyūlaiset"
#: data/nation/ryukyuan.ruleset:6
msgid ""
"The Ryukyu Kingdom (1372-1879) was the Land of Propriety, a peaceful "
"maritime trading nation eventually invaded, occupied, and annexed by Japan."
msgstr ""
+"Ryūkyū-kuningaskunta (1372-1879) oli Soveliaisuuden Maa, rauhanomainen meren "
+"yli kauppaa käyvä kansa, jonka Japani lopulta valloitti, miehitti ja liitti "
+"itseensä."
#: data/nation/ryukyuan.ruleset:21
msgid "Koku-o"
@@ -23975,8 +24329,8 @@ msgid ""
"northernmost regions of the Scandinavian countries: Finnmark of Norway and "
"Lapland of Sweden and Finland."
msgstr ""
-"Saamelaiset ovat pohjois-skandinavialainen kansa, joka asuu Suomen ja "
-"Ruotsin lapin sekä Norjan Finnmarkin alueella."
+"Saamelaiset ovat pohjoisskandinavialainen kansa, joka asuu Suomen ja Ruotsin "
+"lapin sekä Norjan Finnmarkin alueella."
#: data/nation/sami.ruleset:21
msgid "Noaydde"
@@ -24071,6 +24425,9 @@ msgid ""
"against the United States. It consisted of three distinct groups of tribes: "
"the Lakota, the Dakota and the Nakota."
msgstr ""
+"Sioux oli pohjoisamerikkalainen kansakunta, joka taisteli useaan otteeseen "
+"Yhdysvaltoja vastaan. Kansakunta koostui kolmesta erillisestä heimoryhmästä: "
+"lakotoista, dakotoista ja nakotoista."
#: data/nation/slovenian.ruleset:3
msgid "Slovenian"
@@ -24095,13 +24452,22 @@ msgid "?plural:Slovakians"
msgstr "sloveenien"
#: data/nation/slovakian.ruleset:6
-#, fuzzy
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 ""
-"Nykyinen Tsekin tasavalta oli vuoteen 1993 asti osa Tsekkoslovakiaa, joka "
-"taas oli vuoteen 1918 asti ollut Itävalta-Unkarin osa."
+"Slovakia on valtio Euroopan sydämmessä. 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"
#: data/nation/slovakian.ruleset:29
msgid "Pope"
@@ -24130,6 +24496,15 @@ msgid ""
"prisoner Nelson Mandela was elected the first truly democratically elected "
"president of South Africa."
msgstr ""
+"Hollantilaiset uudisasukkaat alkoivat kansoittaa eteläistä Afrikkaa 1600-"
+"luvulla. Etelä-Afrikan Unioni luotiin vuonna 1910 useiden sotien jälkeen - "
+"sotia kävivät lähinnä buurit (hollantilaisten uudisasukkaien jälkeläiset), "
+"brittivoimat ja zulut. Etelä-Afrikan hallinto keräsi kyseenalaista mainetta "
+"\"apartheid\"-politiikallaan, jossa iholtaan eriväriset kansalaiset olivat "
+"epätasa-arvoisia lain edessä. Kun maan ensimmäinen rotuun perustumaton "
+"perustuslaki vahvistettiin 194, pitkäaikainen poliittinen vanki Nelson "
+"Mandela nousi Etelä-Afrikan ensimmäiseksi demokraattisilla vaaleilla "
+"valituksi presidentiksi."
# Note to self: usually "suomalaisten", but ... it sounds wrong! X-)
#: data/nation/soviet.ruleset:3
@@ -24142,12 +24517,19 @@ msgstr "neuvostoliittolaiset"
#: data/nation/soviet.ruleset:6
msgid ""
-"Soviet Union's history starts in November 1917, when under Lenin's "
+"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 "
-"republics integrated into one country. Soviet Union became one of most "
-"powerful states in the 20th century. But by the end of 1991 due to many "
-"social shocks it disintegrated into fifteen independent countries"
-msgstr ""
+"republics integrated into one country. The Soviet Union became one of most "
+"powerful states in the 20th century, but by the end of 1991 it had "
+"disintegrated into fifteen independent countries due to social and economic "
+"problems."
+msgstr ""
+"Neuvostoliiton historia alkaa marraskuussa 1917 Leninin johtamasta "
+"bolševikkivallankumouksesta. Joulukuun 31. päivänä 1922 neljä venäläistä "
+"tasavaltaa liittyi yhdeksi valtioksi. Neuvostoliitosta tuli yksi 1900-luvun "
+"mahtavimmista valtioista, mutta vuoden 1991 loppuun mennessä, monien "
+"yhteiskunnallisten järistyksien jälkeen, se hajosi viideksitoista "
+"itsenäiseksi maaksi."
#: data/nation/spanish.ruleset:3
msgid "Spanish"
@@ -24216,9 +24598,8 @@ msgstr ""
"keksijöinä."
#: data/nation/sumerian.ruleset:22
-#, fuzzy
msgid "Ensi"
-msgstr "Encik"
+msgstr "Ensi"
#: data/nation/swazi.ruleset:3
msgid "Swazi"
@@ -24264,6 +24645,12 @@ msgid ""
"its gained territory. The country has not been involved in an armed conflict "
"since 1814."
msgstr ""
+"Ruotsin kuningaskunta kristillistyi ja muodosti poliittisen yksikön 1100-"
+"luvulla jKr. Maa nousi yhdeksi Euroopan suurvalloista 1600-luvulla, kun "
+"valloittajakuninkaat laajensivat aluetta. Ruotsin talouden heikentyessä ja "
+"sen kärsittyä useita katastrofaalisia tappioita Venäjälle maa menetti pian "
+"suurimman osan vallatuista alueista. Maa ei ole osallistunut aseelliseen "
+"konfliktiin sitten vuoden 1814."
#: data/nation/swiss.ruleset:3
msgid "Swiss"
@@ -24379,6 +24766,13 @@ msgid ""
"established a buddhist religious state under the control of the Gelugpa "
"school of Tibetan Buddhism."
msgstr ""
+"Tiibetiläisten kotimaata kutsutaan joskus \"Maailman katoksi\"; se on "
+"maailman korkeimmalla sijaitseva ylänköalue. 600-luvulla Tiibet oli mahtava "
+"valta kuningas Songtsen Gampon johtamana, ja sen tunnustivat sekä Kiina että "
+"Intia. Dynastia jatkui 1000-luvulle, jolloin mongolit jyräsivät maan. "
+"Vuosisatoja myöhemmin, mongolivallan heikennyttyä, Lozang Gyatso - 5. Dalai "
+"Lama, joka syntyi vuonna 1617 - perusti buddhalaisen uskonnollisen valtion, "
+"jota hallitsi tiibetiläisen buddhalaisuuden Gelugpa-koulukunta."
#: data/nation/tibetan.ruleset:27
msgid "Lama"
@@ -24407,6 +24801,14 @@ msgid ""
"1861. But in 1881 Tunisia was invaded by the French and was made a French "
"protectorate. The country became independent in 1956."
msgstr ""
+"Foinikialaiset perustivat Karthagon nyky-Tunisian alueelle. Karthagosta tuli "
+"myöhemmin huomattava valta Välimeren alueella, kunnes se kukistui "
+"Roomalaisille 146 eKr. Tämän jälkeen arabimuslimien valloitus 600-luvulla "
+"johti arabien ja osmanien muuttamiseen alueelle. 1500-luvun lopulla "
+"juutalaisia ja Espanjan maureja muutti alueelle sankoin joukoin. Tunisia sai "
+"pitkälti itsehallinnon Osmanien valtakunnasta 1861, mutta 1881 ranskalaiset "
+"valloittivat sen ja muuttivat maan Ranskan protektoraatiksi. Tunisia "
+"itsenäistyi 1956."
#: data/nation/turk.ruleset:3
msgid "Turk"
@@ -24417,17 +24819,16 @@ msgid "?plural:Turks"
msgstr "?plural:turkkilaiset"
#: data/nation/turk.ruleset:6
-#, fuzzy
msgid ""
"Modern Turkey is the successor state of the Ottoman Empire, which collapsed "
"and was dismembered by the victors in World War I after backing the Central "
"Powers. The country was subsequently reformed and secularized by Kemal "
"Mustapha, the hero of the defense of Gallipoli."
msgstr ""
-"Nykyisen Turkin edeltäjä oli ottomaanivaltakunta, joka hajosi ja ensimmäisen "
-"maailmansodan voittajat jakoivat sen koska se oli tukenut keskusvaltoja. "
-"Valtion muodosti uudelleen ja maallisti Mustafa Kemal, Gallipolin "
-"puolustamisen sankari."
+"Nykyisen Turkin edeltäjä oli Osmanien valtakunta, joka hajosi ensimmäisen "
+"maailmansodan voittajien jaettavaksi tuettuaan keskusvaltoja. Valtion "
+"muodosti uudelleen ja maallisti Mustafa Kemal, Gallipolin puolustanut "
+"sankari."
#: data/nation/ukrainian.ruleset:3
msgid "Ukrainian"
@@ -24466,6 +24867,13 @@ msgid ""
"Asian states of Uzbekistan, Kazakhstan and Kyrgyzstan. They are also the "
"main minority of the Xinjiang province of China."
msgstr ""
+"Uiguuri oli itäisen Turkin valtakunta ja kansakunta. Kulta-aikanaan 820 jKr. "
+"se kontrolloi suurinta osaa Keski- ja Pohjois-Aasiasta. Useita vuosisatoja "
+"kestäneet yhteenotot kiinalaisten kanssa johtivat lopulta Qing-dynastian "
+"voittoon uiguureista 1700-luvulla. Nykyään uiguurien jälkeläiset asuttavat "
+"Keski-Aasian Uzbekistanin, Kazakstanin ja Kirgisian alueita. Heille on myös "
+"osoitettu Kiinassa sijaitseva Xinjiangin autonominen alue, jolla uiguurit "
+"muodostavat pääasiallisen vähemmistöryhmän."
#: data/nation/venezuelan.ruleset:3
msgid "Venezuela"
@@ -24485,11 +24893,13 @@ msgid ""
"July 5th 1811 under the leadership of El Libertador Simon Bolivar - The "
"Liberator."
msgstr ""
+"Venezuela on Etelä-Amerikan pohjoisin valtio. Oltuaan Espanjan siirtomaana "
+"1500-luvulta lähtien maa itsenäistyi 5. heinäkuuta 1811 El Liberador "
+"(\"vapauttaja\") Simón BolÃvarin johdolla."
#: data/nation/venezuelan.ruleset:28
-#, fuzzy
msgid "Terrateniente"
-msgstr "Maasto"
+msgstr "Terrateniente"
#: data/nation/vietnamese.ruleset:3
msgid "Vietnamese"
@@ -24552,10 +24962,13 @@ msgstr "westfalenilaiset"
#: data/nation/westphalian.ruleset:6
msgid ""
-"Westphalia, before becoming a Prussian province, was the western region the "
-"duchy of Saxony. Present-day it consists of the Northern part of the largest "
+"Westphalia, before becoming a Prussian province, was the western region of "
+"the duchy of Saxony. Today it makes up the northern part of the largest "
"German federal state, North Rhine-Westphalia."
msgstr ""
+"Westfalen oli Saksin herttuakunnan länsialue ennen muuttumistaan Preussin "
+"provinssiksi. Nykyään se kattaa pohjoisen osan Saksan liittotasavallan "
+"suurimmasta osavaltiosta, Nordhein-Westfalenista."
#: data/nation/zulu.ruleset:3
msgid "Zulu"
@@ -24643,6 +25056,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 ""
+"Tervetuloa Freeciviä pelaamaan! Johdat kansakuntaa, ja \n"
+"tehtäväsi on valloittaa maailma! Aloita tutkimalla maastoa\n"
+"ympärilläsi seikkailijallasi, ja etsi uudisraivaajillasi\n"
+"hyvä paikka rakentaa kaupunki. Käytä numeronäppäimistöä\n"
+"yksiköiden liikuttamiseen."
#: data/scenario/tutorial.sav:34
msgid ""
@@ -24653,6 +25071,13 @@ msgid ""
"is the most important resource for any city. Grassland and plains\n"
"provide plenty of food."
msgstr ""
+"Tämä näyttää hyvältä paikalta rakentaa kaupunki. Seuraavan kerran\n"
+"kun tämä yksikkö on liikkumisvuorossa, paina b:tä perustaaksesi\n"
+"kaupungin.\n"
+"\n"
+"Yleisesti ottaen haluat rakentaa kaupunkisi avomaalle lähelle vettä.\n"
+"Ruoka on minkä tahansa kaupungin tärkein resurssi. Ruohomaa ja \n"
+"tasanko tuottavat rutkasti ruokaa."
#: data/scenario/tutorial.sav:49
msgid ""
@@ -24668,6 +25093,17 @@ msgid ""
"dialog. If all goes well the city should display the settler\n"
"production on the map view."
msgstr ""
+"Olet nyt rakentanut ensimmäisen kaupunkisi. Kaupunki-ikkunan pitäisi\n"
+"aueta automaattisesti; jos näin ei käynyt, napsauta kaupunkia avataksesi\n"
+"sen. Kaupungit ovat Freecivin peruskivi, joten tutustu niiden käsitteisiin\n"
+"tämän ikkunan kautta. Löydät ohjevalikosta lisätietoa.\n"
+"\n"
+"Haluat todennäköisesti rakentaa ensin uudisraivaajia, jotta voit laajentaa\n"
+"kansakuntaasi edemmäs. Napsauta tuotantovälilehteä, valitse luettelosta\n"
+"uudisraivaajayksikkö, ja paina sitten Vaihda-nappia aloittaaksesi sen\n"
+"rakentamisen. Kun olet valmis, sulje kaupunki-ikkuna. Jos kaikki menee\n"
+"nappiin, kaupungin pitäisi kertoa rakentavansa uudisraivaajaa \n"
+"karttanäkymässä."
#: data/scenario/tutorial.sav:62
msgid ""
@@ -24676,6 +25112,10 @@ msgid ""
"because of the terrain around it. You probably want to build\n"
"settlers here too."
msgstr ""
+"Onneksi olkoon, olet perustanut toisen kaupunkisi. Tämä kaupunki\n"
+"käyttäytyy lähes täysin samoin kuin ensimmäinen - pienet erot johtuvat\n"
+"erilaisesta maastosta kaupunkien ympärillä. Halunnet rakentaa \n"
+"täälläkin uudisraivaajia."
#: data/scenario/tutorial.sav:68
msgid ""
@@ -24693,6 +25133,18 @@ 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 ""
+"Olet rakentanut kolmannen kaupunkisi! Kansakuntasi näkyy voivan paksusti.\n"
+"Nyt voisi olla hyvä aika ajatella sotavoimiasi. Valitse jokin kaupungeista,\n"
+"joilla on korkea tuotanto, ja muuta se sotilasvoimiesi tukikohdaksi. \n"
+"Rakenna sinne ensin Kasarmi, ja ala sitten rakentaa sotilasyksikköä.\n"
+"Valitse paras yksikkö joka saatavilla on - pelin alussa Soturijoukko \n"
+"on ainoa saatavilla oleva vaihtoehto, mutta pian valinnanvarasi kasvaa.\n"
+"\n"
+"Tämä voi myös olla hyvä hetki käyttää työlistatukea kaupunki-ikkunan \n"
+"tuotantoraportin kohdalla. Napsauta Kasarmia, sitten Vaihda-nappia \n"
+"alkaaksesi rakentaa sitä. Tuplaklikkaa sen jälkeen valitsemaasi sotilas-\n"
+"yksikköä lisätäksesi sen työlistan loppuun. Jahka Kasarmi valmistuu, \n"
+"kaupunki siirtyy automaattisesti kouluttamaan sotilasyksikköä."
#: data/scenario/tutorial.sav:83
msgid ""
@@ -24703,11 +25155,20 @@ msgid ""
"The flag and background color indicate what civilization the city\n"
"belongs to (this will be useful when you meet other civilizations).\n"
"The top row of the bar also shows the name and size of the city, and\n"
-"will show one or more starts to indicate if there are units in the\n"
+"will show one or more stars to indicate if there are units in the\n"
"city. The bottom row shows what the city is building, and how long it\n"
"will take; it also shows how long the city will take to grow to the\n"
"next largest size."
msgstr ""
+"Ja taas yksi kaupunki lisää! Alat olla tästä jo hyvin kärryillä. Tietänet\n"
+"myös jo pitkälti mitä tehdä uusilla kaupungeillasi. Vilkaise tässä\n"
+"vaiheessa karttanäkymässä kaupungin alla näkyvää palkkia. Palkki näyttää\n"
+"hyödyllistä tietoa kaupungin tilasta. Lippu ja taustaväri kertovat, mihin\n"
+"kansakuntaan kaupunki kuuluu - tästä on hyötyä, kun törmäät muihin \n"
+"kansoihin. Palkin ylärivi näyttää kaupungin nimen ja koon, sekä yhden tai\n"
+"useamman tähden sen mukaan, montako yksikköä kaupungissa on. Alarivi\n"
+"kertoo, mitä kaupunki rakentaa ja miten kauan tämä kestää; se kertoo myös,\n"
+"miten kauan kestää kunnes kaupunki kasvaa astetta suuremmaksi."
#: data/scenario/tutorial.sav:96
msgid ""
@@ -24720,6 +25181,14 @@ msgid ""
"from this report. The full power of the city report is beyond the\n"
"scope of this tutorial, however."
msgstr ""
+"Kun valtakuntasi kaupunkien määrä kasvaa, yksittäisten kaupunkien \n"
+"hallinnointi hankaloituu. Tässä vaiheessa kaupunkiraportti tulee hätiin.\n"
+"Paina F1 avataksesi sen. Raportti näyttää luettelon kaupungeista, ja\n"
+"erinäisiä tietoja kustakin. Nuohoa raporttinäkymää sen verran kuin sinua\n"
+"tässä vaiheessa kiinnostaa, ja palaa karttanäkymään napsauttamalla\n"
+"Kartta-välilehteä. Pienen harjoittelun turvin voit hallinnoida lähes\n"
+"mitä tahansa kaupunkeihin liittyvää tämän raportin kautta, mutta tämä \n"
+"tutoriaali ei ulotu työkalun syvällisempien hienouksien esittelyyn."
#: data/scenario/tutorial.sav:115
msgid ""
@@ -24733,6 +25202,15 @@ msgid ""
"in gold (if you have enough of it) to instantly complete the\n"
"production."
msgstr ""
+"Kaupunkisi on kasvanut! Kun kaupunki kasvaa, käytettävissäsi on enemmän\n"
+"kansalaisia, jotka voit määrätä pelloille tai erikoistehtäviin. Kahden\n"
+"kokoinen kaupunki voi myös rakentaa uudisraivaajia, mikä maksaa yhden\n"
+"väestöyksikön verran.\n"
+"\n"
+"Jos kaupunkisi rakentaa uudisraivaajia, harkitse nyt niiden ostamista.\n"
+"Avaa kaupunki-ikkuna ja napsauta Osta-nappia. Tämä käyttää kultaa (jos\n"
+"sinulla on sitä riittävästi) valmistaakseen käynnissä olevan tuotannon\n"
+"välittömästi."
#: data/scenario/tutorial.sav:127
msgid ""
@@ -24752,6 +25230,22 @@ msgid ""
"specialists - right now they are all entertainers which provide\n"
"only luxuries (which will not be useful until later)."
msgstr ""
+"Kaupunkisi on kasvanut taas! Kolmen kansalaisen turvin sinulla on\n"
+"jo varsin hyvä valinnanvara sen suhteen, miten kaupungin kannattaisi\n"
+"ohjata resurssinsa. Kolmen asukasyksikön kaupunki voi työstää kolmea\n"
+"eri ruutua - ilmaiseksi työstetyn keskiruudun lisäksi. Kaupunki-\n"
+"ikkunassa oleva kartta näyttää, millä ruuduilla työläiset ovat, ja\n"
+"miten paljon ruokaa, tuotantoa (\"kilpiä\") ja kauppaa kukin tuottaa.\n"
+"Ruoka kasvattaa kaupunkiasi, tuotanto käytetään rakennusten ja yksikköjen\n"
+"rakentamiseen, ja kauppa tuottaa verotettavaa tuloa joka voidaan muuntaa\n"
+"tieteelliseksi tutkimukseksi, kullaksi tai luksukseksi.\n"
+"\n"
+"Napsauta työstettyä ruutua poistaaksesi työläiset ruudulta. Napsauta\n"
+"sen jälkeen työstämätöntä ruutua sijoittaaksesi työläiset sinne. Voit\n"
+"sijoittaa tässä tapauksessa korkeintaan kolme työläistä. Yli jääneet\n"
+"kansalaiset ovat kaikki erikoistehtävissä: oletuksena he erikoistuvat\n"
+"viihdyttäjäksi, jotka tuottavat vain luksusta - mistä ei ole vielä tässä\n"
+"vaiheessa hyötyä."
#: data/scenario/tutorial.sav:145
#, c-format
@@ -24759,7 +25253,7 @@ msgid ""
"Now your city has grown to size five. As cities get larger unrest\n"
"becomes a problem. A city of this size will usually have one unhappy\n"
"citizen unless pacifying effects are used; meaning one entertainer\n"
-"specialist is required to keep your citzens content. This is basically\n"
+"specialist is required to keep your citizens content. This is basically\n"
"a wasted citizen.\n"
"\n"
"There are several things that can be done about this. One quick fix\n"
@@ -24771,6 +25265,21 @@ msgid ""
"citizen). Building a marketplace enhances the benefit from this\n"
"by providing +50%% luxuries to the city."
msgstr ""
+"Nyt kaupunkisi on kasvanut kokoon viisi. Kun kaupungit kasvavat "
+"suuremmiksi,\n"
+"levottomuudesta tulee ongelma. Tämänkokoisessa kaupungissa on yleensä\n"
+"yksi tyytymätön työläinen, ellei rauhoittavia toimenpiteitä oteta käyttöön:\n"
+"yksi viihdyttäjäksi erikoistunut työläinen tarvitaan pitämään kansalaisesi\n"
+"rauhallisina - tämä tarkoittaa käytännössä yhden kansalaisen haaskuuta.\n"
+"\n"
+"Ongelmaan on kuitenkin useita ratkaisuja. Yksi ratkaisu on rakentaa \n"
+"temppeli (tai muu kulttuurirakennus), joka muuttaa yhden tyytymättömän\n"
+"asukkaan rauhalliseksi (lisätietoa rakennuksia käsittelevissä ohjeissa).\n"
+"Kun useammassa kaupungissa on monta asukasta, voi kannattaa muuttaa\n"
+"veroprosenttiasi (painamalla Shift-T) ja suuntaamalla enemmän veroja\n"
+"suoraan luksukseen - kaksi luksusta rauhoittaa kukin yhden kansalaisen.\n"
+"Torin rakentaminen lisää tästä saatavaa etua tuottamalla +50%% luksusta\n"
+"kaupungille."
#: data/scenario/tutorial.sav:162
msgid ""
@@ -24782,6 +25291,13 @@ msgid ""
"going to continue to grow you should start building one soon. Building\n"
"an aqueduct requires the Construction technology."
msgstr ""
+"Olet viimein kasvattanut kaupungin kokoon kahdeksan. Tämänkokoinen\n"
+"kaupunki voi tuottaa huomattavissa määrin, kunhan luksus riittää \n"
+"pitämään kansalaiset tyytyväisenä.\n"
+"\n"
+"Kasvattaaksesi kaupunkia kahdeksaa suuremmaksi vaatii vesijohtoverkoston.\n"
+"Jos kaupunkisi jatkaa kasvamistaan, sinun pitäisi aloittaa Vesijohdon\n"
+"rakentaminen pian. Tätä varten tarvitset Rakennustaito-edistysaskeleen."
#: data/scenario/tutorial.sav:172
msgid ""
@@ -24789,6 +25305,9 @@ msgid ""
"it larger, however, you will need to build a Sewer System. This\n"
"requires the Sanitation technology."
msgstr ""
+"Olet kasvattanut kaupungin kokoon 12. Jotta kaupunki voisi kasvaa \n"
+"suuremmaksi, se tarvitsee Viemäriverkoston, joka puolestaan vaatii\n"
+"Puhtaanapito-edistysaskeleen."
#: data/scenario/tutorial.sav:178
msgid ""
@@ -24804,6 +25323,17 @@ msgid ""
"provide enough taxable revenue (gold) to allow you to purchase some\n"
"buildings to accelerate their productions."
msgstr ""
+"Onneksi olkoon; olet kasvattanut kaupungin kokoon 13. Tämänkokoinen\n"
+"kaupunki on jo tuotannoltaan erinomainen, jos se on sopivasti tuunattu.\n"
+"Varmista, että sinulla on sopivasti veroja ja kulttuurirakennuksia\n"
+"pitääksesi asukkaat rauhallisina. Varmista myös, että kaupunkiin on\n"
+"rakennettu sopivat tuotantoa parantavat rakennukset. Kirjasto, Tori,\n"
+"Tehdas ja Porauslautta ovat neljä hyvää rakennusta, jotka aiheuttavat\n"
+"suurissa kaupungissa tuntuvan bonuksen. Vertaa kunkin rakennuksen\n"
+"etuja ja kustannuksia - suurissa kaupungeissa lähes kaikki rakennukset\n"
+"ovat hintansa väärtejä. Suurissa kaupungeissa tuotetaan myös riittävästi\n"
+"verotettavaa tuloa (kultaa), jotta voit ostaa osan rakennuksista \n"
+"nopeuttaaksesi niiden pystytystä."
#: data/scenario/tutorial.sav:208
msgid ""
@@ -24820,6 +25350,19 @@ msgid ""
"of much use to small cities. See the help on terrain and specials\n"
"for more information about terrain specs."
msgstr ""
+"Olet rakentanut uudisraivaajaryhmän. Uudisraivaajat ovat parhaimmillaan\n"
+"uusien kaupunkien rakentamisessa, mikä laajentaa kansakuntaasi. Siirrä\n"
+"uudisraivaajasi poispäin olemassaolevista kaupungeistasi löytääksesi\n"
+"paikan uudelle kaupungille. Kun olet valinnut sopivan paikan, paina\n"
+"B:tä rakentaaksesi kaupungin.\n"
+"\n"
+"Kertauksena: kaupungit on hyvä rakentaa avomaalle lähelle vettä. \n"
+"Ruohomaat ja tasangot tuottavat ruokaa kaupungille, metsät ja kukkulat\n"
+"parantavat tuotantoa, jota tarvitaan rakentamiseen. Joet ja valtameri\n"
+"ovat hyviä kaupan kannalta, mikä puolestaan auttaa koko kansakuntaa.\n"
+"Aavikko, tundra ja vuoret yleensä ovat tuottoisuudeltaan heikkoja \n"
+"eivätkä ole pienille kaupungeille juurikaan eduksi. Katso lisätietoa\n"
+"maastotyyppejä ja niiden erityispiirteitä käsittelevistä ohjeista."
#: data/scenario/tutorial.sav:222
msgid ""
@@ -24831,9 +25374,19 @@ msgid ""
"existing cities. Generally when building new cities you want to make\n"
"sure that all tiles are covered by at least one city, but after that\n"
"it is best that your cities overlap as little as possible. Spreading\n"
-"out cities properly gives each city access to more resrouces, allowing\n"
+"out cities properly gives each city access to more resources, allowing\n"
"them to grow to larger sizes."
msgstr ""
+"Toinen uudisraivaajayksikkösi tulisi myös käyttää uuden kaupungin\n"
+"rakentamiseen. Huomaa, kuinka uudisraivaajan ympärille piirtyy raja\n"
+"kun se siirretään kaupungista ulos. Tämä näyttää alueen, jonka \n"
+"kyseiseen paikkaan rakennettu kaupunki kattaisi; se sopii karttanäkymässä\n"
+"jo näkyviin rajoihin, jotka näyttävät mitkä ruudut ovat jo olemassaolevien\n"
+"kaupunkiesi käytössä. Yleensä ottaen haluat rakentaa kaupunkisi siten, \n"
+"että kaikki maaston ruudut kuuluvat johonkin kaupunkiin, mutta tämän \n"
+"lisäksi kaupunkien alueiden on hyvä olla menemättä päällekkäin yhtään \n"
+"sen enempää kuin on pakko. Alueeltaan erilliset kaupungit saavat \n"
+"käyttöönsä enemmän resursseja, ja voivat siten kasvaa suuremmiksi."
#: data/scenario/tutorial.sav:245
msgid ""
@@ -24848,6 +25401,16 @@ msgid ""
"and have a small upkeep as well, so it is not a good idea to let\n"
"them go to waste."
msgstr ""
+"Olet rakentanut Kasarmin. Rakennus saa aikaan sen, että kaikki tässä\n"
+"kaupungissa tuotetut yksiköt ovat konkareita jo valmistuessaan. \n"
+"Konkariyksiköt ovat vahvempia kuin kokemattomat yksiköt, ja selviävät\n"
+"piempään taistelussa. Katso rakennuksia käsittelevästä ohjeesta \n"
+"lisätietoa tästä ja muista rakennuksista.\n"
+"\n"
+"Haluat todennäköisesti alkaa rakentaa sotilasyksikköä kasarmin \n"
+"rakentaneessa kaupungissa. Koska kasarmi on tuotannon puolesta \n"
+"huomattava sijoitus ja sen ylläpitokin maksaa hieman, sitä ei kannata\n"
+"haaskata."
#: data/scenario/tutorial.sav:267
msgid ""
@@ -24861,6 +25424,16 @@ 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 ""
+"Kaupunkisi ei voi rakentaa uudisraivaajia: ne vaativat yhden \n"
+"väestöyksikön syntyäkseen, joten kaupunki, jonka koko on vain yksi,\n"
+"ei voi rakentaa uudisraivaajaa lakkauttamatta koko kaupunkia.\n"
+"\n"
+"Hätä ei ole tämän näköinen - uudelleenjärjestele kaupungin työläinen\n"
+"niin, että se tuottaa enemmän ruokaa ja kasvattaa kaupunkia täten\n"
+"nopeammin. Kaupunkien, jotka tuottavat vain vähän ruokaa, ei kannata\n"
+"rakentaa uudisraivaajia. Kun perustat uuden kaupungin, varmista että\n"
+"rakennat sen maastoon joka tuottaa riittävästi ruokaa - ruohomaa on \n"
+"tältä osin paras vaihtoehto, tasanko tai kukkulat ovat lähes yhtä hyviä."
#: data/scenario/tutorial.sav:279
msgid ""
@@ -24877,6 +25450,19 @@ 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 ""
+"Olet rakentanut ensimmäisen sotilasyksikkösi! Sotilasyksiköillä on kaksi\n"
+"perustoimintoa: hyökkäys ja puolustus. Kullakin yksiköllä on hyökkäys-\n"
+"ja puolustusvoima. Siinä missä Soturijoukko on vain 1/1, Falangi on\n"
+"paljon vahvempi puolustaja, ja sen puolustusarvo onkin 2 (1/2). Katapultti\n"
+"taas on hyvä hyökkäysyksikkö, koska sen hyökkäysvoima on 6 (6/1).\n"
+"\n"
+"Yleisesti ottaen on hyvä idea pitää kussakin kaupungissa kahta puolustajaa.\n"
+"Tärkeissä kaupungeissa, kuten pääkaupungissasi, lisäsuoja voi olla tarpeen.\n"
+"Yhdessä kaupungissa rakennetut yksiköt voiaan lähettää toiseen kaupunkiin\n"
+"puolustamaan sitä (paina G:tä antaaksesi yksikölle Mene-komennon, mikä\n"
+"helpottaa sen siirtoa pitkien välimatkojen yli). Jos tosin olet sodassa, \n"
+"voit haluta siirtää yksikkösi vihollisen kaupungin suuntaan hyökätäksesi.\n"
+"Varo kuitenkin, ettet menetä sitä!"
#: data/scenario/tutorial.sav:304
msgid ""
@@ -24898,6 +25484,23 @@ msgid ""
"technology. When you are done playing around click on the Map tab\n"
"(Alt-M) to return to the map view."
msgstr ""
+"Olet saavuttanut ensimmäisen teknologisen edistysaskeleesi! Teknologian\n"
+"tutkiminen on tärkeä käsite Freecivissä. Kun parannat teknologiatasoasi,\n"
+"uudet yksiköt, rakennukset, hallintomuodot ja erinäiset ilmaisbonukset\n"
+"tulevat saatavillesi.\n"
+"\n"
+"Avaa nyt tiederaportti-ikkuna, painamalla F6:a tai pääikkunan \n"
+"Tiede-välilehteä. Nuohoa siellä aikasi. Paikanna Tasavalta-niminen\n"
+"teknologia ja napsauta sitä: nyt Tasavalta on tutkimuksesi kohteena, \n"
+"eli seuraava edistysaskel polulla tavoitetta kohti valitaan \n"
+"automaattisesti tutkimuksen kohteeksi. Ikkunan yläreunassa näet kuinka\n"
+"paljon tieteellistä tutkimusta saat aikaiseksi kunakin vuorona - \n"
+"tutkimuspanos (\"lamput\") tulee kaupunkiesi verotettavasta kaupankäynnistä\n"
+"(eli kaupasta). Ikkunan alaosassa on teknologiapuu: voit napsauttaa \n"
+"puun osia vasemmalla napilla asettaaksesi tutkimustavoitteita, tai\n"
+"oikealla napilla lukeaksesi lisää jostakin teknologiasta. Kun olet \n"
+"touhunnut kylliksesi, napsauta Kartta-välilehteä (Alt-M) palataksesi\n"
+"karttanäkymään."
#: data/scenario/tutorial.sav:323
msgid ""
@@ -24915,6 +25518,19 @@ msgid ""
"to worry about picking a new research target each time you finish\n"
"researching a technology."
msgstr ""
+"Olet nyt saavuttanut toisen teknologisen edistysaskeleesi. Palaa\n"
+"tiederaportti-ikkunaan (F6) ja vilkaise edistymistäsi. Jos asetit\n"
+"aiemmin Tasavallan teknologiatavoitteeksesi, uuden tutkimuskohteen\n"
+"olisi pitänyt tulla valituksi automaattisesti. Jos sinulla ei ole\n"
+"mitään pitkän tähtäimen kohdetta valittuna, uutta kohdettakaan ei \n"
+"valita ennen vuoron päättymistä.\n"
+"\n"
+"Sinä vuorona kun saat tutkimuksesi valmiiksi, voit valita uuden\n"
+"tutkimuskohteen. Jos kuitenkin vaihdat kohteita kesken aiemman\n"
+"tutkimushankkeen, menetät vaihdossa kohteeseen siihen mennessä \n"
+"uponneen tutkimuksen. Asettamalla tutkimustavoitteesi viisaasti\n"
+"vältyt uusien kohteiden valinnalta joka kerran edistysaskelten \n"
+"valmistuessa."
#: data/scenario/tutorial.sav:338
msgid ""
@@ -24934,6 +25550,21 @@ msgid ""
"However Republic is a substantially better form of government\n"
"than Despotism so the investment will soon pay off."
msgstr ""
+"Olet saavuttanut Tasavalta-tutkimustavoitteesi. Tämä teknologia on \n"
+"erityisen hyödyllinen, koska se sallii uuden hallintomuodon. Kansakuntasi\n"
+"hallinto on tärkeä sen kehittymiseksi. Alussa hallintomuotosi oli \n"
+"Yksinvalta, mikä on hyvin tehoton hallintomuoto. Myöhemmät vaihtoehdot\n"
+"antavat sinulle tilaa valita, haluatko olla rauhanomainen kauppaa käyvä\n"
+"valtio, vaiko tuhoisa valloittaja. Kummallakin lähestymistavalla on omat\n"
+"etunsa.\n"
+"\n"
+"Tässä vaiheessa halunnet vaihtaa suoraan Tasavallaksi. Valitse \n"
+"Hallintomuoto-valikosta Vaihda hallintomuotoa -alivalikko, ja \n"
+"valitse sieltä Tasavalta. Kyllä, haluat vallankumouksen! Hallinnon\n"
+"vaihtaminen tarkoittaa muutaman vuoron kestävän anarkian läpikäyntiä,\n"
+"joten se ei ole täysin ilmaista. Tasavalta on kuitenkin huomattavasti\n"
+"parempi hallintomuoto kuin Yksinvalta, joten sijoitus maksaa pian\n"
+"itsensä takaisin."
#: data/scenario/tutorial.sav:365
msgid ""
@@ -24947,6 +25578,15 @@ msgid ""
"unit instantly. On average, it is beneficial to search out and enter\n"
"any huts you find as soon as possible."
msgstr ""
+"Yksikkö on löytänyt majan. Majat ovat pieniä kyliä, joita on siellä\n"
+"täällä pitkin maastoa. Kun yksikkö astuu majaan, yksi monesta \n"
+"vaihtoehdosta tapahtuu: todennäköisimmin löydät resursseja pienen \n"
+"kultamäärän edestä. Majasta on kuitenkin myös mahdollista löytää \n"
+"teknologiaa tai palkkasoturiyksikkö. Joissakin majoissa on paikallisia\n"
+"uudisraivaajia, jotka liittyvät kansakuntaasi ja tuovat hallintaasi\n"
+"uuden kaupungin. Joissakin majoissa taas on barbaareja, jotka tappavat\n"
+"yksikkösi saman tien. Keskimäärin on kannattavaa paikantaa ja tutkia\n"
+"mahdollisimman monta majaa mahdollisimman varhain."
#: data/scenario/tutorial.sav:380
msgid "Loading tutorial events."
@@ -25112,6 +25752,65 @@ msgstr "Joukkue 30"
msgid "Team 31"
msgstr "Joukkue 31"
+#~ msgid "%s territory"
+#~ msgstr "%s-aluetta"
+
+#~ msgid "%s territory (%d turn cease-fire)"
+#~ msgid_plural "%s territory (%d turn cease-fire)"
+#~ msgstr[0] "%s alue (%d vuoron tulitauko)"
+#~ msgstr[1] "%s alue (%d vuoron tulitauko)"
+
+#~ msgid "%s territory (%s)"
+#~ msgstr "%s-aluetta (%s)"
+
+#~ msgid "City: %s (%s)"
+#~ msgstr "Kaupunki: %s (%s)"
+
+#~ msgid "Unit: %s (%s)"
+#~ msgstr "Yksikkö: %s (%s)"
+
+#~ msgid "Select same type"
+#~ msgstr "Valitse sama tyyppi"
+
+#~ msgid "The %s of the %s (%s)"
+#~ msgstr "%2$s: %1$s (%3$s)"
+
+#~ msgid ""
+#~ "Illegal alliance structure detected: %s alliance to %s reduced to peace "
+#~ "treaty."
+#~ msgstr ""
+#~ "Laiton %s liittorakenne havaittu: %s asetettu heidän kanssaan rauhaan."
+
+#~ msgid "And, became more experienced!"
+#~ msgstr "Ja on nyt kokeneempi!"
+
+#~ msgid "%s of the %s"
+#~ msgstr "%2$s: %1$s"
+
+#~ msgid "no maximum, "
+#~ msgstr "ei maksimia, "
+
+#~ msgid "%d unit maximum, "
+#~ msgid_plural "%d units maximum, "
+#~ msgstr[0] "enintään %d yksikkö, "
+#~ msgstr[1] "enintään %d yksikköä, "
+
+#~ msgid "%d per unit). "
+#~ msgstr "%d yksikköä kohden). "
+
+#~ msgid ""
+#~ "Couldn't find stdfont.ttf file. Please link/copy/move anyunicode ttf font "
+#~ "to data dir as stdfont.ttf"
+#~ msgstr ""
+#~ "Tiedostoa stdfont.ttf ei löytynyt. Ole hyvä ja linkitä/kopioi/siirrä mikä "
+#~ "tahansa Unicode-TTF-kirjasin data-hakemistoon nimellä stdfont.ttf"
+
+#~ msgid "Auth config filename \"%s\" not allowed!"
+#~ msgstr "Antamasi kirjautumisasetustiedoston nimi \"%s\" ei ole sallittu."
+
+#~ msgid "We can't take control of server, attempting to kill it."
+#~ msgstr "Palvelinta ei saada hallintaan, yritetään tappaa prosessi pois."
+
#~ msgid "Building Unavailable Item"
#~ msgstr "Rakennetaan kohdetta, jota ei saatavilla"
@@ -25371,10 +26070,6 @@ msgstr "Joukkue 31"
#~ msgid "Oceanic"
#~ msgstr "Meri"
-#, fuzzy
-#~ msgid "Base"
-#~ msgstr "Hukkaan"
-
#~ msgid "Freeciv version %s (%s)"
#~ msgstr "Freeciv-versio %s (%s)"
@@ -25431,21 +26126,6 @@ msgstr "Joukkue 31"
#~ "Siirrettiin %s pois hylätystä kaupungista %s koska se ei voi jäädä "
#~ "kohteeseen %s."
-#, fuzzy
-#~ msgid ""
-#~ "%s can't build %s from the worklist; only AI of level %s may build this. "
-#~ "Postponing..."
-#~ msgstr ""
-#~ "%s: työlistan projekti %s \"lykkäytyy\", koska vain %s voivat rakentaa "
-#~ "sen."
-
-#, fuzzy
-#~ msgid ""
-#~ "%s can't build %s from the worklist; %s terrain class is required. "
-#~ "Postponing..."
-#~ msgstr ""
-#~ "%s: Työlistan projekti %s lykkäytyy, koska maastotyyppi %s vaaditaan."
-
#~ msgid "%s's worklist is now empty."
#~ msgstr "%s: työlista rakennettu tyhjäksi."
@@ -25455,26 +26135,6 @@ msgstr "Joukkue 31"
#~ msgid "Celebrations cancelled in %s."
#~ msgstr "%s palaa arkeen, juhlallisuudet peruttu."
-#, fuzzy
-#~ msgid ""
-#~ "cheating\n"
-#~ "cheating <player-name>"
-#~ msgstr "create <pelaajan nimi>"
-
-#, fuzzy
-#~ msgid "Set one or all AI players to 'cheating'."
-#~ msgstr "Aseta yhden tai kaikkien AI-pelaajien vaikeustasoksi helppo."
-
-#, fuzzy
-#~ msgid ""
-#~ "With no arguments, sets all AI players to skill level 'cheating', and "
-#~ "sets the default level for any new AI players to 'cheating'. With an "
-#~ "argument, sets the skill level for that player only."
-#~ msgstr ""
-#~ "Ilman argumentteja komento asettaa kaikki AI-pelaajat vaikeustasolle "
-#~ "helppo ja asettaa tason uusien AI-pelaajien oletustasoksi. Muussa "
-#~ "tapauksessa vain kyseisen pelaajan vaikeustasoa muutetaan."
-
#~ msgid "%s Welcome"
#~ msgstr "%s Tervetuloa"
@@ -25515,19 +26175,9 @@ msgstr "Joukkue 31"
#~ msgid "Invalid username '%s'"
#~ msgstr "Kelvoton käyttäjätunnus '%s'"
-# Unliteral translation.
-#, fuzzy
-#~ msgid "%s was rejected: Invalid name [%s]."
-#~ msgstr "%s jätetty ulkopuolelle: epäyhteensopivat ohjelmistot."
-
#~ msgid "'%s' already connected."
#~ msgstr "'%s' on jo yhteydessä palvelimeen."
-# Unliteral translation.
-#, fuzzy
-#~ msgid "%s was rejected: Duplicate login name [%s]."
-#~ msgstr "%s jätetty ulkopuolelle: epäyhteensopivat ohjelmistot."
-
#~ msgid "You receive %s's worldmap."
#~ msgstr "%s näyttävät maailmankarttansa."
@@ -25613,94 +26263,17 @@ msgstr "Joukkue 31"
#~ msgid "Could not change city size."
#~ msgstr "Kaupungin koon muuttaminen epäonnistui."
-#, fuzzy
-#~ msgid "No units placed for %s!"
-#~ msgstr "Peli: Kansa valittu"
-
-#, fuzzy
-#~ msgid ""
-#~ "The capture of %s's capital and the 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 ""
-#~ "Peli: Kun %s menetti pääkaupunkinsa ja valtakunnan hallintorakenteet "
-#~ "tuhoutuivat,\n"
-#~ " sisällissota syttyi. Opportunistit tukevat vallankumousta ja %s,\n"
-#~ " nousukas, on saanut valtaansa %d kapinoivaa maakuntaa."
-
-#, fuzzy
-#~ msgid "%s report on the RICHEST Civilizations in the World %s."
-#~ msgstr "%s listaa maailman RIKKAIMMAT sivilisaatiot."
-
-#, fuzzy
-#~ msgid "%s report on the most ADVANCED Civilizations in the World %s."
-#~ msgstr "%s listaa maailman KEHITTYNEIMMÄT sivilisaatiot."
-
-#, fuzzy
-#~ msgid "%s report on the most MILITARIZED Civilizations in the World %s."
-#~ msgstr "%s listaa maailman MILITARISOITUNEIMMAT sivilisaatiot."
-
-#, fuzzy
-#~ msgid "%s report on the HAPPIEST Civilizations in the World %s."
-#~ msgstr "%s listaa maailman ONNELLISIMMAT sivilisaatiot."
-
-#, fuzzy
-#~ msgid "%s report on the LARGEST Civilizations in the World %s."
-#~ msgstr "%s listaa maailman SUURIMMAT sivilisaatiot."
-
#~ msgid ""
#~ "Illegal alliance structure detected: %s's alliance to %s reduced to peace "
#~ "treaty."
#~ msgstr "Laiton liittorakenne havaittu: %s ja %s asetettu rauhaan keskenään."
-#, fuzzy
-#~ msgid ""
-#~ "If non-zero, saved games will be compressed using zlib (gzip format) or "
-#~ "bzip2. Larger values will give better compression but take longer."
-#~ msgstr ""
-#~ "Jos arvo ei ole 0, tallennetut pelit pakataan käyttäen zlib:iä (gzip-"
-#~ "muodossa). Suuremmilla arvoilla tallennukset vievät vähemmän tilaa mutta "
-#~ "tallentamiseen kuluu enemmän aikaa. Jos suurin mahdollinen arvo on 0, "
-#~ "palvelin on käännetty ('compiled') niin että zlibin käyttöä ei "
-#~ "mahdollistettu."
-
-#, fuzzy
-#~ msgid "Savegame compression algorithm"
-#~ msgstr "Tallennetun pelin pakkaustaso"
-
-#, fuzzy
-#~ msgid ""
-#~ "Your client is too old. To use this server, please upgrade your client to "
-#~ "a Freeciv 2.2 or later."
-#~ msgstr ""
-#~ "Asiakasohjelmasi on liian vanha. Ole hyvä ja päivitä ohjelmasi joko "
-#~ "vähintään Freeciv-versioon 2.2 tai CVS-versioon, joka ei ole 28.11.2003:a "
-#~ "vanhempi."
-
-#, fuzzy
-#~ msgid ""
-#~ "Undefined arguments. Usage: debug < diplomacy <player> | city <x> <y> | "
-#~ "units <x> <y> | unit <id> | tech <player> | timing | info | ferries >."
-#~ msgstr ""
-#~ "Parametrejä ei ole määritelty. Käyttö: debug <diplomacy <pelaaja> | city "
-#~ "<x> <y> | units <x> <y> | unit <id> | tech <pelaaja> | timing | info>."
-
#~ msgid "%s's %s no longer debugged."
#~ msgstr "Pelaajan %s %s ei ole enää debugattavana."
#~ msgid "%s's %s debugged."
#~ msgstr "Pelaajan %s %s on debugattavana."
-#, fuzzy
-#~ msgid "Ferry system is no longer in debug mode."
-#~ msgstr "Peli: %s menetti yksikkönsä %s ydiniskussa."
-
-#, fuzzy
-#~ msgid ", %s"
-#~ msgstr "%s"
-
#~ msgid "Your bombarding %s%s became more experienced!"
#~ msgstr "Pommittajayksikkösi %s%s sai kokemusta!"
@@ -25802,10 +26375,6 @@ msgstr "Joukkue 31"
#~ msgid "Proceeding with sound support disabled."
#~ msgstr "Jatketaan äänituetta."
-#, fuzzy
-#~ msgid "Specialists: %s"
-#~ msgstr "Erikoistuneet"
-
#~ msgid ""
#~ "Requires the %s technology.\n"
#~ "\n"
@@ -25898,10 +26467,6 @@ msgstr "Joukkue 31"
#~ msgid " * Gets used up in making an attack.\n"
#~ msgstr " * Tuhoutuu hyökkäyksessä.\n"
-#, fuzzy
-#~ msgid "* Only barbarians may build this.\n"
-#~ msgstr "Peli: Tähän tarvitaan laskuvarjojääkäreitä."
-
#~ 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] "* Voi kantaa ja tankata %d yksikön luokista:\n"
@@ -25910,18 +26475,6 @@ msgstr "Joukkue 31"
#~ msgid " * %s units\n"
#~ msgstr " * %s yksikköä\n"
-#, fuzzy
-#~ msgid "* Can attack otherwise unreachable enemy units.\n"
-#~ msgstr "* Voi hyökätä vihollisen ilmavoimia vastaan.\n"
-
-#, fuzzy
-#~ msgid "* Counts as 'helicopter' against certain attackers.\n"
-#~ msgstr "* Lasketaan ratsastavaksi yksiköksi tiettyjä puolustajia vastaan.\n"
-
-#, fuzzy
-#~ msgid "* Very good at attacking 'helicopter' units.\n"
-#~ msgstr "Parhaat hyökkäysyksiköt"
-
#~ msgid "* Very bad at attacking AEGIS units.\n"
#~ msgstr "* Hyvin heikko hyökkäämään AEGIS-yksiköitä vastaan.\n"
@@ -25989,25 +26542,6 @@ msgstr "Joukkue 31"
#~ msgid "You were rejected from the game: %s"
#~ msgstr "Sinut poistettiin pelistä: %s"
-#, fuzzy
-#~ msgid "."
-#~ msgstr ". "
-
-#, fuzzy
-#~ msgid "Loading tileset \"%s\"."
-#~ msgstr "Lataan sääntökokoelmaa"
-
-#, fuzzy
-#~ msgid "Client does not support isometric tilesets."
-#~ msgstr ""
-#~ "Asiakasohjelma ei tue isometristä kuvitusta. Käytetään oletusasetuksia."
-
-#, fuzzy
-#~ msgid "Client does not support overhead view tilesets."
-#~ msgstr ""
-#~ "Asiakasohjelma ei tue ylhäältä nähtävää kuvitusta. Käytetään "
-#~ "oletusasetuksia."
-
#~ msgid " Choose Your Diplomat's Strategy"
#~ msgstr " Valitse diplomaattisi tehtävä"
@@ -26118,13 +26652,6 @@ msgstr "Joukkue 31"
#~ msgid "Editing _Tools"
#~ msgstr "Muokkaus_työkalut"
-#~ msgid "Select same type in tile"
-#~ msgstr "Valitse sama tyyppi kohdassa"
-
-#, fuzzy
-#~ msgid "_Editor"
-#~ msgstr "Muokkaa"
-
#~ msgid "_Edit Nation..."
#~ msgstr "_Muokkaa kansakuntaa..."
@@ -26143,675 +26670,6 @@ msgstr "Joukkue 31"
#~ msgid "Editor"
#~ msgstr "Muokkain"
-#, fuzzy
-#~ msgid ""
-#~ "Main Map (Keys):\n"
-#~ "================\n"
-#~ " Shift-home: center on capital\n"
-#~ " Shift-arrows: scroll map\n"
-#~ " Ctrl-G: show grid lines on/off\n"
-#~ " Ctrl-B: show national borders on/off\n"
-#~ " Ctrl-N: show city names on/off\n"
-#~ " Ctrl-R: show city growth on/off\n"
-#~ " Ctrl-P: show city production on/off\n"
-#~ msgstr ""
-#~ "Pääkartta (näppäimet):\n"
-#~ "======================\n"
-#~ " Shift-Home: keskitä pääkaupunkiin\n"
-#~ " Shift-nuolet: liikuta karttaa\n"
-#~ " Ctrl-G: näytä/piilota karttaruudukko\n"
-#~ " Ctrl-B: näytä/piilota valtiorajat\n"
-#~ " Ctrl-N: näytä/piilota kaupunkien nimet\n"
-#~ " Ctrl-R: näytä/piilota kaupungin kasvu\n"
-#~ " Ctrl-P: näytä/piilota kaupungin tuotanto\n"
-#~ " t: näytä kaupungin työläiset (hiiri kaupungin yllä/lähellä)\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "Main Map (Mouse):\n"
-#~ "=================\n"
-#~ " Left-click on city: Pop up city dialog\n"
-#~ " Left-click on unit: Activate unit\n"
-#~ " Left-click-and-drag on unit: Goto command for unit\n"
-#~ " Center-click: Show tile info\n"
-#~ " Right-click: Center tile in view\n"
-#~ "\n"
-#~ " Shift-Left-click: Copy production (GTK)\n"
-#~ " Shift-Right-click on city: Paste production into city (GTK)\n"
-#~ "\n"
-#~ " Shift-Control-Left-click: Adjust city workers\n"
-#~ " Control-Center-click: Wake up sentried units\n"
-#~ " Shift-Control-Right-click: Show city workers (mouse over or near "
-#~ "city)\n"
-#~ "\n"
-#~ " Area Selection mode (GTK):\n"
-#~ " ==========================\n"
-#~ " Right-click-and-drag: Enter Area Selection mode\n"
-#~ " Left-click: Toggle tile highlighting\n"
-#~ " Shift-Right-click: Paste production into highlighted cities\n"
-#~ " Right-click: Cancel Area Selection mode\n"
-#~ "\n"
-#~ " The cities that become highlighted on the map,\n"
-#~ " will also be highlighted in the City Report."
-#~ msgstr ""
-#~ "Pääkartta (hiiri):\n"
-#~ "==================\n"
-#~ " Vasen-klikkaa kaupunkia: Näytä kaupunkidialogi\n"
-#~ " Vasen-klikkaa yksikköä: Aktivoi yksikkö\n"
-#~ " Vasen-klikkaa-ja-raahaa yksikköä: Mene-komento yksikölle\n"
-#~ " Keski-klikkaa: Näytä ruudun tiedot\n"
-#~ " Oikea-klikkaa: Keskitä näkymä ruutuun\n"
-#~ "\n"
-#~ " Shift-vasen-klikkaa: Kopioi tuotanto (GTK)\n"
-#~ " Shift-oikea-klikkaa kaupunkia: Liitä tuotanto kaupunkiin (GTK)\n"
-#~ "\n"
-#~ " Shift-Ctrl-vasen-klikkaa: Muokkaa kaupungin työläisiä\n"
-#~ " Ctrl-keski-klikkaa: Herätä leiriytyneet yksiköt\n"
-#~ "\n"
-#~ " Alueenvalintamoodi (GTK):\n"
-#~ " =========================\n"
-#~ " Oikea-klikkaa-ja-raahaa: Siirry aluevalintamoodiin\n"
-#~ " Vasen-klikkaa: Ruudun korostus päälle/pois\n"
-#~ " Shift-oikea-klikkaa: Liitä tuotanto korostettuihin kaupunkeihin\n"
-#~ " Oikea-klikkaa: Peruuta aluevalintamoodi\n"
-#~ "\n"
-#~ " Kartalla korostetut kaupungit korostuvat myös kaupunkiraportissa."
-
-#, fuzzy
-#~ msgid ""
-#~ "Dialogs and Reports:\n"
-#~ "====================\n"
-#~ " F1: show Map View\n"
-#~ " F2: open Unit Report\n"
-#~ " F3: open Nations Report\n"
-#~ " F4: open City Report\n"
-#~ " F5: open Economy Report\n"
-#~ " F6: open Research Report\n"
-#~ " F7: open World Wonders\n"
-#~ " F8: open Top Five Cities\n"
-#~ " F9: open Messages dialog\n"
-#~ " F11: open Demographics\n"
-#~ " F12: open Spaceship\n"
-#~ "\n"
-#~ " T: open Tax/Lux/Sci Rates dialog\n"
-#~ " F: open Find City dialog\n"
-#~ " Ctrl-L: open Worklists dialog\n"
-#~ " R: open Revolution dialog\n"
-#~ "\n"
-#~ "Shift-Return: Turn done"
-#~ msgstr ""
-#~ "Dialogit ja raportit:\n"
-#~ "=====================\n"
-#~ " F1: avaa Kaupunkiraportti\n"
-#~ " F2: avaa Yksikköraportti\n"
-#~ " F3: avaa Pelaajadialogi\n"
-#~ " F5: avaa Talousraportti\n"
-#~ " F6: avaa Tiederaportti\n"
-#~ " F7: avaa Maailman ihmeet\n"
-#~ " F8: avaa Viisi huippukaupunkia\n"
-#~ " F9: avaa Viestidialogi\n"
-#~ " F11: avaa Tilastotietoja\n"
-#~ " F12: avaa Avaruusalus\n"
-#~ "\n"
-#~ " T: avaa Vero/Luksus/Tiede-tasodialogi\n"
-#~ " F: avaa Löydä kaupunki -dialogi\n"
-#~ " Ctrl-L: avaa Työlistat-dialogi\n"
-#~ "\n"
-#~ "Shift-Enter: Vuoro valmis"
-
-#, fuzzy
-#~ msgid ""
-#~ "Gives one extra food resource on all Oceanic squares. The city needs to "
-#~ "be coastal to build this improvement."
-#~ msgstr ""
-#~ "Ruuantuotanto lisääntyy yhdellä kaikissa meriruuduissa. Voidaan rakentaa "
-#~ "vain rannikkokaupunkeihin."
-
-#, 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 Power Plant, Hydro Plant, Nuclear Plant, or "
-#~ "Solar Plant. A city can only build a Hydro Plant if it is next to (or "
-#~ "on) a Mountain or River tile."
-#~ msgstr ""
-#~ "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."
-
-#, 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 Nuclear Plant together give a 75% production "
-#~ "bonus, and a Factory, Mfg. Plant and Nuclear Plant together give a 150% "
-#~ "production bonus.\n"
-#~ "\n"
-#~ "A city can only have one Power Plant, Hydro Plant, Nuclear Plant, or "
-#~ "Solar Plant."
-#~ msgstr ""
-#~ "Vähentää tuotannosta johtuvaa saastumista kaupungissa 50%. Lisää Tehtaan "
-#~ "ja Teollisuuskompleksin tuotantoa: Tehdas ja Ydinvoimala yhdessä antavat "
-#~ "75% lisän, ja Tehdas, Teollisuuskompleksi ja Ydinvoimala yhdessä antavat "
-#~ "150% bonuksen.\n"
-#~ "\n"
-#~ "Kaupungissa voi olla vain yksi voimalaitos."
-
-#, fuzzy
-#~ msgid ""
-#~ "Adds 1 extra shield resource on all Oceanic squares in a city. The city "
-#~ "needs to be coastal to build this improvement."
-#~ msgstr ""
-#~ "Kaikkien kaupungin meriruutujen tuotanto lisääntyy yhdellä. Voidaan "
-#~ "rakentaa vain rannikkokaupunkeihin."
-
-#, fuzzy
-#~ msgid ""
-#~ "Increases the shield production of a Factory or Mfg. Plant in a city: a "
-#~ "Factory and a Power Plant together give a 75% production bonus, and a "
-#~ "Factory, Mfg. Plant and Power Plant together give a 150% production "
-#~ "bonus. The extra production may lead to the city generating more "
-#~ "pollution.\n"
-#~ "\n"
-#~ "A city can only have one Power Plant, Hydro Plant, Nuclear Plant, or "
-#~ "Solar Plant."
-#~ msgstr ""
-#~ "Lisää Tehtaan ja Teollisuuskompleksin tuotantoa kaupungissa: Tehdas ja "
-#~ "Hiilivoimala yhdessä antavat 75% lisän ja Tehdas, Teollisuuskompleksi ja "
-#~ "Hiilivoimala tuottavat 150% lisäyksen. Lisääntynyt tuotanto saattaa "
-#~ "johtaa saastumisen kasvuun.\n"
-#~ "\n"
-#~ "Kaupungissa voi olla vain yksi voimalaitos."
-
-#, fuzzy
-#~ msgid ""
-#~ "Eliminates all pollution generated by production in a city. It also "
-#~ "increases the shield production of a Factory or Mfg. Plant in the city: a "
-#~ "Factory and a Solar Plant together give a 75% production bonus, and a "
-#~ "Factory, Mfg. Plant and Solar Plant together give a 150% production "
-#~ "bonus.\n"
-#~ "\n"
-#~ "A city can only have one Power Plant, Hydro Plant, Nuclear Plant, or "
-#~ "Solar Plant."
-#~ msgstr ""
-#~ "Poistaa kaupungin saastepäästöt kokonaan. Lisää myös kaupungissa olevan "
-#~ "tehtaan tai teollisuuskompleksin tuotantoa: Tehdas ja aurinkovoimala "
-#~ "yhdessä kaksinkertaistavat tuotannon, ja tehdas, teollisuuskompleksi ja "
-#~ "aurinkovoimala yhdessä lisäävät tuotantoa 150%.\n"
-#~ "\n"
-#~ "Kaupungissa voi olla vain yksi voimalaitos: Aurinkovoimala, vesivoimala, "
-#~ "hiilivoimala tai ydinvoimala."
-
-#, fuzzy
-#~ msgid ""
-#~ "Gives all your sea units 1 additional movement point. Makes all your new "
-#~ "sea units veterans (for all your cities)."
-#~ msgstr ""
-#~ "Antaa kaikille laivastoyksiköille yhden ylimääräisen liikepisteen, "
-#~ "eivätkä kaleerit enää katoa avoremelle. Kaikki uudet laivastoyksiköt "
-#~ "(kaikissa kaupungeissa) ovat konkareita."
-
-#, 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 100% production "
-#~ "bonus, and a Factory, Mfg. Plant and Hydro Plant together give a 150% "
-#~ "production bonus.\n"
-#~ "\n"
-#~ "A city can only have one Power Plant, Hydro Plant, Nuclear Plant, or "
-#~ "Solar Plant. A city can only build a Hydro Plant if it is next to (or "
-#~ "on) a Mountain or River tile."
-#~ msgstr ""
-#~ "Vähentää kaupungin aiheuttamaa saastumista 50%. Lisää kaupungissa olevan "
-#~ "tehtaan tai teollisuuskompleksin tuotantoa: Tehdas ja vesivoimalaitos "
-#~ "yhdessä kaksinkertaistavat tuotannon, ja tehdas, teollisuuskompleksi ja "
-#~ "vesivoimalaitos yhdessä lisäävät tuotantoa 150%.\n"
-#~ "\n"
-#~ "Kaupungissa voi olla vain yksi voimalaitos. Kaupunki voi rakentaa "
-#~ "vesivoimalan vain jos se sijaitsee joen varrella tai vuoren rinteellä "
-#~ "(so. samassa tai viereisessä ruudussa)."
-
-#, 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 Nuclear Plant together give a 100% "
-#~ "production bonus, and a Factory, Mfg. Plant and Nuclear Plant together "
-#~ "give a 150% production bonus.\n"
-#~ "\n"
-#~ "A city can only have one Power Plant, Hydro Plant, Nuclear Plant, or "
-#~ "Solar Plant."
-#~ msgstr ""
-#~ "Vähentää kaupungin aiheuttamaa saastumista 50%. Lisää kaupungissa olevan "
-#~ "tehtaan tai teollisuuskompleksin tuotantoa: Tehdas ja ydinvoimala yhdessä "
-#~ "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."
-
-#, fuzzy
-#~ msgid ""
-#~ "Increases the shield production of a Factory or Mfg. Plant in a city: a "
-#~ "Factory and a Power Plant together give a 100% production bonus, and a "
-#~ "Factory, Mfg. Plant and Power Plant together give a 150% production "
-#~ "bonus. The extra production may lead to the city generating more "
-#~ "pollution.\n"
-#~ "\n"
-#~ "A city can only have one Power Plant, Hydro Plant, Nuclear Plant, or "
-#~ "Solar Plant."
-#~ msgstr ""
-#~ "Lisää kaupungissa olevan tehtaan tai teollisuuskompleksin tuotantoa: "
-#~ "Tehdas ja hiilivoimala yhdessä kaksinkertaistavat tuotannon, ja tehdas, "
-#~ "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."
-
-#, fuzzy
-#~ msgid ""
-#~ "Eliminates all pollution generated by production in a city. It also "
-#~ "increases the shield production of a Factory or Mfg. Plant in the city: a "
-#~ "Factory and a Solar Plant together give a 100% production bonus, and a "
-#~ "Factory, Mfg. Plant and Solar Plant together give a 150% production "
-#~ "bonus.\n"
-#~ "\n"
-#~ "A city can only have one Power Plant, Hydro Plant, Nuclear Plant, or "
-#~ "Solar Plant."
-#~ msgstr ""
-#~ "Poistaa kaupungin saastepäästöt kokonaan. Lisää myös kaupungissa olevan "
-#~ "tehtaan tai teollisuuskompleksin tuotantoa: Tehdas ja aurinkovoimala "
-#~ "yhdessä kaksinkertaistavat tuotannon, ja tehdas, teollisuuskompleksi ja "
-#~ "aurinkovoimala yhdessä lisäävät tuotantoa 150%.\n"
-#~ "\n"
-#~ "Kaupungissa voi olla vain yksi voimalaitos: Aurinkovoimala, vesivoimala, "
-#~ "hiilivoimala tai ydinvoimala."
-
-#, fuzzy
-#~ msgid ""
-#~ "Gives all your sea units 1 additional movement point. Makes all your new "
-#~ "sea units veterans (for all cities)."
-#~ msgstr ""
-#~ "Antaa kaikille laivastoyksiköille yhden ylimääräisen liikepisteen, "
-#~ "eivätkä kaleerit enää katoa avoremelle. Kaikki uudet laivastoyksiköt "
-#~ "(kaikissa kaupungeissa) ovat konkareita."
-
-#, fuzzy
-#~ msgid ""
-#~ "Fundamentalism is a form of government organized around a central set of "
-#~ "beliefs. The beliefs, usually religious in nature, form a rigid guideline "
-#~ "for actions and reactions of both the rulers and the people.\n"
-#~ "\n"
-#~ "In a fundamentalist society, the people and the rulers are entirely "
-#~ "devoted to their beliefs, and are usually willing to die to preserve "
-#~ "them.\n"
-#~ "\n"
-#~ "Improvements that normally convert unhappy citizens to content citizens, "
-#~ "produce `tithes' (gold) equivalent to the number of people they would "
-#~ "convert, and require no maintenance."
-#~ msgstr ""
-#~ "Fundamentalismi on hallitusmuoto joka perustuu keskeisille uskomuksille. "
-#~ "Nämä useimmiten uskonnolliset uskomukset muodostavat jäykän sääntöjen "
-#~ "verkoston, joka rajoittaa sekä hallitsijan että kansalaisten toimia ja "
-#~ "vastatoimia.\n"
-#~ "\n"
-#~ "Fundamentalistisessa yhteiskunnassa kansa ja sen hallitsijat ovat täysin "
-#~ "omistautuneita uskomuksilleen ja ovat usein valmiita kuolemaan uskonsa "
-#~ "puolesta.\n"
-#~ "\n"
-#~ "Fundamentalismin aikana kaupunkisi voivat ylläpitää jopa 10 yksikköä "
-#~ "tuotannon lainkaan kärsimättä. (Sitä useammat yksiköt vähentävät "
-#~ "tuotantopanosta yksikön verran kukin, poikkeuksena fanaatikot.)\n"
-#~ "\n"
-#~ "Uudisraivaajat tarvitsevat 2 ruokaa/vuoro. \n"
-#~ "\n"
-#~ "Kun kaupunki juhlii, se saa bonuksena 1 pisteen kauppaa joka ruudulta "
-#~ "jossa jo tuotetaan vähintään 1 piste. Ks. myös Onnellisuus.\n"
-#~ "\n"
-#~ "Tieteen, verojen ja viihteen maksimitaso on 80%.\n"
-#~ "\n"
-#~ "Tieteen suurin mahdollinen taso käytännössä on 50%, loput käytetään "
-#~ "verojen keräämiseen. Tieteen tuotanto puolittuu tämän lisäksi.\n"
-#~ "\n"
-#~ "Fundamentalismin aikana kaupungit kärsivät vähäisestä lahjonnasta.\n"
-#~ "\n"
-#~ "Rakennukset jotka tavallisesti muuttavat tyytymättömiä asukkaita "
-#~ "rauhallisiksi, tuottavat 'kymmenyksiä' (kultaa), joiden määrä vastaa sitä "
-#~ "kuinka monen asukkaan mieltä ne muuttaisivat. Näillä rakennuksilla ei ole "
-#~ "ylläpitokustannuksia."
-
-#, fuzzy
-#~ msgid ""
-#~ "The %s have acquired %s from ancient scrolls of "
-#~ "wisdom."
-#~ msgstr "Peli: %s ovat oppineet teknologian %s muinaisista kirjoituksista."
-
-#~ msgid "Water"
-#~ msgstr "vesi"
-
-#~ msgid "Lake"
-#~ msgstr "järvi"
-
-#, fuzzy
-#~ msgid "Oceanic Vent"
-#~ msgstr "valtameri"
-
-#, fuzzy
-#~ msgid "Desert hills"
-#~ msgstr "autiomaa"
-
-#, fuzzy
-#~ msgid "Alpine forest"
-#~ msgstr "Alppijääkärit"
-
-#, fuzzy
-#~ msgid "Forested hills"
-#~ msgstr "metsä"
-
-#, fuzzy
-#~ msgid "Glacial peaks"
-#~ msgstr "jäätikkö"
-
-#~ msgid "Tropical swamp"
-#~ msgstr "trooppinen suo"
-
-#~ msgid "Alpine tundra"
-#~ msgstr "alppitundra"
-
-#~ msgid "Volcano"
-#~ msgstr "tulivuori"
-
-#, fuzzy
-#~ msgid ""
-#~ "This unit may be built from the start of the game. It is the weakest "
-#~ "offensive unit."
-#~ msgstr ""
-#~ "Näitä yksiköitä voi valmistaa heti pelin alussa. Se on kaikkein heikoin "
-#~ "sotilasyksikkö."
-
-#, fuzzy
-#~ msgid ""
-#~ "Partisans are guerilla fighters who are experts at using the terrain to "
-#~ "their advantage.\n"
-#~ "\n"
-#~ "A number of Partisans are granted free when an enemy conquers your city, "
-#~ "but only under these conditions:\n"
-#~ "\n"
-#~ " - Guerilla Warfare must be known by at least 1 player.\n"
-#~ "\n"
-#~ " - You must be the player who originally built the city.\n"
-#~ "\n"
-#~ " - You must know about Communism and Gunpowder.\n"
-#~ "\n"
-#~ " - You must run either a Democracy or a Communist government."
-#~ msgstr ""
-#~ "Saat muutaman sissiryhmän ilmaiseksi vihollisen vallatessa kaupunkisi, "
-#~ "jos seuraavat ehdot täyttyvät:\n"
-#~ "\n"
-#~ " - Vähintään yhden pelaajan on tunnettava sissisota.\n"
-#~ "\n"
-#~ " - Sinun on oltava kaupungin alkuperäinen perustaja.\n"
-#~ "\n"
-#~ " - Sinun on tunnettava kommunismi ja ruuti.\n"
-#~ "\n"
-#~ " - Hallitusmuotosi on oltava joko kommunismi tai demokratia."
-
-#, fuzzy
-#~ msgid ""
-#~ "The Mechanized Infantry has the strongest defensive strength of any land "
-#~ "unit, but is only available near the end of the technology tree."
-#~ msgstr ""
-#~ "Panssaroitu jalkaväki; tämän yksikön puolustuskyky on maavoimien suurin, "
-#~ "mutta se on käytettävissä vasta aivan pelin loppuvaiheessa."
-
-#, fuzzy
-#~ msgid ""
-#~ "An improved Ironclad, with better move rate and vision.\n"
-#~ "\n"
-#~ "TIP: A very fast unit, which is very useful for hunting down enemy "
-#~ "Transports."
-#~ msgstr ""
-#~ "VIHJE: Erittäin nopea alus, joka sopii hyvin vihollisen kuljetusalusten "
-#~ "tuhoamiseen."
-
-#, fuzzy
-#~ msgid ""
-#~ "Traveling under the surface of the ocean, Submarines have a very high "
-#~ "strategic value, but a weak defense if caught off guard."
-#~ msgstr ""
-#~ "Sukellusveneillä on paljon strategista arvoa, mutta ne ovat heikkoja "
-#~ "puolustautumaan."
-
-#, fuzzy
-#~ msgid ""
-#~ "The Carrier is a mobile airport and cannot attack other units on its "
-#~ "own.\n"
-#~ "\n"
-#~ "TIP: Guard Carriers with a handful of fast-moving ships and a "
-#~ "battleship, as losing a fully-equipped Carrier is VERY painful and "
-#~ "expensive."
-#~ msgstr ""
-#~ "VIHJE: Suojele tukialuksiasi taistelulaivalla ja muutamalla nopealla "
-#~ "aluksella, koska täyteen kuormatun tukialuksen menettäminen on ERITTÄIN "
-#~ "tuskallista ja kallista."
-
-#, fuzzy
-#~ msgid ""
-#~ "The Cruise Missile is a long-distance missile that can strike deep into "
-#~ "enemy territory.\n"
-#~ "\n"
-#~ "TIP: A handful of these can successfully keep the waters around your "
-#~ "treasured homeland free of enemy ships."
-#~ msgstr ""
-#~ "VIHJE: kourallinen risteilyohjuksia voi pitää kallisarvoisen kotimaasi "
-#~ "lähivedet vapaina vihollisen aluksista."
-
-#, 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 "
-#~ "operations with the intent of harming your opponents.\n"
-#~ "\n"
-#~ "- 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 ""
-#~ " - Diplomaatit voivat perustaa lähetystöjä muihin sivilisaatioihin "
-#~ "menemällä toisten pelaajien kaupunkeihin.\n"
-#~ "\n"
-#~ " - Diplomaatit voivat myös yrittää sabotoida vihollisen tuotantoa tai "
-#~ "varastaa teknologiaa vihollisen kaupungista. (Teknologiaa voidaan "
-#~ "varastaa yhdestä kaupungista vain kerran).\n"
-#~ "\n"
-#~ " - Diplomaatti voi myös lahjoa vihollisen sotilasyksikön, jos se on ainoa "
-#~ "yksikkö ruudullaan.\n"
-#~ "\n"
-#~ " - Diplomaatti voi jopa käännyttää vihollisen kaupungin omaksesi, jos "
-#~ "sinulla on tarpeeksi rahaa tehtävän toteuttamiseksi!\n"
-#~ "\n"
-#~ " - Joissakin pelistrategioissa diplomaattilaumoja käytetään tekemään "
-#~ "tuhojaan vihollisen keskuudessa. Eipä ihmekään, että diplomaatteja usein "
-#~ "katsotaan epäillen ja pelolla!"
-
-#, fuzzy
-#~ msgid ""
-#~ "A Caravan carries goods or material for trading with foreign countries, "
-#~ "or to help building wonders in your cities.\n"
-#~ "\n"
-#~ "Every Caravan that is used to build a wonder will add 50 shields towards "
-#~ "the production of the wonder.\n"
-#~ "\n"
-#~ "TIP: You can stockpile a stack of Caravans in advance and bring them all "
-#~ "into a city where you have started to build a wonder, and finish it in "
-#~ "only one turn!"
-#~ msgstr ""
-#~ "Jokainen karavaani, jota käytetään ihmeen rakentamiseen, lisää 50 raaka-"
-#~ "aineyksikköä sen tuotantoon.\n"
-#~ "\n"
-#~ "VIHJE: Voit varastoida karavaaneja etukäteen ja tuoda ne sitten kaikki "
-#~ "kaupunkiin, johon olet alkanut rakentaa ihmettä. Näin voit saada ihmeen "
-#~ "valmiiksi yhden vuoron aikana!"
-
-#, fuzzy
-#~ msgid ""
-#~ "Explorers are brave individuals that are very useful for mapping unknown "
-#~ "territory."
-#~ msgstr ""
-#~ "Seikkailijat ovat erittäin hyödyllisiä tuntemattomien alueiden "
-#~ "kartoituksessa."
-
-#, fuzzy
-#~ msgid ""
-#~ "One Barbarian Leader appears every time there is a barbarian uprising "
-#~ "somewhere in the world.\n"
-#~ "\n"
-#~ "When a Barbarian Leader is killed on a tile without any defending units, "
-#~ "the 100 gold ransom is paid, but only to land units and helicopters."
-#~ msgstr ""
-#~ "Kun barbaarijohtaja siepataan ruudulta, jolla ei ole lainkaan puolustavia "
-#~ "yksiköitä, maksetaan hänestä 100 yksikön lunnaat kultana, mutta vain "
-#~ "maavoimien yksiköille ja helikoptereille."
-
-#, fuzzy
-#~ msgid ""
-#~ "Fanatics are warriors extremely devoted to a higher cause.\n"
-#~ "\n"
-#~ "Fundamentalist nations can maintain Fanatic units without having to pay "
-#~ "any shields for upkeep."
-#~ msgstr ""
-#~ "Vain fundamentalistivaltiot voivat rakentaa fanaatikkoyksiköitä.\n"
-#~ "\n"
-#~ "Fundamentalistivaltioiden ei tarvitse maksaa ylläpitokustannuksia "
-#~ "fanaatikkoyksiköistä."
-
-#, fuzzy
-#~ msgid ""
-#~ "One Barbarian Leader appears every time there is a barbarian uprising "
-#~ "somewhere in the world.\n"
-#~ "\n"
-#~ "When barbarian leader is killed on a tile without any defending units, "
-#~ "the 100 gold ransom is paid, but only to land units and helicopters."
-#~ msgstr ""
-#~ "Kun barbaarijohtaja siepataan ruudulta, jolla ei ole lainkaan puolustavia "
-#~ "yksiköitä, maksetaan hänestä 100 yksikön lunnaat kultana, mutta vain "
-#~ "maavoimien yksiköille ja helikoptereille."
-
-#, fuzzy
-#~ msgid ""
-#~ "One Barbarian Leader appears every time there is a barbarian uprising "
-#~ "somewhere in the world.\n"
-#~ "\n"
-#~ "When barbarian leader is killed on a tile without any defending units, "
-#~ "the 100 gold ransom is paid, but only to land units."
-#~ msgstr ""
-#~ "Kun barbaarijohtaja siepataan ruudulta, jolla ei ole puolustavia "
-#~ "yksiköitä, maksetaan hänestä sadan yksikön lunnaat, mutta vain maavoimien "
-#~ "yksiköille."
-
-#, fuzzy
-#~ msgid "?female:Prime Minister"
-#~ msgstr "Pääministeri"
-
-#, fuzzy
-#~ msgid "Ainu"
-#~ msgstr "Aasialainen"
-
-#, fuzzy
-#~ msgid "?plural:Ainu"
-#~ msgstr "?plural:suomalaiset"
-
-#, fuzzy
-#~ msgid "?plural:Akwe"
-#~ msgstr "?plural:atsteekit"
-
-#, fuzzy
-#~ msgid "He'a"
-#~ msgstr "Atamaani"
-
-#, fuzzy
-#~ msgid "?female:Speaker"
-#~ msgstr "Vallankaappaaja"
-
-#, fuzzy
-#~ msgid "?female:Reverend"
-#~ msgstr "kunnianarvoisa"
-
-#, fuzzy
-#~ msgid "Aymara"
-#~ msgstr "arabien"
-
-#, fuzzy
-#~ msgid "?plural:Aymaras"
-#~ msgstr "?plural:arabit"
-
-#, fuzzy
-#~ msgid "Jiliri"
-#~ msgstr "Miliisi"
-
-#, fuzzy
-#~ msgid "Mallku"
-#~ msgstr "Mies"
-
-#, fuzzy
-#~ msgid "Ttalla"
-#~ msgstr "Yhteensä"
-
-#, fuzzy
-#~ msgid "Willka"
-#~ msgstr "Turmele"
-
-#, fuzzy
-#~ msgid "Tata"
-#~ msgstr "Sissiryhmä"
-
-#, fuzzy
-#~ msgid "Mama"
-#~ msgstr "Alas"
-
-#, fuzzy
-#~ msgid "Markachiri"
-#~ msgstr "maaliskuu"
-
-#, fuzzy
-#~ msgid "Azeri"
-#~ msgstr "yhdysvaltalaisten"
-
-#, fuzzy
-#~ msgid "?plural:Azeris"
-#~ msgstr "?plural:atsteekit"
-
-#, fuzzy
-#~ msgid "Khatan"
-#~ msgstr "Kaani"
-
-#, fuzzy
-#~ msgid "?plural:Basques"
-#~ msgstr "?plural:turkkilaiset"
-
#~ msgid "Buruzagi"
#~ msgstr "Buruzagi"
@@ -26836,158 +26694,6 @@ msgstr "Joukkue 31"
#~ msgid "?female:Lehendakari"
#~ msgstr "Lehendakari"
-#, fuzzy
-#~ msgid "Belarusian"
-#~ msgstr "unkarilaisten"
-
-#, fuzzy
-#~ msgid "?plural:Belarusians"
-#~ msgstr "?plural:unkarilaiset"
-
-#, fuzzy
-#~ msgid "?female:Nabob"
-#~ msgstr "Konsuli"
-
-#, fuzzy
-#~ msgid "?female:Major"
-#~ msgstr "Toveri"
-
-#, fuzzy
-#~ msgid "Bosnian-Herzegovinian"
-#~ msgstr "bosnia-hertsegovinalaisten"
-
-#, fuzzy
-#~ msgid "?female:Director-President"
-#~ msgstr "Johtaja-Presidentti"
-
-#, fuzzy
-#~ msgid "Breton"
-#~ msgstr "buurien"
-
-#, fuzzy
-#~ msgid "?plural:Bretons"
-#~ msgstr "?plural:baijerilaiset"
-
-#, fuzzy
-#~ msgid "Roue"
-#~ msgstr "luonnonvaroja"
-
-#, fuzzy
-#~ msgid "Rouanez"
-#~ msgstr "roomalaisten"
-
-#, fuzzy
-#~ msgid "Burgundian"
-#~ msgstr "unkarilaisten"
-
-#, fuzzy
-#~ msgid "?plural:Burgundians"
-#~ msgstr "?plural:baijerilaiset"
-
-#, fuzzy
-#~ msgid "Margrave"
-#~ msgstr "Karaveli"
-
-#, fuzzy
-#~ msgid "Margravine"
-#~ msgstr "Merijalkaväki"
-
-#, fuzzy
-#~ msgid "?female:Bohmugyi"
-#~ msgstr "Konsuli"
-
-#, fuzzy
-#~ msgid "?plural:Burundi"
-#~ msgstr "?plural:baijerilaiset"
-
-#, fuzzy
-#~ msgid "Mwami"
-#~ msgstr "Alas"
-
-#, fuzzy
-#~ msgid "Mwamikazi"
-#~ msgstr "Miliisi"
-
-#, fuzzy
-#~ msgid "?female:Basileus"
-#~ msgstr "keidas"
-
-#, fuzzy
-#~ msgid "Cambodian"
-#~ msgstr "kanadalaisten"
-
-#, fuzzy
-#~ msgid "?plural:Cambodians"
-#~ msgstr "?plural:kanadalaiset"
-
-#, fuzzy
-#~ msgid "?plural:Cherokees"
-#~ msgstr "?plural:kreikkalaiset"
-
-#~ msgid "?female:Great Chief"
-#~ msgstr "Suuri päällikkö"
-
-#, fuzzy
-#~ msgid "Principal Chief"
-#~ msgstr "Suuri päällikkö"
-
-#, fuzzy
-#~ msgid "?female:Principal Chief"
-#~ msgstr "Presidentti"
-
-#, fuzzy
-#~ msgid "Chola"
-#~ msgstr "hiiltä"
-
-#, fuzzy
-#~ msgid "?plural:Cholas"
-#~ msgstr "?plural:chileläiset"
-
-#~ msgid "?female:Chieftain"
-#~ msgstr "heimopäällikkö"
-
-#, fuzzy
-#~ msgid "Cree"
-#~ msgstr "Aikaista"
-
-#, fuzzy
-#~ msgid "?plural:Cree"
-#~ msgstr "?plural:kreikkalaiset"
-
-#, fuzzy
-#~ msgid "Dominican"
-#~ msgstr "roomalaisten"
-
-#, fuzzy
-#~ msgid "?plural:Dominican"
-#~ msgstr "?plural:roomalaiset"
-
-#~ msgid "?female:Pharaoh"
-#~ msgstr "Faarao"
-
-#~ msgid "?female:Great Pharaoh"
-#~ msgstr "Suuri Faarao"
-
-#, fuzzy
-#~ msgid "?plural:Emiratis"
-#~ msgstr "?plural:irlantilaiset"
-
-#, fuzzy
-#~ msgid "Sheikh"
-#~ msgstr "ruotsalaisten"
-
-#, fuzzy
-#~ msgid "Sheikhah"
-#~ msgstr "Shaahi"
-
-#, fuzzy
-#~ msgid "Esperant"
-#~ msgstr "Eurooppalainen"
-
-#, fuzzy
-#~ msgid "?plural:Esperants"
-#~ msgstr "?plural:korealaiset"
-
#~ msgid "European"
#~ msgstr "Eurooppalainen"
@@ -27016,14 +26722,6 @@ msgstr "Joukkue 31"
#~ msgid "?female:Archbishop"
#~ msgstr "Arkkipiispa"
-#, fuzzy
-#~ msgid "Don"
-#~ msgstr "Valmis"
-
-#, fuzzy
-#~ msgid "Dona"
-#~ msgstr "Alas"
-
#~ msgid "?female:Druid"
#~ msgstr "druidi"
@@ -27036,14 +26734,6 @@ msgstr "Joukkue 31"
#~ msgid "?female:Despot"
#~ msgstr "Yksinvaltias"
-#, fuzzy
-#~ msgid "?plural:Gupta"
-#~ msgstr "?plural:hollantilaiset"
-
-#, fuzzy
-#~ msgid "Maharajadhiraja"
-#~ msgstr "Maharadja"
-
#~ msgid "Hacker"
#~ msgstr "hakkerien"
@@ -27053,628 +26743,9 @@ msgstr "Joukkue 31"
#~ msgid "h4xx0r r0xx0rz!"
#~ msgstr "h4xx0rit r0xx0rz!"
-#, fuzzy
-#~ msgid "?title:Hacker"
-#~ msgstr "Kansansurmahenkinen"
-
-#~ msgid "?female:Hacker"
-#~ msgstr "Hakkeri"
-
-#, fuzzy
-#~ msgid "Hawaiian"
-#~ msgstr "odottaa"
-
-#, fuzzy
-#~ msgid "?plural:Hawaiians"
-#~ msgstr "?plural:baijerilaiset"
-
-#, fuzzy
-#~ msgid "Himyarite"
-#~ msgstr "Aktivoi"
-
-#, fuzzy
-#~ msgid "?plural:Himyar"
-#~ msgstr "?plural:arabit"
-
-#, fuzzy
-#~ msgid "?plural:Hopis"
-#~ msgstr "?plural:cornwallilaiset"
-
-#, fuzzy
-#~ msgid "Kikmongwi"
-#~ msgstr "Kuningas"
-
-#, fuzzy
-#~ msgid "Inka"
-#~ msgstr "inkojen"
-
-#, fuzzy
-#~ msgid "Sapa Inka"
-#~ msgstr "inkojen"
-
-#, fuzzy
-#~ msgid "Willaq Umu"
-#~ msgstr "Turmele"
-
-#, fuzzy
-#~ msgid "?female:Raja"
-#~ msgstr "Toveri"
-
-#, fuzzy
-#~ msgid "?female:Maharaja"
-#~ msgstr "Maharadja"
-
-#, fuzzy
-#~ msgid "?female:Mahatma"
-#~ msgstr "Toveri"
-
-#, fuzzy
-#~ msgid "?female:Shaman"
-#~ msgstr "Toveri"
-
-#, fuzzy
-#~ msgid "?female:Great Shaman"
-#~ msgstr "Suurkaani"
-
-#, fuzzy
-#~ msgid "Iranian"
-#~ msgstr "intialaisten"
-
-#, fuzzy
-#~ msgid "?plural:Iranians"
-#~ msgstr "?plural:intialaiset"
-
#~ msgid "Dictatress"
#~ msgstr "Diktaattori"
-# Taoiseach *vastaa* pääministeriä, mutta sille ei liene suomenkielistä nimeä.
-#, fuzzy
-#~ msgid "?female:Taoiseach"
-#~ msgstr "Pääministeri"
-
-#, fuzzy
-#~ msgid "?plural:Kanem-Bornu"
-#~ msgstr "?plural:korealaiset"
-
-#, fuzzy
-#~ msgid "Mai"
-#~ msgstr "Sissiryhmä"
-
-#, fuzzy
-#~ msgid "?plural:Kazakhs"
-#~ msgstr "?plural:italialaiset"
-
-#, fuzzy
-#~ msgid "Khwarezmian"
-#~ msgstr "Puheenjohtaja"
-
-#, fuzzy
-#~ msgid "?plural:Khwarezmians"
-#~ msgstr "?plural:korealaiset"
-
-#, fuzzy
-#~ msgid "Kongo"
-#~ msgstr "mongolien"
-
-#, fuzzy
-#~ msgid "?plural:Kongo"
-#~ msgstr "?plural:mongolit"
-
-#, fuzzy
-#~ msgid "Manikongo"
-#~ msgstr "Mylly"
-
-#, fuzzy
-#~ msgid "Kurdish"
-#~ msgstr "irlantilaisten"
-
-#, fuzzy
-#~ msgid "?plural:Kurds"
-#~ msgstr "?plural:turkkilaiset"
-
-#~ msgid "Asian"
-#~ msgstr "Aasialainen"
-
-#, fuzzy
-#~ msgid "Medieval"
-#~ msgstr "keskinkertaiset"
-
-#, fuzzy
-#~ msgid "?plural:Kyrgyzs"
-#~ msgstr "?plural:arabit"
-
-#~ msgid "?female:Governor"
-#~ msgstr "Kuvernööri"
-
-#~ msgid "?female:Supreme Commander"
-#~ msgstr "Ylikomentaja"
-
-#, fuzzy
-#~ msgid "Laotian"
-#~ msgstr "latvialaisten"
-
-#, fuzzy
-#~ msgid "?plural:Laotians"
-#~ msgstr "?plural:latvialaiset"
-
-#, fuzzy
-#~ msgid "Lojbanistani"
-#~ msgstr "roomalaisten"
-
-#, fuzzy
-#~ msgid "?plural:Lojbanistanis"
-#~ msgstr "?plural:roomalaiset"
-
-#, fuzzy
-#~ msgid "?plural:Majapahit"
-#~ msgstr "?plural:italialaiset"
-
-#, fuzzy
-#~ msgid "Mahapatih"
-#~ msgstr "Maharadja"
-
-#, fuzzy
-#~ msgid "?female:High Commissioner"
-#~ msgstr "Toveri"
-
-#, fuzzy
-#~ msgid "Mapuche"
-#~ msgstr "kamputsealaisten"
-
-#, fuzzy
-#~ msgid "?plural:Mapuche"
-#~ msgstr "?plural:korealaiset"
-
-#, fuzzy
-#~ msgid "Toqui"
-#~ msgstr "irlantilaisten"
-
-#, fuzzy
-#~ msgid "Lonko"
-#~ msgstr "Lukitse"
-
-#, fuzzy
-#~ msgid "Machi"
-#~ msgstr "maaliskuu"
-
-#, fuzzy
-#~ msgid "?female:Ajaw"
-#~ msgstr "Toveri"
-
-#, fuzzy
-#~ msgid "?female:Ah kin"
-#~ msgstr "Konsuli"
-
-#, fuzzy
-#~ msgid "?plural:Moldovans"
-#~ msgstr "?plural:italialaiset"
-
-#, fuzzy
-#~ msgid "?female:Khan"
-#~ msgstr "Konsuli"
-
-#, fuzzy
-#~ msgid "?female:Khagan"
-#~ msgstr "Konsuli"
-
-#, fuzzy
-#~ msgid "Muskogee"
-#~ msgstr "Musketöörit"
-
-#, fuzzy
-#~ msgid "?plural:Muskogee"
-#~ msgstr "?plural:turkkilaiset"
-
-#, fuzzy
-#~ msgid "Norman"
-#~ msgstr "Kunnioitettava"
-
-#, fuzzy
-#~ msgid "?plural:Normans"
-#~ msgstr "?plural:roomalaiset"
-
-#, fuzzy
-#~ msgid "Jarl"
-#~ msgstr "Partioi"
-
-#, fuzzy
-#~ msgid "?female:Jarl"
-#~ msgstr "Toveri"
-
-#, fuzzy
-#~ msgid "North Korean"
-#~ msgstr "korealaisten"
-
-#, fuzzy
-#~ msgid "?plural:North Koreans"
-#~ msgstr "?plural:korealaiset"
-
-#, fuzzy
-#~ msgid "Nubian"
-#~ msgstr "Taistelu"
-
-#, fuzzy
-#~ msgid "?plural:Nubians"
-#~ msgstr "?plural:roomalaiset"
-
-#, fuzzy
-#~ msgid "Numidian"
-#~ msgstr "serbien"
-
-#, fuzzy
-#~ msgid "?plural:Numidians"
-#~ msgstr "?plural:persialaiset"
-
-#, fuzzy
-#~ msgid "?plural:Nuu-chah-nulth"
-#~ msgstr "?plural:korealaiset"
-
-#, fuzzy
-#~ msgid "Chaabat"
-#~ msgstr "Sotavaunut"
-
-#, fuzzy
-#~ msgid "Pakistani"
-#~ msgstr "Sissiryhmä"
-
-#, fuzzy
-#~ msgid "?plural:Pakistanis"
-#~ msgstr "?plural:roomalaiset"
-
-#, fuzzy
-#~ msgid "Peruvian"
-#~ msgstr "persialaisten"
-
-#, fuzzy
-#~ msgid "?plural:Peruvians"
-#~ msgstr "?plural:persialaiset"
-
-#, fuzzy
-#~ msgid "Protector"
-#~ msgstr "Valtionhoitaja"
-
-#, fuzzy
-#~ msgid "Milk"
-#~ msgstr "silkkiä"
-
-#, fuzzy
-#~ msgid "Milkot"
-#~ msgstr "Miliisi"
-
-#, fuzzy
-#~ msgid "Pirate"
-#~ msgstr "Lentotukikohta"
-
-#, fuzzy
-#~ msgid "?plural:Pirates"
-#~ msgstr "?plural:portugalilaiset"
-
-#, fuzzy
-#~ msgid "?female:Prymas"
-#~ msgstr "Presidentti"
-
-#, fuzzy
-#~ msgid "?female:Pierwszy Sekretarz"
-#~ msgstr "Pääsihteeri"
-
-#, fuzzy
-#~ msgid "Polynesian"
-#~ msgstr "persialaisten"
-
-#, fuzzy
-#~ msgid "?plural:Polynesian"
-#~ msgstr "?plural:puolalaiset"
-
-#, fuzzy
-#~ msgid "Prussian"
-#~ msgstr "persialaisten"
-
-#, fuzzy
-#~ msgid "?plural:Prussians"
-#~ msgstr "?plural:persialaiset"
-
-#, fuzzy
-#~ msgid "Grand Master"
-#~ msgstr "Viljavarasto"
-
-#, fuzzy
-#~ msgid "Elector"
-#~ msgstr "Sähkö"
-
-#, fuzzy
-#~ msgid "?plural:P'urhepecha"
-#~ msgstr "?plural:ranskalaiset"
-
-#, fuzzy
-#~ msgid "Caconzi"
-#~ msgstr "Kanuuna"
-
-#, fuzzy
-#~ msgid "Rwandan"
-#~ msgstr "kanadalaisten"
-
-#, fuzzy
-#~ msgid "?plural:Rwandans"
-#~ msgstr "?plural:kanadalaiset"
-
-#, fuzzy
-#~ msgid "?female:Noaydde"
-#~ msgstr "Toveri"
-
-#, fuzzy
-#~ msgid "Samogitian"
-#~ msgstr "Puheenjohtaja"
-
-#, fuzzy
-#~ msgid "?plural:Samogitians"
-#~ msgstr "?plural:latvialaiset"
-
-#, fuzzy
-#~ msgid "?female:First Minister"
-#~ msgstr "Pääministeri"
-
-#, fuzzy
-#~ msgid "?female:Encik"
-#~ msgstr "Konsuli"
-
-#, fuzzy
-#~ msgid "?female:Leader"
-#~ msgstr "Toveri"
-
-#, fuzzy
-#~ msgid "?female:General Secretary"
-#~ msgstr "Pääsihteeri"
-
-#, fuzzy
-#~ msgid "South Korean"
-#~ msgstr "yhdysvaltalaisten"
-
-#, fuzzy
-#~ msgid "?plural:South Koreans"
-#~ msgstr "?plural:yhdysvaltalaiset"
-
-#, fuzzy
-#~ msgid "?female:Great Leader"
-#~ msgstr "Ihme"
-
-#~ msgid "?female:Cardinal"
-#~ msgstr "Kardinaali"
-
-#, fuzzy
-#~ msgid "?plural:Sri Vijaya"
-#~ msgstr "?plural:italialaiset"
-
-#, fuzzy
-#~ msgid "Datu"
-#~ msgstr "Tila"
-
-#, fuzzy
-#~ msgid "Nin"
-#~ msgstr "Kansakunta"
-
-#, fuzzy
-#~ msgid "Sanga"
-#~ msgstr "Puheenjohtaja"
-
-#~ msgid "?female:General"
-#~ msgstr "Kenraali"
-
-#~ msgid "?female:Bailiff"
-#~ msgstr "Vouti"
-
-#~ msgid "?female:Federal Chancellor"
-#~ msgstr "Liittovaltion kansleri"
-
-#, fuzzy
-#~ msgid "Syrian"
-#~ msgstr "serbien"
-
-#, fuzzy
-#~ msgid "?plural:Syrians"
-#~ msgstr "?plural:serbit"
-
-#, fuzzy
-#~ msgid "Taino"
-#~ msgstr "Maasto"
-
-#, fuzzy
-#~ msgid "?plural:Taino"
-#~ msgstr "?plural:thait"
-
-#, fuzzy
-#~ msgid "Cacike"
-#~ msgstr "Peru"
-
-#, fuzzy
-#~ msgid "Bohike"
-#~ msgstr "buurien"
-
-#, fuzzy
-#~ msgid "Tairona"
-#~ msgstr "Rautatie"
-
-#, fuzzy
-#~ msgid "?plural:Tairona"
-#~ msgstr "?plural:thait"
-
-#, fuzzy
-#~ msgid "Hankwa"
-#~ msgstr "toukokuu"
-
-#, fuzzy
-#~ msgid "Tajik"
-#~ msgstr "thaimaalaisten"
-
-#, fuzzy
-#~ msgid "?plural:Tajiks"
-#~ msgstr "?plural:thait"
-
-#, fuzzy
-#~ msgid "Knights Templar"
-#~ msgstr "Ritarit"
-
-#, fuzzy
-#~ msgid "?plural:Templars"
-#~ msgstr "?plural:yhdysvaltalaiset"
-
-#, fuzzy
-#~ msgid "Grand Mistress"
-#~ msgstr "Viljavarasto"
-
-#, fuzzy
-#~ msgid "Thracian"
-#~ msgstr "Maasto"
-
-#, fuzzy
-#~ msgid "?plural:Thracians"
-#~ msgstr "?plural:intialaiset"
-
-#, fuzzy
-#~ msgid "Rhesos"
-#~ msgstr "luonnonvaroja"
-
-#, fuzzy
-#~ msgid "Dharma King"
-#~ msgstr "Puheenjohtaja"
-
-#, fuzzy
-#~ msgid "Tocharian"
-#~ msgstr "Sissiryhmä"
-
-#, fuzzy
-#~ msgid "?plural:Tocharians"
-#~ msgstr "?plural:latvialaiset"
-
-#, fuzzy
-#~ msgid "Lant"
-#~ msgstr "Tie"
-
-#, fuzzy
-#~ msgid "Lantsa"
-#~ msgstr "Merijalkaväki"
-
-#, fuzzy
-#~ msgid "?plural:Tupi"
-#~ msgstr "?plural:thait"
-
-#, fuzzy
-#~ msgid "Paje"
-#~ msgstr "Pelaajat"
-
-#, fuzzy
-#~ msgid "Turkmen"
-#~ msgstr "turkkilaisten"
-
-#, fuzzy
-#~ msgid "?plural:Turkmens"
-#~ msgstr "?plural:turkkilaiset"
-
-#, fuzzy
-#~ msgid "Turkish"
-#~ msgstr "turkkilaisten"
-
-#, fuzzy
-#~ msgid "UN"
-#~ msgstr "Y"
-
-#, fuzzy
-#~ msgid "?plural:UN"
-#~ msgstr "?plural:thait"
-
-#, fuzzy
-#~ msgid "?female:Chairperson"
-#~ msgstr "Toveri"
-
-#, fuzzy
-#~ msgid "Secretary-General"
-#~ msgstr "Hallintomuoto"
-
-#, fuzzy
-#~ msgid "?female:Secretary-General"
-#~ msgstr "Konsuli"
-
-#, fuzzy
-#~ msgid "?female:Representative"
-#~ msgstr "Presidentti"
-
-#, fuzzy
-#~ msgid "?plural:Uruguayans"
-#~ msgstr "?plural:unkarilaiset"
-
-#, fuzzy
-#~ msgid "?plural:Uzbeks"
-#~ msgstr "?plural:atsteekit"
-
-#, fuzzy
-#~ msgid "Venezuelan"
-#~ msgstr "?plural:kenialaiset"
-
-#, fuzzy
-#~ msgid "Terratenienta"
-#~ msgstr "Maasto"
-
-#~ msgid ""
-#~ "A Spy is a full time professional and as such is much more skilled in the "
-#~ "arts of espionage than her Diplomat predecessor.\n"
-#~ "\n"
-#~ "The most inoffensive skills in a Spy's repertoire are her ability to "
-#~ "investigate cities - revealing detailed information, and the "
-#~ "establishment of embassies. However, if your Spy has gained herself a "
-#~ "reputation for clandestine behaviour she will be executed if she tries to "
-#~ "establish an embassy.\n"
-#~ "\n"
-#~ "She can also be used to: poison the water supply of an enemy city "
-#~ "(reducing the population); steal specific technology; and sabotage "
-#~ "predetermined city targets (note: sabotaging improvements in a capital or "
-#~ "sabotaging City Walls increases the risks of capture). A Spy can also "
-#~ "infiltrate a city and ferment a revolt.\n"
-#~ "\n"
-#~ "A Spy can also be of aid on the battlefield - sabotaging enemy units as "
-#~ "well as bribing them to change allegiance."
-#~ msgstr ""
-#~ "Vakooja on täysammattilainen ja sellaisena paljon taitavampi vakoilun "
-#~ "alalla kuin edeltäjänsä diplomaatti.\n"
-#~ "\n"
-#~ "Harmittomimpia vakoojan taidoista ovat kyky tutkia kaupunkeja paljastaen "
-#~ "tarkkoja tietoja niistä, ja taito perustaa lähetystöjä. Kuitenkin, mikäli "
-#~ "vakoojasi on ehtinyt saada vaarallisen maineen, hänet teloitetaan, mikäli "
-#~ "hän yrittää perustaa lähetystön.\n"
-#~ "\n"
-#~ "Vakoojaa voidaan käyttää myös viholliskaupungin vesivarastojen "
-#~ "myrkyttämiseen väkiluvun pienentämiseksi, halutun teknologian "
-#~ "varastamiseen ja etukäteen valitun kohteen sabotoimiseen (huomaa, että "
-#~ "kaupunginmuurien tai pääkaupungin rakennushankkeiden lisää paljastumisen "
-#~ "riskiä). Myös vakooja voi yllyttää kaupunkilaisia kapinaan.\n"
-#~ "\n"
-#~ "Vakooja on hyödyllinen myös taistelukentällä sabotoidessaan vihollisen "
-#~ "yksiköitä ja lahjoessaan niitä vaihtamaan puolta."
-
-#~ msgid ""
-#~ "Eliminated %s %s while infiltrating %s. The defender became more "
-#~ "experienced."
-#~ msgstr ""
-#~ "%s %s tuhoutui yrittäessään soluttautua kaupunkiin %s. Puolustajasta tuli "
-#~ "kokeneempi."
-
-#~ msgid ""
-#~ "Eliminated %s %s while infiltrating our troops. The defender became more "
-#~ "experienced."
-#~ msgstr ""
-#~ "%s %s tuhoutui yrittäessään soluttautua joukkoihimme. Puolustajasta tuli "
-#~ "kokeneempi."
-
-#~ msgid "Territory of the %s"
-#~ msgstr "%s alue"
-
-#~ msgid "Game _Options..."
-#~ msgstr "Peli_asetukset..."
-
-#~ msgid "%s detonated a nuke!"
-#~ msgstr "%s räjäytti ydinohjuksen!"
-
-#~ msgid "Our Territory"
-#~ msgstr "Meidän alueemme"
-
#~ msgid "Unit: %s (%s%s)"
#~ msgstr "Yksikkö: %s (%s%s)"
@@ -27690,10 +26761,6 @@ msgstr "Joukkue 31"
#~ msgid "_Do not observe"
#~ msgstr "Älä _tarkkaile"
-#, fuzzy
-#~ msgid "_Number of Players (including AI):"
-#~ msgstr "AI-pelaajilla täydennettävä pelaajamäärä"
-
#~ msgid "_AI Skill Level:"
#~ msgstr "_AIn vaikeustaso:"
@@ -27703,20 +26770,9 @@ msgstr "Joukkue 31"
#~ msgid "More Game _Options..."
#~ msgstr "Lisää peliasetuksia..."
-#, fuzzy
-#~ msgid "%s's SpaceShip"
-#~ msgstr "Avaruusalus"
-
#~ msgid ", nation %s"
#~ msgstr ", kansakunta %s"
-#~ msgid ", team %s"
-#~ msgstr ", joukkue %s"
-
-#, fuzzy
-#~ msgid "Territory of the %s %s"
-#~ msgstr "%2$s ja hallintomuotonsa %1$s"
-
#~ msgid "L_egend"
#~ msgstr "Legenda"
@@ -27747,10 +26803,6 @@ msgstr "Joukkue 31"
#~ msgid "Reason: line too short (expected %d got %lu"
#~ msgstr "Syy: rivi on liian lyhyt (odotettu %d, oli %lu"
-#, fuzzy
-#~ msgid "Ruleset directory name \"%s\" disallowed for security reasons."
-#~ msgstr "Säännöstökokoelmahakemistoa \"%s\" ei löydy"
-
#~ msgid "Plugin '%s' is now selected"
#~ msgstr "Liitännäinen '%s' on valittu."
@@ -27758,10 +26810,6 @@ msgstr "Joukkue 31"
#~ msgstr ""
#~ "Real audio -liitännäistä ei ole saatavilla, jatketaan ilman äänitukea"
-#, fuzzy
-#~ msgid "http://www.libsdl.org/projects/SDL_mixer/index.html"
-#~ msgstr "SDL_mixer: http://www.libsdl.org/projects/SDL_mixer/index.html"
-
#~ msgid "Will continue with disabled sounds."
#~ msgstr "Jatkan ilman ääniä."
@@ -27798,10 +26846,6 @@ msgstr "Joukkue 31"
#~ msgid "Gover_nment"
#~ msgstr "Halli_ntomuoto"
-#, fuzzy
-#~ msgid "_Tools"
-#~ msgstr "Yhteensä"
-
#~ msgid "_Cancel Treaty"
#~ msgstr "Pura sopimus"
@@ -28293,45 +27337,6 @@ msgstr "Joukkue 31"
#~ msgid "Name of Worklist"
#~ msgstr "Työlistan nimi"
-#, fuzzy
-#~ msgid "Options panel"
-#~ msgstr "Valinnat"
-
-#, fuzzy
-#~ msgid "unit"
-#~ msgid_plural "units"
-#~ msgstr[0] " yksikkö"
-#~ msgstr[1] " yksikkö"
-
-#, fuzzy
-#~ msgid "Happiness panel"
-#~ msgstr "Onnellisuussivu"
-
-#, fuzzy
-#~ msgid "Information panel"
-#~ msgstr "Tietoja aiheesta"
-
-#, fuzzy
-#~ msgid "Exit Report"
-#~ msgstr "Kaupunkiraportti"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "finshed"
-#~ msgstr "kiinteä"
-
-#, fuzzy
-#~ msgid "Couldn't blit text to display: %s"
-#~ msgstr "Merkkijonon muunto lähteestä %s kohteeksi %s epäonnistui: %s"
-
-#, fuzzy
-#~ msgid "Clear _Log"
-#~ msgstr "Tyhjennä loki"
-
-#~ msgid "Work_lists"
-#~ msgstr "Työ_listat"
-
#~ msgid ""
#~ "When built, every civilization's attitude toward you is improved by 25%."
#~ msgstr ""
@@ -28340,10 +27345,6 @@ msgstr "Joukkue 31"
#~ msgid "Modern"
#~ msgstr "Nykyaikainen"
-#, fuzzy
-#~ msgid "African"
-#~ msgstr "yhdysvaltalaisten"
-
#~ msgid "Fictional"
#~ msgstr "Fiktiivinen"
@@ -28367,11 +27368,6 @@ msgstr "Joukkue 31"
#~ msgid "tech \"%s\": requires itself"
#~ msgstr "edistysaskel \"%s\" vaatii itsensä"
-#, fuzzy
-#~ msgid "%s's %s tried to build %s, which is not available."
-#~ msgstr ""
-#~ "%s: kaupunki %s yritti rakentaa hankkeen %s, joka ei enää ole saatavilla."
-
#~ msgid "Sea moving start units are not yet supported, %s not created."
#~ msgstr ""
#~ "Merellä liikkuvia aloitusyksiköitä ei vielä tueta, yksikköä %s ei luotu."
@@ -28382,27 +27378,15 @@ msgstr "Joukkue 31"
#~ msgid "Could not load ruleset file \"%s\"."
#~ msgstr "Sääntökokoelmatiedoston \"%s\" lataaminen ei onnistunut."
-#, fuzzy
-#~ msgid "Could not load ruleset script file \"%s\"."
-#~ msgstr "Sääntökokoelmatiedoston \"%s\" lataaminen ei onnistunut."
-
#~ msgid "Ruleset datafile appears incompatible:"
#~ msgstr "Sääntökokoelman datatiedosto ei näytä yhteensopivalta:"
#~ msgid "Ruleset datafile claims required option(s) which we don't support:"
#~ msgstr "Sääntökokoelmatiedosto vaatii asetuksen/-ia joita ei tueta:"
-#, fuzzy
-#~ msgid "Section %s has unknown req: \"%s\" \"%s\" (%s)"
-#~ msgstr "Rakennuksella %s on tuntematon vaatimustyyppi \"%s\" (%s)"
-
#~ msgid "Unknown terrain %s in entry %s."
#~ msgstr "Tuntematon maastotyyppi %s kohdassa %s."
-#, fuzzy
-#~ msgid "Unit %s has unknown unit class %s as cargo."
-#~ msgstr "Maastotyypillä %s on tuntematon lipuke %s"
-
#~ msgid "Ruleset doesn't have any terrains (%s)"
#~ msgstr "Sääntökokoelmalla (%s) ei ole maastotyyppejä"
@@ -28415,160 +27399,6 @@ msgstr "Joukkue 31"
#~ msgid "Terrain %s has unknown flag %s"
#~ msgstr "Maastotyypillä %s on tuntematon lipuke %s"
-#, fuzzy
-#~ msgid "Terrain %s is native to unknown unit class %s"
-#~ msgstr "Maastotyypillä %s on tuntematon lipuke %s"
-
-#, fuzzy
-#~ msgid "Resources %s and %s have the same identifier."
-#~ msgstr "Maastotyypeillä %s ja %s on sama tunniste."
-
-#, fuzzy
-#~ msgid "Base %s has unknown flag %s"
-#~ msgstr "Maastotyypillä %s on tuntematon lipuke %s"
-
-#, fuzzy
-#~ msgid "Section %s lists unknown effect type: \"%s\" (%s)"
-#~ msgstr "Rakennuksella %s on tuntematon vaikutustyyppi \"%s\" (%s)."
-
-#~ msgid "Unknown terrain identifier '%c' in savegame."
-#~ msgstr "Tuntematon maastotyypin tunniste '%c' tallennetussa pelissä."
-
-#, fuzzy
-#~ msgid ""
-#~ "Number of starts (%d) are lower than rules.max_players (%d), lowering "
-#~ "rules.max_players."
-#~ msgstr ""
-#~ "Aloitusten (%d) määrä on pienempi kuin pelaajamaksimi max_players (%d), "
-#~ "pienennän pelaajamaksimia."
-
-#~ msgid "Wrong unit type id value (%d)"
-#~ msgstr "Epäkelpo yksikkötyypin tunnistearvo (%d)"
-
-#~ msgid "Wrong improvement type id value (%d)"
-#~ msgstr "Epäkelpo rakennustyypin tunnistearvo (%d)"
-
-#~ msgid "Wrong tech type id value (%d)"
-#~ msgstr "Epäkelpo teknologiatyypin tunnistearvo (%d)"
-
-#, fuzzy
-#~ msgid "Unknown technology (%s)"
-#~ msgstr "Ei teknologiaa"
-
-#~ msgid "Wrong government type id value (%d)"
-#~ msgstr "Epäkelpo hallitusmuototyypin tunnistearvo (%d)"
-
-#~ msgid "Unknown unit type '%s' in player%d section"
-#~ msgstr "Tuntematon yksikkötyyppi '%s' pelaaja%d-osiossa"
-
-#~ msgid "Savegame error: invalid unit orders."
-#~ msgstr "Virhe tallennetussa pelissä: epäkelvot yksikön käskyt."
-
-#, fuzzy
-#~ msgid "Unsupported government found (%s)"
-#~ msgstr "tuetut asetukset: %s"
-
-#~ msgid "Unsupported city style found in player%d section. Changed to %s"
-#~ msgstr ""
-#~ "Kaupunkityyli, jota ei tueta, löytyi pelaaja%d-osiossa. Muutettu arvoksi %"
-#~ "s"
-
-#~ msgid "Food Stock"
-#~ msgstr "Ruokavarasto"
-
-#, fuzzy
-#~ msgid " with "
-#~ msgstr " (yhdessä askeleen "
-
-#, fuzzy
-#~ msgid ""
-#~ "%s file requires option(s) which client doesn't support:\n"
-#~ "file: \"%s\"\n"
-#~ "file options: %s\n"
-#~ "supported options: %s"
-#~ msgstr "%s tiedosto vaatii toiminnon/toja, jo(i)ta me emme tue:"
-
-#~ msgid "Trying \"%s\" tileset."
-#~ msgstr "Testataan \"%s\" kuvitusta."
-
-#, fuzzy
-#~ msgid "Can't find tileset \"%s\"."
-#~ msgstr "En löydä ääniasetustiedostoa \"%s\"."
-
-#~ msgid "Invalid darkness style set in tileset."
-#~ msgstr "Epäkelpo pimeystyyppi kuvituksessa."
-
-#, fuzzy
-#~ msgid "Can't find spec file \"%s\"."
-#~ msgstr "En löydä ääniasetustiedostoa \"%s\"."
-
-#~ msgid "No graphics for specialist %s."
-#~ msgstr "Kuvake asukasspesialistille %s puuttuu."
-
-#~ msgid "No graphics for citizen %s."
-#~ msgstr "Kuvake asukkaalle %s puuttuu."
-
-#, fuzzy
-#~ msgid "Missing base sprite tag \"%s1\"."
-#~ msgstr "\"%s\": argumentti puuttuu.\n"
-
-# *** '(s/he/it) moves' ***
-#, fuzzy
-#~ msgid "Moves Left"
-#~ msgstr "Liikkuu"
-
-#, fuzzy
-#~ msgid "Economy (F5)"
-#~ msgstr "Talous"
-
-#, fuzzy
-#~ msgid "Research (F6)"
-#~ msgstr "Tutki"
-
-#, fuzzy
-#~ msgid "Revolution (Shift + R)"
-#~ msgstr "Vallankumous"
-
-#, fuzzy
-#~ msgid "Players (F3)"
-#~ msgstr "Pelaajat"
-
-#, fuzzy
-#~ msgid "Units (F2)"
-#~ msgstr "Yksiköt: "
-
-#, fuzzy
-#~ msgid ""
-#~ "Research (F6)\n"
-#~ "%s (%d/%d)"
-#~ msgstr "Tutkittavana: %s(%d/%d)"
-
-#, fuzzy
-#~ msgid "Log"
-#~ msgstr "Kirjaudu sisään:"
-
-#, fuzzy
-#~ msgid ""
-#~ "%s%s - %s%s\n"
-#~ "\n"
-#~ msgstr "%s kaupungissa %s (%s)\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "Start\n"
-#~ "Game"
-#~ msgstr "Aloita peli"
-
-#, fuzzy
-#~ msgid ""
-#~ "Select\n"
-#~ "Nation"
-#~ msgstr "Valitse kansakunta"
-
-#, fuzzy
-#~ msgid "Citizen Management Agent"
-#~ msgstr "Kaupunkiapuri"
-
#~ msgid "Sp1 F/R/T:"
#~ msgstr "Sp1 R/T/K"
@@ -28639,10 +27469,6 @@ msgstr "Joukkue 31"
#~ msgid "Transitional"
#~ msgstr "Väliaikainen"
-#, fuzzy
-#~ msgid "Qween"
-#~ msgstr "Kuningatar"
-
#~ msgid "?trade_routes:T"
#~ msgstr "K"
@@ -28661,31 +27487,6 @@ msgstr "Joukkue 31"
#~ msgid "_Release city"
#~ msgstr "Luovu - siirrä käsinhallintaan"
-#, fuzzy
-#~ msgid "?nationgroup:Transitional"
-#~ msgstr "Fiktiivinen"
-
-#, fuzzy
-#~ msgid "Ancient"
-#~ msgstr "Tutkijoita"
-
-#, fuzzy
-#~ msgid ""
-#~ "Your client is too old. To use this server, please upgrade your client to "
-#~ "a Freeciv 2.1 or later."
-#~ msgstr ""
-#~ "Asiakasohjelmasi on liian vanha. Ole hyvä ja päivitä ohjelmasi joko "
-#~ "vähintään Freeciv-versioon 2.1 tai CVS-versioon, joka ei ole 28.11.2003:a "
-#~ "vanhempi."
-
-#, fuzzy
-#~ msgid "The %s gives an embassy"
-#~ msgstr "%s antavat %s"
-
-#, fuzzy
-#~ msgid "Goto _location"
-#~ msgstr "Mene"
-
#~ msgid ""
#~ "- A Diplomat can establish embassies with other civilizations by moving "
#~ "into another player's city.\n"
@@ -28723,18 +27524,3 @@ msgstr "Joukkue 31"
#~ msgid "_Remove"
#~ msgstr "Poista"
-
-#, fuzzy
-#~ msgid "_Editing Mode"
-#~ msgstr "Muokkaa"
-
-#, fuzzy
-#~ msgid "Oceanian"
-#~ msgstr "valtameri"
-
-#, fuzzy
-#~ msgid "?female:Ah"
-#~ msgstr "Konsuli"
-
-#~ msgid "Tropical"
-#~ msgstr "Trooppinen"
diff --git a/po/fr.gmo b/po/fr.gmo
index 7d2e706..dff9377 100644
Binary files a/po/fr.gmo and b/po/fr.gmo differ
diff --git a/po/fr.po b/po/fr.po
index 72f8593..3d5af0a 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Freeciv 1.15\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 07:45+0900\n"
+"POT-Creation-Date: 2009-03-29 21:13+0900\n"
"PO-Revision-Date: 2007-08-12 15:06+0300\n"
"Last-Translator: Frederic Rodrigo <f.rodrigo free.fr>\n"
"Language-Team: <freeciv-l10n-fr at yahoogroupes.fr>\n"
@@ -647,7 +647,7 @@ msgid "Road"
msgstr "Route"
#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
-#: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
+#: client/gui-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"
@@ -664,7 +664,7 @@ msgid "Mine"
msgstr "Mine"
#: common/terrain.c:396 common/unit.c:548 server/report.c:124
-#: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
+#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr "Pollution"
@@ -710,7 +710,7 @@ msgstr "Retranch
msgid "Sentry"
msgstr "Veiller"
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:851 client/gui-sdl/menu.c:648
+#: common/unit.c:566 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"
@@ -727,7 +727,7 @@ msgstr "Explorer"
msgid "Transform"
msgstr "Transformer"
-#: common/unit.c:584 client/text.c:106 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:584 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"
@@ -796,11 +796,11 @@ msgstr "Missile Nucl
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1406
+#: common/unittype.c:349 client/helpdata.c:1404
msgid " and "
msgstr " et "
-#: common/unittype.c:355 client/helpdata.c:1392
+#: common/unittype.c:355 client/helpdata.c:1390
msgid "?and:, "
msgstr "?and:, "
@@ -1426,32 +1426,26 @@ msgstr ""
#: server/auth.c:281
#, c-format
-msgid "Auth config filename \"%s\" not allowed!"
-msgstr ""
-"Nom de fichier de configuration de l'authentification \"%s\" non autorisé !"
-
-#: server/auth.c:286
-#, c-format
msgid "Cannot load auth config file \"%s\"!"
msgstr ""
"Impossible de charger le fichier de configuration de l'authentification \"%s"
"\" !"
-#: server/auth.c:397
+#: server/auth.c:392
#, c-format
msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
msgstr "Attention: le nom d'invité \"%s\" a été pris, renommage en \"%s\"."
-#: server/auth.c:404
+#: server/auth.c:399
msgid "Guests are not allowed on this server. Sorry."
msgstr "Les invités ne sont pas autorisés sur ce serveur. Désolé."
-#: server/auth.c:406
+#: server/auth.c:401
#, c-format
msgid "%s was rejected: Guests not allowed."
msgstr "%s a été rejeté : invités non autorisés."
-#: server/auth.c:425
+#: server/auth.c:420
#, c-format
msgid ""
"There was an error reading the user database, logging in as guest connection "
@@ -1460,7 +1454,7 @@ msgstr ""
"Il y a eu une erreur à la lecture de la base données des utilisateurs, "
"entrée en tant que connexion invité \"%s\"."
-#: server/auth.c:431
+#: server/auth.c:426
msgid ""
"There was an error reading the user database and guest logins are not "
"allowed. Sorry"
@@ -1468,44 +1462,44 @@ msgstr ""
"Il y a eu une erreur à la lecture de la base données des utilisateurs et les "
"connexions d'invités ne sont pas autorisés. Désolé"
-#: server/auth.c:434
+#: server/auth.c:429
#, c-format
msgid "%s was rejected: Database error and guests not allowed."
msgstr ""
"%s a été rejeté : problème de base de données et les invités ne sont pas "
"autorisés."
-#: server/auth.c:441
+#: server/auth.c:436
#, c-format
msgid "Enter password for %s:"
msgstr "Entrez le mot de passe pour %s:"
-#: server/auth.c:450
+#: server/auth.c:445
msgid "Enter a new password (and remember it)."
msgstr "Entrez un nouveau mot de passe (et souvenez-vous en)."
-#: server/auth.c:456
+#: server/auth.c:451
msgid "This server allows only preregistered users. Sorry."
msgstr "Ce serveur n'autorise que les joueurs pré-enregistrés. Désolé."
-#: server/auth.c:459
+#: server/auth.c:454
#, c-format
msgid "%s was rejected: Only preregister users allowed."
msgstr ""
"%s a été rejeté : uniquement les joueurs préenregistrés sont autorisés."
-#: server/auth.c:488 server/auth.c:547
+#: server/auth.c:483 server/auth.c:542
msgid "Sorry, too many wrong tries..."
msgstr "Désolé, trop de mauvaises tentatives..."
-#: server/auth.c:489
+#: server/auth.c:484
#, c-format
msgid "%s was rejected: Too many wrong password verifies for new user."
msgstr ""
"%s a été rejeté : trop de mauvaises tentatives de vérification du mot de "
"passe pour un nouvel utilisateur."
-#: server/auth.c:505
+#: server/auth.c:500
msgid ""
"Warning: There was an error in saving to the database. Continuing, but your "
"stats will not be saved."
@@ -1513,34 +1507,34 @@ msgstr ""
"Attention: Il y a eu une erreur à la sauvegarde dans la base de données. On "
"continue mais vos statistiques ne seront pas sauvegardées."
-#: server/auth.c:549
+#: server/auth.c:544
#, c-format
msgid "%s was rejected: Too many wrong password tries."
msgstr "%s a été rejeté : trop de mauvais mots de passe entrés."
-#: server/auth.c:558
+#: server/auth.c:553
msgid "Your password is incorrect. Try again."
msgstr "Votre mot de passe est incorrect. Essayez encore."
-#: server/auth.c:569
+#: server/auth.c:564
msgid "Sorry, your connection timed out..."
msgstr "Désolé, votre connexion a expiré ..."
-#: server/auth.c:571
+#: server/auth.c:566
#, c-format
msgid "%s was rejected: Connection timeout waiting for password."
msgstr ""
"%s a été rejeté : expiration de la connexion durant l'attente du mot de "
"passe."
-#: server/auth.c:636
+#: server/auth.c:631
#, c-format
msgid "Your password is too short, the minimum length is %d. Try again."
msgstr ""
"Votre mot de passe est trop court, la longueur minimum est %d. Essayez "
"encore."
-#: server/auth.c:642
+#: server/auth.c:637
#, c-format
msgid ""
"The password must have at least %d capital letters, %d numbers, and be at "
@@ -2059,7 +2053,7 @@ msgstr "Ceci est le serveur pour %s"
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:237 manual/civmanual.c:380
+#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
@@ -2092,14 +2086,14 @@ msgstr ""
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:241
+#: server/civserver.c:217 client/civclient.c:242
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:245
+#: server/civserver.c:221 client/civclient.c:246
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"
@@ -2107,7 +2101,7 @@ msgstr " -d, --debug NUM\tChoisir le niveau de d
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:248 manual/civmanual.c:382
+#: server/civserver.c:225 client/civclient.c:249 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"
@@ -2163,11 +2157,11 @@ msgstr ""
" -R, --Ranklok FICHIER\tUtiliser FICHIER comme fichier historique des "
"classements\n"
-#: server/civserver.c:247 client/civclient.c:267 manual/civmanual.c:383
+#: server/civserver.c:247 client/civclient.c:268 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:279
+#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, c-format
@@ -3451,7 +3445,7 @@ msgstr ""
"Les unités maritimes au démarrage ne sont pas encore supportées. Personne "
"n'a de %s."
-#: server/gamehand.c:310 client/text.c:632
+#: server/gamehand.c:310 client/text.c:691
#, c-format
msgid "Year: %s"
msgstr "Année : %s"
@@ -3743,10 +3737,10 @@ 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
-#, c-format
+#, fuzzy, c-format
msgid ""
-"Your nation is thrust into civil war, %s is declared the leader of the "
-"rebel states."
+"Your nation is thrust into civil war! %s is declared the leader of the rebel "
+"states."
msgstr ""
"Votre nation plonge dans la guerre civile; %s est déclaré chef des États "
"rebelles."
@@ -3857,7 +3851,7 @@ msgstr "Recherches"
msgid "Literacy"
msgstr "Littérature"
-#: server/report.c:121 client/cityrepdata.c:526 client/cityrepdata.c:527
+#: server/report.c:121 client/cityrepdata.c:524 client/cityrepdata.c:525
#: client/gui-sdl/cityrep.c:174
msgid "Production"
msgstr "Production"
@@ -4010,7 +4004,7 @@ msgstr ""
"La chaîne \"demography\" contient des caractères invalides. Essayez \"help "
"demography\"."
-#: server/report.c:743 server/report.c:766
+#: server/report.c:743 server/report.c:768
msgid "Demographics Report:"
msgstr "Bulletin Démographique :"
@@ -4018,10 +4012,12 @@ msgstr "Bulletin D
msgid "Sorry, the Demographics report is unavailable."
msgstr "Désolé, le bulletin démographique n'est pas disponible."
-#: server/report.c:748
-#, c-format
-msgid "The %s of the %s (%s)"
-msgstr "%s des %s (%s)"
+#. TRANS: <nation adjective> <government name> (<year>).
+#. * E.g. "Polish Despotism (200 AD)".
+#: server/report.c:750
+#, fuzzy, c-format
+msgid "%s %s (%s)"
+msgstr "%s dans %s (%s)\n"
#. TRANS: message about an installation error.
#: server/ruleset.c:163
@@ -4078,16 +4074,6 @@ msgstr ""
msgid "%s had invalid nation; changing to %s."
msgstr ""
-#. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4073
-#, fuzzy, c-format
-msgid ""
-"Illegal alliance structure detected: %s alliance to %s reduced to peace "
-"treaty."
-msgstr ""
-"Détection d'une structure d'alliance illégale : l'alliance de %s avec %s est "
-"ramenée à un traité de paix."
-
#: server/settings.c:32
msgid "Geological"
msgstr "Géologiques"
@@ -5355,9 +5341,10 @@ msgid "Auto-save name prefix"
msgstr "Préfixe pour les sauvegardes automatiques"
#: server/settings.c:1016
+#, fuzzy
msgid ""
-"Automatically saved games will have name \"<prefix><year>.sav\". This "
-"setting sets the <prefix> part."
+"Automatically saved games will have name \"<prefix>-T<turn>-Y<year>.sav\". "
+"This setting sets the <prefix> part."
msgstr ""
"Les sauvegardes automatiques auront le nom \"<préfixe><année>.sav\". Ce "
"paramètre définit la partie <préfixe>."
@@ -5376,11 +5363,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:147
+#: server/sernet.c:150
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:922
+#: server/sernet.c:929
#, c-format
msgid "Server: bad address: [%s:%d]."
msgstr "Serveur: erreur d'adresse : [%s:%d]."
@@ -5516,101 +5503,101 @@ msgstr ""
"alliance avec ces deux joueurs est annulée."
# AR
-#: server/srv_main.c:928
+#: server/srv_main.c:961
#, c-format
msgid "Failed saving game as %s"
msgstr "Échec dans la sauvegarde de la partie sous %s"
-#: server/srv_main.c:930
+#: server/srv_main.c:963
#, c-format
msgid "Game saved as %s"
msgstr "Partie sauvegardée sous %s"
-#: server/srv_main.c:962
+#: server/srv_main.c:994
msgid "The game is already running."
msgstr "La partie est déjà en cours."
-#: server/srv_main.c:970
+#: server/srv_main.c:1002
#, 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:977
+#: server/srv_main.c:1009
msgid "Starting game."
msgstr "Démarrage du jeu."
-#: server/srv_main.c:1039
+#: server/srv_main.c:1071
#, c-format
msgid "request for unknown report (type %d)"
msgstr "requête d'un rapport inconnu (type %d)"
-#: server/srv_main.c:1104
+#: server/srv_main.c:1136
#, c-format
msgid "Warning: rejecting old client %s"
msgstr "Attention : rejet d'un ancien client %s"
-#: server/srv_main.c:1206
+#: server/srv_main.c:1238
#, 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:1306
+#: server/srv_main.c:1338
msgid "Please choose a non-blank name."
msgstr "Veuillez choisir un nom non vide."
-#: server/srv_main.c:1322
+#: server/srv_main.c:1354
msgid "That nation is already in use."
msgstr "Cette nation est déjà prise."
-#: server/srv_main.c:1338
+#: server/srv_main.c:1370
#, 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:1359
+#: server/srv_main.c:1391
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:1458
+#: server/srv_main.c:1490
#, 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:1464
+#: server/srv_main.c:1496
#, c-format
msgid "%s nation is already in use."
msgstr "La nation %s est déjà prise."
-#: server/srv_main.c:1482
+#: server/srv_main.c:1514
#, c-format
msgid "%s is the %s ruler %s."
msgstr "%s est le chef %s %s."
-#: server/srv_main.c:1538
+#: server/srv_main.c:1570
#, 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:1582 server/srv_main.c:1586
+#: server/srv_main.c:1614 server/srv_main.c:1618
#, 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:1728
+#: server/srv_main.c:1760
#, c-format
msgid "Player %d"
msgstr "Joueur %d"
-#: server/srv_main.c:1739 server/srv_main.c:1745
+#: server/srv_main.c:1771 server/srv_main.c:1777
#, c-format
msgid "%s rules the %s."
msgstr "%s dirige les %s."
-#: server/srv_main.c:1910
+#: server/srv_main.c:1942
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
@@ -5618,16 +5605,16 @@ msgstr ""
"Ce civserveur a un support d'authentification des joueurs, mais il est "
"actuellement desactivé."
-#: server/srv_main.c:1961
+#: server/srv_main.c:1993
#, c-format
msgid "Sending info to metaserver [%s]"
msgstr "Envoi d'information au métaserveur [%s]"
-#: server/srv_main.c:1992
+#: server/srv_main.c:2024
msgid "The game is over..."
msgstr "La partie est terminée..."
-#: server/srv_main.c:2205
+#: server/srv_main.c:2237
msgid "Now accepting new client connections."
msgstr "Accepte dorénavant la connexion de nouveaux clients."
@@ -6460,25 +6447,25 @@ msgid "Barbarian"
msgstr "Barbare"
#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2030 client/gui-sdl/plrdlg.c:645
+#: client/gui-gtk-2.0/pages.c:2102 client/gui-sdl/plrdlg.c:645
#: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
msgid "AI"
msgstr "IA"
# AR
#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
+#: 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
msgid "Human"
msgstr "Humain"
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
-#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
+#: 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
msgid "Alive"
msgstr "Vivant"
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
#: client/gui-win32/connectdlg.c:200
msgid "Dead"
msgstr "Mort"
@@ -6748,9 +6735,9 @@ 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:242
-#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
-#: client/text.c:1201
+#: 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
#, c-format
msgid "?clistmore:, %s"
msgstr ", %s"
@@ -7005,7 +6992,7 @@ msgstr "Il n'y a que %s qui puisse attaquer depuis la mer."
msgid "Cannot attack from sea."
msgstr "Impossible d'attaquer depuis la mer."
-#: server/unithand.c:996 server/unittools.c:2103
+#: server/unithand.c:996 server/unittools.c:2137
msgid "Cannot attack unless you declare war first."
msgstr "Impossible d'attaquer tant que vous n'avez pas déclaré la guerre."
@@ -7110,105 +7097,105 @@ msgid "%s was upgraded for free to %s."
msgstr "%s a été gratuitement mis à jour en %s."
#: server/unittools.c:297
-#, c-format
-msgid "Not enough gold. %s disbanded"
+#, fuzzy, c-format
+msgid "Not enough gold to pay upkeep for %s. Unit disbanded."
msgstr "Par assez d'or. %s congédié"
-#: server/unittools.c:342
+#: server/unittools.c:343
#, c-format
msgid "Your %s has run out of hit points."
msgstr "Votre %s a épuisé ses points d'attaque."
-#: server/unittools.c:358
+#: server/unittools.c:359
#, c-format
msgid "Your %s has been lost on the high seas."
msgstr "Votre %s a été perdu en haute mer."
-#: server/unittools.c:365
+#: server/unittools.c:366
#, c-format
msgid "Your %s survived on the high seas and became more experienced!"
msgstr "Votre %s a survécu en haute mer et a acquis de l'expérience !"
-#: server/unittools.c:376
+#: server/unittools.c:377
#, c-format
msgid "Your %s has been lost on unsafe terrain."
msgstr "Votre %s a été perdu en terrain dangereux."
-#: server/unittools.c:430
+#: server/unittools.c:431
#, c-format
msgid "Your %s has returned to refuel."
msgstr "Votre %s est retourné faire le plein de carburant."
-#: server/unittools.c:454
+#: server/unittools.c:455
#, c-format
msgid "Your %s has run out of fuel."
msgstr "Votre %s a épuisé son carburant."
-#. TRANS: And, <the unit> became ...
-#: server/unittools.c:616
-#, fuzzy
-msgid "And, became more experienced!"
-msgstr " et a acquis de l'expérience!"
-
#. TRANS: Your <unit> became ...
-#: server/unittools.c:620
+#: server/unittools.c:619
#, c-format
msgid "Your %s became more experienced!"
msgstr "Votre %s a acquis de l'expérience !"
-#: server/unittools.c:1011
+#: server/unittools.c:1009
#, c-format
msgid "Teleported your %s to %s."
msgstr "Téléportation de %s à %s."
-#: server/unittools.c:1041
+#. TRANS: A unit is moved to resolve stack conflicts.
+#: server/unittools.c:1065
+#, fuzzy, c-format
+msgid "Moved your %s."
+msgstr "%s congédié."
+
+#: server/unittools.c:1076
#, c-format
msgid "Disbanded your %s."
msgstr "%s congédié."
-#: server/unittools.c:1363
+#: server/unittools.c:1397
#, 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:1367
+#: server/unittools.c:1401
#, 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:1469
+#: server/unittools.c:1503
#, 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:1478
+#: server/unittools.c:1512
#, 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:1527
+#: server/unittools.c:1561
#, 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:1545
+#: server/unittools.c:1579
#, 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:1554 server/unittools.c:1612
+#: server/unittools.c:1588 server/unittools.c:1646
#, 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:1588
+#: server/unittools.c:1622
#, fuzzy, c-format
msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
msgid_plural ""
@@ -7220,14 +7207,14 @@ msgstr[1] ""
#. TRANS: "Cannon lost when the Polish Destroyer
#. * attacked the German Musketeers."
-#: server/unittools.c:1621
+#: server/unittools.c:1655
#, 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:1636
+#: server/unittools.c:1670
#, 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."
@@ -7235,7 +7222,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:1646
+#: server/unittools.c:1680
#, 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."
@@ -7246,7 +7233,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:1660
+#: server/unittools.c:1694
#, 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."
@@ -7255,190 +7242,190 @@ 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:1928
+#: server/unittools.c:1962
#, c-format
msgid "Your %s was nuked by %s."
msgstr "Votre %s a été atomisé(e) par %s."
-#: server/unittools.c:1931 server/unittools.c:1947
+#: server/unittools.c:1965 server/unittools.c:1981
msgid "yourself"
msgstr "vous-même"
-#: server/unittools.c:1935
+#: server/unittools.c:1969
#, fuzzy, c-format
msgid "The %s %s was nuked."
msgstr "%2$s de %1$s a été atomisé(e)."
-#: server/unittools.c:1944
+#: server/unittools.c:1978
#, c-format
msgid "%s was nuked by %s."
msgstr "%s a été atomisé(e) par %s."
-#: server/unittools.c:1952
+#: server/unittools.c:1986
#, c-format
msgid "You nuked %s."
msgstr "Vous avez atomisé %s."
-#: server/unittools.c:1993
+#: server/unittools.c:2027
#, fuzzy, c-format
msgid "The %s detonated a nuke!"
msgstr "%s a lancé une bombe atomique !"
-#: server/unittools.c:2017
+#: server/unittools.c:2051
#, c-format
msgid "%s transported successfully."
msgstr "%s transporté avec succès."
-#: server/unittools.c:2069
+#: server/unittools.c:2103
msgid "This unit type can not be paradropped."
msgstr "Ce type d'unité ne peut pas être parachuté."
-#: server/unittools.c:2079
+#: server/unittools.c:2113
#, 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:2085
+#: server/unittools.c:2119
msgid "The destination location is not known."
msgstr "L'endroit de destination n'est pas connu."
-#: server/unittools.c:2092
+#: server/unittools.c:2126
#, c-format
msgid "This unit cannot paradrop into %s."
msgstr "Cette unité ne peut pas être parachutée dans %s."
-#: server/unittools.c:2112
+#: server/unittools.c:2146
#, 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:2123
+#: server/unittools.c:2157
#, 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:2136
+#: server/unittools.c:2170
#, 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:2158
+#: server/unittools.c:2192
#, c-format
msgid "You found %d gold."
msgstr "Vous trouvez %d lingots."
-#: server/unittools.c:2175
+#: server/unittools.c:2209
#, c-format
msgid "You found %s in ancient scrolls of wisdom."
msgstr "Vous trouvez %s dans d'anciens parchemins de sagesse."
-#: server/unittools.c:2182
+#: server/unittools.c:2216
#, 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:2196
+#: server/unittools.c:2230
msgid "A band of friendly mercenaries joins your cause."
msgstr "Une bande de mercenaires amicaux rejoint votre cause."
-#: server/unittools.c:2214
+#: server/unittools.c:2248
msgid "An abandoned village is here."
msgstr "Il y a ici un village abandonné."
-#: server/unittools.c:2224
+#: server/unittools.c:2258
msgid "You have unleashed a horde of barbarians!"
msgstr "Vous avez découvert une horde de barbares !"
-#: server/unittools.c:2227
+#: server/unittools.c:2261
#, c-format
msgid "Your %s has been killed by barbarians!"
msgstr "Votre %s a été tué(e) par les barbares !"
-#: server/unittools.c:2243
+#: server/unittools.c:2277
msgid "You found a friendly city."
msgstr "Vous avez trouvé une ville amicale."
-#: server/unittools.c:2257
+#: server/unittools.c:2291
msgid "Friendly nomads are impressed by you, and join you."
msgstr "Vous impressionnez des nomades amicaux, et ils se joignent à vous."
-#: server/unittools.c:2282
+#: server/unittools.c:2316
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:2540
+#: server/unittools.c:2574
#, 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:2989
+#: server/unittools.c:3023
#, 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:3041
+#: server/unittools.c:3075
#, 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:3054
+#: server/unittools.c:3088
#, 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:3068
+#: server/unittools.c:3102
#, 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:3078
+#: server/unittools.c:3112
#, 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:3104
+#: server/unittools.c:3138
#, 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:3145
+#: server/unittools.c:3179
#, 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:3156
+#: server/unittools.c:3190
#, 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:3168
+#: server/unittools.c:3202
#, c-format
msgid "Attempt to build wonder for %s failed."
msgstr "La tentative de construction de merveille à %s a échoué."
-#: server/unittools.c:3177
+#: server/unittools.c:3211
#, c-format
msgid "Your %s has invalid orders."
msgstr "Votre %s a des ordres invalides."
-#: server/generator/mapgen.c:1737
+#: server/generator/mapgen.c:1771
msgid "High landmass - this may take a few seconds."
msgstr "Beaucoup de terres - cela risque de prendre quelques secondes."
-#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
+#: server/generator/mapgen.c:1969 server/generator/mapgen.c:2039
#, c-format
msgid "Falling back to generator %d."
msgstr "Utilisation du générateur %d à la place."
-#: server/generator/mapgen.c:2025
+#: server/generator/mapgen.c:2059
msgid "Generator 3 didn't place all big islands."
msgstr "Le générateur 3 n'a pas placé toutes les grandes îles."
-#: server/generator/mapgen.c:2054
+#: server/generator/mapgen.c:2088
#, c-format
msgid "Generator 3 left %li landmass unplaced."
msgstr "Le générateur 3 a laissé %li terres non placées."
@@ -7546,7 +7533,7 @@ msgid_plural "%3d turns"
msgstr[0] "%3d tour"
msgstr[1] "%3d tours"
-#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:631
#: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
@@ -7664,342 +7651,343 @@ msgstr "?city_state:Paix"
msgid "(worklist)"
msgstr "(liste de travail)"
-#: client/cityrepdata.c:447
-msgid "Special"
-msgstr "Spécial"
+#: client/cityrepdata.c:446
+msgid "?city:Name"
+msgstr "?city:Nom"
-#: client/cityrepdata.c:448
-msgid "?entertainers/scientists/taxmen:E/S/T"
-msgstr "?Artistes/Scientifiques/Percepteurs:A/S/P"
+#: client/cityrepdata.c:446 client/gui-sdl/cityrep.c:169
+msgid "City Name"
+msgstr "Nom Ville"
-#: client/cityrepdata.c:449
-msgid "Entertainers, Scientists, Taxmen"
-msgstr "Artistes, Scientifiques, Percepteurs"
+#: client/cityrepdata.c:448
+msgid "?size [short]:Sz"
+msgstr "?Taille [court]:T"
-#: client/cityrepdata.c:452
-msgid "Concise + Rapture, - Disorder"
-msgstr "Concis + Extase, - Troubles"
+#: client/cityrepdata.c:448
+msgid "Size"
+msgstr "Taille"
-#: client/cityrepdata.c:454 client/plrdlg_common.c:261
+#: client/cityrepdata.c:450 client/plrdlg_common.c:261
#: client/gui-win32/plrdlg.c:337
msgid "State"
msgstr "État"
-#: client/cityrepdata.c:454
+#: client/cityrepdata.c:450
msgid "Rapture/Peace/Disorder"
msgstr "Extase/Paix/Troubles"
+#: client/cityrepdata.c:452
+#, fuzzy
+msgid "Concise *=Rapture, X=Disorder"
+msgstr "Concis + Extase, - Troubles"
+
+#: client/cityrepdata.c:456
+msgid "Special"
+msgstr "Spécial"
+
#: client/cityrepdata.c:457
+msgid "?entertainers/scientists/taxmen:E/S/T"
+msgstr "?Artistes/Scientifiques/Percepteurs:A/S/P"
+
+#: client/cityrepdata.c:458
+msgid "Entertainers, Scientists, Taxmen"
+msgstr "Artistes, Scientifiques, Percepteurs"
+
+#: client/cityrepdata.c:461
msgid "?Happy workers:H"
msgstr "?Travailleurs heureux:H"
-#: client/cityrepdata.c:457
+#: client/cityrepdata.c:461
msgid "Workers: Happy"
msgstr "Travailleurs : Heureux"
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
msgid "?Content workers:C"
msgstr "?Travailleurs contents:C"
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
msgid "Workers: Content"
msgstr "Travailleurs : Contents"
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
msgid "?Unhappy workers:U"
msgstr "?travailleurs Mécontents:M"
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
msgid "Workers: Unhappy"
msgstr "Travailleurs : Mécontents"
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
msgid "?Angry workers:A"
msgstr "?Travailleurs révoltés:R"
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
msgid "Workers: Angry"
msgstr "Travailleurs : Révoltés"
-#: client/cityrepdata.c:465 client/gui-xaw/citydlg.c:2401
-#: data/default/units.ruleset:238
-msgid "Workers"
+#: client/cityrepdata.c:469 client/gui-xaw/citydlg.c:2402
+#, fuzzy
+msgid "?city:Workers"
msgstr "Travailleurs"
-#: client/cityrepdata.c:466
+#: client/cityrepdata.c:470
msgid "?happy/content/unhappy/angry:H/C/U/A"
msgstr "?happy/content/unhappy/angry:H/C/M/R"
-#: client/cityrepdata.c:467
+#: client/cityrepdata.c:471
msgid "Workers: Happy, Content, Unhappy, Angry"
msgstr "Travailleurs: Heureux, Contents, Mécontents, Révoltés"
-#: client/cityrepdata.c:470 client/cityrepdata.c:472
+#: client/cityrepdata.c:474 client/cityrepdata.c:476
msgid "Best"
msgstr "Meilleure"
-#: client/cityrepdata.c:470
+#: client/cityrepdata.c:474
msgid "attack"
msgstr "attaque"
-#: client/cityrepdata.c:471
+#: client/cityrepdata.c:475
msgid "Best attacking units"
msgstr "Meilleures unités d'attaque"
-#: client/cityrepdata.c:472
+#: client/cityrepdata.c:476
msgid "defense"
msgstr "défense"
-#: client/cityrepdata.c:473
+#: client/cityrepdata.c:477
msgid "Best defending units"
msgstr "Meilleures unités défensives"
-#: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
-#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
-#: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
-#: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
-#: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
-#: client/gui-win32/menu.c:351 client/gui-win32/repodlgs.c:616
-#: client/gui-win32/repodlgs.c:707 client/gui-win32/repodlgs.c:716
-#: client/gui-xaw/menu.c:157 client/gui-xaw/menu.c:219
-#: client/gui-xaw/menu.c:242 client/gui-xaw/repodlgs.c:881
-#: client/gui-xaw/repodlgs.c:1069 data/Freeciv.in:1895 data/helpdata.txt:909
+#: client/cityrepdata.c:478 client/cityrepdata.c:482
+#: client/gui-gtk-2.0/cityrep.c:1437 client/gui-gtk-2.0/cityrep.c:1456
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-gtk-2.0/cityrep.c:1494
+#: client/gui-gtk-2.0/cityrep.c:1514 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/repodlgs.c:960 client/gui-sdl/helpdlg.c:688
+#: client/gui-sdl/mapctrl.c:1605 client/gui-sdl/optiondlg.c:1827
+#: client/gui-sdl/repodlgs.c:356 client/gui-win32/menu.c:351
+#: client/gui-win32/repodlgs.c:616 client/gui-win32/repodlgs.c:707
+#: client/gui-win32/repodlgs.c:716 client/gui-xaw/menu.c:157
+#: client/gui-xaw/menu.c:219 client/gui-xaw/menu.c:242
+#: client/gui-xaw/repodlgs.c:881 client/gui-xaw/repodlgs.c:1069
+#: data/Freeciv.in:1895 data/helpdata.txt:909
msgid "Units"
msgstr "Unités"
#. TRANS: Header "Number of units inside city"
-#: client/cityrepdata.c:476
+#: client/cityrepdata.c:480
msgid "?Present (units):Here"
msgstr "?Unités présentes:Ici"
-#: client/cityrepdata.c:477
+#: client/cityrepdata.c:481
msgid "Number of units present"
msgstr "Nombre d'unités présentes"
#. TRANS: Header "Number of units supported by given city"
-#: client/cityrepdata.c:480
+#: client/cityrepdata.c:484
msgid "?Supported (units):Owned"
msgstr "?Unités supportées:Sup."
-#: client/cityrepdata.c:481
+#: client/cityrepdata.c:485
msgid "Number of units supported"
msgstr "Nombre d'unités supportées"
#. TRANS: Header "It will take this many turns before city grows"
-#: client/cityrepdata.c:484
+#: client/cityrepdata.c:488
msgid "?food (population):Grow"
msgstr "?Norriture (poplation):Croissance"
-#: client/cityrepdata.c:485 client/cityrepdata.c:530
+#: client/cityrepdata.c:489 client/cityrepdata.c:528
msgid "?Stock/Target:(Have/Need)"
msgstr "?Stock/Objectif:(Stock/Besoin)"
-#: client/cityrepdata.c:486
+#: client/cityrepdata.c:490
msgid "Turns until growth/famine"
msgstr "Tours avant croissance/famine"
-#: client/cityrepdata.c:488
-msgid "?size [short]:Sz"
-msgstr "?Taille [court]:T"
-
-#: client/cityrepdata.c:488
-msgid "Size"
-msgstr "Taille"
-
-#: client/cityrepdata.c:492
-msgid "?city:Name"
-msgstr "?city:Nom"
-
-#: client/cityrepdata.c:492 client/gui-sdl/cityrep.c:169
-msgid "City Name"
-msgstr "Nom Ville"
-
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
msgid "Surplus"
msgstr "Surplus"
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
msgid "?food/production/trade:F/P/T"
msgstr "?food/production/trade:N/P/C"
-#: client/cityrepdata.c:496
+#: client/cityrepdata.c:494
msgid "Surplus: Food, Production, Trade"
msgstr "Surplus: Nourriture, Production, Commerce"
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
msgid "?Food surplus [short]:+F"
msgstr "?Surplus de nourriture [court]:+N"
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
msgid "Surplus: Food"
msgstr "Surplus : Nourriture"
-#: client/cityrepdata.c:500
+#: client/cityrepdata.c:498
msgid "?Production surplus [short]:+P"
msgstr "?Surplus de production [court]:+P"
-#: client/cityrepdata.c:501
+#: client/cityrepdata.c:499
msgid "Surplus: Production"
msgstr "Surplus : Production"
-#: client/cityrepdata.c:502
+#: client/cityrepdata.c:500
msgid "?Production loss (waste) [short]:-P"
msgstr "?Perte de production (gaspillage) [court]:-P"
-#: client/cityrepdata.c:503
+#: client/cityrepdata.c:501
msgid "Waste"
msgstr "Gaspillage"
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
msgid "?Trade surplus [short]:+T"
msgstr "?Surplus de Commerce [court]:+C"
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
msgid "Surplus: Trade"
msgstr "Surplus : Commerce"
-#: client/cityrepdata.c:506
+#: client/cityrepdata.c:504
msgid "?Trade loss (corruption) [short]:-T"
msgstr "?Perte de commerce (corruption) [court]:-C"
-#: client/cityrepdata.c:507
+#: client/cityrepdata.c:505
msgid "Corruption"
msgstr "Corruption"
-#: client/cityrepdata.c:509 client/gui-gtk-2.0/repodlgs.c:654
+#: client/cityrepdata.c:507 client/gui-gtk-2.0/repodlgs.c:654
#: client/gui-sdl/mapctrl.c:1400 client/gui-win32/repodlgs.c:334
#: client/gui-xaw/menu.c:222 client/gui-xaw/repodlgs.c:644
#: client/gui-xaw/repodlgs.c:773 data/Freeciv.in:1819
msgid "Economy"
msgstr "Économie"
-#: client/cityrepdata.c:509
+#: client/cityrepdata.c:507
msgid "?gold/luxury/science:G/L/S"
msgstr "?gold/luxury/science:O/L/S"
-#: client/cityrepdata.c:510
+#: client/cityrepdata.c:508
msgid "Economy: Gold, Luxuries, Science"
msgstr "Économie: Or, Luxe, Science"
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
msgid "?Gold:G"
msgstr "?Or:O"
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
msgid "Economy: Gold"
msgstr "Économie : Or"
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
msgid "?Luxury:L"
msgstr "?Biens de luxe:L"
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
msgid "Economy: Luxury"
msgstr "Économie : Luxe"
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
msgid "?Science:S"
msgstr "?Science:S"
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
msgid "Economy: Science"
msgstr "Économie : Science"
-#: client/cityrepdata.c:518
+#: client/cityrepdata.c:516
msgid "?number_trade_routes:n"
msgstr "?nombre_de_routes_commerciales:n"
-#: client/cityrepdata.c:518
+#: client/cityrepdata.c:516
msgid "?number_trade_routes:R"
msgstr "?nombre_de_routes_commerciales:RC"
-#: client/cityrepdata.c:519
+#: client/cityrepdata.c:517
msgid "Number of Trade Routes"
msgstr "Nombre de routes commerciales"
-#: client/cityrepdata.c:521
+#: client/cityrepdata.c:519
msgid "?pollution [short]:Pol"
msgstr "?Pollution:Pol"
-#: client/cityrepdata.c:523
+#: client/cityrepdata.c:521
msgid "?cma:Governor"
msgstr "Gouverneur"
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
-#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
-#: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
-#: data/Freeciv.in:1459 data/helpdata.txt:820
+#: client/cityrepdata.c:521 client/gui-gtk-2.0/cityrep.c:1766
+#: client/gui-sdl/citydlg.c:3809 client/gui-sdl/cma_fe.c:858
+#: client/gui-win32/citydlg.c:726 data/Freeciv.in:1459 data/helpdata.txt:820
msgid "Citizen Governor"
msgstr "Gouverneur"
-#: client/cityrepdata.c:526
+#: client/cityrepdata.c:524
msgid "Turns/Buy"
msgstr "Tours/Coût de l'achat"
-#: client/cityrepdata.c:529 client/cityrepdata.c:531
+#: client/cityrepdata.c:527 client/cityrepdata.c:529
msgid "Currently Building"
msgstr "Construction en cours"
-#: client/cityrepdata.c:575
+#: client/cityrepdata.c:573
msgid "?specialist:S"
msgstr "?specialist:S"
-#: client/cityrepdata.c:578
+#: client/cityrepdata.c:576
msgid "Specialists"
msgstr "Spécialistes"
-#: client/civclient.c:239
+#: client/civclient.c:240
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr " -a, --autoconnect\t\tConnexion automatique à un serveur\n"
-#: client/civclient.c:249
+#: client/civclient.c:250
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:251
+#: client/civclient.c:252
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:253
+#: client/civclient.c:254
msgid " -n, --name NAME\tUse NAME as name\n"
msgstr " -n, --name N\t\tUtiliser le nom N\n"
-#: client/civclient.c:255
+#: client/civclient.c:256
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:257
+#: client/civclient.c:258
#, 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:259
+#: client/civclient.c:260
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:262
+#: client/civclient.c:263
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:264
+#: client/civclient.c:265
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:265
+#: client/civclient.c:266
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:268
+#: client/civclient.c:269
#, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -8009,146 +7997,156 @@ msgstr ""
"\t\t\tEssayez \"%s -- --help\" pour plus d'info.\n"
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:273
+#: client/civclient.c:274
#, fuzzy, c-format
msgid "Report bugs at %s\n"
msgstr "Signaler les bogues à %s.\n"
-#: client/civclient.c:297
+#: client/civclient.c:298
#, 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:299 client/civclient.c:314
+#: client/civclient.c:300 client/civclient.c:315
msgid "Try using --help.\n"
msgstr "Essayer d'utiliser --help.\n"
-#: client/civclient.c:312
+#: client/civclient.c:313
#, 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:325
+#: client/civclient.c:326
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr "Option non reconnue: \"%s\"\n"
-#: client/civclient.c:539
+#: client/civclient.c:391
+#, fuzzy, c-format
+msgid "Updating old metaserver address \"%s\"."
+msgstr "metaserver <adresse>"
+
+#: client/civclient.c:394
+#, fuzzy, c-format
+msgid "Default metaserver has been set to \"%s\"."
+msgstr "Option : %s a été positionnée à \"%s\"."
+
+#: client/civclient.c:550
msgid "Game started."
msgstr "Partie commencée."
-#: client/civclient.c:577
+#: client/civclient.c:588
msgid "There was an error while auto connecting; aborting."
msgstr "La connexion automatique a échoué ; abandon."
-#: client/climisc.c:176
+#: client/climisc.c:177
#, c-format
msgid "Changing production of every %s into %s."
msgstr "La production de chaque %s est transformée en production de %s."
-#: client/climisc.c:214
+#: client/climisc.c:215
msgid "?embassy:Both"
msgstr "?embassy:Chacun"
-#: client/climisc.c:216
+#: client/climisc.c:217
msgid "?embassy:Yes"
msgstr "?embassy:Oui"
-#: client/climisc.c:219
+#: client/climisc.c:220
msgid "?embassy:With Us"
msgstr "?embassy:Avec nous"
-#: client/climisc.c:222
+#: client/climisc.c:223
msgid "?embassy:Contact"
msgstr "?embassy:Contact"
-#: client/climisc.c:224
+#: client/climisc.c:225
msgid "?embassy:No Contact"
msgstr "?embassy:Pas de Contact"
-#: client/climisc.c:236
+#: client/climisc.c:237
msgid "?vision:Both"
msgstr "?vision:Ensemble"
-#: client/climisc.c:238
+#: client/climisc.c:239
msgid "?vision:To Them"
msgstr "?vision:À eux"
-#: client/climisc.c:241
+#: client/climisc.c:242
msgid "?vision:To Us"
msgstr "?vision:À nous"
-#: client/climisc.c:257 client/climisc.c:264
+#: client/climisc.c:258 client/climisc.c:265
#, c-format
msgid "The %s give %s"
msgstr "Les %s donnent %s"
-#: client/climisc.c:268
+#: client/climisc.c:269
#, c-format
msgid "The %s give unknown city."
msgstr "Les %s donnent une ville inconnue."
-#: client/climisc.c:273
+#: client/climisc.c:274
#, c-format
msgid "The %s give %d gold"
msgstr "Les %s donnent %d lingots"
-#: client/climisc.c:278
+#: client/climisc.c:279
#, c-format
msgid "The %s give their worldmap"
msgstr "Les %s donnent leur carte du monde"
-#: client/climisc.c:282
+#: client/climisc.c:283
#, c-format
msgid "The %s give their seamap"
msgstr "Les %s donnent leur carte des mers"
# AR : trouver éventuellement des versions non interdites aux moins de 16 ans :)
-#: client/climisc.c:286
+#: client/climisc.c:287
msgid "The parties agree on a cease-fire"
msgstr "Les parties acceptent un cessez-le-feu"
-#: client/climisc.c:289
+#: client/climisc.c:290
msgid "The parties agree on a peace"
msgstr "Les parties acceptent la paix"
-#: client/climisc.c:292
+#: client/climisc.c:293
msgid "The parties create an alliance"
msgstr "Les parties forment une alliance"
-#: client/climisc.c:295
+#: client/climisc.c:296
#, c-format
msgid "The %s give shared vision"
msgstr "Les %s donnent la vue partagée"
-#: client/climisc.c:299
+#: client/climisc.c:300
#, c-format
msgid "The %s give an embassy"
msgstr "Les %s donnent une ambassade"
# AR
-#: client/climisc.c:902
+#: client/climisc.c:906
msgid "Popup Request"
msgstr "Ouverture de fenêtre"
-#: client/climisc.c:932
+#: client/climisc.c:936
msgid "Exporting output window to civgame.log ..."
msgstr "Fenêtre de sortie exportée vers civgame.log ..."
-#: client/climisc.c:936
+#: client/climisc.c:940
msgid "Export complete."
msgstr "Exportation achevée."
-#: client/climisc.c:938
+#: client/climisc.c:942
msgid "Export failed, couldn't write to file."
msgstr "L'exportation a échoué, impossible d'écrire dans le fichier."
-#: client/climisc.c:1038
+#: client/climisc.c:1042
#, c-format
msgid "You don't buy %s in %s!"
msgstr "Vous n'achetez pas %s dans %s !"
-#: client/climisc.c:1056
+#: client/climisc.c:1060
#, c-format
msgid "%s costs %d gold and you only have %d gold."
msgstr "%s coûte %d lingots et vous n'en avez que %d."
@@ -8198,19 +8196,19 @@ msgstr ""
"Autoconnexion au server \"%s\" port %d en tant que \"%s\" chaque %f secondes "
"pendant %d essais"
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1289
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
msgid "novice"
msgstr "novice"
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1289
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1358
msgid "easy"
msgstr "facile"
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1290
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
msgid "normal"
msgstr "normal"
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1290
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
msgid "hard"
msgstr "difficile"
@@ -8239,39 +8237,42 @@ 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
-msgid "We have control of the server (command access level hack)"
+#, 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
-msgid "We can't take control of server, attempting to kill it."
+msgid ""
+"Failed to obtain the required access level to take control of the server. "
+"The server will now be shutdown."
msgstr ""
-"Impossible de prendre le contrôle sur le serveur, tentative de le terminer."
-#: client/control.c:1104
+#: client/control.c:1123
msgid "Only transporter units can be unloaded."
msgstr "Seules les unités de transport peuvent être déchargées."
-#: client/control.c:1353
+#: client/control.c:1425
msgid "Only settler units can be put into auto mode."
msgstr "Seuls les colons peuvent être mis en mode automatique."
-#: client/control.c:1444
+#: client/control.c:1516
msgid "Only nuclear units can do this."
msgstr "Seules les unités nucléaires peuvent faire cela."
-#: client/control.c:1473
+#: client/control.c:1545
msgid "Only paratrooper units can do this."
msgstr "Seuls les parachutistes peuvent faire cela."
-#: client/control.c:1921
+#: client/control.c:2020
msgid "Too far for this unit."
msgstr "Trop loin pour cette unité."
-#: client/control.c:2131 client/control.c:2161 client/control.c:2177
+#: client/control.c:2230 client/control.c:2260 client/control.c:2276
msgid "Didn't find a route to the destination!"
msgstr "Impossible de trouver une route pour cette destination !"
-#: client/control.c:2221
+#: client/control.c:2320
msgid "Oh my! You seem to have no capital!"
msgstr "Hé ! On dirait que vous n'avez pas de capitale !"
@@ -8342,16 +8343,16 @@ msgid "Allows %s (with %s)."
msgstr "Autorise %s (avec %s)."
#. TRANS: preserve single space at beginning
-#: client/helpdata.c:418
+#: client/helpdata.c:416
msgid " Rivers"
msgstr " Rivières"
-#: client/helpdata.c:576
+#: client/helpdata.c:574
#, c-format
msgid "Sorry, no help topic for %s.\n"
msgstr "Désolé, il n'y a pas de rubrique d'aide pour %s.\n"
-#: client/helpdata.c:580
+#: client/helpdata.c:578
#, c-format
msgid ""
"Sorry, no help topic for %s.\n"
@@ -8362,86 +8363,86 @@ msgstr ""
"Cette page est générée automatiquement.\n"
"\n"
-#: client/helpdata.c:670
+#: client/helpdata.c:668
msgid ""
"Requires: Nothing\n"
"\n"
msgstr "Nécessite : rien\n"
-#: client/helpdata.c:675
+#: client/helpdata.c:673
#, c-format
msgid "* The discovery of %s will make %s obsolete.\n"
msgstr "* La découverte de %s va rendre %s obsolète.\n"
-#: client/helpdata.c:694
+#: client/helpdata.c:692
#, c-format
msgid "* Allows all players with knowledge of %s to build %s units.\n"
msgstr "* Permet à tous les joueurs connaissant %s de construire des %s.\n"
-#: client/helpdata.c:706
+#: client/helpdata.c:704
#, c-format
msgid "* Allows %s (with %s).\n"
msgstr "* Autorise %s (avec %s).\n"
# AR
-#: client/helpdata.c:710
+#: client/helpdata.c:708
#, c-format
msgid "* Allows %s.\n"
msgstr "* Autorise %s.\n"
-#: client/helpdata.c:780
+#: client/helpdata.c:778
#, c-format
msgid "* Can only be built if there is %s in the city.\n"
msgstr "* Ne peut être construit qu'en présence de %s dans la ville.\n"
-#: client/helpdata.c:786
+#: client/helpdata.c:784
#, c-format
msgid "* Can only be built with %s as government.\n"
msgstr "* Ne peut être construit que sous le gouvernement %s.\n"
-#: client/helpdata.c:791
+#: client/helpdata.c:789
msgid "* May not be built in cities.\n"
msgstr "* Ne peut pas être construit dans les villes.\n"
-#: client/helpdata.c:794
+#: client/helpdata.c:792
msgid "* Never has a home city.\n"
msgstr "* N'a jamais de ville de rattachement.\n"
-#: client/helpdata.c:797
+#: client/helpdata.c:795
msgid "* Losing this unit will lose you the game!\n"
msgstr "* Perdre cette unité vous fera perdre la partie !\n"
-#: client/helpdata.c:801
+#: client/helpdata.c:799
msgid "* Each player may only have one of this type of unit.\n"
msgstr "* Chaque joueur ne peut avoir qu'une seule unité de ce type.\n"
-#: client/helpdata.c:805
+#: client/helpdata.c:803
#, c-format
msgid "* Requires %d population to build.\n"
msgstr "* Requiert une population de %d pour pouvoir être construit.\n"
-#: client/helpdata.c:811
+#: client/helpdata.c:809
#, c-format
msgid "* Can carry and refuel %d air unit.\n"
msgid_plural "* Can carry and refuel %d air units.\n"
msgstr[0] "* Peut transporter et ravitailler %d unités aériennes.\n"
msgstr[1] "* Peut transporter et ravitailler jusqu'à %d unités aériennes.\n"
-#: client/helpdata.c:816
+#: client/helpdata.c:814
#, c-format
msgid "* Can carry and refuel %d missile unit.\n"
msgid_plural "* Can carry and refuel %d missile units.\n"
msgstr[0] "* Peut transporter et ravitailler %d missile.\n"
msgstr[1] "* Peut transporter et ravitailler jusqu'à %d missiles.\n"
-#: client/helpdata.c:821
+#: client/helpdata.c:819
#, c-format
msgid "* Can carry %d ground unit across water.\n"
msgid_plural "* Can carry %d ground units across water.\n"
msgstr[0] "* Peut transporter %d unité terreste sur la mer.\n"
msgstr[1] "* Peut transporter jusqu'à %d unités terrestres sur la mer.\n"
-#: client/helpdata.c:830
+#: client/helpdata.c:828
msgid ""
"* Can establish trade routes (must travel to target city and must be at "
"least 9 tiles [in Manhattan distance] from this unit's home city).\n"
@@ -8450,133 +8451,133 @@ msgstr ""
"doit être à au moins 9 cases, en distance Manhattan, de la ville de "
"support).\n"
-#: client/helpdata.c:836
+#: client/helpdata.c:834
#, c-format
msgid "* Can help build wonders (adds %d production).\n"
msgstr ""
"* Peut aider à la construction de merveilles (ajoute %d de production).\n"
-#: client/helpdata.c:840
+#: client/helpdata.c:838
msgid "* May not be disbanded.\n"
msgstr "* Ne peut pas être congédié.\n"
-#: client/helpdata.c:842
+#: client/helpdata.c:840
#, c-format
msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
msgstr ""
"* Peut être congédié dans une ville pour récupérer 50%% de son coût de "
"production.\n"
-#: client/helpdata.c:846
+#: client/helpdata.c:844
msgid "* Can build new cities.\n"
msgstr "* Peut fonder des villes.\n"
-#: client/helpdata.c:849
+#: client/helpdata.c:847
#, c-format
msgid "* Can add on %d population to cities of no more than size %d.\n"
msgstr ""
"* Peut ajouter %d de population aux villes en dessous de la taille %d.\n"
-#: client/helpdata.c:858
+#: client/helpdata.c:856
msgid "* Can build roads and railroads.\n"
msgstr "* Peut construire des routes et chemins de fer.\n"
-#: client/helpdata.c:859
+#: client/helpdata.c:857
msgid "* Can build mines on tiles.\n"
msgstr "* Peut construire des mines sur les cases.\n"
-#: client/helpdata.c:860
+#: client/helpdata.c:858
msgid "* Can build irrigation on tiles.\n"
msgstr "* Peut construire des irrigations sur les cases.\n"
-#: client/helpdata.c:865
+#: client/helpdata.c:863
msgid "* Can build farmland.\n"
msgstr "* Peut construire une ferme.\n"
-#: client/helpdata.c:869
+#: client/helpdata.c:867
#, c-format
msgid "* Can build farmland (if %s is known).\n"
msgstr "* Peut construire une ferme (si connaissance de %s).\n"
-#: client/helpdata.c:873
+#: client/helpdata.c:871
#, c-format
msgid "* Can build farmland (if any of the following are known: %s).\n"
msgstr ""
"* Peut construire des fermes (si connaissance de 1 au moins parmi %s).\n"
-#: client/helpdata.c:881
+#: client/helpdata.c:879
msgid "* Can build fortresses.\n"
msgstr "* Peut construire des forteresses.\n"
-#: client/helpdata.c:885
+#: client/helpdata.c:883
#, c-format
msgid "* Can build fortresses (if %s is known).\n"
msgstr "* Peut construire des fortresses (si connaissance de %s).\n"
-#: client/helpdata.c:889
+#: client/helpdata.c:887
#, c-format
msgid "* Can build fortresses (if any of the following are known: %s).\n"
msgstr ""
"* Peut construire des forteresses (si connaissance de 1 au moins parmi %s).\n"
-#: client/helpdata.c:895
+#: client/helpdata.c:893
msgid "* Can clean pollution from tiles.\n"
msgstr "* Peut nettoyer la pollution des cases.\n"
-#: client/helpdata.c:896
+#: client/helpdata.c:894
msgid "* Can clean nuclear fallout from tiles.\n"
msgstr "* Peut nettoyer les retombées nucléaires.\n"
-#: client/helpdata.c:899
+#: client/helpdata.c:897
msgid "* Can transform tiles.\n"
msgstr "* Peut transformer les cases.\n"
-#: client/helpdata.c:902
+#: client/helpdata.c:900
msgid "* Can build airbases.\n"
msgstr "* Peut construire des bases aériennes.\n"
-#: client/helpdata.c:906
+#: client/helpdata.c:904
#, c-format
msgid "* May fortify, granting a 50%% defensive bonus.\n"
msgstr "* Peut se retrancher, obtenant un bonus défensif de 50%%.\n"
-#: client/helpdata.c:909
+#: client/helpdata.c:907
msgid "* May pillage to destroy infrastructure from tiles.\n"
msgstr "* Peut piller pour détruire les infrastructures des cases.\n"
-#: client/helpdata.c:913
+#: client/helpdata.c:911
msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
msgstr ""
"* Peut effectuer le travail d'un diplomate, avec les compétences spéciales "
"d'un espion.\n"
-#: client/helpdata.c:916
+#: client/helpdata.c:914
msgid "* Can perform diplomatic actions.\n"
msgstr "* Peut effectuer le travail d'un diplomate.\n"
-#: client/helpdata.c:920
+#: client/helpdata.c:918
msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
msgstr "* Ne perdra jamais un combat diplomate contre diplomate.\n"
-#: client/helpdata.c:923
+#: client/helpdata.c:921
msgid "* May not be bribed.\n"
msgstr "* Ne peut pas être soudoyée.\n"
-#: client/helpdata.c:926
+#: client/helpdata.c:924
msgid "* Can attack enemy air units.\n"
msgstr "* Peut attaquer les unités aériennes.\n"
-#: client/helpdata.c:930
+#: client/helpdata.c:928
msgid "* Is invisible except when next to an enemy unit or city.\n"
msgstr "* Est invisible sauf si adjacent à une unité ou ville ennemie.\n"
-#: client/helpdata.c:934
+#: client/helpdata.c:932
msgid "* Can only attack units on ocean squares (no land attacks).\n"
msgstr ""
"* Ne peut attaquer que les unités sur des cases de mer (pas d'attaque sur "
"terre).\n"
-#: client/helpdata.c:938
+#: client/helpdata.c:936
msgid ""
"* Can attack from aboard sea units: against enemy cities and onto land "
"squares.\n"
@@ -8584,40 +8585,40 @@ msgstr ""
"* Peut attaquer directement depuis un navire : contre des villes ennemies et "
"les cases terrestres.\n"
-#: client/helpdata.c:943
+#: client/helpdata.c:941
#, c-format
msgid "* Can be paradropped from a friendly city (Range: %d).\n"
msgstr "* Peut être parachuté depuis une ville amie (portée : %d).\n"
-#: client/helpdata.c:949
+#: client/helpdata.c:947
msgid "* Gets double defense against units specified as 'mounted'.\n"
msgstr "* Double les points de défense contre les unités dites \"montées\".\n"
-#: client/helpdata.c:953
+#: client/helpdata.c:951
msgid "* Counts as 'mounted' against certain defenders.\n"
msgstr "* Compte comme une unité \"montée\" contre certains défenseurs.\n"
-#: client/helpdata.c:957
+#: client/helpdata.c:955
msgid "* A missile unit: gets used up in making an attack.\n"
msgstr " * Unité de type missile : est perdu lorsqu'il attaque.\n"
-#: client/helpdata.c:960
+#: client/helpdata.c:958
msgid "* Making an attack ends this unit's turn.\n"
msgstr "* Cette unité termine son tour lorsqu'elle attaque.\n"
-#: client/helpdata.c:964
+#: client/helpdata.c:962
msgid "* This unit's attack causes a nuclear explosion!\n"
msgstr "* Attaquer avec cette unité engendre une explosion nucléaire!\n"
-#: client/helpdata.c:968
+#: client/helpdata.c:966
msgid "* Gets double firepower when attacking cities.\n"
msgstr "* Bénéficie d'une puissance de feu doublée en attaquant les villes.\n"
-#: client/helpdata.c:971
+#: client/helpdata.c:969
msgid "* Ignores the effects of city walls.\n"
msgstr "* Ignore les effets des remparts.\n"
-#: client/helpdata.c:975
+#: client/helpdata.c:973
#, c-format
msgid ""
"* Does bombard attacks (%d per turn). These attacks will only damage (never "
@@ -8627,40 +8628,40 @@ msgstr ""
"qu'endommager (jamais tuer) le défenseur mais sont sans risque pour "
"l'attaquant.\n"
-#: client/helpdata.c:982
+#: client/helpdata.c:980
msgid "* Gets quintuple defense against missiles and aircraft.\n"
msgstr "* Quintuple ses points de défense contre les missiles et les avions.\n"
-#: client/helpdata.c:986
+#: client/helpdata.c:984
msgid "* Ignores terrain effects (treats all squares as roads).\n"
msgstr ""
"* Ignore les différences entre types de terrain (traite toutes les cases "
"comme des routes).\n"
-#: client/helpdata.c:989
+#: client/helpdata.c:987
msgid "* Ignores zones of control.\n"
msgstr "* Ignore les zones de contrôle.\n"
-#: client/helpdata.c:993
+#: client/helpdata.c:991
msgid "* A non-military unit (cannot attack; no martial law).\n"
msgstr "* Unité non militaire (ne peut attaquer ; pas de loi martiale).\n"
-#: client/helpdata.c:997
+#: client/helpdata.c:995
msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
msgstr ""
"* Une unité de campagne : crée du mécontentement, même si elle n'est pas "
"agressive.\n"
-#: client/helpdata.c:1000
+#: client/helpdata.c:998
msgid "* Will never achieve veteran status.\n"
msgstr "* N'obtiendra jamais le statut de vétéran.\n"
-#: client/helpdata.c:1002
+#: client/helpdata.c:1000
msgid "* May become veteran through training or combat.\n"
msgstr "* Peut devenir vétéran par voie d'entraînement ou du combat.\n"
# AR
-#: client/helpdata.c:1008
+#: client/helpdata.c:1006
#, c-format
msgid ""
"* Must end turn in a city or next to land, or has a 50%% risk of being lost "
@@ -8669,12 +8670,12 @@ msgstr ""
"* Doit terminer son tour dans une ville ou près des terres, ou bien a 50%% "
"de chances de disparaître en mer.\n"
-#: client/helpdata.c:1012
+#: client/helpdata.c:1010
#, c-format
msgid "* The discovery of %s reduces the risk to 25%%.\n"
msgstr "* La découverte de %s réduit le risque à 25%%.\n"
-#: client/helpdata.c:1017
+#: client/helpdata.c:1015
#, c-format
msgid "* %s reduces the risk to 12%%.\n"
msgstr "* %s réduit le risque à 12%%.\n"
@@ -8683,28 +8684,28 @@ msgstr "* %s r
#. * last two elements
#. TRANS: List of possible output types has this between
#. * last two elements
-#: client/helpdata.c:1068 client/helpdata.c:1402
+#: client/helpdata.c:1066 client/helpdata.c:1400
msgid " or "
msgstr " ou "
-#: client/helpdata.c:1070 client/helpdata.c:1390
+#: client/helpdata.c:1068 client/helpdata.c:1388
msgid "?or:, "
msgstr "?ou:, "
-#: client/helpdata.c:1082
+#: 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"
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:1124
+#: client/helpdata.c:1122
#, 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:1129
+#: client/helpdata.c:1127
#, c-format
msgid ""
"To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8713,91 +8714,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:1137
+#: client/helpdata.c:1135
msgid "You cannot research this technology."
msgstr "Vous ne pouvez pas rechercher cette technologie."
-#: client/helpdata.c:1141
+#: client/helpdata.c:1139
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:1153
+#: client/helpdata.c:1151
#, 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:1158
+#: client/helpdata.c:1156
#, 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:1161
+#: client/helpdata.c:1159
#, 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:1165
+#: client/helpdata.c:1163
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:1170
+#: client/helpdata.c:1168
#, 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:1177
+#: client/helpdata.c:1175
#, c-format
msgid "* Allows %s to build fortresses.\n"
msgstr "* Permet aux %s de construire des forteresses.\n"
-#: client/helpdata.c:1185
+#: client/helpdata.c:1183
#, c-format
msgid "* Allows %s to build airbases.\n"
msgstr "* Permet aux %s de construire des bases aériennes.\n"
-#: client/helpdata.c:1194
+#: client/helpdata.c:1192
#, 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:1202
+#: client/helpdata.c:1200
#, 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:1236
+#: client/helpdata.c:1234
msgid "* Pollution cannot be generated on this terrain."
msgstr "* Aucune pollution ne peut apparaître sur ce terrain."
-#: client/helpdata.c:1241
+#: client/helpdata.c:1239
msgid "* You cannot build cities on this terrain."
msgstr "* Vous ne pouvez pas construire de ville sur ce terrain."
-#: client/helpdata.c:1247
+#: client/helpdata.c:1245
msgid "* The coastline of this terrain is unsafe."
msgstr "* Les lignes côtières de ce terrain sont dangereuses."
-#: client/helpdata.c:1252
+#: client/helpdata.c:1250
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:1257
+#: client/helpdata.c:1255
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:1307
+#: client/helpdata.c:1305
msgid "Features:\n"
msgstr "Caractéristiques :\n"
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1413 client/helpdata.c:1414
+#: client/helpdata.c:1411 client/helpdata.c:1412
msgid "?outputlist: Nothing "
msgstr " vide "
-#: client/helpdata.c:1421
+#: client/helpdata.c:1419
#, fuzzy, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
@@ -8812,7 +8813,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:1431
+#: client/helpdata.c:1429
#, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8822,30 +8823,30 @@ msgstr ""
"par les unités.\n"
#. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1439
+#: client/helpdata.c:1437
#, 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:1444
+#: client/helpdata.c:1442
#, 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:1449
+#: client/helpdata.c:1447
#, 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:1453
+#: client/helpdata.c:1451
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:1462
+#: client/helpdata.c:1460
#, c-format
msgid "* Each of your cities will avoid paying %d %s towards unit upkeep.\n"
msgstr ""
@@ -8854,12 +8855,12 @@ msgstr ""
#. TRANS: Amount is subtracted from upkeep cost
#. * for each upkeep type.
-#: client/helpdata.c:1470
+#: client/helpdata.c:1468
#, 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:1477
+#: client/helpdata.c:1475
#, c-format
msgid "* Chance of civil war is %d%% if you lose your capital.\n"
msgstr ""
@@ -8867,7 +8868,7 @@ msgstr ""
"capitale.\n"
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1484
+#: client/helpdata.c:1482
#, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -8877,7 +8878,7 @@ msgstr ""
"civilisation apparaît quand vous avez %d villes.\n"
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1491
+#: client/helpdata.c:1489
#, c-format
msgid ""
"* After the first unhappy citizen due to city size, for each %d additional "
@@ -8886,18 +8887,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:1499
+#: client/helpdata.c:1497
#, 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:1504
+#: client/helpdata.c:1502
msgid "Has unlimited science/gold/luxuries rates.\n"
msgstr "Pas de limite pour les taux de science/or/luxe.\n"
-#: client/helpdata.c:1509
+#: client/helpdata.c:1507
#, fuzzy, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
@@ -8912,7 +8913,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:1521
+#: client/helpdata.c:1519
#, 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"
@@ -8924,7 +8925,7 @@ msgstr[1] ""
"martiale.\n"
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1532
+#: client/helpdata.c:1530
#, c-format
msgid ""
"* You may grow your cities by means of celebrations. Your cities must be at "
@@ -8933,15 +8934,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:1538
+#: client/helpdata.c:1536
msgid "* Your units cannot be bribed.\n"
msgstr "* Vos unités ne peuvent pas être soudoyées.\n"
-#: client/helpdata.c:1541
+#: client/helpdata.c:1539
msgid "* Your cities cannot be incited.\n"
msgstr "* Vos villes ne peuvent pas être incitées à la révolte.\n"
-#: client/helpdata.c:1545
+#: client/helpdata.c:1543
msgid ""
"* Government will fall into anarchy if any city is in disorder for more than "
"two turns in a row.\n"
@@ -8949,16 +8950,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:1551
+#: client/helpdata.c:1549
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:1555
+#: client/helpdata.c:1553
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:1559
+#: client/helpdata.c:1557
msgid ""
"* Buildings that normally confer bonuses against unhappiness will instead "
"give gold.\n"
@@ -8966,25 +8967,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:1563
+#: client/helpdata.c:1561
msgid "* Pays no upkeep for fanatics.\n"
msgstr "* Ne paye pas d'entretien pour les fanatiques.\n"
-#: client/helpdata.c:1566
+#: client/helpdata.c:1564
msgid "* Has no unhappy citizens.\n"
msgstr "* N'a pas de citoyen mécontent.\n"
-#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
+#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
#, c-format
msgid "* Veteran %s units.\n"
msgstr "* %s unités vétérantes.\n"
-#: client/helpdata.c:1587
+#: client/helpdata.c:1585
msgid "* Veteran units.\n"
msgstr "* Unité vétérante.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1593
+#: client/helpdata.c:1591
#, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8994,7 +8995,7 @@ msgstr ""
"quand la ville n'est pas en extase.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1602
+#: client/helpdata.c:1600
#, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -9004,117 +9005,117 @@ msgstr ""
"quand la ville est en extase.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1610
+#: client/helpdata.c:1608
#, 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:1619
+#: client/helpdata.c:1617
#, 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:1627
+#: client/helpdata.c:1625
#, 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:1632
+#: client/helpdata.c:1630
#, 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:1637
+#: client/helpdata.c:1635
#, 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:1645
+#: client/helpdata.c:1643
#, 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:1651
+#: client/helpdata.c:1649
#, 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:1657
+#: client/helpdata.c:1655
#, 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:1674
+#: client/helpdata.c:1672
#, 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:1701
+#: client/helpdata.c:1699
#, c-format
msgid "%s%d %s"
msgstr "%s%d %s"
-#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1700 client/helpdata.c:1708 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:1709
+#: client/helpdata.c:1707
#, c-format
msgid "%s%d unhappy"
msgstr "%s%d mécontents"
-#: client/mapctrl_common.c:382
+#: client/mapctrl_common.c:399
#, c-format
msgid "You don't know how to build %s!"
msgstr "Vous ne savez pas comment construire %s !"
-#: client/mapctrl_common.c:392
+#: client/mapctrl_common.c:409
#, c-format
msgid "Copy %s to clipboard."
msgstr "Copie de %s vers le presse-papiers."
-#: client/mapctrl_common.c:408
+#: client/mapctrl_common.c:425
msgid "Clipboard is empty."
msgstr "Le presse-papiers est vide."
-#: client/options.c:98
+#: client/options.c:102
msgid "Graphics"
msgstr "Graphiques"
-#: client/options.c:99
+#: client/options.c:103
msgid "Overview"
msgstr "Aperçu global"
-#: client/options.c:100
+#: client/options.c:104
msgid "Sound"
msgstr "Son"
-#: client/options.c:101
+#: client/options.c:105
msgid "Interface"
msgstr "Interface"
-#: client/options.c:102
+#: client/options.c:106
msgid "Network"
msgstr "Réseau"
-#: client/options.c:107
+#: client/options.c:111
msgid "Login name"
msgstr "Nom d'utilisateur"
-#: client/options.c:108
+#: client/options.c:112
msgid ""
"This is the default login username that will be used in the connection "
"dialogs or with the -a command-line parameter."
@@ -9122,11 +9123,11 @@ msgstr ""
"C'est le nom d'utilisateur par défaut qui sera utilisé dans le dialogue de "
"connexion ou avec le paramètre -a en ligne de commande."
-#: client/options.c:113
+#: client/options.c:117
msgid "Server"
msgstr "Serveur"
-#: client/options.c:114
+#: client/options.c:118
msgid ""
"This is the default server hostname that will be used in the connection "
"dialogs or with the -a command-line parameter."
@@ -9134,11 +9135,11 @@ msgstr ""
"C'est le nom de serveur par défaut qui sera utilisé dans le dialogue de "
"connexion ou avec le paramètre -a en ligne de commande."
-#: client/options.c:119
+#: client/options.c:123
msgid "Server port"
msgstr "Port du serveur"
-#: client/options.c:120
+#: client/options.c:124
msgid ""
"This is the default server port that will be used in the connection dialogs "
"or with the -a command-line parameter."
@@ -9146,11 +9147,11 @@ 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:125 client/gui-win32/connectdlg.c:912 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
msgid "Metaserver"
msgstr "Métaserveur"
-#: client/options.c:126
+#: client/options.c:130
msgid ""
"The metaserver is a host that the client contacts to find out about games on "
"the internet. Don't change this from its default value unless you know what "
@@ -9160,11 +9161,11 @@ msgstr ""
"informations sur les parties par Internet. ne changez pas sa valeur par "
"défaut à moins que vous ne sachiez ce que vous faites."
-#: client/options.c:132
+#: client/options.c:136
msgid "Soundset"
msgstr "Jeu de sons"
-#: client/options.c:133
+#: client/options.c:137
msgid ""
"This is the soundset that will be used. Changing this is the same as using "
"the -S command-line parameter."
@@ -9172,11 +9173,11 @@ msgstr ""
"C'est le jeu de sons qui sera utilisé. Changer ceci est la même chose que "
"d'utiliser le paramètre -S en ligne de commande."
-#: client/options.c:138
+#: client/options.c:142
msgid "Sound plugin"
msgstr "Plugin de son"
-#: client/options.c:139
+#: client/options.c:143
msgid ""
"If you have a problem with sound, try changing the sound plugin. The new "
"plugin won't take effect until you restart Freeciv. Changing this is the "
@@ -9187,19 +9188,19 @@ msgstr ""
"est la même chose que d'utiliser l'option -P en ligne de commande."
# AR
-#: client/options.c:144 client/gui-sdl/gui_main.c:162
+#: client/options.c:148 client/gui-sdl/gui_main.c:162
msgid "Theme"
msgstr "Thème"
-#: client/options.c:145
+#: client/options.c:149
msgid "By changing this option you change the active theme."
msgstr "En changeant cette option, vous modifiez le thème courant utilisé."
-#: client/options.c:148
+#: client/options.c:152
msgid "Tileset"
msgstr "Jeu de textures"
-#: client/options.c:149
+#: client/options.c:153
msgid ""
"By changing this option you change the active tileset. This is the same as "
"using the -t command-line parameter."
@@ -9207,11 +9208,11 @@ msgstr ""
"En changeant cette option, vous modifiez le jeux de textures utilisé. Ceci "
"est la même chose que d'utiliser le paramètre -t en ligne de commande."
-#: client/options.c:156
+#: client/options.c:160
msgid "Solid unit background color"
msgstr "Couleur de fond des unités"
-#: client/options.c:157
+#: client/options.c:161
msgid ""
"Setting this option will cause units on the map view to be drawn with a "
"solid background color instead of the flag backdrop."
@@ -9220,11 +9221,11 @@ msgstr ""
"une couleur de fond solide."
# AR
-#: client/options.c:161 client/gui-sdl/optiondlg.c:960
+#: client/options.c:165 client/gui-sdl/optiondlg.c:960
msgid "Sound bell at new turn"
msgstr "Bip à chaque nouveau tour"
-#: client/options.c:162
+#: client/options.c:166
msgid ""
"Set this option to have a \"bell\" event be generated at the start of a new "
"turn. You can control the behavior of the \"bell\" event by editing the "
@@ -9234,11 +9235,11 @@ msgstr ""
"en début de tour. Vous pouvez contrôler le fonctionnement de la \"sonnerie\" "
"en modifiant les options des messages."
-#: client/options.c:168
+#: client/options.c:172
msgid "Unit movement animation time (milliseconds)"
msgstr "Temps d'animation des unités (millisecondes)"
-#: client/options.c:169
+#: client/options.c:173
msgid ""
"This option controls how long unit \"animation\" takes when a unit moves on "
"the map view. Set it to 0 to disable animation entirely."
@@ -9246,11 +9247,11 @@ msgstr ""
"Cette option contrôle la durée de l'\"animation\" d'une unité en mouvement "
"sur la carte. Réglez-la sur 0 pour désactiver entièrement l'animation."
-#: client/options.c:174
+#: client/options.c:178
msgid "Mapview recentering time (milliseconds)"
msgstr "Temps de recentrage de la carte (millisecondes)"
-#: client/options.c:175
+#: client/options.c:179
msgid ""
"When the map view is recentered, it will slide smoothly over the map to its "
"new position. This option controls how long this slide lasts. Set it to 0 "
@@ -9260,11 +9261,11 @@ msgstr ""
"position. Cette option contrôle la durée du glissement. Réglez-la à 0 pour "
"désactiver entièrement l'effet de \"panoramique\"."
-#: client/options.c:180 client/gui-sdl/optiondlg.c:1014
+#: client/options.c:184 client/gui-sdl/optiondlg.c:1014
msgid "Show combat animation"
msgstr "Montrer les animations de combats"
-#: client/options.c:181
+#: client/options.c:185
msgid ""
"Disabling this option will turn off combat animation between units on the "
"mapview."
@@ -9272,11 +9273,11 @@ msgstr ""
"Si cette option est désactivée, les animations de combats entre unités ne "
"seront pas affichées sur la carte."
-#: client/options.c:184
+#: client/options.c:188
msgid "Draw the citybar"
msgstr "Boite d'info. de ville"
-#: client/options.c:185
+#: client/options.c:189
msgid ""
"Setting this option will display a 'citybar' containing useful information "
"beneath each city. Disabling this option will display only the city's name "
@@ -9286,11 +9287,11 @@ msgstr ""
"des informations utiles au dessous de chaque ville. Désactiver cette option "
"affichera uniquement le nom de la ville et optionnellement la production."
-#: client/options.c:191
+#: client/options.c:195
msgid "Show icons in the technology tree"
msgstr "Afficher les icônes dans l'arbre des technologies"
-#: client/options.c:192
+#: client/options.c:196
msgid ""
"Setting this option will display icons on the technology tree diagram. "
"Turning this option off makes the technology tree more compact."
@@ -9299,11 +9300,11 @@ msgstr ""
"arborescent des technologies. Désactiver cette option permet d'avoir un "
"arbre plus compact."
-#: client/options.c:197
+#: client/options.c:201
msgid "Draw shield graphics for units"
msgstr "Afficher un blason pour les unités"
-#: client/options.c:198
+#: client/options.c:202
msgid ""
"Setting this option will draw a shield icon as the flags on units. If "
"unset, the full flag will be drawn."
@@ -9311,11 +9312,11 @@ msgstr ""
"Si cette option est activée, un blason est utilisée à la place du drapeau "
"pour les unités. Si désactivé, le drapeau complet sera dessiné."
-#: client/options.c:202
+#: client/options.c:206
msgid "Manual Turn Done in AI Mode"
msgstr "Tour manuel en mode IA "
-#: client/options.c:203
+#: client/options.c:207
msgid ""
"Disable this option if you do not want to press the Turn Done button "
"manually when watching an AI player."
@@ -9323,11 +9324,11 @@ msgstr ""
"Si cette option est désactivée vous n'aurez pas besoin de signaler la fin du "
"tour en pressant le bouton quand vous observez un joueur IA."
-#: client/options.c:207 client/gui-sdl/optiondlg.c:1121
+#: client/options.c:211 client/gui-sdl/optiondlg.c:1121
msgid "Auto Center on Units"
msgstr "Auto Centrer sur les Unités"
-#: client/options.c:208
+#: client/options.c:212
msgid ""
"Set this option to have the active unit centered automatically when the unit "
"focus changes."
@@ -9335,11 +9336,11 @@ msgstr ""
"Activez cette option pour centrer la vue sur l'unité active quand le focus "
"change d'unité."
-#: client/options.c:211 client/gui-sdl/optiondlg.c:1147
+#: client/options.c:215 client/gui-sdl/optiondlg.c:1147
msgid "Auto Center on Combat"
msgstr "Auto Centrer sur les combats"
-#: client/options.c:212
+#: client/options.c:216
msgid ""
"Set this option to have any combat be centered automatically. Disabled this "
"will speed up the time between turns but may cause you to miss combat "
@@ -9349,21 +9350,21 @@ msgstr ""
"diminue la durée entre tours mais peut vous laisser dans une totale "
"ignorance dudit combat."
-#: client/options.c:217 client/gui-sdl/optiondlg.c:1174
+#: client/options.c:221 client/gui-sdl/optiondlg.c:1174
msgid "Focus on Awakened Units"
msgstr "Sélectionner les Unités réveillées"
-#: client/options.c:218
+#: client/options.c:222
msgid "Set this option to have newly awoken units be focused automatically."
msgstr ""
"Activez cette option pour avoir automatiquement le focus sur les unités "
"nouvellement réveillées."
-#: client/options.c:221
+#: client/options.c:225
msgid "Allow goto into the unknown"
msgstr "Autoriser les \"Aller à\" dans l'inconnu"
-#: client/options.c:222
+#: client/options.c:226
msgid ""
"Setting this option will make the game consider moving into unknown tiles. "
"If not, then goto routes will detour around or be blocked by unknown tiles."
@@ -9372,11 +9373,11 @@ msgstr ""
"cases inconnues. Sinon les parcours feront le tour ou seront bloqués par des "
"cases inconnues."
-#: client/options.c:226
+#: client/options.c:230
msgid "Center map when Popup city"
msgstr "Centrer la carte en cliquant sur une Ville"
-#: client/options.c:227
+#: client/options.c:231
msgid ""
"Setting this option makes the mapview center on a city when its city dialog "
"is popped up."
@@ -9385,11 +9386,11 @@ msgstr ""
"sa fenêtre de dialogue sera ouverte."
# AR
-#: client/options.c:230
+#: client/options.c:234
msgid "Concise City Production"
msgstr "Production de la ville"
-#: client/options.c:231
+#: client/options.c:235
msgid ""
"Set this option to make the city production (as shown in the city dialog) to "
"be more compact."
@@ -9397,11 +9398,11 @@ msgstr ""
"Activez cette option pour que la production telle que montrée dans le "
"dialogue le soit de manière plus compacte."
-#: client/options.c:234 client/gui-sdl/optiondlg.c:1252
+#: client/options.c:238 client/gui-sdl/optiondlg.c:1252
msgid "End Turn when done moving"
msgstr "Terminer le tour à la fin des mouvements"
-#: client/options.c:235
+#: client/options.c:239
msgid ""
"Setting this option makes your turn end automatically when all your units "
"are done moving."
@@ -9409,11 +9410,11 @@ msgstr ""
"Activez cette option termine automatiquement le tour lorsque toutes vos "
"unites ont terminé leur déplacement."
-#: client/options.c:238 client/gui-sdl/optiondlg.c:1226
+#: client/options.c:242 client/gui-sdl/optiondlg.c:1226
msgid "Prompt for city names"
msgstr "Dialogues pour les noms de villes"
-#: client/options.c:239
+#: client/options.c:243
msgid ""
"Disabling this option will make the names of newly founded cities chosen "
"automatically by the server."
@@ -9421,11 +9422,11 @@ msgstr ""
"Si cette option est désactivée, les noms de ville seront automatiquement "
"choisis par le serveur."
-#: client/options.c:242 client/gui-sdl/optiondlg.c:1200
+#: client/options.c:246 client/gui-sdl/optiondlg.c:1200
msgid "Pop up city dialog for new cities"
msgstr "Affiche le dialogue pour les nouvelles villes"
-#: client/options.c:243
+#: client/options.c:247
msgid ""
"Setting this option will pop up a newly-founded city's city dialog "
"automatically."
@@ -9433,76 +9434,124 @@ msgstr ""
"Si cette option est activée une ville nouvellement fondée affichera son "
"dialogue automatiquement."
-#: client/options.c:248
+#: client/options.c:250
+#, fuzzy
+msgid "Pop up caravan actions"
+msgstr "Actions de caravane"
+
+#: client/options.c:251
+msgid ""
+"If this option is enabled, when caravans arrive at a city where they can "
+"establish a traderoute or help build a wonder, a window will popup asking "
+"which action should be performed. Disabling this option means you will have "
+"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 ""
+
+#: client/options.c:260
+#, fuzzy
+msgid "Enable cursor changing"
+msgstr "Activer les effets de transparence"
+
+#: client/options.c:261
+msgid ""
+"This option controls whether the client should try to change the mouse "
+"cursor depending on what is being pointed at, as well as to indicate changes "
+"in the client or server state."
+msgstr ""
+
+#: client/options.c:266
+msgid "Select cities before units"
+msgstr ""
+
+#: 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 ""
+
+#: client/options.c:272
+msgid "Clear unit orders on selection"
+msgstr ""
+
+#: client/options.c:273
+msgid ""
+"Enabling this option will cause unit orders to be cleared whenever one or "
+"more units are selected. If this option is disabled, selecting units will "
+"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 ""
+
+#: client/options.c:282
msgid "Background layer"
msgstr "Arrière plan"
-#: client/options.c:249
+#: client/options.c:283
msgid "The background layer of the overview shows just ocean and land."
msgstr "L'arrière plan de l'aperçu montre uniquement la terre et l'océan."
-#: client/options.c:252
+#: client/options.c:286
msgid "Terrain relief map layer"
msgstr "Couche du relief du terrain"
-#: client/options.c:253
+#: client/options.c:287
msgid "The relief layer shows all terrains on the map."
msgstr "La couche du relief de terrain montre tous les terrains sur la carte."
-#: client/options.c:256
+#: client/options.c:290
msgid "Borders layer"
msgstr "Couche des frontières"
-#: client/options.c:257
+#: client/options.c:291
msgid ""
"The borders layer of the overview shows which tiles are owned by each player."
msgstr ""
"La couche des frontières de l'aperçu montre quelles cases appartiennent à "
"qui."
-#: client/options.c:261
+#: client/options.c:295
msgid "Units layer"
msgstr "Couche des unités"
-#: client/options.c:262
+#: client/options.c:296
msgid "Enabling this will draw units on the overview."
msgstr "Si activé, les unités seront affichées dans l'aperçu."
-#: client/options.c:265
+#: client/options.c:299
msgid "Cities layer"
msgstr "Couche des villes"
-#: client/options.c:266
+#: client/options.c:300
msgid "Enabling this will draw cities on the overview."
msgstr "Si activé, les villes seront affichées dans l'aperçu."
-#: client/options.c:269
+#: client/options.c:303
msgid "Overview fog of war"
msgstr "Aperçu global du brouillard de guerre"
-#: client/options.c:270
+#: client/options.c:304
msgid "Enabling this will show fog of war on the overview."
msgstr "Si activé, le brouillard de guerre sera affiché dans l'aperçu."
-#: client/options.c:488
+#: client/options.c:526
msgid "If you add a preset by hand, also update \"number_of_presets\""
msgstr ""
"Si vous ajoutez un pré-réglage à la main, mettez à jour \"number_of_presets\""
-#: client/options.c:516
+#: client/options.c:554
msgid "Cannot find your home directory"
msgstr "Votre répertoire \"home\" est introuvable"
-#: client/options.c:665 client/options.c:796
+#: client/options.c:703 client/options.c:834
msgid "Save failed, cannot find a filename."
msgstr "Échec de la sauvegarde, impossible de trouver un nom de fichier."
-#: client/options.c:678 client/options.c:859
+#: client/options.c:716 client/options.c:897
#, c-format
msgid "Save failed, cannot write to file %s"
msgstr "Impossible d'écrire dans le fichier %s"
-#: client/options.c:680 client/options.c:862
+#: client/options.c:718 client/options.c:900
#, c-format
msgid "Saved settings to file %s"
msgstr "Les options sont sauvegardées dans %s"
@@ -9527,16 +9576,16 @@ msgstr "Cha
msgid "Start of turn %d"
msgstr "Début du tour %d"
-#: client/packhand.c:1590
+#: client/packhand.c:1591
#, c-format
msgid "AI Mode is now %s."
msgstr "L'IA est maintenant %s."
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "ON"
msgstr "activée"
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "OFF"
msgstr "désactivée"
@@ -9568,14 +9617,15 @@ 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:2085
+#: client/gui-gtk-2.0/pages.c:2157
msgid "Flag"
msgstr "Drapeau"
#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
-#: client/gui-gtk-2.0/pages.c:1536 client/gui-gtk-2.0/pages.c:2087
-#: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
-#: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
+#: 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/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr "Nation"
@@ -9588,7 +9638,7 @@ msgid "Score"
msgstr "Score"
# AR
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
msgid "Team"
msgstr "Équipe"
@@ -9660,280 +9710,306 @@ msgstr "Aucun %s n'a pu
msgid "Could not open temp file."
msgstr "Impossible d'ouvrir le fichier temporaire."
-#: client/servers.c:407
+#: client/servers.c:410
msgid "Invalid $http_proxy or metaserver value, must start with 'http://'"
msgstr ""
"La valeur de $http_proxy ou metaserver est incorrecte, elle doit commencer "
"par \"http://\""
-#: client/servers.c:413
+#: client/servers.c:416
msgid "Failed looking up metaserver's host"
msgstr "Échec de la recherche de la machine hôte du métaserveur"
-#: client/text.c:85 client/text.c:86 client/text.c:91
+#. TRANS: "AI <player name>"
+#: client/text.c:94
+#, c-format
+msgid "AI %s"
+msgstr ""
+
+#. TRANS: "<nation adjective>, team <team name>"
+#: client/text.c:118
+#, fuzzy, c-format
+msgid "%s, team %s"
+msgstr ", équipe %s"
+
+#: client/text.c:135 client/text.c:136 client/text.c:141
#: client/gui-sdl/mapview.c:752
msgid "?nation:Neutral"
msgstr "?nation:Neutres"
-#: client/text.c:85 client/gui-sdl/mapview.c:752
+#: client/text.c:135 client/gui-sdl/mapview.c:752
msgid "?nation:Hostile"
msgstr "?nation:Hostiles"
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Peaceful"
msgstr "?nation:Pacifiques"
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Friendly"
msgstr "?nation:Amicaux"
-#: client/text.c:88 client/gui-sdl/mapview.c:755
+#: client/text.c:138 client/gui-sdl/mapview.c:755
msgid "?nation:Mysterious"
msgstr "?nation:Mystérieux"
-#: client/text.c:88
+#: client/text.c:138
msgid "?nation:Friendly(team)"
msgstr "?nation:Amicaux(équipe)"
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
msgid "?city:Neutral"
msgstr "?city:Neutre"
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
msgid "?city:Hostile"
msgstr "?city:Hostile"
-#: client/text.c:92 client/gui-sdl/mapview.c:786
+#: client/text.c:142 client/gui-sdl/mapview.c:786
msgid "?city:Peaceful"
msgstr "?city:Pacifique"
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Friendly"
msgstr "?city:Amicale"
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Mysterious"
msgstr "?city:Mystérieuse"
-#: client/text.c:93
+#: client/text.c:143
msgid "?city:Friendly(team)"
msgstr "?city:Amicale(équipe)"
-#: client/text.c:100
+#: client/text.c:151
#, c-format
msgid "Location: (%d, %d) [%d]"
msgstr "Lieu : (%d,%d) [%d]"
-#: client/text.c:109
+#: client/text.c:153
+#, c-format
+msgid "Native coordinates: (%d, %d)"
+msgstr ""
+
+#: client/text.c:160
#, c-format
msgid "Terrain: %s"
msgstr "Terrain: %s"
-#: client/text.c:110
+#: client/text.c:161
#, c-format
msgid "Food/Prod/Trade: %s"
msgstr "Nour/Prod/Comm : %s"
-#: client/text.c:113
+#: client/text.c:164
msgid "Minor Tribe Village"
msgstr "Village d'une Tribu Mineure"
-#: client/text.c:119
+#: client/text.c:173
#, fuzzy
msgid "Our territory"
msgstr "Notre territoire"
-#. TRANS: "Polish territory"
-#: client/text.c:122
+#. TRANS: "Territory of <username> (<nation + team>)"
+#: client/text.c:176
#, fuzzy, c-format
-msgid "%s territory"
-msgstr "Territoire des %s"
+msgid "Territory of %s (%s)"
+msgstr ""
+"\n"
+"Territoire des %s %s"
-#. TRANS: "Polish territory (5 turn cease-fire)"
-#: client/text.c:131
-#, c-format
-msgid "%s territory (%d turn cease-fire)"
-msgid_plural "%s territory (%d turn cease-fire)"
-msgstr[0] "territoire %s (cessez-le-feu %d tour)"
-msgstr[1] "territoire %s (cessez-le-feu %d tours)"
+#: client/text.c:186
+#, fuzzy, c-format
+msgid "Territory of %s (%s) (%d turn cease-fire)"
+msgid_plural "Territory of %s (%s) (%d turn cease-fire)"
+msgstr[0] "Ville : %s (%s, cessez-le-feu %d tour)"
+msgstr[1] "Ville : %s (%s, cessez-le-feu %d tours)"
-#. TRANS: "Polish territory (friendly)"
-#: client/text.c:140
+#. TRANS: "Territory of <username>
+#. * (<nation + team> | <diplomatic state>)"
+#: client/text.c:195
#, fuzzy, c-format
-msgid "%s territory (%s)"
-msgstr "Territoire des %s %s"
+msgid "Territory of %s (%s | %s)"
+msgstr ""
+"\n"
+"Territoire des %s %s"
-#: client/text.c:145
+#: client/text.c:200
msgid "Unclaimed territory"
msgstr "Territoire non revendiqué"
-#. TRANS: "City: Warsaw (Polish)"
-#: client/text.c:156
-#, c-format
-msgid "City: %s (%s)"
-msgstr "Ville : %s (%s)"
+#. TRANS: "City: <city name> | <username> (<nation + team>)"
+#: client/text.c:214
+#, fuzzy, c-format
+msgid "City: %s | %s (%s)"
+msgstr "Ville : %s (%s, %s)"
-#. TRANS: "City: Warsaw (Polish, 5 turn cease-fire)"
-#: client/text.c:166
-#, c-format
-msgid "City: %s (%s, %d turn cease-fire)"
-msgid_plural "City: %s (%s, %d turn cease-fire)"
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <number> turn cease-fire)"
+#: client/text.c:224
+#, fuzzy, c-format
+msgid "City: %s | %s (%s, %d turn cease-fire)"
+msgid_plural "City: %s | %s (%s, %d turn cease-fire)"
msgstr[0] "Ville : %s (%s, cessez-le-feu %d tour)"
msgstr[1] "Ville : %s (%s, cessez-le-feu %d tours)"
-#. TRANS: "City: Warsaw (Polish,friendly)"
-#: client/text.c:174
-#, c-format
-msgid "City: %s (%s, %s)"
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <diplomatic state>)"
+#: client/text.c:231
+#, fuzzy, c-format
+msgid "City: %s | %s (%s, %s)"
msgstr "Ville : %s (%s, %s)"
#. TRANS: previous lines gave other information about the city.
-#: client/text.c:189
+#: client/text.c:246
#, fuzzy, c-format
msgid "?clistbegin: with %s"
msgstr " avec %s"
#. TRANS: "Trade from Warsaw: 5"
-#: client/text.c:202
+#: client/text.c:259
#, c-format
msgid "Trade from %s: %d"
msgstr "Commerce de %s : %d"
-#: client/text.c:210
+#: client/text.c:267
#, c-format
msgid "Infrastructure: %s"
msgstr "Infrastructure : %s"
-#: client/text.c:215
+#: client/text.c:272
#, c-format
msgid "Activity: %s"
msgstr "Activité : %s"
-#. TRANS: "Unit: Musketeers (Polish, Warsaw)"
-#. TRANS: "Unit: Musketeers (Polish,friendly)"
-#: client/text.c:226 client/text.c:253
-#, c-format
-msgid "Unit: %s (%s, %s)"
+#. TRANS: "Unit: <unit type> | <username>
+#. * (<nation + team>, <homecity>)"
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <diplomatic state>)"
+#: client/text.c:287 client/text.c:313
+#, fuzzy, c-format
+msgid "Unit: %s | %s (%s, %s)"
msgstr "Unité: %s (%s, %s)"
-#. TRANS: "Unit: Musketeers (Polish)"
-#: client/text.c:232
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>)"
+#: client/text.c:292
#, fuzzy, c-format
-msgid "Unit: %s (%s)"
-msgstr "Unité: %s (%s)"
+msgid "Unit: %s | %s (%s)"
+msgstr "Unité: %s (%s, %s)"
-#. TRANS: "Unit: Musketeers (Polish, 5 turn cease-fire)"
-#: client/text.c:245
-#, c-format
-msgid "Unit: %s (%s, %d turn cease-fire)"
-msgid_plural "Unit: %s (%s, %d turn cease-fire)"
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <number> turn cease-fire)"
+#: client/text.c:305
+#, fuzzy, c-format
+msgid "Unit: %s | %s (%s, %d turn cease-fire)"
+msgid_plural "Unit: %s | %s (%s, %d turn cease-fire)"
msgstr[0] "Unité : %s (%s, cessez-le-feu %d tour)"
msgstr[1] "Unité : %s (%s, cessez-le-feu %d tours)"
#. TRANS: "Chance to win: A:95% D:46%"
-#: client/text.c:279
+#: client/text.c:338
#, c-format
msgid "Chance to win: A:%d%% D:%d%%"
msgstr "Chances de gagner : A:%d%% D:%d%%"
#. TRANS: A is attack power, D is defense power, FP is firepower,
#. * HP is hitpoints (current and max).
-#: client/text.c:286
+#: client/text.c:345
#, c-format
msgid "A:%d D:%d FP:%d HP:%d/%d (%s)"
msgstr "A:%d D:%d F:%d EV:%d/%d (%s)"
#. TRANS: "5 more" units on this tile
-#: client/text.c:295
+#: client/text.c:354
#, c-format
msgid " (%d more)"
msgstr " (%d de plus)"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:364
+#: client/text.c:423
#, c-format
msgid "far from %s"
msgstr "loin de %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:367
+#: client/text.c:426
#, c-format
msgid "near %s"
msgstr "près de %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:370
+#: client/text.c:429
#, c-format
msgid "in %s"
msgstr "à %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:403
+#: client/text.c:462
#, c-format
msgid "from %s"
msgstr "de %s"
-#: client/text.c:466
+#: client/text.c:525
msgid "Progress: no research"
msgstr "Avancement : pas de recherche"
-#: client/text.c:470
+#: client/text.c:529
msgid "Progress: no research target"
msgstr "Avancement : pas d'objectif de recherche"
-#: client/text.c:475
+#: client/text.c:534
#, c-format
msgid "Progress: %d turn/advance"
msgid_plural "Progress: %d turns/advance"
msgstr[0] "Avancement : %d tour/découverte"
msgstr[1] "Avancement : %d tours/découverte"
-#: client/text.c:480
+#: client/text.c:539
#, c-format
msgid "%d bulb/turn"
msgid_plural "%d bulbs/turn"
msgstr[0] "%d ampoule/tour"
msgstr[1] "%d ampoules/tour"
-#: client/text.c:485
+#: client/text.c:544
#, c-format
msgid ", %d bulb/turn from team"
msgid_plural ", %d bulbs/turn from team"
msgstr[0] ", %d ampoule/tour pour l'équipe"
msgstr[1] ", %d ampoules/tour pour l'équipe"
-#: client/text.c:512
+#: client/text.c:571
#, c-format
msgid "%d/- (never)"
msgstr "%d/- (jamais)"
-#: client/text.c:524
+#: client/text.c:583
#, c-format
msgid "%d/%d (%d turn)"
msgid_plural "%d/%d (%d turns)"
msgstr[0] "%d/%d (%d tour)"
msgstr[1] "%d/%d (%d tours)"
-#: client/text.c:527
+#: client/text.c:586
#, c-format
msgid "%d/%d (never)"
msgstr "%d/%d (jamais)"
-#: client/text.c:564
+#: client/text.c:623
#, c-format
msgid "%d step"
msgid_plural "%d steps"
msgstr[0] "%d étape"
msgstr[1] "%d étapes"
-#: client/text.c:566
+#: client/text.c:625
#, c-format
msgid "%d bulb"
msgid_plural "%d bulbs"
msgstr[0] "%d ampoule"
msgstr[1] "%d ampoules"
-#: client/text.c:570 client/agents/cma_fec.c:269 client/agents/cma_fec.c:313
+#: 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
#, c-format
msgid "%d turn"
@@ -9941,89 +10017,89 @@ msgid_plural "%d turns"
msgstr[0] "%d tour"
msgstr[1] "%d tours"
-#: client/text.c:592
+#: client/text.c:651
#, c-format
msgid "Population: %s"
msgstr "Population : %s"
-#: client/text.c:595
+#: client/text.c:654
#, c-format
msgid "Year: %s (T%d)"
msgstr "Année : %s (T%d)"
-#: client/text.c:598
+#: client/text.c:657
#, c-format
msgid "Gold: %d (%+d)"
msgstr "Or : %d (%+d)"
-#: client/text.c:600
+#: client/text.c:659
#, c-format
msgid "Tax: %d Lux: %d Sci: %d"
msgstr "Tax : %d Lux : %d Sci : %d"
-#: client/text.c:607
+#: client/text.c:666
#, fuzzy
msgid "Moving: Nobody"
msgstr "Déplacement : %s"
-#: client/text.c:609
+#: client/text.c:668
#, c-format
msgid "Moving: %s"
msgstr "Déplacement : %s"
-#: client/text.c:613
+#: client/text.c:672
msgid "(Click for more info)"
msgstr "(Cliquez pour plus d'info)"
-#: client/text.c:629
+#: client/text.c:688
#, c-format
msgid "%s People"
msgstr "%s Personnes"
-#: client/text.c:633
+#: client/text.c:692
#, c-format
msgid "Turn: %d"
msgstr "Tour: %d"
-#: client/text.c:635 client/gui-win32/inteldlg.c:111
+#: client/text.c:694 client/gui-win32/inteldlg.c:111
#: client/gui-xaw/inteldlg.c:208
#, c-format
msgid "Gold: %d"
msgstr "Or: %d"
-#: client/text.c:636
+#: client/text.c:695
#, c-format
msgid "Net Income: %d"
msgstr "Revenu brut : %d"
#. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:639
+#: client/text.c:698
#, c-format
msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
msgstr "Taxes : Or:%d%% Luxe:%d%% Science:%d%%"
-#: client/text.c:643
+#: client/text.c:702
#, c-format
msgid "Researching %s: %s"
msgstr "Recherche %s : %s"
-#: client/text.c:650
+#: client/text.c:709
#, c-format
msgid "Global warming chance: %d%% (%+d%%/turn)"
msgstr "Chance de réchauffement de la planète : %d%% (%+d%%/tour)"
-#: client/text.c:653
+#: client/text.c:712
#, c-format
msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
msgstr "Chance d'un hiver nucléaire : %d%% (%+d%%/tour)"
-#: client/text.c:658 client/gui-win32/inteldlg.c:104
+#: client/text.c:717 client/gui-win32/inteldlg.c:104
#: client/gui-xaw/inteldlg.c:200
#, c-format
msgid "Government: %s"
msgstr "Gouvernement: %s"
-#: client/text.c:682
+#: client/text.c:741
#, c-format
msgid "%d unit"
msgid_plural "%d units"
@@ -10031,55 +10107,55 @@ msgstr[0] "%d unit
msgstr[1] "%d unités"
#. TRANS: Impossible to reach goto target tile
-#: client/text.c:715 client/gui-sdl/mapview.c:566
+#: client/text.c:774 client/gui-sdl/mapview.c:566
msgid "?goto:Unreachable"
msgstr "Inatteignable"
-#: client/text.c:717 client/gui-sdl/mapview.c:568
+#: client/text.c:776 client/gui-sdl/mapview.c:568
#, c-format
msgid "Turns to target: %d"
msgstr "Tours jusqu'à la cible : %d"
-#: client/text.c:719 client/gui-sdl/mapview.c:570
+#: client/text.c:778 client/gui-sdl/mapview.c:570
#, c-format
msgid "Turns to target: %d to %d"
msgstr "Tours jusqu'à la cible : %d à %d"
-#: client/text.c:725 client/gui-sdl/mapview.c:576
+#: client/text.c:784 client/gui-sdl/mapview.c:576
#, c-format
msgid "%d unit selected"
msgid_plural "%d units selected"
msgstr[0] "%d unité sélectionnée"
msgstr[1] "%d unités sélectionnées"
-#: client/text.c:730 client/gui-sdl/mapview.c:581
+#: client/text.c:789 client/gui-sdl/mapview.c:581
msgid "No units selected."
msgstr "Pas d'unité sélectionnée."
-#: client/text.c:804 client/gui-sdl/mapview.c:654
+#: client/text.c:863 client/gui-sdl/mapview.c:654
#, c-format
msgid "Others: %d civil; %d military"
msgstr "Autres : %d civil ; %d militaire"
-#: client/text.c:806 client/gui-sdl/mapview.c:656
+#: client/text.c:865 client/gui-sdl/mapview.c:656
#, c-format
msgid "Others: %d civilian"
msgstr "Autres : %d civil"
-#: client/text.c:808 client/gui-sdl/mapview.c:658
+#: client/text.c:867 client/gui-sdl/mapview.c:658
#, c-format
msgid "Others: %d military"
msgstr "Autres : %d militaire"
-#: client/text.c:839
+#: client/text.c:898
msgid "No units to upgrade!"
msgstr "Aucune unité à mettre à jour !"
-#: client/text.c:864
+#: client/text.c:923
msgid "None of these units may be upgraded."
msgstr "Aucune de ces unités ne peut être mise à jour."
-#: client/text.c:870
+#: client/text.c:929
#, c-format
msgid ""
"Upgrade %d unit for %d gold?\n"
@@ -10094,72 +10170,72 @@ msgstr[1] ""
"Transformer %d unités pour %d lingots ?\n"
"Les finances sont à %d lingots."
-#: client/text.c:891
+#: client/text.c:950
msgid "Shows your progress in researching the current technology."
msgstr "Montre l'avancement dans la recherche de la technologie courante."
-#: client/text.c:897
+#: client/text.c:956
msgid "no research target."
msgstr "pas d'objectif de recherche."
#. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:900
+#: client/text.c:959
#, c-format
msgid "%s: %d/%d."
msgstr "%s : %d/%d."
-#: client/text.c:920
+#: client/text.c:979
msgid "Shows the progress of global warming:"
msgstr "Montre la progression du réchauffement planétaire :"
-#: client/text.c:921
+#: client/text.c:980
#, c-format
msgid "Pollution rate: %d%%"
msgstr "Taux de pollution : %d%%"
-#: client/text.c:923
+#: client/text.c:982
#, c-format
msgid "Chance of catastrophic warming each turn: %d%%"
msgstr "Probabilité d'un réchauffement catastrophique à chaque tour : %d%%"
-#: client/text.c:939
+#: client/text.c:998
msgid "Shows the progress of nuclear winter:"
msgstr "Montre la progression de l'hiver nucléaire :"
-#: client/text.c:940
+#: client/text.c:999
#, c-format
msgid "Fallout rate: %d%%"
msgstr "Taux de retombées : %d%%"
-#: client/text.c:942
+#: client/text.c:1001
#, c-format
msgid "Chance of catastrophic winter each turn: %d%%"
msgstr "Probabilité d'un hiver catastrophique à chaque tour : %d%%"
-#: client/text.c:957
+#: client/text.c:1016
msgid "Shows your current government:"
msgstr "Montre votre gouvernement actuel :"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:981
+#: client/text.c:1040
#, c-format
msgid "Population: %5d"
msgstr "Population : %5d"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:1043
#, c-format
msgid "Support: %5d %%"
msgstr "Support : %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:1047
#, c-format
msgid "Energy: %5d %%"
msgstr "Énergie : %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:992
+#: client/text.c:1051
#, c-format
msgid "Mass: %5d ton"
msgid_plural "Mass: %5d tons"
@@ -10167,97 +10243,98 @@ msgstr[0] "Masse : %5d tonne"
msgstr[1] "Masse : %5d tonnes"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1057
#, c-format
msgid "Travel time: %5.1f years"
msgstr "Durée voyage : %5.1f années"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1061
msgid "Travel time: N/A "
msgstr "Durée du voyage : ND "
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1065
#, c-format
msgid "Success prob.: %5d %%"
msgstr "Prob. de succès : %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1010
+#: client/text.c:1069
#, c-format
msgid "Year of arrival: %8s"
msgstr "Année d'arrivée : %8s"
-#: client/text.c:1030
+#: client/text.c:1089
msgid "?timeout:off"
msgstr "?timeout:off"
# AR : contexte
-#: client/text.c:1054
+#: client/text.c:1113
#, c-format
msgid "?seconds:%02ds"
msgstr "?seconds:%02ds"
-#: client/text.c:1056
+#: client/text.c:1115
#, c-format
msgid "?mins/secs:%02dm %02ds"
msgstr "?mins/secs:%02dm %02ds"
-#: client/text.c:1058
+#: client/text.c:1117
#, c-format
msgid "?hrs/mns:%02dh %02dm"
msgstr "?hrs/mns:%02dh %02dm"
-#: client/text.c:1060
+#: client/text.c:1119
#, c-format
msgid "?dys/hrs:%02dd %02dh"
msgstr "?jrs/hrs:%02dj %02dh"
-#: client/text.c:1063
+#: client/text.c:1122
msgid "?duration:overflow"
msgstr "?duration:débordement"
-#: client/text.c:1084
+#: client/text.c:1143
#, c-format
msgid "%6d.%02d ms"
msgstr "%6d.%02d ms"
-#. TRANS: "Republic of the Poles"
-#: client/text.c:1127
-#, c-format
-msgid "%s of the %s"
-msgstr "%s des %s"
+#. TRANS: <nation adjective> <government name>.
+#. * E.g. "Polish Republic".
+#: client/text.c:1188
+#, fuzzy, c-format
+msgid "?nationgovernment:%s %s"
+msgstr "Gouvernement: %s"
#. TRANS: "Observer: 1985"
-#: client/text.c:1137
+#: client/text.c:1198
#, c-format
msgid "Observer: %s"
msgstr "Observateur : %s"
-#: client/text.c:1155
+#: client/text.c:1216
msgid "Buildings: "
msgstr "Constructions : "
-#: client/text.c:1172 client/text.c:1211
+#: client/text.c:1233 client/text.c:1272
msgid "None. "
msgstr "Aucun. "
-#: client/text.c:1174 client/text.c:1213
+#: client/text.c:1235 client/text.c:1274
msgid "?clistend:."
msgstr "."
-#: client/text.c:1192
+#: client/text.c:1253
msgid "Wonders: "
msgstr "Merveilles : "
-#: client/text.c:1247
+#: client/text.c:1308
#, 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:1251
+#: client/text.c:1312
#, fuzzy, c-format
msgid "%d content before penalty."
msgid_plural "%d content before penalty."
@@ -10265,45 +10342,43 @@ 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:1257
+#: client/text.c:1318
#, 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."
-#. TRANS: Martial law opening parenthesis
-#: client/text.c:1279
-msgid "Martial law in effect ("
+#: client/text.c:1339
+#, fuzzy
+msgid "Unlimited martial law in effect."
msgstr "Loi martiale effective ("
-#. TRANS: no [unit] maximum
-#: client/text.c:1284
-msgid "no maximum, "
-msgstr "pas de maximum, "
-
-#: client/text.c:1287
-#, c-format
-msgid "%d unit maximum, "
-msgid_plural "%d units maximum, "
-msgstr[0] "%d unité au maximum, "
-msgstr[1] "%d unités au maximum, "
+#: client/text.c:1341
+#, 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"
-#. TRANS: Martial law closing parenthesis
-#: client/text.c:1294
-#, c-format
-msgid "%d per unit). "
-msgstr "%d par unité). "
+#: client/text.c:1345
+#, fuzzy, c-format
+msgid "Each military unit makes %d unhappy citizen content."
+msgid_plural "Each military unit makes %d unhappy citizens content."
+msgstr[0] ""
+"Amuse les citoyens de la ville, rendant contents 3 citoyens mécontents."
+msgstr[1] ""
+"Amuse les citoyens de la ville, rendant contents 3 citoyens mécontents."
-#: client/text.c:1298
+#: client/text.c:1352
msgid "Military units in the field may cause unhappiness. "
msgstr "Les unités militaires en campagne peuvent causer du mécontentent. "
-#: client/text.c:1301
+#: client/text.c:1355
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:1316
+#: client/text.c:1370
#, c-format
msgid "Luxury: %d total."
msgstr "Luxe : %d au total."
@@ -10327,7 +10402,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:3968
+#: client/tilespec.c:3966
#, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
@@ -10352,12 +10427,12 @@ msgid ""
"have a look."
msgstr "Le gouverneur s'est embrouillé en gérant %s. Vous devriez intervenir."
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
-#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:599
+#: client/gui-gtk-2.0/cityrep.c:624 client/gui-sdl/citydlg.c:2009
msgid "none"
msgstr "Aucun"
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:645
msgid "custom"
msgstr "Réglable"
@@ -10666,7 +10741,7 @@ msgstr "
msgid "Enter Marketplace"
msgstr "Enter dans la place commerciale"
-#: client/gui-gtk-2.0/chatline.c:144 client/gui-win32/chatline.c:134
+#: client/gui-gtk-2.0/chatline.c:218 client/gui-win32/chatline.c:134
#: client/gui-xaw/chatline.c:120
msgid "Cleared output window."
msgstr "Effacement de l'écran de sortie."
@@ -10747,11 +10822,11 @@ msgid "%d/%d %d turns"
msgstr "%d/%d %d tours"
#: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:821
+#: client/gui-gtk-2.0/cityrep.c:1027
msgid "_Buy"
msgstr "A_cheter"
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:869
#, fuzzy
msgid "_Production"
msgstr "Pro_duction"
@@ -10773,12 +10848,12 @@ msgid "Entertainers"
msgstr "Artistes"
#: client/gui-gtk-2.0/citydlg.c:1029 client/gui-win32/citydlg.c:1989
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2403
msgid "Scientists"
msgstr "Scientifiques"
#: client/gui-gtk-2.0/citydlg.c:1030 client/gui-win32/citydlg.c:1991
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2404
msgid "Taxmen"
msgstr "Percepteurs"
@@ -10871,7 +10946,7 @@ msgstr "Unit
msgid "Present units %d"
msgstr "Unités présentes %d"
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:1019
msgid "Cen_ter"
msgstr "C_entrer"
@@ -10960,32 +11035,62 @@ msgstr "Renommer la ville"
msgid "What should we rename the city to?"
msgstr "Quel nom doit porter cette ville ?"
-#: client/gui-gtk-2.0/cityrep.c:699
+#: client/gui-gtk-2.0/cityrep.c:794
+#, fuzzy
+msgid "(no worklists defined)"
+msgstr "(liste de travail)"
+
+#: client/gui-gtk-2.0/cityrep.c:876
msgid "Chan_ge"
msgstr "C_hanger"
-#: client/gui-gtk-2.0/cityrep.c:703
+#: client/gui-gtk-2.0/cityrep.c:880
msgid "Add _First"
msgstr "Ajouter en _premier"
-#: client/gui-gtk-2.0/cityrep.c:707
+#: client/gui-gtk-2.0/cityrep.c:884
msgid "Add _Next"
msgstr "Ajouter à la s_uite"
-#: client/gui-gtk-2.0/cityrep.c:711
+#: client/gui-gtk-2.0/cityrep.c:888
+#, fuzzy
+msgid "Add _2nd Last"
+msgstr "Ajouter en der_nier"
+
+#: client/gui-gtk-2.0/cityrep.c:892
msgid "Add _Last"
msgstr "Ajouter en der_nier"
-#: client/gui-gtk-2.0/cityrep.c:715
+#: client/gui-gtk-2.0/cityrep.c:899
+#, fuzzy
+msgid "Set Worklist"
+msgstr "Liste de travail"
+
+#: client/gui-gtk-2.0/cityrep.c:905
+#, fuzzy
+msgid "Append Worklist"
+msgstr "Renommer la liste de travail"
+
+#: client/gui-gtk-2.0/cityrep.c:911
+#, fuzzy
+msgid "Clear _Worklist"
+msgstr "Liste de travail envisagée (_W) :"
+
+#: client/gui-gtk-2.0/cityrep.c:916
+#, fuzzy
+msgid "Gover_nor"
+msgstr "Gouverneur"
+
+#: client/gui-gtk-2.0/cityrep.c:921
msgid "_Select"
msgstr "_Sélectionner"
-#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
+#: client/gui-gtk-2.0/cityrep.c:925 client/gui-gtk-2.0/plrdlg.c:521
#, fuzzy
msgid "_Display"
msgstr "_Montrer"
-#: client/gui-gtk-2.0/cityrep.c:800 client/gui-gtk-2.0/menu.c:808
+#: 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-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
#: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -10995,103 +11100,103 @@ msgstr "_Montrer"
msgid "Cities"
msgstr "Villes"
-#: client/gui-gtk-2.0/cityrep.c:817
+#: client/gui-gtk-2.0/cityrep.c:1023
#, fuzzy
msgid "_Inspect"
msgstr "_Fenêtre"
-#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
-#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-sdl/helpdlg.c:297 client/gui-win32/menu.c:342
-#: client/gui-xaw/menu.c:241
+#: 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
+#: client/gui-gtk-2.0/cityrep.c:1518 client/gui-gtk-2.0/menu.c:823
+#: client/gui-gtk-2.0/menu.c:825 client/gui-gtk-2.0/menu.c:827
+#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:831
+#: client/gui-gtk-2.0/menu.c:833 client/gui-sdl/helpdlg.c:297
+#: client/gui-win32/menu.c:342 client/gui-xaw/menu.c:241
msgid "Improvements"
msgstr "Améliorations"
-#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
-#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
-#: client/gui-xaw/menu.c:247
+#: client/gui-gtk-2.0/cityrep.c:1441 client/gui-gtk-2.0/cityrep.c:1460
+#: client/gui-gtk-2.0/cityrep.c:1479 client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1522 client/gui-xaw/menu.c:247
msgid "Wonders"
msgstr "Merveilles"
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1662 client/gui-win32/cityrep.c:439
#: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
msgid "All Cities"
msgstr "Toutes les villes"
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1667 client/gui-win32/cityrep.c:440
msgid "No Cities"
msgstr "Pas de Villes"
-#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1672 client/gui-win32/cityrep.c:441
msgid "Invert Selection"
msgstr "Inverser la sélection"
-#: client/gui-gtk-2.0/cityrep.c:1420
+#: client/gui-gtk-2.0/cityrep.c:1682
msgid "Building Units"
msgstr "Unités en construction"
# AR
-#: client/gui-gtk-2.0/cityrep.c:1426
+#: client/gui-gtk-2.0/cityrep.c:1688
msgid "Building Improvements"
msgstr "Bâtiments en construction"
-#: client/gui-gtk-2.0/cityrep.c:1432
+#: client/gui-gtk-2.0/cityrep.c:1694
msgid "Building Wonders"
msgstr "Merveilles en construction"
-#: client/gui-gtk-2.0/cityrep.c:1444
+#: client/gui-gtk-2.0/cityrep.c:1706
msgid "Building Unit"
msgstr "Unités en construction"
# AR
-#: client/gui-gtk-2.0/cityrep.c:1448
+#: client/gui-gtk-2.0/cityrep.c:1710
msgid "Building Improvement"
msgstr "Bâtiments en construction"
-#: client/gui-gtk-2.0/cityrep.c:1452
+#: client/gui-gtk-2.0/cityrep.c:1714
msgid "Building Wonder"
msgstr "Merveilles en construction"
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1722 client/gui-win32/cityrep.c:443
msgid "Coastal Cities"
msgstr "Villes côtières"
-#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1727 client/gui-win32/cityrep.c:444
msgid "Same Island"
msgstr "Même île"
-#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1737 client/gui-win32/cityrep.c:447
msgid "Supported Units"
msgstr "Unités supportées"
-#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1740 client/gui-win32/cityrep.c:454
msgid "Units Present"
msgstr "Unités présentes"
-#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1744 client/gui-win32/cityrep.c:469
msgid "Improvements in City"
msgstr "Bâtiments dans la ville"
-#: client/gui-gtk-2.0/cityrep.c:1486
+#: client/gui-gtk-2.0/cityrep.c:1748
msgid "Wonders in City"
msgstr "Merveilles présentes"
-#: client/gui-gtk-2.0/cityrep.c:1495
+#: client/gui-gtk-2.0/cityrep.c:1757
msgid "Available Units"
msgstr "Unités disponibles"
-#: client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1760
msgid "Available Improvements"
msgstr "Bâtiments disponibles"
-#: client/gui-gtk-2.0/cityrep.c:1501
+#: client/gui-gtk-2.0/cityrep.c:1763
msgid "Available Wonders"
msgstr "Merveilles disponibles"
-#: client/gui-gtk-2.0/cityrep.c:1625
+#: client/gui-gtk-2.0/cityrep.c:1882
#, fuzzy, c-format
msgid "Total Buy Cost: %d"
msgstr "Coût total : "
@@ -11162,12 +11267,12 @@ 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:186
+#: client/gui-gtk-2.0/dialogs.c:196 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:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
#, fuzzy
msgid "Inspect _City"
msgstr "Fenêtre _ville"
@@ -11196,10 +11301,10 @@ msgstr "Choisissez ce que vous voulez piller :"
msgid "Unit"
msgstr "Unité"
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
-#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
-#: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
-#: manual/civmanual.c:302 data/Freeciv.in:80
+#: 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-win32/plrdlg.c:335 manual/civmanual.c:302 data/Freeciv.in:80
msgid "Name"
msgstr "Nom"
@@ -11225,7 +11330,7 @@ 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:1036 data/Freeciv.in:3371
+#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
msgid "Pick Nation"
msgstr "Prendre un nation"
@@ -11307,7 +11412,7 @@ msgstr "_Cartes"
msgid "_Advances"
msgstr "_Découvertes"
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:910
+#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr "_Villes"
@@ -11413,20 +11518,20 @@ msgstr "Choisissez une destination"
msgid "Show _All Cities"
msgstr "Montrer _toutes les villes"
-#: client/gui-gtk-2.0/gui_main.c:150
+#: client/gui-gtk-2.0/gui_main.c:162
msgid "Show Map Scrollbars"
msgstr "Montrer les barres de défilement de la carte"
-#: client/gui-gtk-2.0/gui_main.c:151
+#: client/gui-gtk-2.0/gui_main.c:163
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:155
+#: client/gui-gtk-2.0/gui_main.c:167
msgid "Keyboardless goto"
msgstr "\"Aller à\" sans clavier"
-#: client/gui-gtk-2.0/gui_main.c:156
+#: client/gui-gtk-2.0/gui_main.c:168
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."
@@ -11434,11 +11539,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:161
+#: client/gui-gtk-2.0/gui_main.c:173
msgid "Keep dialogs on top"
msgstr "Garder les dialogues au dessus"
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:174
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."
@@ -11446,11 +11551,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:166
+#: client/gui-gtk-2.0/gui_main.c:178
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:167
+#: client/gui-gtk-2.0/gui_main.c:179
msgid ""
"Disabling this will turn off the unit and building icons in the worklist "
"dialog and the production tab of the city dialog."
@@ -11458,11 +11563,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:171
+#: client/gui-gtk-2.0/gui_main.c:183
msgid "Enable status report tabs"
msgstr "Active les onglets de rapport"
-#: client/gui-gtk-2.0/gui_main.c:172
+#: client/gui-gtk-2.0/gui_main.c:184
msgid ""
"If this option is enabled then report dialogs will be shown as separate tabs "
"rather than in popup dialogs."
@@ -11470,11 +11575,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:177 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:189 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:178 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:190 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."
@@ -11483,7 +11588,76 @@ 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:277 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:195
+msgid "Show time for each chat message"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:196
+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
+msgid "Split bottom notebook area"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:202
+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
+msgid "New message events go to top of list"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:208
+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
+msgid "Show extra message window buttons"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:214
+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 "
+"is disabled, these buttons will not appear (you can still double-click with "
+"the left mouse button or right-click on a row to inspect or goto "
+"respectively). This option will only take effect once the message window is "
+"closed and reopened."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:224
+#, 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
+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
+msgid "Plain chat messages are sent to allies only"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:231
+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 "
+"messages will be sent as public chat messages. To send a public chat message "
+"with this option enabled, prefix the message with a single colon ':'. This "
+"option can also be set using a toggle button beside the chat entry (only "
+"visible in multiplayer games)."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:340 client/gui-xaw/gui_main.c:245
msgid ""
"This client has no special command line options\n"
"\n"
@@ -11491,44 +11665,45 @@ 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:723 client/gui-gtk-2.0/gui_main.c:1345
+#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
msgid "Freeciv"
msgstr "Freeciv"
-#: client/gui-gtk-2.0/gui_main.c:1088 client/gui-gtk-2.0/gui_main.c:1095
+#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
#: 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:1095 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1232 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:1127 client/gui-gtk-2.0/menu.c:770
-#: client/gui-gtk-2.0/menu.c:772 client/gui-gtk-2.0/menu.c:774
-#: client/gui-gtk-2.0/menu.c:776 client/gui-gtk-2.0/menu.c:778
-#: client/gui-gtk-2.0/menu.c:780 client/gui-gtk-2.0/menu.c:782
-#: client/gui-gtk-2.0/menu.c:784 client/gui-gtk-2.0/menu.c:786
-#: client/gui-gtk-2.0/menu.c:788 client/gui-gtk-2.0/menu.c:790
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-gtk-2.0/menu.c:804 client/gui-gtk-2.0/menu.c:806
-#: client/gui-gtk-2.0/menu.c:808 client/gui-gtk-2.0/menu.c:810
-#: client/gui-gtk-2.0/menu.c:812 client/gui-gtk-2.0/menu.c:814
-#: client/gui-gtk-2.0/menu.c:816 client/gui-gtk-2.0/menu.c:818
-#: client/gui-gtk-2.0/menu.c:820 client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/gui_main.c:1266 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
+#: client/gui-gtk-2.0/menu.c:811 client/gui-gtk-2.0/menu.c:813
+#: client/gui-gtk-2.0/menu.c:815 client/gui-gtk-2.0/menu.c:817
+#: client/gui-gtk-2.0/menu.c:819 client/gui-gtk-2.0/menu.c:821
+#: client/gui-gtk-2.0/menu.c:823 client/gui-gtk-2.0/menu.c:825
+#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
+#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
+#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
+#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
+#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
+#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
#: data/Freeciv.in:2028
msgid "View"
msgstr "Voir"
-#: client/gui-gtk-2.0/gui_main.c:1208
+#: client/gui-gtk-2.0/gui_main.c:1359
msgid "Chat"
msgstr "Discussion"
-#: client/gui-gtk-2.0/gui_main.c:1224 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1377 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"
@@ -11540,70 +11715,74 @@ msgstr ""
"Aide.\n"
"Maintenant... Envoyez les en Enfer !"
-#: client/gui-gtk-2.0/gui_main.c:1491
+#: client/gui-gtk-2.0/gui_main.c:1392
+msgid "Allies Only"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:1657
msgid "Not _ready"
msgstr "Pas p_rêt"
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
+#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
msgid "_Ready"
msgstr "P_rêt"
-#: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2132
+#: 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
msgid "_Start"
msgstr "_Démarrage"
-#: client/gui-gtk-2.0/gui_main.c:1520
+#: client/gui-gtk-2.0/gui_main.c:1686
#, fuzzy
msgid "_Take Player"
msgstr "Prendre ce joueur"
-#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
+#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
msgid "Pick _Nation"
msgstr "Prendre une _nation"
-#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
+#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
msgid "_Observe"
msgstr "_Observateur"
-#: client/gui-gtk-2.0/gui_main.c:1532
+#: client/gui-gtk-2.0/gui_main.c:1698
msgid "Do not _observe"
msgstr "Ne pas _observer"
-#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
msgid "<AI>"
msgstr "<IA>"
-#: client/gui-gtk-2.0/gui_main.c:1557
+#: client/gui-gtk-2.0/gui_main.c:1723
msgid "<Novice AI>"
msgstr "<IA novice>"
-#: client/gui-gtk-2.0/gui_main.c:1560
+#: client/gui-gtk-2.0/gui_main.c:1726
msgid "<Easy AI>"
msgstr "<IA facile>"
-#: client/gui-gtk-2.0/gui_main.c:1563
+#: client/gui-gtk-2.0/gui_main.c:1729
msgid "<Normal AI>"
msgstr "<IA normal>"
-#: client/gui-gtk-2.0/gui_main.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1732
msgid "<Hard AI>"
msgstr "<IA difficile>"
-#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1742 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:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
msgid "Observer"
msgstr "Observateur"
-#: client/gui-gtk-2.0/gui_main.c:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
msgid "Detached"
msgstr "Détaché"
-#: client/gui-gtk-2.0/gui_main.c:1899
+#: client/gui-gtk-2.0/gui_main.c:2073
msgid "Are you sure you want to quit?"
msgstr "Voulez-vous vraiment quitter?"
@@ -11835,472 +12014,510 @@ msgstr "_Techs"
msgid "Foreign Intelligence: %s Empire"
msgstr "Rapport sur l'étranger : empire %s"
-#: client/gui-gtk-2.0/mapctrl.c:195 client/gui-sdl/mapctrl.c:2565
+#: client/gui-gtk-2.0/mapctrl.c:179 client/gui-sdl/mapctrl.c:2565
#: client/gui-sdl/menu.c:839 client/gui-sdl/menu.c:1021
#: client/gui-win32/mapctrl.c:353
msgid "Build New City"
msgstr "Construire une nouvelle ville"
-#: client/gui-gtk-2.0/mapctrl.c:196 client/gui-sdl/mapctrl.c:2594
+#: client/gui-gtk-2.0/mapctrl.c:180 client/gui-sdl/mapctrl.c:2594
#: client/gui-win32/mapctrl.c:354 client/gui-xaw/mapctrl.c:89
msgid "What should we call our new city?"
msgstr "Comment doit s'appeler la nouvelle ville?"
-#: client/gui-gtk-2.0/mapview.c:147
+#: client/gui-gtk-2.0/mapview.c:158
msgid "Shows your current luxury/science/tax rates;click to toggle them."
msgstr ""
"Montre vos taux actuels de luxe/recherche/taxes ; cliquez pour les modifier."
-#: client/gui-gtk-2.0/mapview.c:692 client/gui-win32/canvas.c:275
+#: client/gui-gtk-2.0/mapview.c:702 client/gui-win32/canvas.c:275
msgid "Better fog will only work in truecolor. Disabling it"
msgstr ""
"Champ de vision réel amélioré ne fonctionne qu'en couleur vraie. Désactivé"
-#: client/gui-gtk-2.0/menu.c:250
+#: client/gui-gtk-2.0/menu.c:256
msgid "Leaving a local game will end it!"
msgstr "Quitter une partie locale la terminera !"
-#: client/gui-gtk-2.0/menu.c:700 client/gui-win32/menu.c:303
+#: client/gui-gtk-2.0/menu.c:727 client/gui-win32/menu.c:303
msgid "_Game"
msgstr "_Jeu"
-#: client/gui-gtk-2.0/menu.c:702 client/gui-gtk-2.0/menu.c:704
-#: client/gui-gtk-2.0/menu.c:706 client/gui-gtk-2.0/menu.c:708
-#: client/gui-gtk-2.0/menu.c:710 client/gui-gtk-2.0/menu.c:712
-#: client/gui-gtk-2.0/menu.c:714 client/gui-gtk-2.0/menu.c:717
-#: client/gui-gtk-2.0/menu.c:720 client/gui-gtk-2.0/menu.c:722
-#: client/gui-gtk-2.0/menu.c:724 client/gui-gtk-2.0/menu.c:726
-#: client/gui-gtk-2.0/menu.c:728 client/gui-gtk-2.0/menu.c:730
-#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:736
-#: client/gui-gtk-2.0/menu.c:738 client/gui-gtk-2.0/menu.c:740
+#: client/gui-gtk-2.0/menu.c:729 client/gui-gtk-2.0/menu.c:731
+#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:735
+#: client/gui-gtk-2.0/menu.c:737 client/gui-gtk-2.0/menu.c:739
+#: client/gui-gtk-2.0/menu.c:741 client/gui-gtk-2.0/menu.c:744
+#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
+#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
+#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
+#: client/gui-gtk-2.0/menu.c:760 client/gui-gtk-2.0/menu.c:763
+#: client/gui-gtk-2.0/menu.c:765 client/gui-gtk-2.0/menu.c:767
#: data/Freeciv.in:2026
msgid "Game"
msgstr "Jeu"
-#: client/gui-gtk-2.0/menu.c:704 client/gui-gtk-2.0/menu.c:706
-#: client/gui-gtk-2.0/menu.c:708
+#: client/gui-gtk-2.0/menu.c:731 client/gui-gtk-2.0/menu.c:733
+#: client/gui-gtk-2.0/menu.c:735
msgid "_Chat"
msgstr "_Discussion"
-#: client/gui-gtk-2.0/menu.c:706 client/gui-win32/menu.c:314
+#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:314
msgid "_Clear Log"
msgstr "E_ffacer les logs"
-#: client/gui-gtk-2.0/menu.c:708 client/gui-win32/menu.c:313
+#: client/gui-gtk-2.0/menu.c:735 client/gui-win32/menu.c:313
#, fuzzy
msgid "_Write Log"
msgstr "E_xporter les logs"
-#: client/gui-gtk-2.0/menu.c:710 client/gui-win32/menu.c:304
+#: client/gui-gtk-2.0/menu.c:737 client/gui-win32/menu.c:304
msgid "Local _Options"
msgstr "_Options locales"
-#: client/gui-gtk-2.0/menu.c:712 client/gui-win32/menu.c:305
+#: client/gui-gtk-2.0/menu.c:739 client/gui-win32/menu.c:305
msgid "_Message Options"
msgstr "Options des _messages"
-#: client/gui-gtk-2.0/menu.c:717
+#: client/gui-gtk-2.0/menu.c:744
msgid "_Reload Tileset"
msgstr "_Recharger le Jeu de textures"
-#: client/gui-gtk-2.0/menu.c:720
+#: client/gui-gtk-2.0/menu.c:747
msgid "Save Options on _Exit"
msgstr "Sauv_egarder les options en quitant"
-#: client/gui-gtk-2.0/menu.c:722
+#: client/gui-gtk-2.0/menu.c:749
msgid "Sa_ve Options"
msgstr "Sau_vegarder les options"
-#: client/gui-gtk-2.0/menu.c:726 client/gui-win32/menu.c:308
+#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:308
msgid "Server O_ptions"
msgstr "O_ptions du serveur"
-#: client/gui-gtk-2.0/menu.c:730 client/gui-win32/menu.c:310
+#: client/gui-gtk-2.0/menu.c:757 client/gui-win32/menu.c:310
msgid "_Save Game"
msgstr "_Sauvegarder la partie"
-#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:311
+#: client/gui-gtk-2.0/menu.c:760 client/gui-win32/menu.c:311
msgid "Save Game _As..."
msgstr "Sauveg_arder la partie sous..."
-#: client/gui-gtk-2.0/menu.c:738
+#: client/gui-gtk-2.0/menu.c:765
msgid "_Leave"
msgstr "Se _déconnecter"
-#: client/gui-gtk-2.0/menu.c:740 client/gui-win32/menu.c:317
+#: client/gui-gtk-2.0/menu.c:767 client/gui-win32/menu.c:317
msgid "_Quit"
msgstr "_Quitter"
-#: client/gui-gtk-2.0/menu.c:745 client/gui-win32/menu.c:321
+#: client/gui-gtk-2.0/menu.c:772 client/gui-win32/menu.c:321
msgid "Gov_ernment"
msgstr "Gouv_ernement"
-#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
-#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
-#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:774 client/gui-gtk-2.0/menu.c:776
+#: client/gui-gtk-2.0/menu.c:778 client/gui-gtk-2.0/menu.c:780
+#: client/gui-gtk-2.0/menu.c:782 client/gui-gtk-2.0/menu.c:784
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
#: client/gui-xaw/menu.c:248 data/Freeciv.in:2027 data/helpdata.txt:1320
msgid "Government"
msgstr "Gouvernement"
-#: client/gui-gtk-2.0/menu.c:749 client/gui-win32/menu.c:322
+#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:322
msgid "_Tax Rates"
msgstr "_Impôts"
-#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:324
+#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:324
msgid "_Find City"
msgstr "_Trouver une ville"
-#: client/gui-gtk-2.0/menu.c:755 client/gui-win32/menu.c:325
+#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:325
msgid "_Worklists"
msgstr "_Listes de travail"
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
-#: client/gui-gtk-2.0/menu.c:764 client/gui-win32/menu.c:327
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
+#: client/gui-gtk-2.0/menu.c:791 client/gui-win32/menu.c:327
msgid "_Change Government"
msgstr "_Changer de Gouvernement"
-#: client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:788
msgid "_Revolution..."
msgstr "_Révolution..."
-#: client/gui-gtk-2.0/menu.c:764 client/gui-gtk-2.0/menu.c:970
+#: client/gui-gtk-2.0/menu.c:791 client/gui-gtk-2.0/menu.c:1013
#: client/gui-win32/menu.c:431
msgid "_Government"
msgstr "_Gouvernement"
-#: client/gui-gtk-2.0/menu.c:768 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:795 client/gui-gtk-2.0/menu.c:959
#: client/gui-win32/menu.c:334
msgid "_View"
msgstr "_Voir"
-#: client/gui-gtk-2.0/menu.c:772
+#: client/gui-gtk-2.0/menu.c:799
msgid "City Outlines"
msgstr "Contours des villes"
-#: client/gui-gtk-2.0/menu.c:774 client/gui-win32/menu.c:335
+#: client/gui-gtk-2.0/menu.c:801 client/gui-win32/menu.c:335
msgid "Map _Grid"
msgstr "_Quadrillage"
-#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:336
+#: client/gui-gtk-2.0/menu.c:803 client/gui-win32/menu.c:336
msgid "National _Borders"
msgstr "_Frontières nationales"
-#: client/gui-gtk-2.0/menu.c:778 client/gui-win32/menu.c:337
+#: client/gui-gtk-2.0/menu.c:805 client/gui-win32/menu.c:337
msgid "City _Names"
msgstr "_Nom Ville"
-#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:338
+#: client/gui-gtk-2.0/menu.c:807 client/gui-win32/menu.c:338
msgid "City G_rowth"
msgstr "C_roissance de la ville"
# AR
-#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:339
+#: client/gui-gtk-2.0/menu.c:809 client/gui-win32/menu.c:339
msgid "City _Productions"
msgstr "_Productions de la ville"
-#: client/gui-gtk-2.0/menu.c:784 client/gui-sdl/optiondlg.c:1719
+#: client/gui-gtk-2.0/menu.c:811
+#, fuzzy
+msgid "City Buy Cost"
+msgstr "Coût total : "
+
+#: client/gui-gtk-2.0/menu.c:813
+#, fuzzy
+msgid "City Traderoutes"
+msgstr "Routes commerciales : "
+
+#: client/gui-gtk-2.0/menu.c:815 client/gui-sdl/optiondlg.c:1719
msgid "Draw city worker map grid"
msgstr "Dessiner la grille pour la carte de la ville pour les travailleurs"
-#: client/gui-gtk-2.0/menu.c:788 client/gui-sdl/optiondlg.c:1635
+#: client/gui-gtk-2.0/menu.c:819 client/gui-sdl/optiondlg.c:1635
#: client/gui-win32/menu.c:340 client/gui-xaw/menu.c:148
#: client/gui-xaw/menu.c:246 manual/civmanual.c:220 data/helpdata.txt:1220
msgid "Terrain"
msgstr "Terrain"
-#: client/gui-gtk-2.0/menu.c:790 client/gui-win32/menu.c:341
+#: client/gui-gtk-2.0/menu.c:821 client/gui-win32/menu.c:341
#: client/gui-xaw/menu.c:149
msgid "Coastline"
msgstr "Littoral"
-#: client/gui-gtk-2.0/menu.c:796 client/gui-win32/menu.c:343
+#: client/gui-gtk-2.0/menu.c:827 client/gui-win32/menu.c:343
msgid "Roads & Rails"
msgstr "Routes & Chemins de Fer"
-#: client/gui-gtk-2.0/menu.c:800 client/gui-sdl/optiondlg.c:1933
+#: client/gui-gtk-2.0/menu.c:831 client/gui-sdl/optiondlg.c:1933
#: client/gui-win32/menu.c:345 client/gui-xaw/menu.c:152
msgid "Mines"
msgstr "Mines"
-#: client/gui-gtk-2.0/menu.c:802 client/gui-win32/menu.c:346
+#: client/gui-gtk-2.0/menu.c:833 client/gui-win32/menu.c:346
msgid "Fortress & Airbase"
msgstr "Forteresses & Bases Aériennes"
-#: client/gui-gtk-2.0/menu.c:804 client/gui-win32/menu.c:348
+#: client/gui-gtk-2.0/menu.c:835 client/gui-win32/menu.c:348
#: client/gui-xaw/menu.c:154
msgid "Specials"
msgstr "Ressources spéciales"
-#: client/gui-gtk-2.0/menu.c:806 client/gui-win32/menu.c:349
+#: client/gui-gtk-2.0/menu.c:837 client/gui-win32/menu.c:349
#: client/gui-xaw/menu.c:155
msgid "Pollution & Fallout"
msgstr "Pollution & Radiations"
-#: client/gui-gtk-2.0/menu.c:812 client/gui-win32/menu.c:352
+#: client/gui-gtk-2.0/menu.c:843 client/gui-win32/menu.c:352
#: client/gui-xaw/menu.c:158
msgid "Focus Unit"
msgstr "Sélectionner les Unités actives"
-#: client/gui-gtk-2.0/menu.c:814 client/gui-sdl/optiondlg.c:1854
+#: client/gui-gtk-2.0/menu.c:845 client/gui-sdl/optiondlg.c:1854
#: client/gui-win32/menu.c:353 client/gui-xaw/menu.c:159
msgid "Fog of War"
msgstr "Champ de vision réel"
-#: client/gui-gtk-2.0/menu.c:818
+#: client/gui-gtk-2.0/menu.c:849
msgid "_Full Screen"
msgstr "Mode pl_ein écran"
-#: client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/menu.c:853
msgid "_Center View"
msgstr "_Centrer la vue"
-#: client/gui-gtk-2.0/menu.c:825 client/gui-win32/menu.c:358
+#: client/gui-gtk-2.0/menu.c:856 client/gui-win32/menu.c:358
msgid "_Orders"
msgstr "_Ordres"
-#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
-#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
-#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
-#: client/gui-gtk-2.0/menu.c:855 client/gui-gtk-2.0/menu.c:857
-#: client/gui-gtk-2.0/menu.c:859 client/gui-gtk-2.0/menu.c:861
-#: client/gui-gtk-2.0/menu.c:863 client/gui-gtk-2.0/menu.c:865
-#: client/gui-gtk-2.0/menu.c:867 client/gui-gtk-2.0/menu.c:869
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875 client/gui-gtk-2.0/menu.c:877
-#: client/gui-gtk-2.0/menu.c:879 client/gui-gtk-2.0/menu.c:881
-#: client/gui-gtk-2.0/menu.c:883 client/gui-gtk-2.0/menu.c:885
-#: client/gui-gtk-2.0/menu.c:887 client/gui-gtk-2.0/menu.c:889
-#: client/gui-gtk-2.0/menu.c:891 client/gui-gtk-2.0/menu.c:893
-#: client/gui-gtk-2.0/menu.c:895 client/gui-gtk-2.0/menu.c:897
-#: client/gui-gtk-2.0/menu.c:899 client/gui-gtk-2.0/menu.c:901
-#: client/gui-gtk-2.0/menu.c:903 data/Freeciv.in:2029
+#: client/gui-gtk-2.0/menu.c:858 client/gui-gtk-2.0/menu.c:860
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:864
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:868
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:872
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:876
+#: client/gui-gtk-2.0/menu.c:878 client/gui-gtk-2.0/menu.c:880
+#: client/gui-gtk-2.0/menu.c:882 client/gui-gtk-2.0/menu.c:884
+#: client/gui-gtk-2.0/menu.c:886 client/gui-gtk-2.0/menu.c:888
+#: client/gui-gtk-2.0/menu.c:890 client/gui-gtk-2.0/menu.c:892
+#: client/gui-gtk-2.0/menu.c:894 client/gui-gtk-2.0/menu.c:896
+#: client/gui-gtk-2.0/menu.c:898 client/gui-gtk-2.0/menu.c:900
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906 client/gui-gtk-2.0/menu.c:908
+#: client/gui-gtk-2.0/menu.c:910 client/gui-gtk-2.0/menu.c:912
+#: client/gui-gtk-2.0/menu.c:914 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:918 client/gui-gtk-2.0/menu.c:920
+#: client/gui-gtk-2.0/menu.c:922 client/gui-gtk-2.0/menu.c:924
+#: client/gui-gtk-2.0/menu.c:926 client/gui-gtk-2.0/menu.c:928
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
+#: client/gui-gtk-2.0/menu.c:946 data/Freeciv.in:2029
msgid "Orders"
msgstr "Ordres"
-#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:1444
+#: client/gui-gtk-2.0/menu.c:860 client/gui-gtk-2.0/menu.c:1489
#: client/gui-win32/menu.c:359
msgid "_Build City"
msgstr "_Bâtir une ville"
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:1466
-#: client/gui-gtk-2.0/menu.c:1472 client/gui-win32/menu.c:360
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:1511
+#: client/gui-gtk-2.0/menu.c:1517 client/gui-win32/menu.c:360
msgid "Build _Road"
msgstr "Construire une _route"
-#: client/gui-gtk-2.0/menu.c:833 client/gui-gtk-2.0/menu.c:1360
+#: 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 "_Irriguer"
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:1361
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:1406
#: client/gui-win32/menu.c:362
msgid "Build _Mine"
msgstr "Creuser une _mine"
-#: client/gui-gtk-2.0/menu.c:837 client/gui-gtk-2.0/menu.c:1362
+#: client/gui-gtk-2.0/menu.c:868 client/gui-gtk-2.0/menu.c:1407
msgid "Transf_orm Terrain"
msgstr "Transf_ormer le terrain"
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:1508
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:1553
#: client/gui-win32/menu.c:364
msgid "Build _Fortress"
msgstr "Construire une _Forteresse"
-#: client/gui-gtk-2.0/menu.c:841 client/gui-win32/menu.c:365
+#: client/gui-gtk-2.0/menu.c:872 client/gui-win32/menu.c:365
msgid "Build Airbas_e"
msgstr "Construire une base aérienn_e"
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:1514
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:1559
#: client/gui-win32/menu.c:366
msgid "Clean _Pollution"
msgstr "Dé_polluer"
-#: client/gui-gtk-2.0/menu.c:845 client/gui-win32/menu.c:367
+#: client/gui-gtk-2.0/menu.c:876 client/gui-win32/menu.c:367
msgid "Clean _Nuclear Fallout"
msgstr "Retombées _nucléaires propres"
-#: client/gui-gtk-2.0/menu.c:849 client/gui-win32/menu.c:369
+#: client/gui-gtk-2.0/menu.c:880 client/gui-win32/menu.c:369
msgid "_Sentry"
msgstr "Veiller (_S)"
-#: client/gui-gtk-2.0/menu.c:855 client/gui-win32/menu.c:372
+#: client/gui-gtk-2.0/menu.c:886 client/gui-win32/menu.c:372
msgid "Make _Homecity"
msgstr "Baser ici (_H)"
-#: client/gui-gtk-2.0/menu.c:857 client/gui-win32/menu.c:373
+#: client/gui-gtk-2.0/menu.c:888 client/gui-win32/menu.c:373
msgid "_Load"
msgstr "Charger (_L)"
-#: client/gui-gtk-2.0/menu.c:859
+#: client/gui-gtk-2.0/menu.c:890
msgid "_Unload Transporter"
msgstr "Décharger le transporteur (_U)"
-#: client/gui-gtk-2.0/menu.c:861 client/gui-win32/menu.c:374
+#: client/gui-gtk-2.0/menu.c:892 client/gui-win32/menu.c:374
msgid "_Unload"
msgstr "Décharger (_U)"
-#: client/gui-gtk-2.0/menu.c:863 client/gui-win32/menu.c:375
+#: client/gui-gtk-2.0/menu.c:894 client/gui-win32/menu.c:375
msgid "Wake up o_thers"
msgstr "Réveiller les au_tres"
-#: client/gui-gtk-2.0/menu.c:867
+#: client/gui-gtk-2.0/menu.c:898
msgid "_Auto Settler"
msgstr "_Auto-coloniser"
-#: client/gui-gtk-2.0/menu.c:869 client/gui-win32/menu.c:378
+#: client/gui-gtk-2.0/menu.c:900 client/gui-win32/menu.c:378
msgid "Auto E_xplore"
msgstr "Auto-e_xplorer"
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906
msgid "_Connect"
msgstr "Se _connecter"
-#: client/gui-gtk-2.0/menu.c:871 client/gui-win32/menu.c:380
+#: client/gui-gtk-2.0/menu.c:902 client/gui-win32/menu.c:380
msgid "_Road"
msgstr "_Route"
-#: client/gui-gtk-2.0/menu.c:873 client/gui-win32/menu.c:381
+#: client/gui-gtk-2.0/menu.c:904 client/gui-win32/menu.c:381
msgid "Rai_l"
msgstr "Chemin de fer (_l)"
-#: client/gui-gtk-2.0/menu.c:875 client/gui-win32/menu.c:382
+#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:382
msgid "_Irrigate"
msgstr "_Irrigation"
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
msgid "Go _to"
msgstr "Aller à (_T)"
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
msgid "_Build city"
msgstr "_Bâtir une ville"
-#: client/gui-gtk-2.0/menu.c:879
+#: client/gui-gtk-2.0/menu.c:910
msgid "Patrol (_Q)"
msgstr "Patrouille (_Q)"
-#: client/gui-gtk-2.0/menu.c:881 client/gui-win32/menu.c:385
+#: client/gui-gtk-2.0/menu.c:912 client/gui-win32/menu.c:385
msgid "_Go to"
msgstr "Aller (_G)"
-#: client/gui-gtk-2.0/menu.c:883
+#: client/gui-gtk-2.0/menu.c:914
msgid "Go\\/Airlift to City"
msgstr "Aller\\/Aéroporter dans une ville"
-#: client/gui-gtk-2.0/menu.c:885 client/gui-sdl/menu.c:450
+#: client/gui-gtk-2.0/menu.c:916 client/gui-sdl/menu.c:450
#: client/gui-win32/menu.c:387 client/gui-xaw/menu.c:203
msgid "Return to nearest city"
msgstr "Retourner à la ville la plus proche"
-#: client/gui-gtk-2.0/menu.c:889 client/gui-win32/menu.c:389
+#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:389
#: client/gui-xaw/menu.c:205
msgid "Disband Unit"
msgstr "Congédier l'unité"
-#: client/gui-gtk-2.0/menu.c:891 client/gui-sdl/citydlg.c:532
+#: client/gui-gtk-2.0/menu.c:922 client/gui-sdl/citydlg.c:532
#: data/Freeciv.in:1186
msgid "Upgrade unit"
msgstr "Mettre à jour l'unité"
-#: client/gui-gtk-2.0/menu.c:893
+#: client/gui-gtk-2.0/menu.c:924
msgid "Diplomat\\/Spy Actions"
msgstr "Actions diplomatiques\\/d'espionnage "
-#: client/gui-gtk-2.0/menu.c:895 client/gui-sdl/menu.c:399
+#: client/gui-gtk-2.0/menu.c:926 client/gui-sdl/menu.c:399
#: client/gui-win32/menu.c:391 client/gui-xaw/menu.c:209
msgid "Explode Nuclear"
msgstr "Explosion Nucléaire"
-#: client/gui-gtk-2.0/menu.c:899
-msgid "Select same type"
-msgstr "Sélection même type"
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/cityrep.c:882
+msgid "Select"
+msgstr "Sélectionner"
+
+# AR
+#: client/gui-gtk-2.0/menu.c:934
+#, fuzzy
+msgid "Single"
+msgstr "Jungle"
+
+#: client/gui-gtk-2.0/menu.c:936
+msgid "Same Type On Tile"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:938
+msgid "All On Tile"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:940
+msgid "Same Type On Continent"
+msgstr ""
-#: client/gui-gtk-2.0/menu.c:901 client/gui-win32/menu.c:393
+#: client/gui-gtk-2.0/menu.c:942
+msgid "Same Type Everywhere"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:393
msgid "_Wait"
msgstr "Attendre (_W)"
-#: client/gui-gtk-2.0/menu.c:903 client/gui-win32/menu.c:394
+#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:394
#: client/gui-xaw/menu.c:213
msgid "Done"
msgstr "Terminé"
-#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:398
+#: client/gui-gtk-2.0/menu.c:949 client/gui-win32/menu.c:398
msgid "_Reports"
msgstr "_Rapports"
-#: client/gui-gtk-2.0/menu.c:908 client/gui-gtk-2.0/menu.c:910
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:914
-#: client/gui-gtk-2.0/menu.c:916 client/gui-gtk-2.0/menu.c:918
-#: client/gui-gtk-2.0/menu.c:920 client/gui-gtk-2.0/menu.c:922
-#: client/gui-gtk-2.0/menu.c:924 client/gui-gtk-2.0/menu.c:926
-#: client/gui-gtk-2.0/menu.c:928 client/gui-gtk-2.0/menu.c:930
-#: client/gui-gtk-2.0/menu.c:932 data/Freeciv.in:2030
+#: client/gui-gtk-2.0/menu.c:951 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:957
+#: client/gui-gtk-2.0/menu.c:959 client/gui-gtk-2.0/menu.c:961
+#: client/gui-gtk-2.0/menu.c:963 client/gui-gtk-2.0/menu.c:965
+#: client/gui-gtk-2.0/menu.c:967 client/gui-gtk-2.0/menu.c:969
+#: client/gui-gtk-2.0/menu.c:971 client/gui-gtk-2.0/menu.c:973
+#: client/gui-gtk-2.0/menu.c:975 data/Freeciv.in:2030
msgid "Reports"
msgstr "Rapports"
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:958
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:1001
#: client/gui-win32/menu.c:400 client/gui-win32/menu.c:425
msgid "_Units"
msgstr "_Unités"
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/menu.c:914 client/gui-win32/menu.c:402
+#: client/gui-gtk-2.0/menu.c:957 client/gui-win32/menu.c:402
#, fuzzy
msgid "_Nations"
msgstr "_Nations"
-#: client/gui-gtk-2.0/menu.c:918 client/gui-win32/menu.c:403
+#: client/gui-gtk-2.0/menu.c:961 client/gui-win32/menu.c:403
msgid "_Economy"
msgstr "Économi_e"
#. TRANS: Research report action
-#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:405
+#: client/gui-gtk-2.0/menu.c:963 client/gui-win32/menu.c:405
#, fuzzy
msgid "_Research"
msgstr "_Recherche"
-#: client/gui-gtk-2.0/menu.c:924 client/gui-win32/menu.c:407
+#: client/gui-gtk-2.0/menu.c:967 client/gui-win32/menu.c:407
msgid "_Wonders of the World"
msgstr "_Merveilles du monde"
-#: client/gui-gtk-2.0/menu.c:926 client/gui-win32/menu.c:408
+#: client/gui-gtk-2.0/menu.c:969 client/gui-win32/menu.c:408
msgid "_Top Five Cities"
msgstr "_Top 5 des villes"
-#: client/gui-gtk-2.0/menu.c:928 client/gui-win32/menu.c:409
+#: client/gui-gtk-2.0/menu.c:971 client/gui-win32/menu.c:409
msgid "_Messages"
msgstr "Me_ssages"
-#: client/gui-gtk-2.0/menu.c:930 client/gui-win32/menu.c:410
+#: client/gui-gtk-2.0/menu.c:973 client/gui-win32/menu.c:410
msgid "_Demographics"
msgstr "_Démographie"
-#: client/gui-gtk-2.0/menu.c:932 client/gui-gtk-2.0/plrdlg.c:471
+#: client/gui-gtk-2.0/menu.c:975 client/gui-gtk-2.0/plrdlg.c:354
#: client/gui-win32/menu.c:411
msgid "_Spaceship"
msgstr "_Vaisseau spatial"
-#: client/gui-gtk-2.0/menu.c:936 client/gui-win32/menu.c:415
+#: client/gui-gtk-2.0/menu.c:979 client/gui-win32/menu.c:415
msgid "_Help"
msgstr "_Aide"
-#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
-#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
-#: client/gui-gtk-2.0/menu.c:946 client/gui-gtk-2.0/menu.c:948
-#: client/gui-gtk-2.0/menu.c:950 client/gui-gtk-2.0/menu.c:952
-#: client/gui-gtk-2.0/menu.c:954 client/gui-gtk-2.0/menu.c:956
-#: client/gui-gtk-2.0/menu.c:958 client/gui-gtk-2.0/menu.c:960
-#: client/gui-gtk-2.0/menu.c:962 client/gui-gtk-2.0/menu.c:964
-#: client/gui-gtk-2.0/menu.c:966 client/gui-gtk-2.0/menu.c:968
-#: client/gui-gtk-2.0/menu.c:970 client/gui-gtk-2.0/menu.c:972
-#: client/gui-gtk-2.0/menu.c:974 client/gui-gtk-2.0/menu.c:976
-#: client/gui-gtk-2.0/menu.c:978 client/gui-gtk-2.0/menu.c:980
+#: client/gui-gtk-2.0/menu.c:981 client/gui-gtk-2.0/menu.c:983
+#: client/gui-gtk-2.0/menu.c:985 client/gui-gtk-2.0/menu.c:987
+#: client/gui-gtk-2.0/menu.c:989 client/gui-gtk-2.0/menu.c:991
+#: client/gui-gtk-2.0/menu.c:993 client/gui-gtk-2.0/menu.c:995
+#: client/gui-gtk-2.0/menu.c:997 client/gui-gtk-2.0/menu.c:999
+#: client/gui-gtk-2.0/menu.c:1001 client/gui-gtk-2.0/menu.c:1003
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-gtk-2.0/menu.c:1007
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-gtk-2.0/menu.c:1011
+#: client/gui-gtk-2.0/menu.c:1013 client/gui-gtk-2.0/menu.c:1015
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-gtk-2.0/menu.c:1019
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-gtk-2.0/menu.c:1023
#: client/gui-gtk-2.0/repodlgs.c:313 client/gui-win32/citydlg.c:1077
#: client/gui-win32/repodlgs.c:289 client/gui-win32/wldlg.c:846
#: data/Freeciv.in:1466 data/Freeciv.in:2031 data/Freeciv.in:2101
@@ -12308,120 +12525,120 @@ msgstr "_Aide"
msgid "Help"
msgstr "Aide"
-#: client/gui-gtk-2.0/menu.c:940 client/gui-win32/menu.c:416
+#: client/gui-gtk-2.0/menu.c:983 client/gui-win32/menu.c:416
msgid "Language_s"
msgstr "Langue_s"
-#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/menu.c:417
+#: client/gui-gtk-2.0/menu.c:985 client/gui-win32/menu.c:417
msgid "Co_nnecting"
msgstr "Co_nnexion"
-#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:418
+#: client/gui-gtk-2.0/menu.c:987 client/gui-win32/menu.c:418
msgid "C_ontrols"
msgstr "C_ontrôles"
-#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:419
+#: client/gui-gtk-2.0/menu.c:989 client/gui-win32/menu.c:419
msgid "C_hatline"
msgstr "D_iscussion"
-#: client/gui-gtk-2.0/menu.c:948 client/gui-win32/menu.c:420
+#: client/gui-gtk-2.0/menu.c:991 client/gui-win32/menu.c:420
msgid "_Worklist Editor"
msgstr "É_diteur de liste de travail"
-#: client/gui-gtk-2.0/menu.c:950 client/gui-win32/menu.c:421
+#: client/gui-gtk-2.0/menu.c:993 client/gui-win32/menu.c:421
msgid "Citizen _Management"
msgstr "_Gestion des citadins"
-#: client/gui-gtk-2.0/menu.c:952 client/gui-win32/menu.c:422
+#: client/gui-gtk-2.0/menu.c:995 client/gui-win32/menu.c:422
msgid "_Playing"
msgstr "_Jouer"
# AR
-#: client/gui-gtk-2.0/menu.c:956 client/gui-win32/menu.c:424
+#: client/gui-gtk-2.0/menu.c:999 client/gui-win32/menu.c:424
msgid "City _Improvements"
msgstr "_Bâtiments"
-#: client/gui-gtk-2.0/menu.c:960 client/gui-win32/menu.c:426
+#: client/gui-gtk-2.0/menu.c:1003 client/gui-win32/menu.c:426
msgid "Com_bat"
msgstr "_Combat"
-#: client/gui-gtk-2.0/menu.c:962 client/gui-win32/menu.c:427
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-win32/menu.c:427
msgid "_ZOC"
msgstr "_ZDC"
-#: client/gui-gtk-2.0/menu.c:964 client/gui-win32/menu.c:428
+#: client/gui-gtk-2.0/menu.c:1007 client/gui-win32/menu.c:428
msgid "Techno_logy"
msgstr "Techno_logie"
-#: client/gui-gtk-2.0/menu.c:966 client/gui-win32/menu.c:429
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-win32/menu.c:429
msgid "_Terrain"
msgstr "_Terrain"
-#: client/gui-gtk-2.0/menu.c:968 client/gui-win32/menu.c:430
+#: client/gui-gtk-2.0/menu.c:1011 client/gui-win32/menu.c:430
msgid "Won_ders"
msgstr "Me_rveilles"
-#: client/gui-gtk-2.0/menu.c:972 client/gui-win32/menu.c:432
+#: client/gui-gtk-2.0/menu.c:1015 client/gui-win32/menu.c:432
msgid "Happin_ess"
msgstr "Bonh_eur"
-#: client/gui-gtk-2.0/menu.c:974 client/gui-win32/menu.c:433
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-win32/menu.c:433
msgid "Space _Race"
msgstr "Cou_rse à l'espace"
-#: client/gui-gtk-2.0/menu.c:978 client/gui-win32/menu.c:435
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-win32/menu.c:435
msgid "_Copying"
msgstr "_Licence"
-#: client/gui-gtk-2.0/menu.c:980 client/gui-win32/menu.c:436
+#: client/gui-gtk-2.0/menu.c:1023 client/gui-win32/menu.c:436
msgid "_About"
msgstr "À _propos"
-#: client/gui-gtk-2.0/menu.c:1264
+#: client/gui-gtk-2.0/menu.c:1307
#, c-format
msgid "%s..."
msgstr "%s..."
-#: client/gui-gtk-2.0/menu.c:1352
+#: client/gui-gtk-2.0/menu.c:1397
#, c-format
msgid "Change to %s (_I)"
msgstr "Changer en %s (_I)"
-#: client/gui-gtk-2.0/menu.c:1353
+#: client/gui-gtk-2.0/menu.c:1398
#, c-format
msgid "Change to %s (_M)"
msgstr "Changer en %s (_M)"
-#: client/gui-gtk-2.0/menu.c:1354
+#: client/gui-gtk-2.0/menu.c:1399
#, c-format
msgid "Transf_orm to %s"
msgstr "Transf_ormer en %s"
-#: client/gui-gtk-2.0/menu.c:1427
+#: client/gui-gtk-2.0/menu.c:1472
msgid "Help _Build Wonder"
msgstr "Aider à la construction de la merveille (_b)"
-#: client/gui-gtk-2.0/menu.c:1441
+#: client/gui-gtk-2.0/menu.c:1486
msgid "Add to City (_B)"
msgstr "Ajouter à la ville (_B)"
-#: client/gui-gtk-2.0/menu.c:1449
+#: client/gui-gtk-2.0/menu.c:1494
msgid "Make Trade _Route"
msgstr "Créer une _Route commerciale"
-#: client/gui-gtk-2.0/menu.c:1463
+#: client/gui-gtk-2.0/menu.c:1508
msgid "Build _Railroad"
msgstr "Construire un chemin de fe_r"
-#: client/gui-gtk-2.0/menu.c:1486
+#: client/gui-gtk-2.0/menu.c:1531
msgid "Bu_ild Farmland"
msgstr "Construire une _ferme"
-#: client/gui-gtk-2.0/menu.c:1506
+#: client/gui-gtk-2.0/menu.c:1551
msgid "_Fortify"
msgstr "Se retrancher (_F)"
-#: client/gui-gtk-2.0/menu.c:1512
+#: client/gui-gtk-2.0/menu.c:1557
msgid "_Paradrop"
msgstr "_Parachuter"
@@ -12456,13 +12673,32 @@ msgstr "mes"
msgid "Pop"
msgstr "pop"
-#: client/gui-gtk-2.0/messagewin.c:155 client/gui-sdl/messagewin.c:247
+#: client/gui-gtk-2.0/messagewin.c:186 client/gui-sdl/messagewin.c:247
#: client/gui-win32/messagewin.c:132 client/gui-xaw/menu.c:228
#: data/Freeciv.in:3273 data/Freeciv.in:3274 data/Freeciv.in:3283
msgid "Messages"
msgstr "Messages"
-#: client/gui-gtk-2.0/plrdlg.c:330
+#: client/gui-gtk-2.0/plrdlg.c:317
+msgid "_Meet"
+msgstr "Réunir (_M)"
+
+#: client/gui-gtk-2.0/plrdlg.c:323
+#, fuzzy
+msgid "Cancel _Treaty"
+msgstr "_Annuler traité"
+
+#: client/gui-gtk-2.0/plrdlg.c:329
+#, fuzzy
+msgid "_Withdraw Vision"
+msgstr "Retirer la vue (_w)"
+
+#: client/gui-gtk-2.0/plrdlg.c:348
+#, fuzzy
+msgid "_Report"
+msgstr "_Rapports"
+
+#: client/gui-gtk-2.0/plrdlg.c:386
msgid "?show:Dead Players"
msgstr "?show:Joueurs morts"
@@ -12470,268 +12706,271 @@ msgstr "?show:Joueurs morts"
#. TRANS: Nations report action
#. TRANS: Nations report title
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/plrdlg.c:350 client/gui-sdl/mapctrl.c:1580
+#: client/gui-gtk-2.0/plrdlg.c:406 client/gui-sdl/mapctrl.c:1580
#: client/gui-sdl/plrdlg.c:608 client/gui-win32/plrdlg.c:344
#: client/gui-xaw/menu.c:221 data/Freeciv.in:3192 data/Freeciv.in:3193
msgid "Nations"
msgstr "Nations"
-#: client/gui-gtk-2.0/plrdlg.c:443
-msgid "_Intelligence"
-msgstr "Rense_ignement"
-
-#: client/gui-gtk-2.0/plrdlg.c:450
-msgid "_Meet"
-msgstr "Réunir (_M)"
-
-#: client/gui-gtk-2.0/plrdlg.c:457
+#: client/gui-gtk-2.0/plrdlg.c:511
#, fuzzy
-msgid "Cancel _Treaty"
-msgstr "_Annuler traité"
+msgid "Di_plomacy"
+msgstr "Diplomatie"
-#: client/gui-gtk-2.0/plrdlg.c:464
-msgid "_Withdraw vision"
-msgstr "Retirer la vue (_w)"
+#: client/gui-gtk-2.0/plrdlg.c:516
+msgid "_Intelligence"
+msgstr "Rense_ignement"
-#: client/gui-gtk-2.0/plrdlg.c:495
+#: client/gui-gtk-2.0/plrdlg.c:526
msgid "_AI"
msgstr "_IA"
-#: client/gui-gtk-2.0/plrdlg.c:501
+#: client/gui-gtk-2.0/plrdlg.c:532
msgid "_Toggle AI Mode"
msgstr "Basculer en mode IA (_t)"
-#: client/gui-gtk-2.0/pages.c:208
+#: client/gui-gtk-2.0/pages.c:221
msgid "Start _New Game"
msgstr "Démarrer une _nouvelle partie"
-#: client/gui-gtk-2.0/pages.c:214
+#: client/gui-gtk-2.0/pages.c:227
msgid "Start _Scenario Game"
msgstr "Démarrer un _scénario"
-#: client/gui-gtk-2.0/pages.c:220
+#: client/gui-gtk-2.0/pages.c:233
msgid "_Load Saved Game"
msgstr "C_harger une partie"
-#: client/gui-gtk-2.0/pages.c:229
+#: client/gui-gtk-2.0/pages.c:239
msgid "C_onnect to Network Game"
msgstr "Se c_onnecter à une partie en réseau"
-#: client/gui-gtk-2.0/pages.c:236
+#: client/gui-gtk-2.0/pages.c:247
msgid "Connect to Gaming _Zone"
msgstr "Se connecter à Gaming _Zone"
-#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:300
#: client/gui-xaw/connectdlg.c:326
msgid "Passwords don't match, enter password."
msgstr "Les mots de passe ne correspondent pas, entrez le mot de passe."
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:779 client/gui-gtk-2.0/pages.c:820
+#: client/gui-win32/connectdlg.c:916
msgid "Server Name"
msgstr "Nom du serveur"
-#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
+#: 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
+#: data/Freeciv.in:96
msgid "Port"
msgstr "Port"
-#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
+#: client/gui-win32/connectdlg.c:917
msgid "Version"
msgstr "Version"
-#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
-#: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
+#: 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
msgid "Status"
msgstr "Statut"
-#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
-#: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
+#: 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
msgid "Players"
msgstr "Joueurs"
-#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
+#: client/gui-win32/connectdlg.c:918
msgid "Comment"
msgstr "Commentaire"
-#: client/gui-gtk-2.0/pages.c:747
+#: client/gui-gtk-2.0/pages.c:786
msgid "Local _Area Network"
msgstr "Réseau loc_al"
-#: client/gui-gtk-2.0/pages.c:783
+#: client/gui-gtk-2.0/pages.c:827
msgid "Internet _Metaserver"
msgstr "_Métaserveur internet"
-#: client/gui-gtk-2.0/pages.c:817
+#: client/gui-gtk-2.0/pages.c:864
msgid "_Host:"
msgstr "_Hôte :"
-#: client/gui-gtk-2.0/pages.c:834
+#: client/gui-gtk-2.0/pages.c:881
msgid "_Port:"
msgstr "_Port :"
-#: client/gui-gtk-2.0/pages.c:851
+#: client/gui-gtk-2.0/pages.c:898
msgid "_Login:"
msgstr "_Login :"
-#: client/gui-gtk-2.0/pages.c:869
+#: client/gui-gtk-2.0/pages.c:916
msgid "Pass_word:"
msgstr "Mot de passe (_w):"
-#: client/gui-gtk-2.0/pages.c:887
+#: client/gui-gtk-2.0/pages.c:934
msgid "Conf_irm Password:"
msgstr "Conf_irmer le mot de passe:"
-#: client/gui-gtk-2.0/pages.c:912
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: 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/wldlg.c:800 client/gui-win32/wldlg.c:806
+msgid "Type"
+msgstr "Type"
+
+#: client/gui-gtk-2.0/pages.c:952 client/gui-win32/plrdlg.c:337
+#: data/Freeciv.in:88
+msgid "Host"
+msgstr "Hôte"
+
+#: client/gui-gtk-2.0/pages.c:981
msgid "C_onnect"
msgstr "C_onnexion"
-#: client/gui-gtk-2.0/pages.c:1142
+#: client/gui-gtk-2.0/pages.c:1211
#, c-format
msgid "Connection name: %s"
msgstr "Nom de connexion : %s"
-#: client/gui-gtk-2.0/pages.c:1145
+#: client/gui-gtk-2.0/pages.c:1214
#, c-format
msgid "Player name: %s"
msgstr "Nom du joueur : %s"
-#: client/gui-gtk-2.0/pages.c:1150
+#: client/gui-gtk-2.0/pages.c:1219
#, c-format
msgid "Host: %s"
msgstr "Hôte : %s"
-#: client/gui-gtk-2.0/pages.c:1158
+#: client/gui-gtk-2.0/pages.c:1227
msgid "Player/conn info"
msgstr "Info joueur/connect"
-#: client/gui-gtk-2.0/pages.c:1185
+#: client/gui-gtk-2.0/pages.c:1254
#, c-format
msgid "%s info"
msgstr "%s info"
-#: client/gui-gtk-2.0/pages.c:1196
+#: client/gui-gtk-2.0/pages.c:1265
msgid "Toggle player ready"
msgstr "Permuter joueur prêt"
-#: client/gui-gtk-2.0/pages.c:1204
+#: client/gui-gtk-2.0/pages.c:1273
msgid "Pick nation"
msgstr "Prendre une nation"
-#: client/gui-gtk-2.0/pages.c:1214
+#: client/gui-gtk-2.0/pages.c:1283
msgid "Observe this player"
msgstr "Observer ce joueur"
-#: client/gui-gtk-2.0/pages.c:1221
+#: client/gui-gtk-2.0/pages.c:1290
msgid "Take this player"
msgstr "Prendre ce joueur"
-#: client/gui-gtk-2.0/pages.c:1238
+#: client/gui-gtk-2.0/pages.c:1307
msgid "Cut connection"
msgstr "Couper la connexion"
-#: client/gui-gtk-2.0/pages.c:1248
+#: client/gui-gtk-2.0/pages.c:1317
msgid "Aitoggle player"
msgstr "Permuter entre IA et jouer"
-#: client/gui-gtk-2.0/pages.c:1257
+#: client/gui-gtk-2.0/pages.c:1326
msgid "Remove player"
msgstr "Retirer le Joueur"
-#: client/gui-gtk-2.0/pages.c:1268
+#: client/gui-gtk-2.0/pages.c:1337
msgid "Give info access"
msgstr "Donner le niveau d'accès info"
-#: client/gui-gtk-2.0/pages.c:1276
+#: client/gui-gtk-2.0/pages.c:1345
msgid "Give ctrl access"
msgstr "Donner le niveau d'accès ctrl"
#. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1338
+#: client/gui-gtk-2.0/pages.c:1407
#, c-format
msgid "Put on %s"
msgstr "Ajouté dans %s"
-#: client/gui-gtk-2.0/pages.c:1442
+#: client/gui-gtk-2.0/pages.c:1511
#, fuzzy
msgid "Number of _Players (including AI):"
msgstr "Nombre de _joueurs (y compris IA) :"
-#: client/gui-gtk-2.0/pages.c:1465
+#: client/gui-gtk-2.0/pages.c:1534
#, fuzzy
msgid "AI Skill _Level:"
msgstr "Niveau de l'I_A :"
-#: client/gui-gtk-2.0/pages.c:1481
+#: client/gui-gtk-2.0/pages.c:1550
#, fuzzy
msgid "Ruleset _Version:"
msgstr "Jeu de _règles :"
-#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
msgid "_More Game Options..."
msgstr "Plus d'_options..."
-#: client/gui-gtk-2.0/pages.c:1514
+#: client/gui-gtk-2.0/pages.c:1583
msgid "Record"
msgstr "Enregistré"
-#: client/gui-gtk-2.0/pages.c:1519
+#: client/gui-gtk-2.0/pages.c:1588
msgid "Rating"
msgstr "Classement"
-#: client/gui-gtk-2.0/pages.c:1525
+#: client/gui-gtk-2.0/pages.c:1594
msgid "Ready"
msgstr "Prêt"
-#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
-#: data/nation/slovakian.ruleset:26
-msgid "Leader"
-msgstr "Chef"
+#: client/gui-gtk-2.0/pages.c:1601
+#, fuzzy
+msgid "?player:Leader"
+msgstr "?joueur:Nom"
-#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1732 client/gui-sdl/chatline.c:185
msgid "Choose Saved Game to Load"
msgstr "Choisissez la partie à charger"
-#: client/gui-gtk-2.0/pages.c:1752
+#: client/gui-gtk-2.0/pages.c:1824
msgid "Choose Saved Game to _Load:"
msgstr "Choisissez _la partie à charger :"
-#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
-#: client/gui-gtk-2.0/pages.c:2375
+#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
+#: client/gui-gtk-2.0/pages.c:2451
msgid "_Browse..."
msgstr "_Parcourir..."
-#: client/gui-gtk-2.0/pages.c:1839
+#: client/gui-gtk-2.0/pages.c:1911
msgid "Choose a Scenario"
msgstr "Choisissez un scénario"
-#: client/gui-gtk-2.0/pages.c:1926
+#: client/gui-gtk-2.0/pages.c:1998
msgid "Choose a _Scenario:"
msgstr "Choisissez un _scénario :"
-#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
-#: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
-#: client/gui-win32/wldlg.c:806
-msgid "Type"
-msgstr "Type"
-
-#: client/gui-gtk-2.0/pages.c:2101
+#: client/gui-gtk-2.0/pages.c:2173
msgid "Choose a _nation to play:"
msgstr "Choisissez une _nation à diriger :"
-#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2363 client/gui-win32/menu.c:581
msgid "Select Location to Save"
msgstr "Choisissez l'endroit où sauvegarder"
-#: client/gui-gtk-2.0/pages.c:2372 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2448 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr "Sauvegarder la partie"
-#: client/gui-gtk-2.0/pages.c:2413
+#: client/gui-gtk-2.0/pages.c:2489
msgid "Saved _Games:"
msgstr "Parties sauve_gardées :"
-#: client/gui-gtk-2.0/pages.c:2440
+#: client/gui-gtk-2.0/pages.c:2516
msgid "Save _Filename:"
msgstr "Sauvegarder le _fichier :"
@@ -13084,7 +13323,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:1094
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
msgid "Back"
msgstr "Retour"
@@ -13093,7 +13332,7 @@ msgid "Start"
msgstr "Démarrer"
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:775
+#: client/gui-win32/connectdlg.c:777
msgid "Load Game"
msgstr "Charger une partie"
@@ -13130,12 +13369,12 @@ msgid "Make new homecity"
msgstr "Se rattacher à cette ville"
#: client/gui-sdl/citydlg.c:546 client/gui-sdl/citydlg.c:1418
-#: client/gui-sdl/connectdlg.c:307 client/gui-sdl/connectdlg.c:616
-#: client/gui-sdl/connectdlg.c:802 client/gui-sdl/connectdlg.c:984
+#: 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/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1039
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
#: 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
@@ -13182,7 +13421,7 @@ msgstr "L'acheter ?"
#: client/gui-sdl/diplodlg.c:1335 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:2427
+#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
#: client/gui-xaw/cityrep.c:666 client/gui-xaw/cma_fe.c:327
#: client/gui-xaw/cma_fe.c:511 client/gui-xaw/cma_fe.c:765
#: client/gui-xaw/messagedlg.c:72 client/gui-xaw/optiondlg.c:76
@@ -13198,7 +13437,7 @@ msgstr "Non"
#: client/gui-sdl/diplodlg.c:1345 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:2427 client/gui-xaw/cityrep.c:666
+#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
#: client/gui-xaw/cma_fe.c:327 client/gui-xaw/cma_fe.c:511
#: client/gui-xaw/cma_fe.c:765 client/gui-xaw/messagedlg.c:72
#: client/gui-xaw/optiondlg.c:76 client/gui-xaw/optiondlg.c:304
@@ -13477,36 +13716,36 @@ msgstr "Appliquer une fois"
msgid "Release city"
msgstr "Libérer la ville"
-#: client/gui-sdl/connectdlg.c:238
+#: client/gui-sdl/connectdlg.c:239
msgid "Creating Server List..."
msgstr "Création de la liste des serveurs ..."
-#: client/gui-sdl/connectdlg.c:279 client/gui-sdl/connectdlg.c:343
+#: client/gui-sdl/connectdlg.c:280 client/gui-sdl/connectdlg.c:344
msgid "No LAN servers found"
msgstr "Aucun serveur local trouvé"
-#: client/gui-sdl/connectdlg.c:281 client/gui-sdl/connectdlg.c:345
+#: client/gui-sdl/connectdlg.c:282 client/gui-sdl/connectdlg.c:346
msgid "No public servers found"
msgstr "Aucun serveur public trouvé"
-#: client/gui-sdl/connectdlg.c:555
+#: client/gui-sdl/connectdlg.c:556
msgid "Player Name :"
msgstr "Nom du jouer :"
-#: client/gui-sdl/connectdlg.c:571
+#: client/gui-sdl/connectdlg.c:572
msgid "Freeciv Server :"
msgstr "Serveur Freeciv :"
-#: client/gui-sdl/connectdlg.c:588
+#: client/gui-sdl/connectdlg.c:589
msgid "Port :"
msgstr "Port :"
-#: client/gui-sdl/connectdlg.c:608 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr "Se connecter"
-#: client/gui-sdl/connectdlg.c:794 client/gui-sdl/connectdlg.c:977
+#: client/gui-sdl/connectdlg.c:795 client/gui-sdl/connectdlg.c:978
#: client/gui-xaw/connectdlg.c:145
msgid "Next"
msgstr "Suivant"
@@ -13787,8 +14026,8 @@ msgid "Unable to initialize SDL library: %s"
msgstr "Impossible d'initialiser la bibliothèque SDL : %s"
#: client/gui-sdl/graphics.c:1021
-#, c-format
-msgid "Unable to initialize SDL_ttf library: %s"
+#, fuzzy, c-format
+msgid "Unable to initialize SDL_ttf library: %s"
msgstr "Impossible d'initialiser la bibliothèque SDL_ttf : %s"
#: client/gui-sdl/graphics.c:1058
@@ -13877,14 +14116,6 @@ msgstr "Initialisation du client"
msgid "Waiting for the beginning of the game"
msgstr "En attente du début de la partie"
-#: client/gui-sdl/gui_string.c:608
-msgid ""
-"Couldn't find stdfont.ttf file. Please link/copy/move anyunicode ttf font to "
-"data dir as stdfont.ttf"
-msgstr ""
-"Impossible de trouver le fichier stdfont.ttf. Veuillez liéer/copier/déplacer "
-"n'importe quelle police ttf dans le répertoire data sous le nom stdfont.ttf"
-
#. TRANS: Future Technology
#: client/gui-sdl/gui_tilespec.c:506
msgid "FT"
@@ -14479,12 +14710,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:1098 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1100 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:963
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
msgid "Start New Game"
msgstr "Démarrer une nouvelle partie"
@@ -14601,8 +14832,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:1081
-#: client/gui-win32/connectdlg.c:1089 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
+#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
msgid "Update"
msgstr "M.À.J."
@@ -15062,10 +15293,6 @@ msgstr "Tout Changer"
msgid "Refresh"
msgstr "Rafraîchir"
-#: client/gui-win32/cityrep.c:882
-msgid "Select"
-msgstr "Sélectionner"
-
#: client/gui-win32/cityrep.c:883
msgid "Configure"
msgstr "Configurer"
@@ -15115,55 +15342,55 @@ msgstr "Impossible de charger le fichier de sauvegarde"
msgid "Verify Password"
msgstr "Vérification du mot de passe"
-#: client/gui-win32/connectdlg.c:912 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr "Sélection du Serveur Freeciv"
-#: client/gui-win32/connectdlg.c:913
+#: client/gui-win32/connectdlg.c:915
msgid "Local Area Network"
msgstr "Réseau local"
-#: client/gui-win32/connectdlg.c:947
+#: client/gui-win32/connectdlg.c:949
msgid "Welcome to Freeciv"
msgstr "Bienvenue à Freeciv"
-#: client/gui-win32/connectdlg.c:965
+#: client/gui-win32/connectdlg.c:967
msgid "Load Saved Game"
msgstr "Charger une partie"
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
msgid "Connect To Network Game"
msgstr "Se connecter à une partie en réseau"
-#: client/gui-win32/connectdlg.c:977
+#: client/gui-win32/connectdlg.c:979
msgid "Choose a nation to play"
msgstr "Choisissez une nation à diriger"
-#: client/gui-win32/connectdlg.c:1012
+#: client/gui-win32/connectdlg.c:1014
msgid "Number of players (Including AI):"
msgstr "Nombre de joueurs (y compris IA) :"
-#: client/gui-win32/connectdlg.c:1020
+#: client/gui-win32/connectdlg.c:1022
msgid "AI skill level:"
msgstr "Niveau de l'IA :"
-#: client/gui-win32/connectdlg.c:1034 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
msgid "Game Options"
msgstr "Options du jeu"
-#: client/gui-win32/connectdlg.c:1038
+#: client/gui-win32/connectdlg.c:1040
msgid "Start Game"
msgstr "Démarrer la partie"
-#: client/gui-win32/connectdlg.c:1057
+#: client/gui-win32/connectdlg.c:1059
msgid "Login:"
msgstr "Login:"
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
msgid "Host:"
msgstr "Hôte :"
-#: client/gui-win32/connectdlg.c:1060
+#: client/gui-win32/connectdlg.c:1062
msgid "Port:"
msgstr "Port :"
@@ -15427,10 +15654,6 @@ msgid_plural "(idle %d turns)"
msgstr[0] "(Inactif, %d tour)"
msgstr[1] "(Inactif, %d tours)"
-#: client/gui-win32/plrdlg.c:337 data/Freeciv.in:88
-msgid "Host"
-msgstr "Hôte"
-
#: client/gui-win32/plrdlg.c:355 data/Freeciv.in:3230
msgid "Intelligence"
msgstr "Renseignement"
@@ -17259,13 +17482,14 @@ msgstr ""
"défaut, les autres peuvent être obtenus en signant des traités diplomatiques."
#: data/helpdata.txt:781
+#, fuzzy
msgid ""
-" To have a diplomatic relationship with another player, you must fist "
-"establish first contact with that player. To establish first contact, you "
-"have to move one of your units next to a city or unit belonging to that "
-"player, or vice versa. Unless you establish an embassy with that player, you "
-"may again lose contact with them after a set number of turns without direct "
-"physical contact."
+" To have a diplomatic relationship with another player, you must first "
+"establish contact with that player. To establish contact, you have to move "
+"one of your units next to a city or unit belonging to that player, or vice "
+"versa. Unless you establish an embassy with that player, you may again lose "
+"contact with them after a set number of turns without direct physical "
+"contact."
msgstr ""
" Pour avoir des relations diplomatiques avec un autre joueur, vous "
"devez, en premier lieu, établir un contact avec ce joueur. Pour établir un "
@@ -20179,7 +20403,7 @@ msgid "Communism"
msgstr "Communisme"
#: data/default/governments.ruleset:121 data/civ2/governments.ruleset:118
-#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:26
+#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:27
msgid "Comrade"
msgstr "Camarade"
@@ -21176,6 +21400,11 @@ msgstr ""
"efforts excessifs peuvent être gâchés, et un groupe de Colons/Ingénieurs est "
"très vulnérable aux attaques ennemies."
+#: data/default/units.ruleset:238
+#, fuzzy
+msgid "?unit:Workers"
+msgstr "Travailleurs"
+
#: data/default/units.ruleset:264
msgid ""
"Workers are one of the key units in the game. They can be used to irrigate "
@@ -21854,6 +22083,11 @@ msgid "Explorers are very useful for mapping unknown territory."
msgstr ""
"Les explorateurs sont très pratiques pour découvrir de nouveaux territoires."
+#: data/default/units.ruleset:1864
+#, fuzzy
+msgid "?unit:Leader"
+msgstr "Chef"
+
#: data/default/units.ruleset:1892
msgid "This is you. If you lose this unit, you lose the game. So don't."
msgstr ""
@@ -22129,7 +22363,7 @@ msgid "Emir"
msgstr "Émir"
#: data/nation/afghani.ruleset:25 data/nation/slovakian.ruleset:30
-#: data/nation/soviet.ruleset:27
+#: data/nation/soviet.ruleset:28
msgid "General Secretary"
msgstr "Premier secrétaire"
@@ -22247,10 +22481,11 @@ msgid "?plural:Armenians"
msgstr "?plural:Arméniens"
#: 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 "
-"independence from Soviet in 1991 AD"
+"independence from the Soviet Union in 1991."
msgstr ""
"D'après la légende, les Arméniens sont les descendants d'Haik, l'arrière-"
"arrière-petit fils de Noah. La république d'Arménie acquise son indépendance "
@@ -23339,13 +23574,13 @@ msgid "?plural:Illyrians"
msgstr "?plural:Illyriens"
#: 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 the Dalmatians to the north, "
-"Corcyra island and Ambracia bay in prehistoric Epirus to the south, mixing "
-"with Thracians in Dardania to the east, and settling Messapia across the "
-"Adriatic Sea. Illyrian kingdoms were independent for centuries, until "
-"conquered by the Roman Republic."
+"Illyrians were Indo-European tribes who appeared in the western part of the "
+"Balkan Peninsula before 1000 BC, including Corcyra island and Ambracia bay "
+"in prehistoric Epirus to the south. They mixed with Thracians in Dardania to "
+"the east, and settled Messapia across the Adriatic Sea. Illyrian kingdoms "
+"were independent for centuries, until conquered by the Roman Republic."
msgstr ""
"Les Illyriens furent une tribue indo-européenne qui apparut dans la partie "
"ouest de la péninsule des Balkans avant 1000 avant J.-C., composée des "
@@ -23684,7 +23919,7 @@ msgstr ""
"en deux états, la Corée du Nord et du Sud résultat d'une impasse après la "
"guerre de Corée en 1953."
-#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:28
+#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:29
msgid "Great Leader"
msgstr "Chef suprême"
@@ -23858,12 +24093,13 @@ msgid "?plural:Malians"
msgstr "?plural:Maliens"
#: 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 "
-"called the Sahelian kingdoms. Of these, the Islamic Mali empire with it's "
+"called the Sahelian kingdoms. Of these, the Islamic Mali empire with its "
"capital in Timbuktu was the most influential. This empire reigned from the "
-"14th to the 17th century and was famed for it's wealth and benevolent kings. "
+"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 ""
"Les Sub-shahariens furent un mélange culturel et ethnique durant des "
@@ -23934,9 +24170,10 @@ msgid "?plural:Mayas"
msgstr "?plural:Mayas"
#: data/nation/mayan.ruleset:6
+#, fuzzy
msgid ""
-"The Mayans were a Mesoamerican civilization. Famous for building great "
-"pyramids and palaces in the jungle."
+"The Mayans were a Mesoamerican civilization. They are famous for building "
+"great pyramids and palaces in the jungle."
msgstr ""
"Les Mayas furent une civilisation mésoaméricaine. Célèbre pour leurs grandes "
"pyramides et leurs palais dans la jungle."
@@ -24494,6 +24731,16 @@ msgstr ""
"La Slovaquie est un pays d'europe centrale. Qui faisait autres fois partie "
"de la Tchécoslovaquie, et avant 1918 de l'empire Austro-Hongrois."
+#: data/nation/slovakian.ruleset:26
+#, fuzzy
+msgid "?male:Leader"
+msgstr "Chef"
+
+#: data/nation/slovakian.ruleset:26
+#, fuzzy
+msgid "?female:Leader"
+msgstr "?female:Camarade"
+
#: data/nation/slovakian.ruleset:29
msgid "Pope"
msgstr "Pope"
@@ -24539,12 +24786,14 @@ msgid "?plural:Soviets"
msgstr "?plural:Soviétiques"
#: data/nation/soviet.ruleset:6
+#, fuzzy
msgid ""
-"Soviet Union's history starts in November 1917, when under Lenin's "
+"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 "
-"republics integrated into one country. Soviet Union became one of most "
-"powerful states in the 20th century. But by the end of 1991 due to many "
-"social shocks it disintegrated into fifteen independent countries"
+"republics integrated into one country. The Soviet Union became one of most "
+"powerful states in the 20th century, but by the end of 1991 it had "
+"disintegrated into fifteen independent countries due to social and economic "
+"problems."
msgstr ""
"L'histoire de l'Union Soviétique commence en novembre 1917, lors que sous la "
"direction de Lénine une révolution bolchevique éclata. Le 31 décembre 1922, "
@@ -24986,9 +25235,10 @@ msgid "?plural:Westphalians"
msgstr "?plural:Westphaliens"
#: data/nation/westphalian.ruleset:6
+#, fuzzy
msgid ""
-"Westphalia, before becoming a Prussian province, was the western region the "
-"duchy of Saxony. Present-day it consists of the Northern part of the largest "
+"Westphalia, before becoming a Prussian province, was the western region of "
+"the duchy of Saxony. Today it makes up the northern part of the largest "
"German federal state, North Rhine-Westphalia."
msgstr ""
"La Westphalie, avant de devenir une province Prusse, fut la région la plus à "
@@ -25177,6 +25427,7 @@ msgstr ""
"automatiquement sur la production de l'unité."
#: data/scenario/tutorial.sav:83
+#, fuzzy
msgid ""
"Another city! You are really getting the hang of this. You\n"
"probably have a pretty good idea what to do with new cities by\n"
@@ -25185,7 +25436,7 @@ msgid ""
"The flag and background color indicate what civilization the city\n"
"belongs to (this will be useful when you meet other civilizations).\n"
"The top row of the bar also shows the name and size of the city, and\n"
-"will show one or more starts to indicate if there are units in the\n"
+"will show one or more stars to indicate if there are units in the\n"
"city. The bottom row shows what the city is building, and how long it\n"
"will take; it also shows how long the city will take to grow to the\n"
"next largest size."
@@ -25280,12 +25531,12 @@ msgstr ""
"utiles que plus tard)."
#: data/scenario/tutorial.sav:145
-#, c-format
+#, fuzzy, c-format
msgid ""
"Now your city has grown to size five. As cities get larger unrest\n"
"becomes a problem. A city of this size will usually have one unhappy\n"
"citizen unless pacifying effects are used; meaning one entertainer\n"
-"specialist is required to keep your citzens content. This is basically\n"
+"specialist is required to keep your citizens content. This is basically\n"
"a wasted citizen.\n"
"\n"
"There are several things that can be done about this. One quick fix\n"
@@ -25403,6 +25654,7 @@ msgstr ""
"d'informations sur les spécif. de terrains."
#: data/scenario/tutorial.sav:222
+#, fuzzy
msgid ""
"Your second Settlers should also be used to build a new city.\n"
"Notice how when you move the Settlers away from your existing cities\n"
@@ -25412,7 +25664,7 @@ msgid ""
"existing cities. Generally when building new cities you want to make\n"
"sure that all tiles are covered by at least one city, but after that\n"
"it is best that your cities overlap as little as possible. Spreading\n"
-"out cities properly gives each city access to more resrouces, allowing\n"
+"out cities properly gives each city access to more resources, allowing\n"
"them to grow to larger sizes."
msgstr ""
"Votre deuxièmes colons devraient également être employés à construire\n"
@@ -25830,6 +26082,76 @@ msgstr "
msgid "Team 31"
msgstr "Équipe 31"
+#~ msgid "Auth config filename \"%s\" not allowed!"
+#~ msgstr ""
+#~ "Nom de fichier de configuration de l'authentification \"%s\" non "
+#~ "autorisé !"
+
+#~ msgid "The %s of the %s (%s)"
+#~ msgstr "%s des %s (%s)"
+
+#, fuzzy
+#~ msgid ""
+#~ "Illegal alliance structure detected: %s alliance to %s reduced to peace "
+#~ "treaty."
+#~ msgstr ""
+#~ "Détection d'une structure d'alliance illégale : l'alliance de %s avec %s "
+#~ "est ramenée à un traité de paix."
+
+#, fuzzy
+#~ msgid "And, became more experienced!"
+#~ msgstr " et a acquis de l'expérience!"
+
+#~ msgid "We can't take control of server, attempting to kill it."
+#~ msgstr ""
+#~ "Impossible de prendre le contrôle sur le serveur, tentative de le "
+#~ "terminer."
+
+#, fuzzy
+#~ msgid "%s territory"
+#~ msgstr "Territoire des %s"
+
+#~ msgid "%s territory (%d turn cease-fire)"
+#~ msgid_plural "%s territory (%d turn cease-fire)"
+#~ msgstr[0] "territoire %s (cessez-le-feu %d tour)"
+#~ msgstr[1] "territoire %s (cessez-le-feu %d tours)"
+
+#, fuzzy
+#~ msgid "%s territory (%s)"
+#~ msgstr "Territoire des %s %s"
+
+#~ msgid "City: %s (%s)"
+#~ msgstr "Ville : %s (%s)"
+
+#, fuzzy
+#~ msgid "Unit: %s (%s)"
+#~ msgstr "Unité: %s (%s)"
+
+#~ msgid "%s of the %s"
+#~ msgstr "%s des %s"
+
+#~ msgid "no maximum, "
+#~ msgstr "pas de maximum, "
+
+#~ msgid "%d unit maximum, "
+#~ msgid_plural "%d units maximum, "
+#~ msgstr[0] "%d unité au maximum, "
+#~ msgstr[1] "%d unités au maximum, "
+
+#~ msgid "%d per unit). "
+#~ msgstr "%d par unité). "
+
+#~ msgid "Select same type"
+#~ msgstr "Sélection même type"
+
+#~ msgid ""
+#~ "Couldn't find stdfont.ttf file. Please link/copy/move anyunicode ttf font "
+#~ "to data dir as stdfont.ttf"
+#~ msgstr ""
+#~ "Impossible de trouver le fichier stdfont.ttf. Veuillez liéer/copier/"
+#~ "déplacer n'importe quelle police ttf dans le répertoire data sous le nom "
+#~ "stdfont.ttf"
+
#~ msgid "Units: "
#~ msgstr "Unités : "
@@ -25956,9 +26278,6 @@ msgstr "
#~ msgid ", nation %s"
#~ msgstr ", nation %s"
-#~ msgid ", team %s"
-#~ msgstr ", équipe %s"
-
#~ msgid "_Map"
#~ msgstr "Car_te"
@@ -28051,9 +28370,6 @@ msgstr "
#~ msgid "Error creating new AI player: %s\n"
#~ msgstr "Erreur lors de la création d'un nouveau joueur IA : %s\n"
-#~ msgid "Metaserver topic string set to '%s'."
-#~ msgstr "Chaîne du sujet du métaserveur positionnée à \"%s\"."
-
#~ msgid "Metaserver topic string set to '%s', not reporting to metaserver."
#~ msgstr ""
#~ "Chaîne du sujet du métaserveur positionnée à \"%s\", non transmise au "
diff --git a/po/freeciv.pot b/po/freeciv.pot
index a190380..b86b388 100644
--- a/po/freeciv.pot
+++ b/po/freeciv.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 07:45+0900\n"
+"POT-Creation-Date: 2009-03-29 21:13+0900\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -635,7 +635,7 @@ msgid "Road"
msgstr ""
#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
-#: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
+#: client/gui-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"
@@ -652,7 +652,7 @@ msgid "Mine"
msgstr ""
#: common/terrain.c:396 common/unit.c:548 server/report.c:124
-#: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
+#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr ""
@@ -698,7 +698,7 @@ msgstr ""
msgid "Sentry"
msgstr ""
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:851 client/gui-sdl/menu.c:648
+#: common/unit.c:566 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 ""
@@ -715,7 +715,7 @@ msgstr ""
msgid "Transform"
msgstr ""
-#: common/unit.c:584 client/text.c:106 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:584 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 ""
@@ -780,11 +780,11 @@ msgstr ""
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1406
+#: common/unittype.c:349 client/helpdata.c:1404
msgid " and "
msgstr ""
-#: common/unittype.c:355 client/helpdata.c:1392
+#: common/unittype.c:355 client/helpdata.c:1390
msgid "?and:, "
msgstr ""
@@ -1331,103 +1331,98 @@ msgstr ""
#: server/auth.c:281
#, c-format
-msgid "Auth config filename \"%s\" not allowed!"
-msgstr ""
-
-#: server/auth.c:286
-#, c-format
msgid "Cannot load auth config file \"%s\"!"
msgstr ""
-#: server/auth.c:397
+#: server/auth.c:392
#, c-format
msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
msgstr ""
-#: server/auth.c:404
+#: server/auth.c:399
msgid "Guests are not allowed on this server. Sorry."
msgstr ""
-#: server/auth.c:406
+#: server/auth.c:401
#, c-format
msgid "%s was rejected: Guests not allowed."
msgstr ""
-#: server/auth.c:425
+#: server/auth.c:420
#, c-format
msgid ""
"There was an error reading the user database, logging in as guest connection "
"'%s'."
msgstr ""
-#: server/auth.c:431
+#: server/auth.c:426
msgid ""
"There was an error reading the user database and guest logins are not "
"allowed. Sorry"
msgstr ""
-#: server/auth.c:434
+#: server/auth.c:429
#, c-format
msgid "%s was rejected: Database error and guests not allowed."
msgstr ""
-#: server/auth.c:441
+#: server/auth.c:436
#, c-format
msgid "Enter password for %s:"
msgstr ""
-#: server/auth.c:450
+#: server/auth.c:445
msgid "Enter a new password (and remember it)."
msgstr ""
-#: server/auth.c:456
+#: server/auth.c:451
msgid "This server allows only preregistered users. Sorry."
msgstr ""
-#: server/auth.c:459
+#: server/auth.c:454
#, c-format
msgid "%s was rejected: Only preregister users allowed."
msgstr ""
-#: server/auth.c:488 server/auth.c:547
+#: server/auth.c:483 server/auth.c:542
msgid "Sorry, too many wrong tries..."
msgstr ""
-#: server/auth.c:489
+#: server/auth.c:484
#, c-format
msgid "%s was rejected: Too many wrong password verifies for new user."
msgstr ""
-#: server/auth.c:505
+#: server/auth.c:500
msgid ""
"Warning: There was an error in saving to the database. Continuing, but your "
"stats will not be saved."
msgstr ""
-#: server/auth.c:549
+#: server/auth.c:544
#, c-format
msgid "%s was rejected: Too many wrong password tries."
msgstr ""
-#: server/auth.c:558
+#: server/auth.c:553
msgid "Your password is incorrect. Try again."
msgstr ""
-#: server/auth.c:569
+#: server/auth.c:564
msgid "Sorry, your connection timed out..."
msgstr ""
-#: server/auth.c:571
+#: server/auth.c:566
#, c-format
msgid "%s was rejected: Connection timeout waiting for password."
msgstr ""
-#: server/auth.c:636
+#: server/auth.c:631
#, c-format
msgid "Your password is too short, the minimum length is %d. Try again."
msgstr ""
-#: server/auth.c:642
+#: server/auth.c:637
#, c-format
msgid ""
"The password must have at least %d capital letters, %d numbers, and be at "
@@ -1909,7 +1904,7 @@ msgstr ""
msgid "You can learn a lot about Freeciv at %s"
msgstr ""
-#: server/civserver.c:206 client/civclient.c:237 manual/civmanual.c:380
+#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
@@ -1934,12 +1929,12 @@ msgstr ""
msgid " -b --bind ADDR\tListen for clients on ADDR\n"
msgstr ""
-#: server/civserver.c:217 client/civclient.c:241
+#: server/civserver.c:217 client/civclient.c:242
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:245
+#: server/civserver.c:221 client/civclient.c:246
msgid " -d, --debug NUM\tSet debug log level (0 to 3)\n"
msgstr ""
@@ -1947,7 +1942,7 @@ msgstr ""
msgid " -f, --file FILE\tLoad saved game FILE\n"
msgstr ""
-#: server/civserver.c:225 client/civclient.c:248 manual/civmanual.c:382
+#: server/civserver.c:225 client/civclient.c:249 manual/civmanual.c:382
msgid " -h, --help\t\tPrint a summary of the options\n"
msgstr ""
@@ -1995,11 +1990,11 @@ msgstr ""
msgid " -R, --Ranklog FILE\tUse FILE as ranking logfile\n"
msgstr ""
-#: server/civserver.c:247 client/civclient.c:267 manual/civmanual.c:383
+#: server/civserver.c:247 client/civclient.c:268 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:279
+#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, c-format
@@ -3091,7 +3086,7 @@ msgstr ""
msgid "Sea moving start units are not yet supported. Nobody gets %s."
msgstr ""
-#: server/gamehand.c:310 client/text.c:632
+#: server/gamehand.c:310 client/text.c:691
#, c-format
msgid "Year: %s"
msgstr ""
@@ -3355,8 +3350,8 @@ msgstr ""
#: server/plrhand.c:1686
#, c-format
msgid ""
-"Your nation is thrust into civil war, %s is declared the leader of the "
-"rebel states."
+"Your nation is thrust into civil war! %s is declared the leader of the rebel "
+"states."
msgstr ""
#: server/plrhand.c:1707
@@ -3451,7 +3446,7 @@ msgstr ""
msgid "Literacy"
msgstr ""
-#: server/report.c:121 client/cityrepdata.c:526 client/cityrepdata.c:527
+#: server/report.c:121 client/cityrepdata.c:524 client/cityrepdata.c:525
#: client/gui-sdl/cityrep.c:174
msgid "Production"
msgstr ""
@@ -3601,7 +3596,7 @@ msgstr ""
msgid "Demography string contains invalid characters. Try \"help demography\"."
msgstr ""
-#: server/report.c:743 server/report.c:766
+#: server/report.c:743 server/report.c:768
msgid "Demographics Report:"
msgstr ""
@@ -3609,9 +3604,11 @@ msgstr ""
msgid "Sorry, the Demographics report is unavailable."
msgstr ""
-#: server/report.c:748
+#. TRANS: <nation adjective> <government name> (<year>).
+#. * E.g. "Polish Despotism (200 AD)".
+#: server/report.c:750
#, c-format
-msgid "The %s of the %s (%s)"
+msgid "%s %s (%s)"
msgstr ""
#. TRANS: message about an installation error.
@@ -3659,14 +3656,6 @@ msgstr ""
msgid "%s had invalid nation; changing to %s."
msgstr ""
-#. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4073
-#, c-format
-msgid ""
-"Illegal alliance structure detected: %s alliance to %s reduced to peace "
-"treaty."
-msgstr ""
-
#: server/settings.c:32
msgid "Geological"
msgstr ""
@@ -4600,8 +4589,8 @@ msgstr ""
#: server/settings.c:1016
msgid ""
-"Automatically saved games will have name \"<prefix><year>.sav\". This "
-"setting sets the <prefix> part."
+"Automatically saved games will have name \"<prefix>-T<turn>-Y<year>.sav\". "
+"This setting sets the <prefix> part."
msgstr ""
#: server/settings.c:1023
@@ -4615,11 +4604,11 @@ msgid ""
"the game."
msgstr ""
-#: server/sernet.c:147
+#: server/sernet.c:150
msgid "Server cannot read standard input. Ignoring input."
msgstr ""
-#: server/sernet.c:922
+#: server/sernet.c:929
#, c-format
msgid "Server: bad address: [%s:%d]."
msgstr ""
@@ -4738,112 +4727,112 @@ msgid ""
"alliance with both."
msgstr ""
-#: server/srv_main.c:928
+#: server/srv_main.c:961
#, c-format
msgid "Failed saving game as %s"
msgstr ""
-#: server/srv_main.c:930
+#: server/srv_main.c:963
#, c-format
msgid "Game saved as %s"
msgstr ""
-#: server/srv_main.c:962
+#: server/srv_main.c:994
msgid "The game is already running."
msgstr ""
-#: server/srv_main.c:970
+#: server/srv_main.c:1002
#, c-format
msgid "%s lost control cmdlevel on game start. Use voting from now on."
msgstr ""
-#: server/srv_main.c:977
+#: server/srv_main.c:1009
msgid "Starting game."
msgstr ""
-#: server/srv_main.c:1039
+#: server/srv_main.c:1071
#, c-format
msgid "request for unknown report (type %d)"
msgstr ""
-#: server/srv_main.c:1104
+#: server/srv_main.c:1136
#, c-format
msgid "Warning: rejecting old client %s"
msgstr ""
-#: server/srv_main.c:1206
+#: server/srv_main.c:1238
#, c-format
msgid "Got a packet of type %d from a dead or observer player"
msgstr ""
-#: server/srv_main.c:1306
+#: server/srv_main.c:1338
msgid "Please choose a non-blank name."
msgstr ""
-#: server/srv_main.c:1322
+#: server/srv_main.c:1354
msgid "That nation is already in use."
msgstr ""
-#: server/srv_main.c:1338
+#: server/srv_main.c:1370
#, c-format
msgid "Another player already has the name '%s'. Please choose another name."
msgstr ""
-#: server/srv_main.c:1359
+#: server/srv_main.c:1391
msgid "Please choose a name containing only ASCII characters."
msgstr ""
-#: server/srv_main.c:1458
+#: server/srv_main.c:1490
#, c-format
msgid "%s nation is not available in this scenario."
msgstr ""
-#: server/srv_main.c:1464
+#: server/srv_main.c:1496
#, c-format
msgid "%s nation is already in use."
msgstr ""
-#: server/srv_main.c:1482
+#: server/srv_main.c:1514
#, c-format
msgid "%s is the %s ruler %s."
msgstr ""
-#: server/srv_main.c:1538
+#: server/srv_main.c:1570
#, c-format
msgid "Waiting to start game: %d out of %d players are ready to start."
msgstr ""
-#: server/srv_main.c:1582 server/srv_main.c:1586
+#: server/srv_main.c:1614 server/srv_main.c:1618
#, c-format
msgid "%s has been added as %s level AI-controlled player."
msgstr ""
-#: server/srv_main.c:1728
+#: server/srv_main.c:1760
#, c-format
msgid "Player %d"
msgstr ""
-#: server/srv_main.c:1739 server/srv_main.c:1745
+#: server/srv_main.c:1771 server/srv_main.c:1777
#, c-format
msgid "%s rules the %s."
msgstr ""
-#: server/srv_main.c:1910
+#: server/srv_main.c:1942
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
msgstr ""
-#: server/srv_main.c:1961
+#: server/srv_main.c:1993
#, c-format
msgid "Sending info to metaserver [%s]"
msgstr ""
-#: server/srv_main.c:1992
+#: server/srv_main.c:2024
msgid "The game is over..."
msgstr ""
-#: server/srv_main.c:2205
+#: server/srv_main.c:2237
msgid "Now accepting new client connections."
msgstr ""
@@ -5635,24 +5624,24 @@ msgid "Barbarian"
msgstr ""
#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2030 client/gui-sdl/plrdlg.c:645
+#: client/gui-gtk-2.0/pages.c:2102 client/gui-sdl/plrdlg.c:645
#: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
msgid "AI"
msgstr ""
#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
+#: client/gui-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
msgid "Human"
msgstr ""
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
-#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
+#: 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
msgid "Alive"
msgstr ""
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
#: client/gui-win32/connectdlg.c:200
msgid "Dead"
msgstr ""
@@ -5896,9 +5885,9 @@ 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:242
-#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
-#: client/text.c:1201
+#: 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
#, c-format
msgid "?clistmore:, %s"
msgstr ""
@@ -6145,7 +6134,7 @@ msgstr ""
msgid "Cannot attack from sea."
msgstr ""
-#: server/unithand.c:996 server/unittools.c:2103
+#: server/unithand.c:996 server/unittools.c:2137
msgid "Cannot attack unless you declare war first."
msgstr ""
@@ -6242,99 +6231,100 @@ msgstr ""
#: server/unittools.c:297
#, c-format
-msgid "Not enough gold. %s disbanded"
+msgid "Not enough gold to pay upkeep for %s. Unit disbanded."
msgstr ""
-#: server/unittools.c:342
+#: server/unittools.c:343
#, c-format
msgid "Your %s has run out of hit points."
msgstr ""
-#: server/unittools.c:358
+#: server/unittools.c:359
#, c-format
msgid "Your %s has been lost on the high seas."
msgstr ""
-#: server/unittools.c:365
+#: server/unittools.c:366
#, c-format
msgid "Your %s survived on the high seas and became more experienced!"
msgstr ""
-#: server/unittools.c:376
+#: server/unittools.c:377
#, c-format
msgid "Your %s has been lost on unsafe terrain."
msgstr ""
-#: server/unittools.c:430
+#: server/unittools.c:431
#, c-format
msgid "Your %s has returned to refuel."
msgstr ""
-#: server/unittools.c:454
+#: server/unittools.c:455
#, c-format
msgid "Your %s has run out of fuel."
msgstr ""
-#. TRANS: And, <the unit> became ...
-#: server/unittools.c:616
-msgid "And, became more experienced!"
-msgstr ""
-
#. TRANS: Your <unit> became ...
-#: server/unittools.c:620
+#: server/unittools.c:619
#, c-format
msgid "Your %s became more experienced!"
msgstr ""
-#: server/unittools.c:1011
+#: server/unittools.c:1009
#, c-format
msgid "Teleported your %s to %s."
msgstr ""
-#: server/unittools.c:1041
+#. TRANS: A unit is moved to resolve stack conflicts.
+#: server/unittools.c:1065
+#, c-format
+msgid "Moved your %s."
+msgstr ""
+
+#: server/unittools.c:1076
#, c-format
msgid "Disbanded your %s."
msgstr ""
-#: server/unittools.c:1363
+#: server/unittools.c:1397
#, c-format
msgid "Unable to defend %s, %s has lost the game."
msgstr ""
-#: server/unittools.c:1367
+#: server/unittools.c:1401
#, c-format
msgid "Losing %s meant losing the game! Be more careful next time!"
msgstr ""
-#: server/unittools.c:1469
+#: server/unittools.c:1503
#, c-format
msgid "%s escaped the destruction of %s, and fled to %s."
msgstr ""
-#: server/unittools.c:1478
+#: server/unittools.c:1512
#, c-format
msgid "%s lost when %s was lost."
msgstr ""
-#: server/unittools.c:1527
+#: server/unittools.c:1561
#, c-format
msgid "Barbarian leader captured, %d gold ransom paid."
msgstr ""
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unittools.c:1545
+#: server/unittools.c:1579
#, c-format
msgid "Your attacking %s succeeded against the %s %s!"
msgstr ""
#. TRANS: "Cannon ... the Polish Destroyer."
-#: server/unittools.c:1554 server/unittools.c:1612
+#: server/unittools.c:1588 server/unittools.c:1646
#, c-format
msgid "%s lost to an attack by the %s %s."
msgstr ""
#. TRANS: "... Cannon ... the Polish Destroyer ...."
-#: server/unittools.c:1588
+#: server/unittools.c:1622
#, c-format
msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
msgid_plural ""
@@ -6344,14 +6334,14 @@ msgstr[1] ""
#. TRANS: "Cannon lost when the Polish Destroyer
#. * attacked the German Musketeers."
-#: server/unittools.c:1621
+#: server/unittools.c:1655
#, 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:1636
+#: server/unittools.c:1670
#, c-format
msgid "%s (and %s) lost to an attack from the %s %s."
msgstr ""
@@ -6359,7 +6349,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:1646
+#: server/unittools.c:1680
#, 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."
@@ -6369,192 +6359,192 @@ 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:1660
+#: server/unittools.c:1694
#, 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:1928
+#: server/unittools.c:1962
#, c-format
msgid "Your %s was nuked by %s."
msgstr ""
-#: server/unittools.c:1931 server/unittools.c:1947
+#: server/unittools.c:1965 server/unittools.c:1981
msgid "yourself"
msgstr ""
-#: server/unittools.c:1935
+#: server/unittools.c:1969
#, c-format
msgid "The %s %s was nuked."
msgstr ""
-#: server/unittools.c:1944
+#: server/unittools.c:1978
#, c-format
msgid "%s was nuked by %s."
msgstr ""
-#: server/unittools.c:1952
+#: server/unittools.c:1986
#, c-format
msgid "You nuked %s."
msgstr ""
-#: server/unittools.c:1993
+#: server/unittools.c:2027
#, c-format
msgid "The %s detonated a nuke!"
msgstr ""
-#: server/unittools.c:2017
+#: server/unittools.c:2051
#, c-format
msgid "%s transported successfully."
msgstr ""
-#: server/unittools.c:2069
+#: server/unittools.c:2103
msgid "This unit type can not be paradropped."
msgstr ""
-#: server/unittools.c:2079
+#: server/unittools.c:2113
msgid "You cannot paradrop a unit that is transporting other units."
msgstr ""
-#: server/unittools.c:2085
+#: server/unittools.c:2119
msgid "The destination location is not known."
msgstr ""
-#: server/unittools.c:2092
+#: server/unittools.c:2126
#, c-format
msgid "This unit cannot paradrop into %s."
msgstr ""
-#: server/unittools.c:2112
+#: server/unittools.c:2146
#, c-format
msgid "The distance to the target (%i) is greater than the unit's range (%i)."
msgstr ""
-#: server/unittools.c:2123
+#: server/unittools.c:2157
#, c-format
msgid "Your %s paradropped into the %s and was lost."
msgstr ""
-#: server/unittools.c:2136
+#: server/unittools.c:2170
#, c-format
msgid "Your %s was killed by enemy units at the paradrop destination."
msgstr ""
-#: server/unittools.c:2158
+#: server/unittools.c:2192
#, c-format
msgid "You found %d gold."
msgstr ""
-#: server/unittools.c:2175
+#: server/unittools.c:2209
#, c-format
msgid "You found %s in ancient scrolls of wisdom."
msgstr ""
-#: server/unittools.c:2182
+#: server/unittools.c:2216
#, c-format
msgid "The %s have acquired %s from ancient scrolls of wisdom."
msgstr ""
-#: server/unittools.c:2196
+#: server/unittools.c:2230
msgid "A band of friendly mercenaries joins your cause."
msgstr ""
-#: server/unittools.c:2214
+#: server/unittools.c:2248
msgid "An abandoned village is here."
msgstr ""
-#: server/unittools.c:2224
+#: server/unittools.c:2258
msgid "You have unleashed a horde of barbarians!"
msgstr ""
-#: server/unittools.c:2227
+#: server/unittools.c:2261
#, c-format
msgid "Your %s has been killed by barbarians!"
msgstr ""
-#: server/unittools.c:2243
+#: server/unittools.c:2277
msgid "You found a friendly city."
msgstr ""
-#: server/unittools.c:2257
+#: server/unittools.c:2291
msgid "Friendly nomads are impressed by you, and join you."
msgstr ""
-#: server/unittools.c:2282
+#: server/unittools.c:2316
msgid "Your overflight frightens the tribe; they scatter in terror."
msgstr ""
-#: server/unittools.c:2540
+#: server/unittools.c:2574
#, c-format
msgid "Orders for %s aborted after enemy movement was spotted."
msgstr ""
-#: server/unittools.c:2989
+#: server/unittools.c:3023
#, c-format
msgid "Orders for %s aborted as there are units nearby."
msgstr ""
-#: server/unittools.c:3041
+#: server/unittools.c:3075
#, c-format
msgid "Orders for %s aborted because building of city failed."
msgstr ""
-#: server/unittools.c:3054
+#: server/unittools.c:3088
#, c-format
msgid "Orders for %s aborted since they give an invalid activity."
msgstr ""
-#: server/unittools.c:3068
+#: server/unittools.c:3102
#, c-format
msgid "Orders for %s aborted since they give an invalid location."
msgstr ""
-#: server/unittools.c:3078
+#: server/unittools.c:3112
#, c-format
msgid "Orders for %s aborted as there are units in the way."
msgstr ""
-#: server/unittools.c:3104
+#: server/unittools.c:3138
#, c-format
msgid "Orders for %s aborted because of failed move."
msgstr ""
-#: server/unittools.c:3145
+#: server/unittools.c:3179
#, c-format
msgid "Attempt to change homecity for %s failed."
msgstr ""
-#: server/unittools.c:3156
+#: server/unittools.c:3190
#, c-format
msgid "Attempt to establish trade route for %s failed."
msgstr ""
-#: server/unittools.c:3168
+#: server/unittools.c:3202
#, c-format
msgid "Attempt to build wonder for %s failed."
msgstr ""
-#: server/unittools.c:3177
+#: server/unittools.c:3211
#, c-format
msgid "Your %s has invalid orders."
msgstr ""
-#: server/generator/mapgen.c:1737
+#: server/generator/mapgen.c:1771
msgid "High landmass - this may take a few seconds."
msgstr ""
-#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
+#: server/generator/mapgen.c:1969 server/generator/mapgen.c:2039
#, c-format
msgid "Falling back to generator %d."
msgstr ""
-#: server/generator/mapgen.c:2025
+#: server/generator/mapgen.c:2059
msgid "Generator 3 didn't place all big islands."
msgstr ""
-#: server/generator/mapgen.c:2054
+#: server/generator/mapgen.c:2088
#, c-format
msgid "Generator 3 left %li landmass unplaced."
msgstr ""
@@ -6657,7 +6647,7 @@ msgid_plural "%3d turns"
msgstr[0] ""
msgstr[1] ""
-#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:631
#: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
@@ -6775,333 +6765,332 @@ msgstr ""
msgid "(worklist)"
msgstr ""
-#: client/cityrepdata.c:447
-msgid "Special"
+#: client/cityrepdata.c:446
+msgid "?city:Name"
msgstr ""
-#: client/cityrepdata.c:448
-msgid "?entertainers/scientists/taxmen:E/S/T"
+#: client/cityrepdata.c:446 client/gui-sdl/cityrep.c:169
+msgid "City Name"
msgstr ""
-#: client/cityrepdata.c:449
-msgid "Entertainers, Scientists, Taxmen"
+#: client/cityrepdata.c:448
+msgid "?size [short]:Sz"
msgstr ""
-#: client/cityrepdata.c:452
-msgid "Concise + Rapture, - Disorder"
+#: client/cityrepdata.c:448
+msgid "Size"
msgstr ""
-#: client/cityrepdata.c:454 client/plrdlg_common.c:261
+#: client/cityrepdata.c:450 client/plrdlg_common.c:261
#: client/gui-win32/plrdlg.c:337
msgid "State"
msgstr ""
-#: client/cityrepdata.c:454
+#: client/cityrepdata.c:450
msgid "Rapture/Peace/Disorder"
msgstr ""
+#: client/cityrepdata.c:452
+msgid "Concise *=Rapture, X=Disorder"
+msgstr ""
+
+#: client/cityrepdata.c:456
+msgid "Special"
+msgstr ""
+
#: client/cityrepdata.c:457
+msgid "?entertainers/scientists/taxmen:E/S/T"
+msgstr ""
+
+#: client/cityrepdata.c:458
+msgid "Entertainers, Scientists, Taxmen"
+msgstr ""
+
+#: client/cityrepdata.c:461
msgid "?Happy workers:H"
msgstr ""
-#: client/cityrepdata.c:457
+#: client/cityrepdata.c:461
msgid "Workers: Happy"
msgstr ""
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
msgid "?Content workers:C"
msgstr ""
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
msgid "Workers: Content"
msgstr ""
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
msgid "?Unhappy workers:U"
msgstr ""
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
msgid "Workers: Unhappy"
msgstr ""
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
msgid "?Angry workers:A"
msgstr ""
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
msgid "Workers: Angry"
msgstr ""
-#: client/cityrepdata.c:465 client/gui-xaw/citydlg.c:2401
-#: data/default/units.ruleset:238
-msgid "Workers"
+#: client/cityrepdata.c:469 client/gui-xaw/citydlg.c:2402
+msgid "?city:Workers"
msgstr ""
-#: client/cityrepdata.c:466
+#: client/cityrepdata.c:470
msgid "?happy/content/unhappy/angry:H/C/U/A"
msgstr ""
-#: client/cityrepdata.c:467
+#: client/cityrepdata.c:471
msgid "Workers: Happy, Content, Unhappy, Angry"
msgstr ""
-#: client/cityrepdata.c:470 client/cityrepdata.c:472
+#: client/cityrepdata.c:474 client/cityrepdata.c:476
msgid "Best"
msgstr ""
-#: client/cityrepdata.c:470
+#: client/cityrepdata.c:474
msgid "attack"
msgstr ""
-#: client/cityrepdata.c:471
+#: client/cityrepdata.c:475
msgid "Best attacking units"
msgstr ""
-#: client/cityrepdata.c:472
+#: client/cityrepdata.c:476
msgid "defense"
msgstr ""
-#: client/cityrepdata.c:473
+#: client/cityrepdata.c:477
msgid "Best defending units"
msgstr ""
-#: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
-#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
-#: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
-#: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
-#: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
-#: client/gui-win32/menu.c:351 client/gui-win32/repodlgs.c:616
-#: client/gui-win32/repodlgs.c:707 client/gui-win32/repodlgs.c:716
-#: client/gui-xaw/menu.c:157 client/gui-xaw/menu.c:219
-#: client/gui-xaw/menu.c:242 client/gui-xaw/repodlgs.c:881
-#: client/gui-xaw/repodlgs.c:1069 data/Freeciv.in:1895 data/helpdata.txt:909
+#: client/cityrepdata.c:478 client/cityrepdata.c:482
+#: client/gui-gtk-2.0/cityrep.c:1437 client/gui-gtk-2.0/cityrep.c:1456
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-gtk-2.0/cityrep.c:1494
+#: client/gui-gtk-2.0/cityrep.c:1514 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/repodlgs.c:960 client/gui-sdl/helpdlg.c:688
+#: client/gui-sdl/mapctrl.c:1605 client/gui-sdl/optiondlg.c:1827
+#: client/gui-sdl/repodlgs.c:356 client/gui-win32/menu.c:351
+#: client/gui-win32/repodlgs.c:616 client/gui-win32/repodlgs.c:707
+#: client/gui-win32/repodlgs.c:716 client/gui-xaw/menu.c:157
+#: client/gui-xaw/menu.c:219 client/gui-xaw/menu.c:242
+#: client/gui-xaw/repodlgs.c:881 client/gui-xaw/repodlgs.c:1069
+#: data/Freeciv.in:1895 data/helpdata.txt:909
msgid "Units"
msgstr ""
#. TRANS: Header "Number of units inside city"
-#: client/cityrepdata.c:476
+#: client/cityrepdata.c:480
msgid "?Present (units):Here"
msgstr ""
-#: client/cityrepdata.c:477
+#: client/cityrepdata.c:481
msgid "Number of units present"
msgstr ""
#. TRANS: Header "Number of units supported by given city"
-#: client/cityrepdata.c:480
+#: client/cityrepdata.c:484
msgid "?Supported (units):Owned"
msgstr ""
-#: client/cityrepdata.c:481
+#: client/cityrepdata.c:485
msgid "Number of units supported"
msgstr ""
#. TRANS: Header "It will take this many turns before city grows"
-#: client/cityrepdata.c:484
+#: client/cityrepdata.c:488
msgid "?food (population):Grow"
msgstr ""
-#: client/cityrepdata.c:485 client/cityrepdata.c:530
+#: client/cityrepdata.c:489 client/cityrepdata.c:528
msgid "?Stock/Target:(Have/Need)"
msgstr ""
-#: client/cityrepdata.c:486
+#: client/cityrepdata.c:490
msgid "Turns until growth/famine"
msgstr ""
-#: client/cityrepdata.c:488
-msgid "?size [short]:Sz"
-msgstr ""
-
-#: client/cityrepdata.c:488
-msgid "Size"
-msgstr ""
-
-#: client/cityrepdata.c:492
-msgid "?city:Name"
-msgstr ""
-
-#: client/cityrepdata.c:492 client/gui-sdl/cityrep.c:169
-msgid "City Name"
-msgstr ""
-
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
msgid "Surplus"
msgstr ""
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
msgid "?food/production/trade:F/P/T"
msgstr ""
-#: client/cityrepdata.c:496
+#: client/cityrepdata.c:494
msgid "Surplus: Food, Production, Trade"
msgstr ""
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
msgid "?Food surplus [short]:+F"
msgstr ""
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
msgid "Surplus: Food"
msgstr ""
-#: client/cityrepdata.c:500
+#: client/cityrepdata.c:498
msgid "?Production surplus [short]:+P"
msgstr ""
-#: client/cityrepdata.c:501
+#: client/cityrepdata.c:499
msgid "Surplus: Production"
msgstr ""
-#: client/cityrepdata.c:502
+#: client/cityrepdata.c:500
msgid "?Production loss (waste) [short]:-P"
msgstr ""
-#: client/cityrepdata.c:503
+#: client/cityrepdata.c:501
msgid "Waste"
msgstr ""
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
msgid "?Trade surplus [short]:+T"
msgstr ""
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
msgid "Surplus: Trade"
msgstr ""
-#: client/cityrepdata.c:506
+#: client/cityrepdata.c:504
msgid "?Trade loss (corruption) [short]:-T"
msgstr ""
-#: client/cityrepdata.c:507
+#: client/cityrepdata.c:505
msgid "Corruption"
msgstr ""
-#: client/cityrepdata.c:509 client/gui-gtk-2.0/repodlgs.c:654
+#: client/cityrepdata.c:507 client/gui-gtk-2.0/repodlgs.c:654
#: client/gui-sdl/mapctrl.c:1400 client/gui-win32/repodlgs.c:334
#: client/gui-xaw/menu.c:222 client/gui-xaw/repodlgs.c:644
#: client/gui-xaw/repodlgs.c:773 data/Freeciv.in:1819
msgid "Economy"
msgstr ""
-#: client/cityrepdata.c:509
+#: client/cityrepdata.c:507
msgid "?gold/luxury/science:G/L/S"
msgstr ""
-#: client/cityrepdata.c:510
+#: client/cityrepdata.c:508
msgid "Economy: Gold, Luxuries, Science"
msgstr ""
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
msgid "?Gold:G"
msgstr ""
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
msgid "Economy: Gold"
msgstr ""
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
msgid "?Luxury:L"
msgstr ""
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
msgid "Economy: Luxury"
msgstr ""
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
msgid "?Science:S"
msgstr ""
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
msgid "Economy: Science"
msgstr ""
-#: client/cityrepdata.c:518
+#: client/cityrepdata.c:516
msgid "?number_trade_routes:n"
msgstr ""
-#: client/cityrepdata.c:518
+#: client/cityrepdata.c:516
msgid "?number_trade_routes:R"
msgstr ""
-#: client/cityrepdata.c:519
+#: client/cityrepdata.c:517
msgid "Number of Trade Routes"
msgstr ""
-#: client/cityrepdata.c:521
+#: client/cityrepdata.c:519
msgid "?pollution [short]:Pol"
msgstr ""
-#: client/cityrepdata.c:523
+#: client/cityrepdata.c:521
msgid "?cma:Governor"
msgstr ""
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
-#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
-#: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
-#: data/Freeciv.in:1459 data/helpdata.txt:820
+#: client/cityrepdata.c:521 client/gui-gtk-2.0/cityrep.c:1766
+#: client/gui-sdl/citydlg.c:3809 client/gui-sdl/cma_fe.c:858
+#: client/gui-win32/citydlg.c:726 data/Freeciv.in:1459 data/helpdata.txt:820
msgid "Citizen Governor"
msgstr ""
-#: client/cityrepdata.c:526
+#: client/cityrepdata.c:524
msgid "Turns/Buy"
msgstr ""
-#: client/cityrepdata.c:529 client/cityrepdata.c:531
+#: client/cityrepdata.c:527 client/cityrepdata.c:529
msgid "Currently Building"
msgstr ""
-#: client/cityrepdata.c:575
+#: client/cityrepdata.c:573
msgid "?specialist:S"
msgstr ""
-#: client/cityrepdata.c:578
+#: client/cityrepdata.c:576
msgid "Specialists"
msgstr ""
-#: client/civclient.c:239
+#: client/civclient.c:240
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr ""
-#: client/civclient.c:249
+#: client/civclient.c:250
msgid " -l, --log FILE\tUse FILE as logfile (spawned server also uses this)\n"
msgstr ""
-#: client/civclient.c:251
+#: client/civclient.c:252
msgid " -m, --meta HOST\tConnect to the metaserver at HOST\n"
msgstr ""
-#: client/civclient.c:253
+#: client/civclient.c:254
msgid " -n, --name NAME\tUse NAME as name\n"
msgstr ""
-#: client/civclient.c:255
+#: client/civclient.c:256
msgid " -p, --port PORT\tConnect to server port PORT (usually with -a)\n"
msgstr ""
-#: client/civclient.c:257
+#: client/civclient.c:258
#, c-format
msgid " -P, --Plugin PLUGIN\tUse PLUGIN for sound output %s\n"
msgstr ""
-#: client/civclient.c:259
+#: client/civclient.c:260
msgid " -r, --read FILE\tRead startup script FILE (for spawned server only)\n"
msgstr ""
-#: client/civclient.c:262
+#: client/civclient.c:263
msgid " -s, --server HOST\tConnect to the server at HOST (usually with -a)\n"
msgstr ""
-#: client/civclient.c:264
+#: client/civclient.c:265
msgid " -S, --Sound FILE\tRead sound tags from FILE\n"
msgstr ""
-#: client/civclient.c:265
+#: client/civclient.c:266
msgid " -t, --tiles FILE\tUse data file FILE.tilespec for tiles\n"
msgstr ""
-#: client/civclient.c:268
+#: client/civclient.c:269
#, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -7109,144 +7098,154 @@ msgid ""
msgstr ""
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:273
+#: client/civclient.c:274
#, c-format
msgid "Report bugs at %s\n"
msgstr ""
-#: client/civclient.c:297
+#: client/civclient.c:298
#, c-format
msgid "Invalid port \"%s\" specified with --port option.\n"
msgstr ""
-#: client/civclient.c:299 client/civclient.c:314
+#: client/civclient.c:300 client/civclient.c:315
msgid "Try using --help.\n"
msgstr ""
-#: client/civclient.c:312
+#: client/civclient.c:313
#, c-format
msgid "Invalid debug level \"%s\" specified with --debug option.\n"
msgstr ""
-#: client/civclient.c:325
+#: client/civclient.c:326
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr ""
-#: client/civclient.c:539
+#: client/civclient.c:391
+#, c-format
+msgid "Updating old metaserver address \"%s\"."
+msgstr ""
+
+#: client/civclient.c:394
+#, c-format
+msgid "Default metaserver has been set to \"%s\"."
+msgstr ""
+
+#: client/civclient.c:550
msgid "Game started."
msgstr ""
-#: client/civclient.c:577
+#: client/civclient.c:588
msgid "There was an error while auto connecting; aborting."
msgstr ""
-#: client/climisc.c:176
+#: client/climisc.c:177
#, c-format
msgid "Changing production of every %s into %s."
msgstr ""
-#: client/climisc.c:214
+#: client/climisc.c:215
msgid "?embassy:Both"
msgstr ""
-#: client/climisc.c:216
+#: client/climisc.c:217
msgid "?embassy:Yes"
msgstr ""
-#: client/climisc.c:219
+#: client/climisc.c:220
msgid "?embassy:With Us"
msgstr ""
-#: client/climisc.c:222
+#: client/climisc.c:223
msgid "?embassy:Contact"
msgstr ""
-#: client/climisc.c:224
+#: client/climisc.c:225
msgid "?embassy:No Contact"
msgstr ""
-#: client/climisc.c:236
+#: client/climisc.c:237
msgid "?vision:Both"
msgstr ""
-#: client/climisc.c:238
+#: client/climisc.c:239
msgid "?vision:To Them"
msgstr ""
-#: client/climisc.c:241
+#: client/climisc.c:242
msgid "?vision:To Us"
msgstr ""
-#: client/climisc.c:257 client/climisc.c:264
+#: client/climisc.c:258 client/climisc.c:265
#, c-format
msgid "The %s give %s"
msgstr ""
-#: client/climisc.c:268
+#: client/climisc.c:269
#, c-format
msgid "The %s give unknown city."
msgstr ""
-#: client/climisc.c:273
+#: client/climisc.c:274
#, c-format
msgid "The %s give %d gold"
msgstr ""
-#: client/climisc.c:278
+#: client/climisc.c:279
#, c-format
msgid "The %s give their worldmap"
msgstr ""
-#: client/climisc.c:282
+#: client/climisc.c:283
#, c-format
msgid "The %s give their seamap"
msgstr ""
-#: client/climisc.c:286
+#: client/climisc.c:287
msgid "The parties agree on a cease-fire"
msgstr ""
-#: client/climisc.c:289
+#: client/climisc.c:290
msgid "The parties agree on a peace"
msgstr ""
-#: client/climisc.c:292
+#: client/climisc.c:293
msgid "The parties create an alliance"
msgstr ""
-#: client/climisc.c:295
+#: client/climisc.c:296
#, c-format
msgid "The %s give shared vision"
msgstr ""
-#: client/climisc.c:299
+#: client/climisc.c:300
#, c-format
msgid "The %s give an embassy"
msgstr ""
-#: client/climisc.c:902
+#: client/climisc.c:906
msgid "Popup Request"
msgstr ""
-#: client/climisc.c:932
+#: client/climisc.c:936
msgid "Exporting output window to civgame.log ..."
msgstr ""
-#: client/climisc.c:936
+#: client/climisc.c:940
msgid "Export complete."
msgstr ""
-#: client/climisc.c:938
+#: client/climisc.c:942
msgid "Export failed, couldn't write to file."
msgstr ""
-#: client/climisc.c:1038
+#: client/climisc.c:1042
#, c-format
msgid "You don't buy %s in %s!"
msgstr ""
-#: client/climisc.c:1056
+#: client/climisc.c:1060
#, c-format
msgid "%s costs %d gold and you only have %d gold."
msgstr ""
@@ -7290,19 +7289,19 @@ msgid ""
"%d times"
msgstr ""
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1289
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
msgid "novice"
msgstr ""
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1289
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1358
msgid "easy"
msgstr ""
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1290
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
msgid "normal"
msgstr ""
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1290
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
msgid "hard"
msgstr ""
@@ -7331,38 +7330,41 @@ msgid "We probably couldn't start it from here."
msgstr ""
#: client/connectdlg_common.c:470
-msgid "We have control of the server (command access level hack)"
+msgid ""
+"Established control over the server. You have command access level 'hack'."
msgstr ""
#: client/connectdlg_common.c:475
-msgid "We can't take control of server, attempting to kill it."
+msgid ""
+"Failed to obtain the required access level to take control of the server. "
+"The server will now be shutdown."
msgstr ""
-#: client/control.c:1104
+#: client/control.c:1123
msgid "Only transporter units can be unloaded."
msgstr ""
-#: client/control.c:1353
+#: client/control.c:1425
msgid "Only settler units can be put into auto mode."
msgstr ""
-#: client/control.c:1444
+#: client/control.c:1516
msgid "Only nuclear units can do this."
msgstr ""
-#: client/control.c:1473
+#: client/control.c:1545
msgid "Only paratrooper units can do this."
msgstr ""
-#: client/control.c:1921
+#: client/control.c:2020
msgid "Too far for this unit."
msgstr ""
-#: client/control.c:2131 client/control.c:2161 client/control.c:2177
+#: client/control.c:2230 client/control.c:2260 client/control.c:2276
msgid "Didn't find a route to the destination!"
msgstr ""
-#: client/control.c:2221
+#: client/control.c:2320
msgid "Oh my! You seem to have no capital!"
msgstr ""
@@ -7430,16 +7432,16 @@ msgid "Allows %s (with %s)."
msgstr ""
#. TRANS: preserve single space at beginning
-#: client/helpdata.c:418
+#: client/helpdata.c:416
msgid " Rivers"
msgstr ""
-#: client/helpdata.c:576
+#: client/helpdata.c:574
#, c-format
msgid "Sorry, no help topic for %s.\n"
msgstr ""
-#: client/helpdata.c:580
+#: client/helpdata.c:578
#, c-format
msgid ""
"Sorry, no help topic for %s.\n"
@@ -7447,293 +7449,293 @@ msgid ""
"\n"
msgstr ""
-#: client/helpdata.c:670
+#: client/helpdata.c:668
msgid ""
"Requires: Nothing\n"
"\n"
msgstr ""
-#: client/helpdata.c:675
+#: client/helpdata.c:673
#, c-format
msgid "* The discovery of %s will make %s obsolete.\n"
msgstr ""
-#: client/helpdata.c:694
+#: client/helpdata.c:692
#, c-format
msgid "* Allows all players with knowledge of %s to build %s units.\n"
msgstr ""
-#: client/helpdata.c:706
+#: client/helpdata.c:704
#, c-format
msgid "* Allows %s (with %s).\n"
msgstr ""
-#: client/helpdata.c:710
+#: client/helpdata.c:708
#, c-format
msgid "* Allows %s.\n"
msgstr ""
-#: client/helpdata.c:780
+#: client/helpdata.c:778
#, c-format
msgid "* Can only be built if there is %s in the city.\n"
msgstr ""
-#: client/helpdata.c:786
+#: client/helpdata.c:784
#, c-format
msgid "* Can only be built with %s as government.\n"
msgstr ""
-#: client/helpdata.c:791
+#: client/helpdata.c:789
msgid "* May not be built in cities.\n"
msgstr ""
-#: client/helpdata.c:794
+#: client/helpdata.c:792
msgid "* Never has a home city.\n"
msgstr ""
-#: client/helpdata.c:797
+#: client/helpdata.c:795
msgid "* Losing this unit will lose you the game!\n"
msgstr ""
-#: client/helpdata.c:801
+#: client/helpdata.c:799
msgid "* Each player may only have one of this type of unit.\n"
msgstr ""
-#: client/helpdata.c:805
+#: client/helpdata.c:803
#, c-format
msgid "* Requires %d population to build.\n"
msgstr ""
-#: client/helpdata.c:811
+#: client/helpdata.c:809
#, c-format
msgid "* Can carry and refuel %d air unit.\n"
msgid_plural "* Can carry and refuel %d air units.\n"
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:816
+#: client/helpdata.c:814
#, c-format
msgid "* Can carry and refuel %d missile unit.\n"
msgid_plural "* Can carry and refuel %d missile units.\n"
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:821
+#: client/helpdata.c:819
#, c-format
msgid "* Can carry %d ground unit across water.\n"
msgid_plural "* Can carry %d ground units across water.\n"
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:830
+#: client/helpdata.c:828
msgid ""
"* Can establish trade routes (must travel to target city and must be at "
"least 9 tiles [in Manhattan distance] from this unit's home city).\n"
msgstr ""
-#: client/helpdata.c:836
+#: client/helpdata.c:834
#, c-format
msgid "* Can help build wonders (adds %d production).\n"
msgstr ""
-#: client/helpdata.c:840
+#: client/helpdata.c:838
msgid "* May not be disbanded.\n"
msgstr ""
-#: client/helpdata.c:842
+#: client/helpdata.c:840
#, c-format
msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
msgstr ""
-#: client/helpdata.c:846
+#: client/helpdata.c:844
msgid "* Can build new cities.\n"
msgstr ""
-#: client/helpdata.c:849
+#: client/helpdata.c:847
#, c-format
msgid "* Can add on %d population to cities of no more than size %d.\n"
msgstr ""
-#: client/helpdata.c:858
+#: client/helpdata.c:856
msgid "* Can build roads and railroads.\n"
msgstr ""
-#: client/helpdata.c:859
+#: client/helpdata.c:857
msgid "* Can build mines on tiles.\n"
msgstr ""
-#: client/helpdata.c:860
+#: client/helpdata.c:858
msgid "* Can build irrigation on tiles.\n"
msgstr ""
-#: client/helpdata.c:865
+#: client/helpdata.c:863
msgid "* Can build farmland.\n"
msgstr ""
-#: client/helpdata.c:869
+#: client/helpdata.c:867
#, c-format
msgid "* Can build farmland (if %s is known).\n"
msgstr ""
-#: client/helpdata.c:873
+#: client/helpdata.c:871
#, c-format
msgid "* Can build farmland (if any of the following are known: %s).\n"
msgstr ""
-#: client/helpdata.c:881
+#: client/helpdata.c:879
msgid "* Can build fortresses.\n"
msgstr ""
-#: client/helpdata.c:885
+#: client/helpdata.c:883
#, c-format
msgid "* Can build fortresses (if %s is known).\n"
msgstr ""
-#: client/helpdata.c:889
+#: client/helpdata.c:887
#, c-format
msgid "* Can build fortresses (if any of the following are known: %s).\n"
msgstr ""
-#: client/helpdata.c:895
+#: client/helpdata.c:893
msgid "* Can clean pollution from tiles.\n"
msgstr ""
-#: client/helpdata.c:896
+#: client/helpdata.c:894
msgid "* Can clean nuclear fallout from tiles.\n"
msgstr ""
-#: client/helpdata.c:899
+#: client/helpdata.c:897
msgid "* Can transform tiles.\n"
msgstr ""
-#: client/helpdata.c:902
+#: client/helpdata.c:900
msgid "* Can build airbases.\n"
msgstr ""
-#: client/helpdata.c:906
+#: client/helpdata.c:904
#, c-format
msgid "* May fortify, granting a 50%% defensive bonus.\n"
msgstr ""
-#: client/helpdata.c:909
+#: client/helpdata.c:907
msgid "* May pillage to destroy infrastructure from tiles.\n"
msgstr ""
-#: client/helpdata.c:913
+#: client/helpdata.c:911
msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
msgstr ""
-#: client/helpdata.c:916
+#: client/helpdata.c:914
msgid "* Can perform diplomatic actions.\n"
msgstr ""
-#: client/helpdata.c:920
+#: client/helpdata.c:918
msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
msgstr ""
-#: client/helpdata.c:923
+#: client/helpdata.c:921
msgid "* May not be bribed.\n"
msgstr ""
-#: client/helpdata.c:926
+#: client/helpdata.c:924
msgid "* Can attack enemy air units.\n"
msgstr ""
-#: client/helpdata.c:930
+#: client/helpdata.c:928
msgid "* Is invisible except when next to an enemy unit or city.\n"
msgstr ""
-#: client/helpdata.c:934
+#: client/helpdata.c:932
msgid "* Can only attack units on ocean squares (no land attacks).\n"
msgstr ""
-#: client/helpdata.c:938
+#: client/helpdata.c:936
msgid ""
"* Can attack from aboard sea units: against enemy cities and onto land "
"squares.\n"
msgstr ""
-#: client/helpdata.c:943
+#: client/helpdata.c:941
#, c-format
msgid "* Can be paradropped from a friendly city (Range: %d).\n"
msgstr ""
-#: client/helpdata.c:949
+#: client/helpdata.c:947
msgid "* Gets double defense against units specified as 'mounted'.\n"
msgstr ""
-#: client/helpdata.c:953
+#: client/helpdata.c:951
msgid "* Counts as 'mounted' against certain defenders.\n"
msgstr ""
-#: client/helpdata.c:957
+#: client/helpdata.c:955
msgid "* A missile unit: gets used up in making an attack.\n"
msgstr ""
-#: client/helpdata.c:960
+#: client/helpdata.c:958
msgid "* Making an attack ends this unit's turn.\n"
msgstr ""
-#: client/helpdata.c:964
+#: client/helpdata.c:962
msgid "* This unit's attack causes a nuclear explosion!\n"
msgstr ""
-#: client/helpdata.c:968
+#: client/helpdata.c:966
msgid "* Gets double firepower when attacking cities.\n"
msgstr ""
-#: client/helpdata.c:971
+#: client/helpdata.c:969
msgid "* Ignores the effects of city walls.\n"
msgstr ""
-#: client/helpdata.c:975
+#: client/helpdata.c:973
#, c-format
msgid ""
"* Does bombard attacks (%d per turn). These attacks will only damage (never "
"kill) the defender, but have no risk for the attacker.\n"
msgstr ""
-#: client/helpdata.c:982
+#: client/helpdata.c:980
msgid "* Gets quintuple defense against missiles and aircraft.\n"
msgstr ""
-#: client/helpdata.c:986
+#: client/helpdata.c:984
msgid "* Ignores terrain effects (treats all squares as roads).\n"
msgstr ""
-#: client/helpdata.c:989
+#: client/helpdata.c:987
msgid "* Ignores zones of control.\n"
msgstr ""
-#: client/helpdata.c:993
+#: client/helpdata.c:991
msgid "* A non-military unit (cannot attack; no martial law).\n"
msgstr ""
-#: client/helpdata.c:997
+#: client/helpdata.c:995
msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
msgstr ""
-#: client/helpdata.c:1000
+#: client/helpdata.c:998
msgid "* Will never achieve veteran status.\n"
msgstr ""
-#: client/helpdata.c:1002
+#: client/helpdata.c:1000
msgid "* May become veteran through training or combat.\n"
msgstr ""
-#: client/helpdata.c:1008
+#: client/helpdata.c:1006
#, c-format
msgid ""
"* Must end turn in a city or next to land, or has a 50%% risk of being lost "
"at sea.\n"
msgstr ""
-#: client/helpdata.c:1012
+#: client/helpdata.c:1010
#, c-format
msgid "* The discovery of %s reduces the risk to 25%%.\n"
msgstr ""
-#: client/helpdata.c:1017
+#: client/helpdata.c:1015
#, c-format
msgid "* %s reduces the risk to 12%%.\n"
msgstr ""
@@ -7742,115 +7744,115 @@ msgstr ""
#. * last two elements
#. TRANS: List of possible output types has this between
#. * last two elements
-#: client/helpdata.c:1068 client/helpdata.c:1402
+#: client/helpdata.c:1066 client/helpdata.c:1400
msgid " or "
msgstr ""
-#: client/helpdata.c:1070 client/helpdata.c:1390
+#: client/helpdata.c:1068 client/helpdata.c:1388
msgid "?or:, "
msgstr ""
-#: client/helpdata.c:1082
+#: 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"
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:1124
+#: client/helpdata.c:1122
#, c-format
msgid "If we would now start with %s we would need %d bulbs."
msgstr ""
-#: client/helpdata.c:1129
+#: client/helpdata.c:1127
#, 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:1137
+#: client/helpdata.c:1135
msgid "You cannot research this technology."
msgstr ""
-#: client/helpdata.c:1141
+#: client/helpdata.c:1139
msgid " This number may vary depending on what other players will research.\n"
msgstr ""
-#: client/helpdata.c:1153
+#: client/helpdata.c:1151
#, c-format
msgid "* The first player to research %s gets an immediate advance.\n"
msgstr ""
-#: client/helpdata.c:1158
+#: client/helpdata.c:1156
#, c-format
msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
msgstr ""
-#: client/helpdata.c:1161
+#: client/helpdata.c:1159
#, c-format
msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
msgstr ""
-#: client/helpdata.c:1165
+#: client/helpdata.c:1163
msgid "* Increases the pollution generated by the population.\n"
msgstr ""
-#: client/helpdata.c:1170
+#: client/helpdata.c:1168
#, c-format
msgid "* Allows %s to build roads on river squares.\n"
msgstr ""
-#: client/helpdata.c:1177
+#: client/helpdata.c:1175
#, c-format
msgid "* Allows %s to build fortresses.\n"
msgstr ""
-#: client/helpdata.c:1185
+#: client/helpdata.c:1183
#, c-format
msgid "* Allows %s to build airbases.\n"
msgstr ""
-#: client/helpdata.c:1194
+#: client/helpdata.c:1192
#, c-format
msgid "* Allows %s to upgrade roads to railroads.\n"
msgstr ""
-#: client/helpdata.c:1202
+#: client/helpdata.c:1200
#, c-format
msgid "* Allows %s to upgrade irrigation to farmland.\n"
msgstr ""
-#: client/helpdata.c:1236
+#: client/helpdata.c:1234
msgid "* Pollution cannot be generated on this terrain."
msgstr ""
-#: client/helpdata.c:1241
+#: client/helpdata.c:1239
msgid "* You cannot build cities on this terrain."
msgstr ""
-#: client/helpdata.c:1247
+#: client/helpdata.c:1245
msgid "* The coastline of this terrain is unsafe."
msgstr ""
-#: client/helpdata.c:1252
+#: client/helpdata.c:1250
msgid "* This terrain is unsafe for units to travel on."
msgstr ""
-#: client/helpdata.c:1257
+#: client/helpdata.c:1255
msgid "* Land units cannot travel on oceanic terrains."
msgstr ""
-#: client/helpdata.c:1307
+#: client/helpdata.c:1305
msgid "Features:\n"
msgstr ""
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1413 client/helpdata.c:1414
+#: client/helpdata.c:1411 client/helpdata.c:1412
msgid "?outputlist: Nothing "
msgstr ""
-#: client/helpdata.c:1421
+#: client/helpdata.c:1419
#, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
@@ -7861,7 +7863,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:1431
+#: client/helpdata.c:1429
#, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -7869,48 +7871,48 @@ msgid ""
msgstr ""
#. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1439
+#: client/helpdata.c:1437
#, c-format
msgid "* You pay %d times normal %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1444
+#: client/helpdata.c:1442
#, 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:1449
+#: client/helpdata.c:1447
#, c-format
msgid "* You pay no %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1453
+#: client/helpdata.c:1451
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:1462
+#: client/helpdata.c:1460
#, 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:1470
+#: client/helpdata.c:1468
#, c-format
msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
msgstr ""
-#: client/helpdata.c:1477
+#: client/helpdata.c:1475
#, 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:1484
+#: client/helpdata.c:1482
#, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -7918,23 +7920,23 @@ msgid ""
msgstr ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1491
+#: client/helpdata.c:1489
#, 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:1499
+#: client/helpdata.c:1497
#, c-format
msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
msgstr ""
-#: client/helpdata.c:1504
+#: client/helpdata.c:1502
msgid "Has unlimited science/gold/luxuries rates.\n"
msgstr ""
-#: client/helpdata.c:1509
+#: client/helpdata.c:1507
#, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
@@ -7945,7 +7947,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:1521
+#: client/helpdata.c:1519
#, 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"
@@ -7953,60 +7955,60 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1532
+#: client/helpdata.c:1530
#, 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:1538
+#: client/helpdata.c:1536
msgid "* Your units cannot be bribed.\n"
msgstr ""
-#: client/helpdata.c:1541
+#: client/helpdata.c:1539
msgid "* Your cities cannot be incited.\n"
msgstr ""
-#: client/helpdata.c:1545
+#: client/helpdata.c:1543
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:1551
+#: client/helpdata.c:1549
msgid "* Has a senate that may prevent declaration of war.\n"
msgstr ""
-#: client/helpdata.c:1555
+#: client/helpdata.c:1553
msgid "* Allows partisans when cities are taken by the enemy.\n"
msgstr ""
-#: client/helpdata.c:1559
+#: client/helpdata.c:1557
msgid ""
"* Buildings that normally confer bonuses against unhappiness will instead "
"give gold.\n"
msgstr ""
-#: client/helpdata.c:1563
+#: client/helpdata.c:1561
msgid "* Pays no upkeep for fanatics.\n"
msgstr ""
-#: client/helpdata.c:1566
+#: client/helpdata.c:1564
msgid "* Has no unhappy citizens.\n"
msgstr ""
-#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
+#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
#, c-format
msgid "* Veteran %s units.\n"
msgstr ""
-#: client/helpdata.c:1587
+#: client/helpdata.c:1585
msgid "* Veteran units.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1593
+#: client/helpdata.c:1591
#, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8014,7 +8016,7 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1602
+#: client/helpdata.c:1600
#, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8022,438 +8024,484 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1610
+#: client/helpdata.c:1608
#, 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:1619
+#: client/helpdata.c:1617
#, c-format
msgid "* %s production is increased %d%%.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1627
+#: client/helpdata.c:1625
#, c-format
msgid "* %s production will suffer massive waste.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1632
+#: client/helpdata.c:1630
#, c-format
msgid "* %s production will suffer some waste.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1637
+#: client/helpdata.c:1635
#, 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:1645
+#: client/helpdata.c:1643
#, 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:1651
+#: client/helpdata.c:1649
#, 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:1657
+#: client/helpdata.c:1655
#, c-format
msgid "* %s waste will increase slowly with distance from capital.\n"
msgstr ""
-#: client/helpdata.c:1674
+#: client/helpdata.c:1672
#, c-format
msgid "* Allows you to build %s.\n"
msgstr ""
#. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1701
+#: client/helpdata.c:1699
#, c-format
msgid "%s%d %s"
msgstr ""
-#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1700 client/helpdata.c:1708 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:1709
+#: client/helpdata.c:1707
#, c-format
msgid "%s%d unhappy"
msgstr ""
-#: client/mapctrl_common.c:382
+#: client/mapctrl_common.c:399
#, c-format
msgid "You don't know how to build %s!"
msgstr ""
-#: client/mapctrl_common.c:392
+#: client/mapctrl_common.c:409
#, c-format
msgid "Copy %s to clipboard."
msgstr ""
-#: client/mapctrl_common.c:408
+#: client/mapctrl_common.c:425
msgid "Clipboard is empty."
msgstr ""
-#: client/options.c:98
+#: client/options.c:102
msgid "Graphics"
msgstr ""
-#: client/options.c:99
+#: client/options.c:103
msgid "Overview"
msgstr ""
-#: client/options.c:100
+#: client/options.c:104
msgid "Sound"
msgstr ""
-#: client/options.c:101
+#: client/options.c:105
msgid "Interface"
msgstr ""
-#: client/options.c:102
+#: client/options.c:106
msgid "Network"
msgstr ""
-#: client/options.c:107
+#: client/options.c:111
msgid "Login name"
msgstr ""
-#: client/options.c:108
+#: client/options.c:112
msgid ""
"This is the default login username that will be used in the connection "
"dialogs or with the -a command-line parameter."
msgstr ""
-#: client/options.c:113
+#: client/options.c:117
msgid "Server"
msgstr ""
-#: client/options.c:114
+#: client/options.c:118
msgid ""
"This is the default server hostname that will be used in the connection "
"dialogs or with the -a command-line parameter."
msgstr ""
-#: client/options.c:119
+#: client/options.c:123
msgid "Server port"
msgstr ""
-#: client/options.c:120
+#: client/options.c:124
msgid ""
"This is the default server port that will be used in the connection dialogs "
"or with the -a command-line parameter."
msgstr ""
-#: client/options.c:125 client/gui-win32/connectdlg.c:912 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
msgid "Metaserver"
msgstr ""
-#: client/options.c:126
+#: client/options.c:130
msgid ""
"The metaserver is a host that the client contacts to find out about games on "
"the internet. Don't change this from its default value unless you know what "
"you're doing."
msgstr ""
-#: client/options.c:132
+#: client/options.c:136
msgid "Soundset"
msgstr ""
-#: client/options.c:133
+#: client/options.c:137
msgid ""
"This is the soundset that will be used. Changing this is the same as using "
"the -S command-line parameter."
msgstr ""
-#: client/options.c:138
+#: client/options.c:142
msgid "Sound plugin"
msgstr ""
-#: client/options.c:139
+#: client/options.c:143
msgid ""
"If you have a problem with sound, try changing the sound plugin. The new "
"plugin won't take effect until you restart Freeciv. Changing this is the "
"same as using the -P command-line option."
msgstr ""
-#: client/options.c:144 client/gui-sdl/gui_main.c:162
+#: client/options.c:148 client/gui-sdl/gui_main.c:162
msgid "Theme"
msgstr ""
-#: client/options.c:145
+#: client/options.c:149
msgid "By changing this option you change the active theme."
msgstr ""
-#: client/options.c:148
+#: client/options.c:152
msgid "Tileset"
msgstr ""
-#: client/options.c:149
+#: client/options.c:153
msgid ""
"By changing this option you change the active tileset. This is the same as "
"using the -t command-line parameter."
msgstr ""
-#: client/options.c:156
+#: client/options.c:160
msgid "Solid unit background color"
msgstr ""
-#: client/options.c:157
+#: client/options.c:161
msgid ""
"Setting this option will cause units on the map view to be drawn with a "
"solid background color instead of the flag backdrop."
msgstr ""
-#: client/options.c:161 client/gui-sdl/optiondlg.c:960
+#: client/options.c:165 client/gui-sdl/optiondlg.c:960
msgid "Sound bell at new turn"
msgstr ""
-#: client/options.c:162
+#: client/options.c:166
msgid ""
"Set this option to have a \"bell\" event be generated at the start of a new "
"turn. You can control the behavior of the \"bell\" event by editing the "
"message options."
msgstr ""
-#: client/options.c:168
+#: client/options.c:172
msgid "Unit movement animation time (milliseconds)"
msgstr ""
-#: client/options.c:169
+#: client/options.c:173
msgid ""
"This option controls how long unit \"animation\" takes when a unit moves on "
"the map view. Set it to 0 to disable animation entirely."
msgstr ""
-#: client/options.c:174
+#: client/options.c:178
msgid "Mapview recentering time (milliseconds)"
msgstr ""
-#: client/options.c:175
+#: client/options.c:179
msgid ""
"When the map view is recentered, it will slide smoothly over the map to its "
"new position. This option controls how long this slide lasts. Set it to 0 "
"to disable mapview sliding entirely."
msgstr ""
-#: client/options.c:180 client/gui-sdl/optiondlg.c:1014
+#: client/options.c:184 client/gui-sdl/optiondlg.c:1014
msgid "Show combat animation"
msgstr ""
-#: client/options.c:181
+#: client/options.c:185
msgid ""
"Disabling this option will turn off combat animation between units on the "
"mapview."
msgstr ""
-#: client/options.c:184
+#: client/options.c:188
msgid "Draw the citybar"
msgstr ""
-#: client/options.c:185
+#: client/options.c:189
msgid ""
"Setting this option will display a 'citybar' containing useful information "
"beneath each city. Disabling this option will display only the city's name "
"and optionally, production."
msgstr ""
-#: client/options.c:191
+#: client/options.c:195
msgid "Show icons in the technology tree"
msgstr ""
-#: client/options.c:192
+#: client/options.c:196
msgid ""
"Setting this option will display icons on the technology tree diagram. "
"Turning this option off makes the technology tree more compact."
msgstr ""
-#: client/options.c:197
+#: client/options.c:201
msgid "Draw shield graphics for units"
msgstr ""
-#: client/options.c:198
+#: client/options.c:202
msgid ""
"Setting this option will draw a shield icon as the flags on units. If "
"unset, the full flag will be drawn."
msgstr ""
-#: client/options.c:202
+#: client/options.c:206
msgid "Manual Turn Done in AI Mode"
msgstr ""
-#: client/options.c:203
+#: client/options.c:207
msgid ""
"Disable this option if you do not want to press the Turn Done button "
"manually when watching an AI player."
msgstr ""
-#: client/options.c:207 client/gui-sdl/optiondlg.c:1121
+#: client/options.c:211 client/gui-sdl/optiondlg.c:1121
msgid "Auto Center on Units"
msgstr ""
-#: client/options.c:208
+#: client/options.c:212
msgid ""
"Set this option to have the active unit centered automatically when the unit "
"focus changes."
msgstr ""
-#: client/options.c:211 client/gui-sdl/optiondlg.c:1147
+#: client/options.c:215 client/gui-sdl/optiondlg.c:1147
msgid "Auto Center on Combat"
msgstr ""
-#: client/options.c:212
+#: client/options.c:216
msgid ""
"Set this option to have any combat be centered automatically. Disabled this "
"will speed up the time between turns but may cause you to miss combat "
"entirely."
msgstr ""
-#: client/options.c:217 client/gui-sdl/optiondlg.c:1174
+#: client/options.c:221 client/gui-sdl/optiondlg.c:1174
msgid "Focus on Awakened Units"
msgstr ""
-#: client/options.c:218
+#: client/options.c:222
msgid "Set this option to have newly awoken units be focused automatically."
msgstr ""
-#: client/options.c:221
+#: client/options.c:225
msgid "Allow goto into the unknown"
msgstr ""
-#: client/options.c:222
+#: client/options.c:226
msgid ""
"Setting this option will make the game consider moving into unknown tiles. "
"If not, then goto routes will detour around or be blocked by unknown tiles."
msgstr ""
-#: client/options.c:226
+#: client/options.c:230
msgid "Center map when Popup city"
msgstr ""
-#: client/options.c:227
+#: client/options.c:231
msgid ""
"Setting this option makes the mapview center on a city when its city dialog "
"is popped up."
msgstr ""
-#: client/options.c:230
+#: client/options.c:234
msgid "Concise City Production"
msgstr ""
-#: client/options.c:231
+#: client/options.c:235
msgid ""
"Set this option to make the city production (as shown in the city dialog) to "
"be more compact."
msgstr ""
-#: client/options.c:234 client/gui-sdl/optiondlg.c:1252
+#: client/options.c:238 client/gui-sdl/optiondlg.c:1252
msgid "End Turn when done moving"
msgstr ""
-#: client/options.c:235
+#: client/options.c:239
msgid ""
"Setting this option makes your turn end automatically when all your units "
"are done moving."
msgstr ""
-#: client/options.c:238 client/gui-sdl/optiondlg.c:1226
+#: client/options.c:242 client/gui-sdl/optiondlg.c:1226
msgid "Prompt for city names"
msgstr ""
-#: client/options.c:239
+#: client/options.c:243
msgid ""
"Disabling this option will make the names of newly founded cities chosen "
"automatically by the server."
msgstr ""
-#: client/options.c:242 client/gui-sdl/optiondlg.c:1200
+#: client/options.c:246 client/gui-sdl/optiondlg.c:1200
msgid "Pop up city dialog for new cities"
msgstr ""
-#: client/options.c:243
+#: client/options.c:247
msgid ""
"Setting this option will pop up a newly-founded city's city dialog "
"automatically."
msgstr ""
-#: client/options.c:248
+#: client/options.c:250
+msgid "Pop up caravan actions"
+msgstr ""
+
+#: client/options.c:251
+msgid ""
+"If this option is enabled, when caravans arrive at a city where they can "
+"establish a traderoute or help build a wonder, a window will popup asking "
+"which action should be performed. Disabling this option means you will have "
+"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 ""
+
+#: client/options.c:260
+msgid "Enable cursor changing"
+msgstr ""
+
+#: client/options.c:261
+msgid ""
+"This option controls whether the client should try to change the mouse "
+"cursor depending on what is being pointed at, as well as to indicate changes "
+"in the client or server state."
+msgstr ""
+
+#: client/options.c:266
+msgid "Select cities before units"
+msgstr ""
+
+#: 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 ""
+
+#: client/options.c:272
+msgid "Clear unit orders on selection"
+msgstr ""
+
+#: client/options.c:273
+msgid ""
+"Enabling this option will cause unit orders to be cleared whenever one or "
+"more units are selected. If this option is disabled, selecting units will "
+"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 ""
+
+#: client/options.c:282
msgid "Background layer"
msgstr ""
-#: client/options.c:249
+#: client/options.c:283
msgid "The background layer of the overview shows just ocean and land."
msgstr ""
-#: client/options.c:252
+#: client/options.c:286
msgid "Terrain relief map layer"
msgstr ""
-#: client/options.c:253
+#: client/options.c:287
msgid "The relief layer shows all terrains on the map."
msgstr ""
-#: client/options.c:256
+#: client/options.c:290
msgid "Borders layer"
msgstr ""
-#: client/options.c:257
+#: client/options.c:291
msgid ""
"The borders layer of the overview shows which tiles are owned by each player."
msgstr ""
-#: client/options.c:261
+#: client/options.c:295
msgid "Units layer"
msgstr ""
-#: client/options.c:262
+#: client/options.c:296
msgid "Enabling this will draw units on the overview."
msgstr ""
-#: client/options.c:265
+#: client/options.c:299
msgid "Cities layer"
msgstr ""
-#: client/options.c:266
+#: client/options.c:300
msgid "Enabling this will draw cities on the overview."
msgstr ""
-#: client/options.c:269
+#: client/options.c:303
msgid "Overview fog of war"
msgstr ""
-#: client/options.c:270
+#: client/options.c:304
msgid "Enabling this will show fog of war on the overview."
msgstr ""
-#: client/options.c:488
+#: client/options.c:526
msgid "If you add a preset by hand, also update \"number_of_presets\""
msgstr ""
-#: client/options.c:516
+#: client/options.c:554
msgid "Cannot find your home directory"
msgstr ""
-#: client/options.c:665 client/options.c:796
+#: client/options.c:703 client/options.c:834
msgid "Save failed, cannot find a filename."
msgstr ""
-#: client/options.c:678 client/options.c:859
+#: client/options.c:716 client/options.c:897
#, c-format
msgid "Save failed, cannot write to file %s"
msgstr ""
-#: client/options.c:680 client/options.c:862
+#: client/options.c:718 client/options.c:900
#, c-format
msgid "Saved settings to file %s"
msgstr ""
@@ -8477,16 +8525,16 @@ msgstr ""
msgid "Start of turn %d"
msgstr ""
-#: client/packhand.c:1590
+#: client/packhand.c:1591
#, c-format
msgid "AI Mode is now %s."
msgstr ""
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "ON"
msgstr ""
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "OFF"
msgstr ""
@@ -8518,14 +8566,15 @@ msgid "Username"
msgstr ""
#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
-#: client/gui-gtk-2.0/pages.c:2085
+#: client/gui-gtk-2.0/pages.c:2157
msgid "Flag"
msgstr ""
#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
-#: client/gui-gtk-2.0/pages.c:1536 client/gui-gtk-2.0/pages.c:2087
-#: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
-#: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
+#: 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/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr ""
@@ -8537,7 +8586,7 @@ msgstr ""
msgid "Score"
msgstr ""
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
msgid "Team"
msgstr ""
@@ -8608,277 +8657,299 @@ msgstr ""
msgid "Could not open temp file."
msgstr ""
-#: client/servers.c:407
+#: client/servers.c:410
msgid "Invalid $http_proxy or metaserver value, must start with 'http://'"
msgstr ""
-#: client/servers.c:413
+#: client/servers.c:416
msgid "Failed looking up metaserver's host"
msgstr ""
-#: client/text.c:85 client/text.c:86 client/text.c:91
+#. TRANS: "AI <player name>"
+#: client/text.c:94
+#, c-format
+msgid "AI %s"
+msgstr ""
+
+#. TRANS: "<nation adjective>, team <team name>"
+#: client/text.c:118
+#, c-format
+msgid "%s, team %s"
+msgstr ""
+
+#: client/text.c:135 client/text.c:136 client/text.c:141
#: client/gui-sdl/mapview.c:752
msgid "?nation:Neutral"
msgstr ""
-#: client/text.c:85 client/gui-sdl/mapview.c:752
+#: client/text.c:135 client/gui-sdl/mapview.c:752
msgid "?nation:Hostile"
msgstr ""
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Peaceful"
msgstr ""
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Friendly"
msgstr ""
-#: client/text.c:88 client/gui-sdl/mapview.c:755
+#: client/text.c:138 client/gui-sdl/mapview.c:755
msgid "?nation:Mysterious"
msgstr ""
-#: client/text.c:88
+#: client/text.c:138
msgid "?nation:Friendly(team)"
msgstr ""
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
msgid "?city:Neutral"
msgstr ""
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
msgid "?city:Hostile"
msgstr ""
-#: client/text.c:92 client/gui-sdl/mapview.c:786
+#: client/text.c:142 client/gui-sdl/mapview.c:786
msgid "?city:Peaceful"
msgstr ""
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Friendly"
msgstr ""
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Mysterious"
msgstr ""
-#: client/text.c:93
+#: client/text.c:143
msgid "?city:Friendly(team)"
msgstr ""
-#: client/text.c:100
+#: client/text.c:151
#, c-format
msgid "Location: (%d, %d) [%d]"
msgstr ""
-#: client/text.c:109
+#: client/text.c:153
+#, c-format
+msgid "Native coordinates: (%d, %d)"
+msgstr ""
+
+#: client/text.c:160
#, c-format
msgid "Terrain: %s"
msgstr ""
-#: client/text.c:110
+#: client/text.c:161
#, c-format
msgid "Food/Prod/Trade: %s"
msgstr ""
-#: client/text.c:113
+#: client/text.c:164
msgid "Minor Tribe Village"
msgstr ""
-#: client/text.c:119
+#: client/text.c:173
msgid "Our territory"
msgstr ""
-#. TRANS: "Polish territory"
-#: client/text.c:122
+#. TRANS: "Territory of <username> (<nation + team>)"
+#: client/text.c:176
#, c-format
-msgid "%s territory"
+msgid "Territory of %s (%s)"
msgstr ""
-#. TRANS: "Polish territory (5 turn cease-fire)"
-#: client/text.c:131
+#: client/text.c:186
#, c-format
-msgid "%s territory (%d turn cease-fire)"
-msgid_plural "%s territory (%d turn cease-fire)"
+msgid "Territory of %s (%s) (%d turn cease-fire)"
+msgid_plural "Territory of %s (%s) (%d turn cease-fire)"
msgstr[0] ""
msgstr[1] ""
-#. TRANS: "Polish territory (friendly)"
-#: client/text.c:140
+#. TRANS: "Territory of <username>
+#. * (<nation + team> | <diplomatic state>)"
+#: client/text.c:195
#, c-format
-msgid "%s territory (%s)"
+msgid "Territory of %s (%s | %s)"
msgstr ""
-#: client/text.c:145
+#: client/text.c:200
msgid "Unclaimed territory"
msgstr ""
-#. TRANS: "City: Warsaw (Polish)"
-#: client/text.c:156
+#. TRANS: "City: <city name> | <username> (<nation + team>)"
+#: client/text.c:214
#, c-format
-msgid "City: %s (%s)"
+msgid "City: %s | %s (%s)"
msgstr ""
-#. TRANS: "City: Warsaw (Polish, 5 turn cease-fire)"
-#: client/text.c:166
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <number> turn cease-fire)"
+#: client/text.c:224
#, c-format
-msgid "City: %s (%s, %d turn cease-fire)"
-msgid_plural "City: %s (%s, %d turn cease-fire)"
+msgid "City: %s | %s (%s, %d turn cease-fire)"
+msgid_plural "City: %s | %s (%s, %d turn cease-fire)"
msgstr[0] ""
msgstr[1] ""
-#. TRANS: "City: Warsaw (Polish,friendly)"
-#: client/text.c:174
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <diplomatic state>)"
+#: client/text.c:231
#, c-format
-msgid "City: %s (%s, %s)"
+msgid "City: %s | %s (%s, %s)"
msgstr ""
#. TRANS: previous lines gave other information about the city.
-#: client/text.c:189
+#: client/text.c:246
#, c-format
msgid "?clistbegin: with %s"
msgstr ""
#. TRANS: "Trade from Warsaw: 5"
-#: client/text.c:202
+#: client/text.c:259
#, c-format
msgid "Trade from %s: %d"
msgstr ""
-#: client/text.c:210
+#: client/text.c:267
#, c-format
msgid "Infrastructure: %s"
msgstr ""
-#: client/text.c:215
+#: client/text.c:272
#, c-format
msgid "Activity: %s"
msgstr ""
-#. TRANS: "Unit: Musketeers (Polish, Warsaw)"
-#. TRANS: "Unit: Musketeers (Polish,friendly)"
-#: client/text.c:226 client/text.c:253
+#. TRANS: "Unit: <unit type> | <username>
+#. * (<nation + team>, <homecity>)"
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <diplomatic state>)"
+#: client/text.c:287 client/text.c:313
#, c-format
-msgid "Unit: %s (%s, %s)"
+msgid "Unit: %s | %s (%s, %s)"
msgstr ""
-#. TRANS: "Unit: Musketeers (Polish)"
-#: client/text.c:232
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>)"
+#: client/text.c:292
#, c-format
-msgid "Unit: %s (%s)"
+msgid "Unit: %s | %s (%s)"
msgstr ""
-#. TRANS: "Unit: Musketeers (Polish, 5 turn cease-fire)"
-#: client/text.c:245
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <number> turn cease-fire)"
+#: client/text.c:305
#, c-format
-msgid "Unit: %s (%s, %d turn cease-fire)"
-msgid_plural "Unit: %s (%s, %d turn cease-fire)"
+msgid "Unit: %s | %s (%s, %d turn cease-fire)"
+msgid_plural "Unit: %s | %s (%s, %d turn cease-fire)"
msgstr[0] ""
msgstr[1] ""
#. TRANS: "Chance to win: A:95% D:46%"
-#: client/text.c:279
+#: client/text.c:338
#, c-format
msgid "Chance to win: A:%d%% D:%d%%"
msgstr ""
#. TRANS: A is attack power, D is defense power, FP is firepower,
#. * HP is hitpoints (current and max).
-#: client/text.c:286
+#: client/text.c:345
#, c-format
msgid "A:%d D:%d FP:%d HP:%d/%d (%s)"
msgstr ""
#. TRANS: "5 more" units on this tile
-#: client/text.c:295
+#: client/text.c:354
#, c-format
msgid " (%d more)"
msgstr ""
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:364
+#: client/text.c:423
#, c-format
msgid "far from %s"
msgstr ""
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:367
+#: client/text.c:426
#, c-format
msgid "near %s"
msgstr ""
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:370
+#: client/text.c:429
#, c-format
msgid "in %s"
msgstr ""
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:403
+#: client/text.c:462
#, c-format
msgid "from %s"
msgstr ""
-#: client/text.c:466
+#: client/text.c:525
msgid "Progress: no research"
msgstr ""
-#: client/text.c:470
+#: client/text.c:529
msgid "Progress: no research target"
msgstr ""
-#: client/text.c:475
+#: client/text.c:534
#, c-format
msgid "Progress: %d turn/advance"
msgid_plural "Progress: %d turns/advance"
msgstr[0] ""
msgstr[1] ""
-#: client/text.c:480
+#: client/text.c:539
#, c-format
msgid "%d bulb/turn"
msgid_plural "%d bulbs/turn"
msgstr[0] ""
msgstr[1] ""
-#: client/text.c:485
+#: client/text.c:544
#, c-format
msgid ", %d bulb/turn from team"
msgid_plural ", %d bulbs/turn from team"
msgstr[0] ""
msgstr[1] ""
-#: client/text.c:512
+#: client/text.c:571
#, c-format
msgid "%d/- (never)"
msgstr ""
-#: client/text.c:524
+#: client/text.c:583
#, c-format
msgid "%d/%d (%d turn)"
msgid_plural "%d/%d (%d turns)"
msgstr[0] ""
msgstr[1] ""
-#: client/text.c:527
+#: client/text.c:586
#, c-format
msgid "%d/%d (never)"
msgstr ""
-#: client/text.c:564
+#: client/text.c:623
#, c-format
msgid "%d step"
msgid_plural "%d steps"
msgstr[0] ""
msgstr[1] ""
-#: client/text.c:566
+#: client/text.c:625
#, c-format
msgid "%d bulb"
msgid_plural "%d bulbs"
msgstr[0] ""
msgstr[1] ""
-#: client/text.c:570 client/agents/cma_fec.c:269 client/agents/cma_fec.c:313
+#: 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
#, c-format
msgid "%d turn"
@@ -8886,88 +8957,88 @@ msgid_plural "%d turns"
msgstr[0] ""
msgstr[1] ""
-#: client/text.c:592
+#: client/text.c:651
#, c-format
msgid "Population: %s"
msgstr ""
-#: client/text.c:595
+#: client/text.c:654
#, c-format
msgid "Year: %s (T%d)"
msgstr ""
-#: client/text.c:598
+#: client/text.c:657
#, c-format
msgid "Gold: %d (%+d)"
msgstr ""
-#: client/text.c:600
+#: client/text.c:659
#, c-format
msgid "Tax: %d Lux: %d Sci: %d"
msgstr ""
-#: client/text.c:607
+#: client/text.c:666
msgid "Moving: Nobody"
msgstr ""
-#: client/text.c:609
+#: client/text.c:668
#, c-format
msgid "Moving: %s"
msgstr ""
-#: client/text.c:613
+#: client/text.c:672
msgid "(Click for more info)"
msgstr ""
-#: client/text.c:629
+#: client/text.c:688
#, c-format
msgid "%s People"
msgstr ""
-#: client/text.c:633
+#: client/text.c:692
#, c-format
msgid "Turn: %d"
msgstr ""
-#: client/text.c:635 client/gui-win32/inteldlg.c:111
+#: client/text.c:694 client/gui-win32/inteldlg.c:111
#: client/gui-xaw/inteldlg.c:208
#, c-format
msgid "Gold: %d"
msgstr ""
-#: client/text.c:636
+#: client/text.c:695
#, c-format
msgid "Net Income: %d"
msgstr ""
#. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:639
+#: client/text.c:698
#, c-format
msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
msgstr ""
-#: client/text.c:643
+#: client/text.c:702
#, c-format
msgid "Researching %s: %s"
msgstr ""
-#: client/text.c:650
+#: client/text.c:709
#, c-format
msgid "Global warming chance: %d%% (%+d%%/turn)"
msgstr ""
-#: client/text.c:653
+#: client/text.c:712
#, c-format
msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
msgstr ""
-#: client/text.c:658 client/gui-win32/inteldlg.c:104
+#: client/text.c:717 client/gui-win32/inteldlg.c:104
#: client/gui-xaw/inteldlg.c:200
#, c-format
msgid "Government: %s"
msgstr ""
-#: client/text.c:682
+#: client/text.c:741
#, c-format
msgid "%d unit"
msgid_plural "%d units"
@@ -8975,55 +9046,55 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Impossible to reach goto target tile
-#: client/text.c:715 client/gui-sdl/mapview.c:566
+#: client/text.c:774 client/gui-sdl/mapview.c:566
msgid "?goto:Unreachable"
msgstr ""
-#: client/text.c:717 client/gui-sdl/mapview.c:568
+#: client/text.c:776 client/gui-sdl/mapview.c:568
#, c-format
msgid "Turns to target: %d"
msgstr ""
-#: client/text.c:719 client/gui-sdl/mapview.c:570
+#: client/text.c:778 client/gui-sdl/mapview.c:570
#, c-format
msgid "Turns to target: %d to %d"
msgstr ""
-#: client/text.c:725 client/gui-sdl/mapview.c:576
+#: client/text.c:784 client/gui-sdl/mapview.c:576
#, c-format
msgid "%d unit selected"
msgid_plural "%d units selected"
msgstr[0] ""
msgstr[1] ""
-#: client/text.c:730 client/gui-sdl/mapview.c:581
+#: client/text.c:789 client/gui-sdl/mapview.c:581
msgid "No units selected."
msgstr ""
-#: client/text.c:804 client/gui-sdl/mapview.c:654
+#: client/text.c:863 client/gui-sdl/mapview.c:654
#, c-format
msgid "Others: %d civil; %d military"
msgstr ""
-#: client/text.c:806 client/gui-sdl/mapview.c:656
+#: client/text.c:865 client/gui-sdl/mapview.c:656
#, c-format
msgid "Others: %d civilian"
msgstr ""
-#: client/text.c:808 client/gui-sdl/mapview.c:658
+#: client/text.c:867 client/gui-sdl/mapview.c:658
#, c-format
msgid "Others: %d military"
msgstr ""
-#: client/text.c:839
+#: client/text.c:898
msgid "No units to upgrade!"
msgstr ""
-#: client/text.c:864
+#: client/text.c:923
msgid "None of these units may be upgraded."
msgstr ""
-#: client/text.c:870
+#: client/text.c:929
#, c-format
msgid ""
"Upgrade %d unit for %d gold?\n"
@@ -9034,72 +9105,72 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: client/text.c:891
+#: client/text.c:950
msgid "Shows your progress in researching the current technology."
msgstr ""
-#: client/text.c:897
+#: client/text.c:956
msgid "no research target."
msgstr ""
#. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:900
+#: client/text.c:959
#, c-format
msgid "%s: %d/%d."
msgstr ""
-#: client/text.c:920
+#: client/text.c:979
msgid "Shows the progress of global warming:"
msgstr ""
-#: client/text.c:921
+#: client/text.c:980
#, c-format
msgid "Pollution rate: %d%%"
msgstr ""
-#: client/text.c:923
+#: client/text.c:982
#, c-format
msgid "Chance of catastrophic warming each turn: %d%%"
msgstr ""
-#: client/text.c:939
+#: client/text.c:998
msgid "Shows the progress of nuclear winter:"
msgstr ""
-#: client/text.c:940
+#: client/text.c:999
#, c-format
msgid "Fallout rate: %d%%"
msgstr ""
-#: client/text.c:942
+#: client/text.c:1001
#, c-format
msgid "Chance of catastrophic winter each turn: %d%%"
msgstr ""
-#: client/text.c:957
+#: client/text.c:1016
msgid "Shows your current government:"
msgstr ""
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:981
+#: client/text.c:1040
#, c-format
msgid "Population: %5d"
msgstr ""
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:1043
#, c-format
msgid "Support: %5d %%"
msgstr ""
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:1047
#, c-format
msgid "Energy: %5d %%"
msgstr ""
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:992
+#: client/text.c:1051
#, c-format
msgid "Mass: %5d ton"
msgid_plural "Mass: %5d tons"
@@ -9107,96 +9178,97 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1057
#, c-format
msgid "Travel time: %5.1f years"
msgstr ""
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1061
msgid "Travel time: N/A "
msgstr ""
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1065
#, c-format
msgid "Success prob.: %5d %%"
msgstr ""
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1010
+#: client/text.c:1069
#, c-format
msgid "Year of arrival: %8s"
msgstr ""
-#: client/text.c:1030
+#: client/text.c:1089
msgid "?timeout:off"
msgstr ""
-#: client/text.c:1054
+#: client/text.c:1113
#, c-format
msgid "?seconds:%02ds"
msgstr ""
-#: client/text.c:1056
+#: client/text.c:1115
#, c-format
msgid "?mins/secs:%02dm %02ds"
msgstr ""
-#: client/text.c:1058
+#: client/text.c:1117
#, c-format
msgid "?hrs/mns:%02dh %02dm"
msgstr ""
-#: client/text.c:1060
+#: client/text.c:1119
#, c-format
msgid "?dys/hrs:%02dd %02dh"
msgstr ""
-#: client/text.c:1063
+#: client/text.c:1122
msgid "?duration:overflow"
msgstr ""
-#: client/text.c:1084
+#: client/text.c:1143
#, c-format
msgid "%6d.%02d ms"
msgstr ""
-#. TRANS: "Republic of the Poles"
-#: client/text.c:1127
+#. TRANS: <nation adjective> <government name>.
+#. * E.g. "Polish Republic".
+#: client/text.c:1188
#, c-format
-msgid "%s of the %s"
+msgid "?nationgovernment:%s %s"
msgstr ""
#. TRANS: "Observer: 1985"
-#: client/text.c:1137
+#: client/text.c:1198
#, c-format
msgid "Observer: %s"
msgstr ""
-#: client/text.c:1155
+#: client/text.c:1216
msgid "Buildings: "
msgstr ""
-#: client/text.c:1172 client/text.c:1211
+#: client/text.c:1233 client/text.c:1272
msgid "None. "
msgstr ""
-#: client/text.c:1174 client/text.c:1213
+#: client/text.c:1235 client/text.c:1274
msgid "?clistend:."
msgstr ""
-#: client/text.c:1192
+#: client/text.c:1253
msgid "Wonders: "
msgstr ""
-#: client/text.c:1247
+#: client/text.c:1308
#, c-format
msgid "Cities: %d total, %d over threshold of %d cities."
msgstr ""
#. TRANS: 0-21 content [citizen(s)] ...
-#: client/text.c:1251
+#: client/text.c:1312
#, c-format
msgid "%d content before penalty."
msgid_plural "%d content before penalty."
@@ -9204,45 +9276,40 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1257
+#: client/text.c:1318
#, c-format
msgid "%d additional unhappy citizen."
msgid_plural "%d additional unhappy citizens."
msgstr[0] ""
msgstr[1] ""
-#. TRANS: Martial law opening parenthesis
-#: client/text.c:1279
-msgid "Martial law in effect ("
-msgstr ""
-
-#. TRANS: no [unit] maximum
-#: client/text.c:1284
-msgid "no maximum, "
+#: client/text.c:1339
+msgid "Unlimited martial law in effect."
msgstr ""
-#: client/text.c:1287
+#: client/text.c:1341
#, c-format
-msgid "%d unit maximum, "
-msgid_plural "%d units maximum, "
+msgid "%d military unit may impose martial law."
+msgid_plural "Up to %d military units may impose martial law."
msgstr[0] ""
msgstr[1] ""
-#. TRANS: Martial law closing parenthesis
-#: client/text.c:1294
+#: client/text.c:1345
#, c-format
-msgid "%d per unit). "
-msgstr ""
+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:1298
+#: client/text.c:1352
msgid "Military units in the field may cause unhappiness. "
msgstr ""
-#: client/text.c:1301
+#: client/text.c:1355
msgid "Military units have no happiness effect. "
msgstr ""
-#: client/text.c:1316
+#: client/text.c:1370
#, c-format
msgid "Luxury: %d total."
msgstr ""
@@ -9262,7 +9329,7 @@ msgid ""
"instead."
msgstr ""
-#: client/tilespec.c:3968
+#: client/tilespec.c:3966
#, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
@@ -9283,12 +9350,12 @@ msgid ""
"have a look."
msgstr ""
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
-#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:599
+#: client/gui-gtk-2.0/cityrep.c:624 client/gui-sdl/citydlg.c:2009
msgid "none"
msgstr ""
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:645
msgid "custom"
msgstr ""
@@ -9575,7 +9642,7 @@ msgstr ""
msgid "Enter Marketplace"
msgstr ""
-#: client/gui-gtk-2.0/chatline.c:144 client/gui-win32/chatline.c:134
+#: client/gui-gtk-2.0/chatline.c:218 client/gui-win32/chatline.c:134
#: client/gui-xaw/chatline.c:120
msgid "Cleared output window."
msgstr ""
@@ -9656,11 +9723,11 @@ msgid "%d/%d %d turns"
msgstr ""
#: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:821
+#: client/gui-gtk-2.0/cityrep.c:1027
msgid "_Buy"
msgstr ""
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:869
msgid "_Production"
msgstr ""
@@ -9681,12 +9748,12 @@ msgid "Entertainers"
msgstr ""
#: client/gui-gtk-2.0/citydlg.c:1029 client/gui-win32/citydlg.c:1989
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2403
msgid "Scientists"
msgstr ""
#: client/gui-gtk-2.0/citydlg.c:1030 client/gui-win32/citydlg.c:1991
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2404
msgid "Taxmen"
msgstr ""
@@ -9779,7 +9846,7 @@ msgstr ""
msgid "Present units %d"
msgstr ""
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:1019
msgid "Cen_ter"
msgstr ""
@@ -9864,31 +9931,55 @@ msgstr ""
msgid "What should we rename the city to?"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:699
+#: client/gui-gtk-2.0/cityrep.c:794
+msgid "(no worklists defined)"
+msgstr ""
+
+#: client/gui-gtk-2.0/cityrep.c:876
msgid "Chan_ge"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:703
+#: client/gui-gtk-2.0/cityrep.c:880
msgid "Add _First"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:707
+#: client/gui-gtk-2.0/cityrep.c:884
msgid "Add _Next"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:711
+#: client/gui-gtk-2.0/cityrep.c:888
+msgid "Add _2nd Last"
+msgstr ""
+
+#: client/gui-gtk-2.0/cityrep.c:892
msgid "Add _Last"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:715
+#: client/gui-gtk-2.0/cityrep.c:899
+msgid "Set Worklist"
+msgstr ""
+
+#: client/gui-gtk-2.0/cityrep.c:905
+msgid "Append Worklist"
+msgstr ""
+
+#: client/gui-gtk-2.0/cityrep.c:911
+msgid "Clear _Worklist"
+msgstr ""
+
+#: client/gui-gtk-2.0/cityrep.c:916
+msgid "Gover_nor"
+msgstr ""
+
+#: client/gui-gtk-2.0/cityrep.c:921
msgid "_Select"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
+#: client/gui-gtk-2.0/cityrep.c:925 client/gui-gtk-2.0/plrdlg.c:521
msgid "_Display"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:800 client/gui-gtk-2.0/menu.c:808
+#: 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-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
#: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -9898,100 +9989,100 @@ msgstr ""
msgid "Cities"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:817
+#: client/gui-gtk-2.0/cityrep.c:1023
msgid "_Inspect"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
-#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-sdl/helpdlg.c:297 client/gui-win32/menu.c:342
-#: client/gui-xaw/menu.c:241
+#: 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
+#: client/gui-gtk-2.0/cityrep.c:1518 client/gui-gtk-2.0/menu.c:823
+#: client/gui-gtk-2.0/menu.c:825 client/gui-gtk-2.0/menu.c:827
+#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:831
+#: client/gui-gtk-2.0/menu.c:833 client/gui-sdl/helpdlg.c:297
+#: client/gui-win32/menu.c:342 client/gui-xaw/menu.c:241
msgid "Improvements"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
-#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
-#: client/gui-xaw/menu.c:247
+#: client/gui-gtk-2.0/cityrep.c:1441 client/gui-gtk-2.0/cityrep.c:1460
+#: client/gui-gtk-2.0/cityrep.c:1479 client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1522 client/gui-xaw/menu.c:247
msgid "Wonders"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1662 client/gui-win32/cityrep.c:439
#: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
msgid "All Cities"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1667 client/gui-win32/cityrep.c:440
msgid "No Cities"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1672 client/gui-win32/cityrep.c:441
msgid "Invert Selection"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:1420
+#: client/gui-gtk-2.0/cityrep.c:1682
msgid "Building Units"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:1426
+#: client/gui-gtk-2.0/cityrep.c:1688
msgid "Building Improvements"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:1432
+#: client/gui-gtk-2.0/cityrep.c:1694
msgid "Building Wonders"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:1444
+#: client/gui-gtk-2.0/cityrep.c:1706
msgid "Building Unit"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:1448
+#: client/gui-gtk-2.0/cityrep.c:1710
msgid "Building Improvement"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:1452
+#: client/gui-gtk-2.0/cityrep.c:1714
msgid "Building Wonder"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1722 client/gui-win32/cityrep.c:443
msgid "Coastal Cities"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1727 client/gui-win32/cityrep.c:444
msgid "Same Island"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1737 client/gui-win32/cityrep.c:447
msgid "Supported Units"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1740 client/gui-win32/cityrep.c:454
msgid "Units Present"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1744 client/gui-win32/cityrep.c:469
msgid "Improvements in City"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:1486
+#: client/gui-gtk-2.0/cityrep.c:1748
msgid "Wonders in City"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:1495
+#: client/gui-gtk-2.0/cityrep.c:1757
msgid "Available Units"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1760
msgid "Available Improvements"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:1501
+#: client/gui-gtk-2.0/cityrep.c:1763
msgid "Available Wonders"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:1625
+#: client/gui-gtk-2.0/cityrep.c:1882
#, c-format
msgid "Total Buy Cost: %d"
msgstr ""
@@ -10057,11 +10148,11 @@ msgstr ""
msgid "Remove this preset?"
msgstr ""
-#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:186
+#: client/gui-gtk-2.0/dialogs.c:196 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:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
msgid "Inspect _City"
msgstr ""
@@ -10089,10 +10180,10 @@ msgstr ""
msgid "Unit"
msgstr ""
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
-#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
-#: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
-#: manual/civmanual.c:302 data/Freeciv.in:80
+#: 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-win32/plrdlg.c:335 manual/civmanual.c:302 data/Freeciv.in:80
msgid "Name"
msgstr ""
@@ -10117,7 +10208,7 @@ 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:1036 data/Freeciv.in:3371
+#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
msgid "Pick Nation"
msgstr ""
@@ -10196,7 +10287,7 @@ msgstr ""
msgid "_Advances"
msgstr ""
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:910
+#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr ""
@@ -10301,108 +10392,177 @@ msgstr ""
msgid "Show _All Cities"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:150
+#: client/gui-gtk-2.0/gui_main.c:162
msgid "Show Map Scrollbars"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:151
+#: client/gui-gtk-2.0/gui_main.c:163
msgid "Disable this option to hide the scrollbars on the map view."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:155
+#: client/gui-gtk-2.0/gui_main.c:167
msgid "Keyboardless goto"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:156
+#: client/gui-gtk-2.0/gui_main.c:168
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:161
+#: client/gui-gtk-2.0/gui_main.c:173
msgid "Keep dialogs on top"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:174
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:166
+#: client/gui-gtk-2.0/gui_main.c:178
msgid "Show worklist task icons"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:179
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:171
+#: client/gui-gtk-2.0/gui_main.c:183
msgid "Enable status report tabs"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:172
+#: client/gui-gtk-2.0/gui_main.c:184
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:177 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:189 client/gui-win32/gui_main.c:110
msgid "Better fog-of-war drawing"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:178 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:190 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:277 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:195
+msgid "Show time for each chat message"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:196
+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
+msgid "Split bottom notebook area"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:202
+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
+msgid "New message events go to top of list"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:208
+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
+msgid "Show extra message window buttons"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:214
+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 "
+"is disabled, these buttons will not appear (you can still double-click with "
+"the left mouse button or right-click on a row to inspect or goto "
+"respectively). This option will only take effect once the message window is "
+"closed and reopened."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:224
+msgid "Metaserver tab first in network page"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:225
+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
+msgid "Plain chat messages are sent to allies only"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:231
+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 "
+"messages will be sent as public chat messages. To send a public chat message "
+"with this option enabled, prefix the message with a single colon ':'. This "
+"option can also be set using a toggle button beside the chat entry (only "
+"visible in multiplayer games)."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:340 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:723 client/gui-gtk-2.0/gui_main.c:1345
+#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
msgid "Freeciv"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1088 client/gui-gtk-2.0/gui_main.c:1095
+#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
#: 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:1095 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1232 client/gui-sdl/mapctrl.c:1566
#: client/gui-sdl/mapview.c:1082
msgid "Shift+Return"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1127 client/gui-gtk-2.0/menu.c:770
-#: client/gui-gtk-2.0/menu.c:772 client/gui-gtk-2.0/menu.c:774
-#: client/gui-gtk-2.0/menu.c:776 client/gui-gtk-2.0/menu.c:778
-#: client/gui-gtk-2.0/menu.c:780 client/gui-gtk-2.0/menu.c:782
-#: client/gui-gtk-2.0/menu.c:784 client/gui-gtk-2.0/menu.c:786
-#: client/gui-gtk-2.0/menu.c:788 client/gui-gtk-2.0/menu.c:790
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-gtk-2.0/menu.c:804 client/gui-gtk-2.0/menu.c:806
-#: client/gui-gtk-2.0/menu.c:808 client/gui-gtk-2.0/menu.c:810
-#: client/gui-gtk-2.0/menu.c:812 client/gui-gtk-2.0/menu.c:814
-#: client/gui-gtk-2.0/menu.c:816 client/gui-gtk-2.0/menu.c:818
-#: client/gui-gtk-2.0/menu.c:820 client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/gui_main.c:1266 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
+#: client/gui-gtk-2.0/menu.c:811 client/gui-gtk-2.0/menu.c:813
+#: client/gui-gtk-2.0/menu.c:815 client/gui-gtk-2.0/menu.c:817
+#: client/gui-gtk-2.0/menu.c:819 client/gui-gtk-2.0/menu.c:821
+#: client/gui-gtk-2.0/menu.c:823 client/gui-gtk-2.0/menu.c:825
+#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
+#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
+#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
+#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
+#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
+#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
#: data/Freeciv.in:2028
msgid "View"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1208
+#: client/gui-gtk-2.0/gui_main.c:1359
msgid "Chat"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1224 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1377 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"
@@ -10410,69 +10570,73 @@ msgid ""
"Now.. Go give'em hell!"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1491
+#: client/gui-gtk-2.0/gui_main.c:1392
+msgid "Allies Only"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:1657
msgid "Not _ready"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
+#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
msgid "_Ready"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2132
+#: 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
msgid "_Start"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1520
+#: client/gui-gtk-2.0/gui_main.c:1686
msgid "_Take Player"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
+#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
msgid "Pick _Nation"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
+#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
msgid "_Observe"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1532
+#: client/gui-gtk-2.0/gui_main.c:1698
msgid "Do not _observe"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
msgid "<AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1557
+#: client/gui-gtk-2.0/gui_main.c:1723
msgid "<Novice AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1560
+#: client/gui-gtk-2.0/gui_main.c:1726
msgid "<Easy AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1563
+#: client/gui-gtk-2.0/gui_main.c:1729
msgid "<Normal AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1732
msgid "<Hard AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1742 client/gui-win32/dialogs.c:594
#: client/gui-xaw/pages.c:217
msgid "Random"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
msgid "Observer"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
msgid "Detached"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1899
+#: client/gui-gtk-2.0/gui_main.c:2073
msgid "Are you sure you want to quit?"
msgstr ""
@@ -10702,466 +10866,500 @@ msgstr ""
msgid "Foreign Intelligence: %s Empire"
msgstr ""
-#: client/gui-gtk-2.0/mapctrl.c:195 client/gui-sdl/mapctrl.c:2565
+#: client/gui-gtk-2.0/mapctrl.c:179 client/gui-sdl/mapctrl.c:2565
#: client/gui-sdl/menu.c:839 client/gui-sdl/menu.c:1021
#: client/gui-win32/mapctrl.c:353
msgid "Build New City"
msgstr ""
-#: client/gui-gtk-2.0/mapctrl.c:196 client/gui-sdl/mapctrl.c:2594
+#: client/gui-gtk-2.0/mapctrl.c:180 client/gui-sdl/mapctrl.c:2594
#: client/gui-win32/mapctrl.c:354 client/gui-xaw/mapctrl.c:89
msgid "What should we call our new city?"
msgstr ""
-#: client/gui-gtk-2.0/mapview.c:147
+#: client/gui-gtk-2.0/mapview.c:158
msgid "Shows your current luxury/science/tax rates;click to toggle them."
msgstr ""
-#: client/gui-gtk-2.0/mapview.c:692 client/gui-win32/canvas.c:275
+#: client/gui-gtk-2.0/mapview.c:702 client/gui-win32/canvas.c:275
msgid "Better fog will only work in truecolor. Disabling it"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:250
+#: client/gui-gtk-2.0/menu.c:256
msgid "Leaving a local game will end it!"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:700 client/gui-win32/menu.c:303
+#: client/gui-gtk-2.0/menu.c:727 client/gui-win32/menu.c:303
msgid "_Game"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:702 client/gui-gtk-2.0/menu.c:704
-#: client/gui-gtk-2.0/menu.c:706 client/gui-gtk-2.0/menu.c:708
-#: client/gui-gtk-2.0/menu.c:710 client/gui-gtk-2.0/menu.c:712
-#: client/gui-gtk-2.0/menu.c:714 client/gui-gtk-2.0/menu.c:717
-#: client/gui-gtk-2.0/menu.c:720 client/gui-gtk-2.0/menu.c:722
-#: client/gui-gtk-2.0/menu.c:724 client/gui-gtk-2.0/menu.c:726
-#: client/gui-gtk-2.0/menu.c:728 client/gui-gtk-2.0/menu.c:730
-#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:736
-#: client/gui-gtk-2.0/menu.c:738 client/gui-gtk-2.0/menu.c:740
+#: client/gui-gtk-2.0/menu.c:729 client/gui-gtk-2.0/menu.c:731
+#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:735
+#: client/gui-gtk-2.0/menu.c:737 client/gui-gtk-2.0/menu.c:739
+#: client/gui-gtk-2.0/menu.c:741 client/gui-gtk-2.0/menu.c:744
+#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
+#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
+#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
+#: client/gui-gtk-2.0/menu.c:760 client/gui-gtk-2.0/menu.c:763
+#: client/gui-gtk-2.0/menu.c:765 client/gui-gtk-2.0/menu.c:767
#: data/Freeciv.in:2026
msgid "Game"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:704 client/gui-gtk-2.0/menu.c:706
-#: client/gui-gtk-2.0/menu.c:708
+#: client/gui-gtk-2.0/menu.c:731 client/gui-gtk-2.0/menu.c:733
+#: client/gui-gtk-2.0/menu.c:735
msgid "_Chat"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:706 client/gui-win32/menu.c:314
+#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:314
msgid "_Clear Log"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:708 client/gui-win32/menu.c:313
+#: client/gui-gtk-2.0/menu.c:735 client/gui-win32/menu.c:313
msgid "_Write Log"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:710 client/gui-win32/menu.c:304
+#: client/gui-gtk-2.0/menu.c:737 client/gui-win32/menu.c:304
msgid "Local _Options"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:712 client/gui-win32/menu.c:305
+#: client/gui-gtk-2.0/menu.c:739 client/gui-win32/menu.c:305
msgid "_Message Options"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:717
+#: client/gui-gtk-2.0/menu.c:744
msgid "_Reload Tileset"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:720
+#: client/gui-gtk-2.0/menu.c:747
msgid "Save Options on _Exit"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:722
+#: client/gui-gtk-2.0/menu.c:749
msgid "Sa_ve Options"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:726 client/gui-win32/menu.c:308
+#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:308
msgid "Server O_ptions"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:730 client/gui-win32/menu.c:310
+#: client/gui-gtk-2.0/menu.c:757 client/gui-win32/menu.c:310
msgid "_Save Game"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:311
+#: client/gui-gtk-2.0/menu.c:760 client/gui-win32/menu.c:311
msgid "Save Game _As..."
msgstr ""
-#: client/gui-gtk-2.0/menu.c:738
+#: client/gui-gtk-2.0/menu.c:765
msgid "_Leave"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:740 client/gui-win32/menu.c:317
+#: client/gui-gtk-2.0/menu.c:767 client/gui-win32/menu.c:317
msgid "_Quit"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:745 client/gui-win32/menu.c:321
+#: client/gui-gtk-2.0/menu.c:772 client/gui-win32/menu.c:321
msgid "Gov_ernment"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
-#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
-#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:774 client/gui-gtk-2.0/menu.c:776
+#: client/gui-gtk-2.0/menu.c:778 client/gui-gtk-2.0/menu.c:780
+#: client/gui-gtk-2.0/menu.c:782 client/gui-gtk-2.0/menu.c:784
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
#: client/gui-xaw/menu.c:248 data/Freeciv.in:2027 data/helpdata.txt:1320
msgid "Government"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:749 client/gui-win32/menu.c:322
+#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:322
msgid "_Tax Rates"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:324
+#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:324
msgid "_Find City"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:755 client/gui-win32/menu.c:325
+#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:325
msgid "_Worklists"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
-#: client/gui-gtk-2.0/menu.c:764 client/gui-win32/menu.c:327
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
+#: client/gui-gtk-2.0/menu.c:791 client/gui-win32/menu.c:327
msgid "_Change Government"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:788
msgid "_Revolution..."
msgstr ""
-#: client/gui-gtk-2.0/menu.c:764 client/gui-gtk-2.0/menu.c:970
+#: client/gui-gtk-2.0/menu.c:791 client/gui-gtk-2.0/menu.c:1013
#: client/gui-win32/menu.c:431
msgid "_Government"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:768 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:795 client/gui-gtk-2.0/menu.c:959
#: client/gui-win32/menu.c:334
msgid "_View"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:772
+#: client/gui-gtk-2.0/menu.c:799
msgid "City Outlines"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:774 client/gui-win32/menu.c:335
+#: client/gui-gtk-2.0/menu.c:801 client/gui-win32/menu.c:335
msgid "Map _Grid"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:336
+#: client/gui-gtk-2.0/menu.c:803 client/gui-win32/menu.c:336
msgid "National _Borders"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:778 client/gui-win32/menu.c:337
+#: client/gui-gtk-2.0/menu.c:805 client/gui-win32/menu.c:337
msgid "City _Names"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:338
+#: client/gui-gtk-2.0/menu.c:807 client/gui-win32/menu.c:338
msgid "City G_rowth"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:339
+#: client/gui-gtk-2.0/menu.c:809 client/gui-win32/menu.c:339
msgid "City _Productions"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:784 client/gui-sdl/optiondlg.c:1719
+#: client/gui-gtk-2.0/menu.c:811
+msgid "City Buy Cost"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:813
+msgid "City Traderoutes"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:815 client/gui-sdl/optiondlg.c:1719
msgid "Draw city worker map grid"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:788 client/gui-sdl/optiondlg.c:1635
+#: client/gui-gtk-2.0/menu.c:819 client/gui-sdl/optiondlg.c:1635
#: client/gui-win32/menu.c:340 client/gui-xaw/menu.c:148
#: client/gui-xaw/menu.c:246 manual/civmanual.c:220 data/helpdata.txt:1220
msgid "Terrain"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:790 client/gui-win32/menu.c:341
+#: client/gui-gtk-2.0/menu.c:821 client/gui-win32/menu.c:341
#: client/gui-xaw/menu.c:149
msgid "Coastline"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:796 client/gui-win32/menu.c:343
+#: client/gui-gtk-2.0/menu.c:827 client/gui-win32/menu.c:343
msgid "Roads & Rails"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:800 client/gui-sdl/optiondlg.c:1933
+#: client/gui-gtk-2.0/menu.c:831 client/gui-sdl/optiondlg.c:1933
#: client/gui-win32/menu.c:345 client/gui-xaw/menu.c:152
msgid "Mines"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:802 client/gui-win32/menu.c:346
+#: client/gui-gtk-2.0/menu.c:833 client/gui-win32/menu.c:346
msgid "Fortress & Airbase"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:804 client/gui-win32/menu.c:348
+#: client/gui-gtk-2.0/menu.c:835 client/gui-win32/menu.c:348
#: client/gui-xaw/menu.c:154
msgid "Specials"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:806 client/gui-win32/menu.c:349
+#: client/gui-gtk-2.0/menu.c:837 client/gui-win32/menu.c:349
#: client/gui-xaw/menu.c:155
msgid "Pollution & Fallout"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:812 client/gui-win32/menu.c:352
+#: client/gui-gtk-2.0/menu.c:843 client/gui-win32/menu.c:352
#: client/gui-xaw/menu.c:158
msgid "Focus Unit"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:814 client/gui-sdl/optiondlg.c:1854
+#: client/gui-gtk-2.0/menu.c:845 client/gui-sdl/optiondlg.c:1854
#: client/gui-win32/menu.c:353 client/gui-xaw/menu.c:159
msgid "Fog of War"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:818
+#: client/gui-gtk-2.0/menu.c:849
msgid "_Full Screen"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/menu.c:853
msgid "_Center View"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:825 client/gui-win32/menu.c:358
+#: client/gui-gtk-2.0/menu.c:856 client/gui-win32/menu.c:358
msgid "_Orders"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
-#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
-#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
-#: client/gui-gtk-2.0/menu.c:855 client/gui-gtk-2.0/menu.c:857
-#: client/gui-gtk-2.0/menu.c:859 client/gui-gtk-2.0/menu.c:861
-#: client/gui-gtk-2.0/menu.c:863 client/gui-gtk-2.0/menu.c:865
-#: client/gui-gtk-2.0/menu.c:867 client/gui-gtk-2.0/menu.c:869
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875 client/gui-gtk-2.0/menu.c:877
-#: client/gui-gtk-2.0/menu.c:879 client/gui-gtk-2.0/menu.c:881
-#: client/gui-gtk-2.0/menu.c:883 client/gui-gtk-2.0/menu.c:885
-#: client/gui-gtk-2.0/menu.c:887 client/gui-gtk-2.0/menu.c:889
-#: client/gui-gtk-2.0/menu.c:891 client/gui-gtk-2.0/menu.c:893
-#: client/gui-gtk-2.0/menu.c:895 client/gui-gtk-2.0/menu.c:897
-#: client/gui-gtk-2.0/menu.c:899 client/gui-gtk-2.0/menu.c:901
-#: client/gui-gtk-2.0/menu.c:903 data/Freeciv.in:2029
+#: client/gui-gtk-2.0/menu.c:858 client/gui-gtk-2.0/menu.c:860
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:864
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:868
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:872
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:876
+#: client/gui-gtk-2.0/menu.c:878 client/gui-gtk-2.0/menu.c:880
+#: client/gui-gtk-2.0/menu.c:882 client/gui-gtk-2.0/menu.c:884
+#: client/gui-gtk-2.0/menu.c:886 client/gui-gtk-2.0/menu.c:888
+#: client/gui-gtk-2.0/menu.c:890 client/gui-gtk-2.0/menu.c:892
+#: client/gui-gtk-2.0/menu.c:894 client/gui-gtk-2.0/menu.c:896
+#: client/gui-gtk-2.0/menu.c:898 client/gui-gtk-2.0/menu.c:900
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906 client/gui-gtk-2.0/menu.c:908
+#: client/gui-gtk-2.0/menu.c:910 client/gui-gtk-2.0/menu.c:912
+#: client/gui-gtk-2.0/menu.c:914 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:918 client/gui-gtk-2.0/menu.c:920
+#: client/gui-gtk-2.0/menu.c:922 client/gui-gtk-2.0/menu.c:924
+#: client/gui-gtk-2.0/menu.c:926 client/gui-gtk-2.0/menu.c:928
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
+#: client/gui-gtk-2.0/menu.c:946 data/Freeciv.in:2029
msgid "Orders"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:1444
+#: client/gui-gtk-2.0/menu.c:860 client/gui-gtk-2.0/menu.c:1489
#: client/gui-win32/menu.c:359
msgid "_Build City"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:1466
-#: client/gui-gtk-2.0/menu.c:1472 client/gui-win32/menu.c:360
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:1511
+#: client/gui-gtk-2.0/menu.c:1517 client/gui-win32/menu.c:360
msgid "Build _Road"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:833 client/gui-gtk-2.0/menu.c:1360
+#: 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 ""
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:1361
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:1406
#: client/gui-win32/menu.c:362
msgid "Build _Mine"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:837 client/gui-gtk-2.0/menu.c:1362
+#: client/gui-gtk-2.0/menu.c:868 client/gui-gtk-2.0/menu.c:1407
msgid "Transf_orm Terrain"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:1508
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:1553
#: client/gui-win32/menu.c:364
msgid "Build _Fortress"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:841 client/gui-win32/menu.c:365
+#: client/gui-gtk-2.0/menu.c:872 client/gui-win32/menu.c:365
msgid "Build Airbas_e"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:1514
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:1559
#: client/gui-win32/menu.c:366
msgid "Clean _Pollution"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:845 client/gui-win32/menu.c:367
+#: client/gui-gtk-2.0/menu.c:876 client/gui-win32/menu.c:367
msgid "Clean _Nuclear Fallout"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:849 client/gui-win32/menu.c:369
+#: client/gui-gtk-2.0/menu.c:880 client/gui-win32/menu.c:369
msgid "_Sentry"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:855 client/gui-win32/menu.c:372
+#: client/gui-gtk-2.0/menu.c:886 client/gui-win32/menu.c:372
msgid "Make _Homecity"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:857 client/gui-win32/menu.c:373
+#: client/gui-gtk-2.0/menu.c:888 client/gui-win32/menu.c:373
msgid "_Load"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:859
+#: client/gui-gtk-2.0/menu.c:890
msgid "_Unload Transporter"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:861 client/gui-win32/menu.c:374
+#: client/gui-gtk-2.0/menu.c:892 client/gui-win32/menu.c:374
msgid "_Unload"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:863 client/gui-win32/menu.c:375
+#: client/gui-gtk-2.0/menu.c:894 client/gui-win32/menu.c:375
msgid "Wake up o_thers"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:867
+#: client/gui-gtk-2.0/menu.c:898
msgid "_Auto Settler"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:869 client/gui-win32/menu.c:378
+#: client/gui-gtk-2.0/menu.c:900 client/gui-win32/menu.c:378
msgid "Auto E_xplore"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906
msgid "_Connect"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:871 client/gui-win32/menu.c:380
+#: client/gui-gtk-2.0/menu.c:902 client/gui-win32/menu.c:380
msgid "_Road"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:873 client/gui-win32/menu.c:381
+#: client/gui-gtk-2.0/menu.c:904 client/gui-win32/menu.c:381
msgid "Rai_l"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:875 client/gui-win32/menu.c:382
+#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:382
msgid "_Irrigate"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
msgid "Go _to"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
msgid "_Build city"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:879
+#: client/gui-gtk-2.0/menu.c:910
msgid "Patrol (_Q)"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:881 client/gui-win32/menu.c:385
+#: client/gui-gtk-2.0/menu.c:912 client/gui-win32/menu.c:385
msgid "_Go to"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:883
+#: client/gui-gtk-2.0/menu.c:914
msgid "Go\\/Airlift to City"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:885 client/gui-sdl/menu.c:450
+#: client/gui-gtk-2.0/menu.c:916 client/gui-sdl/menu.c:450
#: client/gui-win32/menu.c:387 client/gui-xaw/menu.c:203
msgid "Return to nearest city"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:889 client/gui-win32/menu.c:389
+#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:389
#: client/gui-xaw/menu.c:205
msgid "Disband Unit"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:891 client/gui-sdl/citydlg.c:532
+#: client/gui-gtk-2.0/menu.c:922 client/gui-sdl/citydlg.c:532
#: data/Freeciv.in:1186
msgid "Upgrade unit"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:893
+#: client/gui-gtk-2.0/menu.c:924
msgid "Diplomat\\/Spy Actions"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:895 client/gui-sdl/menu.c:399
+#: client/gui-gtk-2.0/menu.c:926 client/gui-sdl/menu.c:399
#: client/gui-win32/menu.c:391 client/gui-xaw/menu.c:209
msgid "Explode Nuclear"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:899
-msgid "Select same type"
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/cityrep.c:882
+msgid "Select"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:934
+msgid "Single"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:936
+msgid "Same Type On Tile"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:901 client/gui-win32/menu.c:393
+#: client/gui-gtk-2.0/menu.c:938
+msgid "All On Tile"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:940
+msgid "Same Type On Continent"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:942
+msgid "Same Type Everywhere"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:393
msgid "_Wait"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:903 client/gui-win32/menu.c:394
+#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:394
#: client/gui-xaw/menu.c:213
msgid "Done"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:398
+#: client/gui-gtk-2.0/menu.c:949 client/gui-win32/menu.c:398
msgid "_Reports"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:908 client/gui-gtk-2.0/menu.c:910
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:914
-#: client/gui-gtk-2.0/menu.c:916 client/gui-gtk-2.0/menu.c:918
-#: client/gui-gtk-2.0/menu.c:920 client/gui-gtk-2.0/menu.c:922
-#: client/gui-gtk-2.0/menu.c:924 client/gui-gtk-2.0/menu.c:926
-#: client/gui-gtk-2.0/menu.c:928 client/gui-gtk-2.0/menu.c:930
-#: client/gui-gtk-2.0/menu.c:932 data/Freeciv.in:2030
+#: client/gui-gtk-2.0/menu.c:951 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:957
+#: client/gui-gtk-2.0/menu.c:959 client/gui-gtk-2.0/menu.c:961
+#: client/gui-gtk-2.0/menu.c:963 client/gui-gtk-2.0/menu.c:965
+#: client/gui-gtk-2.0/menu.c:967 client/gui-gtk-2.0/menu.c:969
+#: client/gui-gtk-2.0/menu.c:971 client/gui-gtk-2.0/menu.c:973
+#: client/gui-gtk-2.0/menu.c:975 data/Freeciv.in:2030
msgid "Reports"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:958
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:1001
#: client/gui-win32/menu.c:400 client/gui-win32/menu.c:425
msgid "_Units"
msgstr ""
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/menu.c:914 client/gui-win32/menu.c:402
+#: client/gui-gtk-2.0/menu.c:957 client/gui-win32/menu.c:402
msgid "_Nations"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:918 client/gui-win32/menu.c:403
+#: client/gui-gtk-2.0/menu.c:961 client/gui-win32/menu.c:403
msgid "_Economy"
msgstr ""
#. TRANS: Research report action
-#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:405
+#: client/gui-gtk-2.0/menu.c:963 client/gui-win32/menu.c:405
msgid "_Research"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:924 client/gui-win32/menu.c:407
+#: client/gui-gtk-2.0/menu.c:967 client/gui-win32/menu.c:407
msgid "_Wonders of the World"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:926 client/gui-win32/menu.c:408
+#: client/gui-gtk-2.0/menu.c:969 client/gui-win32/menu.c:408
msgid "_Top Five Cities"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:928 client/gui-win32/menu.c:409
+#: client/gui-gtk-2.0/menu.c:971 client/gui-win32/menu.c:409
msgid "_Messages"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:930 client/gui-win32/menu.c:410
+#: client/gui-gtk-2.0/menu.c:973 client/gui-win32/menu.c:410
msgid "_Demographics"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:932 client/gui-gtk-2.0/plrdlg.c:471
+#: client/gui-gtk-2.0/menu.c:975 client/gui-gtk-2.0/plrdlg.c:354
#: client/gui-win32/menu.c:411
msgid "_Spaceship"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:936 client/gui-win32/menu.c:415
+#: client/gui-gtk-2.0/menu.c:979 client/gui-win32/menu.c:415
msgid "_Help"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
-#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
-#: client/gui-gtk-2.0/menu.c:946 client/gui-gtk-2.0/menu.c:948
-#: client/gui-gtk-2.0/menu.c:950 client/gui-gtk-2.0/menu.c:952
-#: client/gui-gtk-2.0/menu.c:954 client/gui-gtk-2.0/menu.c:956
-#: client/gui-gtk-2.0/menu.c:958 client/gui-gtk-2.0/menu.c:960
-#: client/gui-gtk-2.0/menu.c:962 client/gui-gtk-2.0/menu.c:964
-#: client/gui-gtk-2.0/menu.c:966 client/gui-gtk-2.0/menu.c:968
-#: client/gui-gtk-2.0/menu.c:970 client/gui-gtk-2.0/menu.c:972
-#: client/gui-gtk-2.0/menu.c:974 client/gui-gtk-2.0/menu.c:976
-#: client/gui-gtk-2.0/menu.c:978 client/gui-gtk-2.0/menu.c:980
+#: client/gui-gtk-2.0/menu.c:981 client/gui-gtk-2.0/menu.c:983
+#: client/gui-gtk-2.0/menu.c:985 client/gui-gtk-2.0/menu.c:987
+#: client/gui-gtk-2.0/menu.c:989 client/gui-gtk-2.0/menu.c:991
+#: client/gui-gtk-2.0/menu.c:993 client/gui-gtk-2.0/menu.c:995
+#: client/gui-gtk-2.0/menu.c:997 client/gui-gtk-2.0/menu.c:999
+#: client/gui-gtk-2.0/menu.c:1001 client/gui-gtk-2.0/menu.c:1003
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-gtk-2.0/menu.c:1007
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-gtk-2.0/menu.c:1011
+#: client/gui-gtk-2.0/menu.c:1013 client/gui-gtk-2.0/menu.c:1015
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-gtk-2.0/menu.c:1019
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-gtk-2.0/menu.c:1023
#: client/gui-gtk-2.0/repodlgs.c:313 client/gui-win32/citydlg.c:1077
#: client/gui-win32/repodlgs.c:289 client/gui-win32/wldlg.c:846
#: data/Freeciv.in:1466 data/Freeciv.in:2031 data/Freeciv.in:2101
@@ -11169,119 +11367,119 @@ msgstr ""
msgid "Help"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:940 client/gui-win32/menu.c:416
+#: client/gui-gtk-2.0/menu.c:983 client/gui-win32/menu.c:416
msgid "Language_s"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/menu.c:417
+#: client/gui-gtk-2.0/menu.c:985 client/gui-win32/menu.c:417
msgid "Co_nnecting"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:418
+#: client/gui-gtk-2.0/menu.c:987 client/gui-win32/menu.c:418
msgid "C_ontrols"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:419
+#: client/gui-gtk-2.0/menu.c:989 client/gui-win32/menu.c:419
msgid "C_hatline"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:948 client/gui-win32/menu.c:420
+#: client/gui-gtk-2.0/menu.c:991 client/gui-win32/menu.c:420
msgid "_Worklist Editor"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:950 client/gui-win32/menu.c:421
+#: client/gui-gtk-2.0/menu.c:993 client/gui-win32/menu.c:421
msgid "Citizen _Management"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:952 client/gui-win32/menu.c:422
+#: client/gui-gtk-2.0/menu.c:995 client/gui-win32/menu.c:422
msgid "_Playing"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:956 client/gui-win32/menu.c:424
+#: client/gui-gtk-2.0/menu.c:999 client/gui-win32/menu.c:424
msgid "City _Improvements"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:960 client/gui-win32/menu.c:426
+#: client/gui-gtk-2.0/menu.c:1003 client/gui-win32/menu.c:426
msgid "Com_bat"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:962 client/gui-win32/menu.c:427
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-win32/menu.c:427
msgid "_ZOC"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:964 client/gui-win32/menu.c:428
+#: client/gui-gtk-2.0/menu.c:1007 client/gui-win32/menu.c:428
msgid "Techno_logy"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:966 client/gui-win32/menu.c:429
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-win32/menu.c:429
msgid "_Terrain"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:968 client/gui-win32/menu.c:430
+#: client/gui-gtk-2.0/menu.c:1011 client/gui-win32/menu.c:430
msgid "Won_ders"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:972 client/gui-win32/menu.c:432
+#: client/gui-gtk-2.0/menu.c:1015 client/gui-win32/menu.c:432
msgid "Happin_ess"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:974 client/gui-win32/menu.c:433
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-win32/menu.c:433
msgid "Space _Race"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:978 client/gui-win32/menu.c:435
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-win32/menu.c:435
msgid "_Copying"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:980 client/gui-win32/menu.c:436
+#: client/gui-gtk-2.0/menu.c:1023 client/gui-win32/menu.c:436
msgid "_About"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:1264
+#: client/gui-gtk-2.0/menu.c:1307
#, c-format
msgid "%s..."
msgstr ""
-#: client/gui-gtk-2.0/menu.c:1352
+#: client/gui-gtk-2.0/menu.c:1397
#, c-format
msgid "Change to %s (_I)"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:1353
+#: client/gui-gtk-2.0/menu.c:1398
#, c-format
msgid "Change to %s (_M)"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:1354
+#: client/gui-gtk-2.0/menu.c:1399
#, c-format
msgid "Transf_orm to %s"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:1427
+#: client/gui-gtk-2.0/menu.c:1472
msgid "Help _Build Wonder"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:1441
+#: client/gui-gtk-2.0/menu.c:1486
msgid "Add to City (_B)"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:1449
+#: client/gui-gtk-2.0/menu.c:1494
msgid "Make Trade _Route"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:1463
+#: client/gui-gtk-2.0/menu.c:1508
msgid "Build _Railroad"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:1486
+#: client/gui-gtk-2.0/menu.c:1531
msgid "Bu_ild Farmland"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:1506
+#: client/gui-gtk-2.0/menu.c:1551
msgid "_Fortify"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:1512
+#: client/gui-gtk-2.0/menu.c:1557
msgid "_Paradrop"
msgstr ""
@@ -11313,13 +11511,29 @@ msgstr ""
msgid "Pop"
msgstr ""
-#: client/gui-gtk-2.0/messagewin.c:155 client/gui-sdl/messagewin.c:247
+#: client/gui-gtk-2.0/messagewin.c:186 client/gui-sdl/messagewin.c:247
#: client/gui-win32/messagewin.c:132 client/gui-xaw/menu.c:228
#: data/Freeciv.in:3273 data/Freeciv.in:3274 data/Freeciv.in:3283
msgid "Messages"
msgstr ""
-#: client/gui-gtk-2.0/plrdlg.c:330
+#: client/gui-gtk-2.0/plrdlg.c:317
+msgid "_Meet"
+msgstr ""
+
+#: client/gui-gtk-2.0/plrdlg.c:323
+msgid "Cancel _Treaty"
+msgstr ""
+
+#: client/gui-gtk-2.0/plrdlg.c:329
+msgid "_Withdraw Vision"
+msgstr ""
+
+#: client/gui-gtk-2.0/plrdlg.c:348
+msgid "_Report"
+msgstr ""
+
+#: client/gui-gtk-2.0/plrdlg.c:386
msgid "?show:Dead Players"
msgstr ""
@@ -11327,264 +11541,266 @@ msgstr ""
#. TRANS: Nations report action
#. TRANS: Nations report title
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/plrdlg.c:350 client/gui-sdl/mapctrl.c:1580
+#: client/gui-gtk-2.0/plrdlg.c:406 client/gui-sdl/mapctrl.c:1580
#: client/gui-sdl/plrdlg.c:608 client/gui-win32/plrdlg.c:344
#: client/gui-xaw/menu.c:221 data/Freeciv.in:3192 data/Freeciv.in:3193
msgid "Nations"
msgstr ""
-#: client/gui-gtk-2.0/plrdlg.c:443
-msgid "_Intelligence"
-msgstr ""
-
-#: client/gui-gtk-2.0/plrdlg.c:450
-msgid "_Meet"
-msgstr ""
-
-#: client/gui-gtk-2.0/plrdlg.c:457
-msgid "Cancel _Treaty"
+#: client/gui-gtk-2.0/plrdlg.c:511
+msgid "Di_plomacy"
msgstr ""
-#: client/gui-gtk-2.0/plrdlg.c:464
-msgid "_Withdraw vision"
+#: client/gui-gtk-2.0/plrdlg.c:516
+msgid "_Intelligence"
msgstr ""
-#: client/gui-gtk-2.0/plrdlg.c:495
+#: client/gui-gtk-2.0/plrdlg.c:526
msgid "_AI"
msgstr ""
-#: client/gui-gtk-2.0/plrdlg.c:501
+#: client/gui-gtk-2.0/plrdlg.c:532
msgid "_Toggle AI Mode"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:208
+#: client/gui-gtk-2.0/pages.c:221
msgid "Start _New Game"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:214
+#: client/gui-gtk-2.0/pages.c:227
msgid "Start _Scenario Game"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:220
+#: client/gui-gtk-2.0/pages.c:233
msgid "_Load Saved Game"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:229
+#: client/gui-gtk-2.0/pages.c:239
msgid "C_onnect to Network Game"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:236
+#: client/gui-gtk-2.0/pages.c:247
msgid "Connect to Gaming _Zone"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:300
#: client/gui-xaw/connectdlg.c:326
msgid "Passwords don't match, enter password."
msgstr ""
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:779 client/gui-gtk-2.0/pages.c:820
+#: client/gui-win32/connectdlg.c:916
msgid "Server Name"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
+#: 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
+#: data/Freeciv.in:96
msgid "Port"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
+#: client/gui-win32/connectdlg.c:917
msgid "Version"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
-#: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
+#: 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
msgid "Status"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
-#: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
+#: 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
msgid "Players"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
+#: client/gui-win32/connectdlg.c:918
msgid "Comment"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:747
+#: client/gui-gtk-2.0/pages.c:786
msgid "Local _Area Network"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:783
+#: client/gui-gtk-2.0/pages.c:827
msgid "Internet _Metaserver"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:817
+#: client/gui-gtk-2.0/pages.c:864
msgid "_Host:"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:834
+#: client/gui-gtk-2.0/pages.c:881
msgid "_Port:"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:851
+#: client/gui-gtk-2.0/pages.c:898
msgid "_Login:"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:869
+#: client/gui-gtk-2.0/pages.c:916
msgid "Pass_word:"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:887
+#: client/gui-gtk-2.0/pages.c:934
msgid "Conf_irm Password:"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:912
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: 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/wldlg.c:800 client/gui-win32/wldlg.c:806
+msgid "Type"
+msgstr ""
+
+#: client/gui-gtk-2.0/pages.c:952 client/gui-win32/plrdlg.c:337
+#: data/Freeciv.in:88
+msgid "Host"
+msgstr ""
+
+#: client/gui-gtk-2.0/pages.c:981
msgid "C_onnect"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1142
+#: client/gui-gtk-2.0/pages.c:1211
#, c-format
msgid "Connection name: %s"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1145
+#: client/gui-gtk-2.0/pages.c:1214
#, c-format
msgid "Player name: %s"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1150
+#: client/gui-gtk-2.0/pages.c:1219
#, c-format
msgid "Host: %s"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1158
+#: client/gui-gtk-2.0/pages.c:1227
msgid "Player/conn info"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1185
+#: client/gui-gtk-2.0/pages.c:1254
#, c-format
msgid "%s info"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1196
+#: client/gui-gtk-2.0/pages.c:1265
msgid "Toggle player ready"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1204
+#: client/gui-gtk-2.0/pages.c:1273
msgid "Pick nation"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1214
+#: client/gui-gtk-2.0/pages.c:1283
msgid "Observe this player"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1221
+#: client/gui-gtk-2.0/pages.c:1290
msgid "Take this player"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1238
+#: client/gui-gtk-2.0/pages.c:1307
msgid "Cut connection"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1248
+#: client/gui-gtk-2.0/pages.c:1317
msgid "Aitoggle player"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1257
+#: client/gui-gtk-2.0/pages.c:1326
msgid "Remove player"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1268
+#: client/gui-gtk-2.0/pages.c:1337
msgid "Give info access"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1276
+#: client/gui-gtk-2.0/pages.c:1345
msgid "Give ctrl access"
msgstr ""
#. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1338
+#: client/gui-gtk-2.0/pages.c:1407
#, c-format
msgid "Put on %s"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1442
+#: client/gui-gtk-2.0/pages.c:1511
msgid "Number of _Players (including AI):"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1465
+#: client/gui-gtk-2.0/pages.c:1534
msgid "AI Skill _Level:"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1481
+#: client/gui-gtk-2.0/pages.c:1550
msgid "Ruleset _Version:"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
msgid "_More Game Options..."
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1514
+#: client/gui-gtk-2.0/pages.c:1583
msgid "Record"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1519
+#: client/gui-gtk-2.0/pages.c:1588
msgid "Rating"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1525
+#: client/gui-gtk-2.0/pages.c:1594
msgid "Ready"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
-#: data/nation/slovakian.ruleset:26
-msgid "Leader"
+#: client/gui-gtk-2.0/pages.c:1601
+msgid "?player:Leader"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1732 client/gui-sdl/chatline.c:185
msgid "Choose Saved Game to Load"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1752
+#: client/gui-gtk-2.0/pages.c:1824
msgid "Choose Saved Game to _Load:"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
-#: client/gui-gtk-2.0/pages.c:2375
+#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
+#: client/gui-gtk-2.0/pages.c:2451
msgid "_Browse..."
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1839
+#: client/gui-gtk-2.0/pages.c:1911
msgid "Choose a Scenario"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1926
+#: client/gui-gtk-2.0/pages.c:1998
msgid "Choose a _Scenario:"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
-#: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
-#: client/gui-win32/wldlg.c:806
-msgid "Type"
-msgstr ""
-
-#: client/gui-gtk-2.0/pages.c:2101
+#: client/gui-gtk-2.0/pages.c:2173
msgid "Choose a _nation to play:"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2363 client/gui-win32/menu.c:581
msgid "Select Location to Save"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:2372 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2448 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:2413
+#: client/gui-gtk-2.0/pages.c:2489
msgid "Saved _Games:"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:2440
+#: client/gui-gtk-2.0/pages.c:2516
msgid "Save _Filename:"
msgstr ""
@@ -11915,7 +12131,7 @@ msgstr ""
msgid "Total users logged in : %d"
msgstr ""
-#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1094
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
msgid "Back"
msgstr ""
@@ -11924,7 +12140,7 @@ msgid "Start"
msgstr ""
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:775
+#: client/gui-win32/connectdlg.c:777
msgid "Load Game"
msgstr ""
@@ -11961,12 +12177,12 @@ msgid "Make new homecity"
msgstr ""
#: client/gui-sdl/citydlg.c:546 client/gui-sdl/citydlg.c:1418
-#: client/gui-sdl/connectdlg.c:307 client/gui-sdl/connectdlg.c:616
-#: client/gui-sdl/connectdlg.c:802 client/gui-sdl/connectdlg.c:984
+#: 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/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1039
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
#: 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
@@ -12009,7 +12225,7 @@ msgstr ""
#: client/gui-sdl/diplodlg.c:1335 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:2427
+#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
#: client/gui-xaw/cityrep.c:666 client/gui-xaw/cma_fe.c:327
#: client/gui-xaw/cma_fe.c:511 client/gui-xaw/cma_fe.c:765
#: client/gui-xaw/messagedlg.c:72 client/gui-xaw/optiondlg.c:76
@@ -12025,7 +12241,7 @@ msgstr ""
#: client/gui-sdl/diplodlg.c:1345 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:2427 client/gui-xaw/cityrep.c:666
+#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
#: client/gui-xaw/cma_fe.c:327 client/gui-xaw/cma_fe.c:511
#: client/gui-xaw/cma_fe.c:765 client/gui-xaw/messagedlg.c:72
#: client/gui-xaw/optiondlg.c:76 client/gui-xaw/optiondlg.c:304
@@ -12298,36 +12514,36 @@ msgstr ""
msgid "Release city"
msgstr ""
-#: client/gui-sdl/connectdlg.c:238
+#: client/gui-sdl/connectdlg.c:239
msgid "Creating Server List..."
msgstr ""
-#: client/gui-sdl/connectdlg.c:279 client/gui-sdl/connectdlg.c:343
+#: client/gui-sdl/connectdlg.c:280 client/gui-sdl/connectdlg.c:344
msgid "No LAN servers found"
msgstr ""
-#: client/gui-sdl/connectdlg.c:281 client/gui-sdl/connectdlg.c:345
+#: client/gui-sdl/connectdlg.c:282 client/gui-sdl/connectdlg.c:346
msgid "No public servers found"
msgstr ""
-#: client/gui-sdl/connectdlg.c:555
+#: client/gui-sdl/connectdlg.c:556
msgid "Player Name :"
msgstr ""
-#: client/gui-sdl/connectdlg.c:571
+#: client/gui-sdl/connectdlg.c:572
msgid "Freeciv Server :"
msgstr ""
-#: client/gui-sdl/connectdlg.c:588
+#: client/gui-sdl/connectdlg.c:589
msgid "Port :"
msgstr ""
-#: client/gui-sdl/connectdlg.c:608 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr ""
-#: client/gui-sdl/connectdlg.c:794 client/gui-sdl/connectdlg.c:977
+#: client/gui-sdl/connectdlg.c:795 client/gui-sdl/connectdlg.c:978
#: client/gui-xaw/connectdlg.c:145
msgid "Next"
msgstr ""
@@ -12604,7 +12820,7 @@ msgstr ""
#: client/gui-sdl/graphics.c:1021
#, c-format
-msgid "Unable to initialize SDL_ttf library: %s"
+msgid "Unable to initialize SDL_ttf library: %s"
msgstr ""
#: client/gui-sdl/graphics.c:1058
@@ -12689,12 +12905,6 @@ msgstr ""
msgid "Waiting for the beginning of the game"
msgstr ""
-#: client/gui-sdl/gui_string.c:608
-msgid ""
-"Couldn't find stdfont.ttf file. Please link/copy/move anyunicode ttf font to "
-"data dir as stdfont.ttf"
-msgstr ""
-
#. TRANS: Future Technology
#: client/gui-sdl/gui_tilespec.c:506
msgid "FT"
@@ -13254,12 +13464,12 @@ msgid "Leave Game"
msgstr ""
#: client/gui-sdl/optiondlg.c:2302 client/gui-sdl/pages.c:255
-#: client/gui-win32/connectdlg.c:1098 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1100 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:963
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
msgid "Start New Game"
msgstr ""
@@ -13367,8 +13577,8 @@ msgstr ""
msgid "%s max rate : %d%%"
msgstr ""
-#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1081
-#: client/gui-win32/connectdlg.c:1089 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
+#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
msgid "Update"
msgstr ""
@@ -13786,10 +13996,6 @@ msgstr ""
msgid "Refresh"
msgstr ""
-#: client/gui-win32/cityrep.c:882
-msgid "Select"
-msgstr ""
-
#: client/gui-win32/cityrep.c:883
msgid "Configure"
msgstr ""
@@ -13839,55 +14045,55 @@ msgstr ""
msgid "Verify Password"
msgstr ""
-#: client/gui-win32/connectdlg.c:912 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr ""
-#: client/gui-win32/connectdlg.c:913
+#: client/gui-win32/connectdlg.c:915
msgid "Local Area Network"
msgstr ""
-#: client/gui-win32/connectdlg.c:947
+#: client/gui-win32/connectdlg.c:949
msgid "Welcome to Freeciv"
msgstr ""
-#: client/gui-win32/connectdlg.c:965
+#: client/gui-win32/connectdlg.c:967
msgid "Load Saved Game"
msgstr ""
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
msgid "Connect To Network Game"
msgstr ""
-#: client/gui-win32/connectdlg.c:977
+#: client/gui-win32/connectdlg.c:979
msgid "Choose a nation to play"
msgstr ""
-#: client/gui-win32/connectdlg.c:1012
+#: client/gui-win32/connectdlg.c:1014
msgid "Number of players (Including AI):"
msgstr ""
-#: client/gui-win32/connectdlg.c:1020
+#: client/gui-win32/connectdlg.c:1022
msgid "AI skill level:"
msgstr ""
-#: client/gui-win32/connectdlg.c:1034 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
msgid "Game Options"
msgstr ""
-#: client/gui-win32/connectdlg.c:1038
+#: client/gui-win32/connectdlg.c:1040
msgid "Start Game"
msgstr ""
-#: client/gui-win32/connectdlg.c:1057
+#: client/gui-win32/connectdlg.c:1059
msgid "Login:"
msgstr ""
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
msgid "Host:"
msgstr ""
-#: client/gui-win32/connectdlg.c:1060
+#: client/gui-win32/connectdlg.c:1062
msgid "Port:"
msgstr ""
@@ -14135,10 +14341,6 @@ msgid_plural "(idle %d turns)"
msgstr[0] ""
msgstr[1] ""
-#: client/gui-win32/plrdlg.c:337 data/Freeciv.in:88
-msgid "Host"
-msgstr ""
-
#: client/gui-win32/plrdlg.c:355 data/Freeciv.in:3230
msgid "Intelligence"
msgstr ""
@@ -15553,12 +15755,12 @@ msgstr ""
#: data/helpdata.txt:781
msgid ""
-" To have a diplomatic relationship with another player, you must fist "
-"establish first contact with that player. To establish first contact, you "
-"have to move one of your units next to a city or unit belonging to that "
-"player, or vice versa. Unless you establish an embassy with that player, you "
-"may again lose contact with them after a set number of turns without direct "
-"physical contact."
+" To have a diplomatic relationship with another player, you must first "
+"establish contact with that player. To establish contact, you have to move "
+"one of your units next to a city or unit belonging to that player, or vice "
+"versa. Unless you establish an embassy with that player, you may again lose "
+"contact with them after a set number of turns without direct physical "
+"contact."
msgstr ""
#: data/helpdata.txt:788
@@ -17661,7 +17863,7 @@ msgid "Communism"
msgstr ""
#: data/default/governments.ruleset:121 data/civ2/governments.ruleset:118
-#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:26
+#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:27
msgid "Comrade"
msgstr ""
@@ -18528,6 +18730,10 @@ msgid ""
"attacks."
msgstr ""
+#: data/default/units.ruleset:238
+msgid "?unit:Workers"
+msgstr ""
+
#: data/default/units.ruleset:264
msgid ""
"Workers are one of the key units in the game. They can be used to irrigate "
@@ -19086,6 +19292,10 @@ msgstr ""
msgid "Explorers are very useful for mapping unknown territory."
msgstr ""
+#: data/default/units.ruleset:1864
+msgid "?unit:Leader"
+msgstr ""
+
#: data/default/units.ruleset:1892
msgid "This is you. If you lose this unit, you lose the game. So don't."
msgstr ""
@@ -19283,7 +19493,7 @@ msgid "Emir"
msgstr ""
#: data/nation/afghani.ruleset:25 data/nation/slovakian.ruleset:30
-#: data/nation/soviet.ruleset:27
+#: data/nation/soviet.ruleset:28
msgid "General Secretary"
msgstr ""
@@ -19398,7 +19608,7 @@ msgstr ""
msgid ""
"According to legend, the Armenian people are the descendants of Haik - the "
"great-great-grandson of Noah. The modern Republic of Armenia gained "
-"independence from Soviet in 1991 AD"
+"independence from the Soviet Union in 1991."
msgstr ""
#: data/nation/assyrian.ruleset:3
@@ -20345,12 +20555,11 @@ msgstr ""
#: data/nation/illyrian.ruleset:6
msgid ""
-"Illyrians were Indo-European tribes who appeared in the western part of the "
-"Balkan Peninsula before 1000 BC, including the Dalmatians to the north, "
-"Corcyra island and Ambracia bay in prehistoric Epirus to the south, mixing "
-"with Thracians in Dardania to the east, and settling Messapia across the "
-"Adriatic Sea. Illyrian kingdoms were independent for centuries, until "
-"conquered by the Roman Republic."
+"Illyrians were Indo-European tribes who appeared in the western part of the "
+"Balkan Peninsula before 1000 BC, including Corcyra island and Ambracia bay "
+"in prehistoric Epirus to the south. They mixed with Thracians in Dardania to "
+"the east, and settled Messapia across the Adriatic Sea. Illyrian kingdoms "
+"were independent for centuries, until conquered by the Roman Republic."
msgstr ""
#: data/nation/inca.ruleset:3
@@ -20636,7 +20845,7 @@ msgid ""
"1953."
msgstr ""
-#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:28
+#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:29
msgid "Great Leader"
msgstr ""
@@ -20793,9 +21002,9 @@ msgstr ""
msgid ""
"Sub-Saharan Africa has been a cultural and ethnical melting pot for "
"millennia. In medieval times, the region was home to a succession of empires "
-"called the Sahelian kingdoms. Of these, the Islamic Mali empire with it's "
+"called the Sahelian kingdoms. Of these, the Islamic Mali empire with its "
"capital in Timbuktu was the most influential. This empire reigned from the "
-"14th to the 17th century and was famed for it's wealth and benevolent kings. "
+"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 ""
@@ -20855,8 +21064,8 @@ msgstr ""
#: data/nation/mayan.ruleset:6
msgid ""
-"The Mayans were a Mesoamerican civilization. Famous for building great "
-"pyramids and palaces in the jungle."
+"The Mayans were a Mesoamerican civilization. They are famous for building "
+"great pyramids and palaces in the jungle."
msgstr ""
#: data/nation/mayan.ruleset:19
@@ -21342,6 +21551,14 @@ msgid ""
"Czechoslovakia, until 1918 it was part of the Austro-Hungarian Empire."
msgstr ""
+#: data/nation/slovakian.ruleset:26
+msgid "?male:Leader"
+msgstr ""
+
+#: data/nation/slovakian.ruleset:26
+msgid "?female:Leader"
+msgstr ""
+
#: data/nation/slovakian.ruleset:29
msgid "Pope"
msgstr ""
@@ -21380,11 +21597,12 @@ msgstr ""
#: data/nation/soviet.ruleset:6
msgid ""
-"Soviet Union's history starts in November 1917, when under Lenin's "
+"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 "
-"republics integrated into one country. Soviet Union became one of most "
-"powerful states in the 20th century. But by the end of 1991 due to many "
-"social shocks it disintegrated into fifteen independent countries"
+"republics integrated into one country. The Soviet Union became one of most "
+"powerful states in the 20th century, but by the end of 1991 it had "
+"disintegrated into fifteen independent countries due to social and economic "
+"problems."
msgstr ""
#: data/nation/spanish.ruleset:3
@@ -21751,8 +21969,8 @@ msgstr ""
#: data/nation/westphalian.ruleset:6
msgid ""
-"Westphalia, before becoming a Prussian province, was the western region the "
-"duchy of Saxony. Present-day it consists of the Northern part of the largest "
+"Westphalia, before becoming a Prussian province, was the western region of "
+"the duchy of Saxony. Today it makes up the northern part of the largest "
"German federal state, North Rhine-Westphalia."
msgstr ""
@@ -21897,7 +22115,7 @@ msgid ""
"The flag and background color indicate what civilization the city\n"
"belongs to (this will be useful when you meet other civilizations).\n"
"The top row of the bar also shows the name and size of the city, and\n"
-"will show one or more starts to indicate if there are units in the\n"
+"will show one or more stars to indicate if there are units in the\n"
"city. The bottom row shows what the city is building, and how long it\n"
"will take; it also shows how long the city will take to grow to the\n"
"next largest size."
@@ -21953,7 +22171,7 @@ msgid ""
"Now your city has grown to size five. As cities get larger unrest\n"
"becomes a problem. A city of this size will usually have one unhappy\n"
"citizen unless pacifying effects are used; meaning one entertainer\n"
-"specialist is required to keep your citzens content. This is basically\n"
+"specialist is required to keep your citizens content. This is basically\n"
"a wasted citizen.\n"
"\n"
"There are several things that can be done about this. One quick fix\n"
@@ -22025,7 +22243,7 @@ msgid ""
"existing cities. Generally when building new cities you want to make\n"
"sure that all tiles are covered by at least one city, but after that\n"
"it is best that your cities overlap as little as possible. Spreading\n"
-"out cities properly gives each city access to more resrouces, allowing\n"
+"out cities properly gives each city access to more resources, allowing\n"
"them to grow to larger sizes."
msgstr ""
diff --git a/po/he.gmo b/po/he.gmo
index d4ab8e0..810a2b1 100644
Binary files a/po/he.gmo and b/po/he.gmo differ
diff --git a/po/he.po b/po/he.po
index cb8bfbc..2c4c53a 100644
--- a/po/he.po
+++ b/po/he.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: he\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 07:45+0900\n"
+"POT-Creation-Date: 2009-03-29 21:13+0900\n"
"PO-Revision-Date: 2007-08-12 15:15+0300\n"
"Last-Translator: Chen Levy <contrib at chenlevy.com>\n"
"Language-Team: Hebrew <kde-il at yahoogroups.com>\n"
@@ -638,7 +638,7 @@ msgid "Road"
msgstr "דרך"
#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
-#: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
+#: client/gui-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"
@@ -655,7 +655,7 @@ msgid "Mine"
msgstr "מכרה"
#: common/terrain.c:396 common/unit.c:548 server/report.c:124
-#: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
+#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr "זיהו×"
@@ -701,7 +701,7 @@ msgstr "מבוצר"
msgid "Sentry"
msgstr "חיל־משמר"
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:851 client/gui-sdl/menu.c:648
+#: common/unit.c:566 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 "ביזה"
@@ -718,7 +718,7 @@ msgstr "גלה ×רץ"
msgid "Transform"
msgstr "המרה"
-#: common/unit.c:584 client/text.c:106 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:584 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 "×œ× ×™×“×•×¢"
@@ -791,11 +791,11 @@ msgstr "יחידה ×’×¨×¢×™× ×™×ª"
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1406
+#: common/unittype.c:349 client/helpdata.c:1404
msgid " and "
msgstr "וג×"
-#: common/unittype.c:355 client/helpdata.c:1392
+#: common/unittype.c:355 client/helpdata.c:1390
msgid "?and:, "
msgstr "?וג×:,"
@@ -1349,103 +1349,98 @@ msgstr ""
#: server/auth.c:281
#, fuzzy, c-format
-msgid "Auth config filename \"%s\" not allowed!"
-msgstr "×©× ×–×” ×סור."
-
-#: server/auth.c:286
-#, fuzzy, c-format
msgid "Cannot load auth config file \"%s\"!"
msgstr "×ין ×פשרות לטעון קובץ תסריט ×§×‘×•×¦×ªÖ¾×—×•×§×™× \"%s\"."
-#: server/auth.c:397
+#: server/auth.c:392
#, c-format
msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
msgstr ""
-#: server/auth.c:404
+#: server/auth.c:399
msgid "Guests are not allowed on this server. Sorry."
msgstr ""
-#: server/auth.c:406
+#: server/auth.c:401
#, c-format
msgid "%s was rejected: Guests not allowed."
msgstr ""
-#: server/auth.c:425
+#: server/auth.c:420
#, c-format
msgid ""
"There was an error reading the user database, logging in as guest connection "
"'%s'."
msgstr ""
-#: server/auth.c:431
+#: server/auth.c:426
msgid ""
"There was an error reading the user database and guest logins are not "
"allowed. Sorry"
msgstr ""
-#: server/auth.c:434
+#: server/auth.c:429
#, c-format
msgid "%s was rejected: Database error and guests not allowed."
msgstr ""
-#: server/auth.c:441
+#: server/auth.c:436
#, c-format
msgid "Enter password for %s:"
msgstr "הזן ססמה עבור %s:"
-#: server/auth.c:450
+#: server/auth.c:445
msgid "Enter a new password (and remember it)."
msgstr "הזן ססמה חדשה (וזכור ×ותה)."
-#: server/auth.c:456
+#: server/auth.c:451
msgid "This server allows only preregistered users. Sorry."
msgstr "שרת ×–×” מתיר רק ×ž×©×ª×ž×©×™× × ×‘×—×¨×™×. סליחה."
-#: server/auth.c:459
+#: server/auth.c:454
#, c-format
msgid "%s was rejected: Only preregister users allowed."
msgstr ""
-#: server/auth.c:488 server/auth.c:547
+#: server/auth.c:483 server/auth.c:542
msgid "Sorry, too many wrong tries..."
msgstr "סליחה, יותר מדי × ×™×¡×™×•× ×•×ª כושלי×..."
-#: server/auth.c:489
+#: server/auth.c:484
#, c-format
msgid "%s was rejected: Too many wrong password verifies for new user."
msgstr ""
-#: server/auth.c:505
+#: server/auth.c:500
msgid ""
"Warning: There was an error in saving to the database. Continuing, but your "
"stats will not be saved."
msgstr ""
-#: server/auth.c:549
+#: server/auth.c:544
#, c-format
msgid "%s was rejected: Too many wrong password tries."
msgstr ""
-#: server/auth.c:558
+#: server/auth.c:553
msgid "Your password is incorrect. Try again."
msgstr "ססמתך שגוייה. × ×¡×” שוב."
-#: server/auth.c:569
+#: server/auth.c:564
msgid "Sorry, your connection timed out..."
msgstr ""
-#: server/auth.c:571
+#: server/auth.c:566
#, c-format
msgid "%s was rejected: Connection timeout waiting for password."
msgstr ""
-#: server/auth.c:636
+#: server/auth.c:631
#, c-format
msgid "Your password is too short, the minimum length is %d. Try again."
msgstr ""
-#: server/auth.c:642
+#: server/auth.c:637
#, c-format
msgid ""
"The password must have at least %d capital letters, %d numbers, and be at "
@@ -1927,7 +1922,7 @@ msgstr ""
msgid "You can learn a lot about Freeciv at %s"
msgstr ""
-#: server/civserver.c:206 client/civclient.c:237 manual/civmanual.c:380
+#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
@@ -1952,12 +1947,12 @@ msgstr ""
msgid " -b --bind ADDR\tListen for clients on ADDR\n"
msgstr ""
-#: server/civserver.c:217 client/civclient.c:241
+#: server/civserver.c:217 client/civclient.c:242
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:245
+#: server/civserver.c:221 client/civclient.c:246
msgid " -d, --debug NUM\tSet debug log level (0 to 3)\n"
msgstr ""
@@ -1965,7 +1960,7 @@ msgstr ""
msgid " -f, --file FILE\tLoad saved game FILE\n"
msgstr ""
-#: server/civserver.c:225 client/civclient.c:248 manual/civmanual.c:382
+#: server/civserver.c:225 client/civclient.c:249 manual/civmanual.c:382
msgid " -h, --help\t\tPrint a summary of the options\n"
msgstr ""
@@ -2013,11 +2008,11 @@ msgstr ""
msgid " -R, --Ranklog FILE\tUse FILE as ranking logfile\n"
msgstr ""
-#: server/civserver.c:247 client/civclient.c:267 manual/civmanual.c:383
+#: server/civserver.c:247 client/civclient.c:268 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:279
+#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, c-format
@@ -3115,7 +3110,7 @@ msgstr ""
msgid "Sea moving start units are not yet supported. Nobody gets %s."
msgstr ""
-#: server/gamehand.c:310 client/text.c:632
+#: server/gamehand.c:310 client/text.c:691
#, c-format
msgid "Year: %s"
msgstr "×©× ×”: %s"
@@ -3379,8 +3374,8 @@ msgstr ""
#: server/plrhand.c:1686
#, c-format
msgid ""
-"Your nation is thrust into civil war, %s is declared the leader of the "
-"rebel states."
+"Your nation is thrust into civil war! %s is declared the leader of the rebel "
+"states."
msgstr ""
#: server/plrhand.c:1707
@@ -3475,7 +3470,7 @@ msgstr ""
msgid "Literacy"
msgstr "×§×¨×•× ×•×›×ª×•×‘"
-#: server/report.c:121 client/cityrepdata.c:526 client/cityrepdata.c:527
+#: server/report.c:121 client/cityrepdata.c:524 client/cityrepdata.c:525
#: client/gui-sdl/cityrep.c:174
msgid "Production"
msgstr "ייצור"
@@ -3625,7 +3620,7 @@ msgstr " "
msgid "Demography string contains invalid characters. Try \"help demography\"."
msgstr ""
-#: server/report.c:743 server/report.c:766
+#: server/report.c:743 server/report.c:768
msgid "Demographics Report:"
msgstr ""
@@ -3633,10 +3628,12 @@ msgstr ""
msgid "Sorry, the Demographics report is unavailable."
msgstr ""
-#: server/report.c:748
-#, c-format
-msgid "The %s of the %s (%s)"
-msgstr ""
+#. TRANS: <nation adjective> <government name> (<year>).
+#. * E.g. "Polish Despotism (200 AD)".
+#: server/report.c:750
+#, fuzzy, c-format
+msgid "%s %s (%s)"
+msgstr "%s (%s) (רשימת־עבודה)"
#. TRANS: message about an installation error.
#: server/ruleset.c:163
@@ -3683,14 +3680,6 @@ msgstr ""
msgid "%s had invalid nation; changing to %s."
msgstr ""
-#. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4073
-#, c-format
-msgid ""
-"Illegal alliance structure detected: %s alliance to %s reduced to peace "
-"treaty."
-msgstr ""
-
#: server/settings.c:32
msgid "Geological"
msgstr "×’×ולוגי"
@@ -4624,8 +4613,8 @@ msgstr ""
#: server/settings.c:1016
msgid ""
-"Automatically saved games will have name \"<prefix><year>.sav\". This "
-"setting sets the <prefix> part."
+"Automatically saved games will have name \"<prefix>-T<turn>-Y<year>.sav\". "
+"This setting sets the <prefix> part."
msgstr ""
#: server/settings.c:1023
@@ -4639,11 +4628,11 @@ msgid ""
"the game."
msgstr ""
-#: server/sernet.c:147
+#: server/sernet.c:150
msgid "Server cannot read standard input. Ignoring input."
msgstr ""
-#: server/sernet.c:922
+#: server/sernet.c:929
#, c-format
msgid "Server: bad address: [%s:%d]."
msgstr ""
@@ -4762,112 +4751,112 @@ msgid ""
"alliance with both."
msgstr ""
-#: server/srv_main.c:928
+#: server/srv_main.c:961
#, c-format
msgid "Failed saving game as %s"
msgstr ""
-#: server/srv_main.c:930
+#: server/srv_main.c:963
#, c-format
msgid "Game saved as %s"
msgstr ""
-#: server/srv_main.c:962
+#: server/srv_main.c:994
msgid "The game is already running."
msgstr ""
-#: server/srv_main.c:970
+#: server/srv_main.c:1002
#, c-format
msgid "%s lost control cmdlevel on game start. Use voting from now on."
msgstr ""
-#: server/srv_main.c:977
+#: server/srv_main.c:1009
msgid "Starting game."
msgstr ""
-#: server/srv_main.c:1039
+#: server/srv_main.c:1071
#, c-format
msgid "request for unknown report (type %d)"
msgstr ""
-#: server/srv_main.c:1104
+#: server/srv_main.c:1136
#, c-format
msgid "Warning: rejecting old client %s"
msgstr ""
-#: server/srv_main.c:1206
+#: server/srv_main.c:1238
#, c-format
msgid "Got a packet of type %d from a dead or observer player"
msgstr ""
-#: server/srv_main.c:1306
+#: server/srv_main.c:1338
msgid "Please choose a non-blank name."
msgstr ""
-#: server/srv_main.c:1322
+#: server/srv_main.c:1354
msgid "That nation is already in use."
msgstr ""
-#: server/srv_main.c:1338
+#: server/srv_main.c:1370
#, c-format
msgid "Another player already has the name '%s'. Please choose another name."
msgstr ""
-#: server/srv_main.c:1359
+#: server/srv_main.c:1391
msgid "Please choose a name containing only ASCII characters."
msgstr ""
-#: server/srv_main.c:1458
+#: server/srv_main.c:1490
#, c-format
msgid "%s nation is not available in this scenario."
msgstr ""
-#: server/srv_main.c:1464
+#: server/srv_main.c:1496
#, c-format
msgid "%s nation is already in use."
msgstr ""
-#: server/srv_main.c:1482
+#: server/srv_main.c:1514
#, c-format
msgid "%s is the %s ruler %s."
msgstr ""
-#: server/srv_main.c:1538
+#: server/srv_main.c:1570
#, c-format
msgid "Waiting to start game: %d out of %d players are ready to start."
msgstr ""
-#: server/srv_main.c:1582 server/srv_main.c:1586
+#: server/srv_main.c:1614 server/srv_main.c:1618
#, c-format
msgid "%s has been added as %s level AI-controlled player."
msgstr ""
-#: server/srv_main.c:1728
+#: server/srv_main.c:1760
#, c-format
msgid "Player %d"
msgstr "שחקן %d"
-#: server/srv_main.c:1739 server/srv_main.c:1745
+#: server/srv_main.c:1771 server/srv_main.c:1777
#, c-format
msgid "%s rules the %s."
msgstr ""
-#: server/srv_main.c:1910
+#: server/srv_main.c:1942
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
msgstr ""
-#: server/srv_main.c:1961
+#: server/srv_main.c:1993
#, c-format
msgid "Sending info to metaserver [%s]"
msgstr ""
-#: server/srv_main.c:1992
+#: server/srv_main.c:2024
msgid "The game is over..."
msgstr ""
-#: server/srv_main.c:2205
+#: server/srv_main.c:2237
msgid "Now accepting new client connections."
msgstr ""
@@ -5660,24 +5649,24 @@ msgid "Barbarian"
msgstr ""
#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2030 client/gui-sdl/plrdlg.c:645
+#: client/gui-gtk-2.0/pages.c:2102 client/gui-sdl/plrdlg.c:645
#: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
msgid "AI"
msgstr ""
#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
+#: client/gui-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
msgid "Human"
msgstr ""
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
-#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
+#: 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
msgid "Alive"
msgstr "בחיי×"
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
#: client/gui-win32/connectdlg.c:200
msgid "Dead"
msgstr ""
@@ -5921,9 +5910,9 @@ 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:242
-#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
-#: client/text.c:1201
+#: 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
#, c-format
msgid "?clistmore:, %s"
msgstr ", %s"
@@ -6170,7 +6159,7 @@ msgstr ""
msgid "Cannot attack from sea."
msgstr ""
-#: server/unithand.c:996 server/unittools.c:2103
+#: server/unithand.c:996 server/unittools.c:2137
msgid "Cannot attack unless you declare war first."
msgstr ""
@@ -6267,99 +6256,100 @@ msgstr ""
#: server/unittools.c:297
#, c-format
-msgid "Not enough gold. %s disbanded"
+msgid "Not enough gold to pay upkeep for %s. Unit disbanded."
msgstr ""
-#: server/unittools.c:342
+#: server/unittools.c:343
#, c-format
msgid "Your %s has run out of hit points."
msgstr ""
-#: server/unittools.c:358
+#: server/unittools.c:359
#, c-format
msgid "Your %s has been lost on the high seas."
msgstr ""
-#: server/unittools.c:365
+#: server/unittools.c:366
#, c-format
msgid "Your %s survived on the high seas and became more experienced!"
msgstr ""
-#: server/unittools.c:376
+#: server/unittools.c:377
#, c-format
msgid "Your %s has been lost on unsafe terrain."
msgstr ""
-#: server/unittools.c:430
+#: server/unittools.c:431
#, c-format
msgid "Your %s has returned to refuel."
msgstr ""
-#: server/unittools.c:454
+#: server/unittools.c:455
#, c-format
msgid "Your %s has run out of fuel."
msgstr ""
-#. TRANS: And, <the unit> became ...
-#: server/unittools.c:616
-msgid "And, became more experienced!"
-msgstr ""
-
#. TRANS: Your <unit> became ...
-#: server/unittools.c:620
+#: server/unittools.c:619
#, c-format
msgid "Your %s became more experienced!"
msgstr ""
-#: server/unittools.c:1011
+#: server/unittools.c:1009
#, c-format
msgid "Teleported your %s to %s."
msgstr ""
-#: server/unittools.c:1041
+#. TRANS: A unit is moved to resolve stack conflicts.
+#: server/unittools.c:1065
+#, fuzzy, c-format
+msgid "Moved your %s."
+msgstr "עלות ×ª× ×•×¢×”"
+
+#: server/unittools.c:1076
#, c-format
msgid "Disbanded your %s."
msgstr ""
-#: server/unittools.c:1363
+#: server/unittools.c:1397
#, c-format
msgid "Unable to defend %s, %s has lost the game."
msgstr ""
-#: server/unittools.c:1367
+#: server/unittools.c:1401
#, c-format
msgid "Losing %s meant losing the game! Be more careful next time!"
msgstr ""
-#: server/unittools.c:1469
+#: server/unittools.c:1503
#, c-format
msgid "%s escaped the destruction of %s, and fled to %s."
msgstr ""
-#: server/unittools.c:1478
+#: server/unittools.c:1512
#, c-format
msgid "%s lost when %s was lost."
msgstr ""
-#: server/unittools.c:1527
+#: server/unittools.c:1561
#, c-format
msgid "Barbarian leader captured, %d gold ransom paid."
msgstr ""
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unittools.c:1545
+#: server/unittools.c:1579
#, c-format
msgid "Your attacking %s succeeded against the %s %s!"
msgstr ""
#. TRANS: "Cannon ... the Polish Destroyer."
-#: server/unittools.c:1554 server/unittools.c:1612
+#: server/unittools.c:1588 server/unittools.c:1646
#, c-format
msgid "%s lost to an attack by the %s %s."
msgstr ""
#. TRANS: "... Cannon ... the Polish Destroyer ...."
-#: server/unittools.c:1588
+#: server/unittools.c:1622
#, c-format
msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
msgid_plural ""
@@ -6369,14 +6359,14 @@ msgstr[1] ""
#. TRANS: "Cannon lost when the Polish Destroyer
#. * attacked the German Musketeers."
-#: server/unittools.c:1621
+#: server/unittools.c:1655
#, 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:1636
+#: server/unittools.c:1670
#, c-format
msgid "%s (and %s) lost to an attack from the %s %s."
msgstr ""
@@ -6384,7 +6374,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:1646
+#: server/unittools.c:1680
#, 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."
@@ -6394,192 +6384,192 @@ 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:1660
+#: server/unittools.c:1694
#, 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:1928
+#: server/unittools.c:1962
#, c-format
msgid "Your %s was nuked by %s."
msgstr ""
-#: server/unittools.c:1931 server/unittools.c:1947
+#: server/unittools.c:1965 server/unittools.c:1981
msgid "yourself"
msgstr ""
-#: server/unittools.c:1935
+#: server/unittools.c:1969
#, c-format
msgid "The %s %s was nuked."
msgstr ""
-#: server/unittools.c:1944
+#: server/unittools.c:1978
#, c-format
msgid "%s was nuked by %s."
msgstr ""
-#: server/unittools.c:1952
+#: server/unittools.c:1986
#, c-format
msgid "You nuked %s."
msgstr ""
-#: server/unittools.c:1993
+#: server/unittools.c:2027
#, c-format
msgid "The %s detonated a nuke!"
msgstr ""
-#: server/unittools.c:2017
+#: server/unittools.c:2051
#, c-format
msgid "%s transported successfully."
msgstr ""
-#: server/unittools.c:2069
+#: server/unittools.c:2103
msgid "This unit type can not be paradropped."
msgstr ""
-#: server/unittools.c:2079
+#: server/unittools.c:2113
msgid "You cannot paradrop a unit that is transporting other units."
msgstr ""
-#: server/unittools.c:2085
+#: server/unittools.c:2119
msgid "The destination location is not known."
msgstr ""
-#: server/unittools.c:2092
+#: server/unittools.c:2126
#, c-format
msgid "This unit cannot paradrop into %s."
msgstr ""
-#: server/unittools.c:2112
+#: server/unittools.c:2146
#, c-format
msgid "The distance to the target (%i) is greater than the unit's range (%i)."
msgstr ""
-#: server/unittools.c:2123
+#: server/unittools.c:2157
#, c-format
msgid "Your %s paradropped into the %s and was lost."
msgstr ""
-#: server/unittools.c:2136
+#: server/unittools.c:2170
#, c-format
msgid "Your %s was killed by enemy units at the paradrop destination."
msgstr ""
-#: server/unittools.c:2158
+#: server/unittools.c:2192
#, c-format
msgid "You found %d gold."
msgstr ""
-#: server/unittools.c:2175
+#: server/unittools.c:2209
#, c-format
msgid "You found %s in ancient scrolls of wisdom."
msgstr ""
-#: server/unittools.c:2182
+#: server/unittools.c:2216
#, c-format
msgid "The %s have acquired %s from ancient scrolls of wisdom."
msgstr ""
-#: server/unittools.c:2196
+#: server/unittools.c:2230
msgid "A band of friendly mercenaries joins your cause."
msgstr ""
-#: server/unittools.c:2214
+#: server/unittools.c:2248
msgid "An abandoned village is here."
msgstr ""
-#: server/unittools.c:2224
+#: server/unittools.c:2258
msgid "You have unleashed a horde of barbarians!"
msgstr ""
-#: server/unittools.c:2227
+#: server/unittools.c:2261
#, c-format
msgid "Your %s has been killed by barbarians!"
msgstr ""
-#: server/unittools.c:2243
+#: server/unittools.c:2277
msgid "You found a friendly city."
msgstr ""
-#: server/unittools.c:2257
+#: server/unittools.c:2291
msgid "Friendly nomads are impressed by you, and join you."
msgstr ""
-#: server/unittools.c:2282
+#: server/unittools.c:2316
msgid "Your overflight frightens the tribe; they scatter in terror."
msgstr ""
-#: server/unittools.c:2540
+#: server/unittools.c:2574
#, c-format
msgid "Orders for %s aborted after enemy movement was spotted."
msgstr ""
-#: server/unittools.c:2989
+#: server/unittools.c:3023
#, c-format
msgid "Orders for %s aborted as there are units nearby."
msgstr ""
-#: server/unittools.c:3041
+#: server/unittools.c:3075
#, c-format
msgid "Orders for %s aborted because building of city failed."
msgstr ""
-#: server/unittools.c:3054
+#: server/unittools.c:3088
#, c-format
msgid "Orders for %s aborted since they give an invalid activity."
msgstr ""
-#: server/unittools.c:3068
+#: server/unittools.c:3102
#, c-format
msgid "Orders for %s aborted since they give an invalid location."
msgstr ""
-#: server/unittools.c:3078
+#: server/unittools.c:3112
#, c-format
msgid "Orders for %s aborted as there are units in the way."
msgstr ""
-#: server/unittools.c:3104
+#: server/unittools.c:3138
#, c-format
msgid "Orders for %s aborted because of failed move."
msgstr ""
-#: server/unittools.c:3145
+#: server/unittools.c:3179
#, c-format
msgid "Attempt to change homecity for %s failed."
msgstr "× ×™×¡×™×•×Ÿ ×œ×©× ×•×ª ×ת העיר־בית עבור %s × ×›×©×œ."
-#: server/unittools.c:3156
+#: server/unittools.c:3190
#, c-format
msgid "Attempt to establish trade route for %s failed."
msgstr "× ×™×¡×™×•×Ÿ ×œ×”×§×™× × ×ª×™×‘Ö¾×¡×—×¨ עבור %s × ×›×©×œ."
-#: server/unittools.c:3168
+#: server/unittools.c:3202
#, c-format
msgid "Attempt to build wonder for %s failed."
msgstr "× ×™×¡×™×•×Ÿ ×œ×‘× ×•×ª פל×־תבל עבור %s × ×›×©×œ."
-#: server/unittools.c:3177
+#: server/unittools.c:3211
#, c-format
msgid "Your %s has invalid orders."
msgstr "יחידת ×”%s שלך קבלה פקודה ×œ× ×ª×§×™× ×”."
-#: server/generator/mapgen.c:1737
+#: server/generator/mapgen.c:1771
msgid "High landmass - this may take a few seconds."
msgstr ""
-#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
+#: server/generator/mapgen.c:1969 server/generator/mapgen.c:2039
#, c-format
msgid "Falling back to generator %d."
msgstr ""
-#: server/generator/mapgen.c:2025
+#: server/generator/mapgen.c:2059
msgid "Generator 3 didn't place all big islands."
msgstr ""
-#: server/generator/mapgen.c:2054
+#: server/generator/mapgen.c:2088
#, c-format
msgid "Generator 3 left %li landmass unplaced."
msgstr ""
@@ -6682,7 +6672,7 @@ msgid_plural "%3d turns"
msgstr[0] ""
msgstr[1] ""
-#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:631
#: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
@@ -6800,347 +6790,347 @@ msgstr ""
msgid "(worklist)"
msgstr ""
-#: client/cityrepdata.c:447
-msgid "Special"
-msgstr "חברתי"
+#: client/cityrepdata.c:446
+msgid "?city:Name"
+msgstr ""
-#: client/cityrepdata.c:448
-msgid "?entertainers/scientists/taxmen:E/S/T"
-msgstr "?×‘×“×¨× ×™×/×ž×“×¢× ×™×/גובי־מס:ב/מ/×’"
+#: client/cityrepdata.c:446 client/gui-sdl/cityrep.c:169
+msgid "City Name"
+msgstr ""
-#: client/cityrepdata.c:449
-msgid "Entertainers, Scientists, Taxmen"
-msgstr "×‘×“×¨× ×™×, ×ž×“×¢× ×™×, גובי־מס"
+#: client/cityrepdata.c:448
+msgid "?size [short]:Sz"
+msgstr ""
-#: client/cityrepdata.c:452
-#, fuzzy
-msgid "Concise + Rapture, - Disorder"
-msgstr "משבר + שלהוב־יצרי×, - מהומות"
+#: client/cityrepdata.c:448
+msgid "Size"
+msgstr ""
-#: client/cityrepdata.c:454 client/plrdlg_common.c:261
+#: client/cityrepdata.c:450 client/plrdlg_common.c:261
#: client/gui-win32/plrdlg.c:337
msgid "State"
msgstr ""
-#: client/cityrepdata.c:454
+#: client/cityrepdata.c:450
msgid "Rapture/Peace/Disorder"
msgstr ""
+#: client/cityrepdata.c:452
+#, fuzzy
+msgid "Concise *=Rapture, X=Disorder"
+msgstr "משבר + שלהוב־יצרי×, - מהומות"
+
+#: client/cityrepdata.c:456
+msgid "Special"
+msgstr "חברתי"
+
#: client/cityrepdata.c:457
+msgid "?entertainers/scientists/taxmen:E/S/T"
+msgstr "?×‘×“×¨× ×™×/×ž×“×¢× ×™×/גובי־מס:ב/מ/×’"
+
+#: client/cityrepdata.c:458
+msgid "Entertainers, Scientists, Taxmen"
+msgstr "×‘×“×¨× ×™×, ×ž×“×¢× ×™×, גובי־מס"
+
+#: client/cityrepdata.c:461
msgid "?Happy workers:H"
msgstr "?×¤×•×¢×œ×™× ×©×ž×—×™×:ש"
-#: client/cityrepdata.c:457
+#: client/cityrepdata.c:461
msgid "Workers: Happy"
msgstr "פועלי×: שמחי×"
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
msgid "?Content workers:C"
msgstr "?×¤×•×¢×œ×™× ×ž×¨×•×¦×™×:מ "
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
msgid "Workers: Content"
msgstr "פועלי×: מרוצי×"
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
msgid "?Unhappy workers:U"
msgstr "?×¤×•×¢×œ×™× ×¢×¦×•×‘×™×:×¢"
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
msgid "Workers: Unhappy"
msgstr "פועלי×: עצובי×"
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
msgid "?Angry workers:A"
msgstr "?×¤×•×¢×œ×™× ×›×•×¢×¡×™×:×›"
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
msgid "Workers: Angry"
msgstr "פועלי×: כועסי×"
-#: client/cityrepdata.c:465 client/gui-xaw/citydlg.c:2401
-#: data/default/units.ruleset:238
-msgid "Workers"
+#: client/cityrepdata.c:469 client/gui-xaw/citydlg.c:2402
+#, fuzzy
+msgid "?city:Workers"
msgstr "פועלי×"
-#: client/cityrepdata.c:466
+#: client/cityrepdata.c:470
msgid "?happy/content/unhappy/angry:H/C/U/A"
msgstr "?שמח/מרוצה/עצוב/כועס:ש/מ/ע/כ"
-#: client/cityrepdata.c:467
+#: client/cityrepdata.c:471
msgid "Workers: Happy, Content, Unhappy, Angry"
msgstr "פועלי×: שמחי×, מרוצי×, עצובי×, כועסי×"
-#: client/cityrepdata.c:470 client/cityrepdata.c:472
+#: client/cityrepdata.c:474 client/cityrepdata.c:476
msgid "Best"
msgstr "הטוב ביותר"
-#: client/cityrepdata.c:470
+#: client/cityrepdata.c:474
msgid "attack"
msgstr "התקפה"
-#: client/cityrepdata.c:471
+#: client/cityrepdata.c:475
msgid "Best attacking units"
msgstr "היחידות התוקפות הטובות ביותר"
-#: client/cityrepdata.c:472
+#: client/cityrepdata.c:476
msgid "defense"
msgstr "×”×’× ×”"
-#: client/cityrepdata.c:473
+#: client/cityrepdata.c:477
msgid "Best defending units"
msgstr "היחידות ×”×ž×’× ×•×ª הטובות ביותר"
-#: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
-#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
-#: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
-#: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
-#: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
-#: client/gui-win32/menu.c:351 client/gui-win32/repodlgs.c:616
-#: client/gui-win32/repodlgs.c:707 client/gui-win32/repodlgs.c:716
-#: client/gui-xaw/menu.c:157 client/gui-xaw/menu.c:219
-#: client/gui-xaw/menu.c:242 client/gui-xaw/repodlgs.c:881
-#: client/gui-xaw/repodlgs.c:1069 data/Freeciv.in:1895 data/helpdata.txt:909
+#: client/cityrepdata.c:478 client/cityrepdata.c:482
+#: client/gui-gtk-2.0/cityrep.c:1437 client/gui-gtk-2.0/cityrep.c:1456
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-gtk-2.0/cityrep.c:1494
+#: client/gui-gtk-2.0/cityrep.c:1514 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/repodlgs.c:960 client/gui-sdl/helpdlg.c:688
+#: client/gui-sdl/mapctrl.c:1605 client/gui-sdl/optiondlg.c:1827
+#: client/gui-sdl/repodlgs.c:356 client/gui-win32/menu.c:351
+#: client/gui-win32/repodlgs.c:616 client/gui-win32/repodlgs.c:707
+#: client/gui-win32/repodlgs.c:716 client/gui-xaw/menu.c:157
+#: client/gui-xaw/menu.c:219 client/gui-xaw/menu.c:242
+#: client/gui-xaw/repodlgs.c:881 client/gui-xaw/repodlgs.c:1069
+#: data/Freeciv.in:1895 data/helpdata.txt:909
msgid "Units"
msgstr "יחידות"
#. TRANS: Header "Number of units inside city"
-#: client/cityrepdata.c:476
+#: client/cityrepdata.c:480
#, fuzzy
msgid "?Present (units):Here"
msgstr "?× ×•×›×—×•×ª (יחידות):× ×›×—"
-#: client/cityrepdata.c:477
+#: client/cityrepdata.c:481
msgid "Number of units present"
msgstr "מספר יחידות × ×•×›×—×•×ª"
#. TRANS: Header "Number of units supported by given city"
-#: client/cityrepdata.c:480
+#: client/cityrepdata.c:484
#, fuzzy
msgid "?Supported (units):Owned"
msgstr "?× ×ª×ž×›×•×ª(יחידות):תמך"
-#: client/cityrepdata.c:481
+#: client/cityrepdata.c:485
msgid "Number of units supported"
msgstr "מספר יחידות × ×ª×ž×›×•×ª"
#. TRANS: Header "It will take this many turns before city grows"
-#: client/cityrepdata.c:484
+#: client/cityrepdata.c:488
#, fuzzy
msgid "?food (population):Grow"
msgstr "צמיחה"
-#: client/cityrepdata.c:485 client/cityrepdata.c:530
+#: client/cityrepdata.c:489 client/cityrepdata.c:528
#, fuzzy
msgid "?Stock/Target:(Have/Need)"
msgstr "(מל××™/מטרה)"
-#: client/cityrepdata.c:486
+#: client/cityrepdata.c:490
msgid "Turns until growth/famine"
msgstr "מספר תורות עד לצמחיה/רעב"
-#: client/cityrepdata.c:488
-msgid "?size [short]:Sz"
-msgstr ""
-
-#: client/cityrepdata.c:488
-msgid "Size"
-msgstr ""
-
-#: client/cityrepdata.c:492
-msgid "?city:Name"
-msgstr ""
-
-#: client/cityrepdata.c:492 client/gui-sdl/cityrep.c:169
-msgid "City Name"
-msgstr ""
-
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
msgid "Surplus"
msgstr "עודף"
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
msgid "?food/production/trade:F/P/T"
msgstr "?מזון/יצור/סחר:מ/י/ס"
-#: client/cityrepdata.c:496
+#: client/cityrepdata.c:494
msgid "Surplus: Food, Production, Trade"
msgstr "עודף: מזון, יצור, סחר"
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
#, fuzzy
msgid "?Food surplus [short]:+F"
msgstr "?עודף מזון:מ+ "
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
msgid "Surplus: Food"
msgstr "עודף: מזון"
-#: client/cityrepdata.c:500
+#: client/cityrepdata.c:498
#, fuzzy
msgid "?Production surplus [short]:+P"
msgstr "?עודף יצור:י+"
-#: client/cityrepdata.c:501
+#: client/cityrepdata.c:499
msgid "Surplus: Production"
msgstr "עודף: יצור"
-#: client/cityrepdata.c:502
+#: client/cityrepdata.c:500
#, fuzzy
msgid "?Production loss (waste) [short]:-P"
msgstr "?בזבוז:בזב"
-#: client/cityrepdata.c:503
+#: client/cityrepdata.c:501
msgid "Waste"
msgstr "בזבוב"
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
#, fuzzy
msgid "?Trade surplus [short]:+T"
msgstr "?עודף סחר:ס+ "
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
msgid "Surplus: Trade"
msgstr "עודף: סחר"
-#: client/cityrepdata.c:506
+#: client/cityrepdata.c:504
#, fuzzy
msgid "?Trade loss (corruption) [short]:-T"
msgstr "?שחיתות:שחת"
-#: client/cityrepdata.c:507
+#: client/cityrepdata.c:505
msgid "Corruption"
msgstr "שחיתות"
-#: client/cityrepdata.c:509 client/gui-gtk-2.0/repodlgs.c:654
+#: client/cityrepdata.c:507 client/gui-gtk-2.0/repodlgs.c:654
#: client/gui-sdl/mapctrl.c:1400 client/gui-win32/repodlgs.c:334
#: client/gui-xaw/menu.c:222 client/gui-xaw/repodlgs.c:644
#: client/gui-xaw/repodlgs.c:773 data/Freeciv.in:1819
msgid "Economy"
msgstr "כלכלה"
-#: client/cityrepdata.c:509
+#: client/cityrepdata.c:507
msgid "?gold/luxury/science:G/L/S"
msgstr "?זהב/שפע/מדע:ז/ש/מ"
-#: client/cityrepdata.c:510
+#: client/cityrepdata.c:508
msgid "Economy: Gold, Luxuries, Science"
msgstr "כלכלה: זהב, שפע, מדע"
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
msgid "?Gold:G"
msgstr "?זהב:ז"
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
msgid "Economy: Gold"
msgstr "כלכלה: זהב"
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
msgid "?Luxury:L"
msgstr "?שפע:ש"
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
msgid "Economy: Luxury"
msgstr "כלכלה: שפע"
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
msgid "?Science:S"
msgstr "?מדע:מ "
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
msgid "Economy: Science"
msgstr "כלכלה: מדע"
-#: client/cityrepdata.c:518
+#: client/cityrepdata.c:516
#, fuzzy
msgid "?number_trade_routes:n"
msgstr "?× ×ª×™×‘×™Ö¾×¡×—×¨:× "
-#: client/cityrepdata.c:518
+#: client/cityrepdata.c:516
#, fuzzy
msgid "?number_trade_routes:R"
msgstr "?× ×ª×™×‘×™Ö¾×¡×—×¨:ס"
-#: client/cityrepdata.c:519
+#: client/cityrepdata.c:517
msgid "Number of Trade Routes"
msgstr "מספר × ×ª×™×‘×™Ö¾×¡×—×¨"
-#: client/cityrepdata.c:521
+#: client/cityrepdata.c:519
msgid "?pollution [short]:Pol"
msgstr "?זיהו×:×–×”×"
-#: client/cityrepdata.c:523
+#: client/cityrepdata.c:521
msgid "?cma:Governor"
msgstr "?×¡× ×: מושל"
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
-#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
-#: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
-#: data/Freeciv.in:1459 data/helpdata.txt:820
+#: client/cityrepdata.c:521 client/gui-gtk-2.0/cityrep.c:1766
+#: client/gui-sdl/citydlg.c:3809 client/gui-sdl/cma_fe.c:858
+#: client/gui-win32/citydlg.c:726 data/Freeciv.in:1459 data/helpdata.txt:820
msgid "Citizen Governor"
msgstr "מושל ×זרחי×"
-#: client/cityrepdata.c:526
+#: client/cityrepdata.c:524
#, fuzzy
msgid "Turns/Buy"
msgstr "תורות/רכש"
-#: client/cityrepdata.c:529 client/cityrepdata.c:531
+#: client/cityrepdata.c:527 client/cityrepdata.c:529
msgid "Currently Building"
msgstr "כרגע ×‘×‘× ×™×”"
-#: client/cityrepdata.c:575
+#: client/cityrepdata.c:573
msgid "?specialist:S"
msgstr "?מומחה:מ"
-#: client/cityrepdata.c:578
+#: client/cityrepdata.c:576
#, fuzzy
msgid "Specialists"
msgstr "מומחה"
-#: client/civclient.c:239
+#: client/civclient.c:240
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr ""
-#: client/civclient.c:249
+#: client/civclient.c:250
msgid " -l, --log FILE\tUse FILE as logfile (spawned server also uses this)\n"
msgstr ""
-#: client/civclient.c:251
+#: client/civclient.c:252
msgid " -m, --meta HOST\tConnect to the metaserver at HOST\n"
msgstr ""
-#: client/civclient.c:253
+#: client/civclient.c:254
msgid " -n, --name NAME\tUse NAME as name\n"
msgstr ""
-#: client/civclient.c:255
+#: client/civclient.c:256
msgid " -p, --port PORT\tConnect to server port PORT (usually with -a)\n"
msgstr ""
-#: client/civclient.c:257
+#: client/civclient.c:258
#, c-format
msgid " -P, --Plugin PLUGIN\tUse PLUGIN for sound output %s\n"
msgstr ""
-#: client/civclient.c:259
+#: client/civclient.c:260
msgid " -r, --read FILE\tRead startup script FILE (for spawned server only)\n"
msgstr ""
-#: client/civclient.c:262
+#: client/civclient.c:263
msgid " -s, --server HOST\tConnect to the server at HOST (usually with -a)\n"
msgstr ""
-#: client/civclient.c:264
+#: client/civclient.c:265
msgid " -S, --Sound FILE\tRead sound tags from FILE\n"
msgstr ""
-#: client/civclient.c:265
+#: client/civclient.c:266
msgid " -t, --tiles FILE\tUse data file FILE.tilespec for tiles\n"
msgstr ""
-#: client/civclient.c:268
+#: client/civclient.c:269
#, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -7148,144 +7138,154 @@ msgid ""
msgstr ""
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:273
+#: client/civclient.c:274
#, c-format
msgid "Report bugs at %s\n"
msgstr ""
-#: client/civclient.c:297
+#: client/civclient.c:298
#, c-format
msgid "Invalid port \"%s\" specified with --port option.\n"
msgstr ""
-#: client/civclient.c:299 client/civclient.c:314
+#: client/civclient.c:300 client/civclient.c:315
msgid "Try using --help.\n"
msgstr ""
-#: client/civclient.c:312
+#: client/civclient.c:313
#, c-format
msgid "Invalid debug level \"%s\" specified with --debug option.\n"
msgstr ""
-#: client/civclient.c:325
+#: client/civclient.c:326
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr ""
-#: client/civclient.c:539
+#: client/civclient.c:391
+#, c-format
+msgid "Updating old metaserver address \"%s\"."
+msgstr ""
+
+#: client/civclient.c:394
+#, c-format
+msgid "Default metaserver has been set to \"%s\"."
+msgstr ""
+
+#: client/civclient.c:550
msgid "Game started."
msgstr "משחק החל. "
-#: client/civclient.c:577
+#: client/civclient.c:588
msgid "There was an error while auto connecting; aborting."
msgstr ""
-#: client/climisc.c:176
+#: client/climisc.c:177
#, c-format
msgid "Changing production of every %s into %s."
msgstr "×ž×©× ×” ייצור של כל %s ל%s"
-#: client/climisc.c:214
+#: client/climisc.c:215
msgid "?embassy:Both"
msgstr "?שגרירות:הדדי"
-#: client/climisc.c:216
+#: client/climisc.c:217
msgid "?embassy:Yes"
msgstr "?שגרירות:כן"
-#: client/climisc.c:219
+#: client/climisc.c:220
msgid "?embassy:With Us"
msgstr "?שגרירות:××™×ª× ×•"
-#: client/climisc.c:222
+#: client/climisc.c:223
msgid "?embassy:Contact"
msgstr "?שגרירות:צור־קשר"
-#: client/climisc.c:224
+#: client/climisc.c:225
msgid "?embassy:No Contact"
msgstr "?שגרירות:×ין קשר"
-#: client/climisc.c:236
+#: client/climisc.c:237
msgid "?vision:Both"
msgstr "?חזור:הדדי"
-#: client/climisc.c:238
+#: client/climisc.c:239
msgid "?vision:To Them"
msgstr "?חזון:×ליה×"
-#: client/climisc.c:241
+#: client/climisc.c:242
msgid "?vision:To Us"
msgstr "?חזון:××œ× ×•"
-#: client/climisc.c:257 client/climisc.c:264
+#: client/climisc.c:258 client/climisc.c:265
#, c-format
msgid "The %s give %s"
msgstr "×”%s ×ž×¢× ×™×§×™× %s"
-#: client/climisc.c:268
+#: client/climisc.c:269
#, c-format
msgid "The %s give unknown city."
msgstr "×”%s ×ž×¢× ×™×§×™× ×¢×™×¨ ×œ× ×™×“×•×¢×”."
-#: client/climisc.c:273
+#: client/climisc.c:274
#, c-format
msgid "The %s give %d gold"
msgstr "×”%s ×ž×¢× ×™×§×™× %d זהב"
-#: client/climisc.c:278
+#: client/climisc.c:279
#, c-format
msgid "The %s give their worldmap"
msgstr "×”%s ×ž×¢× ×™×§×™× ×ת מפת ×”×¢×•×œ× ×©×œ×”×"
-#: client/climisc.c:282
+#: client/climisc.c:283
#, c-format
msgid "The %s give their seamap"
msgstr "×”%s ×ž×¢× ×™×§×™× ×ת מפת ×”×™× ×©×œ×”×"
-#: client/climisc.c:286
+#: client/climisc.c:287
msgid "The parties agree on a cease-fire"
msgstr "×”×¦×“×“×™× ×ž×¡×›×™×ž×™× ×œ×”×¤×¡×§×ª ×ש"
-#: client/climisc.c:289
+#: client/climisc.c:290
msgid "The parties agree on a peace"
msgstr "×”×¦×“×“×™× ×—×ª×ž×• על ×”×¡×›× ×©×œ×•×"
-#: client/climisc.c:292
+#: client/climisc.c:293
msgid "The parties create an alliance"
msgstr "×”×¦×“×“×™× ×›×¨×ª×• ברית"
-#: client/climisc.c:295
+#: client/climisc.c:296
#, c-format
msgid "The %s give shared vision"
msgstr "×”%s ×”×¢× ×™×§×• חזון משותף"
-#: client/climisc.c:299
+#: client/climisc.c:300
#, c-format
msgid "The %s give an embassy"
msgstr "×”%s ×”×¢× ×™×§×• שגרירות"
-#: client/climisc.c:902
+#: client/climisc.c:906
msgid "Popup Request"
msgstr ""
-#: client/climisc.c:932
+#: client/climisc.c:936
msgid "Exporting output window to civgame.log ..."
msgstr ""
-#: client/climisc.c:936
+#: client/climisc.c:940
msgid "Export complete."
msgstr ""
-#: client/climisc.c:938
+#: client/climisc.c:942
msgid "Export failed, couldn't write to file."
msgstr ""
-#: client/climisc.c:1038
+#: client/climisc.c:1042
#, c-format
msgid "You don't buy %s in %s!"
msgstr "××™× ×š רוכש %s ב־ %s"
-#: client/climisc.c:1056
+#: client/climisc.c:1060
#, c-format
msgid "%s costs %d gold and you only have %d gold."
msgstr "%s עולה %d זהב וברשותך רק %d זהב."
@@ -7329,19 +7329,19 @@ msgid ""
"%d times"
msgstr ""
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1289
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
msgid "novice"
msgstr "טירון"
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1289
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1358
msgid "easy"
msgstr "קל"
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1290
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
msgid "normal"
msgstr "רגיל"
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1290
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
msgid "hard"
msgstr "קשה"
@@ -7370,38 +7370,41 @@ msgid "We probably couldn't start it from here."
msgstr ""
#: client/connectdlg_common.c:470
-msgid "We have control of the server (command access level hack)"
+msgid ""
+"Established control over the server. You have command access level 'hack'."
msgstr ""
#: client/connectdlg_common.c:475
-msgid "We can't take control of server, attempting to kill it."
+msgid ""
+"Failed to obtain the required access level to take control of the server. "
+"The server will now be shutdown."
msgstr ""
-#: client/control.c:1104
+#: client/control.c:1123
msgid "Only transporter units can be unloaded."
msgstr "רק יחידות תובלה יכולות להיפרק."
-#: client/control.c:1353
+#: client/control.c:1425
msgid "Only settler units can be put into auto mode."
msgstr "רק יחידות ×ž×ª× ×—×œ×™× ×™×›×•×œ×•×ª לעבור למצב ×וטומטי."
-#: client/control.c:1444
+#: client/control.c:1516
msgid "Only nuclear units can do this."
msgstr "רק יחידות ×’×¨×¢×™× ×™×•×ª יכולות לעשות ×–×ת."
-#: client/control.c:1473
+#: client/control.c:1545
msgid "Only paratrooper units can do this."
msgstr "רק יחידות ×¦× ×—× ×™× ×™×›×•×œ×•×ª לעשות ×–×ת."
-#: client/control.c:1921
+#: client/control.c:2020
msgid "Too far for this unit."
msgstr "רחוק מדי עבור יחיד זו."
-#: client/control.c:2131 client/control.c:2161 client/control.c:2177
+#: client/control.c:2230 client/control.c:2260 client/control.c:2276
msgid "Didn't find a route to the destination!"
msgstr "×œ× × ×ž×¦× × ×ª×™×‘ ליעד!"
-#: client/control.c:2221
+#: client/control.c:2320
msgid "Oh my! You seem to have no capital!"
msgstr "×בוי! × ×¨××” ש×ין לך עיר בירה!"
@@ -7485,16 +7488,16 @@ msgid "Allows %s (with %s)."
msgstr "מ×פשר %s (יחד ×¢× %s)."
#. TRANS: preserve single space at beginning
-#: client/helpdata.c:418
+#: client/helpdata.c:416
msgid " Rivers"
msgstr "× ×”×¨×•×ª"
-#: client/helpdata.c:576
+#: client/helpdata.c:574
#, c-format
msgid "Sorry, no help topic for %s.\n"
msgstr "סליחה, ×ין × ×•×©× ×¢×–×¨×” עבור %s.\n"
-#: client/helpdata.c:580
+#: client/helpdata.c:578
#, c-format
msgid ""
"Sorry, no help topic for %s.\n"
@@ -7502,7 +7505,7 @@ msgid ""
"\n"
msgstr ""
-#: client/helpdata.c:670
+#: client/helpdata.c:668
#, fuzzy
msgid ""
"Requires: Nothing\n"
@@ -7511,287 +7514,287 @@ msgstr ""
"דורש ×ת ×‘× ×™×™×Ÿ ×”%s.\n"
"\n"
-#: client/helpdata.c:675
+#: client/helpdata.c:673
#, c-format
msgid "* The discovery of %s will make %s obsolete.\n"
msgstr ""
-#: client/helpdata.c:694
+#: client/helpdata.c:692
#, c-format
msgid "* Allows all players with knowledge of %s to build %s units.\n"
msgstr ""
-#: client/helpdata.c:706
+#: client/helpdata.c:704
#, c-format
msgid "* Allows %s (with %s).\n"
msgstr "* מ×פשר %s (יחד ×¢× %s).\n"
-#: client/helpdata.c:710
+#: client/helpdata.c:708
#, c-format
msgid "* Allows %s.\n"
msgstr "* מ×פשר %s.\n"
-#: client/helpdata.c:780
+#: client/helpdata.c:778
#, c-format
msgid "* Can only be built if there is %s in the city.\n"
msgstr "* × ×™×ª×Ÿ ×œ×‘× ×•×ª רק ×× ×™×© %s בעיר.\n"
-#: client/helpdata.c:786
+#: client/helpdata.c:784
#, c-format
msgid "* Can only be built with %s as government.\n"
msgstr "* × ×™×ª×Ÿ ×œ×‘× ×•×ª רק ×¢× %s כממשל.\n"
-#: client/helpdata.c:791
+#: client/helpdata.c:789
msgid "* May not be built in cities.\n"
msgstr ""
-#: client/helpdata.c:794
+#: client/helpdata.c:792
msgid "* Never has a home city.\n"
msgstr ""
-#: client/helpdata.c:797
+#: client/helpdata.c:795
msgid "* Losing this unit will lose you the game!\n"
msgstr ""
-#: client/helpdata.c:801
+#: client/helpdata.c:799
msgid "* Each player may only have one of this type of unit.\n"
msgstr ""
-#: client/helpdata.c:805
+#: client/helpdata.c:803
#, c-format
msgid "* Requires %d population to build.\n"
msgstr ""
-#: client/helpdata.c:811
+#: client/helpdata.c:809
#, c-format
msgid "* Can carry and refuel %d air unit.\n"
msgid_plural "* Can carry and refuel %d air units.\n"
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:816
+#: client/helpdata.c:814
#, c-format
msgid "* Can carry and refuel %d missile unit.\n"
msgid_plural "* Can carry and refuel %d missile units.\n"
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:821
+#: client/helpdata.c:819
#, c-format
msgid "* Can carry %d ground unit across water.\n"
msgid_plural "* Can carry %d ground units across water.\n"
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:830
+#: client/helpdata.c:828
msgid ""
"* Can establish trade routes (must travel to target city and must be at "
"least 9 tiles [in Manhattan distance] from this unit's home city).\n"
msgstr ""
-#: client/helpdata.c:836
+#: client/helpdata.c:834
#, c-format
msgid "* Can help build wonders (adds %d production).\n"
msgstr "* ×™×›×•×œ×™× ×œ×¢×–×•×¨ ×‘×‘× ×™×™×ª פל×י־תבל (מוסיף %d ייצור).\n"
-#: client/helpdata.c:840
+#: client/helpdata.c:838
msgid "* May not be disbanded.\n"
msgstr "* ×ין לפרק.\n"
-#: client/helpdata.c:842
+#: client/helpdata.c:840
#, c-format
msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
msgstr "× ×™×ª×Ÿ לפרק בעיר לקבלת 50%% מעלות הייצור בחזרה.\n"
-#: client/helpdata.c:846
+#: client/helpdata.c:844
msgid "* Can build new cities.\n"
msgstr "* ×™×›×•×œ×™× ×œ×‘× ×•×ª ×¢×¨×™× ×—×“×©×•×ª.\n"
-#: client/helpdata.c:849
+#: client/helpdata.c:847
#, c-format
msgid "* Can add on %d population to cities of no more than size %d.\n"
msgstr "* ×™×›×•×œ×™× ×œ×”×•×¡×™×£ %d ל×וכלוסיית העיר ×‘×¢×¨×™× ×¢× ×©×’×•×“×œ×Ÿ ××™× ×• עולה על %d.\n"
-#: client/helpdata.c:858
+#: client/helpdata.c:856
msgid "* Can build roads and railroads.\n"
msgstr "* ×™×›×•×œ×™× ×œ×‘× ×•×ª ×“×¨×›×™× ×•×ž×¡×™×œ×•×ª.\n"
-#: client/helpdata.c:859
+#: client/helpdata.c:857
msgid "* Can build mines on tiles.\n"
msgstr "* ×™×›×•×œ×™× ×œ×”×§×™× ×ž×›×¨×•×ª במשבצות.\n"
-#: client/helpdata.c:860
+#: client/helpdata.c:858
msgid "* Can build irrigation on tiles.\n"
msgstr "* ×™×›×•×œ×™× ×œ×”×§×™× ×ž×¢×¨×›×ª השקיה במשבצות.\n"
-#: client/helpdata.c:865
+#: client/helpdata.c:863
msgid "* Can build farmland.\n"
msgstr "* ×™×›×•×œ×™× ×œ×”×§×™× ×—×•×•×”.\n"
-#: client/helpdata.c:869
+#: client/helpdata.c:867
#, c-format
msgid "* Can build farmland (if %s is known).\n"
msgstr "* ×™×›×•×œ×™× ×œ×”×§×™× ×—×•×•×” (×× %s ידוע).\n"
-#: client/helpdata.c:873
+#: client/helpdata.c:871
#, c-format
msgid "* Can build farmland (if any of the following are known: %s).\n"
msgstr "* ×™×›×•×œ×™× ×œ×”×§×™× ×—×•×•×” (×× ×”×˜×›× ×•×œ×•×’×™×•×ª: %s, ידועות).\n"
-#: client/helpdata.c:881
+#: client/helpdata.c:879
msgid "* Can build fortresses.\n"
msgstr "* ×™×›×•×œ×™× ×œ×‘× ×•×ª ביצורי×.\n"
-#: client/helpdata.c:885
+#: client/helpdata.c:883
#, c-format
msgid "* Can build fortresses (if %s is known).\n"
msgstr "* ×™×›×•×œ×™× ×œ×‘× ×•×ª ×‘×™×¦×•×¨×™× (×× %s ידוע).\n"
-#: client/helpdata.c:889
+#: client/helpdata.c:887
#, c-format
msgid "* Can build fortresses (if any of the following are known: %s).\n"
msgstr ""
-#: client/helpdata.c:895
+#: client/helpdata.c:893
msgid "* Can clean pollution from tiles.\n"
msgstr ""
-#: client/helpdata.c:896
+#: client/helpdata.c:894
msgid "* Can clean nuclear fallout from tiles.\n"
msgstr ""
-#: client/helpdata.c:899
+#: client/helpdata.c:897
msgid "* Can transform tiles.\n"
msgstr ""
-#: client/helpdata.c:902
+#: client/helpdata.c:900
msgid "* Can build airbases.\n"
msgstr ""
-#: client/helpdata.c:906
+#: client/helpdata.c:904
#, c-format
msgid "* May fortify, granting a 50%% defensive bonus.\n"
msgstr ""
-#: client/helpdata.c:909
+#: client/helpdata.c:907
msgid "* May pillage to destroy infrastructure from tiles.\n"
msgstr ""
-#: client/helpdata.c:913
+#: client/helpdata.c:911
msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
msgstr ""
-#: client/helpdata.c:916
+#: client/helpdata.c:914
msgid "* Can perform diplomatic actions.\n"
msgstr ""
-#: client/helpdata.c:920
+#: client/helpdata.c:918
msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
msgstr ""
-#: client/helpdata.c:923
+#: client/helpdata.c:921
msgid "* May not be bribed.\n"
msgstr ""
-#: client/helpdata.c:926
+#: client/helpdata.c:924
msgid "* Can attack enemy air units.\n"
msgstr ""
-#: client/helpdata.c:930
+#: client/helpdata.c:928
msgid "* Is invisible except when next to an enemy unit or city.\n"
msgstr ""
-#: client/helpdata.c:934
+#: client/helpdata.c:932
msgid "* Can only attack units on ocean squares (no land attacks).\n"
msgstr ""
-#: client/helpdata.c:938
+#: client/helpdata.c:936
msgid ""
"* Can attack from aboard sea units: against enemy cities and onto land "
"squares.\n"
msgstr ""
-#: client/helpdata.c:943
+#: client/helpdata.c:941
#, c-format
msgid "* Can be paradropped from a friendly city (Range: %d).\n"
msgstr ""
-#: client/helpdata.c:949
+#: client/helpdata.c:947
msgid "* Gets double defense against units specified as 'mounted'.\n"
msgstr ""
-#: client/helpdata.c:953
+#: client/helpdata.c:951
msgid "* Counts as 'mounted' against certain defenders.\n"
msgstr ""
-#: client/helpdata.c:957
+#: client/helpdata.c:955
msgid "* A missile unit: gets used up in making an attack.\n"
msgstr ""
-#: client/helpdata.c:960
+#: client/helpdata.c:958
msgid "* Making an attack ends this unit's turn.\n"
msgstr ""
-#: client/helpdata.c:964
+#: client/helpdata.c:962
msgid "* This unit's attack causes a nuclear explosion!\n"
msgstr ""
-#: client/helpdata.c:968
+#: client/helpdata.c:966
msgid "* Gets double firepower when attacking cities.\n"
msgstr ""
-#: client/helpdata.c:971
+#: client/helpdata.c:969
msgid "* Ignores the effects of city walls.\n"
msgstr "* ×”×ª×¢×œ× ×”×ž×©×¤×¢×ª חומת־עיר.\n"
-#: client/helpdata.c:975
+#: client/helpdata.c:973
#, c-format
msgid ""
"* Does bombard attacks (%d per turn). These attacks will only damage (never "
"kill) the defender, but have no risk for the attacker.\n"
msgstr ""
-#: client/helpdata.c:982
+#: client/helpdata.c:980
msgid "* Gets quintuple defense against missiles and aircraft.\n"
msgstr ""
-#: client/helpdata.c:986
+#: client/helpdata.c:984
msgid "* Ignores terrain effects (treats all squares as roads).\n"
msgstr ""
-#: client/helpdata.c:989
+#: client/helpdata.c:987
msgid "* Ignores zones of control.\n"
msgstr ""
-#: client/helpdata.c:993
+#: client/helpdata.c:991
msgid "* A non-military unit (cannot attack; no martial law).\n"
msgstr ""
-#: client/helpdata.c:997
+#: client/helpdata.c:995
msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
msgstr ""
-#: client/helpdata.c:1000
+#: client/helpdata.c:998
msgid "* Will never achieve veteran status.\n"
msgstr ""
-#: client/helpdata.c:1002
+#: client/helpdata.c:1000
msgid "* May become veteran through training or combat.\n"
msgstr ""
-#: client/helpdata.c:1008
+#: client/helpdata.c:1006
#, c-format
msgid ""
"* Must end turn in a city or next to land, or has a 50%% risk of being lost "
"at sea.\n"
msgstr ""
-#: client/helpdata.c:1012
+#: client/helpdata.c:1010
#, c-format
msgid "* The discovery of %s reduces the risk to 25%%.\n"
msgstr ""
-#: client/helpdata.c:1017
+#: client/helpdata.c:1015
#, c-format
msgid "* %s reduces the risk to 12%%.\n"
msgstr ""
@@ -7800,115 +7803,115 @@ msgstr ""
#. * last two elements
#. TRANS: List of possible output types has this between
#. * last two elements
-#: client/helpdata.c:1068 client/helpdata.c:1402
+#: client/helpdata.c:1066 client/helpdata.c:1400
msgid " or "
msgstr ""
-#: client/helpdata.c:1070 client/helpdata.c:1390
+#: client/helpdata.c:1068 client/helpdata.c:1388
msgid "?or:, "
msgstr ""
-#: client/helpdata.c:1082
+#: 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"
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:1124
+#: client/helpdata.c:1122
#, c-format
msgid "If we would now start with %s we would need %d bulbs."
msgstr ""
-#: client/helpdata.c:1129
+#: client/helpdata.c:1127
#, 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:1137
+#: client/helpdata.c:1135
msgid "You cannot research this technology."
msgstr ""
-#: client/helpdata.c:1141
+#: client/helpdata.c:1139
msgid " This number may vary depending on what other players will research.\n"
msgstr ""
-#: client/helpdata.c:1153
+#: client/helpdata.c:1151
#, c-format
msgid "* The first player to research %s gets an immediate advance.\n"
msgstr ""
-#: client/helpdata.c:1158
+#: client/helpdata.c:1156
#, c-format
msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
msgstr ""
-#: client/helpdata.c:1161
+#: client/helpdata.c:1159
#, c-format
msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
msgstr ""
-#: client/helpdata.c:1165
+#: client/helpdata.c:1163
msgid "* Increases the pollution generated by the population.\n"
msgstr ""
-#: client/helpdata.c:1170
+#: client/helpdata.c:1168
#, c-format
msgid "* Allows %s to build roads on river squares.\n"
msgstr ""
-#: client/helpdata.c:1177
+#: client/helpdata.c:1175
#, c-format
msgid "* Allows %s to build fortresses.\n"
msgstr ""
-#: client/helpdata.c:1185
+#: client/helpdata.c:1183
#, c-format
msgid "* Allows %s to build airbases.\n"
msgstr ""
-#: client/helpdata.c:1194
+#: client/helpdata.c:1192
#, c-format
msgid "* Allows %s to upgrade roads to railroads.\n"
msgstr ""
-#: client/helpdata.c:1202
+#: client/helpdata.c:1200
#, c-format
msgid "* Allows %s to upgrade irrigation to farmland.\n"
msgstr ""
-#: client/helpdata.c:1236
+#: client/helpdata.c:1234
msgid "* Pollution cannot be generated on this terrain."
msgstr ""
-#: client/helpdata.c:1241
+#: client/helpdata.c:1239
msgid "* You cannot build cities on this terrain."
msgstr ""
-#: client/helpdata.c:1247
+#: client/helpdata.c:1245
msgid "* The coastline of this terrain is unsafe."
msgstr ""
-#: client/helpdata.c:1252
+#: client/helpdata.c:1250
msgid "* This terrain is unsafe for units to travel on."
msgstr ""
-#: client/helpdata.c:1257
+#: client/helpdata.c:1255
msgid "* Land units cannot travel on oceanic terrains."
msgstr ""
-#: client/helpdata.c:1307
+#: client/helpdata.c:1305
msgid "Features:\n"
msgstr ""
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1413 client/helpdata.c:1414
+#: client/helpdata.c:1411 client/helpdata.c:1412
msgid "?outputlist: Nothing "
msgstr ""
-#: client/helpdata.c:1421
+#: client/helpdata.c:1419
#, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
@@ -7919,7 +7922,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:1431
+#: client/helpdata.c:1429
#, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -7927,48 +7930,48 @@ msgid ""
msgstr ""
#. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1439
+#: client/helpdata.c:1437
#, c-format
msgid "* You pay %d times normal %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1444
+#: client/helpdata.c:1442
#, 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:1449
+#: client/helpdata.c:1447
#, c-format
msgid "* You pay no %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1453
+#: client/helpdata.c:1451
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:1462
+#: client/helpdata.c:1460
#, 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:1470
+#: client/helpdata.c:1468
#, c-format
msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
msgstr ""
-#: client/helpdata.c:1477
+#: client/helpdata.c:1475
#, 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:1484
+#: client/helpdata.c:1482
#, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -7976,23 +7979,23 @@ msgid ""
msgstr ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1491
+#: client/helpdata.c:1489
#, 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:1499
+#: client/helpdata.c:1497
#, c-format
msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
msgstr ""
-#: client/helpdata.c:1504
+#: client/helpdata.c:1502
msgid "Has unlimited science/gold/luxuries rates.\n"
msgstr ""
-#: client/helpdata.c:1509
+#: client/helpdata.c:1507
#, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
@@ -8003,7 +8006,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:1521
+#: client/helpdata.c:1519
#, 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"
@@ -8011,60 +8014,60 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1532
+#: client/helpdata.c:1530
#, 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:1538
+#: client/helpdata.c:1536
msgid "* Your units cannot be bribed.\n"
msgstr ""
-#: client/helpdata.c:1541
+#: client/helpdata.c:1539
msgid "* Your cities cannot be incited.\n"
msgstr ""
-#: client/helpdata.c:1545
+#: client/helpdata.c:1543
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:1551
+#: client/helpdata.c:1549
msgid "* Has a senate that may prevent declaration of war.\n"
msgstr ""
-#: client/helpdata.c:1555
+#: client/helpdata.c:1553
msgid "* Allows partisans when cities are taken by the enemy.\n"
msgstr ""
-#: client/helpdata.c:1559
+#: client/helpdata.c:1557
msgid ""
"* Buildings that normally confer bonuses against unhappiness will instead "
"give gold.\n"
msgstr ""
-#: client/helpdata.c:1563
+#: client/helpdata.c:1561
msgid "* Pays no upkeep for fanatics.\n"
msgstr ""
-#: client/helpdata.c:1566
+#: client/helpdata.c:1564
msgid "* Has no unhappy citizens.\n"
msgstr ""
-#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
+#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
#, c-format
msgid "* Veteran %s units.\n"
msgstr ""
-#: client/helpdata.c:1587
+#: client/helpdata.c:1585
msgid "* Veteran units.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1593
+#: client/helpdata.c:1591
#, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8072,7 +8075,7 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1602
+#: client/helpdata.c:1600
#, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8080,438 +8083,485 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1610
+#: client/helpdata.c:1608
#, 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:1619
+#: client/helpdata.c:1617
#, c-format
msgid "* %s production is increased %d%%.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1627
+#: client/helpdata.c:1625
#, c-format
msgid "* %s production will suffer massive waste.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1632
+#: client/helpdata.c:1630
#, c-format
msgid "* %s production will suffer some waste.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1637
+#: client/helpdata.c:1635
#, 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:1645
+#: client/helpdata.c:1643
#, 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:1651
+#: client/helpdata.c:1649
#, 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:1657
+#: client/helpdata.c:1655
#, c-format
msgid "* %s waste will increase slowly with distance from capital.\n"
msgstr ""
-#: client/helpdata.c:1674
+#: client/helpdata.c:1672
#, c-format
msgid "* Allows you to build %s.\n"
msgstr ""
#. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1701
+#: client/helpdata.c:1699
#, c-format
msgid "%s%d %s"
msgstr ""
-#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1700 client/helpdata.c:1708 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:1709
+#: client/helpdata.c:1707
#, c-format
msgid "%s%d unhappy"
msgstr ""
-#: client/mapctrl_common.c:382
+#: client/mapctrl_common.c:399
#, c-format
msgid "You don't know how to build %s!"
msgstr ""
-#: client/mapctrl_common.c:392
+#: client/mapctrl_common.c:409
#, c-format
msgid "Copy %s to clipboard."
msgstr ""
-#: client/mapctrl_common.c:408
+#: client/mapctrl_common.c:425
msgid "Clipboard is empty."
msgstr "×œ×•×—Ö¾×”×’×–×™×¨×™× ×¨×™×§."
-#: client/options.c:98
+#: client/options.c:102
msgid "Graphics"
msgstr "גרפיקה"
-#: client/options.c:99
+#: client/options.c:103
msgid "Overview"
msgstr "סקירה"
-#: client/options.c:100
+#: client/options.c:104
msgid "Sound"
msgstr "שמע"
-#: client/options.c:101
+#: client/options.c:105
msgid "Interface"
msgstr "ממשק"
-#: client/options.c:102
+#: client/options.c:106
msgid "Network"
msgstr "רשת"
-#: client/options.c:107
+#: client/options.c:111
msgid "Login name"
msgstr "×©× ×›× ×™×¡×”"
-#: client/options.c:108
+#: client/options.c:112
msgid ""
"This is the default login username that will be used in the connection "
"dialogs or with the -a command-line parameter."
msgstr ""
-#: client/options.c:113
+#: client/options.c:117
msgid "Server"
msgstr "שרת"
-#: client/options.c:114
+#: client/options.c:118
msgid ""
"This is the default server hostname that will be used in the connection "
"dialogs or with the -a command-line parameter."
msgstr ""
-#: client/options.c:119
+#: client/options.c:123
msgid "Server port"
msgstr ""
-#: client/options.c:120
+#: client/options.c:124
msgid ""
"This is the default server port that will be used in the connection dialogs "
"or with the -a command-line parameter."
msgstr ""
-#: client/options.c:125 client/gui-win32/connectdlg.c:912 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
msgid "Metaserver"
msgstr "שרתי×"
-#: client/options.c:126
+#: client/options.c:130
msgid ""
"The metaserver is a host that the client contacts to find out about games on "
"the internet. Don't change this from its default value unless you know what "
"you're doing."
msgstr ""
-#: client/options.c:132
+#: client/options.c:136
msgid "Soundset"
msgstr ""
-#: client/options.c:133
+#: client/options.c:137
msgid ""
"This is the soundset that will be used. Changing this is the same as using "
"the -S command-line parameter."
msgstr ""
-#: client/options.c:138
+#: client/options.c:142
msgid "Sound plugin"
msgstr ""
-#: client/options.c:139
+#: client/options.c:143
msgid ""
"If you have a problem with sound, try changing the sound plugin. The new "
"plugin won't take effect until you restart Freeciv. Changing this is the "
"same as using the -P command-line option."
msgstr ""
-#: client/options.c:144 client/gui-sdl/gui_main.c:162
+#: client/options.c:148 client/gui-sdl/gui_main.c:162
msgid "Theme"
msgstr ""
-#: client/options.c:145
+#: client/options.c:149
msgid "By changing this option you change the active theme."
msgstr ""
-#: client/options.c:148
+#: client/options.c:152
msgid "Tileset"
msgstr ""
-#: client/options.c:149
+#: client/options.c:153
msgid ""
"By changing this option you change the active tileset. This is the same as "
"using the -t command-line parameter."
msgstr ""
-#: client/options.c:156
+#: client/options.c:160
msgid "Solid unit background color"
msgstr ""
-#: client/options.c:157
+#: client/options.c:161
msgid ""
"Setting this option will cause units on the map view to be drawn with a "
"solid background color instead of the flag backdrop."
msgstr ""
-#: client/options.c:161 client/gui-sdl/optiondlg.c:960
+#: client/options.c:165 client/gui-sdl/optiondlg.c:960
msgid "Sound bell at new turn"
msgstr ""
-#: client/options.c:162
+#: client/options.c:166
msgid ""
"Set this option to have a \"bell\" event be generated at the start of a new "
"turn. You can control the behavior of the \"bell\" event by editing the "
"message options."
msgstr ""
-#: client/options.c:168
+#: client/options.c:172
msgid "Unit movement animation time (milliseconds)"
msgstr ""
-#: client/options.c:169
+#: client/options.c:173
msgid ""
"This option controls how long unit \"animation\" takes when a unit moves on "
"the map view. Set it to 0 to disable animation entirely."
msgstr ""
-#: client/options.c:174
+#: client/options.c:178
msgid "Mapview recentering time (milliseconds)"
msgstr ""
-#: client/options.c:175
+#: client/options.c:179
msgid ""
"When the map view is recentered, it will slide smoothly over the map to its "
"new position. This option controls how long this slide lasts. Set it to 0 "
"to disable mapview sliding entirely."
msgstr ""
-#: client/options.c:180 client/gui-sdl/optiondlg.c:1014
+#: client/options.c:184 client/gui-sdl/optiondlg.c:1014
msgid "Show combat animation"
msgstr ""
-#: client/options.c:181
+#: client/options.c:185
msgid ""
"Disabling this option will turn off combat animation between units on the "
"mapview."
msgstr ""
-#: client/options.c:184
+#: client/options.c:188
msgid "Draw the citybar"
msgstr ""
-#: client/options.c:185
+#: client/options.c:189
msgid ""
"Setting this option will display a 'citybar' containing useful information "
"beneath each city. Disabling this option will display only the city's name "
"and optionally, production."
msgstr ""
-#: client/options.c:191
+#: client/options.c:195
msgid "Show icons in the technology tree"
msgstr ""
-#: client/options.c:192
+#: client/options.c:196
msgid ""
"Setting this option will display icons on the technology tree diagram. "
"Turning this option off makes the technology tree more compact."
msgstr ""
-#: client/options.c:197
+#: client/options.c:201
msgid "Draw shield graphics for units"
msgstr ""
-#: client/options.c:198
+#: client/options.c:202
msgid ""
"Setting this option will draw a shield icon as the flags on units. If "
"unset, the full flag will be drawn."
msgstr ""
-#: client/options.c:202
+#: client/options.c:206
msgid "Manual Turn Done in AI Mode"
msgstr ""
-#: client/options.c:203
+#: client/options.c:207
msgid ""
"Disable this option if you do not want to press the Turn Done button "
"manually when watching an AI player."
msgstr ""
-#: client/options.c:207 client/gui-sdl/optiondlg.c:1121
+#: client/options.c:211 client/gui-sdl/optiondlg.c:1121
msgid "Auto Center on Units"
msgstr ""
-#: client/options.c:208
+#: client/options.c:212
msgid ""
"Set this option to have the active unit centered automatically when the unit "
"focus changes."
msgstr ""
-#: client/options.c:211 client/gui-sdl/optiondlg.c:1147
+#: client/options.c:215 client/gui-sdl/optiondlg.c:1147
msgid "Auto Center on Combat"
msgstr ""
-#: client/options.c:212
+#: client/options.c:216
msgid ""
"Set this option to have any combat be centered automatically. Disabled this "
"will speed up the time between turns but may cause you to miss combat "
"entirely."
msgstr ""
-#: client/options.c:217 client/gui-sdl/optiondlg.c:1174
+#: client/options.c:221 client/gui-sdl/optiondlg.c:1174
msgid "Focus on Awakened Units"
msgstr ""
-#: client/options.c:218
+#: client/options.c:222
msgid "Set this option to have newly awoken units be focused automatically."
msgstr ""
-#: client/options.c:221
+#: client/options.c:225
msgid "Allow goto into the unknown"
msgstr ""
-#: client/options.c:222
+#: client/options.c:226
msgid ""
"Setting this option will make the game consider moving into unknown tiles. "
"If not, then goto routes will detour around or be blocked by unknown tiles."
msgstr ""
-#: client/options.c:226
+#: client/options.c:230
msgid "Center map when Popup city"
msgstr ""
-#: client/options.c:227
+#: client/options.c:231
msgid ""
"Setting this option makes the mapview center on a city when its city dialog "
"is popped up."
msgstr ""
-#: client/options.c:230
+#: client/options.c:234
msgid "Concise City Production"
msgstr ""
-#: client/options.c:231
+#: client/options.c:235
msgid ""
"Set this option to make the city production (as shown in the city dialog) to "
"be more compact."
msgstr ""
-#: client/options.c:234 client/gui-sdl/optiondlg.c:1252
+#: client/options.c:238 client/gui-sdl/optiondlg.c:1252
msgid "End Turn when done moving"
msgstr ""
-#: client/options.c:235
+#: client/options.c:239
msgid ""
"Setting this option makes your turn end automatically when all your units "
"are done moving."
msgstr ""
-#: client/options.c:238 client/gui-sdl/optiondlg.c:1226
+#: client/options.c:242 client/gui-sdl/optiondlg.c:1226
msgid "Prompt for city names"
msgstr ""
-#: client/options.c:239
+#: client/options.c:243
msgid ""
"Disabling this option will make the names of newly founded cities chosen "
"automatically by the server."
msgstr ""
-#: client/options.c:242 client/gui-sdl/optiondlg.c:1200
+#: client/options.c:246 client/gui-sdl/optiondlg.c:1200
msgid "Pop up city dialog for new cities"
msgstr ""
-#: client/options.c:243
+#: client/options.c:247
msgid ""
"Setting this option will pop up a newly-founded city's city dialog "
"automatically."
msgstr ""
-#: client/options.c:248
+#: client/options.c:250
+#, fuzzy
+msgid "Pop up caravan actions"
+msgstr "פעולות ×ž×ª× ×—×œ×™×"
+
+#: client/options.c:251
+msgid ""
+"If this option is enabled, when caravans arrive at a city where they can "
+"establish a traderoute or help build a wonder, a window will popup asking "
+"which action should be performed. Disabling this option means you will have "
+"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 ""
+
+#: client/options.c:260
+msgid "Enable cursor changing"
+msgstr ""
+
+#: client/options.c:261
+msgid ""
+"This option controls whether the client should try to change the mouse "
+"cursor depending on what is being pointed at, as well as to indicate changes "
+"in the client or server state."
+msgstr ""
+
+#: client/options.c:266
+msgid "Select cities before units"
+msgstr ""
+
+#: 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 ""
+
+#: client/options.c:272
+msgid "Clear unit orders on selection"
+msgstr ""
+
+#: client/options.c:273
+msgid ""
+"Enabling this option will cause unit orders to be cleared whenever one or "
+"more units are selected. If this option is disabled, selecting units will "
+"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 ""
+
+#: client/options.c:282
msgid "Background layer"
msgstr ""
-#: client/options.c:249
+#: client/options.c:283
msgid "The background layer of the overview shows just ocean and land."
msgstr ""
-#: client/options.c:252
+#: client/options.c:286
msgid "Terrain relief map layer"
msgstr ""
-#: client/options.c:253
+#: client/options.c:287
msgid "The relief layer shows all terrains on the map."
msgstr ""
-#: client/options.c:256
+#: client/options.c:290
msgid "Borders layer"
msgstr "שכבת גבולות"
-#: client/options.c:257
+#: client/options.c:291
msgid ""
"The borders layer of the overview shows which tiles are owned by each player."
msgstr ""
-#: client/options.c:261
+#: client/options.c:295
msgid "Units layer"
msgstr "שכבת יחידות"
-#: client/options.c:262
+#: client/options.c:296
msgid "Enabling this will draw units on the overview."
msgstr ""
-#: client/options.c:265
+#: client/options.c:299
msgid "Cities layer"
msgstr "שכבת ערי×"
-#: client/options.c:266
+#: client/options.c:300
msgid "Enabling this will draw cities on the overview."
msgstr ""
-#: client/options.c:269
+#: client/options.c:303
msgid "Overview fog of war"
msgstr "סקירת ערפל הקרב"
-#: client/options.c:270
+#: client/options.c:304
msgid "Enabling this will show fog of war on the overview."
msgstr ""
-#: client/options.c:488
+#: client/options.c:526
msgid "If you add a preset by hand, also update \"number_of_presets\""
msgstr ""
-#: client/options.c:516
+#: client/options.c:554
msgid "Cannot find your home directory"
msgstr ""
-#: client/options.c:665 client/options.c:796
+#: client/options.c:703 client/options.c:834
msgid "Save failed, cannot find a filename."
msgstr ""
-#: client/options.c:678 client/options.c:859
+#: client/options.c:716 client/options.c:897
#, c-format
msgid "Save failed, cannot write to file %s"
msgstr ""
-#: client/options.c:680 client/options.c:862
+#: client/options.c:718 client/options.c:900
#, c-format
msgid "Saved settings to file %s"
msgstr ""
@@ -8535,16 +8585,16 @@ msgstr ""
msgid "Start of turn %d"
msgstr ""
-#: client/packhand.c:1590
+#: client/packhand.c:1591
#, c-format
msgid "AI Mode is now %s."
msgstr ""
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "ON"
msgstr "פועל"
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "OFF"
msgstr "כבוי"
@@ -8576,14 +8626,15 @@ msgid "Username"
msgstr "×©× ×ž×©×ª×ž×©"
#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
-#: client/gui-gtk-2.0/pages.c:2085
+#: client/gui-gtk-2.0/pages.c:2157
msgid "Flag"
msgstr "דגל"
#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
-#: client/gui-gtk-2.0/pages.c:1536 client/gui-gtk-2.0/pages.c:2087
-#: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
-#: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
+#: 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/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr "×ומה"
@@ -8595,7 +8646,7 @@ msgstr "גבול"
msgid "Score"
msgstr "× ×™×§×•×“"
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
msgid "Team"
msgstr "צוות"
@@ -8666,280 +8717,318 @@ msgstr ""
msgid "Could not open temp file."
msgstr "×ין ×פשרות לפתוח קובץ ×–×ž× ×™."
-#: client/servers.c:407
+#: client/servers.c:410
msgid "Invalid $http_proxy or metaserver value, must start with 'http://'"
msgstr ""
-#: client/servers.c:413
+#: client/servers.c:416
msgid "Failed looking up metaserver's host"
msgstr ""
-#: client/text.c:85 client/text.c:86 client/text.c:91
+#. TRANS: "AI <player name>"
+#: client/text.c:94
+#, c-format
+msgid "AI %s"
+msgstr ""
+
+#. TRANS: "<nation adjective>, team <team name>"
+#: client/text.c:118
+#, fuzzy, c-format
+msgid "%s, team %s"
+msgstr ", צוות %s"
+
+#: client/text.c:135 client/text.c:136 client/text.c:141
#: client/gui-sdl/mapview.c:752
msgid "?nation:Neutral"
msgstr "?×ומה:× ×™×˜×¨×œ×™"
-#: client/text.c:85 client/gui-sdl/mapview.c:752
+#: client/text.c:135 client/gui-sdl/mapview.c:752
msgid "?nation:Hostile"
msgstr "?×ומה:עוין"
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Peaceful"
msgstr "?×ומה:שוחר־שלו×"
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Friendly"
msgstr "?×ומה:ידידותי"
-#: client/text.c:88 client/gui-sdl/mapview.c:755
+#: client/text.c:138 client/gui-sdl/mapview.c:755
msgid "?nation:Mysterious"
msgstr "?×ומה:מסתורי"
-#: client/text.c:88
+#: client/text.c:138
msgid "?nation:Friendly(team)"
msgstr "?×ומה:ידידותי(צוות)"
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
msgid "?city:Neutral"
msgstr "?עיר:× ×™×˜×¨×œ×™×ª"
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
msgid "?city:Hostile"
msgstr "?עיר:×¢×•×™× ×ª"
-#: client/text.c:92 client/gui-sdl/mapview.c:786
+#: client/text.c:142 client/gui-sdl/mapview.c:786
msgid "?city:Peaceful"
msgstr "?עיר:שוחרת־שלו×"
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Friendly"
msgstr "?עיר:ידידותית"
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Mysterious"
msgstr "?עיר:מסתורית"
-#: client/text.c:93
+#: client/text.c:143
msgid "?city:Friendly(team)"
msgstr "?עיר:ידידותית(צוות)"
-#: client/text.c:100
+#: client/text.c:151
#, c-format
msgid "Location: (%d, %d) [%d]"
msgstr "מיקו×: (%d, %d) [%d]"
-#: client/text.c:109
+#: client/text.c:153
+#, c-format
+msgid "Native coordinates: (%d, %d)"
+msgstr ""
+
+#: client/text.c:160
#, c-format
msgid "Terrain: %s"
msgstr "תוו××™ שטח: %s"
-#: client/text.c:110
+#: client/text.c:161
#, c-format
msgid "Food/Prod/Trade: %s"
msgstr "מזון/ייצור/סחר: %s"
-#: client/text.c:113
+#: client/text.c:164
msgid "Minor Tribe Village"
msgstr ""
-#: client/text.c:119
+#: client/text.c:173
#, fuzzy
msgid "Our territory"
msgstr ""
"\n"
"הטריטוריה ×©×œ× ×• "
-#. TRANS: "Polish territory"
-#: client/text.c:122
+#. TRANS: "Territory of <username> (<nation + team>)"
+#: client/text.c:176
#, fuzzy, c-format
-msgid "%s territory"
-msgstr "טריטוריה של ה%s"
+msgid "Territory of %s (%s)"
+msgstr ""
+"\n"
+"הטריטוריה של ה%s %s"
-#. TRANS: "Polish territory (5 turn cease-fire)"
-#: client/text.c:131
-#, c-format
-msgid "%s territory (%d turn cease-fire)"
-msgid_plural "%s territory (%d turn cease-fire)"
+#: client/text.c:186
+#, fuzzy, c-format
+msgid "Territory of %s (%s) (%d turn cease-fire)"
+msgid_plural "Territory of %s (%s) (%d turn cease-fire)"
msgstr[0] ""
+"\n"
+"טריטוריה של ×”%s (הפסקת ×ש תור ×חד)"
msgstr[1] ""
+"\n"
+"טריטוריה של ×”%s (הפסקת ×ש %d תורות)"
-#. TRANS: "Polish territory (friendly)"
-#: client/text.c:140
-#, c-format
-msgid "%s territory (%s)"
+#. TRANS: "Territory of <username>
+#. * (<nation + team> | <diplomatic state>)"
+#: client/text.c:195
+#, fuzzy, c-format
+msgid "Territory of %s (%s | %s)"
msgstr ""
+"\n"
+"הטריטוריה של ה%s %s"
-#: client/text.c:145
+#: client/text.c:200
msgid "Unclaimed territory"
msgstr ""
-#. TRANS: "City: Warsaw (Polish)"
-#: client/text.c:156
-#, c-format
-msgid "City: %s (%s)"
-msgstr ""
+#. TRANS: "City: <city name> | <username> (<nation + team>)"
+#: client/text.c:214
+#, fuzzy, c-format
+msgid "City: %s | %s (%s)"
+msgstr "עיר: %s(%s) "
-#. TRANS: "City: Warsaw (Polish, 5 turn cease-fire)"
-#: client/text.c:166
-#, c-format
-msgid "City: %s (%s, %d turn cease-fire)"
-msgid_plural "City: %s (%s, %d turn cease-fire)"
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <number> turn cease-fire)"
+#: client/text.c:224
+#, fuzzy, c-format
+msgid "City: %s | %s (%s, %d turn cease-fire)"
+msgid_plural "City: %s | %s (%s, %d turn cease-fire)"
msgstr[0] ""
+"\n"
+"טריטוריה של ×”%s (הפסקת ×ש תור ×חד)"
msgstr[1] ""
+"\n"
+"טריטוריה של ×”%s (הפסקת ×ש %d תורות)"
-#. TRANS: "City: Warsaw (Polish,friendly)"
-#: client/text.c:174
-#, c-format
-msgid "City: %s (%s, %s)"
-msgstr ""
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <diplomatic state>)"
+#: client/text.c:231
+#, fuzzy, c-format
+msgid "City: %s | %s (%s, %s)"
+msgstr "עיר: %s(%s) "
#. TRANS: previous lines gave other information about the city.
-#: client/text.c:189
+#: client/text.c:246
#, fuzzy, c-format
msgid "?clistbegin: with %s"
msgstr "?clistbegin: %s"
#. TRANS: "Trade from Warsaw: 5"
-#: client/text.c:202
+#: client/text.c:259
#, c-format
msgid "Trade from %s: %d"
msgstr ""
-#: client/text.c:210
+#: client/text.c:267
#, c-format
msgid "Infrastructure: %s"
msgstr ""
-#: client/text.c:215
+#: client/text.c:272
#, c-format
msgid "Activity: %s"
msgstr ""
-#. TRANS: "Unit: Musketeers (Polish, Warsaw)"
-#. TRANS: "Unit: Musketeers (Polish,friendly)"
-#: client/text.c:226 client/text.c:253
-#, c-format
-msgid "Unit: %s (%s, %s)"
-msgstr ""
+#. TRANS: "Unit: <unit type> | <username>
+#. * (<nation + team>, <homecity>)"
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <diplomatic state>)"
+#: client/text.c:287 client/text.c:313
+#, fuzzy, c-format
+msgid "Unit: %s | %s (%s, %s)"
+msgstr "יחידה: %s(%s%s)"
-#. TRANS: "Unit: Musketeers (Polish)"
-#: client/text.c:232
-#, c-format
-msgid "Unit: %s (%s)"
-msgstr ""
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>)"
+#: client/text.c:292
+#, fuzzy, c-format
+msgid "Unit: %s | %s (%s)"
+msgstr "יחידה: %s(%s%s)"
-#. TRANS: "Unit: Musketeers (Polish, 5 turn cease-fire)"
-#: client/text.c:245
-#, c-format
-msgid "Unit: %s (%s, %d turn cease-fire)"
-msgid_plural "Unit: %s (%s, %d turn cease-fire)"
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <number> turn cease-fire)"
+#: client/text.c:305
+#, fuzzy, c-format
+msgid "Unit: %s | %s (%s, %d turn cease-fire)"
+msgid_plural "Unit: %s | %s (%s, %d turn cease-fire)"
msgstr[0] ""
+"\n"
+"טריטוריה של ×”%s (הפסקת ×ש תור ×חד)"
msgstr[1] ""
+"\n"
+"טריטוריה של ×”%s (הפסקת ×ש %d תורות)"
#. TRANS: "Chance to win: A:95% D:46%"
-#: client/text.c:279
+#: client/text.c:338
#, c-format
msgid "Chance to win: A:%d%% D:%d%%"
msgstr ""
#. TRANS: A is attack power, D is defense power, FP is firepower,
#. * HP is hitpoints (current and max).
-#: client/text.c:286
+#: client/text.c:345
#, c-format
msgid "A:%d D:%d FP:%d HP:%d/%d (%s)"
msgstr ""
#. TRANS: "5 more" units on this tile
-#: client/text.c:295
+#: client/text.c:354
#, c-format
msgid " (%d more)"
msgstr " (עוד %d)"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:364
+#: client/text.c:423
#, c-format
msgid "far from %s"
msgstr "רחוק מ%s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:367
+#: client/text.c:426
#, c-format
msgid "near %s"
msgstr "בקרבת %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:370
+#: client/text.c:429
#, c-format
msgid "in %s"
msgstr "ב%s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:403
+#: client/text.c:462
#, c-format
msgid "from %s"
msgstr "מ%s"
-#: client/text.c:466
+#: client/text.c:525
msgid "Progress: no research"
msgstr "קידמה: ×ין מחקר"
-#: client/text.c:470
+#: client/text.c:529
msgid "Progress: no research target"
msgstr "קידמה: ×ין מטרת מחקר"
-#: client/text.c:475
+#: client/text.c:534
#, c-format
msgid "Progress: %d turn/advance"
msgid_plural "Progress: %d turns/advance"
msgstr[0] "קידמה: %d תור\\התקדמות"
msgstr[1] "קידמה: %d תורות\\התקדמות"
-#: client/text.c:480
+#: client/text.c:539
#, c-format
msgid "%d bulb/turn"
msgid_plural "%d bulbs/turn"
msgstr[0] "%d × ×•×¨×”\\תור"
msgstr[1] "%d × ×•×¨×•×ª\\תור"
-#: client/text.c:485
+#: client/text.c:544
#, c-format
msgid ", %d bulb/turn from team"
msgid_plural ", %d bulbs/turn from team"
msgstr[0] ", %d × ×•×¨×”\\תור מצוות"
msgstr[1] ", %d × ×•×¨×•×ª\\תור מצוות"
-#: client/text.c:512
+#: client/text.c:571
#, c-format
msgid "%d/- (never)"
msgstr "%d/- (×œ×¢×•×œ× ×œ×)"
-#: client/text.c:524
+#: client/text.c:583
#, c-format
msgid "%d/%d (%d turn)"
msgid_plural "%d/%d (%d turns)"
msgstr[0] "%d/%d (תור %d)"
msgstr[1] "%d/%d (%d תורות)"
-#: client/text.c:527
+#: client/text.c:586
#, c-format
msgid "%d/%d (never)"
msgstr "%d/%d (×œ×¢×•×œ× ×œ×)"
-#: client/text.c:564
+#: client/text.c:623
#, c-format
msgid "%d step"
msgid_plural "%d steps"
msgstr[0] "צעד ×חד"
msgstr[1] "%d צעדי×"
-#: client/text.c:566
+#: client/text.c:625
#, c-format
msgid "%d bulb"
msgid_plural "%d bulbs"
msgstr[0] "× ×•×¨×” ×חת"
msgstr[1] "%d × ×•×¨×•×ª"
-#: client/text.c:570 client/agents/cma_fec.c:269 client/agents/cma_fec.c:313
+#: 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
#, c-format
msgid "%d turn"
@@ -8947,89 +9036,89 @@ msgid_plural "%d turns"
msgstr[0] "תור ×חד"
msgstr[1] "%d תורות"
-#: client/text.c:592
+#: client/text.c:651
#, c-format
msgid "Population: %s"
msgstr "×וכלוסייה: %s"
-#: client/text.c:595
+#: client/text.c:654
#, c-format
msgid "Year: %s (T%d)"
msgstr "×©× ×”: %s (T%d)"
-#: client/text.c:598
+#: client/text.c:657
#, c-format
msgid "Gold: %d (%+d)"
msgstr "זהב: %d (%+d)"
-#: client/text.c:600
+#: client/text.c:659
#, c-format
msgid "Tax: %d Lux: %d Sci: %d"
msgstr "מס: %d שפע: %d מדע: %d"
-#: client/text.c:607
+#: client/text.c:666
#, fuzzy
msgid "Moving: Nobody"
msgstr "×ª× ×•×¢×”: %s"
-#: client/text.c:609
+#: client/text.c:668
#, c-format
msgid "Moving: %s"
msgstr "×ª× ×•×¢×”: %s"
-#: client/text.c:613
+#: client/text.c:672
msgid "(Click for more info)"
msgstr "(לחץ למידע × ×•×¡×£)"
-#: client/text.c:629
+#: client/text.c:688
#, c-format
msgid "%s People"
msgstr "%s ×× ×©×™×"
-#: client/text.c:633
+#: client/text.c:692
#, c-format
msgid "Turn: %d"
msgstr "תור: %d"
-#: client/text.c:635 client/gui-win32/inteldlg.c:111
+#: client/text.c:694 client/gui-win32/inteldlg.c:111
#: client/gui-xaw/inteldlg.c:208
#, c-format
msgid "Gold: %d"
msgstr "זהב: %d"
-#: client/text.c:636
+#: client/text.c:695
#, c-format
msgid "Net Income: %d"
msgstr "×”×›× ×¡×” × ×˜×•: %d"
#. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:639
+#: client/text.c:698
#, c-format
msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
msgstr "שיעור מס: זהב:%d%% שפע:%d%% מדע:%d%%"
-#: client/text.c:643
+#: client/text.c:702
#, c-format
msgid "Researching %s: %s"
msgstr "חוקר%s: %s"
-#: client/text.c:650
+#: client/text.c:709
#, c-format
msgid "Global warming chance: %d%% (%+d%%/turn)"
msgstr ""
-#: client/text.c:653
+#: client/text.c:712
#, c-format
msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
msgstr ""
-#: client/text.c:658 client/gui-win32/inteldlg.c:104
+#: client/text.c:717 client/gui-win32/inteldlg.c:104
#: client/gui-xaw/inteldlg.c:200
#, c-format
msgid "Government: %s"
msgstr "ממשל: %s"
-#: client/text.c:682
+#: client/text.c:741
#, c-format
msgid "%d unit"
msgid_plural "%d units"
@@ -9037,55 +9126,55 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Impossible to reach goto target tile
-#: client/text.c:715 client/gui-sdl/mapview.c:566
+#: client/text.c:774 client/gui-sdl/mapview.c:566
msgid "?goto:Unreachable"
msgstr ""
-#: client/text.c:717 client/gui-sdl/mapview.c:568
+#: client/text.c:776 client/gui-sdl/mapview.c:568
#, c-format
msgid "Turns to target: %d"
msgstr ""
-#: client/text.c:719 client/gui-sdl/mapview.c:570
+#: client/text.c:778 client/gui-sdl/mapview.c:570
#, c-format
msgid "Turns to target: %d to %d"
msgstr ""
-#: client/text.c:725 client/gui-sdl/mapview.c:576
+#: client/text.c:784 client/gui-sdl/mapview.c:576
#, c-format
msgid "%d unit selected"
msgid_plural "%d units selected"
msgstr[0] ""
msgstr[1] ""
-#: client/text.c:730 client/gui-sdl/mapview.c:581
+#: client/text.c:789 client/gui-sdl/mapview.c:581
msgid "No units selected."
msgstr ""
-#: client/text.c:804 client/gui-sdl/mapview.c:654
+#: client/text.c:863 client/gui-sdl/mapview.c:654
#, c-format
msgid "Others: %d civil; %d military"
msgstr ""
-#: client/text.c:806 client/gui-sdl/mapview.c:656
+#: client/text.c:865 client/gui-sdl/mapview.c:656
#, c-format
msgid "Others: %d civilian"
msgstr ""
-#: client/text.c:808 client/gui-sdl/mapview.c:658
+#: client/text.c:867 client/gui-sdl/mapview.c:658
#, c-format
msgid "Others: %d military"
msgstr ""
-#: client/text.c:839
+#: client/text.c:898
msgid "No units to upgrade!"
msgstr ""
-#: client/text.c:864
+#: client/text.c:923
msgid "None of these units may be upgraded."
msgstr ""
-#: client/text.c:870
+#: client/text.c:929
#, c-format
msgid ""
"Upgrade %d unit for %d gold?\n"
@@ -9096,72 +9185,72 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: client/text.c:891
+#: client/text.c:950
msgid "Shows your progress in researching the current technology."
msgstr ""
-#: client/text.c:897
+#: client/text.c:956
msgid "no research target."
msgstr ""
#. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:900
+#: client/text.c:959
#, c-format
msgid "%s: %d/%d."
msgstr ""
-#: client/text.c:920
+#: client/text.c:979
msgid "Shows the progress of global warming:"
msgstr ""
-#: client/text.c:921
+#: client/text.c:980
#, c-format
msgid "Pollution rate: %d%%"
msgstr "רמת זיהו×: %d%%"
-#: client/text.c:923
+#: client/text.c:982
#, c-format
msgid "Chance of catastrophic warming each turn: %d%%"
msgstr ""
-#: client/text.c:939
+#: client/text.c:998
msgid "Shows the progress of nuclear winter:"
msgstr ""
-#: client/text.c:940
+#: client/text.c:999
#, c-format
msgid "Fallout rate: %d%%"
msgstr ""
-#: client/text.c:942
+#: client/text.c:1001
#, c-format
msgid "Chance of catastrophic winter each turn: %d%%"
msgstr ""
-#: client/text.c:957
+#: client/text.c:1016
msgid "Shows your current government:"
msgstr "מציג ×ת המשטר ×”× ×•×›×—×™:"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:981
+#: client/text.c:1040
#, c-format
msgid "Population: %5d"
msgstr "×וכלוסיה: %5d"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:1043
#, c-format
msgid "Support: %5d %%"
msgstr "תמיכה: %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:1047
#, c-format
msgid "Energy: %5d %%"
msgstr "×× ×¨×’×™×”: %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:992
+#: client/text.c:1051
#, c-format
msgid "Mass: %5d ton"
msgid_plural "Mass: %5d tons"
@@ -9169,96 +9258,97 @@ msgstr[0] "מסה: %5d טון"
msgstr[1] "מסה: %5d ×˜×•× ×•×ª"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1057
#, c-format
msgid "Travel time: %5.1f years"
msgstr "משך המסע: %5.1f ×©× ×™×"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1061
msgid "Travel time: N/A "
msgstr "משך המסע: ×œ× ×–×ž×™×Ÿ "
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1065
#, c-format
msgid "Success prob.: %5d %%"
msgstr "הסתברות להצלחה: %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1010
+#: client/text.c:1069
#, c-format
msgid "Year of arrival: %8s"
msgstr "×©× ×ª ×”×’×¢×”: %8s"
-#: client/text.c:1030
+#: client/text.c:1089
msgid "?timeout:off"
msgstr ""
-#: client/text.c:1054
+#: client/text.c:1113
#, c-format
msgid "?seconds:%02ds"
msgstr ""
-#: client/text.c:1056
+#: client/text.c:1115
#, c-format
msgid "?mins/secs:%02dm %02ds"
msgstr ""
-#: client/text.c:1058
+#: client/text.c:1117
#, c-format
msgid "?hrs/mns:%02dh %02dm"
msgstr ""
-#: client/text.c:1060
+#: client/text.c:1119
#, c-format
msgid "?dys/hrs:%02dd %02dh"
msgstr ""
-#: client/text.c:1063
+#: client/text.c:1122
msgid "?duration:overflow"
msgstr ""
-#: client/text.c:1084
+#: client/text.c:1143
#, c-format
msgid "%6d.%02d ms"
msgstr ""
-#. TRANS: "Republic of the Poles"
-#: client/text.c:1127
-#, c-format
-msgid "%s of the %s"
-msgstr "%s מה־ %s"
+#. TRANS: <nation adjective> <government name>.
+#. * E.g. "Polish Republic".
+#: client/text.c:1188
+#, fuzzy, c-format
+msgid "?nationgovernment:%s %s"
+msgstr "ממשל: %s"
#. TRANS: "Observer: 1985"
-#: client/text.c:1137
+#: client/text.c:1198
#, c-format
msgid "Observer: %s"
msgstr "משקיף: %s"
-#: client/text.c:1155
+#: client/text.c:1216
msgid "Buildings: "
msgstr "×‘× ×™×™× ×™×:"
-#: client/text.c:1172 client/text.c:1211
+#: client/text.c:1233 client/text.c:1272
msgid "None. "
msgstr ""
-#: client/text.c:1174 client/text.c:1213
+#: client/text.c:1235 client/text.c:1274
msgid "?clistend:."
msgstr "?blistend:"
-#: client/text.c:1192
+#: client/text.c:1253
msgid "Wonders: "
msgstr "פל×י־תבל:"
-#: client/text.c:1247
+#: client/text.c:1308
#, c-format
msgid "Cities: %d total, %d over threshold of %d cities."
msgstr ""
#. TRANS: 0-21 content [citizen(s)] ...
-#: client/text.c:1251
+#: client/text.c:1312
#, c-format
msgid "%d content before penalty."
msgid_plural "%d content before penalty."
@@ -9266,45 +9356,40 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1257
+#: client/text.c:1318
#, c-format
msgid "%d additional unhappy citizen."
msgid_plural "%d additional unhappy citizens."
msgstr[0] ""
msgstr[1] ""
-#. TRANS: Martial law opening parenthesis
-#: client/text.c:1279
-msgid "Martial law in effect ("
+#: client/text.c:1339
+msgid "Unlimited martial law in effect."
msgstr ""
-#. TRANS: no [unit] maximum
-#: client/text.c:1284
-msgid "no maximum, "
-msgstr ""
-
-#: client/text.c:1287
+#: client/text.c:1341
#, c-format
-msgid "%d unit maximum, "
-msgid_plural "%d units maximum, "
+msgid "%d military unit may impose martial law."
+msgid_plural "Up to %d military units may impose martial law."
msgstr[0] ""
msgstr[1] ""
-#. TRANS: Martial law closing parenthesis
-#: client/text.c:1294
+#: client/text.c:1345
#, c-format
-msgid "%d per unit). "
-msgstr ""
+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:1298
+#: client/text.c:1352
msgid "Military units in the field may cause unhappiness. "
msgstr ""
-#: client/text.c:1301
+#: client/text.c:1355
msgid "Military units have no happiness effect. "
msgstr ""
-#: client/text.c:1316
+#: client/text.c:1370
#, c-format
msgid "Luxury: %d total."
msgstr ""
@@ -9324,7 +9409,7 @@ msgid ""
"instead."
msgstr ""
-#: client/tilespec.c:3968
+#: client/tilespec.c:3966
#, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
@@ -9345,12 +9430,12 @@ msgid ""
"have a look."
msgstr ""
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
-#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:599
+#: client/gui-gtk-2.0/cityrep.c:624 client/gui-sdl/citydlg.c:2009
msgid "none"
msgstr ""
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:645
msgid "custom"
msgstr ""
@@ -9639,7 +9724,7 @@ msgstr "×”×§× × ×ª×™×‘Ö¾_סחר"
msgid "Enter Marketplace"
msgstr "×”×›× ×¡ לשוק"
-#: client/gui-gtk-2.0/chatline.c:144 client/gui-win32/chatline.c:134
+#: client/gui-gtk-2.0/chatline.c:218 client/gui-win32/chatline.c:134
#: client/gui-xaw/chatline.c:120
msgid "Cleared output window."
msgstr "חלון פלט × ×§×™."
@@ -9720,11 +9805,11 @@ msgid "%d/%d %d turns"
msgstr "%d\\%d %d תורות"
#: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:821
+#: client/gui-gtk-2.0/cityrep.c:1027
msgid "_Buy"
msgstr "_×§× ×”"
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:869
#, fuzzy
msgid "_Production"
msgstr "_ייצור"
@@ -9746,12 +9831,12 @@ msgid "Entertainers"
msgstr "×‘×“×¨× ×™×"
#: client/gui-gtk-2.0/citydlg.c:1029 client/gui-win32/citydlg.c:1989
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2403
msgid "Scientists"
msgstr "×ž×“×¢× ×™×"
#: client/gui-gtk-2.0/citydlg.c:1030 client/gui-win32/citydlg.c:1991
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2404
msgid "Taxmen"
msgstr "גובי־מס"
@@ -9844,7 +9929,7 @@ msgstr "יחידות × ×ª×ž×›×•×ª %d"
msgid "Present units %d"
msgstr "יחידות × ×•×›×—×•×ª %d"
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:1019
msgid "Cen_ter"
msgstr "מר_כז"
@@ -9933,32 +10018,61 @@ msgstr "×©× ×” ×©× ×¢×™×¨"
msgid "What should we rename the city to?"
msgstr "××™×–×” ×©× ×œ×ª×ª לעיר?"
-#: client/gui-gtk-2.0/cityrep.c:699
+#: client/gui-gtk-2.0/cityrep.c:794
+msgid "(no worklists defined)"
+msgstr ""
+
+#: client/gui-gtk-2.0/cityrep.c:876
msgid "Chan_ge"
msgstr "_×©× ×”"
-#: client/gui-gtk-2.0/cityrep.c:703
+#: client/gui-gtk-2.0/cityrep.c:880
msgid "Add _First"
msgstr "הוסף _ר×שון"
-#: client/gui-gtk-2.0/cityrep.c:707
+#: client/gui-gtk-2.0/cityrep.c:884
msgid "Add _Next"
msgstr "הוסף _הב×"
-#: client/gui-gtk-2.0/cityrep.c:711
+#: client/gui-gtk-2.0/cityrep.c:888
+#, fuzzy
+msgid "Add _2nd Last"
+msgstr "הוסף _×חרון"
+
+#: client/gui-gtk-2.0/cityrep.c:892
msgid "Add _Last"
msgstr "הוסף _×חרון"
-#: client/gui-gtk-2.0/cityrep.c:715
+#: client/gui-gtk-2.0/cityrep.c:899
+#, fuzzy
+msgid "Set Worklist"
+msgstr "רשימת־עבודה"
+
+#: client/gui-gtk-2.0/cityrep.c:905
+#, fuzzy
+msgid "Append Worklist"
+msgstr "×©× ×” ×©× ×¨×©×™×ž×ªÖ¾×¢×‘×•×“×”"
+
+#: client/gui-gtk-2.0/cityrep.c:911
+#, fuzzy
+msgid "Clear _Worklist"
+msgstr "מטרת _רשימת־עבודות"
+
+#: client/gui-gtk-2.0/cityrep.c:916
+#, fuzzy
+msgid "Gover_nor"
+msgstr "מושל"
+
+#: client/gui-gtk-2.0/cityrep.c:921
msgid "_Select"
msgstr "_בחר"
-#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
+#: client/gui-gtk-2.0/cityrep.c:925 client/gui-gtk-2.0/plrdlg.c:521
#, fuzzy
msgid "_Display"
msgstr "ה_צג"
-#: client/gui-gtk-2.0/cityrep.c:800 client/gui-gtk-2.0/menu.c:808
+#: 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-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
#: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -9968,101 +10082,101 @@ msgstr "ה_צג"
msgid "Cities"
msgstr "ערי×"
-#: client/gui-gtk-2.0/cityrep.c:817
+#: client/gui-gtk-2.0/cityrep.c:1023
#, fuzzy
msgid "_Inspect"
msgstr "חלון _צץ"
-#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
-#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-sdl/helpdlg.c:297 client/gui-win32/menu.c:342
-#: client/gui-xaw/menu.c:241
+#: 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
+#: client/gui-gtk-2.0/cityrep.c:1518 client/gui-gtk-2.0/menu.c:823
+#: client/gui-gtk-2.0/menu.c:825 client/gui-gtk-2.0/menu.c:827
+#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:831
+#: client/gui-gtk-2.0/menu.c:833 client/gui-sdl/helpdlg.c:297
+#: client/gui-win32/menu.c:342 client/gui-xaw/menu.c:241
msgid "Improvements"
msgstr "שיפורי×"
-#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
-#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
-#: client/gui-xaw/menu.c:247
+#: client/gui-gtk-2.0/cityrep.c:1441 client/gui-gtk-2.0/cityrep.c:1460
+#: client/gui-gtk-2.0/cityrep.c:1479 client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1522 client/gui-xaw/menu.c:247
msgid "Wonders"
msgstr "פל×י־תבל"
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1662 client/gui-win32/cityrep.c:439
#: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
msgid "All Cities"
msgstr "כל הערי×"
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1667 client/gui-win32/cityrep.c:440
msgid "No Cities"
msgstr "××£ ×œ× ×¢×™×¨ ×חת"
-#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1672 client/gui-win32/cityrep.c:441
msgid "Invert Selection"
msgstr "הפוך בחירה"
-#: client/gui-gtk-2.0/cityrep.c:1420
+#: client/gui-gtk-2.0/cityrep.c:1682
msgid "Building Units"
msgstr "×‘× ×™×™×ª יחידות"
-#: client/gui-gtk-2.0/cityrep.c:1426
+#: client/gui-gtk-2.0/cityrep.c:1688
msgid "Building Improvements"
msgstr "×‘× ×™×™×ª שיפורי×"
-#: client/gui-gtk-2.0/cityrep.c:1432
+#: client/gui-gtk-2.0/cityrep.c:1694
msgid "Building Wonders"
msgstr "×‘× ×™×™×ª פל×י־תבל"
-#: client/gui-gtk-2.0/cityrep.c:1444
+#: client/gui-gtk-2.0/cityrep.c:1706
msgid "Building Unit"
msgstr "×‘× ×™×™×ª יחידה"
-#: client/gui-gtk-2.0/cityrep.c:1448
+#: client/gui-gtk-2.0/cityrep.c:1710
msgid "Building Improvement"
msgstr "×‘× ×™×™×ª שיפור"
-#: client/gui-gtk-2.0/cityrep.c:1452
+#: client/gui-gtk-2.0/cityrep.c:1714
msgid "Building Wonder"
msgstr "×‘× ×™×™×ª פל×־תבל"
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1722 client/gui-win32/cityrep.c:443
msgid "Coastal Cities"
msgstr "ערי חוף"
-#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1727 client/gui-win32/cityrep.c:444
msgid "Same Island"
msgstr "×ותו ××™"
-#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1737 client/gui-win32/cityrep.c:447
msgid "Supported Units"
msgstr "יחידות × ×ª×ž×›×•×ª"
-#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1740 client/gui-win32/cityrep.c:454
msgid "Units Present"
msgstr "יחידות × ×•×›×—×•×ª"
-#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1744 client/gui-win32/cityrep.c:469
msgid "Improvements in City"
msgstr "שיפורי עיר"
-#: client/gui-gtk-2.0/cityrep.c:1486
+#: client/gui-gtk-2.0/cityrep.c:1748
msgid "Wonders in City"
msgstr "פל×י־תבל בעיר"
-#: client/gui-gtk-2.0/cityrep.c:1495
+#: client/gui-gtk-2.0/cityrep.c:1757
msgid "Available Units"
msgstr "יחידות ×–×ž×™× ×•×ª"
-#: client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1760
msgid "Available Improvements"
msgstr "×©×™×¤×•×¨×™× ×–×ž×™× ×™×"
-#: client/gui-gtk-2.0/cityrep.c:1501
+#: client/gui-gtk-2.0/cityrep.c:1763
msgid "Available Wonders"
msgstr "פל×י־תבל ×–×ž×™× ×™×"
-#: client/gui-gtk-2.0/cityrep.c:1625
+#: client/gui-gtk-2.0/cityrep.c:1882
#, fuzzy, c-format
msgid "Total Buy Cost: %d"
msgstr "עלות כוללת:"
@@ -10132,12 +10246,12 @@ msgstr "××™×–×” ×©× ×œ×ª×ª לערך קבוע ×–×”?"
msgid "Remove this preset?"
msgstr "הסר ערך קבוע זה?"
-#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:186
+#: client/gui-gtk-2.0/dialogs.c:196 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:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
#, fuzzy
msgid "Inspect _City"
msgstr "_הקפץ עיר"
@@ -10166,10 +10280,10 @@ msgstr "בחר מה לבזוז:"
msgid "Unit"
msgstr "יחידה"
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
-#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
-#: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
-#: manual/civmanual.c:302 data/Freeciv.in:80
+#: 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-win32/plrdlg.c:335 manual/civmanual.c:302 data/Freeciv.in:80
msgid "Name"
msgstr "ש×"
@@ -10195,7 +10309,7 @@ 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:1036 data/Freeciv.in:3371
+#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
msgid "Pick Nation"
msgstr "בחר ×ומה"
@@ -10277,7 +10391,7 @@ msgstr "_מפות"
msgid "_Advances"
msgstr "_התקדמויות"
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:910
+#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr "_ערי×"
@@ -10383,108 +10497,177 @@ msgstr "בחר יעד"
msgid "Show _All Cities"
msgstr "הצג ×ת _כל הערי×"
-#: client/gui-gtk-2.0/gui_main.c:150
+#: client/gui-gtk-2.0/gui_main.c:162
msgid "Show Map Scrollbars"
msgstr "הצג סרגל־גלילה למפה"
-#: client/gui-gtk-2.0/gui_main.c:151
+#: client/gui-gtk-2.0/gui_main.c:163
msgid "Disable this option to hide the scrollbars on the map view."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:155
+#: client/gui-gtk-2.0/gui_main.c:167
msgid "Keyboardless goto"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:156
+#: client/gui-gtk-2.0/gui_main.c:168
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:161
+#: client/gui-gtk-2.0/gui_main.c:173
msgid "Keep dialogs on top"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:174
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:166
+#: client/gui-gtk-2.0/gui_main.c:178
msgid "Show worklist task icons"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:179
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:171
+#: client/gui-gtk-2.0/gui_main.c:183
msgid "Enable status report tabs"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:172
+#: client/gui-gtk-2.0/gui_main.c:184
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:177 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:189 client/gui-win32/gui_main.c:110
msgid "Better fog-of-war drawing"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:178 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:190 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:277 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:195
+msgid "Show time for each chat message"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:196
+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
+msgid "Split bottom notebook area"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:202
+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
+msgid "New message events go to top of list"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:208
+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
+msgid "Show extra message window buttons"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:214
+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 "
+"is disabled, these buttons will not appear (you can still double-click with "
+"the left mouse button or right-click on a row to inspect or goto "
+"respectively). This option will only take effect once the message window is "
+"closed and reopened."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:224
+msgid "Metaserver tab first in network page"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:225
+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
+msgid "Plain chat messages are sent to allies only"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:231
+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 "
+"messages will be sent as public chat messages. To send a public chat message "
+"with this option enabled, prefix the message with a single colon ':'. This "
+"option can also be set using a toggle button beside the chat entry (only "
+"visible in multiplayer games)."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:340 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:723 client/gui-gtk-2.0/gui_main.c:1345
+#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
msgid "Freeciv"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1088 client/gui-gtk-2.0/gui_main.c:1095
+#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
#: 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:1095 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1232 client/gui-sdl/mapctrl.c:1566
#: client/gui-sdl/mapview.c:1082
msgid "Shift+Return"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1127 client/gui-gtk-2.0/menu.c:770
-#: client/gui-gtk-2.0/menu.c:772 client/gui-gtk-2.0/menu.c:774
-#: client/gui-gtk-2.0/menu.c:776 client/gui-gtk-2.0/menu.c:778
-#: client/gui-gtk-2.0/menu.c:780 client/gui-gtk-2.0/menu.c:782
-#: client/gui-gtk-2.0/menu.c:784 client/gui-gtk-2.0/menu.c:786
-#: client/gui-gtk-2.0/menu.c:788 client/gui-gtk-2.0/menu.c:790
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-gtk-2.0/menu.c:804 client/gui-gtk-2.0/menu.c:806
-#: client/gui-gtk-2.0/menu.c:808 client/gui-gtk-2.0/menu.c:810
-#: client/gui-gtk-2.0/menu.c:812 client/gui-gtk-2.0/menu.c:814
-#: client/gui-gtk-2.0/menu.c:816 client/gui-gtk-2.0/menu.c:818
-#: client/gui-gtk-2.0/menu.c:820 client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/gui_main.c:1266 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
+#: client/gui-gtk-2.0/menu.c:811 client/gui-gtk-2.0/menu.c:813
+#: client/gui-gtk-2.0/menu.c:815 client/gui-gtk-2.0/menu.c:817
+#: client/gui-gtk-2.0/menu.c:819 client/gui-gtk-2.0/menu.c:821
+#: client/gui-gtk-2.0/menu.c:823 client/gui-gtk-2.0/menu.c:825
+#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
+#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
+#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
+#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
+#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
+#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
#: data/Freeciv.in:2028
msgid "View"
msgstr "הצג"
-#: client/gui-gtk-2.0/gui_main.c:1208
+#: client/gui-gtk-2.0/gui_main.c:1359
msgid "Chat"
msgstr "שיחה"
-#: client/gui-gtk-2.0/gui_main.c:1224 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1377 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"
@@ -10495,71 +10678,75 @@ msgstr ""
"בכמה ×ª× ××™×; ר××” סעיף \"Copying\" בדף העזרה\n"
"ועכשיו... - תר××” ×œ×”× ×ת ×”×’×™×”×™× ×•×!"
-#: client/gui-gtk-2.0/gui_main.c:1491
+#: client/gui-gtk-2.0/gui_main.c:1392
+msgid "Allies Only"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:1657
msgid "Not _ready"
msgstr "_×œ× ×ž×•×›×Ÿ"
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
+#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
msgid "_Ready"
msgstr "_מוכן"
-#: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2132
+#: 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
msgid "_Start"
msgstr "_התחל"
-#: client/gui-gtk-2.0/gui_main.c:1520
+#: client/gui-gtk-2.0/gui_main.c:1686
#, fuzzy
msgid "_Take Player"
msgstr "קח שחקן זה"
-#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
+#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
msgid "Pick _Nation"
msgstr "בחר _×ומה"
-#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
+#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
msgid "_Observe"
msgstr "_השקף"
-#: client/gui-gtk-2.0/gui_main.c:1532
+#: client/gui-gtk-2.0/gui_main.c:1698
#, fuzzy
msgid "Do not _observe"
msgstr "_×ל תשקיף"
-#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
msgid "<AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1557
+#: client/gui-gtk-2.0/gui_main.c:1723
msgid "<Novice AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1560
+#: client/gui-gtk-2.0/gui_main.c:1726
msgid "<Easy AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1563
+#: client/gui-gtk-2.0/gui_main.c:1729
msgid "<Normal AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1732
msgid "<Hard AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1742 client/gui-win32/dialogs.c:594
#: client/gui-xaw/pages.c:217
msgid "Random"
msgstr "×קר××™"
-#: client/gui-gtk-2.0/gui_main.c:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
msgid "Observer"
msgstr "השקף"
-#: client/gui-gtk-2.0/gui_main.c:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
msgid "Detached"
msgstr "×”×ª× ×ª×§"
-#: client/gui-gtk-2.0/gui_main.c:1899
+#: client/gui-gtk-2.0/gui_main.c:2073
msgid "Are you sure you want to quit?"
msgstr "×”×× ×תה בטוח ×©×‘×¨×¦×•× ×š לצ×ת?"
@@ -10791,469 +10978,506 @@ msgstr "_×˜×›× ×•×œ×•×’×™×•×ª"
msgid "Foreign Intelligence: %s Empire"
msgstr "מודיעין זר: %s פג־תוקף"
-#: client/gui-gtk-2.0/mapctrl.c:195 client/gui-sdl/mapctrl.c:2565
+#: client/gui-gtk-2.0/mapctrl.c:179 client/gui-sdl/mapctrl.c:2565
#: client/gui-sdl/menu.c:839 client/gui-sdl/menu.c:1021
#: client/gui-win32/mapctrl.c:353
msgid "Build New City"
msgstr "×‘× ×” עיר חדשה"
-#: client/gui-gtk-2.0/mapctrl.c:196 client/gui-sdl/mapctrl.c:2594
+#: client/gui-gtk-2.0/mapctrl.c:180 client/gui-sdl/mapctrl.c:2594
#: client/gui-win32/mapctrl.c:354 client/gui-xaw/mapctrl.c:89
msgid "What should we call our new city?"
msgstr "×יך × ×§×¨× ×œ×¢×™×¨× ×•?"
-#: client/gui-gtk-2.0/mapview.c:147
+#: client/gui-gtk-2.0/mapview.c:158
msgid "Shows your current luxury/science/tax rates;click to toggle them."
msgstr ""
-#: client/gui-gtk-2.0/mapview.c:692 client/gui-win32/canvas.c:275
+#: client/gui-gtk-2.0/mapview.c:702 client/gui-win32/canvas.c:275
msgid "Better fog will only work in truecolor. Disabling it"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:250
+#: client/gui-gtk-2.0/menu.c:256
msgid "Leaving a local game will end it!"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:700 client/gui-win32/menu.c:303
+#: client/gui-gtk-2.0/menu.c:727 client/gui-win32/menu.c:303
msgid "_Game"
msgstr "_משחק"
-#: client/gui-gtk-2.0/menu.c:702 client/gui-gtk-2.0/menu.c:704
-#: client/gui-gtk-2.0/menu.c:706 client/gui-gtk-2.0/menu.c:708
-#: client/gui-gtk-2.0/menu.c:710 client/gui-gtk-2.0/menu.c:712
-#: client/gui-gtk-2.0/menu.c:714 client/gui-gtk-2.0/menu.c:717
-#: client/gui-gtk-2.0/menu.c:720 client/gui-gtk-2.0/menu.c:722
-#: client/gui-gtk-2.0/menu.c:724 client/gui-gtk-2.0/menu.c:726
-#: client/gui-gtk-2.0/menu.c:728 client/gui-gtk-2.0/menu.c:730
-#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:736
-#: client/gui-gtk-2.0/menu.c:738 client/gui-gtk-2.0/menu.c:740
+#: client/gui-gtk-2.0/menu.c:729 client/gui-gtk-2.0/menu.c:731
+#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:735
+#: client/gui-gtk-2.0/menu.c:737 client/gui-gtk-2.0/menu.c:739
+#: client/gui-gtk-2.0/menu.c:741 client/gui-gtk-2.0/menu.c:744
+#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
+#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
+#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
+#: client/gui-gtk-2.0/menu.c:760 client/gui-gtk-2.0/menu.c:763
+#: client/gui-gtk-2.0/menu.c:765 client/gui-gtk-2.0/menu.c:767
#: data/Freeciv.in:2026
msgid "Game"
msgstr "משחק"
-#: client/gui-gtk-2.0/menu.c:704 client/gui-gtk-2.0/menu.c:706
-#: client/gui-gtk-2.0/menu.c:708
+#: client/gui-gtk-2.0/menu.c:731 client/gui-gtk-2.0/menu.c:733
+#: client/gui-gtk-2.0/menu.c:735
msgid "_Chat"
msgstr "_שיחה"
-#: client/gui-gtk-2.0/menu.c:706 client/gui-win32/menu.c:314
+#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:314
msgid "_Clear Log"
msgstr "_× ×§×” יומן־רישו×"
-#: client/gui-gtk-2.0/menu.c:708 client/gui-win32/menu.c:313
+#: client/gui-gtk-2.0/menu.c:735 client/gui-win32/menu.c:313
#, fuzzy
msgid "_Write Log"
msgstr "×™_×¦× ×™×•×ž×ŸÖ¾×¨×™×©×•×"
-#: client/gui-gtk-2.0/menu.c:710 client/gui-win32/menu.c:304
+#: client/gui-gtk-2.0/menu.c:737 client/gui-win32/menu.c:304
msgid "Local _Options"
msgstr "_×פשרויות מקומיות"
-#: client/gui-gtk-2.0/menu.c:712 client/gui-win32/menu.c:305
+#: client/gui-gtk-2.0/menu.c:739 client/gui-win32/menu.c:305
msgid "_Message Options"
msgstr "×פשרויות _הודעות"
-#: client/gui-gtk-2.0/menu.c:717
+#: client/gui-gtk-2.0/menu.c:744
msgid "_Reload Tileset"
msgstr "_טען מחדש קבוצת משבצות"
-#: client/gui-gtk-2.0/menu.c:720
+#: client/gui-gtk-2.0/menu.c:747
msgid "Save Options on _Exit"
msgstr "שמור ×פשריות בי_צי××”"
-#: client/gui-gtk-2.0/menu.c:722
+#: client/gui-gtk-2.0/menu.c:749
msgid "Sa_ve Options"
msgstr "ש_מור ×פשריות"
-#: client/gui-gtk-2.0/menu.c:726 client/gui-win32/menu.c:308
+#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:308
msgid "Server O_ptions"
msgstr "×פשריות _שרת"
-#: client/gui-gtk-2.0/menu.c:730 client/gui-win32/menu.c:310
+#: client/gui-gtk-2.0/menu.c:757 client/gui-win32/menu.c:310
msgid "_Save Game"
msgstr "_שמור משחק"
-#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:311
+#: client/gui-gtk-2.0/menu.c:760 client/gui-win32/menu.c:311
msgid "Save Game _As..."
msgstr "שמור משחק _בש×..."
-#: client/gui-gtk-2.0/menu.c:738
+#: client/gui-gtk-2.0/menu.c:765
msgid "_Leave"
msgstr "_עזוב"
-#: client/gui-gtk-2.0/menu.c:740 client/gui-win32/menu.c:317
+#: client/gui-gtk-2.0/menu.c:767 client/gui-win32/menu.c:317
msgid "_Quit"
msgstr "_יצי××”"
-#: client/gui-gtk-2.0/menu.c:745 client/gui-win32/menu.c:321
+#: client/gui-gtk-2.0/menu.c:772 client/gui-win32/menu.c:321
msgid "Gov_ernment"
msgstr "_ממשלה"
-#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
-#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
-#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:774 client/gui-gtk-2.0/menu.c:776
+#: client/gui-gtk-2.0/menu.c:778 client/gui-gtk-2.0/menu.c:780
+#: client/gui-gtk-2.0/menu.c:782 client/gui-gtk-2.0/menu.c:784
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
#: client/gui-xaw/menu.c:248 data/Freeciv.in:2027 data/helpdata.txt:1320
msgid "Government"
msgstr "ממשל"
-#: client/gui-gtk-2.0/menu.c:749 client/gui-win32/menu.c:322
+#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:322
msgid "_Tax Rates"
msgstr "שיעור־_מס"
-#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:324
+#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:324
msgid "_Find City"
msgstr "_×ž×¦× ×¢×™×¨"
-#: client/gui-gtk-2.0/menu.c:755 client/gui-win32/menu.c:325
+#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:325
msgid "_Worklists"
msgstr "_רשימת־עבודה"
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
-#: client/gui-gtk-2.0/menu.c:764 client/gui-win32/menu.c:327
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
+#: client/gui-gtk-2.0/menu.c:791 client/gui-win32/menu.c:327
msgid "_Change Government"
msgstr "_החלף ממשל"
-#: client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:788
msgid "_Revolution..."
msgstr "_מהפכה..."
-#: client/gui-gtk-2.0/menu.c:764 client/gui-gtk-2.0/menu.c:970
+#: client/gui-gtk-2.0/menu.c:791 client/gui-gtk-2.0/menu.c:1013
#: client/gui-win32/menu.c:431
msgid "_Government"
msgstr "_ממשל"
-#: client/gui-gtk-2.0/menu.c:768 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:795 client/gui-gtk-2.0/menu.c:959
#: client/gui-win32/menu.c:334
msgid "_View"
msgstr "_הצג"
-#: client/gui-gtk-2.0/menu.c:772
+#: client/gui-gtk-2.0/menu.c:799
msgid "City Outlines"
msgstr "קווי־מת×ר ערי×"
-#: client/gui-gtk-2.0/menu.c:774 client/gui-win32/menu.c:335
+#: client/gui-gtk-2.0/menu.c:801 client/gui-win32/menu.c:335
msgid "Map _Grid"
msgstr "_קווי־רשת במפה"
-#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:336
+#: client/gui-gtk-2.0/menu.c:803 client/gui-win32/menu.c:336
msgid "National _Borders"
msgstr "_גבולות ×‘×™× ×œ×ומיי×"
-#: client/gui-gtk-2.0/menu.c:778 client/gui-win32/menu.c:337
+#: client/gui-gtk-2.0/menu.c:805 client/gui-win32/menu.c:337
msgid "City _Names"
msgstr "_שמות ערי×"
-#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:338
+#: client/gui-gtk-2.0/menu.c:807 client/gui-win32/menu.c:338
msgid "City G_rowth"
msgstr "_צמיחת עיר"
-#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:339
+#: client/gui-gtk-2.0/menu.c:809 client/gui-win32/menu.c:339
msgid "City _Productions"
msgstr "_ייצור בעיר"
-#: client/gui-gtk-2.0/menu.c:784 client/gui-sdl/optiondlg.c:1719
+#: client/gui-gtk-2.0/menu.c:811
+#, fuzzy
+msgid "City Buy Cost"
+msgstr "עלות כוללת:"
+
+#: client/gui-gtk-2.0/menu.c:813
+#, fuzzy
+msgid "City Traderoutes"
+msgstr "× ×ª×™×‘×™Ö¾×¡×—×¨:"
+
+#: client/gui-gtk-2.0/menu.c:815 client/gui-sdl/optiondlg.c:1719
msgid "Draw city worker map grid"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:788 client/gui-sdl/optiondlg.c:1635
+#: client/gui-gtk-2.0/menu.c:819 client/gui-sdl/optiondlg.c:1635
#: client/gui-win32/menu.c:340 client/gui-xaw/menu.c:148
#: client/gui-xaw/menu.c:246 manual/civmanual.c:220 data/helpdata.txt:1220
msgid "Terrain"
msgstr "תוו××™ שטח"
-#: client/gui-gtk-2.0/menu.c:790 client/gui-win32/menu.c:341
+#: client/gui-gtk-2.0/menu.c:821 client/gui-win32/menu.c:341
#: client/gui-xaw/menu.c:149
msgid "Coastline"
msgstr "קו חוף"
-#: client/gui-gtk-2.0/menu.c:796 client/gui-win32/menu.c:343
+#: client/gui-gtk-2.0/menu.c:827 client/gui-win32/menu.c:343
msgid "Roads & Rails"
msgstr "×“×¨×›×™× ×•×ž×¡×™×œ×•×ª"
-#: client/gui-gtk-2.0/menu.c:800 client/gui-sdl/optiondlg.c:1933
+#: client/gui-gtk-2.0/menu.c:831 client/gui-sdl/optiondlg.c:1933
#: client/gui-win32/menu.c:345 client/gui-xaw/menu.c:152
msgid "Mines"
msgstr "מכרות"
-#: client/gui-gtk-2.0/menu.c:802 client/gui-win32/menu.c:346
+#: client/gui-gtk-2.0/menu.c:833 client/gui-win32/menu.c:346
msgid "Fortress & Airbase"
msgstr "×‘×™×¦×•×¨×™× ×•×‘×¡×™×¡×™Ö¾×ª×¢×•×¤×”"
-#: client/gui-gtk-2.0/menu.c:804 client/gui-win32/menu.c:348
+#: client/gui-gtk-2.0/menu.c:835 client/gui-win32/menu.c:348
#: client/gui-xaw/menu.c:154
msgid "Specials"
msgstr "מיוחדי×"
-#: client/gui-gtk-2.0/menu.c:806 client/gui-win32/menu.c:349
+#: client/gui-gtk-2.0/menu.c:837 client/gui-win32/menu.c:349
#: client/gui-xaw/menu.c:155
msgid "Pollution & Fallout"
msgstr "×–×™×”×•× ×•× ×©×•×¨×ª"
-#: client/gui-gtk-2.0/menu.c:812 client/gui-win32/menu.c:352
+#: client/gui-gtk-2.0/menu.c:843 client/gui-win32/menu.c:352
#: client/gui-xaw/menu.c:158
msgid "Focus Unit"
msgstr "מיקוד יחידה"
-#: client/gui-gtk-2.0/menu.c:814 client/gui-sdl/optiondlg.c:1854
+#: client/gui-gtk-2.0/menu.c:845 client/gui-sdl/optiondlg.c:1854
#: client/gui-win32/menu.c:353 client/gui-xaw/menu.c:159
msgid "Fog of War"
msgstr "ערפל קרב"
-#: client/gui-gtk-2.0/menu.c:818
+#: client/gui-gtk-2.0/menu.c:849
msgid "_Full Screen"
msgstr "מסך _מל×"
-#: client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/menu.c:853
msgid "_Center View"
msgstr "מ_רכז תצוגה"
-#: client/gui-gtk-2.0/menu.c:825 client/gui-win32/menu.c:358
+#: client/gui-gtk-2.0/menu.c:856 client/gui-win32/menu.c:358
msgid "_Orders"
msgstr "_פקודות"
-#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
-#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
-#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
-#: client/gui-gtk-2.0/menu.c:855 client/gui-gtk-2.0/menu.c:857
-#: client/gui-gtk-2.0/menu.c:859 client/gui-gtk-2.0/menu.c:861
-#: client/gui-gtk-2.0/menu.c:863 client/gui-gtk-2.0/menu.c:865
-#: client/gui-gtk-2.0/menu.c:867 client/gui-gtk-2.0/menu.c:869
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875 client/gui-gtk-2.0/menu.c:877
-#: client/gui-gtk-2.0/menu.c:879 client/gui-gtk-2.0/menu.c:881
-#: client/gui-gtk-2.0/menu.c:883 client/gui-gtk-2.0/menu.c:885
-#: client/gui-gtk-2.0/menu.c:887 client/gui-gtk-2.0/menu.c:889
-#: client/gui-gtk-2.0/menu.c:891 client/gui-gtk-2.0/menu.c:893
-#: client/gui-gtk-2.0/menu.c:895 client/gui-gtk-2.0/menu.c:897
-#: client/gui-gtk-2.0/menu.c:899 client/gui-gtk-2.0/menu.c:901
-#: client/gui-gtk-2.0/menu.c:903 data/Freeciv.in:2029
+#: client/gui-gtk-2.0/menu.c:858 client/gui-gtk-2.0/menu.c:860
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:864
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:868
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:872
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:876
+#: client/gui-gtk-2.0/menu.c:878 client/gui-gtk-2.0/menu.c:880
+#: client/gui-gtk-2.0/menu.c:882 client/gui-gtk-2.0/menu.c:884
+#: client/gui-gtk-2.0/menu.c:886 client/gui-gtk-2.0/menu.c:888
+#: client/gui-gtk-2.0/menu.c:890 client/gui-gtk-2.0/menu.c:892
+#: client/gui-gtk-2.0/menu.c:894 client/gui-gtk-2.0/menu.c:896
+#: client/gui-gtk-2.0/menu.c:898 client/gui-gtk-2.0/menu.c:900
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906 client/gui-gtk-2.0/menu.c:908
+#: client/gui-gtk-2.0/menu.c:910 client/gui-gtk-2.0/menu.c:912
+#: client/gui-gtk-2.0/menu.c:914 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:918 client/gui-gtk-2.0/menu.c:920
+#: client/gui-gtk-2.0/menu.c:922 client/gui-gtk-2.0/menu.c:924
+#: client/gui-gtk-2.0/menu.c:926 client/gui-gtk-2.0/menu.c:928
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
+#: client/gui-gtk-2.0/menu.c:946 data/Freeciv.in:2029
msgid "Orders"
msgstr "פקודות"
-#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:1444
+#: client/gui-gtk-2.0/menu.c:860 client/gui-gtk-2.0/menu.c:1489
#: client/gui-win32/menu.c:359
msgid "_Build City"
msgstr "_×‘× ×” עיר"
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:1466
-#: client/gui-gtk-2.0/menu.c:1472 client/gui-win32/menu.c:360
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:1511
+#: client/gui-gtk-2.0/menu.c:1517 client/gui-win32/menu.c:360
msgid "Build _Road"
msgstr "_סלול דרך"
-#: client/gui-gtk-2.0/menu.c:833 client/gui-gtk-2.0/menu.c:1360
+#: 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 "צור מערכת _השקיה"
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:1361
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:1406
#: client/gui-win32/menu.c:362
msgid "Build _Mine"
msgstr "חצוב _מכרה"
-#: client/gui-gtk-2.0/menu.c:837 client/gui-gtk-2.0/menu.c:1362
+#: client/gui-gtk-2.0/menu.c:868 client/gui-gtk-2.0/menu.c:1407
msgid "Transf_orm Terrain"
msgstr "המר _תוו××™ שטח"
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:1508
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:1553
#: client/gui-win32/menu.c:364
msgid "Build _Fortress"
msgstr "_×‘× ×” ביצורי×"
-#: client/gui-gtk-2.0/menu.c:841 client/gui-win32/menu.c:365
+#: client/gui-gtk-2.0/menu.c:872 client/gui-win32/menu.c:365
msgid "Build Airbas_e"
msgstr "×”×§× ×‘×¡×™×¡Ö¾_×וויר"
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:1514
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:1559
#: client/gui-win32/menu.c:366
msgid "Clean _Pollution"
msgstr "× ×§×” _זיהו×"
-#: client/gui-gtk-2.0/menu.c:845 client/gui-win32/menu.c:367
+#: client/gui-gtk-2.0/menu.c:876 client/gui-win32/menu.c:367
msgid "Clean _Nuclear Fallout"
msgstr "× ×§×” _× ×©×•×¨×ª ×’×¨×¢×™× ×™×ª"
-#: client/gui-gtk-2.0/menu.c:849 client/gui-win32/menu.c:369
+#: client/gui-gtk-2.0/menu.c:880 client/gui-win32/menu.c:369
msgid "_Sentry"
msgstr "_משמר"
-#: client/gui-gtk-2.0/menu.c:855 client/gui-win32/menu.c:372
+#: client/gui-gtk-2.0/menu.c:886 client/gui-win32/menu.c:372
msgid "Make _Homecity"
msgstr "הפוך לעיר־ה_בית"
-#: client/gui-gtk-2.0/menu.c:857 client/gui-win32/menu.c:373
+#: client/gui-gtk-2.0/menu.c:888 client/gui-win32/menu.c:373
msgid "_Load"
msgstr "_טען"
-#: client/gui-gtk-2.0/menu.c:859
+#: client/gui-gtk-2.0/menu.c:890
msgid "_Unload Transporter"
msgstr "_פרוק מוביל"
-#: client/gui-gtk-2.0/menu.c:861 client/gui-win32/menu.c:374
+#: client/gui-gtk-2.0/menu.c:892 client/gui-win32/menu.c:374
msgid "_Unload"
msgstr "_פרוק"
-#: client/gui-gtk-2.0/menu.c:863 client/gui-win32/menu.c:375
+#: client/gui-gtk-2.0/menu.c:894 client/gui-win32/menu.c:375
msgid "Wake up o_thers"
msgstr "×”_ער ×ת ×”×חרי×"
-#: client/gui-gtk-2.0/menu.c:867
+#: client/gui-gtk-2.0/menu.c:898
msgid "_Auto Settler"
msgstr "×”×ª× ×—×œ×•×ª _×וטומטית"
-#: client/gui-gtk-2.0/menu.c:869 client/gui-win32/menu.c:378
+#: client/gui-gtk-2.0/menu.c:900 client/gui-win32/menu.c:378
msgid "Auto E_xplore"
msgstr "_גילוי־×רץ ×וטומטי"
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906
msgid "_Connect"
msgstr "_חבר"
-#: client/gui-gtk-2.0/menu.c:871 client/gui-win32/menu.c:380
+#: client/gui-gtk-2.0/menu.c:902 client/gui-win32/menu.c:380
msgid "_Road"
msgstr "_דרך"
-#: client/gui-gtk-2.0/menu.c:873 client/gui-win32/menu.c:381
+#: client/gui-gtk-2.0/menu.c:904 client/gui-win32/menu.c:381
msgid "Rai_l"
msgstr "_מסילה"
-#: client/gui-gtk-2.0/menu.c:875 client/gui-win32/menu.c:382
+#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:382
msgid "_Irrigate"
msgstr "_השקה"
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
msgid "Go _to"
msgstr "_לך ×ל"
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
msgid "_Build city"
msgstr "_×‘× ×” עיר"
-#: client/gui-gtk-2.0/menu.c:879
+#: client/gui-gtk-2.0/menu.c:910
msgid "Patrol (_Q)"
msgstr "פטרול (_Q)"
-#: client/gui-gtk-2.0/menu.c:881 client/gui-win32/menu.c:385
+#: client/gui-gtk-2.0/menu.c:912 client/gui-win32/menu.c:385
msgid "_Go to"
msgstr "_לך ×ל"
-#: client/gui-gtk-2.0/menu.c:883
+#: client/gui-gtk-2.0/menu.c:914
msgid "Go\\/Airlift to City"
msgstr "לך\\/עבור ×ווירית לעיר"
-#: client/gui-gtk-2.0/menu.c:885 client/gui-sdl/menu.c:450
+#: client/gui-gtk-2.0/menu.c:916 client/gui-sdl/menu.c:450
#: client/gui-win32/menu.c:387 client/gui-xaw/menu.c:203
msgid "Return to nearest city"
msgstr "חזור לעיר הקרובה ביותר"
-#: client/gui-gtk-2.0/menu.c:889 client/gui-win32/menu.c:389
+#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:389
#: client/gui-xaw/menu.c:205
msgid "Disband Unit"
msgstr "פזר יחידה"
-#: client/gui-gtk-2.0/menu.c:891 client/gui-sdl/citydlg.c:532
+#: client/gui-gtk-2.0/menu.c:922 client/gui-sdl/citydlg.c:532
#: data/Freeciv.in:1186
msgid "Upgrade unit"
msgstr "שדרג יחידה"
-#: client/gui-gtk-2.0/menu.c:893
+#: client/gui-gtk-2.0/menu.c:924
msgid "Diplomat\\/Spy Actions"
msgstr "פעולות דיפלומט\\/מרגל"
-#: client/gui-gtk-2.0/menu.c:895 client/gui-sdl/menu.c:399
+#: client/gui-gtk-2.0/menu.c:926 client/gui-sdl/menu.c:399
#: client/gui-win32/menu.c:391 client/gui-xaw/menu.c:209
msgid "Explode Nuclear"
msgstr "פוצץ יחידה ×’×¨×¢×™× ×™×ª"
-#: client/gui-gtk-2.0/menu.c:899
-msgid "Select same type"
-msgstr "בחר ×ותו סוג"
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/cityrep.c:882
+msgid "Select"
+msgstr "בחר"
+
+#: client/gui-gtk-2.0/menu.c:934
+#, fuzzy
+msgid "Single"
+msgstr "×’'×•× ×’×œ"
-#: client/gui-gtk-2.0/menu.c:901 client/gui-win32/menu.c:393
+#: client/gui-gtk-2.0/menu.c:936
+msgid "Same Type On Tile"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:938
+msgid "All On Tile"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:940
+msgid "Same Type On Continent"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:942
+msgid "Same Type Everywhere"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:393
msgid "_Wait"
msgstr "_המתן"
-#: client/gui-gtk-2.0/menu.c:903 client/gui-win32/menu.c:394
+#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:394
#: client/gui-xaw/menu.c:213
msgid "Done"
msgstr "הסתיי×"
-#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:398
+#: client/gui-gtk-2.0/menu.c:949 client/gui-win32/menu.c:398
msgid "_Reports"
msgstr "_דוחות"
-#: client/gui-gtk-2.0/menu.c:908 client/gui-gtk-2.0/menu.c:910
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:914
-#: client/gui-gtk-2.0/menu.c:916 client/gui-gtk-2.0/menu.c:918
-#: client/gui-gtk-2.0/menu.c:920 client/gui-gtk-2.0/menu.c:922
-#: client/gui-gtk-2.0/menu.c:924 client/gui-gtk-2.0/menu.c:926
-#: client/gui-gtk-2.0/menu.c:928 client/gui-gtk-2.0/menu.c:930
-#: client/gui-gtk-2.0/menu.c:932 data/Freeciv.in:2030
+#: client/gui-gtk-2.0/menu.c:951 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:957
+#: client/gui-gtk-2.0/menu.c:959 client/gui-gtk-2.0/menu.c:961
+#: client/gui-gtk-2.0/menu.c:963 client/gui-gtk-2.0/menu.c:965
+#: client/gui-gtk-2.0/menu.c:967 client/gui-gtk-2.0/menu.c:969
+#: client/gui-gtk-2.0/menu.c:971 client/gui-gtk-2.0/menu.c:973
+#: client/gui-gtk-2.0/menu.c:975 data/Freeciv.in:2030
msgid "Reports"
msgstr "דוחות"
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:958
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:1001
#: client/gui-win32/menu.c:400 client/gui-win32/menu.c:425
msgid "_Units"
msgstr "_יחידות"
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/menu.c:914 client/gui-win32/menu.c:402
+#: client/gui-gtk-2.0/menu.c:957 client/gui-win32/menu.c:402
#, fuzzy
msgid "_Nations"
msgstr "_×ומות"
-#: client/gui-gtk-2.0/menu.c:918 client/gui-win32/menu.c:403
+#: client/gui-gtk-2.0/menu.c:961 client/gui-win32/menu.c:403
msgid "_Economy"
msgstr "_כלכלה"
#. TRANS: Research report action
-#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:405
+#: client/gui-gtk-2.0/menu.c:963 client/gui-win32/menu.c:405
#, fuzzy
msgid "_Research"
msgstr "_מחקר"
-#: client/gui-gtk-2.0/menu.c:924 client/gui-win32/menu.c:407
+#: client/gui-gtk-2.0/menu.c:967 client/gui-win32/menu.c:407
msgid "_Wonders of the World"
msgstr "_פל×י־תבל"
-#: client/gui-gtk-2.0/menu.c:926 client/gui-win32/menu.c:408
+#: client/gui-gtk-2.0/menu.c:969 client/gui-win32/menu.c:408
msgid "_Top Five Cities"
msgstr "_חמש ×”×¢×¨×™× ×”×¨××©×•× ×•×ª"
-#: client/gui-gtk-2.0/menu.c:928 client/gui-win32/menu.c:409
+#: client/gui-gtk-2.0/menu.c:971 client/gui-win32/menu.c:409
msgid "_Messages"
msgstr "_הודעות"
-#: client/gui-gtk-2.0/menu.c:930 client/gui-win32/menu.c:410
+#: client/gui-gtk-2.0/menu.c:973 client/gui-win32/menu.c:410
msgid "_Demographics"
msgstr "_מידע דמוגרפי"
-#: client/gui-gtk-2.0/menu.c:932 client/gui-gtk-2.0/plrdlg.c:471
+#: client/gui-gtk-2.0/menu.c:975 client/gui-gtk-2.0/plrdlg.c:354
#: client/gui-win32/menu.c:411
msgid "_Spaceship"
msgstr "_×¡×¤×™× ×ªÖ¾×—×œ×œ"
-#: client/gui-gtk-2.0/menu.c:936 client/gui-win32/menu.c:415
+#: client/gui-gtk-2.0/menu.c:979 client/gui-win32/menu.c:415
msgid "_Help"
msgstr "_עזרה"
-#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
-#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
-#: client/gui-gtk-2.0/menu.c:946 client/gui-gtk-2.0/menu.c:948
-#: client/gui-gtk-2.0/menu.c:950 client/gui-gtk-2.0/menu.c:952
-#: client/gui-gtk-2.0/menu.c:954 client/gui-gtk-2.0/menu.c:956
-#: client/gui-gtk-2.0/menu.c:958 client/gui-gtk-2.0/menu.c:960
-#: client/gui-gtk-2.0/menu.c:962 client/gui-gtk-2.0/menu.c:964
-#: client/gui-gtk-2.0/menu.c:966 client/gui-gtk-2.0/menu.c:968
-#: client/gui-gtk-2.0/menu.c:970 client/gui-gtk-2.0/menu.c:972
-#: client/gui-gtk-2.0/menu.c:974 client/gui-gtk-2.0/menu.c:976
-#: client/gui-gtk-2.0/menu.c:978 client/gui-gtk-2.0/menu.c:980
+#: client/gui-gtk-2.0/menu.c:981 client/gui-gtk-2.0/menu.c:983
+#: client/gui-gtk-2.0/menu.c:985 client/gui-gtk-2.0/menu.c:987
+#: client/gui-gtk-2.0/menu.c:989 client/gui-gtk-2.0/menu.c:991
+#: client/gui-gtk-2.0/menu.c:993 client/gui-gtk-2.0/menu.c:995
+#: client/gui-gtk-2.0/menu.c:997 client/gui-gtk-2.0/menu.c:999
+#: client/gui-gtk-2.0/menu.c:1001 client/gui-gtk-2.0/menu.c:1003
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-gtk-2.0/menu.c:1007
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-gtk-2.0/menu.c:1011
+#: client/gui-gtk-2.0/menu.c:1013 client/gui-gtk-2.0/menu.c:1015
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-gtk-2.0/menu.c:1019
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-gtk-2.0/menu.c:1023
#: client/gui-gtk-2.0/repodlgs.c:313 client/gui-win32/citydlg.c:1077
#: client/gui-win32/repodlgs.c:289 client/gui-win32/wldlg.c:846
#: data/Freeciv.in:1466 data/Freeciv.in:2031 data/Freeciv.in:2101
@@ -11261,119 +11485,119 @@ msgstr "_עזרה"
msgid "Help"
msgstr "עזרה"
-#: client/gui-gtk-2.0/menu.c:940 client/gui-win32/menu.c:416
+#: client/gui-gtk-2.0/menu.c:983 client/gui-win32/menu.c:416
msgid "Language_s"
msgstr "_שפות"
-#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/menu.c:417
+#: client/gui-gtk-2.0/menu.c:985 client/gui-win32/menu.c:417
msgid "Co_nnecting"
msgstr "_מתחבר"
-#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:418
+#: client/gui-gtk-2.0/menu.c:987 client/gui-win32/menu.c:418
msgid "C_ontrols"
msgstr "_בקרות"
-#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:419
+#: client/gui-gtk-2.0/menu.c:989 client/gui-win32/menu.c:419
msgid "C_hatline"
msgstr "קו _שיחה"
-#: client/gui-gtk-2.0/menu.c:948 client/gui-win32/menu.c:420
+#: client/gui-gtk-2.0/menu.c:991 client/gui-win32/menu.c:420
msgid "_Worklist Editor"
msgstr "עורך _רשימת־עבודה"
-#: client/gui-gtk-2.0/menu.c:950 client/gui-win32/menu.c:421
+#: client/gui-gtk-2.0/menu.c:993 client/gui-win32/menu.c:421
msgid "Citizen _Management"
msgstr "_× ×™×”×•×œ ×זרחי×"
-#: client/gui-gtk-2.0/menu.c:952 client/gui-win32/menu.c:422
+#: client/gui-gtk-2.0/menu.c:995 client/gui-win32/menu.c:422
msgid "_Playing"
msgstr "_משחקי×"
-#: client/gui-gtk-2.0/menu.c:956 client/gui-win32/menu.c:424
+#: client/gui-gtk-2.0/menu.c:999 client/gui-win32/menu.c:424
msgid "City _Improvements"
msgstr "_×©×™×¤×•×¨×™× ×‘×¢×¨×™×"
-#: client/gui-gtk-2.0/menu.c:960 client/gui-win32/menu.c:426
+#: client/gui-gtk-2.0/menu.c:1003 client/gui-win32/menu.c:426
msgid "Com_bat"
msgstr "_קרב"
-#: client/gui-gtk-2.0/menu.c:962 client/gui-win32/menu.c:427
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-win32/menu.c:427
msgid "_ZOC"
msgstr "_×זור־שליטה"
-#: client/gui-gtk-2.0/menu.c:964 client/gui-win32/menu.c:428
+#: client/gui-gtk-2.0/menu.c:1007 client/gui-win32/menu.c:428
msgid "Techno_logy"
msgstr "_×˜×›× ×•×œ×•×’×™×”"
-#: client/gui-gtk-2.0/menu.c:966 client/gui-win32/menu.c:429
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-win32/menu.c:429
msgid "_Terrain"
msgstr "_תוו×י־קרקע"
-#: client/gui-gtk-2.0/menu.c:968 client/gui-win32/menu.c:430
+#: client/gui-gtk-2.0/menu.c:1011 client/gui-win32/menu.c:430
msgid "Won_ders"
msgstr "_פל×י־תבל"
-#: client/gui-gtk-2.0/menu.c:972 client/gui-win32/menu.c:432
+#: client/gui-gtk-2.0/menu.c:1015 client/gui-win32/menu.c:432
msgid "Happin_ess"
msgstr "_×ושר"
-#: client/gui-gtk-2.0/menu.c:974 client/gui-win32/menu.c:433
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-win32/menu.c:433
msgid "Space _Race"
msgstr "המירוץ ל_חלל"
-#: client/gui-gtk-2.0/menu.c:978 client/gui-win32/menu.c:435
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-win32/menu.c:435
msgid "_Copying"
msgstr "_העתקה"
-#: client/gui-gtk-2.0/menu.c:980 client/gui-win32/menu.c:436
+#: client/gui-gtk-2.0/menu.c:1023 client/gui-win32/menu.c:436
msgid "_About"
msgstr "_×ודות"
-#: client/gui-gtk-2.0/menu.c:1264
+#: client/gui-gtk-2.0/menu.c:1307
#, c-format
msgid "%s..."
msgstr "%s..."
-#: client/gui-gtk-2.0/menu.c:1352
+#: client/gui-gtk-2.0/menu.c:1397
#, c-format
msgid "Change to %s (_I)"
msgstr "×©× ×” ל%s (_I)"
-#: client/gui-gtk-2.0/menu.c:1353
+#: client/gui-gtk-2.0/menu.c:1398
#, c-format
msgid "Change to %s (_M)"
msgstr "×©× ×” ל%s (_M)"
-#: client/gui-gtk-2.0/menu.c:1354
+#: client/gui-gtk-2.0/menu.c:1399
#, c-format
msgid "Transf_orm to %s"
msgstr "_המר ל%s"
-#: client/gui-gtk-2.0/menu.c:1427
+#: client/gui-gtk-2.0/menu.c:1472
msgid "Help _Build Wonder"
msgstr "סייע ×‘×‘× ×™×™×ª _פל×־תבל"
-#: client/gui-gtk-2.0/menu.c:1441
+#: client/gui-gtk-2.0/menu.c:1486
msgid "Add to City (_B)"
msgstr "הוסף לעיר (_B)"
-#: client/gui-gtk-2.0/menu.c:1449
+#: client/gui-gtk-2.0/menu.c:1494
msgid "Make Trade _Route"
msgstr "צור × ×ª×™×‘Ö¾_סחר"
-#: client/gui-gtk-2.0/menu.c:1463
+#: client/gui-gtk-2.0/menu.c:1508
msgid "Build _Railroad"
msgstr "×‘× ×” _מסילת־ברזל"
-#: client/gui-gtk-2.0/menu.c:1486
+#: client/gui-gtk-2.0/menu.c:1531
msgid "Bu_ild Farmland"
msgstr "×‘× ×” _חווה"
-#: client/gui-gtk-2.0/menu.c:1506
+#: client/gui-gtk-2.0/menu.c:1551
msgid "_Fortify"
msgstr "_בצר"
-#: client/gui-gtk-2.0/menu.c:1512
+#: client/gui-gtk-2.0/menu.c:1557
msgid "_Paradrop"
msgstr "_×”×¦× ×—"
@@ -11407,13 +11631,32 @@ msgstr "הדע"
msgid "Pop"
msgstr "צץ"
-#: client/gui-gtk-2.0/messagewin.c:155 client/gui-sdl/messagewin.c:247
+#: client/gui-gtk-2.0/messagewin.c:186 client/gui-sdl/messagewin.c:247
#: client/gui-win32/messagewin.c:132 client/gui-xaw/menu.c:228
#: data/Freeciv.in:3273 data/Freeciv.in:3274 data/Freeciv.in:3283
msgid "Messages"
msgstr "הודעות"
-#: client/gui-gtk-2.0/plrdlg.c:330
+#: client/gui-gtk-2.0/plrdlg.c:317
+msgid "_Meet"
+msgstr "_פגוש"
+
+#: client/gui-gtk-2.0/plrdlg.c:323
+#, fuzzy
+msgid "Cancel _Treaty"
+msgstr "_בטל ברית"
+
+#: client/gui-gtk-2.0/plrdlg.c:329
+#, fuzzy
+msgid "_Withdraw Vision"
+msgstr "_משוך חזון"
+
+#: client/gui-gtk-2.0/plrdlg.c:348
+#, fuzzy
+msgid "_Report"
+msgstr "_דוחות"
+
+#: client/gui-gtk-2.0/plrdlg.c:386
msgid "?show:Dead Players"
msgstr "?הצג:×©×—×§× ×™× ×ž×ª×™×"
@@ -11421,268 +11664,271 @@ msgstr "?הצג:×©×—×§× ×™× ×ž×ª×™×"
#. TRANS: Nations report action
#. TRANS: Nations report title
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/plrdlg.c:350 client/gui-sdl/mapctrl.c:1580
+#: client/gui-gtk-2.0/plrdlg.c:406 client/gui-sdl/mapctrl.c:1580
#: client/gui-sdl/plrdlg.c:608 client/gui-win32/plrdlg.c:344
#: client/gui-xaw/menu.c:221 data/Freeciv.in:3192 data/Freeciv.in:3193
msgid "Nations"
msgstr "×ומות"
-#: client/gui-gtk-2.0/plrdlg.c:443
-msgid "_Intelligence"
-msgstr "_מודיעין"
-
-#: client/gui-gtk-2.0/plrdlg.c:450
-msgid "_Meet"
-msgstr "_פגוש"
-
-#: client/gui-gtk-2.0/plrdlg.c:457
+#: client/gui-gtk-2.0/plrdlg.c:511
#, fuzzy
-msgid "Cancel _Treaty"
-msgstr "_בטל ברית"
+msgid "Di_plomacy"
+msgstr "דיפלומטיה"
-#: client/gui-gtk-2.0/plrdlg.c:464
-msgid "_Withdraw vision"
-msgstr "_משוך חזון"
+#: client/gui-gtk-2.0/plrdlg.c:516
+msgid "_Intelligence"
+msgstr "_מודיעין"
-#: client/gui-gtk-2.0/plrdlg.c:495
+#: client/gui-gtk-2.0/plrdlg.c:526
msgid "_AI"
msgstr "_×\"מ"
-#: client/gui-gtk-2.0/plrdlg.c:501
+#: client/gui-gtk-2.0/plrdlg.c:532
msgid "_Toggle AI Mode"
msgstr "הפעל/בטל מצב ×\"מ"
-#: client/gui-gtk-2.0/pages.c:208
+#: client/gui-gtk-2.0/pages.c:221
msgid "Start _New Game"
msgstr "התחל משחק _חדש"
-#: client/gui-gtk-2.0/pages.c:214
+#: client/gui-gtk-2.0/pages.c:227
msgid "Start _Scenario Game"
msgstr "התחל משחק לפי _תסריט"
-#: client/gui-gtk-2.0/pages.c:220
+#: client/gui-gtk-2.0/pages.c:233
msgid "_Load Saved Game"
msgstr "_טען משחק שמור"
-#: client/gui-gtk-2.0/pages.c:229
+#: client/gui-gtk-2.0/pages.c:239
msgid "C_onnect to Network Game"
msgstr "הת_חבר למשחק רשת"
-#: client/gui-gtk-2.0/pages.c:236
+#: client/gui-gtk-2.0/pages.c:247
msgid "Connect to Gaming _Zone"
msgstr "התחבר ×ל Gaming _Zone"
-#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:300
#: client/gui-xaw/connectdlg.c:326
msgid "Passwords don't match, enter password."
msgstr "ססמ×ות ××™× ×Ÿ תו×מות, הזן ססמה."
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:779 client/gui-gtk-2.0/pages.c:820
+#: client/gui-win32/connectdlg.c:916
msgid "Server Name"
msgstr "×©× ×©×¨×ª"
-#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
+#: 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
+#: data/Freeciv.in:96
msgid "Port"
msgstr "פורט"
-#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
+#: client/gui-win32/connectdlg.c:917
msgid "Version"
msgstr "גרסה"
-#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
-#: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
+#: 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
msgid "Status"
msgstr "מצב"
-#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
-#: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
+#: 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
msgid "Players"
msgstr "×©×—×§× ×™×"
-#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
+#: client/gui-win32/connectdlg.c:918
msgid "Comment"
msgstr "הערה"
-#: client/gui-gtk-2.0/pages.c:747
+#: client/gui-gtk-2.0/pages.c:786
msgid "Local _Area Network"
msgstr "_רשת תקשורת מקומית"
-#: client/gui-gtk-2.0/pages.c:783
+#: client/gui-gtk-2.0/pages.c:827
msgid "Internet _Metaserver"
msgstr "_מטה־שרת ××™× ×˜×¨× ×˜"
-#: client/gui-gtk-2.0/pages.c:817
+#: client/gui-gtk-2.0/pages.c:864
msgid "_Host:"
msgstr "_שרת:"
-#: client/gui-gtk-2.0/pages.c:834
+#: client/gui-gtk-2.0/pages.c:881
msgid "_Port:"
msgstr "_פורט:"
-#: client/gui-gtk-2.0/pages.c:851
+#: client/gui-gtk-2.0/pages.c:898
msgid "_Login:"
msgstr "_×›× ×™×¡×”:"
-#: client/gui-gtk-2.0/pages.c:869
+#: client/gui-gtk-2.0/pages.c:916
msgid "Pass_word:"
msgstr "_ססמה:"
-#: client/gui-gtk-2.0/pages.c:887
+#: client/gui-gtk-2.0/pages.c:934
msgid "Conf_irm Password:"
msgstr "_×ישור ססמה:"
-#: client/gui-gtk-2.0/pages.c:912
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: 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/wldlg.c:800 client/gui-win32/wldlg.c:806
+msgid "Type"
+msgstr "סוג"
+
+#: client/gui-gtk-2.0/pages.c:952 client/gui-win32/plrdlg.c:337
+#: data/Freeciv.in:88
+msgid "Host"
+msgstr "מחשב מ×רח"
+
+#: client/gui-gtk-2.0/pages.c:981
msgid "C_onnect"
msgstr "הת_חבר"
-#: client/gui-gtk-2.0/pages.c:1142
+#: client/gui-gtk-2.0/pages.c:1211
#, c-format
msgid "Connection name: %s"
msgstr "×©× ×—×™×‘×•×¨: %s"
-#: client/gui-gtk-2.0/pages.c:1145
+#: client/gui-gtk-2.0/pages.c:1214
#, c-format
msgid "Player name: %s"
msgstr "×©× ×©×—×§×Ÿ: %s"
-#: client/gui-gtk-2.0/pages.c:1150
+#: client/gui-gtk-2.0/pages.c:1219
#, c-format
msgid "Host: %s"
msgstr "מחשב־מ×רח: %s"
-#: client/gui-gtk-2.0/pages.c:1158
+#: client/gui-gtk-2.0/pages.c:1227
msgid "Player/conn info"
msgstr "מידע שחקן/חיבור"
-#: client/gui-gtk-2.0/pages.c:1185
+#: client/gui-gtk-2.0/pages.c:1254
#, c-format
msgid "%s info"
msgstr "מידע %s"
-#: client/gui-gtk-2.0/pages.c:1196
+#: client/gui-gtk-2.0/pages.c:1265
msgid "Toggle player ready"
msgstr "הפעל/בטל ×ž×•×›× ×•×ª שחקן"
-#: client/gui-gtk-2.0/pages.c:1204
+#: client/gui-gtk-2.0/pages.c:1273
msgid "Pick nation"
msgstr "בחר ×ומה"
-#: client/gui-gtk-2.0/pages.c:1214
+#: client/gui-gtk-2.0/pages.c:1283
msgid "Observe this player"
msgstr "השקף על שחקן זה"
-#: client/gui-gtk-2.0/pages.c:1221
+#: client/gui-gtk-2.0/pages.c:1290
msgid "Take this player"
msgstr "קח שחקן זה"
-#: client/gui-gtk-2.0/pages.c:1238
+#: client/gui-gtk-2.0/pages.c:1307
msgid "Cut connection"
msgstr "חתוך חיבור"
-#: client/gui-gtk-2.0/pages.c:1248
+#: client/gui-gtk-2.0/pages.c:1317
msgid "Aitoggle player"
msgstr "הפעל/בטל ×\"מ לשחקן"
-#: client/gui-gtk-2.0/pages.c:1257
+#: client/gui-gtk-2.0/pages.c:1326
msgid "Remove player"
msgstr "הסר שחקן"
-#: client/gui-gtk-2.0/pages.c:1268
+#: client/gui-gtk-2.0/pages.c:1337
msgid "Give info access"
msgstr "תן מידע לגישה"
-#: client/gui-gtk-2.0/pages.c:1276
+#: client/gui-gtk-2.0/pages.c:1345
msgid "Give ctrl access"
msgstr "תן שליטה בגישה"
#. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1338
+#: client/gui-gtk-2.0/pages.c:1407
#, c-format
msgid "Put on %s"
msgstr "×©×™× ×¢×œ %s"
-#: client/gui-gtk-2.0/pages.c:1442
+#: client/gui-gtk-2.0/pages.c:1511
#, fuzzy
msgid "Number of _Players (including AI):"
msgstr "_מספר ×©×—×§×™× (כולל ×\"מ):"
-#: client/gui-gtk-2.0/pages.c:1465
+#: client/gui-gtk-2.0/pages.c:1534
#, fuzzy
msgid "AI Skill _Level:"
msgstr "רמת ×”_×ž×™×•×ž× ×•×ª של ×\"מ:"
-#: client/gui-gtk-2.0/pages.c:1481
+#: client/gui-gtk-2.0/pages.c:1550
#, fuzzy
msgid "Ruleset _Version:"
msgstr "_קבוצת כללי×:"
-#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
msgid "_More Game Options..."
msgstr "_×פשרויות משחק × ×¡×¤×•×ª..."
-#: client/gui-gtk-2.0/pages.c:1514
+#: client/gui-gtk-2.0/pages.c:1583
msgid "Record"
msgstr "רשומה"
-#: client/gui-gtk-2.0/pages.c:1519
+#: client/gui-gtk-2.0/pages.c:1588
msgid "Rating"
msgstr "דרוג"
-#: client/gui-gtk-2.0/pages.c:1525
+#: client/gui-gtk-2.0/pages.c:1594
msgid "Ready"
msgstr "מוכן"
-#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
-#: data/nation/slovakian.ruleset:26
-msgid "Leader"
-msgstr "×ž× ×”×™×’"
+#: client/gui-gtk-2.0/pages.c:1601
+#, fuzzy
+msgid "?player:Leader"
+msgstr "?שחקן:ש×"
-#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1732 client/gui-sdl/chatline.c:185
msgid "Choose Saved Game to Load"
msgstr "בחר משחק שמור ×œ×˜×¢×™× ×”"
-#: client/gui-gtk-2.0/pages.c:1752
+#: client/gui-gtk-2.0/pages.c:1824
msgid "Choose Saved Game to _Load:"
msgstr "בחר משחק שמור ל_×˜×¢×™× ×”:"
-#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
-#: client/gui-gtk-2.0/pages.c:2375
+#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
+#: client/gui-gtk-2.0/pages.c:2451
msgid "_Browse..."
msgstr "_עיין..."
-#: client/gui-gtk-2.0/pages.c:1839
+#: client/gui-gtk-2.0/pages.c:1911
msgid "Choose a Scenario"
msgstr "בחר בתסריט"
-#: client/gui-gtk-2.0/pages.c:1926
+#: client/gui-gtk-2.0/pages.c:1998
msgid "Choose a _Scenario:"
msgstr "בחר ב_תסריט"
-#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
-#: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
-#: client/gui-win32/wldlg.c:806
-msgid "Type"
-msgstr "סוג"
-
-#: client/gui-gtk-2.0/pages.c:2101
+#: client/gui-gtk-2.0/pages.c:2173
msgid "Choose a _nation to play:"
msgstr "בחר לשחק ב×_ומה:"
-#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2363 client/gui-win32/menu.c:581
msgid "Select Location to Save"
msgstr "בחר ×ž×™×§×•× ×œ×©×ž×™×¨×”"
-#: client/gui-gtk-2.0/pages.c:2372 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2448 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr "שמור משחק"
-#: client/gui-gtk-2.0/pages.c:2413
+#: client/gui-gtk-2.0/pages.c:2489
msgid "Saved _Games:"
msgstr "_×ž×©×—×§×™× ×©×ž×•×¨×™×:"
-#: client/gui-gtk-2.0/pages.c:2440
+#: client/gui-gtk-2.0/pages.c:2516
msgid "Save _Filename:"
msgstr "שמור ש×Ö¾_קובץ:"
@@ -12031,7 +12277,7 @@ msgstr ""
msgid "Total users logged in : %d"
msgstr ""
-#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1094
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
msgid "Back"
msgstr "×חורה"
@@ -12040,7 +12286,7 @@ msgid "Start"
msgstr "התחל"
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:775
+#: client/gui-win32/connectdlg.c:777
msgid "Load Game"
msgstr "טען משחק"
@@ -12077,12 +12323,12 @@ msgid "Make new homecity"
msgstr "הפוך לעיר־בית חדשה"
#: client/gui-sdl/citydlg.c:546 client/gui-sdl/citydlg.c:1418
-#: client/gui-sdl/connectdlg.c:307 client/gui-sdl/connectdlg.c:616
-#: client/gui-sdl/connectdlg.c:802 client/gui-sdl/connectdlg.c:984
+#: 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/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1039
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
#: 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
@@ -12128,7 +12374,7 @@ msgstr "×§× ×” ×ת ×–×”?"
#: client/gui-sdl/diplodlg.c:1335 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:2427
+#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
#: client/gui-xaw/cityrep.c:666 client/gui-xaw/cma_fe.c:327
#: client/gui-xaw/cma_fe.c:511 client/gui-xaw/cma_fe.c:765
#: client/gui-xaw/messagedlg.c:72 client/gui-xaw/optiondlg.c:76
@@ -12144,7 +12390,7 @@ msgstr "ל×"
#: client/gui-sdl/diplodlg.c:1345 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:2427 client/gui-xaw/cityrep.c:666
+#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
#: client/gui-xaw/cma_fe.c:327 client/gui-xaw/cma_fe.c:511
#: client/gui-xaw/cma_fe.c:765 client/gui-xaw/messagedlg.c:72
#: client/gui-xaw/optiondlg.c:76 client/gui-xaw/optiondlg.c:304
@@ -12426,36 +12672,36 @@ msgstr "החל הפע×"
msgid "Release city"
msgstr "שחרר עיר"
-#: client/gui-sdl/connectdlg.c:238
+#: client/gui-sdl/connectdlg.c:239
msgid "Creating Server List..."
msgstr "צור רשימת שרתי×..."
-#: client/gui-sdl/connectdlg.c:279 client/gui-sdl/connectdlg.c:343
+#: client/gui-sdl/connectdlg.c:280 client/gui-sdl/connectdlg.c:344
msgid "No LAN servers found"
msgstr "×œ× × ×ž×¦× ×©×¨×ª רת\"מ"
-#: client/gui-sdl/connectdlg.c:281 client/gui-sdl/connectdlg.c:345
+#: client/gui-sdl/connectdlg.c:282 client/gui-sdl/connectdlg.c:346
msgid "No public servers found"
msgstr ""
-#: client/gui-sdl/connectdlg.c:555
+#: client/gui-sdl/connectdlg.c:556
msgid "Player Name :"
msgstr "×©× ×©×—×§×Ÿ:"
-#: client/gui-sdl/connectdlg.c:571
+#: client/gui-sdl/connectdlg.c:572
msgid "Freeciv Server :"
msgstr "שרת Freeciv :"
-#: client/gui-sdl/connectdlg.c:588
+#: client/gui-sdl/connectdlg.c:589
msgid "Port :"
msgstr "פורט :"
-#: client/gui-sdl/connectdlg.c:608 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr ""
-#: client/gui-sdl/connectdlg.c:794 client/gui-sdl/connectdlg.c:977
+#: client/gui-sdl/connectdlg.c:795 client/gui-sdl/connectdlg.c:978
#: client/gui-xaw/connectdlg.c:145
msgid "Next"
msgstr "הב×"
@@ -12732,7 +12978,7 @@ msgstr ""
#: client/gui-sdl/graphics.c:1021
#, c-format
-msgid "Unable to initialize SDL_ttf library: %s"
+msgid "Unable to initialize SDL_ttf library: %s"
msgstr ""
#: client/gui-sdl/graphics.c:1058
@@ -12817,12 +13063,6 @@ msgstr ""
msgid "Waiting for the beginning of the game"
msgstr ""
-#: client/gui-sdl/gui_string.c:608
-msgid ""
-"Couldn't find stdfont.ttf file. Please link/copy/move anyunicode ttf font to "
-"data dir as stdfont.ttf"
-msgstr ""
-
#. TRANS: Future Technology
#: client/gui-sdl/gui_tilespec.c:506
msgid "FT"
@@ -13399,12 +13639,12 @@ msgid "Leave Game"
msgstr "שמור משחק"
#: client/gui-sdl/optiondlg.c:2302 client/gui-sdl/pages.c:255
-#: client/gui-win32/connectdlg.c:1098 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1100 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:963
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
msgid "Start New Game"
msgstr "התחל משחק חדש"
@@ -13519,8 +13759,8 @@ msgstr "×”×›× ×¡×” × ×˜×•:"
msgid "%s max rate : %d%%"
msgstr "%s שיעור־מרבי : %d%%"
-#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1081
-#: client/gui-win32/connectdlg.c:1089 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
+#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
msgid "Update"
msgstr "עדכון"
@@ -13938,10 +14178,6 @@ msgstr "×©× ×” הכל"
msgid "Refresh"
msgstr "×¨×¢× ×Ÿ"
-#: client/gui-win32/cityrep.c:882
-msgid "Select"
-msgstr "בחר"
-
#: client/gui-win32/cityrep.c:883
msgid "Configure"
msgstr "הגדר"
@@ -13991,55 +14227,55 @@ msgstr "×ין ×פשרות לטעון משחק שמור"
msgid "Verify Password"
msgstr "×•×•×“× ×¡×¡×ž×”"
-#: client/gui-win32/connectdlg.c:912 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr "בחירת שרת Freeciv"
-#: client/gui-win32/connectdlg.c:913
+#: client/gui-win32/connectdlg.c:915
msgid "Local Area Network"
msgstr "רשת תקשורת מקומית"
-#: client/gui-win32/connectdlg.c:947
+#: client/gui-win32/connectdlg.c:949
msgid "Welcome to Freeciv"
msgstr "ברוך בו×ך ל־ Freeciv"
-#: client/gui-win32/connectdlg.c:965
+#: client/gui-win32/connectdlg.c:967
msgid "Load Saved Game"
msgstr "טען משחק שמור"
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
msgid "Connect To Network Game"
msgstr "התחבר למשחק רשת"
-#: client/gui-win32/connectdlg.c:977
+#: client/gui-win32/connectdlg.c:979
msgid "Choose a nation to play"
msgstr "בחר לשחק ב×ומה"
-#: client/gui-win32/connectdlg.c:1012
+#: client/gui-win32/connectdlg.c:1014
msgid "Number of players (Including AI):"
msgstr "מספר ×©×—×§× ×™× (כולל ×\"מ):"
-#: client/gui-win32/connectdlg.c:1020
+#: client/gui-win32/connectdlg.c:1022
msgid "AI skill level:"
msgstr "רמת ×ž×™×•×ž× ×•×ª ×\"מ:"
-#: client/gui-win32/connectdlg.c:1034 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
msgid "Game Options"
msgstr "×פשריות משחק"
-#: client/gui-win32/connectdlg.c:1038
+#: client/gui-win32/connectdlg.c:1040
msgid "Start Game"
msgstr "התחל משחק"
-#: client/gui-win32/connectdlg.c:1057
+#: client/gui-win32/connectdlg.c:1059
msgid "Login:"
msgstr ""
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
msgid "Host:"
msgstr "שרת:"
-#: client/gui-win32/connectdlg.c:1060
+#: client/gui-win32/connectdlg.c:1062
msgid "Port:"
msgstr "פורט:"
@@ -14294,10 +14530,6 @@ msgid_plural "(idle %d turns)"
msgstr[0] "(חסר־מעש תור ×חד)"
msgstr[1] "(לל×־מעש %d תורות)"
-#: client/gui-win32/plrdlg.c:337 data/Freeciv.in:88
-msgid "Host"
-msgstr "מחשב מ×רח"
-
#: client/gui-win32/plrdlg.c:355 data/Freeciv.in:3230
msgid "Intelligence"
msgstr "מודיעין"
@@ -15726,12 +15958,12 @@ msgstr ""
#: data/helpdata.txt:781
msgid ""
-" To have a diplomatic relationship with another player, you must fist "
-"establish first contact with that player. To establish first contact, you "
-"have to move one of your units next to a city or unit belonging to that "
-"player, or vice versa. Unless you establish an embassy with that player, you "
-"may again lose contact with them after a set number of turns without direct "
-"physical contact."
+" To have a diplomatic relationship with another player, you must first "
+"establish contact with that player. To establish contact, you have to move "
+"one of your units next to a city or unit belonging to that player, or vice "
+"versa. Unless you establish an embassy with that player, you may again lose "
+"contact with them after a set number of turns without direct physical "
+"contact."
msgstr ""
#: data/helpdata.txt:788
@@ -17978,7 +18210,7 @@ msgid "Communism"
msgstr "×§×•×ž×•× ×™×–×"
#: data/default/governments.ruleset:121 data/civ2/governments.ruleset:118
-#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:26
+#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:27
msgid "Comrade"
msgstr ""
@@ -18857,6 +19089,11 @@ msgstr ""
"מלהקצות יותר מדי ×¢×•×‘×“×™× ×œ×ž×˜×œ×” ×חת; מ×מץ רב מדי עלול להתבזבז, וקבוצה של "
"×ž×ª× ×—×œ×™× ×•/×ו ×ž×”× ×“×¡×™× ×¢×œ×•×œ×” להיות פגיעה ביותר לפגיעה מצד ×”×ויב."
+#: data/default/units.ruleset:238
+#, fuzzy
+msgid "?unit:Workers"
+msgstr "פועלי×"
+
#: data/default/units.ruleset:264
msgid ""
"Workers are one of the key units in the game. They can be used to irrigate "
@@ -19447,6 +19684,11 @@ msgstr "מגלה־×רצות"
msgid "Explorers are very useful for mapping unknown territory."
msgstr "מגלי־×רצות ×”× ×©×™×ž×•×©×™×™× ×‘×™×•×ª×¨ למפות טריטוריה ×œ× ×™×“×•×¢×”."
+#: data/default/units.ruleset:1864
+#, fuzzy
+msgid "?unit:Leader"
+msgstr "×ž× ×”×™×’"
+
#: data/default/units.ruleset:1892
msgid "This is you. If you lose this unit, you lose the game. So don't."
msgstr "×–×” ×תה. ×× ×תה מ×בד יחידה זו, ×תה מפסיד ×ת המשחק. ××– ×ל תעשה ×–×ת."
@@ -19647,7 +19889,7 @@ msgid "Emir"
msgstr "×מיר"
#: data/nation/afghani.ruleset:25 data/nation/slovakian.ruleset:30
-#: data/nation/soviet.ruleset:27
+#: data/nation/soviet.ruleset:28
msgid "General Secretary"
msgstr "המזכיר־הכללי"
@@ -19762,7 +20004,7 @@ msgstr "?רבי×:××¨×ž× ×™×"
msgid ""
"According to legend, the Armenian people are the descendants of Haik - the "
"great-great-grandson of Noah. The modern Republic of Armenia gained "
-"independence from Soviet in 1991 AD"
+"independence from the Soviet Union in 1991."
msgstr ""
#: data/nation/assyrian.ruleset:3
@@ -20709,12 +20951,11 @@ msgstr ""
#: data/nation/illyrian.ruleset:6
msgid ""
-"Illyrians were Indo-European tribes who appeared in the western part of the "
-"Balkan Peninsula before 1000 BC, including the Dalmatians to the north, "
-"Corcyra island and Ambracia bay in prehistoric Epirus to the south, mixing "
-"with Thracians in Dardania to the east, and settling Messapia across the "
-"Adriatic Sea. Illyrian kingdoms were independent for centuries, until "
-"conquered by the Roman Republic."
+"Illyrians were Indo-European tribes who appeared in the western part of the "
+"Balkan Peninsula before 1000 BC, including Corcyra island and Ambracia bay "
+"in prehistoric Epirus to the south. They mixed with Thracians in Dardania to "
+"the east, and settled Messapia across the Adriatic Sea. Illyrian kingdoms "
+"were independent for centuries, until conquered by the Roman Republic."
msgstr ""
#: data/nation/inca.ruleset:3
@@ -21000,7 +21241,7 @@ msgid ""
"1953."
msgstr ""
-#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:28
+#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:29
msgid "Great Leader"
msgstr "×ž× ×”×™×’ דגול"
@@ -21157,9 +21398,9 @@ msgstr "?רבי×:מ×לי×× ×™×"
msgid ""
"Sub-Saharan Africa has been a cultural and ethnical melting pot for "
"millennia. In medieval times, the region was home to a succession of empires "
-"called the Sahelian kingdoms. Of these, the Islamic Mali empire with it's "
+"called the Sahelian kingdoms. Of these, the Islamic Mali empire with its "
"capital in Timbuktu was the most influential. This empire reigned from the "
-"14th to the 17th century and was famed for it's wealth and benevolent kings. "
+"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 ""
@@ -21219,8 +21460,8 @@ msgstr "?רבי×:מי××”"
#: data/nation/mayan.ruleset:6
msgid ""
-"The Mayans were a Mesoamerican civilization. Famous for building great "
-"pyramids and palaces in the jungle."
+"The Mayans were a Mesoamerican civilization. They are famous for building "
+"great pyramids and palaces in the jungle."
msgstr ""
#: data/nation/mayan.ruleset:19
@@ -21706,6 +21947,16 @@ msgid ""
"Czechoslovakia, until 1918 it was part of the Austro-Hungarian Empire."
msgstr ""
+#: data/nation/slovakian.ruleset:26
+#, fuzzy
+msgid "?male:Leader"
+msgstr "×ž× ×”×™×’"
+
+#: data/nation/slovakian.ruleset:26
+#, fuzzy
+msgid "?female:Leader"
+msgstr "?× ×§×‘×”:× ×©×™××”"
+
#: data/nation/slovakian.ruleset:29
msgid "Pope"
msgstr "×פיפיור"
@@ -21744,11 +21995,12 @@ msgstr "?רבי×:סובייטי×"
#: data/nation/soviet.ruleset:6
msgid ""
-"Soviet Union's history starts in November 1917, when under Lenin's "
+"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 "
-"republics integrated into one country. Soviet Union became one of most "
-"powerful states in the 20th century. But by the end of 1991 due to many "
-"social shocks it disintegrated into fifteen independent countries"
+"republics integrated into one country. The Soviet Union became one of most "
+"powerful states in the 20th century, but by the end of 1991 it had "
+"disintegrated into fifteen independent countries due to social and economic "
+"problems."
msgstr ""
#: data/nation/spanish.ruleset:3
@@ -22115,8 +22367,8 @@ msgstr ""
#: data/nation/westphalian.ruleset:6
msgid ""
-"Westphalia, before becoming a Prussian province, was the western region the "
-"duchy of Saxony. Present-day it consists of the Northern part of the largest "
+"Westphalia, before becoming a Prussian province, was the western region of "
+"the duchy of Saxony. Today it makes up the northern part of the largest "
"German federal state, North Rhine-Westphalia."
msgstr ""
@@ -22261,7 +22513,7 @@ msgid ""
"The flag and background color indicate what civilization the city\n"
"belongs to (this will be useful when you meet other civilizations).\n"
"The top row of the bar also shows the name and size of the city, and\n"
-"will show one or more starts to indicate if there are units in the\n"
+"will show one or more stars to indicate if there are units in the\n"
"city. The bottom row shows what the city is building, and how long it\n"
"will take; it also shows how long the city will take to grow to the\n"
"next largest size."
@@ -22317,7 +22569,7 @@ msgid ""
"Now your city has grown to size five. As cities get larger unrest\n"
"becomes a problem. A city of this size will usually have one unhappy\n"
"citizen unless pacifying effects are used; meaning one entertainer\n"
-"specialist is required to keep your citzens content. This is basically\n"
+"specialist is required to keep your citizens content. This is basically\n"
"a wasted citizen.\n"
"\n"
"There are several things that can be done about this. One quick fix\n"
@@ -22389,7 +22641,7 @@ msgid ""
"existing cities. Generally when building new cities you want to make\n"
"sure that all tiles are covered by at least one city, but after that\n"
"it is best that your cities overlap as little as possible. Spreading\n"
-"out cities properly gives each city access to more resrouces, allowing\n"
+"out cities properly gives each city access to more resources, allowing\n"
"them to grow to larger sizes."
msgstr ""
@@ -22672,6 +22924,20 @@ msgstr "צוות 30"
msgid "Team 31"
msgstr "צוות 31"
+#, fuzzy
+#~ msgid "Auth config filename \"%s\" not allowed!"
+#~ msgstr "×©× ×–×” ×סור."
+
+#, fuzzy
+#~ msgid "%s territory"
+#~ msgstr "טריטוריה של ה%s"
+
+#~ msgid "%s of the %s"
+#~ msgstr "%s מה־ %s"
+
+#~ msgid "Select same type"
+#~ msgstr "בחר ×ותו סוג"
+
#~ msgid "%s"
#~ msgstr "%s"
@@ -22681,9 +22947,6 @@ msgstr "צוות 31"
#~ msgid ", nation %s"
#~ msgstr ", ×ומה %s"
-#~ msgid ", team %s"
-#~ msgstr ", צוות %s"
-
#~ msgid "_Map"
#~ msgstr "_מפה"
@@ -22807,9 +23070,6 @@ msgstr "צוות 31"
#~ msgid "_Close"
#~ msgstr "_סגור"
-#~ msgid "%s (%s) (worklist)"
-#~ msgstr "%s (%s) (רשימת־עבודה)"
-
#~ msgid "%s citizens%s"
#~ msgstr "%s ×זרחי×%s"
@@ -22990,18 +23250,12 @@ msgstr "צוות 31"
#~ "מגן: %d\n"
#~ "סחר: %d"
-#~ msgid "City: %s(%s)"
-#~ msgstr "עיר: %s(%s) "
-
#~ msgid "with City Walls"
#~ msgstr "×¢× ×—×•×ž×”"
#~ msgid "Infrastructure: "
#~ msgstr "תשתית:"
-#~ msgid "Unit: %s(%s%s)"
-#~ msgstr "יחידה: %s(%s%s)"
-
#~ msgid "City %s"
#~ msgstr "עיר %s"
diff --git a/po/hu.gmo b/po/hu.gmo
index 5995977..9ddfe09 100644
Binary files a/po/hu.gmo and b/po/hu.gmo differ
diff --git a/po/hu.po b/po/hu.po
index 5096308..54f2491 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Freeciv 1.14.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 07:45+0900\n"
+"POT-Creation-Date: 2009-03-29 21:13+0900\n"
"PO-Revision-Date: 2007-08-12 15:37+0300\n"
"Last-Translator: Gábor Takács <tg330 at hszk.bme.hu>\n"
"Language-Team: Hungarian <hu at li.org>\n"
@@ -652,7 +652,7 @@ msgid "Road"
msgstr "Út"
#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
-#: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
+#: client/gui-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"
@@ -669,7 +669,7 @@ msgid "Mine"
msgstr "Bánya"
#: common/terrain.c:396 common/unit.c:548 server/report.c:124
-#: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
+#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr "Szennyezés"
@@ -715,7 +715,7 @@ msgstr "Meger
msgid "Sentry"
msgstr "Õrjáratozik"
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:851 client/gui-sdl/menu.c:648
+#: common/unit.c:566 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"
@@ -732,7 +732,7 @@ msgstr "Felfedez"
msgid "Transform"
msgstr "Átalakít"
-#: common/unit.c:584 client/text.c:106 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:584 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"
@@ -806,11 +806,11 @@ msgstr "Atomrak
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1406
+#: common/unittype.c:349 client/helpdata.c:1404
msgid " and "
msgstr " és "
-#: common/unittype.c:355 client/helpdata.c:1392
+#: common/unittype.c:355 client/helpdata.c:1390
msgid "?and:, "
msgstr "?and:, "
@@ -1360,106 +1360,101 @@ msgstr ""
#: server/auth.c:281
#, fuzzy, c-format
-msgid "Auth config filename \"%s\" not allowed!"
-msgstr "Milyen típusú kapcsolódások engedélyezettek"
-
-#: server/auth.c:286
-#, fuzzy, c-format
msgid "Cannot load auth config file \"%s\"!"
msgstr "Nincs meg a(z) %s hangfájl"
-#: server/auth.c:397
+#: server/auth.c:392
#, c-format
msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
msgstr ""
-#: server/auth.c:404
+#: server/auth.c:399
#, fuzzy
msgid "Guests are not allowed on this server. Sorry."
msgstr "Sajnálom, nincs jogosultságod szerverparancsok kiadására."
-#: server/auth.c:406
+#: server/auth.c:401
#, fuzzy, c-format
msgid "%s was rejected: Guests not allowed."
msgstr "%s visszautasítva: %s már kapcsolódott."
-#: server/auth.c:425
+#: server/auth.c:420
#, c-format
msgid ""
"There was an error reading the user database, logging in as guest connection "
"'%s'."
msgstr ""
-#: server/auth.c:431
+#: server/auth.c:426
msgid ""
"There was an error reading the user database and guest logins are not "
"allowed. Sorry"
msgstr ""
-#: server/auth.c:434
+#: server/auth.c:429
#, fuzzy, c-format
msgid "%s was rejected: Database error and guests not allowed."
msgstr "%s visszautasítva: A(z) %s nevet már valaki más használja."
-#: server/auth.c:441
+#: server/auth.c:436
#, c-format
msgid "Enter password for %s:"
msgstr ""
-#: server/auth.c:450
+#: server/auth.c:445
msgid "Enter a new password (and remember it)."
msgstr ""
-#: server/auth.c:456
+#: server/auth.c:451
msgid "This server allows only preregistered users. Sorry."
msgstr ""
-#: server/auth.c:459
+#: server/auth.c:454
#, fuzzy, c-format
msgid "%s was rejected: Only preregister users allowed."
msgstr "%s visszautasítva: A(z) %s nevet már valaki más használja."
-#: server/auth.c:488 server/auth.c:547
+#: server/auth.c:483 server/auth.c:542
msgid "Sorry, too many wrong tries..."
msgstr ""
-#: server/auth.c:489
+#: server/auth.c:484
#, c-format
msgid "%s was rejected: Too many wrong password verifies for new user."
msgstr ""
-#: server/auth.c:505
+#: server/auth.c:500
msgid ""
"Warning: There was an error in saving to the database. Continuing, but your "
"stats will not be saved."
msgstr ""
-#: server/auth.c:549
+#: server/auth.c:544
#, fuzzy, c-format
msgid "%s was rejected: Too many wrong password tries."
msgstr "%s visszautasítva: Tilos a barbárok megfigyelése."
-#: server/auth.c:558
+#: server/auth.c:553
msgid "Your password is incorrect. Try again."
msgstr ""
-#: server/auth.c:569
+#: server/auth.c:564
#, fuzzy
msgid "Sorry, your connection timed out..."
msgstr "Sajnálom, a légi egységek õrjáratozása egyelõre nincs megvalósítva."
-#: server/auth.c:571
+#: server/auth.c:566
#, fuzzy, c-format
msgid "%s was rejected: Connection timeout waiting for password."
msgstr ""
"%s visszautasítva: Az ember játékosok számára tilos az újrakapcsolódás."
-#: server/auth.c:636
+#: server/auth.c:631
#, c-format
msgid "Your password is too short, the minimum length is %d. Try again."
msgstr ""
-#: server/auth.c:642
+#: server/auth.c:637
#, c-format
msgid ""
"The password must have at least %d capital letters, %d numbers, and be at "
@@ -1971,7 +1966,7 @@ msgstr "Ez a %s szervere"
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:237 manual/civmanual.c:380
+#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
@@ -1999,14 +1994,14 @@ msgstr ""
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:241
+#: server/civserver.c:217 client/civclient.c:242
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:245
+#: server/civserver.c:221 client/civclient.c:246
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"
@@ -2014,7 +2009,7 @@ msgstr " -d, --debug NUM\tNapl
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:248 manual/civmanual.c:382
+#: server/civserver.c:225 client/civclient.c:249 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"
@@ -2067,11 +2062,11 @@ msgstr " -r, --read F
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:267 manual/civmanual.c:383
+#: server/civserver.c:247 client/civclient.c:268 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:279
+#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, fuzzy, c-format
@@ -3350,7 +3345,7 @@ msgstr "A(z) %2$si l
msgid "Sea moving start units are not yet supported. Nobody gets %s."
msgstr ""
-#: server/gamehand.c:310 client/text.c:632
+#: server/gamehand.c:310 client/text.c:691
#, c-format
msgid "Year: %s"
msgstr "Év: %s"
@@ -3634,10 +3629,10 @@ msgid "Could not throw %s into civil war - no available nations"
msgstr ""
#: server/plrhand.c:1686
-#, c-format
+#, fuzzy, c-format
msgid ""
-"Your nation is thrust into civil war, %s is declared the leader of the "
-"rebel states."
+"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
@@ -3737,7 +3732,7 @@ msgstr "Kutat
msgid "Literacy"
msgstr "Mûveltség"
-#: server/report.c:121 client/cityrepdata.c:526 client/cityrepdata.c:527
+#: server/report.c:121 client/cityrepdata.c:524 client/cityrepdata.c:525
#: client/gui-sdl/cityrep.c:174
msgid "Production"
msgstr "Termelés"
@@ -3887,7 +3882,7 @@ 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:766
+#: server/report.c:743 server/report.c:768
msgid "Demographics Report:"
msgstr "Demográfiai jelentés:"
@@ -3895,10 +3890,12 @@ msgstr "Demogr
msgid "Sorry, the Demographics report is unavailable."
msgstr "Sajnálom, a Demográfiai jelentés nem elérhetõ."
-#: server/report.c:748
+#. TRANS: <nation adjective> <government name> (<year>).
+#. * E.g. "Polish Despotism (200 AD)".
+#: server/report.c:750
#, fuzzy, c-format
-msgid "The %s of the %s (%s)"
-msgstr "A(z) %2$s (Államforma: %1$s)"
+msgid "%s %s (%s)"
+msgstr "A(z) %2$si %1$s (%3$s)\n"
#. TRANS: message about an installation error.
#: server/ruleset.c:163
@@ -3957,14 +3954,6 @@ msgstr ""
msgid "%s had invalid nation; changing to %s."
msgstr ""
-#. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4073
-#, c-format
-msgid ""
-"Illegal alliance structure detected: %s alliance to %s reduced to peace "
-"treaty."
-msgstr ""
-
#: server/settings.c:32
msgid "Geological"
msgstr ""
@@ -5147,8 +5136,8 @@ msgstr "Automatikus ment
#: server/settings.c:1016
#, fuzzy
msgid ""
-"Automatically saved games will have name \"<prefix><year>.sav\". This "
-"setting sets the <prefix> part."
+"Automatically saved games will have name \"<prefix>-T<turn>-Y<year>.sav\". "
+"This setting sets the <prefix> part."
msgstr ""
"Az automatikusan elmentett játékállások neve \"<elõtag><év>.sav\" alakú "
"lesz.\n"
@@ -5169,13 +5158,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:147
+#: server/sernet.c:150
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:922
+#: server/sernet.c:929
#, fuzzy, c-format
msgid "Server: bad address: [%s:%d]."
msgstr "Metaszerver: rossz cím: [%s]."
@@ -5304,114 +5293,114 @@ 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:928
+#: server/srv_main.c:961
#, 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:930
+#: server/srv_main.c:963
#, c-format
msgid "Game saved as %s"
msgstr "A játékállást elmentettem %s néven"
-#: server/srv_main.c:962
+#: server/srv_main.c:994
msgid "The game is already running."
msgstr "A játék már fut."
-#: server/srv_main.c:970
+#: server/srv_main.c:1002
#, c-format
msgid "%s lost control cmdlevel on game start. Use voting from now on."
msgstr ""
-#: server/srv_main.c:977
+#: server/srv_main.c:1009
msgid "Starting game."
msgstr "Játék indítása."
-#: server/srv_main.c:1039
+#: server/srv_main.c:1071
#, c-format
msgid "request for unknown report (type %d)"
msgstr ""
-#: server/srv_main.c:1104
+#: server/srv_main.c:1136
#, fuzzy, c-format
msgid "Warning: rejecting old client %s"
msgstr "Figyelmeztetés: Éhínség van %s városában."
-#: server/srv_main.c:1206
+#: server/srv_main.c:1238
#, 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:1306
+#: server/srv_main.c:1338
msgid "Please choose a non-blank name."
msgstr "Nem üres nevet válassz."
-#: server/srv_main.c:1322
+#: server/srv_main.c:1354
#, fuzzy
msgid "That nation is already in use."
msgstr "A játék már fut."
-#: server/srv_main.c:1338
+#: server/srv_main.c:1370
#, 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:1359
+#: server/srv_main.c:1391
#, fuzzy
msgid "Please choose a name containing only ASCII characters."
msgstr "Nem üres nevet válassz."
-#: server/srv_main.c:1458
+#: server/srv_main.c:1490
#, c-format
msgid "%s nation is not available in this scenario."
msgstr ""
-#: server/srv_main.c:1464
+#: server/srv_main.c:1496
#, fuzzy, c-format
msgid "%s nation is already in use."
msgstr "A játék már fut."
-#: server/srv_main.c:1482
+#: server/srv_main.c:1514
#, c-format
msgid "%s is the %s ruler %s."
msgstr "%s a(z) %s uralkodó %s néven."
-#: server/srv_main.c:1538
+#: server/srv_main.c:1570
#, 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:1582 server/srv_main.c:1586
+#: server/srv_main.c:1614 server/srv_main.c:1618
#, 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:1728
+#: server/srv_main.c:1760
#, c-format
msgid "Player %d"
msgstr "%d. Játékos"
-#: server/srv_main.c:1739 server/srv_main.c:1745
+#: server/srv_main.c:1771 server/srv_main.c:1777
#, c-format
msgid "%s rules the %s."
msgstr "%s a(z) %s uralkodója."
-#: server/srv_main.c:1910
+#: server/srv_main.c:1942
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
msgstr ""
-#: server/srv_main.c:1961
+#: server/srv_main.c:1993
#, c-format
msgid "Sending info to metaserver [%s]"
msgstr "Információ küldése a metszervernek [%s]"
-#: server/srv_main.c:1992
+#: server/srv_main.c:2024
msgid "The game is over..."
msgstr "Vége a játéknak..."
-#: server/srv_main.c:2205
+#: server/srv_main.c:2237
msgid "Now accepting new client connections."
msgstr "Most fogadom a kliensek kapcsolódását."
@@ -6253,25 +6242,25 @@ 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:2030 client/gui-sdl/plrdlg.c:645
+#: 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
msgid "AI"
msgstr "MI"
#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
+#: client/gui-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
msgid "Human"
msgstr "Ember"
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
-#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
+#: 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
#, fuzzy
msgid "Alive"
msgstr "Aktív"
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
#: client/gui-win32/connectdlg.c:200
#, fuzzy
msgid "Dead"
@@ -6550,9 +6539,9 @@ 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:242
-#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
-#: client/text.c:1201
+#: 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
#, c-format
msgid "?clistmore:, %s"
msgstr ", %s"
@@ -6810,7 +6799,7 @@ msgstr "Csak %s t
msgid "Cannot attack from sea."
msgstr "Nem támadhatsz tengerrõl."
-#: server/unithand.c:996 server/unittools.c:2103
+#: server/unithand.c:996 server/unittools.c:2137
msgid "Cannot attack unless you declare war first."
msgstr "Nem támadhatsz, ha nem üzensz hadat elõbb."
@@ -6911,100 +6900,101 @@ msgid "%s was upgraded for free to %s."
msgstr "%s felfejlesztett egy %s egységet."
#: server/unittools.c:297
-#, c-format
-msgid "Not enough gold. %s disbanded"
-msgstr ""
+#, fuzzy, c-format
+msgid "Not enough gold to pay upkeep for %s. Unit disbanded."
+msgstr "Egy %si %s feloszlott, mert a város nem tudja fenntartani."
-#: server/unittools.c:342
+#: server/unittools.c:343
#, c-format
msgid "Your %s has run out of hit points."
msgstr "Elfogytak a(z) %s egységed életpontjai."
-#: server/unittools.c:358
+#: server/unittools.c:359
#, c-format
msgid "Your %s has been lost on the high seas."
msgstr "Az óceánba süllyedt a(z) %s egységed."
-#: server/unittools.c:365
+#: server/unittools.c:366
#, c-format
msgid "Your %s survived on the high seas and became more experienced!"
msgstr ""
-#: server/unittools.c:376
+#: server/unittools.c:377
#, fuzzy, c-format
msgid "Your %s has been lost on unsafe terrain."
msgstr "Az óceánba süllyedt a(z) %s egységed."
-#: server/unittools.c:430
+#: server/unittools.c:431
#, c-format
msgid "Your %s has returned to refuel."
msgstr "A(z) %s egységed visszatért üzemanyagfelvételre."
-#: server/unittools.c:454
+#: server/unittools.c:455
#, c-format
msgid "Your %s has run out of fuel."
msgstr "A(z) %s egységednek kifogyott az üzemanyaga."
-#. TRANS: And, <the unit> became ...
-#: server/unittools.c:616
-msgid "And, became more experienced!"
-msgstr ""
-
#. TRANS: Your <unit> became ...
-#: server/unittools.c:620
+#: server/unittools.c:619
#, c-format
msgid "Your %s became more experienced!"
msgstr ""
-#: server/unittools.c:1011
+#: server/unittools.c:1009
#, fuzzy, c-format
msgid "Teleported your %s to %s."
msgstr "Egy %s egységed teleportált a(z) (%d, %d) mezõrõl %s városába."
-#: server/unittools.c:1041
+#. TRANS: A unit is moved to resolve stack conflicts.
+#: server/unittools.c:1065
+#, fuzzy, c-format
+msgid "Moved your %s."
+msgstr "Feloszlott egy %s egységed a(z) (%d, %d) mezõn."
+
+#: server/unittools.c:1076
#, fuzzy, c-format
msgid "Disbanded your %s."
msgstr "Feloszlott egy %s egységed a(z) (%d, %d) mezõn."
-#: server/unittools.c:1363
+#: server/unittools.c:1397
#, c-format
msgid "Unable to defend %s, %s has lost the game."
msgstr ""
-#: server/unittools.c:1367
+#: server/unittools.c:1401
#, c-format
msgid "Losing %s meant losing the game! Be more careful next time!"
msgstr ""
-#: server/unittools.c:1469
+#: server/unittools.c:1503
#, c-format
msgid "%s escaped the destruction of %s, and fled to %s."
msgstr ""
-#: server/unittools.c:1478
+#: server/unittools.c:1512
#, 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:1527
+#: server/unittools.c:1561
#, 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:1545
+#: server/unittools.c:1579
#, 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:1554 server/unittools.c:1612
+#: server/unittools.c:1588 server/unittools.c:1646
#, 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:1588
+#: server/unittools.c:1622
#, fuzzy, c-format
msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
msgid_plural ""
@@ -7013,14 +7003,14 @@ msgstr[0] "a t
#. TRANS: "Cannon lost when the Polish Destroyer
#. * attacked the German Musketeers."
-#: server/unittools.c:1621
+#: server/unittools.c:1655
#, 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:1636
+#: server/unittools.c:1670
#, 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."
@@ -7028,7 +7018,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:1646
+#: server/unittools.c:1680
#, 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."
@@ -7037,201 +7027,201 @@ 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:1660
+#: server/unittools.c:1694
#, 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:1928
+#: server/unittools.c:1962
#, 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:1931 server/unittools.c:1947
+#: server/unittools.c:1965 server/unittools.c:1981
msgid "yourself"
msgstr "a saját magad"
-#: server/unittools.c:1935
+#: server/unittools.c:1969
#, fuzzy, c-format
msgid "The %s %s was nuked."
msgstr "%s %s egységét atomtámadás érte."
-#: server/unittools.c:1944
+#: server/unittools.c:1978
#, 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:1952
+#: server/unittools.c:1986
#, c-format
msgid "You nuked %s."
msgstr "Atombombát dobtál le %s városára."
-#: server/unittools.c:1993
+#: server/unittools.c:2027
#, fuzzy, c-format
msgid "The %s detonated a nuke!"
msgstr "%s atombombát robbantott!"
-#: server/unittools.c:2017
+#: server/unittools.c:2051
#, c-format
msgid "%s transported successfully."
msgstr "A(z) %s átszállítása sikerült."
-#: server/unittools.c:2069
+#: server/unittools.c:2103
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:2079
+#: server/unittools.c:2113
#, fuzzy
msgid "You cannot paradrop a unit that is transporting other units."
msgstr "Nem lehet óceánba ejtõernyõzni."
-#: server/unittools.c:2085
+#: server/unittools.c:2119
msgid "The destination location is not known."
msgstr "A célmezõ ismeretlen."
-#: server/unittools.c:2092
+#: server/unittools.c:2126
#, fuzzy, c-format
msgid "This unit cannot paradrop into %s."
msgstr "Nem lehet óceánba ejtõernyõzni."
-#: server/unittools.c:2112
+#: server/unittools.c:2146
#, 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:2123
+#: server/unittools.c:2157
#, 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:2136
+#: server/unittools.c:2170
#, 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:2158
+#: server/unittools.c:2192
#, c-format
msgid "You found %d gold."
msgstr "Találtál %d aranyat."
-#: server/unittools.c:2175
+#: server/unittools.c:2209
#, 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:2182
+#: server/unittools.c:2216
#, 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:2196
+#: server/unittools.c:2230
msgid "A band of friendly mercenaries joins your cause."
msgstr "Egy csapat szolgálatkész zsoldos csatlakozott hozzád."
-#: server/unittools.c:2214
+#: server/unittools.c:2248
msgid "An abandoned village is here."
msgstr "Egy elhagyatott falu van itt."
-#: server/unittools.c:2224
+#: server/unittools.c:2258
msgid "You have unleashed a horde of barbarians!"
msgstr "Elszabadítottál egy barbár hordát!"
-#: server/unittools.c:2227
+#: server/unittools.c:2261
#, c-format
msgid "Your %s has been killed by barbarians!"
msgstr "Barbárok ölték meg a(z) %s egységedet!"
-#: server/unittools.c:2243
+#: server/unittools.c:2277
msgid "You found a friendly city."
msgstr "Találtál egy szövetséges várost."
-#: server/unittools.c:2257
+#: server/unittools.c:2291
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:2282
+#: server/unittools.c:2316
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:2540
+#: server/unittools.c:2574
#, 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:2989
+#: server/unittools.c:3023
#, 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:3041
+#: server/unittools.c:3075
#, 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:3054
+#: server/unittools.c:3088
#, c-format
msgid "Orders for %s aborted since they give an invalid activity."
msgstr ""
-#: server/unittools.c:3068
+#: server/unittools.c:3102
#, c-format
msgid "Orders for %s aborted since they give an invalid location."
msgstr ""
-#: server/unittools.c:3078
+#: server/unittools.c:3112
#, 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:3104
+#: server/unittools.c:3138
#, c-format
msgid "Orders for %s aborted because of failed move."
msgstr ""
-#: server/unittools.c:3145
+#: server/unittools.c:3179
#, 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:3156
+#: server/unittools.c:3190
#, fuzzy, c-format
msgid "Attempt to establish trade route for %s failed."
msgstr "* Létesíthet kereskedelmi kapcsolatokat.\n"
-#: server/unittools.c:3168
+#: server/unittools.c:3202
#, c-format
msgid "Attempt to build wonder for %s failed."
msgstr ""
-#: server/unittools.c:3177
+#: server/unittools.c:3211
#, fuzzy, c-format
msgid "Your %s has invalid orders."
msgstr "A(z) %s egységed visszatért üzemanyagfelvételre."
-#: server/generator/mapgen.c:1737
+#: 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."
-#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
+#: server/generator/mapgen.c:1969 server/generator/mapgen.c:2039
#, fuzzy, c-format
msgid "Falling back to generator %d."
msgstr "Vissza a 2-es generálóeljáráshoz."
-#: server/generator/mapgen.c:2025
+#: server/generator/mapgen.c:2059
msgid "Generator 3 didn't place all big islands."
msgstr "A 3-as generálóeljárás nem helyezte el az összes nagy szigetet."
-#: server/generator/mapgen.c:2054
+#: server/generator/mapgen.c:2088
#, c-format
msgid "Generator 3 left %li landmass unplaced."
msgstr "A 3-as generálóeljárás %li szárazföldi mezõt nem helyezett el."
@@ -7335,7 +7325,7 @@ msgid "%3d turn"
msgid_plural "%3d turns"
msgstr[0] "%3d kör"
-#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:631
#: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
@@ -7454,383 +7444,383 @@ msgstr "?city_state:B
msgid "(worklist)"
msgstr "(munkaterv)"
-#: client/cityrepdata.c:447
-msgid "Special"
-msgstr "Speciális"
+#: client/cityrepdata.c:446
+msgid "?city:Name"
+msgstr "?city:Név"
-#: client/cityrepdata.c:448
-msgid "?entertainers/scientists/taxmen:E/S/T"
-msgstr "?entertainers/scientists/taxmen:Sz/T/A"
+#: client/cityrepdata.c:446 client/gui-sdl/cityrep.c:169
+msgid "City Name"
+msgstr "Városnév"
-#: client/cityrepdata.c:449
-msgid "Entertainers, Scientists, Taxmen"
-msgstr "Szórakoztatók, Tudósok, Adószedõk"
+#: client/cityrepdata.c:448
+msgid "?size [short]:Sz"
+msgstr "?size:Mrt"
-#: client/cityrepdata.c:452
-#, fuzzy
-msgid "Concise + Rapture, - Disorder"
-msgstr "Jelek: + Ünneplés, - Zavargás"
+#: client/cityrepdata.c:448
+msgid "Size"
+msgstr "Méret"
-#: client/cityrepdata.c:454 client/plrdlg_common.c:261
+#: client/cityrepdata.c:450 client/plrdlg_common.c:261
#: client/gui-win32/plrdlg.c:337
msgid "State"
msgstr "Állapot"
-#: client/cityrepdata.c:454
+#: client/cityrepdata.c:450
msgid "Rapture/Peace/Disorder"
msgstr "Öröm/Béke/Zavargás"
+#: client/cityrepdata.c:452
+#, fuzzy
+msgid "Concise *=Rapture, X=Disorder"
+msgstr "Jelek: + Ünneplés, - Zavargás"
+
+#: client/cityrepdata.c:456
+msgid "Special"
+msgstr "Speciális"
+
#: client/cityrepdata.c:457
+msgid "?entertainers/scientists/taxmen:E/S/T"
+msgstr "?entertainers/scientists/taxmen:Sz/T/A"
+
+#: client/cityrepdata.c:458
+msgid "Entertainers, Scientists, Taxmen"
+msgstr "Szórakoztatók, Tudósok, Adószedõk"
+
+#: client/cityrepdata.c:461
#, fuzzy
msgid "?Happy workers:H"
msgstr "B"
-#: client/cityrepdata.c:457
+#: client/cityrepdata.c:461
#, fuzzy
msgid "Workers: Happy"
msgstr "Munkások: boldogak"
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
#, fuzzy
msgid "?Content workers:C"
msgstr "E"
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
#, fuzzy
msgid "Workers: Content"
msgstr "Munkások: elégedettek"
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
#, fuzzy
msgid "?Unhappy workers:U"
msgstr "Bt"
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
#, fuzzy
msgid "Workers: Unhappy"
msgstr "Munkások: boldogtalanok"
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
#, fuzzy
msgid "?Angry workers:A"
msgstr "L"
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
#, fuzzy
msgid "Workers: Angry"
msgstr "Munkások: mérgesek"
-#: client/cityrepdata.c:465 client/gui-xaw/citydlg.c:2401
-#: data/default/units.ruleset:238
-msgid "Workers"
+#: client/cityrepdata.c:469 client/gui-xaw/citydlg.c:2402
+#, fuzzy
+msgid "?city:Workers"
msgstr "Munkások"
-#: client/cityrepdata.c:466
+#: client/cityrepdata.c:470
#, fuzzy
msgid "?happy/content/unhappy/angry:H/C/U/A"
msgstr "?happy/content/unhappy/angry:B/E/Bt/L"
-#: client/cityrepdata.c:467
+#: client/cityrepdata.c:471
msgid "Workers: Happy, Content, Unhappy, Angry"
msgstr "Munkások: Boldog, Elégedett, Boldogtalan, Lázadó"
-#: client/cityrepdata.c:470 client/cityrepdata.c:472
+#: client/cityrepdata.c:474 client/cityrepdata.c:476
#, fuzzy
msgid "Best"
msgstr "."
-#: client/cityrepdata.c:470
+#: client/cityrepdata.c:474
#, fuzzy
msgid "attack"
msgstr "Támadás:"
-#: client/cityrepdata.c:471
+#: client/cityrepdata.c:475
#, fuzzy
msgid "Best attacking units"
msgstr "Automata támadás a légi egységek ellen"
-#: client/cityrepdata.c:472
+#: client/cityrepdata.c:476
#, fuzzy
msgid "defense"
msgstr "Védekezés:"
-#: client/cityrepdata.c:473
+#: client/cityrepdata.c:477
#, fuzzy
msgid "Best defending units"
msgstr "Jelenlévõ egységek ki_listázása"
-#: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
-#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
-#: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
-#: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
-#: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
-#: client/gui-win32/menu.c:351 client/gui-win32/repodlgs.c:616
-#: client/gui-win32/repodlgs.c:707 client/gui-win32/repodlgs.c:716
-#: client/gui-xaw/menu.c:157 client/gui-xaw/menu.c:219
-#: client/gui-xaw/menu.c:242 client/gui-xaw/repodlgs.c:881
-#: client/gui-xaw/repodlgs.c:1069 data/Freeciv.in:1895 data/helpdata.txt:909
+#: client/cityrepdata.c:478 client/cityrepdata.c:482
+#: client/gui-gtk-2.0/cityrep.c:1437 client/gui-gtk-2.0/cityrep.c:1456
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-gtk-2.0/cityrep.c:1494
+#: client/gui-gtk-2.0/cityrep.c:1514 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/repodlgs.c:960 client/gui-sdl/helpdlg.c:688
+#: client/gui-sdl/mapctrl.c:1605 client/gui-sdl/optiondlg.c:1827
+#: client/gui-sdl/repodlgs.c:356 client/gui-win32/menu.c:351
+#: client/gui-win32/repodlgs.c:616 client/gui-win32/repodlgs.c:707
+#: client/gui-win32/repodlgs.c:716 client/gui-xaw/menu.c:157
+#: client/gui-xaw/menu.c:219 client/gui-xaw/menu.c:242
+#: client/gui-xaw/repodlgs.c:881 client/gui-xaw/repodlgs.c:1069
+#: data/Freeciv.in:1895 data/helpdata.txt:909
msgid "Units"
msgstr "Egységek"
#. TRANS: Header "Number of units inside city"
-#: client/cityrepdata.c:476
+#: client/cityrepdata.c:480
#, fuzzy
msgid "?Present (units):Here"
msgstr "Jelenlévõ"
-#: client/cityrepdata.c:477
+#: client/cityrepdata.c:481
#, fuzzy
msgid "Number of units present"
msgstr "Jelenlévõ egységek"
#. TRANS: Header "Number of units supported by given city"
-#: client/cityrepdata.c:480
+#: client/cityrepdata.c:484
#, fuzzy
msgid "?Supported (units):Owned"
msgstr "Eltartott"
-#: client/cityrepdata.c:481
+#: client/cityrepdata.c:485
#, fuzzy
msgid "Number of units supported"
msgstr "Eltartott egységek"
#. TRANS: Header "It will take this many turns before city grows"
-#: client/cityrepdata.c:484
+#: client/cityrepdata.c:488
#, fuzzy
msgid "?food (population):Grow"
msgstr "Élelem"
-#: client/cityrepdata.c:485 client/cityrepdata.c:530
+#: client/cityrepdata.c:489 client/cityrepdata.c:528
#, fuzzy
msgid "?Stock/Target:(Have/Need)"
msgstr "(Raktár/Cél)"
-#: client/cityrepdata.c:486
+#: client/cityrepdata.c:490
#, fuzzy
msgid "Turns until growth/famine"
msgstr "Körök Élelem"
-#: client/cityrepdata.c:488
-msgid "?size [short]:Sz"
-msgstr "?size:Mrt"
-
-#: client/cityrepdata.c:488
-msgid "Size"
-msgstr "Méret"
-
-#: client/cityrepdata.c:492
-msgid "?city:Name"
-msgstr "?city:Név"
-
-#: client/cityrepdata.c:492 client/gui-sdl/cityrep.c:169
-msgid "City Name"
-msgstr "Városnév"
-
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
msgid "Surplus"
msgstr "Többlet"
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
msgid "?food/production/trade:F/P/T"
msgstr "?food/production/trade:É/T/K"
-#: client/cityrepdata.c:496
+#: client/cityrepdata.c:494
msgid "Surplus: Food, Production, Trade"
msgstr "Többlet: Élelem, Termelés, Kereskedelem"
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
#, fuzzy
msgid "?Food surplus [short]:+F"
msgstr "?Food surplus [short]:+É"
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
#, fuzzy
msgid "Surplus: Food"
msgstr "Többlet: Élelem"
-#: client/cityrepdata.c:500
+#: client/cityrepdata.c:498
#, fuzzy
msgid "?Production surplus [short]:+P"
msgstr "?Termelési munkaterv:+T"
-#: client/cityrepdata.c:501
+#: client/cityrepdata.c:499
#, fuzzy
msgid "Surplus: Production"
msgstr "Többlet: Termelés"
-#: client/cityrepdata.c:502
+#: client/cityrepdata.c:500
#, fuzzy
msgid "?Production loss (waste) [short]:-P"
msgstr "-T"
-#: client/cityrepdata.c:503
+#: client/cityrepdata.c:501
#, fuzzy
msgid "Waste"
msgstr "Várakozik"
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
#, fuzzy
msgid "?Trade surplus [short]:+T"
msgstr "?Trade surplus [short]:+K"
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
#, fuzzy
msgid "Surplus: Trade"
msgstr "Többlet: Kereskedelem"
-#: client/cityrepdata.c:506
+#: client/cityrepdata.c:504
#, fuzzy
msgid "?Trade loss (corruption) [short]:-T"
msgstr "-K"
-#: client/cityrepdata.c:507
+#: client/cityrepdata.c:505
msgid "Corruption"
msgstr "Korrupció"
-#: client/cityrepdata.c:509 client/gui-gtk-2.0/repodlgs.c:654
+#: client/cityrepdata.c:507 client/gui-gtk-2.0/repodlgs.c:654
#: client/gui-sdl/mapctrl.c:1400 client/gui-win32/repodlgs.c:334
#: client/gui-xaw/menu.c:222 client/gui-xaw/repodlgs.c:644
#: client/gui-xaw/repodlgs.c:773 data/Freeciv.in:1819
msgid "Economy"
msgstr "Gazdaság"
-#: client/cityrepdata.c:509
+#: client/cityrepdata.c:507
msgid "?gold/luxury/science:G/L/S"
msgstr "?gold/luxury/science:A/L/T"
-#: client/cityrepdata.c:510
+#: client/cityrepdata.c:508
msgid "Economy: Gold, Luxuries, Science"
msgstr "Gazdaság: Arany, Luxus, Tudomány"
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
#, fuzzy
msgid "?Gold:G"
msgstr "?Arany:A"
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
#, fuzzy
msgid "Economy: Gold"
msgstr "Gazdaság: Arany"
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
#, fuzzy
msgid "?Luxury:L"
msgstr "?Luxus:L"
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
#, fuzzy
msgid "Economy: Luxury"
msgstr "Gazdaság: Luxus"
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
#, fuzzy
msgid "?Science:S"
msgstr "?Tudomány:T"
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
#, fuzzy
msgid "Economy: Science"
msgstr "Gazdaság: Tudomány"
-#: client/cityrepdata.c:518
+#: client/cityrepdata.c:516
#, fuzzy
msgid "?number_trade_routes:n"
msgstr "?number_trade_routes:sz"
-#: client/cityrepdata.c:518
+#: client/cityrepdata.c:516
#, fuzzy
msgid "?number_trade_routes:R"
msgstr "?number_trade_routes:KK"
-#: client/cityrepdata.c:519
+#: client/cityrepdata.c:517
msgid "Number of Trade Routes"
msgstr "Kereskedelmi kapcsolatok száma"
-#: client/cityrepdata.c:521
+#: client/cityrepdata.c:519
msgid "?pollution [short]:Pol"
msgstr "?pollution [short]:Szenny"
-#: client/cityrepdata.c:523
+#: client/cityrepdata.c:521
#, fuzzy
msgid "?cma:Governor"
msgstr "?cma:Helytartó"
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
-#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
-#: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
-#: data/Freeciv.in:1459 data/helpdata.txt:820
+#: client/cityrepdata.c:521 client/gui-gtk-2.0/cityrep.c:1766
+#: client/gui-sdl/citydlg.c:3809 client/gui-sdl/cma_fe.c:858
+#: client/gui-win32/citydlg.c:726 data/Freeciv.in:1459 data/helpdata.txt:820
#, fuzzy
msgid "Citizen Governor"
msgstr "Városi helytartó"
-#: client/cityrepdata.c:526
+#: client/cityrepdata.c:524
#, fuzzy
msgid "Turns/Buy"
msgstr "Körök/Ár"
-#: client/cityrepdata.c:529 client/cityrepdata.c:531
+#: client/cityrepdata.c:527 client/cityrepdata.c:529
msgid "Currently Building"
msgstr "Most épül"
-#: client/cityrepdata.c:575
+#: client/cityrepdata.c:573
#, fuzzy
msgid "?specialist:S"
msgstr "?Speciálisok:S"
-#: client/cityrepdata.c:578
+#: client/cityrepdata.c:576
#, fuzzy
msgid "Specialists"
msgstr "Speciálisok"
-#: client/civclient.c:239
+#: client/civclient.c:240
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr " -a, --autoconnect\tKapcsolódás ablak átugrása\n"
-#: client/civclient.c:249
+#: client/civclient.c:250
#, 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:251
+#: client/civclient.c:252
msgid " -m, --meta HOST\tConnect to the metaserver at HOST\n"
msgstr " -m, --meta HOST\tHOST használata metaszerverként\n"
-#: client/civclient.c:253
+#: client/civclient.c:254
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:255
+#: client/civclient.c:256
#, 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:257
+#: client/civclient.c:258
#, 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:259
+#: client/civclient.c:260
#, 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:262
+#: client/civclient.c:263
#, 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:264
+#: client/civclient.c:265
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:265
+#: client/civclient.c:266
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:268
+#: client/civclient.c:269
#, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -7838,146 +7828,156 @@ msgid ""
msgstr ""
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:273
+#: client/civclient.c:274
#, fuzzy, c-format
msgid "Report bugs at %s\n"
msgstr "Hibajelentéseket a(z) <%s> címre küldj.\n"
-#: client/civclient.c:297
+#: client/civclient.c:298
#, c-format
msgid "Invalid port \"%s\" specified with --port option.\n"
msgstr ""
-#: client/civclient.c:299 client/civclient.c:314
+#: client/civclient.c:300 client/civclient.c:315
msgid "Try using --help.\n"
msgstr ""
-#: client/civclient.c:312
+#: client/civclient.c:313
#, c-format
msgid "Invalid debug level \"%s\" specified with --debug option.\n"
msgstr ""
-#: client/civclient.c:325
+#: client/civclient.c:326
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr "Ismeretlen opció: \"%s\"\n"
-#: client/civclient.c:539
+#: client/civclient.c:391
+#, fuzzy, c-format
+msgid "Updating old metaserver address \"%s\"."
+msgstr "metaserver <cím>"
+
+#: client/civclient.c:394
+#, 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
msgid "Game started."
msgstr "A játék elkezdõdött."
-#: client/civclient.c:577
+#: client/civclient.c:588
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."
-#: client/climisc.c:176
+#: client/climisc.c:177
#, c-format
msgid "Changing production of every %s into %s."
msgstr "Minden %s gyártásának cseréje %s egységre/épületre."
-#: client/climisc.c:214
+#: client/climisc.c:215
msgid "?embassy:Both"
msgstr "?embassy:Kölcsönös"
-#: client/climisc.c:216
+#: client/climisc.c:217
msgid "?embassy:Yes"
msgstr "?embassy:Van"
-#: client/climisc.c:219
+#: client/climisc.c:220
msgid "?embassy:With Us"
msgstr "?embassy:Velünk"
-#: client/climisc.c:222
+#: client/climisc.c:223
#, fuzzy
msgid "?embassy:Contact"
msgstr "?embassy:Kölcsönös"
-#: client/climisc.c:224
+#: client/climisc.c:225
#, fuzzy
msgid "?embassy:No Contact"
msgstr "?embassy:Kölcsönös"
-#: client/climisc.c:236
+#: client/climisc.c:237
msgid "?vision:Both"
msgstr "?vision:Kölcsönös"
-#: client/climisc.c:238
+#: client/climisc.c:239
msgid "?vision:To Them"
msgstr "?vision:Feléjük"
-#: client/climisc.c:241
+#: client/climisc.c:242
msgid "?vision:To Us"
msgstr "?vision:Felénk"
-#: client/climisc.c:257 client/climisc.c:264
+#: client/climisc.c:258 client/climisc.c:265
#, c-format
msgid "The %s give %s"
msgstr "A(z) %s odaadják a(z) %s tudományt"
-#: client/climisc.c:268
+#: client/climisc.c:269
#, c-format
msgid "The %s give unknown city."
msgstr "A(z) %s ismeretlen várot adnak."
-#: client/climisc.c:273
+#: client/climisc.c:274
#, c-format
msgid "The %s give %d gold"
msgstr "A(z) %s %d aranyat adnak"
-#: client/climisc.c:278
+#: client/climisc.c:279
#, c-format
msgid "The %s give their worldmap"
msgstr "A(z) %s világtérképet adnak"
-#: client/climisc.c:282
+#: client/climisc.c:283
#, c-format
msgid "The %s give their seamap"
msgstr "A(z) %s tengeri térképet adnak"
-#: client/climisc.c:286
+#: client/climisc.c:287
msgid "The parties agree on a cease-fire"
msgstr "A felek tûzszünetet kötnek"
-#: client/climisc.c:289
+#: client/climisc.c:290
msgid "The parties agree on a peace"
msgstr "A felek békét kötnek"
-#: client/climisc.c:292
+#: client/climisc.c:293
msgid "The parties create an alliance"
msgstr "A felek szövetséget kötnek"
-#: client/climisc.c:295
+#: client/climisc.c:296
#, c-format
msgid "The %s give shared vision"
msgstr "A(z) %s közös látványt adnak"
-#: client/climisc.c:299
+#: client/climisc.c:300
#, fuzzy, c-format
msgid "The %s give an embassy"
msgstr "A(z) %s odaadják a(z) %s tudományt"
-#: client/climisc.c:902
+#: client/climisc.c:906
msgid "Popup Request"
msgstr "Felbukkanó kérés"
-#: client/climisc.c:932
+#: client/climisc.c:936
msgid "Exporting output window to civgame.log ..."
msgstr "A kimeneti ablak tartalmának exportálása a civgame.log fájlba ..."
-#: client/climisc.c:936
+#: client/climisc.c:940
msgid "Export complete."
msgstr "Exportálás kész."
-#: client/climisc.c:938
+#: client/climisc.c:942
msgid "Export failed, couldn't write to file."
msgstr "Nem sikerült elkészíteni a fájlt, az exportálás nem sikerült."
-#: client/climisc.c:1038
+#: client/climisc.c:1042
#, fuzzy, c-format
msgid "You don't buy %s in %s!"
msgstr "Nem veszel %s egységet/épületet!"
-#: client/climisc.c:1056
+#: client/climisc.c:1060
#, c-format
msgid "%s costs %d gold and you only have %d gold."
msgstr "%s ára %d arany, de neked csak %d aranyad van."
@@ -8031,21 +8031,21 @@ msgstr ""
"Automatikus kapcsolódás a(z) \"%s\" szerverhez a(z) %d porton \"%s\" néven %"
"d.%d másodpercenként (%d kísérlet)"
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1289
+#: client/connectdlg_common.c:79 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:1289
+#: client/connectdlg_common.c:80 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:1290
+#: client/connectdlg_common.c:81 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:1290
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
msgid "hard"
msgstr "nehéz"
@@ -8078,40 +8078,43 @@ msgstr ""
#: client/connectdlg_common.c:470
#, fuzzy
-msgid "We have control of the server (command access level hack)"
+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
-msgid "We can't take control of server, attempting to kill it."
+msgid ""
+"Failed to obtain the required access level to take control of the server. "
+"The server will now be shutdown."
msgstr ""
-#: client/control.c:1104
+#: client/control.c:1123
msgid "Only transporter units can be unloaded."
msgstr "Csak szállító egységek tudnak kirakodni."
-#: client/control.c:1353
+#: client/control.c:1425
#, 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:1444
+#: client/control.c:1516
msgid "Only nuclear units can do this."
msgstr "Csak nukleáris egységek tehetik ezt."
-#: client/control.c:1473
+#: client/control.c:1545
msgid "Only paratrooper units can do this."
msgstr "Csak ejtõernyõs egységet tehetik ezt."
-#: client/control.c:1921
+#: client/control.c:2020
msgid "Too far for this unit."
msgstr "Túl messze van az egységtõl."
-#: client/control.c:2131 client/control.c:2161 client/control.c:2177
+#: client/control.c:2230 client/control.c:2260 client/control.c:2276
msgid "Didn't find a route to the destination!"
msgstr "Nem sikerült útvonalat találni a célhoz!"
-#: client/control.c:2221
+#: client/control.c:2320
msgid "Oh my! You seem to have no capital!"
msgstr ""
@@ -8180,17 +8183,17 @@ msgid "Allows %s (with %s)."
msgstr "Lehetõvé válik a(z) %s (ha van már %s).\n"
#. TRANS: preserve single space at beginning
-#: client/helpdata.c:418
+#: client/helpdata.c:416
#, fuzzy
msgid " Rivers"
msgstr " Folyók"
-#: client/helpdata.c:576
+#: client/helpdata.c:574
#, c-format
msgid "Sorry, no help topic for %s.\n"
msgstr "Sajnálom, a(z) %s azonosítóhoz nincs súgó témakör.\n"
-#: client/helpdata.c:580
+#: client/helpdata.c:578
#, c-format
msgid ""
"Sorry, no help topic for %s.\n"
@@ -8201,13 +8204,13 @@ msgstr ""
"Ez egy automatikusan generált lap.\n"
"\n"
-#: client/helpdata.c:670
+#: client/helpdata.c:668
msgid ""
"Requires: Nothing\n"
"\n"
msgstr ""
-#: client/helpdata.c:675
+#: client/helpdata.c:673
#, fuzzy, c-format
msgid "* The discovery of %s will make %s obsolete.\n"
msgstr ""
@@ -8215,208 +8218,208 @@ msgstr ""
"\n"
"A(z) %2$s elavul a %1$s felfedezésével. "
-#: client/helpdata.c:694
+#: client/helpdata.c:692
#, fuzzy, c-format
msgid "* Allows all players with knowledge of %s to build %s units.\n"
msgstr ""
"Minden %s tudományt ismerõ játékosnak engedélyezi a(z) %s egységek "
"építését. "
-#: client/helpdata.c:706
+#: client/helpdata.c:704
#, fuzzy, c-format
msgid "* Allows %s (with %s).\n"
msgstr "Lehetõvé válik a(z) %s (ha van már %s).\n"
-#: client/helpdata.c:710
+#: client/helpdata.c:708
#, fuzzy, c-format
msgid "* Allows %s.\n"
msgstr "Lehetõvé válik a(z) %s.\n"
-#: client/helpdata.c:780
+#: client/helpdata.c:778
#, c-format
msgid "* Can only be built if there is %s in the city.\n"
msgstr ""
-#: client/helpdata.c:786
+#: client/helpdata.c:784
#, c-format
msgid "* Can only be built with %s as government.\n"
msgstr ""
-#: client/helpdata.c:791
+#: client/helpdata.c:789
#, fuzzy
msgid "* May not be built in cities.\n"
msgstr "* Alapíthat új városokat.\n"
-#: client/helpdata.c:794
+#: client/helpdata.c:792
msgid "* Never has a home city.\n"
msgstr ""
-#: client/helpdata.c:797
+#: client/helpdata.c:795
msgid "* Losing this unit will lose you the game!\n"
msgstr ""
-#: client/helpdata.c:801
+#: client/helpdata.c:799
msgid "* Each player may only have one of this type of unit.\n"
msgstr ""
-#: client/helpdata.c:805
+#: client/helpdata.c:803
#, c-format
msgid "* Requires %d population to build.\n"
msgstr ""
-#: client/helpdata.c:811
+#: client/helpdata.c:809
#, c-format
msgid "* Can carry and refuel %d air unit.\n"
msgid_plural "* Can carry and refuel %d air units.\n"
msgstr[0] "* Tud szállítani és új üzemanyaggal ellátni %d légi egységet.\n"
-#: client/helpdata.c:816
+#: client/helpdata.c:814
#, c-format
msgid "* Can carry and refuel %d missile unit.\n"
msgid_plural "* Can carry and refuel %d missile units.\n"
msgstr[0] "* Tud szállítani és új üzemanyaggal ellátni %d rakétaegységet.\n"
-#: client/helpdata.c:821
+#: client/helpdata.c:819
#, c-format
msgid "* Can carry %d ground unit across water.\n"
msgid_plural "* Can carry %d ground units across water.\n"
msgstr[0] "* %d szárazföldi egységet tud szállítani a tengeren.\n"
-#: client/helpdata.c:830
+#: client/helpdata.c:828
msgid ""
"* Can establish trade routes (must travel to target city and must be at "
"least 9 tiles [in Manhattan distance] from this unit's home city).\n"
msgstr ""
-#: client/helpdata.c:836
+#: client/helpdata.c:834
#, fuzzy, c-format
msgid "* Can help build wonders (adds %d production).\n"
msgstr "* Segíthet világcsodát építeni.\n"
-#: client/helpdata.c:840
+#: client/helpdata.c:838
msgid "* May not be disbanded.\n"
msgstr ""
-#: client/helpdata.c:842
+#: client/helpdata.c:840
#, c-format
msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
msgstr ""
-#: client/helpdata.c:846
+#: client/helpdata.c:844
msgid "* Can build new cities.\n"
msgstr "* Alapíthat új városokat.\n"
-#: client/helpdata.c:849
+#: client/helpdata.c:847
#, c-format
msgid "* Can add on %d population to cities of no more than size %d.\n"
msgstr ""
-#: client/helpdata.c:858
+#: client/helpdata.c:856
#, fuzzy
msgid "* Can build roads and railroads.\n"
msgstr "* Segíthet világcsodát építeni.\n"
-#: client/helpdata.c:859
+#: client/helpdata.c:857
#, fuzzy
msgid "* Can build mines on tiles.\n"
msgstr "* Alapíthat új városokat.\n"
-#: client/helpdata.c:860
+#: client/helpdata.c:858
#, fuzzy
msgid "* Can build irrigation on tiles.\n"
msgstr "* Alapíthat új városokat.\n"
-#: client/helpdata.c:865
+#: client/helpdata.c:863
#, fuzzy
msgid "* Can build farmland.\n"
msgstr "Farmot Épít"
-#: client/helpdata.c:869
+#: client/helpdata.c:867
#, fuzzy, c-format
msgid "* Can build farmland (if %s is known).\n"
msgstr "* Alapíthat új városokat.\n"
-#: client/helpdata.c:873
+#: client/helpdata.c:871
#, c-format
msgid "* Can build farmland (if any of the following are known: %s).\n"
msgstr ""
-#: client/helpdata.c:881
+#: client/helpdata.c:879
#, fuzzy
msgid "* Can build fortresses.\n"
msgstr "Lehetõvé teszi a(z) %s egységek számára az erõdépítést.\n"
-#: client/helpdata.c:885
+#: client/helpdata.c:883
#, c-format
msgid "* Can build fortresses (if %s is known).\n"
msgstr ""
-#: client/helpdata.c:889
+#: client/helpdata.c:887
#, c-format
msgid "* Can build fortresses (if any of the following are known: %s).\n"
msgstr ""
-#: client/helpdata.c:895
+#: client/helpdata.c:893
msgid "* Can clean pollution from tiles.\n"
msgstr ""
-#: client/helpdata.c:896
+#: client/helpdata.c:894
#, fuzzy
msgid "* Can clean nuclear fallout from tiles.\n"
msgstr "Nukleáris Szennyezést Eltakarít"
-#: client/helpdata.c:899
+#: client/helpdata.c:897
#, fuzzy
msgid "* Can transform tiles.\n"
msgstr "* Végezhet telepes tevékenységeket.\n"
-#: client/helpdata.c:902
+#: client/helpdata.c:900
#, fuzzy
msgid "* Can build airbases.\n"
msgstr "* Alapíthat új városokat.\n"
-#: client/helpdata.c:906
+#: client/helpdata.c:904
#, c-format
msgid "* May fortify, granting a 50%% defensive bonus.\n"
msgstr ""
-#: client/helpdata.c:909
+#: client/helpdata.c:907
msgid "* May pillage to destroy infrastructure from tiles.\n"
msgstr ""
-#: client/helpdata.c:913
+#: client/helpdata.c:911
msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
msgstr ""
"* Végrehajthat diplomáciai akciókat, ezen kívül speciális, csak kémekre "
"jellemzõ képességei is vannak.\n"
-#: client/helpdata.c:916
+#: client/helpdata.c:914
msgid "* Can perform diplomatic actions.\n"
msgstr "* Végrehajthat diplomáciai akciókat.\n"
-#: client/helpdata.c:920
+#: client/helpdata.c:918
msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
msgstr ""
-#: client/helpdata.c:923
+#: client/helpdata.c:921
msgid "* May not be bribed.\n"
msgstr ""
-#: client/helpdata.c:926
+#: client/helpdata.c:924
msgid "* Can attack enemy air units.\n"
msgstr "* Megtámadhat ellenséges légi egységeket.\n"
-#: client/helpdata.c:930
+#: client/helpdata.c:928
msgid "* Is invisible except when next to an enemy unit or city.\n"
msgstr ""
"* Láthatatlan, kivéve ha közvetlenül egy ellenséges egység vagy város "
"mellett van.\n"
-#: client/helpdata.c:934
+#: client/helpdata.c:932
msgid "* Can only attack units on ocean squares (no land attacks).\n"
msgstr "* Csak tengeri mezõn tartózkodó egységeket támadhat.\n"
-#: client/helpdata.c:938
+#: client/helpdata.c:936
#, fuzzy
msgid ""
"* Can attack from aboard sea units: against enemy cities and onto land "
@@ -8425,79 +8428,79 @@ msgstr ""
"* Tengeri egységek fedélzetérõl is képes támadni: városokat és szárazföldi "
"mezõket."
-#: client/helpdata.c:943
+#: client/helpdata.c:941
#, fuzzy, c-format
msgid "* Can be paradropped from a friendly city (Range: %d).\n"
msgstr ""
"* A városokból indítva ejtõernyõs ugrást hajthat végre (Hatótávolság: %d)."
-#: client/helpdata.c:949
+#: client/helpdata.c:947
msgid "* Gets double defense against units specified as 'mounted'.\n"
msgstr "* Dupla védelem a 'lovas' jelzõvel ellátott egységek ellen.\n"
-#: client/helpdata.c:953
+#: client/helpdata.c:951
msgid "* Counts as 'mounted' against certain defenders.\n"
msgstr "* Bizonyos védõk ellen 'lovas' egységnek számít.\n"
-#: client/helpdata.c:957
+#: client/helpdata.c:955
msgid "* A missile unit: gets used up in making an attack.\n"
msgstr "* Rakéta típusú egység: támadás közben megsemmisül.\n"
-#: client/helpdata.c:960
+#: client/helpdata.c:958
msgid "* Making an attack ends this unit's turn.\n"
msgstr "* A támadás lezárja az egység körét.\n"
-#: client/helpdata.c:964
+#: client/helpdata.c:962
msgid "* This unit's attack causes a nuclear explosion!\n"
msgstr "* Az egység támadása atomrobbanást okoz!\n"
-#: client/helpdata.c:968
+#: client/helpdata.c:966
msgid "* Gets double firepower when attacking cities.\n"
msgstr ""
-#: client/helpdata.c:971
+#: client/helpdata.c:969
msgid "* Ignores the effects of city walls.\n"
msgstr "* Nem hat rá a városfal.\n"
-#: client/helpdata.c:975
+#: client/helpdata.c:973
#, c-format
msgid ""
"* Does bombard attacks (%d per turn). These attacks will only damage (never "
"kill) the defender, but have no risk for the attacker.\n"
msgstr ""
-#: client/helpdata.c:982
+#: client/helpdata.c:980
msgid "* Gets quintuple defense against missiles and aircraft.\n"
msgstr "* Négyszeres védelem a rakéták és repülõgépek ellen.\n"
-#: client/helpdata.c:986
+#: client/helpdata.c:984
msgid "* Ignores terrain effects (treats all squares as roads).\n"
msgstr ""
"* Mozgását nem befolyásolják a terepviszonyok (minden mezõt útként "
"használ).\n"
-#: client/helpdata.c:989
+#: client/helpdata.c:987
msgid "* Ignores zones of control.\n"
msgstr "* Nem hatnak rá a fennhatósági zónák.\n"
-#: client/helpdata.c:993
+#: client/helpdata.c:991
msgid "* A non-military unit (cannot attack; no martial law).\n"
msgstr "* Nem katonai egység (nem tud támadni; nem csökkenti a zavargást).\n"
-#: client/helpdata.c:997
+#: client/helpdata.c:995
msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
msgstr ""
"* Harctéri egység: akkor is 1 boldogtalanságot okoz, amikor nem agresszív.\n"
-#: client/helpdata.c:1000
+#: client/helpdata.c:998
msgid "* Will never achieve veteran status.\n"
msgstr ""
-#: client/helpdata.c:1002
+#: client/helpdata.c:1000
msgid "* May become veteran through training or combat.\n"
msgstr ""
-#: client/helpdata.c:1008
+#: client/helpdata.c:1006
#, fuzzy, c-format
msgid ""
"* Must end turn in a city or next to land, or has a 50%% risk of being lost "
@@ -8506,12 +8509,12 @@ msgstr ""
"* Ha nem városban vagy part mellett fejezi be a körét, akkor 50%% eséllyel "
"elsüllyed a tengerben."
-#: client/helpdata.c:1012
+#: client/helpdata.c:1010
#, c-format
msgid "* The discovery of %s reduces the risk to 25%%.\n"
msgstr ""
-#: client/helpdata.c:1017
+#: client/helpdata.c:1015
#, c-format
msgid "* %s reduces the risk to 12%%.\n"
msgstr ""
@@ -8520,29 +8523,29 @@ msgstr ""
#. * last two elements
#. TRANS: List of possible output types has this between
#. * last two elements
-#: client/helpdata.c:1068 client/helpdata.c:1402
+#: client/helpdata.c:1066 client/helpdata.c:1400
msgid " or "
msgstr " vagy "
-#: client/helpdata.c:1070 client/helpdata.c:1390
+#: client/helpdata.c:1068 client/helpdata.c:1388
msgid "?or:, "
msgstr "?or:, "
-#: client/helpdata.c:1082
+#: 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"
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:1124
+#: client/helpdata.c:1122
#, 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:1129
+#: client/helpdata.c:1127
#, c-format
msgid ""
"To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8551,97 +8554,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:1137
+#: client/helpdata.c:1135
msgid "You cannot research this technology."
msgstr ""
-#: client/helpdata.c:1141
+#: client/helpdata.c:1139
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:1153
+#: client/helpdata.c:1151
#, 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:1158
+#: client/helpdata.c:1156
#, c-format
msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
msgstr ""
-#: client/helpdata.c:1161
+#: client/helpdata.c:1159
#, c-format
msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
msgstr ""
-#: client/helpdata.c:1165
+#: client/helpdata.c:1163
#, fuzzy
msgid "* Increases the pollution generated by the population.\n"
msgstr "Növeli a lakosság által termelt szennyezést.\n"
-#: client/helpdata.c:1170
+#: client/helpdata.c:1168
#, 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:1177
+#: client/helpdata.c:1175
#, 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:1185
+#: client/helpdata.c:1183
#, 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:1194
+#: client/helpdata.c:1192
#, 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:1202
+#: client/helpdata.c:1200
#, 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:1236
+#: client/helpdata.c:1234
msgid "* Pollution cannot be generated on this terrain."
msgstr ""
-#: client/helpdata.c:1241
+#: client/helpdata.c:1239
#, fuzzy
msgid "* You cannot build cities on this terrain."
msgstr "Ennek a népnek az egységeit nem lehet lefizetni."
-#: client/helpdata.c:1247
+#: client/helpdata.c:1245
msgid "* The coastline of this terrain is unsafe."
msgstr ""
-#: client/helpdata.c:1252
+#: client/helpdata.c:1250
msgid "* This terrain is unsafe for units to travel on."
msgstr ""
-#: client/helpdata.c:1257
+#: client/helpdata.c:1255
msgid "* Land units cannot travel on oceanic terrains."
msgstr ""
-#: client/helpdata.c:1307
+#: client/helpdata.c:1305
msgid "Features:\n"
msgstr ""
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1413 client/helpdata.c:1414
+#: client/helpdata.c:1411 client/helpdata.c:1412
msgid "?outputlist: Nothing "
msgstr ""
-#: client/helpdata.c:1421
+#: client/helpdata.c:1419
#, fuzzy, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
@@ -8651,7 +8654,7 @@ msgid_plural ""
"become unhappy.\n"
msgstr[0] "A harcmezõn lévõ katonai egységek boldogtalanságot okozhatnak. "
-#: client/helpdata.c:1431
+#: client/helpdata.c:1429
#, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8659,48 +8662,48 @@ msgid ""
msgstr ""
#. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1439
+#: client/helpdata.c:1437
#, c-format
msgid "* You pay %d times normal %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1444
+#: client/helpdata.c:1442
#, 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:1449
+#: client/helpdata.c:1447
#, c-format
msgid "* You pay no %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1453
+#: client/helpdata.c:1451
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:1462
+#: client/helpdata.c:1460
#, 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:1470
+#: client/helpdata.c:1468
#, c-format
msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
msgstr ""
-#: client/helpdata.c:1477
+#: client/helpdata.c:1475
#, 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:1484
+#: client/helpdata.c:1482
#, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -8708,23 +8711,23 @@ msgid ""
msgstr ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1491
+#: client/helpdata.c:1489
#, 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:1499
+#: client/helpdata.c:1497
#, c-format
msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
msgstr ""
-#: client/helpdata.c:1504
+#: client/helpdata.c:1502
msgid "Has unlimited science/gold/luxuries rates.\n"
msgstr ""
-#: client/helpdata.c:1509
+#: client/helpdata.c:1507
#, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
@@ -8734,71 +8737,71 @@ msgid_plural ""
"force %d unhappy citizens to become content.\n"
msgstr[0] ""
-#: client/helpdata.c:1521
+#: client/helpdata.c:1519
#, 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:1532
+#: client/helpdata.c:1530
#, 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:1538
+#: client/helpdata.c:1536
#, 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:1541
+#: client/helpdata.c:1539
#, fuzzy
msgid "* Your cities cannot be incited.\n"
msgstr "A város nem lázítható fel!"
-#: client/helpdata.c:1545
+#: client/helpdata.c:1543
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:1551
+#: client/helpdata.c:1549
msgid "* Has a senate that may prevent declaration of war.\n"
msgstr ""
-#: client/helpdata.c:1555
+#: client/helpdata.c:1553
msgid "* Allows partisans when cities are taken by the enemy.\n"
msgstr ""
-#: client/helpdata.c:1559
+#: client/helpdata.c:1557
msgid ""
"* Buildings that normally confer bonuses against unhappiness will instead "
"give gold.\n"
msgstr ""
-#: client/helpdata.c:1563
+#: client/helpdata.c:1561
msgid "* Pays no upkeep for fanatics.\n"
msgstr ""
-#: client/helpdata.c:1566
+#: client/helpdata.c:1564
#, fuzzy
msgid "* Has no unhappy citizens.\n"
msgstr "a plusz %d boldogtalan lakosos büntetés életbe lépéséig."
-#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
+#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
#, c-format
msgid "* Veteran %s units.\n"
msgstr ""
-#: client/helpdata.c:1587
+#: client/helpdata.c:1585
#, fuzzy
msgid "* Veteran units.\n"
msgstr "Tengeri egységek ellen"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1593
+#: client/helpdata.c:1591
#, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8806,7 +8809,7 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1602
+#: client/helpdata.c:1600
#, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8814,464 +8817,511 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1610
+#: client/helpdata.c:1608
#, 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:1619
+#: client/helpdata.c:1617
#, c-format
msgid "* %s production is increased %d%%.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1627
+#: client/helpdata.c:1625
#, c-format
msgid "* %s production will suffer massive waste.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1632
+#: client/helpdata.c:1630
#, c-format
msgid "* %s production will suffer some waste.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1637
+#: client/helpdata.c:1635
#, 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:1645
+#: client/helpdata.c:1643
#, 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:1651
+#: client/helpdata.c:1649
#, 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:1657
+#: client/helpdata.c:1655
#, c-format
msgid "* %s waste will increase slowly with distance from capital.\n"
msgstr ""
-#: client/helpdata.c:1674
+#: client/helpdata.c:1672
#, 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:1701
+#: client/helpdata.c:1699
#, fuzzy, c-format
msgid "%s%d %s"
msgstr "%3d/%3d %s"
-#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1700 client/helpdata.c:1708 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:1709
+#: client/helpdata.c:1707
#, c-format
msgid "%s%d unhappy"
msgstr "%s%d boldogtalan"
-#: client/mapctrl_common.c:382
+#: client/mapctrl_common.c:399
#, fuzzy, c-format
msgid "You don't know how to build %s!"
msgstr "Nem veszel %s egységet/épületet!"
-#: client/mapctrl_common.c:392
+#: client/mapctrl_common.c:409
#, c-format
msgid "Copy %s to clipboard."
msgstr ""
-#: client/mapctrl_common.c:408
+#: client/mapctrl_common.c:425
msgid "Clipboard is empty."
msgstr ""
-#: client/options.c:98
+#: client/options.c:102
#, fuzzy
msgid "Graphics"
msgstr "Demográfia"
-#: client/options.c:99
+#: client/options.c:103
#, fuzzy
msgid "Overview"
msgstr "Általános _jellemzõk"
-#: client/options.c:100
+#: client/options.c:104
#, fuzzy
msgid "Sound"
msgstr "Körök"
-#: client/options.c:101
+#: client/options.c:105
msgid "Interface"
msgstr ""
-#: client/options.c:102
+#: client/options.c:106
msgid "Network"
msgstr ""
-#: client/options.c:107
+#: client/options.c:111
#, fuzzy
msgid "Login name"
msgstr "Csatlakozás"
-#: client/options.c:108
+#: client/options.c:112
msgid ""
"This is the default login username that will be used in the connection "
"dialogs or with the -a command-line parameter."
msgstr ""
-#: client/options.c:113
+#: client/options.c:117
#, fuzzy
msgid "Server"
msgstr "soha"
-#: client/options.c:114
+#: client/options.c:118
msgid ""
"This is the default server hostname that will be used in the connection "
"dialogs or with the -a command-line parameter."
msgstr ""
-#: client/options.c:119
+#: client/options.c:123
#, fuzzy
msgid "Server port"
msgstr "(szerverprompt)"
-#: client/options.c:120
+#: client/options.c:124
msgid ""
"This is the default server port that will be used in the connection dialogs "
"or with the -a command-line parameter."
msgstr ""
-#: client/options.c:125 client/gui-win32/connectdlg.c:912 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
msgid "Metaserver"
msgstr "Metaszerver"
-#: client/options.c:126
+#: client/options.c:130
msgid ""
"The metaserver is a host that the client contacts to find out about games on "
"the internet. Don't change this from its default value unless you know what "
"you're doing."
msgstr ""
-#: client/options.c:132
+#: client/options.c:136
#, fuzzy
msgid "Soundset"
msgstr "Körök"
-#: client/options.c:133
+#: client/options.c:137
msgid ""
"This is the soundset that will be used. Changing this is the same as using "
"the -S command-line parameter."
msgstr ""
-#: client/options.c:138
+#: client/options.c:142
#, fuzzy
msgid "Sound plugin"
msgstr "Alapértelmezett hang-bõvítõmodul"
-#: client/options.c:139
+#: client/options.c:143
msgid ""
"If you have a problem with sound, try changing the sound plugin. The new "
"plugin won't take effect until you restart Freeciv. Changing this is the "
"same as using the -P command-line option."
msgstr ""
-#: client/options.c:144 client/gui-sdl/gui_main.c:162
+#: client/options.c:148 client/gui-sdl/gui_main.c:162
#, fuzzy
msgid "Theme"
msgstr "Templom"
-#: client/options.c:145
+#: client/options.c:149
msgid "By changing this option you change the active theme."
msgstr ""
-#: client/options.c:148
+#: client/options.c:152
#, fuzzy
msgid "Tileset"
msgstr "%s Mezõ"
-#: client/options.c:149
+#: client/options.c:153
msgid ""
"By changing this option you change the active tileset. This is the same as "
"using the -t command-line parameter."
msgstr ""
-#: client/options.c:156
+#: client/options.c:160
msgid "Solid unit background color"
msgstr "Nem átlátszó egységháttér"
-#: client/options.c:157
+#: client/options.c:161
msgid ""
"Setting this option will cause units on the map view to be drawn with a "
"solid background color instead of the flag backdrop."
msgstr ""
-#: client/options.c:161 client/gui-sdl/optiondlg.c:960
+#: client/options.c:165 client/gui-sdl/optiondlg.c:960
msgid "Sound bell at new turn"
msgstr "Hangjelzés új kör esetén"
-#: client/options.c:162
+#: client/options.c:166
msgid ""
"Set this option to have a \"bell\" event be generated at the start of a new "
"turn. You can control the behavior of the \"bell\" event by editing the "
"message options."
msgstr ""
-#: client/options.c:168
+#: client/options.c:172
msgid "Unit movement animation time (milliseconds)"
msgstr ""
-#: client/options.c:169
+#: client/options.c:173
msgid ""
"This option controls how long unit \"animation\" takes when a unit moves on "
"the map view. Set it to 0 to disable animation entirely."
msgstr ""
-#: client/options.c:174
+#: client/options.c:178
msgid "Mapview recentering time (milliseconds)"
msgstr ""
-#: client/options.c:175
+#: client/options.c:179
msgid ""
"When the map view is recentered, it will slide smoothly over the map to its "
"new position. This option controls how long this slide lasts. Set it to 0 "
"to disable mapview sliding entirely."
msgstr ""
-#: client/options.c:180 client/gui-sdl/optiondlg.c:1014
+#: client/options.c:184 client/gui-sdl/optiondlg.c:1014
msgid "Show combat animation"
msgstr "Animált csata"
-#: client/options.c:181
+#: client/options.c:185
msgid ""
"Disabling this option will turn off combat animation between units on the "
"mapview."
msgstr ""
-#: client/options.c:184
+#: client/options.c:188
msgid "Draw the citybar"
msgstr ""
-#: client/options.c:185
+#: client/options.c:189
msgid ""
"Setting this option will display a 'citybar' containing useful information "
"beneath each city. Disabling this option will display only the city's name "
"and optionally, production."
msgstr ""
-#: client/options.c:191
+#: client/options.c:195
msgid "Show icons in the technology tree"
msgstr ""
-#: client/options.c:192
+#: client/options.c:196
msgid ""
"Setting this option will display icons on the technology tree diagram. "
"Turning this option off makes the technology tree more compact."
msgstr ""
-#: client/options.c:197
+#: client/options.c:201
msgid "Draw shield graphics for units"
msgstr ""
-#: client/options.c:198
+#: client/options.c:202
msgid ""
"Setting this option will draw a shield icon as the flags on units. If "
"unset, the full flag will be drawn."
msgstr ""
-#: client/options.c:202
+#: client/options.c:206
msgid "Manual Turn Done in AI Mode"
msgstr ""
-#: client/options.c:203
+#: client/options.c:207
msgid ""
"Disable this option if you do not want to press the Turn Done button "
"manually when watching an AI player."
msgstr ""
-#: client/options.c:207 client/gui-sdl/optiondlg.c:1121
+#: client/options.c:211 client/gui-sdl/optiondlg.c:1121
msgid "Auto Center on Units"
msgstr "Ráközelítés az egységekre"
-#: client/options.c:208
+#: client/options.c:212
msgid ""
"Set this option to have the active unit centered automatically when the unit "
"focus changes."
msgstr ""
-#: client/options.c:211 client/gui-sdl/optiondlg.c:1147
+#: client/options.c:215 client/gui-sdl/optiondlg.c:1147
msgid "Auto Center on Combat"
msgstr "Ráközelítés a csatákra"
-#: client/options.c:212
+#: client/options.c:216
msgid ""
"Set this option to have any combat be centered automatically. Disabled this "
"will speed up the time between turns but may cause you to miss combat "
"entirely."
msgstr ""
-#: client/options.c:217 client/gui-sdl/optiondlg.c:1174
+#: client/options.c:221 client/gui-sdl/optiondlg.c:1174
msgid "Focus on Awakened Units"
msgstr "Ráközelítés a felébresztett egységekre"
-#: client/options.c:218
+#: client/options.c:222
msgid "Set this option to have newly awoken units be focused automatically."
msgstr ""
-#: client/options.c:221
+#: client/options.c:225
msgid "Allow goto into the unknown"
msgstr ""
-#: client/options.c:222
+#: client/options.c:226
msgid ""
"Setting this option will make the game consider moving into unknown tiles. "
"If not, then goto routes will detour around or be blocked by unknown tiles."
msgstr ""
-#: client/options.c:226
+#: client/options.c:230
msgid "Center map when Popup city"
msgstr "Ráközelítés a városra a városablak megnyitásakor"
-#: client/options.c:227
+#: client/options.c:231
msgid ""
"Setting this option makes the mapview center on a city when its city dialog "
"is popped up."
msgstr ""
-#: client/options.c:230
+#: client/options.c:234
msgid "Concise City Production"
msgstr "Tömör formátumú termelési infó"
-#: client/options.c:231
+#: client/options.c:235
msgid ""
"Set this option to make the city production (as shown in the city dialog) to "
"be more compact."
msgstr ""
-#: client/options.c:234 client/gui-sdl/optiondlg.c:1252
+#: client/options.c:238 client/gui-sdl/optiondlg.c:1252
msgid "End Turn when done moving"
msgstr "Automatikus kör vége a lépések befejezésekor"
-#: client/options.c:235
+#: client/options.c:239
msgid ""
"Setting this option makes your turn end automatically when all your units "
"are done moving."
msgstr ""
-#: client/options.c:238 client/gui-sdl/optiondlg.c:1226
+#: client/options.c:242 client/gui-sdl/optiondlg.c:1226
#, fuzzy
msgid "Prompt for city names"
msgstr "Megengedett városnevek"
-#: client/options.c:239
+#: client/options.c:243
msgid ""
"Disabling this option will make the names of newly founded cities chosen "
"automatically by the server."
msgstr ""
-#: client/options.c:242 client/gui-sdl/optiondlg.c:1200
+#: client/options.c:246 client/gui-sdl/optiondlg.c:1200
msgid "Pop up city dialog for new cities"
msgstr ""
-#: client/options.c:243
+#: client/options.c:247
msgid ""
"Setting this option will pop up a newly-founded city's city dialog "
"automatically."
msgstr ""
-#: client/options.c:248
+#: client/options.c:250
+#, fuzzy
+msgid "Pop up caravan actions"
+msgstr "Karaván"
+
+#: client/options.c:251
+msgid ""
+"If this option is enabled, when caravans arrive at a city where they can "
+"establish a traderoute or help build a wonder, a window will popup asking "
+"which action should be performed. Disabling this option means you will have "
+"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 ""
+
+#: client/options.c:260
+msgid "Enable cursor changing"
+msgstr ""
+
+#: client/options.c:261
+msgid ""
+"This option controls whether the client should try to change the mouse "
+"cursor depending on what is being pointed at, as well as to indicate changes "
+"in the client or server state."
+msgstr ""
+
+#: client/options.c:266
+msgid "Select cities before units"
+msgstr ""
+
+#: 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 ""
+
+#: client/options.c:272
+msgid "Clear unit orders on selection"
+msgstr ""
+
+#: client/options.c:273
+msgid ""
+"Enabling this option will cause unit orders to be cleared whenever one or "
+"more units are selected. If this option is disabled, selecting units will "
+"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 ""
+
+#: client/options.c:282
msgid "Background layer"
msgstr ""
-#: client/options.c:249
+#: client/options.c:283
msgid "The background layer of the overview shows just ocean and land."
msgstr ""
-#: client/options.c:252
+#: client/options.c:286
msgid "Terrain relief map layer"
msgstr ""
-#: client/options.c:253
+#: client/options.c:287
msgid "The relief layer shows all terrains on the map."
msgstr ""
-#: client/options.c:256
+#: client/options.c:290
#, fuzzy
msgid "Borders layer"
msgstr "Búr"
-#: client/options.c:257
+#: client/options.c:291
msgid ""
"The borders layer of the overview shows which tiles are owned by each player."
msgstr ""
-#: client/options.c:261
+#: client/options.c:295
#, fuzzy
msgid "Units layer"
msgstr "Egységek fül"
-#: client/options.c:262
+#: client/options.c:296
#, fuzzy
msgid "Enabling this will draw units on the overview."
msgstr ""
"Ha engedélyezzük, akkor a környezõ tereptõl függ a szerver által felajánlott "
"városnév."
-#: client/options.c:265
+#: client/options.c:299
#, fuzzy
msgid "Cities layer"
msgstr "Városok"
-#: client/options.c:266
+#: client/options.c:300
#, fuzzy
msgid "Enabling this will draw cities on the overview."
msgstr ""
"Ha engedélyezzük, akkor a környezõ tereptõl függ a szerver által felajánlott "
"városnév."
-#: client/options.c:269
+#: client/options.c:303
#, fuzzy
msgid "Overview fog of war"
msgstr "Általános jellemzõk fül"
-#: client/options.c:270
+#: client/options.c:304
#, fuzzy
msgid "Enabling this will show fog of war on the overview."
msgstr ""
"Ha engedélyezzük, akkor a környezõ tereptõl függ a szerver által felajánlott "
"városnév."
-#: client/options.c:488
+#: client/options.c:526
msgid "If you add a preset by hand, also update \"number_of_presets\""
msgstr ""
"Ha kézileg adsz hozzá új beállításmintát, akkor a \"number_of_presets\" mezõ "
"értékét is frissítsd!"
-#: client/options.c:516
+#: client/options.c:554
msgid "Cannot find your home directory"
msgstr "Nem található a home-könyvtár"
-#: client/options.c:665 client/options.c:796
+#: client/options.c:703 client/options.c:834
msgid "Save failed, cannot find a filename."
msgstr "A mentés nem sikerült, nem sikerült fájlnevet találni."
-#: client/options.c:678 client/options.c:859
+#: client/options.c:716 client/options.c:897
#, c-format
msgid "Save failed, cannot write to file %s"
msgstr "Nem sikerült a mentés a(z) %s fájlba"
-#: client/options.c:680 client/options.c:862
+#: client/options.c:718 client/options.c:900
#, c-format
msgid "Saved settings to file %s"
msgstr "Beállítások elmentve a(z) %s fájlba"
@@ -9296,16 +9346,16 @@ msgstr "A szerver k
msgid "Start of turn %d"
msgstr "Elkezdõdött a(z) %d. kör"
-#: client/packhand.c:1590
+#: client/packhand.c:1591
#, c-format
msgid "AI Mode is now %s."
msgstr "Az MI irányítás %s van kapcsolva."
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "ON"
msgstr "BE"
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "OFF"
msgstr "KI"
@@ -9340,14 +9390,15 @@ 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:2085
+#: client/gui-gtk-2.0/pages.c:2157
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:1536 client/gui-gtk-2.0/pages.c:2087
-#: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
-#: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
+#: 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/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr "Nép"
@@ -9361,7 +9412,7 @@ msgstr "B
msgid "Score"
msgstr "Pontszámok"
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
#, fuzzy
msgid "Team"
msgstr "Templom"
@@ -9438,423 +9489,445 @@ msgstr "Egy %s sem adhat
msgid "Could not open temp file."
msgstr "Nem sikerült megnyitni a(z) %s fájlt."
-#: client/servers.c:407
+#: client/servers.c:410
#, fuzzy
msgid "Invalid $http_proxy or metaserver value, must start with 'http://'"
msgstr "Érvénytelen $http_proxy érték ('http://'-vel kell kezdõdnie)"
-#: client/servers.c:413
+#: client/servers.c:416
#, fuzzy
msgid "Failed looking up metaserver's host"
msgstr "Nem sikerült megtalálni a szervert"
-#: client/text.c:85 client/text.c:86 client/text.c:91
+#. TRANS: "AI <player name>"
+#: client/text.c:94
+#, c-format
+msgid "AI %s"
+msgstr ""
+
+#. TRANS: "<nation adjective>, team <team name>"
+#: client/text.c:118
+#, fuzzy, c-format
+msgid "%s, team %s"
+msgstr " %s mellett"
+
+#: client/text.c:135 client/text.c:136 client/text.c:141
#: client/gui-sdl/mapview.c:752
#, fuzzy
msgid "?nation:Neutral"
msgstr "?duration:túlcsordulás"
-#: client/text.c:85 client/gui-sdl/mapview.c:752
+#: client/text.c:135 client/gui-sdl/mapview.c:752
msgid "?nation:Hostile"
msgstr ""
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Peaceful"
msgstr ""
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Friendly"
msgstr ""
-#: client/text.c:88 client/gui-sdl/mapview.c:755
+#: client/text.c:138 client/gui-sdl/mapview.c:755
msgid "?nation:Mysterious"
msgstr ""
-#: client/text.c:88
+#: client/text.c:138
msgid "?nation:Friendly(team)"
msgstr ""
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
#, fuzzy
msgid "?city:Neutral"
msgstr "?city:Név"
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
#, fuzzy
msgid "?city:Hostile"
msgstr "?city:Név"
-#: client/text.c:92 client/gui-sdl/mapview.c:786
+#: client/text.c:142 client/gui-sdl/mapview.c:786
#, fuzzy
msgid "?city:Peaceful"
msgstr "?city_state:Béke"
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Friendly"
msgstr ""
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Mysterious"
msgstr ""
-#: client/text.c:93
+#: client/text.c:143
msgid "?city:Friendly(team)"
msgstr ""
-#: client/text.c:100
+#: client/text.c:151
#, fuzzy, c-format
msgid "Location: (%d, %d) [%d]"
msgstr "Hely: (%d, %d)"
-#: client/text.c:109
+#: client/text.c:153
+#, c-format
+msgid "Native coordinates: (%d, %d)"
+msgstr ""
+
+#: client/text.c:160
#, c-format
msgid "Terrain: %s"
msgstr "Terep: %s"
-#: client/text.c:110
+#: client/text.c:161
#, c-format
msgid "Food/Prod/Trade: %s"
msgstr "Élelem/Term/Keresk: %s"
-#: client/text.c:113
+#: client/text.c:164
msgid "Minor Tribe Village"
msgstr "Apró törzsi falu"
-#: client/text.c:119
+#: client/text.c:173
#, fuzzy
msgid "Our territory"
msgstr "A(z) %s"
-#. TRANS: "Polish territory"
-#: client/text.c:122
+#. TRANS: "Territory of <username> (<nation + team>)"
+#: client/text.c:176
#, fuzzy, c-format
-msgid "%s territory"
-msgstr "A(z) %s"
+msgid "Territory of %s (%s)"
+msgstr "A(z) %2$s (Államforma: %1$s)"
-#. TRANS: "Polish territory (5 turn cease-fire)"
-#: client/text.c:131
+#: client/text.c:186
#, fuzzy, c-format
-msgid "%s territory (%d turn cease-fire)"
-msgid_plural "%s territory (%d turn cease-fire)"
+msgid "Territory of %s (%s) (%d turn cease-fire)"
+msgid_plural "Territory of %s (%s) (%d turn cease-fire)"
msgstr[0] "Egység: %s(%s%s)"
-#. TRANS: "Polish territory (friendly)"
-#: client/text.c:140
+#. TRANS: "Territory of <username>
+#. * (<nation + team> | <diplomatic state>)"
+#: client/text.c:195
#, fuzzy, c-format
-msgid "%s territory (%s)"
+msgid "Territory of %s (%s | %s)"
msgstr "A(z) %2$s (Államforma: %1$s)"
-#: client/text.c:145
+#: client/text.c:200
msgid "Unclaimed territory"
msgstr ""
-#. TRANS: "City: Warsaw (Polish)"
-#: client/text.c:156
+#. TRANS: "City: <city name> | <username> (<nation + team>)"
+#: client/text.c:214
#, fuzzy, c-format
-msgid "City: %s (%s)"
-msgstr "Város: %s(%s)"
+msgid "City: %s | %s (%s)"
+msgstr "Város: %s(%s) %s"
-#. TRANS: "City: Warsaw (Polish, 5 turn cease-fire)"
-#: client/text.c:166
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <number> turn cease-fire)"
+#: client/text.c:224
#, fuzzy, c-format
-msgid "City: %s (%s, %d turn cease-fire)"
-msgid_plural "City: %s (%s, %d turn cease-fire)"
+msgid "City: %s | %s (%s, %d turn cease-fire)"
+msgid_plural "City: %s | %s (%s, %d turn cease-fire)"
msgstr[0] "Egység: %s(%s%s)"
-#. TRANS: "City: Warsaw (Polish,friendly)"
-#: client/text.c:174
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <diplomatic state>)"
+#: client/text.c:231
#, fuzzy, c-format
-msgid "City: %s (%s, %s)"
+msgid "City: %s | %s (%s, %s)"
msgstr "Város: %s(%s) %s"
#. TRANS: previous lines gave other information about the city.
-#: client/text.c:189
+#: client/text.c:246
#, fuzzy, c-format
msgid "?clistbegin: with %s"
msgstr " ezzel: %s"
#. TRANS: "Trade from Warsaw: 5"
-#: client/text.c:202
+#: client/text.c:259
#, fuzzy, c-format
msgid "Trade from %s: %d"
msgstr "Összes kereskedelem a kereskedelmi kapcsolatokból: %d"
-#: client/text.c:210
+#: client/text.c:267
#, fuzzy, c-format
msgid "Infrastructure: %s"
msgstr "Infrastruktúra: "
-#: client/text.c:215
+#: client/text.c:272
#, fuzzy, c-format
msgid "Activity: %s"
msgstr "Tevékenység: "
-#. TRANS: "Unit: Musketeers (Polish, Warsaw)"
-#. TRANS: "Unit: Musketeers (Polish,friendly)"
-#: client/text.c:226 client/text.c:253
+#. TRANS: "Unit: <unit type> | <username>
+#. * (<nation + team>, <homecity>)"
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <diplomatic state>)"
+#: client/text.c:287 client/text.c:313
#, fuzzy, c-format
-msgid "Unit: %s (%s, %s)"
+msgid "Unit: %s | %s (%s, %s)"
msgstr "Egység: %s(%s%s)"
-#. TRANS: "Unit: Musketeers (Polish)"
-#: client/text.c:232
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>)"
+#: client/text.c:292
#, fuzzy, c-format
-msgid "Unit: %s (%s)"
-msgstr "Egység: %s(%s)"
+msgid "Unit: %s | %s (%s)"
+msgstr "Egység: %s(%s%s)"
-#. TRANS: "Unit: Musketeers (Polish, 5 turn cease-fire)"
-#: client/text.c:245
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <number> turn cease-fire)"
+#: client/text.c:305
#, fuzzy, c-format
-msgid "Unit: %s (%s, %d turn cease-fire)"
-msgid_plural "Unit: %s (%s, %d turn cease-fire)"
+msgid "Unit: %s | %s (%s, %d turn cease-fire)"
+msgid_plural "Unit: %s | %s (%s, %d turn cease-fire)"
msgstr[0] "Egység: %s(%s%s)"
#. TRANS: "Chance to win: A:95% D:46%"
-#: client/text.c:279
+#: client/text.c:338
#, c-format
msgid "Chance to win: A:%d%% D:%d%%"
msgstr ""
#. TRANS: A is attack power, D is defense power, FP is firepower,
#. * HP is hitpoints (current and max).
-#: client/text.c:286
+#: client/text.c:345
#, fuzzy, c-format
msgid "A:%d D:%d FP:%d HP:%d/%d (%s)"
msgstr "T:%d V:%d TE:%d ÉP:%d/%d%s%s"
#. TRANS: "5 more" units on this tile
-#: client/text.c:295
+#: client/text.c:354
#, c-format
msgid " (%d more)"
msgstr " (még %d)"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:364
+#: client/text.c:423
#, fuzzy, c-format
msgid "far from %s"
msgstr "%s@%s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:367
+#: client/text.c:426
#, fuzzy, c-format
msgid "near %s"
msgstr " %s mellett"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:370
+#: client/text.c:429
#, fuzzy, c-format
msgid "in %s"
msgstr " %s városában"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:403
+#: client/text.c:462
#, fuzzy, c-format
msgid "from %s"
msgstr "%s@%s"
-#: client/text.c:466
+#: client/text.c:525
#, fuzzy
msgid "Progress: no research"
msgstr "Menet közbeni pontszámok:"
-#: client/text.c:470
+#: client/text.c:529
#, fuzzy
msgid "Progress: no research target"
msgstr "Menet közbeni pontszámok:"
-#: client/text.c:475
+#: client/text.c:534
#, fuzzy, c-format
msgid "Progress: %d turn/advance"
msgid_plural "Progress: %d turns/advance"
msgstr[0] "Kutatási sebesség: %d kör/tudomány"
-#: client/text.c:480
+#: client/text.c:539
#, fuzzy, c-format
msgid "%d bulb/turn"
msgid_plural "%d bulbs/turn"
msgstr[0] "%d kör"
-#: client/text.c:485
+#: client/text.c:544
#, c-format
msgid ", %d bulb/turn from team"
msgid_plural ", %d bulbs/turn from team"
msgstr[0] ""
-#: client/text.c:512
+#: client/text.c:571
#, fuzzy, c-format
msgid "%d/- (never)"
msgstr "(Soha)"
-#: client/text.c:524
+#: client/text.c:583
#, fuzzy, c-format
msgid "%d/%d (%d turn)"
msgid_plural "%d/%d (%d turns)"
msgstr[0] "%d/%d %d kör"
-#: client/text.c:527
+#: client/text.c:586
#, fuzzy, c-format
msgid "%d/%d (never)"
msgstr "(Soha)"
-#: client/text.c:564
+#: client/text.c:623
#, fuzzy, c-format
msgid "%d step"
msgid_plural "%d steps"
msgstr[0] "(%d lépés)"
-#: client/text.c:566
+#: client/text.c:625
#, c-format
msgid "%d bulb"
msgid_plural "%d bulbs"
msgstr[0] ""
-#: client/text.c:570 client/agents/cma_fec.c:269 client/agents/cma_fec.c:313
+#: 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
#, c-format
msgid "%d turn"
msgid_plural "%d turns"
msgstr[0] "%d kör"
-#: client/text.c:592
+#: client/text.c:651
#, c-format
msgid "Population: %s"
msgstr "Népesség: %s"
-#: client/text.c:595
+#: client/text.c:654
#, fuzzy, c-format
msgid "Year: %s (T%d)"
msgstr "Év: %s"
-#: client/text.c:598
+#: client/text.c:657
#, fuzzy, c-format
msgid "Gold: %d (%+d)"
msgstr "Arany: %d"
-#: client/text.c:600
+#: client/text.c:659
#, fuzzy, c-format
msgid "Tax: %d Lux: %d Sci: %d"
msgstr "Adó:%d Lux:%d Tud:%d"
-#: client/text.c:607
+#: client/text.c:666
#, fuzzy
msgid "Moving: Nobody"
msgstr " %s városában"
-#: client/text.c:609
+#: client/text.c:668
#, fuzzy, c-format
msgid "Moving: %s"
msgstr " %s városában"
-#: client/text.c:613
+#: client/text.c:672
msgid "(Click for more info)"
msgstr ""
-#: client/text.c:629
+#: client/text.c:688
#, fuzzy, c-format
msgid "%s People"
msgstr "Fel"
-#: client/text.c:633
+#: client/text.c:692
#, fuzzy, c-format
msgid "Turn: %d"
msgstr "Terep: %s"
-#: client/text.c:635 client/gui-win32/inteldlg.c:111
+#: client/text.c:694 client/gui-win32/inteldlg.c:111
#: client/gui-xaw/inteldlg.c:208
#, c-format
msgid "Gold: %d"
msgstr "Arany: %d"
-#: client/text.c:636
+#: client/text.c:695
#, c-format
msgid "Net Income: %d"
msgstr ""
#. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:639
+#: client/text.c:698
#, fuzzy, c-format
msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
msgstr "Adó:%d Lux:%d Tud:%d"
-#: client/text.c:643
+#: client/text.c:702
#, fuzzy, c-format
msgid "Researching %s: %s"
msgstr "Kutatás: %s: %d/%d"
-#: client/text.c:650
+#: client/text.c:709
#, c-format
msgid "Global warming chance: %d%% (%+d%%/turn)"
msgstr ""
-#: client/text.c:653
+#: client/text.c:712
#, c-format
msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
msgstr ""
-#: client/text.c:658 client/gui-win32/inteldlg.c:104
+#: client/text.c:717 client/gui-win32/inteldlg.c:104
#: client/gui-xaw/inteldlg.c:200
#, c-format
msgid "Government: %s"
msgstr "Államforma: %s"
-#: client/text.c:682
+#: client/text.c:741
#, fuzzy, c-format
msgid "%d unit"
msgid_plural "%d units"
msgstr[0] " egység"
#. TRANS: Impossible to reach goto target tile
-#: client/text.c:715 client/gui-sdl/mapview.c:566
+#: client/text.c:774 client/gui-sdl/mapview.c:566
msgid "?goto:Unreachable"
msgstr ""
-#: client/text.c:717 client/gui-sdl/mapview.c:568
+#: client/text.c:776 client/gui-sdl/mapview.c:568
#, c-format
msgid "Turns to target: %d"
msgstr ""
-#: client/text.c:719 client/gui-sdl/mapview.c:570
+#: client/text.c:778 client/gui-sdl/mapview.c:570
#, c-format
msgid "Turns to target: %d to %d"
msgstr ""
-#: client/text.c:725 client/gui-sdl/mapview.c:576
+#: client/text.c:784 client/gui-sdl/mapview.c:576
#, fuzzy, c-format
msgid "%d unit selected"
msgid_plural "%d units selected"
msgstr[0] "Egységválasztás"
-#: client/text.c:730 client/gui-sdl/mapview.c:581
+#: client/text.c:789 client/gui-sdl/mapview.c:581
#, fuzzy
msgid "No units selected."
msgstr "Nép kiválasztása"
-#: client/text.c:804 client/gui-sdl/mapview.c:654
+#: client/text.c:863 client/gui-sdl/mapview.c:654
#, c-format
msgid "Others: %d civil; %d military"
msgstr ""
-#: client/text.c:806 client/gui-sdl/mapview.c:656
+#: client/text.c:865 client/gui-sdl/mapview.c:656
#, c-format
msgid "Others: %d civilian"
msgstr ""
-#: client/text.c:808 client/gui-sdl/mapview.c:658
+#: client/text.c:867 client/gui-sdl/mapview.c:658
#, c-format
msgid "Others: %d military"
msgstr ""
-#: client/text.c:839
+#: client/text.c:898
#, fuzzy
msgid "No units to upgrade!"
msgstr "Nem volt felfejlesztendõ egység."
-#: client/text.c:864
+#: client/text.c:923
#, fuzzy
msgid "None of these units may be upgraded."
msgstr "Nem volt felfejlesztendõ egység."
-#: client/text.c:870
+#: client/text.c:929
#, fuzzy, c-format
msgid ""
"Upgrade %d unit for %d gold?\n"
@@ -9866,11 +9939,11 @@ msgstr[0] ""
"Felfejlesszük a(z) %s egységet %s egységgé %d aranyért?\n"
"A kincstárban %d arany van."
-#: client/text.c:891
+#: client/text.c:950
msgid "Shows your progress in researching the current technology."
msgstr ""
-#: client/text.c:897
+#: client/text.c:956
#, fuzzy
msgid "no research target."
msgstr ""
@@ -9878,203 +9951,202 @@ msgstr ""
"(nincs kutatás)"
#. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:900
+#: client/text.c:959
#, c-format
msgid "%s: %d/%d."
msgstr ""
-#: client/text.c:920
+#: client/text.c:979
msgid "Shows the progress of global warming:"
msgstr ""
-#: client/text.c:921
+#: client/text.c:980
#, fuzzy, c-format
msgid "Pollution rate: %d%%"
msgstr "Szennyezés: %3d"
-#: client/text.c:923
+#: client/text.c:982
#, c-format
msgid "Chance of catastrophic warming each turn: %d%%"
msgstr ""
-#: client/text.c:939
+#: client/text.c:998
msgid "Shows the progress of nuclear winter:"
msgstr ""
-#: client/text.c:940
+#: client/text.c:999
#, fuzzy, c-format
msgid "Fallout rate: %d%%"
msgstr "Maximális lehetséges arány %s államforma esetén: %d%%"
-#: client/text.c:942
+#: client/text.c:1001
#, c-format
msgid "Chance of catastrophic winter each turn: %d%%"
msgstr ""
-#: client/text.c:957
+#: client/text.c:1016
#, fuzzy
msgid "Shows your current government:"
msgstr "Aktuális pontszámok megjelenítése."
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:981
+#: client/text.c:1040
#, fuzzy, c-format
msgid "Population: %5d"
msgstr "Népesség: %s"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:1043
#, c-format
msgid "Support: %5d %%"
msgstr ""
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:1047
#, fuzzy, c-format
msgid "Energy: %5d %%"
msgstr "Tömeg: %5d tonna"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:992
+#: client/text.c:1051
#, c-format
msgid "Mass: %5d ton"
msgid_plural "Mass: %5d tons"
msgstr[0] "Tömeg: %5d tonna"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1057
#, c-format
msgid "Travel time: %5.1f years"
msgstr "Útidõ: %5.1f év"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1061
msgid "Travel time: N/A "
msgstr "Útidõ: - "
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1065
#, c-format
msgid "Success prob.: %5d %%"
msgstr ""
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1010
+#: client/text.c:1069
#, c-format
msgid "Year of arrival: %8s"
msgstr ""
-#: client/text.c:1030
+#: client/text.c:1089
msgid "?timeout:off"
msgstr "?timeout:ki"
-#: client/text.c:1054
+#: client/text.c:1113
#, c-format
msgid "?seconds:%02ds"
msgstr "?seconds:%02dmp"
-#: client/text.c:1056
+#: client/text.c:1115
#, c-format
msgid "?mins/secs:%02dm %02ds"
msgstr "?mins/secs:%02dperc %02dmp"
-#: client/text.c:1058
+#: client/text.c:1117
#, c-format
msgid "?hrs/mns:%02dh %02dm"
msgstr "?hrs/mns:%02dóra %02dperc"
-#: client/text.c:1060
+#: client/text.c:1119
#, c-format
msgid "?dys/hrs:%02dd %02dh"
msgstr "?dys/hrs:%02dnap %02dóra"
-#: client/text.c:1063
+#: client/text.c:1122
msgid "?duration:overflow"
msgstr "?duration:túlcsordulás"
-#: client/text.c:1084
+#: client/text.c:1143
#, c-format
msgid "%6d.%02d ms"
msgstr ""
-#. TRANS: "Republic of the Poles"
-#: client/text.c:1127
+#. TRANS: <nation adjective> <government name>.
+#. * E.g. "Polish Republic".
+#: client/text.c:1188
#, fuzzy, c-format
-msgid "%s of the %s"
-msgstr "A(z) %2$s (Államforma: %1$s)"
+msgid "?nationgovernment:%s %s"
+msgstr "Államforma: %s"
#. TRANS: "Observer: 1985"
-#: client/text.c:1137
+#: client/text.c:1198
#, fuzzy, c-format
msgid "Observer: %s"
msgstr " (megfigyelõ)"
-#: client/text.c:1155
+#: client/text.c:1216
msgid "Buildings: "
msgstr "Épületek: "
-#: client/text.c:1172 client/text.c:1211
+#: client/text.c:1233 client/text.c:1272
msgid "None. "
msgstr "Nincsenek. "
-#: client/text.c:1174 client/text.c:1213
+#: client/text.c:1235 client/text.c:1274
msgid "?clistend:."
msgstr "."
-#: client/text.c:1192
+#: client/text.c:1253
msgid "Wonders: "
msgstr "Világcsodák: "
-#: client/text.c:1247
+#: client/text.c:1308
#, 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:1251
+#: client/text.c:1312
#, 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:1257
+#: client/text.c:1318
#, fuzzy, c-format
msgid "%d additional unhappy citizen."
msgid_plural "%d additional unhappy citizens."
msgstr[0] "a plusz %d boldogtalan lakosos büntetés életbe lépéséig."
-#. TRANS: Martial law opening parenthesis
-#: client/text.c:1279
-msgid "Martial law in effect ("
+#: client/text.c:1339
+#, fuzzy
+msgid "Unlimited martial law in effect."
msgstr "Katonai jelenlét hatása ("
-#. TRANS: no [unit] maximum
-#: client/text.c:1284
-msgid "no maximum, "
-msgstr "nincs egységlimit, "
-
-#: client/text.c:1287
-#, c-format
-msgid "%d unit maximum, "
-msgid_plural "%d units maximum, "
-msgstr[0] "maximum %d egységig, "
+#: client/text.c:1341
+#, 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"
-#. TRANS: Martial law closing parenthesis
-#: client/text.c:1294
-#, c-format
-msgid "%d per unit). "
-msgstr "egységenként %d). "
+#: client/text.c:1345
+#, fuzzy, c-format
+msgid "Each military unit makes %d unhappy citizen content."
+msgid_plural "Each military unit makes %d unhappy citizens content."
+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:1298
+#: client/text.c:1352
msgid "Military units in the field may cause unhappiness. "
msgstr "A harcmezõn lévõ katonai egységek boldogtalanságot okozhatnak. "
-#: client/text.c:1301
+#: client/text.c:1355
msgid "Military units have no happiness effect. "
msgstr "A katonai egységek nincsenek hatással a közhangulatra. "
-#: client/text.c:1316
+#: client/text.c:1370
#, c-format
msgid "Luxury: %d total."
msgstr "Luxus: összesen %d."
@@ -10099,7 +10171,7 @@ msgstr ""
"A kliens nem támogatja a felülnézeti mezõkészleteket. Alapértelmezett "
"mezõkészlet használata."
-#: client/tilespec.c:3968
+#: client/tilespec.c:3966
#, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
@@ -10122,12 +10194,12 @@ msgid ""
"have a look."
msgstr ""
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
-#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:599
+#: client/gui-gtk-2.0/cityrep.c:624 client/gui-sdl/citydlg.c:2009
msgid "none"
msgstr "semmi"
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:645
msgid "custom"
msgstr "saját"
@@ -10442,7 +10514,7 @@ msgstr "Keresk. kapcsolat _l
msgid "Enter Marketplace"
msgstr "Piac"
-#: client/gui-gtk-2.0/chatline.c:144 client/gui-win32/chatline.c:134
+#: client/gui-gtk-2.0/chatline.c:218 client/gui-win32/chatline.c:134
#: client/gui-xaw/chatline.c:120
msgid "Cleared output window."
msgstr "A kimeneti ablak törölve."
@@ -10525,11 +10597,11 @@ msgid "%d/%d %d turns"
msgstr "%d/%d %d kör"
#: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:821
+#: client/gui-gtk-2.0/cityrep.c:1027
msgid "_Buy"
msgstr "Meg_vétel"
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:869
#, fuzzy
msgid "_Production"
msgstr "Termelés"
@@ -10553,12 +10625,12 @@ msgid "Entertainers"
msgstr "Szórakoztatók"
#: client/gui-gtk-2.0/citydlg.c:1029 client/gui-win32/citydlg.c:1989
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2403
msgid "Scientists"
msgstr "Tudósok"
#: client/gui-gtk-2.0/citydlg.c:1030 client/gui-win32/citydlg.c:1991
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2404
msgid "Taxmen"
msgstr "Adószedõk"
@@ -10658,7 +10730,7 @@ msgstr "Eltartott egys
msgid "Present units %d"
msgstr "Jelenlévõ egységek: %d"
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:1019
msgid "Cen_ter"
msgstr "_Középre hozás"
@@ -10750,36 +10822,66 @@ msgstr "V
msgid "What should we rename the city to?"
msgstr "Mi legyen a város új neve?"
-#: client/gui-gtk-2.0/cityrep.c:699
+#: client/gui-gtk-2.0/cityrep.c:794
+#, fuzzy
+msgid "(no worklists defined)"
+msgstr "(munkaterv)"
+
+#: client/gui-gtk-2.0/cityrep.c:876
msgid "Chan_ge"
msgstr "_Átállítás"
-#: client/gui-gtk-2.0/cityrep.c:703
+#: client/gui-gtk-2.0/cityrep.c:880
#, fuzzy
msgid "Add _First"
msgstr "Minta hozzáadása"
-#: client/gui-gtk-2.0/cityrep.c:707
+#: client/gui-gtk-2.0/cityrep.c:884
#, fuzzy
msgid "Add _Next"
msgstr "Minta hozzáadása"
-#: client/gui-gtk-2.0/cityrep.c:711
+#: client/gui-gtk-2.0/cityrep.c:888
+#, fuzzy
+msgid "Add _2nd Last"
+msgstr "Minta hozzáadása"
+
+#: client/gui-gtk-2.0/cityrep.c:892
#, fuzzy
msgid "Add _Last"
msgstr "Minta hozzáadása"
-#: client/gui-gtk-2.0/cityrep.c:715
+#: client/gui-gtk-2.0/cityrep.c:899
+#, fuzzy
+msgid "Set Worklist"
+msgstr "Munkaterv"
+
+#: client/gui-gtk-2.0/cityrep.c:905
+#, fuzzy
+msgid "Append Worklist"
+msgstr "Munkaterv Átnevezése"
+
+#: client/gui-gtk-2.0/cityrep.c:911
+#, fuzzy
+msgid "Clear _Worklist"
+msgstr "_Munkaterv"
+
+#: client/gui-gtk-2.0/cityrep.c:916
+#, fuzzy
+msgid "Gover_nor"
+msgstr "Államforma"
+
+#: client/gui-gtk-2.0/cityrep.c:921
#, fuzzy
msgid "_Select"
msgstr "Kiválasztás"
-#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
+#: client/gui-gtk-2.0/cityrep.c:925 client/gui-gtk-2.0/plrdlg.c:521
#, fuzzy
msgid "_Display"
msgstr "_Megjelenítés..."
-#: client/gui-gtk-2.0/cityrep.c:800 client/gui-gtk-2.0/menu.c:808
+#: 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-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
#: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -10789,101 +10891,101 @@ msgstr "_Megjelen
msgid "Cities"
msgstr "Városok"
-#: client/gui-gtk-2.0/cityrep.c:817
+#: client/gui-gtk-2.0/cityrep.c:1023
#, fuzzy
msgid "_Inspect"
msgstr "Meg_nyitás"
-#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
-#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-sdl/helpdlg.c:297 client/gui-win32/menu.c:342
-#: client/gui-xaw/menu.c:241
+#: 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
+#: client/gui-gtk-2.0/cityrep.c:1518 client/gui-gtk-2.0/menu.c:823
+#: client/gui-gtk-2.0/menu.c:825 client/gui-gtk-2.0/menu.c:827
+#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:831
+#: client/gui-gtk-2.0/menu.c:833 client/gui-sdl/helpdlg.c:297
+#: client/gui-win32/menu.c:342 client/gui-xaw/menu.c:241
msgid "Improvements"
msgstr "Fejlesztések"
-#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
-#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
-#: client/gui-xaw/menu.c:247
+#: client/gui-gtk-2.0/cityrep.c:1441 client/gui-gtk-2.0/cityrep.c:1460
+#: client/gui-gtk-2.0/cityrep.c:1479 client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1522 client/gui-xaw/menu.c:247
msgid "Wonders"
msgstr "Világcsodák"
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1662 client/gui-win32/cityrep.c:439
#: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
msgid "All Cities"
msgstr "Összes város"
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1667 client/gui-win32/cityrep.c:440
msgid "No Cities"
msgstr "Nincsenek városok"
-#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1672 client/gui-win32/cityrep.c:441
msgid "Invert Selection"
msgstr "Kijelölés invertálása"
-#: client/gui-gtk-2.0/cityrep.c:1420
+#: client/gui-gtk-2.0/cityrep.c:1682
msgid "Building Units"
msgstr "Egységet épít"
-#: client/gui-gtk-2.0/cityrep.c:1426
+#: client/gui-gtk-2.0/cityrep.c:1688
msgid "Building Improvements"
msgstr "Épületet épít"
-#: client/gui-gtk-2.0/cityrep.c:1432
+#: client/gui-gtk-2.0/cityrep.c:1694
msgid "Building Wonders"
msgstr "Világcsodát épít"
-#: client/gui-gtk-2.0/cityrep.c:1444
+#: client/gui-gtk-2.0/cityrep.c:1706
msgid "Building Unit"
msgstr "Egységet épít"
-#: client/gui-gtk-2.0/cityrep.c:1448
+#: client/gui-gtk-2.0/cityrep.c:1710
msgid "Building Improvement"
msgstr "Épületet épít"
-#: client/gui-gtk-2.0/cityrep.c:1452
+#: client/gui-gtk-2.0/cityrep.c:1714
msgid "Building Wonder"
msgstr "Világcsodát épít"
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1722 client/gui-win32/cityrep.c:443
msgid "Coastal Cities"
msgstr "Partmenti városok"
-#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1727 client/gui-win32/cityrep.c:444
msgid "Same Island"
msgstr "Ugyanazon a szigeten"
-#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1737 client/gui-win32/cityrep.c:447
msgid "Supported Units"
msgstr "Eltartott egységek"
-#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1740 client/gui-win32/cityrep.c:454
msgid "Units Present"
msgstr "Jelenlévõ egységek"
-#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1744 client/gui-win32/cityrep.c:469
msgid "Improvements in City"
msgstr "Épületek a városban"
-#: client/gui-gtk-2.0/cityrep.c:1486
+#: client/gui-gtk-2.0/cityrep.c:1748
msgid "Wonders in City"
msgstr "Világcsodák a városban"
-#: client/gui-gtk-2.0/cityrep.c:1495
+#: client/gui-gtk-2.0/cityrep.c:1757
msgid "Available Units"
msgstr "Legyártható egységek"
-#: client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1760
msgid "Available Improvements"
msgstr "Megépíthetõ épületek"
-#: client/gui-gtk-2.0/cityrep.c:1501
+#: client/gui-gtk-2.0/cityrep.c:1763
msgid "Available Wonders"
msgstr "Megépíthetõ világcsodák"
-#: client/gui-gtk-2.0/cityrep.c:1625
+#: client/gui-gtk-2.0/cityrep.c:1882
#, fuzzy, c-format
msgid "Total Buy Cost: %d"
msgstr "Összes Kiadás:"
@@ -10951,11 +11053,11 @@ 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:186
+#: client/gui-gtk-2.0/dialogs.c:196 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:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
#, fuzzy
msgid "Inspect _City"
msgstr "_Városablak felnyitása"
@@ -10985,10 +11087,10 @@ msgstr "V
msgid "Unit"
msgstr "Egységek"
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
-#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
-#: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
-#: manual/civmanual.c:302 data/Freeciv.in:80
+#: 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-win32/plrdlg.c:335 manual/civmanual.c:302 data/Freeciv.in:80
msgid "Name"
msgstr "Név"
@@ -11016,7 +11118,7 @@ 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:1036 data/Freeciv.in:3371
+#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
#, fuzzy
msgid "Pick Nation"
msgstr "Rendõrállomás"
@@ -11106,7 +11208,7 @@ msgstr "T
msgid "_Advances"
msgstr "Technológiák"
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:910
+#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr "_Városok"
@@ -11220,111 +11322,181 @@ msgstr "V
msgid "Show _All Cities"
msgstr "Összes város"
-#: client/gui-gtk-2.0/gui_main.c:150
+#: client/gui-gtk-2.0/gui_main.c:162
#, 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:151
+#: client/gui-gtk-2.0/gui_main.c:163
msgid "Disable this option to hide the scrollbars on the map view."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:155
+#: client/gui-gtk-2.0/gui_main.c:167
msgid "Keyboardless goto"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:156
+#: client/gui-gtk-2.0/gui_main.c:168
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:161
+#: client/gui-gtk-2.0/gui_main.c:173
#, fuzzy
msgid "Keep dialogs on top"
msgstr "Felbukkanó ablakok MI módban"
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:174
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:166
+#: client/gui-gtk-2.0/gui_main.c:178
msgid "Show worklist task icons"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:179
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:171
+#: client/gui-gtk-2.0/gui_main.c:183
msgid "Enable status report tabs"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:172
+#: client/gui-gtk-2.0/gui_main.c:184
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:177 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:189 client/gui-win32/gui_main.c:110
msgid "Better fog-of-war drawing"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:178 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:190 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:277 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:195
+msgid "Show time for each chat message"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:196
+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
+msgid "Split bottom notebook area"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:202
+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
+msgid "New message events go to top of list"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:208
+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
+msgid "Show extra message window buttons"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:214
+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 "
+"is disabled, these buttons will not appear (you can still double-click with "
+"the left mouse button or right-click on a row to inspect or goto "
+"respectively). This option will only take effect once the message window is "
+"closed and reopened."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:224
+#, 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
+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
+msgid "Plain chat messages are sent to allies only"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:231
+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 "
+"messages will be sent as public chat messages. To send a public chat message "
+"with this option enabled, prefix the message with a single colon ':'. This "
+"option can also be set using a toggle button beside the chat entry (only "
+"visible in multiplayer games)."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:340 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:723 client/gui-gtk-2.0/gui_main.c:1345
+#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
msgid "Freeciv"
msgstr "Freeciv"
-#: client/gui-gtk-2.0/gui_main.c:1088 client/gui-gtk-2.0/gui_main.c:1095
+#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
#: 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:1095 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1232 client/gui-sdl/mapctrl.c:1566
#: client/gui-sdl/mapview.c:1082
msgid "Shift+Return"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1127 client/gui-gtk-2.0/menu.c:770
-#: client/gui-gtk-2.0/menu.c:772 client/gui-gtk-2.0/menu.c:774
-#: client/gui-gtk-2.0/menu.c:776 client/gui-gtk-2.0/menu.c:778
-#: client/gui-gtk-2.0/menu.c:780 client/gui-gtk-2.0/menu.c:782
-#: client/gui-gtk-2.0/menu.c:784 client/gui-gtk-2.0/menu.c:786
-#: client/gui-gtk-2.0/menu.c:788 client/gui-gtk-2.0/menu.c:790
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-gtk-2.0/menu.c:804 client/gui-gtk-2.0/menu.c:806
-#: client/gui-gtk-2.0/menu.c:808 client/gui-gtk-2.0/menu.c:810
-#: client/gui-gtk-2.0/menu.c:812 client/gui-gtk-2.0/menu.c:814
-#: client/gui-gtk-2.0/menu.c:816 client/gui-gtk-2.0/menu.c:818
-#: client/gui-gtk-2.0/menu.c:820 client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/gui_main.c:1266 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
+#: client/gui-gtk-2.0/menu.c:811 client/gui-gtk-2.0/menu.c:813
+#: client/gui-gtk-2.0/menu.c:815 client/gui-gtk-2.0/menu.c:817
+#: client/gui-gtk-2.0/menu.c:819 client/gui-gtk-2.0/menu.c:821
+#: client/gui-gtk-2.0/menu.c:823 client/gui-gtk-2.0/menu.c:825
+#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
+#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
+#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
+#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
+#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
+#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
#: data/Freeciv.in:2028
msgid "View"
msgstr "Látvány"
-#: client/gui-gtk-2.0/gui_main.c:1208
+#: client/gui-gtk-2.0/gui_main.c:1359
#, fuzzy
msgid "Chat"
msgstr "Harci Szekér"
-#: client/gui-gtk-2.0/gui_main.c:1224 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1377 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"
@@ -11336,81 +11508,85 @@ 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:1491
+#: client/gui-gtk-2.0/gui_main.c:1392
+msgid "Allies Only"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:1657
msgid "Not _ready"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
+#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
#, fuzzy
msgid "_Ready"
msgstr "Mindenki készenlétbe"
-#: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2132
+#: 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
#, fuzzy
msgid "_Start"
msgstr "Állapot"
-#: client/gui-gtk-2.0/gui_main.c:1520
+#: client/gui-gtk-2.0/gui_main.c:1686
#, fuzzy
msgid "_Take Player"
msgstr "Városok"
-#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
+#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
#, fuzzy
msgid "Pick _Nation"
msgstr "Rendõrállomás"
-#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
+#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
#, fuzzy
msgid "_Observe"
msgstr " (megfigyelõ)"
-#: client/gui-gtk-2.0/gui_main.c:1532
+#: client/gui-gtk-2.0/gui_main.c:1698
#, 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:1554 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
#, fuzzy
msgid "<AI>"
msgstr "MI"
-#: client/gui-gtk-2.0/gui_main.c:1557
+#: client/gui-gtk-2.0/gui_main.c:1723
msgid "<Novice AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1560
+#: client/gui-gtk-2.0/gui_main.c:1726
#, fuzzy
msgid "<Easy AI>"
msgstr "MI"
-#: client/gui-gtk-2.0/gui_main.c:1563
+#: client/gui-gtk-2.0/gui_main.c:1729
msgid "<Normal AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1732
#, fuzzy
msgid "<Hard AI>"
msgstr "MI"
-#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1742 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:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
#, fuzzy
msgid "Observer"
msgstr " (megfigyelõ)"
-#: client/gui-gtk-2.0/gui_main.c:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
#, fuzzy
msgid "Detached"
msgstr ", Legyõzött"
-#: client/gui-gtk-2.0/gui_main.c:1899
+#: client/gui-gtk-2.0/gui_main.c:2073
msgid "Are you sure you want to quit?"
msgstr ""
@@ -11647,493 +11823,529 @@ msgstr "_Igen"
msgid "Foreign Intelligence: %s Empire"
msgstr "Hírszerzési jelentés"
-#: client/gui-gtk-2.0/mapctrl.c:195 client/gui-sdl/mapctrl.c:2565
+#: client/gui-gtk-2.0/mapctrl.c:179 client/gui-sdl/mapctrl.c:2565
#: client/gui-sdl/menu.c:839 client/gui-sdl/menu.c:1021
#: client/gui-win32/mapctrl.c:353
msgid "Build New City"
msgstr "Új város építése"
-#: client/gui-gtk-2.0/mapctrl.c:196 client/gui-sdl/mapctrl.c:2594
+#: client/gui-gtk-2.0/mapctrl.c:180 client/gui-sdl/mapctrl.c:2594
#: client/gui-win32/mapctrl.c:354 client/gui-xaw/mapctrl.c:89
msgid "What should we call our new city?"
msgstr "Mi legyen az új város neve?"
-#: client/gui-gtk-2.0/mapview.c:147
+#: client/gui-gtk-2.0/mapview.c:158
msgid "Shows your current luxury/science/tax rates;click to toggle them."
msgstr ""
-#: client/gui-gtk-2.0/mapview.c:692 client/gui-win32/canvas.c:275
+#: client/gui-gtk-2.0/mapview.c:702 client/gui-win32/canvas.c:275
msgid "Better fog will only work in truecolor. Disabling it"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:250
+#: client/gui-gtk-2.0/menu.c:256
msgid "Leaving a local game will end it!"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:700 client/gui-win32/menu.c:303
+#: client/gui-gtk-2.0/menu.c:727 client/gui-win32/menu.c:303
msgid "_Game"
msgstr "_Játék"
-#: client/gui-gtk-2.0/menu.c:702 client/gui-gtk-2.0/menu.c:704
-#: client/gui-gtk-2.0/menu.c:706 client/gui-gtk-2.0/menu.c:708
-#: client/gui-gtk-2.0/menu.c:710 client/gui-gtk-2.0/menu.c:712
-#: client/gui-gtk-2.0/menu.c:714 client/gui-gtk-2.0/menu.c:717
-#: client/gui-gtk-2.0/menu.c:720 client/gui-gtk-2.0/menu.c:722
-#: client/gui-gtk-2.0/menu.c:724 client/gui-gtk-2.0/menu.c:726
-#: client/gui-gtk-2.0/menu.c:728 client/gui-gtk-2.0/menu.c:730
-#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:736
-#: client/gui-gtk-2.0/menu.c:738 client/gui-gtk-2.0/menu.c:740
+#: client/gui-gtk-2.0/menu.c:729 client/gui-gtk-2.0/menu.c:731
+#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:735
+#: client/gui-gtk-2.0/menu.c:737 client/gui-gtk-2.0/menu.c:739
+#: client/gui-gtk-2.0/menu.c:741 client/gui-gtk-2.0/menu.c:744
+#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
+#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
+#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
+#: client/gui-gtk-2.0/menu.c:760 client/gui-gtk-2.0/menu.c:763
+#: client/gui-gtk-2.0/menu.c:765 client/gui-gtk-2.0/menu.c:767
#: data/Freeciv.in:2026
msgid "Game"
msgstr "Játék"
-#: client/gui-gtk-2.0/menu.c:704 client/gui-gtk-2.0/menu.c:706
-#: client/gui-gtk-2.0/menu.c:708
+#: client/gui-gtk-2.0/menu.c:731 client/gui-gtk-2.0/menu.c:733
+#: client/gui-gtk-2.0/menu.c:735
#, fuzzy
msgid "_Chat"
msgstr "Harci Szekér"
-#: client/gui-gtk-2.0/menu.c:706 client/gui-win32/menu.c:314
+#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:314
msgid "_Clear Log"
msgstr "Napló _törlése"
-#: client/gui-gtk-2.0/menu.c:708 client/gui-win32/menu.c:313
+#: client/gui-gtk-2.0/menu.c:735 client/gui-win32/menu.c:313
#, fuzzy
msgid "_Write Log"
msgstr "Log Exportálása"
-#: client/gui-gtk-2.0/menu.c:710 client/gui-win32/menu.c:304
+#: client/gui-gtk-2.0/menu.c:737 client/gui-win32/menu.c:304
#, fuzzy
msgid "Local _Options"
msgstr "Lokális Opciók"
-#: client/gui-gtk-2.0/menu.c:712 client/gui-win32/menu.c:305
+#: client/gui-gtk-2.0/menu.c:739 client/gui-win32/menu.c:305
#, fuzzy
msgid "_Message Options"
msgstr "Üzenetbeállítások"
-#: client/gui-gtk-2.0/menu.c:717
+#: client/gui-gtk-2.0/menu.c:744
#, fuzzy
msgid "_Reload Tileset"
msgstr "Alapértelmezett mezõkészlet"
-#: client/gui-gtk-2.0/menu.c:720
+#: client/gui-gtk-2.0/menu.c:747
#, fuzzy
msgid "Save Options on _Exit"
msgstr "Szerverbeállítások (menetközbeni)"
-#: client/gui-gtk-2.0/menu.c:722
+#: client/gui-gtk-2.0/menu.c:749
#, fuzzy
msgid "Sa_ve Options"
msgstr "_Üzenetbeállítások"
-#: client/gui-gtk-2.0/menu.c:726 client/gui-win32/menu.c:308
+#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:308
#, fuzzy
msgid "Server O_ptions"
msgstr "Szerverbeállítások értékének megjelenítése."
-#: client/gui-gtk-2.0/menu.c:730 client/gui-win32/menu.c:310
+#: client/gui-gtk-2.0/menu.c:757 client/gui-win32/menu.c:310
#, fuzzy
msgid "_Save Game"
msgstr "Játék elmentése"
-#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:311
+#: client/gui-gtk-2.0/menu.c:760 client/gui-win32/menu.c:311
#, fuzzy
msgid "Save Game _As..."
msgstr "Játék elmentése"
-#: client/gui-gtk-2.0/menu.c:738
+#: client/gui-gtk-2.0/menu.c:765
#, fuzzy
msgid "_Leave"
msgstr "Vezetõ:"
-#: client/gui-gtk-2.0/menu.c:740 client/gui-win32/menu.c:317
+#: client/gui-gtk-2.0/menu.c:767 client/gui-win32/menu.c:317
msgid "_Quit"
msgstr "_Kilépés"
-#: client/gui-gtk-2.0/menu.c:745 client/gui-win32/menu.c:321
+#: client/gui-gtk-2.0/menu.c:772 client/gui-win32/menu.c:321
#, fuzzy
msgid "Gov_ernment"
msgstr "Államforma"
-#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
-#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
-#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:774 client/gui-gtk-2.0/menu.c:776
+#: client/gui-gtk-2.0/menu.c:778 client/gui-gtk-2.0/menu.c:780
+#: client/gui-gtk-2.0/menu.c:782 client/gui-gtk-2.0/menu.c:784
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
#: client/gui-xaw/menu.c:248 data/Freeciv.in:2027 data/helpdata.txt:1320
msgid "Government"
msgstr "Államforma"
-#: client/gui-gtk-2.0/menu.c:749 client/gui-win32/menu.c:322
+#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:322
msgid "_Tax Rates"
msgstr "_Adók mértéke"
-#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:324
+#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:324
msgid "_Find City"
msgstr "_Városkeresés"
-#: client/gui-gtk-2.0/menu.c:755 client/gui-win32/menu.c:325
+#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:325
#, fuzzy
msgid "_Worklists"
msgstr "Munkatervek"
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
-#: client/gui-gtk-2.0/menu.c:764 client/gui-win32/menu.c:327
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
+#: client/gui-gtk-2.0/menu.c:791 client/gui-win32/menu.c:327
#, fuzzy
msgid "_Change Government"
msgstr "_Államforma"
-#: client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:788
#, fuzzy
msgid "_Revolution..."
msgstr "_Forradalom"
-#: client/gui-gtk-2.0/menu.c:764 client/gui-gtk-2.0/menu.c:970
+#: client/gui-gtk-2.0/menu.c:791 client/gui-gtk-2.0/menu.c:1013
#: client/gui-win32/menu.c:431
msgid "_Government"
msgstr "_Államforma"
-#: client/gui-gtk-2.0/menu.c:768 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:795 client/gui-gtk-2.0/menu.c:959
#: client/gui-win32/menu.c:334
msgid "_View"
msgstr "_Látvány"
-#: client/gui-gtk-2.0/menu.c:772
+#: client/gui-gtk-2.0/menu.c:799
#, fuzzy
msgid "City Outlines"
msgstr "Város Opciók"
-#: client/gui-gtk-2.0/menu.c:774 client/gui-win32/menu.c:335
+#: client/gui-gtk-2.0/menu.c:801 client/gui-win32/menu.c:335
msgid "Map _Grid"
msgstr "Térkép_beosztás"
-#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:336
+#: client/gui-gtk-2.0/menu.c:803 client/gui-win32/menu.c:336
msgid "National _Borders"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:778 client/gui-win32/menu.c:337
+#: client/gui-gtk-2.0/menu.c:805 client/gui-win32/menu.c:337
msgid "City _Names"
msgstr "Város_nevek"
-#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:338
+#: client/gui-gtk-2.0/menu.c:807 client/gui-win32/menu.c:338
#, fuzzy
msgid "City G_rowth"
msgstr "Város: Növekedés"
-#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:339
+#: client/gui-gtk-2.0/menu.c:809 client/gui-win32/menu.c:339
msgid "City _Productions"
msgstr "Városok _termelése"
-#: client/gui-gtk-2.0/menu.c:784 client/gui-sdl/optiondlg.c:1719
+#: client/gui-gtk-2.0/menu.c:811
+#, fuzzy
+msgid "City Buy Cost"
+msgstr "Összes Kiadás:"
+
+#: client/gui-gtk-2.0/menu.c:813
+#, fuzzy
+msgid "City Traderoutes"
+msgstr "Kereskedelmi kapcsolatok"
+
+#: client/gui-gtk-2.0/menu.c:815 client/gui-sdl/optiondlg.c:1719
msgid "Draw city worker map grid"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:788 client/gui-sdl/optiondlg.c:1635
+#: client/gui-gtk-2.0/menu.c:819 client/gui-sdl/optiondlg.c:1635
#: client/gui-win32/menu.c:340 client/gui-xaw/menu.c:148
#: client/gui-xaw/menu.c:246 manual/civmanual.c:220 data/helpdata.txt:1220
msgid "Terrain"
msgstr "Terep"
-#: client/gui-gtk-2.0/menu.c:790 client/gui-win32/menu.c:341
+#: client/gui-gtk-2.0/menu.c:821 client/gui-win32/menu.c:341
#: client/gui-xaw/menu.c:149
msgid "Coastline"
msgstr "Partvonal"
-#: client/gui-gtk-2.0/menu.c:796 client/gui-win32/menu.c:343
+#: client/gui-gtk-2.0/menu.c:827 client/gui-win32/menu.c:343
msgid "Roads & Rails"
msgstr "Utak és vasutak"
-#: client/gui-gtk-2.0/menu.c:800 client/gui-sdl/optiondlg.c:1933
+#: client/gui-gtk-2.0/menu.c:831 client/gui-sdl/optiondlg.c:1933
#: client/gui-win32/menu.c:345 client/gui-xaw/menu.c:152
msgid "Mines"
msgstr "Bányák"
-#: client/gui-gtk-2.0/menu.c:802 client/gui-win32/menu.c:346
+#: client/gui-gtk-2.0/menu.c:833 client/gui-win32/menu.c:346
msgid "Fortress & Airbase"
msgstr "Erõdök és légibázisok"
-#: client/gui-gtk-2.0/menu.c:804 client/gui-win32/menu.c:348
+#: client/gui-gtk-2.0/menu.c:835 client/gui-win32/menu.c:348
#: client/gui-xaw/menu.c:154
msgid "Specials"
msgstr "Speciálisok"
-#: client/gui-gtk-2.0/menu.c:806 client/gui-win32/menu.c:349
+#: client/gui-gtk-2.0/menu.c:837 client/gui-win32/menu.c:349
#: client/gui-xaw/menu.c:155
msgid "Pollution & Fallout"
msgstr "Szennyezés"
-#: client/gui-gtk-2.0/menu.c:812 client/gui-win32/menu.c:352
+#: client/gui-gtk-2.0/menu.c:843 client/gui-win32/menu.c:352
#: client/gui-xaw/menu.c:158
msgid "Focus Unit"
msgstr "Egységre fókuszálás"
-#: client/gui-gtk-2.0/menu.c:814 client/gui-sdl/optiondlg.c:1854
+#: client/gui-gtk-2.0/menu.c:845 client/gui-sdl/optiondlg.c:1854
#: client/gui-win32/menu.c:353 client/gui-xaw/menu.c:159
msgid "Fog of War"
msgstr "Ismeretlen mezõk árnyékolása"
-#: client/gui-gtk-2.0/menu.c:818
+#: client/gui-gtk-2.0/menu.c:849
msgid "_Full Screen"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/menu.c:853
msgid "_Center View"
msgstr "_Középre hozás"
-#: client/gui-gtk-2.0/menu.c:825 client/gui-win32/menu.c:358
+#: client/gui-gtk-2.0/menu.c:856 client/gui-win32/menu.c:358
msgid "_Orders"
msgstr "_Parancsok"
-#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
-#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
-#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
-#: client/gui-gtk-2.0/menu.c:855 client/gui-gtk-2.0/menu.c:857
-#: client/gui-gtk-2.0/menu.c:859 client/gui-gtk-2.0/menu.c:861
-#: client/gui-gtk-2.0/menu.c:863 client/gui-gtk-2.0/menu.c:865
-#: client/gui-gtk-2.0/menu.c:867 client/gui-gtk-2.0/menu.c:869
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875 client/gui-gtk-2.0/menu.c:877
-#: client/gui-gtk-2.0/menu.c:879 client/gui-gtk-2.0/menu.c:881
-#: client/gui-gtk-2.0/menu.c:883 client/gui-gtk-2.0/menu.c:885
-#: client/gui-gtk-2.0/menu.c:887 client/gui-gtk-2.0/menu.c:889
-#: client/gui-gtk-2.0/menu.c:891 client/gui-gtk-2.0/menu.c:893
-#: client/gui-gtk-2.0/menu.c:895 client/gui-gtk-2.0/menu.c:897
-#: client/gui-gtk-2.0/menu.c:899 client/gui-gtk-2.0/menu.c:901
-#: client/gui-gtk-2.0/menu.c:903 data/Freeciv.in:2029
+#: client/gui-gtk-2.0/menu.c:858 client/gui-gtk-2.0/menu.c:860
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:864
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:868
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:872
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:876
+#: client/gui-gtk-2.0/menu.c:878 client/gui-gtk-2.0/menu.c:880
+#: client/gui-gtk-2.0/menu.c:882 client/gui-gtk-2.0/menu.c:884
+#: client/gui-gtk-2.0/menu.c:886 client/gui-gtk-2.0/menu.c:888
+#: client/gui-gtk-2.0/menu.c:890 client/gui-gtk-2.0/menu.c:892
+#: client/gui-gtk-2.0/menu.c:894 client/gui-gtk-2.0/menu.c:896
+#: client/gui-gtk-2.0/menu.c:898 client/gui-gtk-2.0/menu.c:900
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906 client/gui-gtk-2.0/menu.c:908
+#: client/gui-gtk-2.0/menu.c:910 client/gui-gtk-2.0/menu.c:912
+#: client/gui-gtk-2.0/menu.c:914 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:918 client/gui-gtk-2.0/menu.c:920
+#: client/gui-gtk-2.0/menu.c:922 client/gui-gtk-2.0/menu.c:924
+#: client/gui-gtk-2.0/menu.c:926 client/gui-gtk-2.0/menu.c:928
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
+#: client/gui-gtk-2.0/menu.c:946 data/Freeciv.in:2029
msgid "Orders"
msgstr "Parancsok"
-#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:1444
+#: client/gui-gtk-2.0/menu.c:860 client/gui-gtk-2.0/menu.c:1489
#: client/gui-win32/menu.c:359
msgid "_Build City"
msgstr "_Várost épít"
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:1466
-#: client/gui-gtk-2.0/menu.c:1472 client/gui-win32/menu.c:360
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:1511
+#: client/gui-gtk-2.0/menu.c:1517 client/gui-win32/menu.c:360
msgid "Build _Road"
msgstr "_Utat épít"
-#: client/gui-gtk-2.0/menu.c:833 client/gui-gtk-2.0/menu.c:1360
+#: 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 "_Öntözést épít"
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:1361
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:1406
#: client/gui-win32/menu.c:362
msgid "Build _Mine"
msgstr "_Bányát épít"
-#: client/gui-gtk-2.0/menu.c:837 client/gui-gtk-2.0/menu.c:1362
+#: client/gui-gtk-2.0/menu.c:868 client/gui-gtk-2.0/menu.c:1407
msgid "Transf_orm Terrain"
msgstr "Terepet _átalakít"
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:1508
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:1553
#: client/gui-win32/menu.c:364
msgid "Build _Fortress"
msgstr "_Erõdöt épít"
-#: client/gui-gtk-2.0/menu.c:841 client/gui-win32/menu.c:365
+#: client/gui-gtk-2.0/menu.c:872 client/gui-win32/menu.c:365
msgid "Build Airbas_e"
msgstr "_Légibázist épít"
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:1514
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:1559
#: client/gui-win32/menu.c:366
msgid "Clean _Pollution"
msgstr "_Szennyezést eltakarít"
-#: client/gui-gtk-2.0/menu.c:845 client/gui-win32/menu.c:367
+#: client/gui-gtk-2.0/menu.c:876 client/gui-win32/menu.c:367
msgid "Clean _Nuclear Fallout"
msgstr "_Nukleáris szennyezést eltakarít"
-#: client/gui-gtk-2.0/menu.c:849 client/gui-win32/menu.c:369
+#: client/gui-gtk-2.0/menu.c:880 client/gui-win32/menu.c:369
msgid "_Sentry"
msgstr "_Õrködik"
-#: client/gui-gtk-2.0/menu.c:855 client/gui-win32/menu.c:372
+#: client/gui-gtk-2.0/menu.c:886 client/gui-win32/menu.c:372
msgid "Make _Homecity"
msgstr "Város _kijelölése ellátóvárosnak"
-#: client/gui-gtk-2.0/menu.c:857 client/gui-win32/menu.c:373
+#: client/gui-gtk-2.0/menu.c:888 client/gui-win32/menu.c:373
#, fuzzy
msgid "_Load"
msgstr "Ki_rakodik"
-#: client/gui-gtk-2.0/menu.c:859
+#: client/gui-gtk-2.0/menu.c:890
#, fuzzy
msgid "_Unload Transporter"
msgstr "Szállítóhajó"
-#: client/gui-gtk-2.0/menu.c:861 client/gui-win32/menu.c:374
+#: client/gui-gtk-2.0/menu.c:892 client/gui-win32/menu.c:374
msgid "_Unload"
msgstr "Ki_rakodik"
-#: client/gui-gtk-2.0/menu.c:863 client/gui-win32/menu.c:375
+#: client/gui-gtk-2.0/menu.c:894 client/gui-win32/menu.c:375
msgid "Wake up o_thers"
msgstr "Felkelti a _többieket"
-#: client/gui-gtk-2.0/menu.c:867
+#: client/gui-gtk-2.0/menu.c:898
msgid "_Auto Settler"
msgstr "_Automata telepes"
-#: client/gui-gtk-2.0/menu.c:869 client/gui-win32/menu.c:378
+#: client/gui-gtk-2.0/menu.c:900 client/gui-win32/menu.c:378
msgid "Auto E_xplore"
msgstr "Automata _felfedezés"
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906
msgid "_Connect"
msgstr "_Bekapcsolódik"
-#: client/gui-gtk-2.0/menu.c:871 client/gui-win32/menu.c:380
+#: client/gui-gtk-2.0/menu.c:902 client/gui-win32/menu.c:380
#, fuzzy
msgid "_Road"
msgstr "Út"
-#: client/gui-gtk-2.0/menu.c:873 client/gui-win32/menu.c:381
+#: client/gui-gtk-2.0/menu.c:904 client/gui-win32/menu.c:381
#, fuzzy
msgid "Rai_l"
msgstr "Vitorlás Hajó"
-#: client/gui-gtk-2.0/menu.c:875 client/gui-win32/menu.c:382
+#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:382
#, fuzzy
msgid "_Irrigate"
msgstr "Fregatt"
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
#, fuzzy
msgid "Go _to"
msgstr "Menj..."
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
#, fuzzy
msgid "_Build city"
msgstr "_Várost épít"
-#: client/gui-gtk-2.0/menu.c:879
+#: client/gui-gtk-2.0/menu.c:910
msgid "Patrol (_Q)"
msgstr "Õr_járatozik"
-#: client/gui-gtk-2.0/menu.c:881 client/gui-win32/menu.c:385
+#: client/gui-gtk-2.0/menu.c:912 client/gui-win32/menu.c:385
msgid "_Go to"
msgstr "_Menj"
-#: client/gui-gtk-2.0/menu.c:883
+#: client/gui-gtk-2.0/menu.c:914
msgid "Go\\/Airlift to City"
msgstr "Menj\\/Repülj ... városába"
-#: client/gui-gtk-2.0/menu.c:885 client/gui-sdl/menu.c:450
+#: client/gui-gtk-2.0/menu.c:916 client/gui-sdl/menu.c:450
#: client/gui-win32/menu.c:387 client/gui-xaw/menu.c:203
msgid "Return to nearest city"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:889 client/gui-win32/menu.c:389
+#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:389
#: client/gui-xaw/menu.c:205
msgid "Disband Unit"
msgstr "Egység feloszlatása"
-#: client/gui-gtk-2.0/menu.c:891 client/gui-sdl/citydlg.c:532
+#: client/gui-gtk-2.0/menu.c:922 client/gui-sdl/citydlg.c:532
#: data/Freeciv.in:1186
msgid "Upgrade unit"
msgstr "Egység fejlesztése"
-#: client/gui-gtk-2.0/menu.c:893
+#: client/gui-gtk-2.0/menu.c:924
msgid "Diplomat\\/Spy Actions"
msgstr "Diplomata\\/Kémtevékenység"
-#: client/gui-gtk-2.0/menu.c:895 client/gui-sdl/menu.c:399
+#: client/gui-gtk-2.0/menu.c:926 client/gui-sdl/menu.c:399
#: client/gui-win32/menu.c:391 client/gui-xaw/menu.c:209
msgid "Explode Nuclear"
msgstr "Atomrobbantás"
-#: client/gui-gtk-2.0/menu.c:899
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/cityrep.c:882
+msgid "Select"
+msgstr "Kiválasztás"
+
+#: client/gui-gtk-2.0/menu.c:934
#, fuzzy
-msgid "Select same type"
-msgstr "Válassz egy várost"
+msgid "Single"
+msgstr "Dzsungel"
-#: client/gui-gtk-2.0/menu.c:901 client/gui-win32/menu.c:393
+#: client/gui-gtk-2.0/menu.c:936
+msgid "Same Type On Tile"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:938
+msgid "All On Tile"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:940
+msgid "Same Type On Continent"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:942
+msgid "Same Type Everywhere"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:393
msgid "_Wait"
msgstr "_Várakozik"
-#: client/gui-gtk-2.0/menu.c:903 client/gui-win32/menu.c:394
+#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:394
#: client/gui-xaw/menu.c:213
msgid "Done"
msgstr "Kész"
-#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:398
+#: client/gui-gtk-2.0/menu.c:949 client/gui-win32/menu.c:398
msgid "_Reports"
msgstr "J_elentések"
-#: client/gui-gtk-2.0/menu.c:908 client/gui-gtk-2.0/menu.c:910
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:914
-#: client/gui-gtk-2.0/menu.c:916 client/gui-gtk-2.0/menu.c:918
-#: client/gui-gtk-2.0/menu.c:920 client/gui-gtk-2.0/menu.c:922
-#: client/gui-gtk-2.0/menu.c:924 client/gui-gtk-2.0/menu.c:926
-#: client/gui-gtk-2.0/menu.c:928 client/gui-gtk-2.0/menu.c:930
-#: client/gui-gtk-2.0/menu.c:932 data/Freeciv.in:2030
+#: client/gui-gtk-2.0/menu.c:951 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:957
+#: client/gui-gtk-2.0/menu.c:959 client/gui-gtk-2.0/menu.c:961
+#: client/gui-gtk-2.0/menu.c:963 client/gui-gtk-2.0/menu.c:965
+#: client/gui-gtk-2.0/menu.c:967 client/gui-gtk-2.0/menu.c:969
+#: client/gui-gtk-2.0/menu.c:971 client/gui-gtk-2.0/menu.c:973
+#: client/gui-gtk-2.0/menu.c:975 data/Freeciv.in:2030
msgid "Reports"
msgstr "Jelentések"
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:958
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:1001
#: client/gui-win32/menu.c:400 client/gui-win32/menu.c:425
msgid "_Units"
msgstr "_Egységek"
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/menu.c:914 client/gui-win32/menu.c:402
+#: client/gui-gtk-2.0/menu.c:957 client/gui-win32/menu.c:402
#, fuzzy
msgid "_Nations"
msgstr "_Nép"
-#: client/gui-gtk-2.0/menu.c:918 client/gui-win32/menu.c:403
+#: client/gui-gtk-2.0/menu.c:961 client/gui-win32/menu.c:403
msgid "_Economy"
msgstr "_Gazdaság"
#. TRANS: Research report action
-#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:405
+#: client/gui-gtk-2.0/menu.c:963 client/gui-win32/menu.c:405
#, fuzzy
msgid "_Research"
msgstr "_Kutatás"
-#: client/gui-gtk-2.0/menu.c:924 client/gui-win32/menu.c:407
+#: client/gui-gtk-2.0/menu.c:967 client/gui-win32/menu.c:407
msgid "_Wonders of the World"
msgstr "A világ _csodái"
-#: client/gui-gtk-2.0/menu.c:926 client/gui-win32/menu.c:408
+#: client/gui-gtk-2.0/menu.c:969 client/gui-win32/menu.c:408
msgid "_Top Five Cities"
msgstr "Az _öt legjobb város"
-#: client/gui-gtk-2.0/menu.c:928 client/gui-win32/menu.c:409
+#: client/gui-gtk-2.0/menu.c:971 client/gui-win32/menu.c:409
msgid "_Messages"
msgstr "_Üzenetek"
-#: client/gui-gtk-2.0/menu.c:930 client/gui-win32/menu.c:410
+#: client/gui-gtk-2.0/menu.c:973 client/gui-win32/menu.c:410
msgid "_Demographics"
msgstr "_Demográfia"
-#: client/gui-gtk-2.0/menu.c:932 client/gui-gtk-2.0/plrdlg.c:471
+#: client/gui-gtk-2.0/menu.c:975 client/gui-gtk-2.0/plrdlg.c:354
#: client/gui-win32/menu.c:411
msgid "_Spaceship"
msgstr "Ûr_hajó"
-#: client/gui-gtk-2.0/menu.c:936 client/gui-win32/menu.c:415
+#: client/gui-gtk-2.0/menu.c:979 client/gui-win32/menu.c:415
msgid "_Help"
msgstr "_Súgó"
-#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
-#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
-#: client/gui-gtk-2.0/menu.c:946 client/gui-gtk-2.0/menu.c:948
-#: client/gui-gtk-2.0/menu.c:950 client/gui-gtk-2.0/menu.c:952
-#: client/gui-gtk-2.0/menu.c:954 client/gui-gtk-2.0/menu.c:956
-#: client/gui-gtk-2.0/menu.c:958 client/gui-gtk-2.0/menu.c:960
-#: client/gui-gtk-2.0/menu.c:962 client/gui-gtk-2.0/menu.c:964
-#: client/gui-gtk-2.0/menu.c:966 client/gui-gtk-2.0/menu.c:968
-#: client/gui-gtk-2.0/menu.c:970 client/gui-gtk-2.0/menu.c:972
-#: client/gui-gtk-2.0/menu.c:974 client/gui-gtk-2.0/menu.c:976
-#: client/gui-gtk-2.0/menu.c:978 client/gui-gtk-2.0/menu.c:980
+#: client/gui-gtk-2.0/menu.c:981 client/gui-gtk-2.0/menu.c:983
+#: client/gui-gtk-2.0/menu.c:985 client/gui-gtk-2.0/menu.c:987
+#: client/gui-gtk-2.0/menu.c:989 client/gui-gtk-2.0/menu.c:991
+#: client/gui-gtk-2.0/menu.c:993 client/gui-gtk-2.0/menu.c:995
+#: client/gui-gtk-2.0/menu.c:997 client/gui-gtk-2.0/menu.c:999
+#: client/gui-gtk-2.0/menu.c:1001 client/gui-gtk-2.0/menu.c:1003
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-gtk-2.0/menu.c:1007
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-gtk-2.0/menu.c:1011
+#: client/gui-gtk-2.0/menu.c:1013 client/gui-gtk-2.0/menu.c:1015
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-gtk-2.0/menu.c:1019
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-gtk-2.0/menu.c:1023
#: client/gui-gtk-2.0/repodlgs.c:313 client/gui-win32/citydlg.c:1077
#: client/gui-win32/repodlgs.c:289 client/gui-win32/wldlg.c:846
#: data/Freeciv.in:1466 data/Freeciv.in:2031 data/Freeciv.in:2101
@@ -12141,119 +12353,119 @@ msgstr "_S
msgid "Help"
msgstr "Súgó"
-#: client/gui-gtk-2.0/menu.c:940 client/gui-win32/menu.c:416
+#: client/gui-gtk-2.0/menu.c:983 client/gui-win32/menu.c:416
msgid "Language_s"
msgstr "N_yelvek"
-#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/menu.c:417
+#: client/gui-gtk-2.0/menu.c:985 client/gui-win32/menu.c:417
msgid "Co_nnecting"
msgstr "_Kapcsolódás"
-#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:418
+#: client/gui-gtk-2.0/menu.c:987 client/gui-win32/menu.c:418
msgid "C_ontrols"
msgstr "_Vezérlés"
-#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:419
+#: client/gui-gtk-2.0/menu.c:989 client/gui-win32/menu.c:419
msgid "C_hatline"
msgstr "_Beszélgetés a többiekkel"
-#: client/gui-gtk-2.0/menu.c:948 client/gui-win32/menu.c:420
+#: client/gui-gtk-2.0/menu.c:991 client/gui-win32/menu.c:420
msgid "_Worklist Editor"
msgstr "_Munkatervszerkesztõ"
-#: client/gui-gtk-2.0/menu.c:950 client/gui-win32/menu.c:421
+#: client/gui-gtk-2.0/menu.c:993 client/gui-win32/menu.c:421
msgid "Citizen _Management"
msgstr "Város_irányítás"
-#: client/gui-gtk-2.0/menu.c:952 client/gui-win32/menu.c:422
+#: client/gui-gtk-2.0/menu.c:995 client/gui-win32/menu.c:422
msgid "_Playing"
msgstr "_Játékmenet"
-#: client/gui-gtk-2.0/menu.c:956 client/gui-win32/menu.c:424
+#: client/gui-gtk-2.0/menu.c:999 client/gui-win32/menu.c:424
msgid "City _Improvements"
msgstr "_Épületek"
-#: client/gui-gtk-2.0/menu.c:960 client/gui-win32/menu.c:426
+#: client/gui-gtk-2.0/menu.c:1003 client/gui-win32/menu.c:426
msgid "Com_bat"
msgstr "_Csata"
-#: client/gui-gtk-2.0/menu.c:962 client/gui-win32/menu.c:427
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-win32/menu.c:427
msgid "_ZOC"
msgstr "Fennhatósági _övezetek"
-#: client/gui-gtk-2.0/menu.c:964 client/gui-win32/menu.c:428
+#: client/gui-gtk-2.0/menu.c:1007 client/gui-win32/menu.c:428
msgid "Techno_logy"
msgstr "Techno_lógia"
-#: client/gui-gtk-2.0/menu.c:966 client/gui-win32/menu.c:429
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-win32/menu.c:429
msgid "_Terrain"
msgstr "_Terep"
-#: client/gui-gtk-2.0/menu.c:968 client/gui-win32/menu.c:430
+#: client/gui-gtk-2.0/menu.c:1011 client/gui-win32/menu.c:430
msgid "Won_ders"
msgstr "_Világcsodák"
-#: client/gui-gtk-2.0/menu.c:972 client/gui-win32/menu.c:432
+#: client/gui-gtk-2.0/menu.c:1015 client/gui-win32/menu.c:432
msgid "Happin_ess"
msgstr "Köz_hangulat"
-#: client/gui-gtk-2.0/menu.c:974 client/gui-win32/menu.c:433
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-win32/menu.c:433
msgid "Space _Race"
msgstr "A világûr meghódítása"
-#: client/gui-gtk-2.0/menu.c:978 client/gui-win32/menu.c:435
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-win32/menu.c:435
msgid "_Copying"
msgstr "_Másolás"
-#: client/gui-gtk-2.0/menu.c:980 client/gui-win32/menu.c:436
+#: client/gui-gtk-2.0/menu.c:1023 client/gui-win32/menu.c:436
msgid "_About"
msgstr "_Névjegy"
-#: client/gui-gtk-2.0/menu.c:1264
+#: client/gui-gtk-2.0/menu.c:1307
#, c-format
msgid "%s..."
msgstr ""
-#: client/gui-gtk-2.0/menu.c:1352
+#: client/gui-gtk-2.0/menu.c:1397
#, c-format
msgid "Change to %s (_I)"
msgstr "Cserél %s tereptípusra (_I)"
-#: client/gui-gtk-2.0/menu.c:1353
+#: client/gui-gtk-2.0/menu.c:1398
#, c-format
msgid "Change to %s (_M)"
msgstr "Cserél %s tereptípusra (_M)"
-#: client/gui-gtk-2.0/menu.c:1354
+#: client/gui-gtk-2.0/menu.c:1399
#, c-format
msgid "Transf_orm to %s"
msgstr "Átalakít %s tereptípusra"
-#: client/gui-gtk-2.0/menu.c:1427
+#: client/gui-gtk-2.0/menu.c:1472
msgid "Help _Build Wonder"
msgstr "Segít _csodát építeni"
-#: client/gui-gtk-2.0/menu.c:1441
+#: client/gui-gtk-2.0/menu.c:1486
msgid "Add to City (_B)"
msgstr "Városhoz hozzáad (_B)"
-#: client/gui-gtk-2.0/menu.c:1449
+#: client/gui-gtk-2.0/menu.c:1494
msgid "Make Trade _Route"
msgstr "Kereskedelmi _kapcsolatot létesít"
-#: client/gui-gtk-2.0/menu.c:1463
+#: client/gui-gtk-2.0/menu.c:1508
msgid "Build _Railroad"
msgstr "_Vasutat épít"
-#: client/gui-gtk-2.0/menu.c:1486
+#: client/gui-gtk-2.0/menu.c:1531
msgid "Bu_ild Farmland"
msgstr "Farmot épít"
-#: client/gui-gtk-2.0/menu.c:1506
+#: client/gui-gtk-2.0/menu.c:1551
msgid "_Fortify"
msgstr "Megerõsítés (_F)"
-#: client/gui-gtk-2.0/menu.c:1512
+#: client/gui-gtk-2.0/menu.c:1557
msgid "_Paradrop"
msgstr "_Ejtõernyõs támadás"
@@ -12288,13 +12500,32 @@ msgstr "
msgid "Pop"
msgstr "Fel"
-#: client/gui-gtk-2.0/messagewin.c:155 client/gui-sdl/messagewin.c:247
+#: client/gui-gtk-2.0/messagewin.c:186 client/gui-sdl/messagewin.c:247
#: client/gui-win32/messagewin.c:132 client/gui-xaw/menu.c:228
#: data/Freeciv.in:3273 data/Freeciv.in:3274 data/Freeciv.in:3283
msgid "Messages"
msgstr "Üzenetek"
-#: client/gui-gtk-2.0/plrdlg.c:330
+#: client/gui-gtk-2.0/plrdlg.c:317
+msgid "_Meet"
+msgstr "_Találkozó"
+
+#: client/gui-gtk-2.0/plrdlg.c:323
+#, fuzzy
+msgid "Cancel _Treaty"
+msgstr "Egyezmény _Felbontása"
+
+#: client/gui-gtk-2.0/plrdlg.c:329
+#, fuzzy
+msgid "_Withdraw Vision"
+msgstr "Látvány _visszavonása"
+
+#: client/gui-gtk-2.0/plrdlg.c:348
+#, fuzzy
+msgid "_Report"
+msgstr "J_elentések"
+
+#: client/gui-gtk-2.0/plrdlg.c:386
msgid "?show:Dead Players"
msgstr ""
@@ -12302,295 +12533,297 @@ msgstr ""
#. TRANS: Nations report action
#. TRANS: Nations report title
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/plrdlg.c:350 client/gui-sdl/mapctrl.c:1580
+#: client/gui-gtk-2.0/plrdlg.c:406 client/gui-sdl/mapctrl.c:1580
#: client/gui-sdl/plrdlg.c:608 client/gui-win32/plrdlg.c:344
#: client/gui-xaw/menu.c:221 data/Freeciv.in:3192 data/Freeciv.in:3193
#, fuzzy
msgid "Nations"
msgstr "Nép"
-#: client/gui-gtk-2.0/plrdlg.c:443
-msgid "_Intelligence"
-msgstr "_Hírszerzés"
-
-#: client/gui-gtk-2.0/plrdlg.c:450
-msgid "_Meet"
-msgstr "_Találkozó"
-
-#: client/gui-gtk-2.0/plrdlg.c:457
+#: client/gui-gtk-2.0/plrdlg.c:511
#, fuzzy
-msgid "Cancel _Treaty"
-msgstr "Egyezmény _Felbontása"
+msgid "Di_plomacy"
+msgstr "Diplomata"
-#: client/gui-gtk-2.0/plrdlg.c:464
-msgid "_Withdraw vision"
-msgstr "Látvány _visszavonása"
+#: client/gui-gtk-2.0/plrdlg.c:516
+msgid "_Intelligence"
+msgstr "_Hírszerzés"
-#: client/gui-gtk-2.0/plrdlg.c:495
+#: client/gui-gtk-2.0/plrdlg.c:526
#, fuzzy
msgid "_AI"
msgstr "MI"
-#: client/gui-gtk-2.0/plrdlg.c:501
+#: client/gui-gtk-2.0/plrdlg.c:532
msgid "_Toggle AI Mode"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:208
+#: client/gui-gtk-2.0/pages.c:221
#, fuzzy
msgid "Start _New Game"
msgstr "Új játék indítása"
-#: client/gui-gtk-2.0/pages.c:214
+#: client/gui-gtk-2.0/pages.c:227
#, fuzzy
msgid "Start _Scenario Game"
msgstr "Új játék indítása"
-#: client/gui-gtk-2.0/pages.c:220
+#: client/gui-gtk-2.0/pages.c:233
#, fuzzy
msgid "_Load Saved Game"
msgstr "Játék betöltése"
-#: client/gui-gtk-2.0/pages.c:229
+#: client/gui-gtk-2.0/pages.c:239
msgid "C_onnect to Network Game"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:236
+#: client/gui-gtk-2.0/pages.c:247
#, fuzzy
msgid "Connect to Gaming _Zone"
msgstr "Kapcsolódj be itt"
-#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:300
#: client/gui-xaw/connectdlg.c:326
msgid "Passwords don't match, enter password."
msgstr ""
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:779 client/gui-gtk-2.0/pages.c:820
+#: client/gui-win32/connectdlg.c:916
msgid "Server Name"
msgstr "Szervernév"
-#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
+#: 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
+#: data/Freeciv.in:96
msgid "Port"
msgstr "Port"
-#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
+#: client/gui-win32/connectdlg.c:917
msgid "Version"
msgstr "Verzió"
-#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
-#: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
+#: 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
msgid "Status"
msgstr "Állapot"
-#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
-#: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
+#: 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
msgid "Players"
msgstr "Játékosok"
-#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
+#: client/gui-win32/connectdlg.c:918
msgid "Comment"
msgstr "Megjegyzés"
-#: client/gui-gtk-2.0/pages.c:747
+#: client/gui-gtk-2.0/pages.c:786
msgid "Local _Area Network"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:783
+#: client/gui-gtk-2.0/pages.c:827
#, fuzzy
msgid "Internet _Metaserver"
msgstr "Metaszerver"
-#: client/gui-gtk-2.0/pages.c:817
+#: client/gui-gtk-2.0/pages.c:864
#, fuzzy
msgid "_Host:"
msgstr "_Szerver"
-#: client/gui-gtk-2.0/pages.c:834
+#: client/gui-gtk-2.0/pages.c:881
#, fuzzy
msgid "_Port:"
msgstr "_Port"
-#: client/gui-gtk-2.0/pages.c:851
+#: client/gui-gtk-2.0/pages.c:898
#, fuzzy
msgid "_Login:"
msgstr "Légió"
-#: client/gui-gtk-2.0/pages.c:869
+#: client/gui-gtk-2.0/pages.c:916
msgid "Pass_word:"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:887
+#: client/gui-gtk-2.0/pages.c:934
msgid "Conf_irm Password:"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:912
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: 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/wldlg.c:800 client/gui-win32/wldlg.c:806
+msgid "Type"
+msgstr "Típus"
+
+#: client/gui-gtk-2.0/pages.c:952 client/gui-win32/plrdlg.c:337
+#: data/Freeciv.in:88
+msgid "Host"
+msgstr "Szerver"
+
+#: client/gui-gtk-2.0/pages.c:981
#, fuzzy
msgid "C_onnect"
msgstr "Kapcsolódás"
-#: client/gui-gtk-2.0/pages.c:1142
+#: client/gui-gtk-2.0/pages.c:1211
#, fuzzy, c-format
msgid "Connection name: %s"
msgstr "Kapcsolódás"
-#: client/gui-gtk-2.0/pages.c:1145
+#: client/gui-gtk-2.0/pages.c:1214
#, fuzzy, c-format
msgid "Player name: %s"
msgstr "?city:Név"
-#: client/gui-gtk-2.0/pages.c:1150
+#: client/gui-gtk-2.0/pages.c:1219
#, fuzzy, c-format
msgid "Host: %s"
msgstr "Gazdagép:"
-#: client/gui-gtk-2.0/pages.c:1158
+#: client/gui-gtk-2.0/pages.c:1227
msgid "Player/conn info"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1185
+#: client/gui-gtk-2.0/pages.c:1254
#, fuzzy, c-format
msgid "%s info"
msgstr "Városinfó"
-#: client/gui-gtk-2.0/pages.c:1196
+#: client/gui-gtk-2.0/pages.c:1265
#, fuzzy
msgid "Toggle player ready"
msgstr "aitoggle <játékosnév>"
-#: client/gui-gtk-2.0/pages.c:1204
+#: client/gui-gtk-2.0/pages.c:1273
#, fuzzy
msgid "Pick nation"
msgstr "Rendõrállomás"
-#: client/gui-gtk-2.0/pages.c:1214
+#: client/gui-gtk-2.0/pages.c:1283
msgid "Observe this player"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1221
+#: client/gui-gtk-2.0/pages.c:1290
#, fuzzy
msgid "Take this player"
msgstr "Városok"
-#: client/gui-gtk-2.0/pages.c:1238
+#: client/gui-gtk-2.0/pages.c:1307
#, fuzzy
msgid "Cut connection"
msgstr "A(z) %s kapcsolat megszakítása."
-#: client/gui-gtk-2.0/pages.c:1248
+#: client/gui-gtk-2.0/pages.c:1317
#, fuzzy
msgid "Aitoggle player"
msgstr "aitoggle <játékosnév>"
-#: client/gui-gtk-2.0/pages.c:1257
+#: client/gui-gtk-2.0/pages.c:1326
#, fuzzy
msgid "Remove player"
msgstr "%s játékos törlése."
-#: client/gui-gtk-2.0/pages.c:1268
+#: client/gui-gtk-2.0/pages.c:1337
msgid "Give info access"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1276
+#: client/gui-gtk-2.0/pages.c:1345
msgid "Give ctrl access"
msgstr ""
#. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1338
+#: client/gui-gtk-2.0/pages.c:1407
#, fuzzy, c-format
msgid "Put on %s"
msgstr "Népesség: %s"
-#: client/gui-gtk-2.0/pages.c:1442
+#: client/gui-gtk-2.0/pages.c:1511
#, fuzzy
msgid "Number of _Players (including AI):"
msgstr "Ennyire egészítsék ki a játékosok számát az MI játékosok"
-#: client/gui-gtk-2.0/pages.c:1465
+#: client/gui-gtk-2.0/pages.c:1534
msgid "AI Skill _Level:"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1481
+#: client/gui-gtk-2.0/pages.c:1550
#, fuzzy
msgid "Ruleset _Version:"
msgstr "CMA _kikapcsolása"
-#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
#, fuzzy
msgid "_More Game Options..."
msgstr "Üzenetbeállítások..."
-#: client/gui-gtk-2.0/pages.c:1514
+#: client/gui-gtk-2.0/pages.c:1583
#, fuzzy
msgid "Record"
msgstr "Jelentés"
-#: client/gui-gtk-2.0/pages.c:1519
+#: client/gui-gtk-2.0/pages.c:1588
#, fuzzy
msgid "Rating"
msgstr "Várakozik"
-#: client/gui-gtk-2.0/pages.c:1525
+#: client/gui-gtk-2.0/pages.c:1594
#, fuzzy
msgid "Ready"
msgstr "Mindenki készenlétbe"
-#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
-#: data/nation/slovakian.ruleset:26
+#: client/gui-gtk-2.0/pages.c:1601
#, fuzzy
-msgid "Leader"
-msgstr "Vezetõ:"
+msgid "?player:Leader"
+msgstr "?city:Név"
-#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1732 client/gui-sdl/chatline.c:185
msgid "Choose Saved Game to Load"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1752
+#: client/gui-gtk-2.0/pages.c:1824
msgid "Choose Saved Game to _Load:"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
-#: client/gui-gtk-2.0/pages.c:2375
+#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
+#: client/gui-gtk-2.0/pages.c:2451
#, fuzzy
msgid "_Browse..."
msgstr "_Megjelenítés..."
-#: client/gui-gtk-2.0/pages.c:1839
+#: client/gui-gtk-2.0/pages.c:1911
#, fuzzy
msgid "Choose a Scenario"
msgstr "Scenario betöltése"
-#: client/gui-gtk-2.0/pages.c:1926
+#: client/gui-gtk-2.0/pages.c:1998
#, fuzzy
msgid "Choose a _Scenario:"
msgstr "Scenario betöltése"
-#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
-#: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
-#: client/gui-win32/wldlg.c:806
-msgid "Type"
-msgstr "Típus"
-
-#: client/gui-gtk-2.0/pages.c:2101
+#: client/gui-gtk-2.0/pages.c:2173
#, fuzzy
msgid "Choose a _nation to play:"
msgstr "Válassz tevékenységet:"
-#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2363 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:2372 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2448 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr "Játék elmentése"
-#: client/gui-gtk-2.0/pages.c:2413
+#: client/gui-gtk-2.0/pages.c:2489
#, fuzzy
msgid "Saved _Games:"
msgstr "Játék elmentése"
-#: client/gui-gtk-2.0/pages.c:2440
+#: client/gui-gtk-2.0/pages.c:2516
#, fuzzy
msgid "Save _Filename:"
msgstr "Játék elmentése"
@@ -12953,7 +13186,7 @@ msgstr "V
msgid "Total users logged in : %d"
msgstr ""
-#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1094
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
#, fuzzy
msgid "Back"
msgstr "Bank"
@@ -12964,7 +13197,7 @@ msgid "Start"
msgstr "Állapot"
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:775
+#: client/gui-win32/connectdlg.c:777
msgid "Load Game"
msgstr "Játék betöltése"
@@ -13003,12 +13236,12 @@ msgid "Make new homecity"
msgstr "Ellátó város kijelölése"
#: client/gui-sdl/citydlg.c:546 client/gui-sdl/citydlg.c:1418
-#: client/gui-sdl/connectdlg.c:307 client/gui-sdl/connectdlg.c:616
-#: client/gui-sdl/connectdlg.c:802 client/gui-sdl/connectdlg.c:984
+#: 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/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1039
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
#: 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
@@ -13056,7 +13289,7 @@ msgstr "Vegy
#: client/gui-sdl/diplodlg.c:1335 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:2427
+#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
#: client/gui-xaw/cityrep.c:666 client/gui-xaw/cma_fe.c:327
#: client/gui-xaw/cma_fe.c:511 client/gui-xaw/cma_fe.c:765
#: client/gui-xaw/messagedlg.c:72 client/gui-xaw/optiondlg.c:76
@@ -13072,7 +13305,7 @@ msgstr "Nem"
#: client/gui-sdl/diplodlg.c:1345 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:2427 client/gui-xaw/cityrep.c:666
+#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
#: client/gui-xaw/cma_fe.c:327 client/gui-xaw/cma_fe.c:511
#: client/gui-xaw/cma_fe.c:765 client/gui-xaw/messagedlg.c:72
#: client/gui-xaw/optiondlg.c:76 client/gui-xaw/optiondlg.c:304
@@ -13374,40 +13607,40 @@ msgstr "_Egyszeri alkalmaz
msgid "Release city"
msgstr "CMA _kikapcsolása"
-#: client/gui-sdl/connectdlg.c:238
+#: client/gui-sdl/connectdlg.c:239
#, fuzzy
msgid "Creating Server List..."
msgstr "Freeciv szerver választás"
-#: client/gui-sdl/connectdlg.c:279 client/gui-sdl/connectdlg.c:343
+#: client/gui-sdl/connectdlg.c:280 client/gui-sdl/connectdlg.c:344
msgid "No LAN servers found"
msgstr ""
-#: client/gui-sdl/connectdlg.c:281 client/gui-sdl/connectdlg.c:345
+#: client/gui-sdl/connectdlg.c:282 client/gui-sdl/connectdlg.c:346
msgid "No public servers found"
msgstr ""
-#: client/gui-sdl/connectdlg.c:555
+#: client/gui-sdl/connectdlg.c:556
#, fuzzy
msgid "Player Name :"
msgstr "?city:Név"
-#: client/gui-sdl/connectdlg.c:571
+#: client/gui-sdl/connectdlg.c:572
#, fuzzy
msgid "Freeciv Server :"
msgstr "Freeciv szerver választás"
-#: client/gui-sdl/connectdlg.c:588
+#: client/gui-sdl/connectdlg.c:589
#, fuzzy
msgid "Port :"
msgstr "Port:"
-#: client/gui-sdl/connectdlg.c:608 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr "Kapcsolódás"
-#: client/gui-sdl/connectdlg.c:794 client/gui-sdl/connectdlg.c:977
+#: client/gui-sdl/connectdlg.c:795 client/gui-sdl/connectdlg.c:978
#: client/gui-xaw/connectdlg.c:145
msgid "Next"
msgstr ""
@@ -13699,7 +13932,7 @@ msgstr ""
#: client/gui-sdl/graphics.c:1021
#, c-format
-msgid "Unable to initialize SDL_ttf library: %s"
+msgid "Unable to initialize SDL_ttf library: %s"
msgstr ""
#: client/gui-sdl/graphics.c:1058
@@ -13785,12 +14018,6 @@ msgstr ""
msgid "Waiting for the beginning of the game"
msgstr ""
-#: client/gui-sdl/gui_string.c:608
-msgid ""
-"Couldn't find stdfont.ttf file. Please link/copy/move anyunicode ttf font to "
-"data dir as stdfont.ttf"
-msgstr ""
-
#. TRANS: Future Technology
#: client/gui-sdl/gui_tilespec.c:506
msgid "FT"
@@ -14400,12 +14627,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:1098 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1100 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:963
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
msgid "Start New Game"
msgstr "Új játék indítása"
@@ -14532,8 +14759,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:1081
-#: client/gui-win32/connectdlg.c:1089 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
+#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
msgid "Update"
msgstr "Frissítés"
@@ -14954,10 +15181,6 @@ msgstr "
msgid "Refresh"
msgstr "Frissítés"
-#: client/gui-win32/cityrep.c:882
-msgid "Select"
-msgstr "Kiválasztás"
-
#: client/gui-win32/cityrep.c:883
msgid "Configure"
msgstr "Beállítás"
@@ -15009,60 +15232,60 @@ msgstr "Nem siker
msgid "Verify Password"
msgstr ""
-#: client/gui-win32/connectdlg.c:912 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr "Freeciv szerver választás"
-#: client/gui-win32/connectdlg.c:913
+#: client/gui-win32/connectdlg.c:915
msgid "Local Area Network"
msgstr ""
-#: client/gui-win32/connectdlg.c:947
+#: client/gui-win32/connectdlg.c:949
#, fuzzy
msgid "Welcome to Freeciv"
msgstr "Egy kliens a Freeciv-hez"
-#: client/gui-win32/connectdlg.c:965
+#: client/gui-win32/connectdlg.c:967
#, fuzzy
msgid "Load Saved Game"
msgstr "Játék elmentése"
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
msgid "Connect To Network Game"
msgstr ""
-#: client/gui-win32/connectdlg.c:977
+#: client/gui-win32/connectdlg.c:979
msgid "Choose a nation to play"
msgstr ""
-#: client/gui-win32/connectdlg.c:1012
+#: client/gui-win32/connectdlg.c:1014
#, 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:1020
+#: client/gui-win32/connectdlg.c:1022
msgid "AI skill level:"
msgstr ""
-#: client/gui-win32/connectdlg.c:1034 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
#, fuzzy
msgid "Game Options"
msgstr "Üzenetbeállítások"
-#: client/gui-win32/connectdlg.c:1038
+#: client/gui-win32/connectdlg.c:1040
msgid "Start Game"
msgstr "Játék indítása"
-#: client/gui-win32/connectdlg.c:1057
+#: client/gui-win32/connectdlg.c:1059
#, fuzzy
msgid "Login:"
msgstr "Légió"
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
msgid "Host:"
msgstr "Gazdagép:"
-#: client/gui-win32/connectdlg.c:1060
+#: client/gui-win32/connectdlg.c:1062
msgid "Port:"
msgstr "Port:"
@@ -15325,10 +15548,6 @@ msgid "(idle %d turn)"
msgid_plural "(idle %d turns)"
msgstr[0] "(%d kör óta tétlen)"
-#: client/gui-win32/plrdlg.c:337 data/Freeciv.in:88
-msgid "Host"
-msgstr "Szerver"
-
#: client/gui-win32/plrdlg.c:355 data/Freeciv.in:3230
msgid "Intelligence"
msgstr "Hírszerzés"
@@ -17079,12 +17298,12 @@ msgstr ""
#: data/helpdata.txt:781
msgid ""
-" To have a diplomatic relationship with another player, you must fist "
-"establish first contact with that player. To establish first contact, you "
-"have to move one of your units next to a city or unit belonging to that "
-"player, or vice versa. Unless you establish an embassy with that player, you "
-"may again lose contact with them after a set number of turns without direct "
-"physical contact."
+" To have a diplomatic relationship with another player, you must first "
+"establish contact with that player. To establish contact, you have to move "
+"one of your units next to a city or unit belonging to that player, or vice "
+"versa. Unless you establish an embassy with that player, you may again lose "
+"contact with them after a set number of turns without direct physical "
+"contact."
msgstr ""
#: data/helpdata.txt:788
@@ -19476,7 +19695,7 @@ msgid "Communism"
msgstr "Kommunizmus"
#: data/default/governments.ruleset:121 data/civ2/governments.ruleset:118
-#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:26
+#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:27
msgid "Comrade"
msgstr "Fõtitkár"
@@ -20370,6 +20589,11 @@ msgid ""
"attacks."
msgstr ""
+#: data/default/units.ruleset:238
+#, fuzzy
+msgid "?unit:Workers"
+msgstr "Munkások"
+
#: data/default/units.ruleset:264
msgid ""
"Workers are one of the key units in the game. They can be used to irrigate "
@@ -20930,6 +21154,11 @@ msgstr "Felfedez
msgid "Explorers are very useful for mapping unknown territory."
msgstr ""
+#: data/default/units.ruleset:1864
+#, fuzzy
+msgid "?unit:Leader"
+msgstr "Vezetõ:"
+
#: data/default/units.ruleset:1892
msgid "This is you. If you lose this unit, you lose the game. So don't."
msgstr ""
@@ -21130,7 +21359,7 @@ msgid "Emir"
msgstr ""
#: data/nation/afghani.ruleset:25 data/nation/slovakian.ruleset:30
-#: data/nation/soviet.ruleset:27
+#: data/nation/soviet.ruleset:28
#, fuzzy
msgid "General Secretary"
msgstr "Elsõ Titkár"
@@ -21254,7 +21483,7 @@ msgstr "?plural:Amerikaiak"
msgid ""
"According to legend, the Armenian people are the descendants of Haik - the "
"great-great-grandson of Noah. The modern Republic of Armenia gained "
-"independence from Soviet in 1991 AD"
+"independence from the Soviet Union in 1991."
msgstr ""
#: data/nation/assyrian.ruleset:3
@@ -22261,12 +22490,11 @@ msgstr "?plural:Olaszok"
#: data/nation/illyrian.ruleset:6
msgid ""
-"Illyrians were Indo-European tribes who appeared in the western part of the "
-"Balkan Peninsula before 1000 BC, including the Dalmatians to the north, "
-"Corcyra island and Ambracia bay in prehistoric Epirus to the south, mixing "
-"with Thracians in Dardania to the east, and settling Messapia across the "
-"Adriatic Sea. Illyrian kingdoms were independent for centuries, until "
-"conquered by the Roman Republic."
+"Illyrians were Indo-European tribes who appeared in the western part of the "
+"Balkan Peninsula before 1000 BC, including Corcyra island and Ambracia bay "
+"in prehistoric Epirus to the south. They mixed with Thracians in Dardania to "
+"the east, and settled Messapia across the Adriatic Sea. Illyrian kingdoms "
+"were independent for centuries, until conquered by the Roman Republic."
msgstr ""
#: data/nation/inca.ruleset:3
@@ -22572,7 +22800,7 @@ msgid ""
"1953."
msgstr ""
-#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:28
+#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:29
#, fuzzy
msgid "Great Leader"
msgstr "Világcsoda"
@@ -22745,9 +22973,9 @@ msgstr "?plural:Olaszok"
msgid ""
"Sub-Saharan Africa has been a cultural and ethnical melting pot for "
"millennia. In medieval times, the region was home to a succession of empires "
-"called the Sahelian kingdoms. Of these, the Islamic Mali empire with it's "
+"called the Sahelian kingdoms. Of these, the Islamic Mali empire with its "
"capital in Timbuktu was the most influential. This empire reigned from the "
-"14th to the 17th century and was famed for it's wealth and benevolent kings. "
+"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 ""
@@ -22816,8 +23044,8 @@ msgstr "?plural:Olaszok"
#: data/nation/mayan.ruleset:6
msgid ""
-"The Mayans were a Mesoamerican civilization. Famous for building great "
-"pyramids and palaces in the jungle."
+"The Mayans were a Mesoamerican civilization. They are famous for building "
+"great pyramids and palaces in the jungle."
msgstr ""
#: data/nation/mayan.ruleset:19
@@ -23340,6 +23568,16 @@ msgid ""
"Czechoslovakia, until 1918 it was part of the Austro-Hungarian Empire."
msgstr ""
+#: data/nation/slovakian.ruleset:26
+#, fuzzy
+msgid "?male:Leader"
+msgstr "Vezetõ:"
+
+#: data/nation/slovakian.ruleset:26
+#, fuzzy
+msgid "?female:Leader"
+msgstr "Fõtitkár"
+
#: data/nation/slovakian.ruleset:29
#, fuzzy
msgid "Pope"
@@ -23384,11 +23622,12 @@ msgstr "?plural:Sk
#: data/nation/soviet.ruleset:6
msgid ""
-"Soviet Union's history starts in November 1917, when under Lenin's "
+"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 "
-"republics integrated into one country. Soviet Union became one of most "
-"powerful states in the 20th century. But by the end of 1991 due to many "
-"social shocks it disintegrated into fifteen independent countries"
+"republics integrated into one country. The Soviet Union became one of most "
+"powerful states in the 20th century, but by the end of 1991 it had "
+"disintegrated into fifteen independent countries due to social and economic "
+"problems."
msgstr ""
#: data/nation/spanish.ruleset:3
@@ -23782,8 +24021,8 @@ msgstr "?plural:Olaszok"
#: data/nation/westphalian.ruleset:6
msgid ""
-"Westphalia, before becoming a Prussian province, was the western region the "
-"duchy of Saxony. Present-day it consists of the Northern part of the largest "
+"Westphalia, before becoming a Prussian province, was the western region of "
+"the duchy of Saxony. Today it makes up the northern part of the largest "
"German federal state, North Rhine-Westphalia."
msgstr ""
@@ -23930,7 +24169,7 @@ msgid ""
"The flag and background color indicate what civilization the city\n"
"belongs to (this will be useful when you meet other civilizations).\n"
"The top row of the bar also shows the name and size of the city, and\n"
-"will show one or more starts to indicate if there are units in the\n"
+"will show one or more stars to indicate if there are units in the\n"
"city. The bottom row shows what the city is building, and how long it\n"
"will take; it also shows how long the city will take to grow to the\n"
"next largest size."
@@ -23986,7 +24225,7 @@ msgid ""
"Now your city has grown to size five. As cities get larger unrest\n"
"becomes a problem. A city of this size will usually have one unhappy\n"
"citizen unless pacifying effects are used; meaning one entertainer\n"
-"specialist is required to keep your citzens content. This is basically\n"
+"specialist is required to keep your citizens content. This is basically\n"
"a wasted citizen.\n"
"\n"
"There are several things that can be done about this. One quick fix\n"
@@ -24058,7 +24297,7 @@ msgid ""
"existing cities. Generally when building new cities you want to make\n"
"sure that all tiles are covered by at least one city, but after that\n"
"it is best that your cities overlap as little as possible. Spreading\n"
-"out cities properly gives each city access to more resrouces, allowing\n"
+"out cities properly gives each city access to more resources, allowing\n"
"them to grow to larger sizes."
msgstr ""
@@ -24372,6 +24611,53 @@ msgstr "Templom"
msgid "Team 31"
msgstr "Templom"
+#, fuzzy
+#~ msgid "Auth config filename \"%s\" not allowed!"
+#~ msgstr "Milyen típusú kapcsolódások engedélyezettek"
+
+#, fuzzy
+#~ msgid "The %s of the %s (%s)"
+#~ msgstr "A(z) %2$s (Államforma: %1$s)"
+
+#, fuzzy
+#~ msgid "%s territory"
+#~ msgstr "A(z) %s"
+
+#, fuzzy
+#~ msgid "%s territory (%d turn cease-fire)"
+#~ msgid_plural "%s territory (%d turn cease-fire)"
+#~ msgstr[0] "Egység: %s(%s%s)"
+
+#, fuzzy
+#~ msgid "%s territory (%s)"
+#~ msgstr "A(z) %2$s (Államforma: %1$s)"
+
+#, fuzzy
+#~ msgid "City: %s (%s)"
+#~ msgstr "Város: %s(%s)"
+
+#, fuzzy
+#~ msgid "Unit: %s (%s)"
+#~ msgstr "Egység: %s(%s)"
+
+#, fuzzy
+#~ msgid "%s of the %s"
+#~ msgstr "A(z) %2$s (Államforma: %1$s)"
+
+#~ msgid "no maximum, "
+#~ msgstr "nincs egységlimit, "
+
+#~ msgid "%d unit maximum, "
+#~ msgid_plural "%d units maximum, "
+#~ msgstr[0] "maximum %d egységig, "
+
+#~ msgid "%d per unit). "
+#~ msgstr "egységenként %d). "
+
+#, fuzzy
+#~ msgid "Select same type"
+#~ msgstr "Válassz egy várost"
+
#~ msgid "Units: "
#~ msgstr "Egységek: "
@@ -24458,10 +24744,6 @@ msgstr "Templom"
#~ msgstr ", nép: %s"
#, fuzzy
-#~ msgid ", team %s"
-#~ msgstr " %s mellett"
-
-#, fuzzy
#~ msgid "_Map"
#~ msgstr "Térképek"
@@ -25458,10 +25740,6 @@ msgstr "Templom"
#~ msgstr "Hiba történt %s MI játékos létrehozása közben."
#, fuzzy
-#~ msgid "Metaserver topic string set to '%s'."
-#~ msgstr "Az infó sor a metaszerveren mostantól '%s'."
-
-#, fuzzy
#~ msgid "Metaserver topic string set to '%s', not reporting to metaserver."
#~ msgstr "Az infó sor a metaszerveren mostantól '%s'."
diff --git a/po/it.gmo b/po/it.gmo
index 8c143b0..233282b 100644
Binary files a/po/it.gmo and b/po/it.gmo differ
diff --git a/po/it.po b/po/it.po
index 0e8570a..7237ca0 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,4 +1,4 @@
-# $Id: it.po 15343 2008-11-30 11:48:06Z dmarks $
+# $Id: it.po 15599 2009-03-24 00:31:07Z dmarks $
#
# |~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~|
# | Italian translations for Freeciv |
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Freeciv 1.14.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 07:45+0900\n"
+"POT-Creation-Date: 2009-03-29 21:13+0900\n"
"PO-Revision-Date: 2007-08-12 15:47+0300\n"
"Last-Translator: Freeciv Italian Team <slug-freeciv at siena.linux.it>\n"
"Language-Team: Italian <slug-freeciv at siena.linux.it>\n"
@@ -652,7 +652,7 @@ msgid "Road"
msgstr "Strada"
#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
-#: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
+#: client/gui-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"
@@ -669,7 +669,7 @@ msgid "Mine"
msgstr "Miniera"
#: common/terrain.c:396 common/unit.c:548 server/report.c:124
-#: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
+#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr "Inquinamento"
@@ -715,7 +715,7 @@ msgstr "Fortificato"
msgid "Sentry"
msgstr "Sentinella"
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:851 client/gui-sdl/menu.c:648
+#: common/unit.c:566 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"
@@ -732,7 +732,7 @@ msgstr "Esplora"
msgid "Transform"
msgstr "Trasforma"
-#: common/unit.c:584 client/text.c:106 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:584 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"
@@ -805,11 +805,11 @@ msgstr "Missile Nucleare"
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1406
+#: common/unittype.c:349 client/helpdata.c:1404
msgid " and "
msgstr " e "
-#: common/unittype.c:355 client/helpdata.c:1392
+#: common/unittype.c:355 client/helpdata.c:1390
msgid "?and:, "
msgstr "?and:, "
@@ -1393,30 +1393,25 @@ msgstr ""
#: server/auth.c:281
#, fuzzy, c-format
-msgid "Auth config filename \"%s\" not allowed!"
-msgstr "Quel nome non è permesso."
-
-#: server/auth.c:286
-#, fuzzy, c-format
msgid "Cannot load auth config file \"%s\"!"
msgstr "Impossibile trovare il file audio %s"
-#: server/auth.c:397
+#: server/auth.c:392
#, c-format
msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
msgstr ""
"Attenzione: l'ospite con nome '%s' è stato preso, utente rinominato a '%s'."
-#: server/auth.c:404
+#: server/auth.c:399
msgid "Guests are not allowed on this server. Sorry."
msgstr "Gli ospiti non sono consentiti su questo server. Spiacente."
-#: server/auth.c:406
+#: server/auth.c:401
#, fuzzy, c-format
msgid "%s was rejected: Guests not allowed."
msgstr "%s è stato rifiutato: capacità non corrispondenti."
-#: server/auth.c:425
+#: server/auth.c:420
#, c-format
msgid ""
"There was an error reading the user database, logging in as guest connection "
@@ -1425,7 +1420,7 @@ msgstr ""
"C'è stato un'errore durante la lettura del database utenti, ingresso "
"consentito come ospite '%s'."
-#: server/auth.c:431
+#: server/auth.c:426
msgid ""
"There was an error reading the user database and guest logins are not "
"allowed. Sorry"
@@ -1433,41 +1428,41 @@ msgstr ""
"C'è stato un'errore durante la lettura del database utenti e l'accesso come "
"ospiti non è consentito. Spiacenti"
-#: server/auth.c:434
+#: server/auth.c:429
#, c-format
msgid "%s was rejected: Database error and guests not allowed."
msgstr ""
-#: server/auth.c:441
+#: server/auth.c:436
#, c-format
msgid "Enter password for %s:"
msgstr "Inserisci la password per %s:"
-#: server/auth.c:450
+#: server/auth.c:445
msgid "Enter a new password (and remember it)."
msgstr "Inserisci una password (e ricordatela!)."
-#: server/auth.c:456
+#: server/auth.c:451
msgid "This server allows only preregistered users. Sorry."
msgstr ""
"Questo server permette l'accesso solo a utenti pre-registrati. Spiacenti"
-#: server/auth.c:459
+#: server/auth.c:454
#, fuzzy, c-format
msgid "%s was rejected: Only preregister users allowed."
msgstr ""
"Questo server permette l'accesso solo a utenti pre-registrati. Spiacenti"
-#: server/auth.c:488 server/auth.c:547
+#: server/auth.c:483 server/auth.c:542
msgid "Sorry, too many wrong tries..."
msgstr "Spiacenti, troppi tentativi sbagliati..."
-#: server/auth.c:489
+#: server/auth.c:484
#, c-format
msgid "%s was rejected: Too many wrong password verifies for new user."
msgstr ""
-#: server/auth.c:505
+#: server/auth.c:500
msgid ""
"Warning: There was an error in saving to the database. Continuing, but your "
"stats will not be saved."
@@ -1475,33 +1470,33 @@ msgstr ""
"Attenzione: C'è stato un errore nel salvare su database. Puoi continuare ma "
"le tue statistiche non saranno salvate."
-#: server/auth.c:549
+#: server/auth.c:544
#, fuzzy, c-format
msgid "%s was rejected: Too many wrong password tries."
msgstr "%s è stato rifiutato: capacità non corrispondenti."
-#: server/auth.c:558
+#: server/auth.c:553
msgid "Your password is incorrect. Try again."
msgstr "La password non è corretta. Riprova."
-#: server/auth.c:569
+#: server/auth.c:564
#, fuzzy
msgid "Sorry, your connection timed out..."
msgstr ""
"spiacente, il comando connect non è ancora stato implementato per le unità "
"aeree."
-#: server/auth.c:571
+#: server/auth.c:566
#, c-format
msgid "%s was rejected: Connection timeout waiting for password."
msgstr ""
-#: server/auth.c:636
+#: server/auth.c:631
#, c-format
msgid "Your password is too short, the minimum length is %d. Try again."
msgstr "La tua password è troppo corta, la lunghezza minima è %d. Riprova."
-#: server/auth.c:642
+#: server/auth.c:637
#, c-format
msgid ""
"The password must have at least %d capital letters, %d numbers, and be at "
@@ -2022,7 +2017,7 @@ msgstr "Questo
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:237 manual/civmanual.c:380
+#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
@@ -2054,14 +2049,14 @@ msgstr ""
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:241
+#: server/civserver.c:217 client/civclient.c:242
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:245
+#: server/civserver.c:221 client/civclient.c:246
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"
@@ -2069,7 +2064,7 @@ msgstr " -d, --debug NUM\tImposta il livello di log per il debug (da 0 a 3)\n"
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:248 manual/civmanual.c:382
+#: server/civserver.c:225 client/civclient.c:249 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"
@@ -2121,11 +2116,11 @@ msgstr " -r, --read FILE\tLegge lo script iniziale FILE\n"
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:267 manual/civmanual.c:383
+#: server/civserver.c:247 client/civclient.c:268 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:279
+#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, fuzzy, c-format
@@ -3401,7 +3396,7 @@ msgstr ""
msgid "Sea moving start units are not yet supported. Nobody gets %s."
msgstr "Unità di mare iniziali non ancora supportate, nessuno ottiene %s."
-#: server/gamehand.c:310 client/text.c:632
+#: server/gamehand.c:310 client/text.c:691
#, c-format
msgid "Year: %s"
msgstr "Anno: %s"
@@ -3688,10 +3683,10 @@ 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
-#, c-format
+#, fuzzy, c-format
msgid ""
-"Your nation is thrust into civil war, %s is declared the leader of the "
-"rebel states."
+"Your nation is thrust into civil war! %s is declared the leader of the rebel "
+"states."
msgstr ""
"la vostra nazione è spinta nella guerra civile; %s è dichiarato capo degli "
"stati ribelli."
@@ -3794,7 +3789,7 @@ msgstr "Velocit
msgid "Literacy"
msgstr "Alfabetizzazione"
-#: server/report.c:121 client/cityrepdata.c:526 client/cityrepdata.c:527
+#: server/report.c:121 client/cityrepdata.c:524 client/cityrepdata.c:525
#: client/gui-sdl/cityrep.c:174
msgid "Production"
msgstr "Produzione"
@@ -3946,7 +3941,7 @@ msgstr ""
"La stringa riguardante la demografia contiene caratteri non validi. Provate "
"\"help demography\"."
-#: server/report.c:743 server/report.c:766
+#: server/report.c:743 server/report.c:768
msgid "Demographics Report:"
msgstr "Rapporto Demografico:"
@@ -3954,10 +3949,12 @@ msgstr "Rapporto Demografico:"
msgid "Sorry, the Demographics report is unavailable."
msgstr "Spiacente, il rapporto demografico non è disponibile."
-#: server/report.c:748
+#. TRANS: <nation adjective> <government name> (<year>).
+#. * E.g. "Polish Despotism (200 AD)".
+#: server/report.c:750
#, fuzzy, c-format
-msgid "The %s of the %s (%s)"
-msgstr "La %s degli %s"
+msgid "%s %s (%s)"
+msgstr "%s a %s (%s)\n"
#. TRANS: message about an installation error.
#: server/ruleset.c:163
@@ -4015,16 +4012,6 @@ msgstr ""
msgid "%s had invalid nation; changing to %s."
msgstr ""
-#. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4073
-#, fuzzy, c-format
-msgid ""
-"Illegal alliance structure detected: %s alliance to %s reduced to peace "
-"treaty."
-msgstr ""
-"Trovata relazione di alleanza illegale: l'alleanza di %s con %s è ridotta ad "
-"un trattato di pace."
-
#: server/settings.c:32
msgid "Geological"
msgstr "Geologica"
@@ -5297,9 +5284,10 @@ msgid "Auto-save name prefix"
msgstr "Prefisso per i nomi dei salvataggi automatici"
#: server/settings.c:1016
+#, fuzzy
msgid ""
-"Automatically saved games will have name \"<prefix><year>.sav\". This "
-"setting sets the <prefix> part."
+"Automatically saved games will have name \"<prefix>-T<turn>-Y<year>.sav\". "
+"This setting sets the <prefix> part."
msgstr ""
"I giochi salvati automaticamente avranno nome \"<prefisso><anno>.sav\"."
"Questa opzione imposta la parte <prefisso>."
@@ -5318,11 +5306,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:147
+#: server/sernet.c:150
msgid "Server cannot read standard input. Ignoring input."
msgstr "Il server non può leggere l'ingresso standard. Ignoro l'ingresso."
-#: server/sernet.c:922
+#: server/sernet.c:929
#, c-format
msgid "Server: bad address: [%s:%d]."
msgstr "Metaserver: indirizzo errato: [%s:%d]."
@@ -5454,114 +5442,114 @@ msgstr ""
"Il tuo compagno di squadra %s ha dichiarato guerra a %s. Sei obbligato a "
"cancellare l'alleanza con %s."
-#: server/srv_main.c:928
+#: server/srv_main.c:961
#, c-format
msgid "Failed saving game as %s"
msgstr "Ho fallito nel salvataggio del gioco come %s"
-#: server/srv_main.c:930
+#: server/srv_main.c:963
#, c-format
msgid "Game saved as %s"
msgstr "Gioco salvato come %s"
-#: server/srv_main.c:962
+#: server/srv_main.c:994
msgid "The game is already running."
msgstr "Il gioco sta già girando."
-#: server/srv_main.c:970
+#: server/srv_main.c:1002
#, c-format
msgid "%s lost control cmdlevel on game start. Use voting from now on."
msgstr ""
-#: server/srv_main.c:977
+#: server/srv_main.c:1009
msgid "Starting game."
msgstr "Inizio gioco."
-#: server/srv_main.c:1039
+#: server/srv_main.c:1071
#, c-format
msgid "request for unknown report (type %d)"
msgstr "richiesta per rapporto sconosciuto (tipo %d)"
-#: server/srv_main.c:1104
+#: server/srv_main.c:1136
#, c-format
msgid "Warning: rejecting old client %s"
msgstr "Attenzione: vecchio client %s rifiutato"
-#: server/srv_main.c:1206
+#: server/srv_main.c:1238
#, 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:1306
+#: server/srv_main.c:1338
msgid "Please choose a non-blank name."
msgstr "Per favore scegliete un nome non vuoto."
-#: server/srv_main.c:1322
+#: server/srv_main.c:1354
msgid "That nation is already in use."
msgstr "Quella nazione è già in uso."
-#: server/srv_main.c:1338
+#: server/srv_main.c:1370
#, 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:1359
+#: server/srv_main.c:1391
msgid "Please choose a name containing only ASCII characters."
msgstr "Per favore scegliete un nome contenente solo caratteri ASCII."
-#: server/srv_main.c:1458
+#: server/srv_main.c:1490
#, c-format
msgid "%s nation is not available in this scenario."
msgstr ""
-#: server/srv_main.c:1464
+#: server/srv_main.c:1496
#, fuzzy, c-format
msgid "%s nation is already in use."
msgstr "Quella nazione è già in uso."
-#: server/srv_main.c:1482
+#: server/srv_main.c:1514
#, c-format
msgid "%s is the %s ruler %s."
msgstr "%s è il governatore %s %s."
-#: server/srv_main.c:1538
+#: server/srv_main.c:1570
#, 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:1582 server/srv_main.c:1586
+#: server/srv_main.c:1614 server/srv_main.c:1618
#, 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:1728
+#: server/srv_main.c:1760
#, c-format
msgid "Player %d"
msgstr "Giocatore %d"
-#: server/srv_main.c:1739 server/srv_main.c:1745
+#: server/srv_main.c:1771 server/srv_main.c:1777
#, c-format
msgid "%s rules the %s."
msgstr "%s guida gli %s."
-#: server/srv_main.c:1910
+#: server/srv_main.c:1942
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
msgstr ""
-#: server/srv_main.c:1961
+#: server/srv_main.c:1993
#, c-format
msgid "Sending info to metaserver [%s]"
msgstr "Sto mandando informazioni al metaserver [%s]"
-#: server/srv_main.c:1992
+#: server/srv_main.c:2024
msgid "The game is over..."
msgstr "il gioco è finito..."
-#: server/srv_main.c:2205
+#: server/srv_main.c:2237
msgid "Now accepting new client connections."
msgstr "Da ora sono accettate nuove connessioni dai client."
@@ -6399,24 +6387,24 @@ msgid "Barbarian"
msgstr "Barbaro"
#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2030 client/gui-sdl/plrdlg.c:645
+#: client/gui-gtk-2.0/pages.c:2102 client/gui-sdl/plrdlg.c:645
#: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
msgid "AI"
msgstr "IA"
#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
+#: 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
msgid "Human"
msgstr "Umano"
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
-#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
+#: 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
msgid "Alive"
msgstr "Vivo"
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
#: client/gui-win32/connectdlg.c:200
msgid "Dead"
msgstr "Morto"
@@ -6692,9 +6680,9 @@ 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:242
-#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
-#: client/text.c:1201
+#: 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
#, c-format
msgid "?clistmore:, %s"
msgstr ", %s"
@@ -6951,7 +6939,7 @@ msgstr "solo i %s possono attaccare dal mare."
msgid "Cannot attack from sea."
msgstr "impossibile attaccare dal mare."
-#: server/unithand.c:996 server/unittools.c:2103
+#: server/unithand.c:996 server/unittools.c:2137
msgid "Cannot attack unless you declare war first."
msgstr "impossibile attaccare finché non dichiarate guerra."
@@ -7054,102 +7042,102 @@ msgid "%s was upgraded for free to %s."
msgstr "%s aggiornato gratuitamente a %s."
#: server/unittools.c:297
-#, c-format
-msgid "Not enough gold. %s disbanded"
+#, fuzzy, c-format
+msgid "Not enough gold to pay upkeep for %s. Unit disbanded."
msgstr "Auri insufficienti. %s congedato"
-#: server/unittools.c:342
+#: server/unittools.c:343
#, c-format
msgid "Your %s has run out of hit points."
msgstr "il vostro %s ha finito i punti vita."
-#: server/unittools.c:358
+#: server/unittools.c:359
#, c-format
msgid "Your %s has been lost on the high seas."
msgstr "la vostra %s è stata persa in alto mare."
-#: server/unittools.c:365
+#: server/unittools.c:366
#, c-format
msgid "Your %s survived on the high seas and became more experienced!"
msgstr "la vostra %s è sopravvissuta in alto mare ed è diventata più esperta."
-#: server/unittools.c:376
+#: server/unittools.c:377
#, c-format
msgid "Your %s has been lost on unsafe terrain."
msgstr "la vostra %s è stata persa su un terreno insicuro."
-#: server/unittools.c:430
+#: server/unittools.c:431
#, c-format
msgid "Your %s has returned to refuel."
msgstr "il vostro %s è tornato per rifornirsi."
-#: server/unittools.c:454
+#: server/unittools.c:455
#, c-format
msgid "Your %s has run out of fuel."
msgstr "il vostro %s ha esaurito il carburante."
-#. TRANS: And, <the unit> became ...
-#: server/unittools.c:616
-#, fuzzy
-msgid "And, became more experienced!"
-msgstr " ed è diventato più esperto!"
-
#. TRANS: Your <unit> became ...
-#: server/unittools.c:620
+#: server/unittools.c:619
#, c-format
msgid "Your %s became more experienced!"
msgstr "Il vostro %s è diventato più esperto!"
-#: server/unittools.c:1011
+#: server/unittools.c:1009
#, c-format
msgid "Teleported your %s to %s."
msgstr "il vostro %s è stato teletrasportato a %s."
-#: server/unittools.c:1041
+#. TRANS: A unit is moved to resolve stack conflicts.
+#: server/unittools.c:1065
+#, fuzzy, c-format
+msgid "Moved your %s."
+msgstr "il vostro %s è stato congedato."
+
+#: server/unittools.c:1076
#, c-format
msgid "Disbanded your %s."
msgstr "il vostro %s è stato congedato."
-#: server/unittools.c:1363
+#: server/unittools.c:1397
#, 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:1367
+#: server/unittools.c:1401
#, 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:1469
+#: server/unittools.c:1503
#, 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:1478
+#: server/unittools.c:1512
#, c-format
msgid "%s lost when %s was lost."
msgstr "%s perso a causa della perdita di %s."
-#: server/unittools.c:1527
+#: server/unittools.c:1561
#, 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:1545
+#: server/unittools.c:1579
#, 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:1554 server/unittools.c:1612
+#: server/unittools.c:1588 server/unittools.c:1646
#, 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:1588
+#: server/unittools.c:1622
#, fuzzy, c-format
msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
msgid_plural ""
@@ -7159,14 +7147,14 @@ msgstr[1] "l'attacco del vostro %1$s
#. TRANS: "Cannon lost when the Polish Destroyer
#. * attacked the German Musketeers."
-#: server/unittools.c:1621
+#: server/unittools.c:1655
#, 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:1636
+#: server/unittools.c:1670
#, 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."
@@ -7174,7 +7162,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:1646
+#: server/unittools.c:1680
#, 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."
@@ -7184,197 +7172,197 @@ 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:1660
+#: server/unittools.c:1694
#, 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:1928
+#: server/unittools.c:1962
#, c-format
msgid "Your %s was nuked by %s."
msgstr "il vostro %s è stato ucciso con un ordigno nucleare da %s."
-#: server/unittools.c:1931 server/unittools.c:1947
+#: server/unittools.c:1965 server/unittools.c:1981
msgid "yourself"
msgstr "te stesso"
-#: server/unittools.c:1935
+#: server/unittools.c:1969
#, 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:1944
+#: server/unittools.c:1978
#, c-format
msgid "%s was nuked by %s."
msgstr "%s è stata distrutta con un ordigno nucleare da %s."
-#: server/unittools.c:1952
+#: server/unittools.c:1986
#, c-format
msgid "You nuked %s."
msgstr "avete distrutto %s con un ordigno nucleare."
-#: server/unittools.c:1993
+#: server/unittools.c:2027
#, fuzzy, c-format
msgid "The %s detonated a nuke!"
msgstr "gli %s hanno fatto esplodere una bomba nucleare."
-#: server/unittools.c:2017
+#: server/unittools.c:2051
#, c-format
msgid "%s transported successfully."
msgstr "%s trasportato con successo."
-#: server/unittools.c:2069
+#: server/unittools.c:2103
msgid "This unit type can not be paradropped."
msgstr "questo tipo di unità non può essere paracadutato."
-#: server/unittools.c:2079
+#: server/unittools.c:2113
#, fuzzy
msgid "You cannot paradrop a unit that is transporting other units."
msgstr "impossibile paracadutare un'unità cargo."
-#: server/unittools.c:2085
+#: server/unittools.c:2119
msgid "The destination location is not known."
msgstr "la posizione della destinazione non è conosciuta."
-#: server/unittools.c:2092
+#: server/unittools.c:2126
#, fuzzy, c-format
msgid "This unit cannot paradrop into %s."
msgstr "impossibile paracadutare nell'oceano."
-#: server/unittools.c:2112
+#: server/unittools.c:2146
#, 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:2123
+#: server/unittools.c:2157
#, 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:2136
+#: server/unittools.c:2170
#, 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:2158
+#: server/unittools.c:2192
#, c-format
msgid "You found %d gold."
msgstr "avete trovato %d auri."
-#: server/unittools.c:2175
+#: server/unittools.c:2209
#, c-format
msgid "You found %s in ancient scrolls of wisdom."
msgstr "avete trovato %s in delle antiche pergamene di saggezza."
-#: server/unittools.c:2182
+#: server/unittools.c:2216
#, 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:2196
+#: server/unittools.c:2230
msgid "A band of friendly mercenaries joins your cause."
msgstr "una banda di mercenari amichevoli si unisce alla vostra causa."
-#: server/unittools.c:2214
+#: server/unittools.c:2248
msgid "An abandoned village is here."
msgstr "qui c'è un villaggio abbandonato."
-#: server/unittools.c:2224
+#: server/unittools.c:2258
msgid "You have unleashed a horde of barbarians!"
msgstr "avete scatenato un'orda di barbari!"
-#: server/unittools.c:2227
+#: server/unittools.c:2261
#, c-format
msgid "Your %s has been killed by barbarians!"
msgstr "il vostro %s è stato ucciso dai barbari!"
-#: server/unittools.c:2243
+#: server/unittools.c:2277
msgid "You found a friendly city."
msgstr "Avete fondato una città."
-#: server/unittools.c:2257
+#: server/unittools.c:2291
msgid "Friendly nomads are impressed by you, and join you."
msgstr "avete impressionato dei nomadi amichevoli, che si uniscono a voi."
-#: server/unittools.c:2282
+#: server/unittools.c:2316
msgid "Your overflight frightens the tribe; they scatter in terror."
msgstr "il vostro sorvolo ha atterrito la tribù, che fugge terrorizzata."
-#: server/unittools.c:2540
+#: server/unittools.c:2574
#, 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:2989
+#: server/unittools.c:3023
#, 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:3041
+#: server/unittools.c:3075
#, 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:3054
+#: server/unittools.c:3088
#, 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:3068
+#: server/unittools.c:3102
#, 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:3078
+#: server/unittools.c:3112
#, 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:3104
+#: server/unittools.c:3138
#, 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:3145
+#: server/unittools.c:3179
#, fuzzy, c-format
msgid "Attempt to change homecity for %s failed."
msgstr "la città d'origine di %s è diventata %s."
-#: server/unittools.c:3156
+#: server/unittools.c:3190
#, c-format
msgid "Attempt to establish trade route for %s failed."
msgstr ""
-#: server/unittools.c:3168
+#: server/unittools.c:3202
#, c-format
msgid "Attempt to build wonder for %s failed."
msgstr ""
-#: server/unittools.c:3177
+#: server/unittools.c:3211
#, c-format
msgid "Your %s has invalid orders."
msgstr "il vostro %s ha degli ordini non consentiti."
-#: server/generator/mapgen.c:1737
+#: server/generator/mapgen.c:1771
msgid "High landmass - this may take a few seconds."
msgstr "Valore di landmass alto - questo potrebbe richiedere alcuni secondi."
-#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
+#: server/generator/mapgen.c:1969 server/generator/mapgen.c:2039
#, c-format
msgid "Falling back to generator %d."
msgstr "Utilizzo invece il generatore %d."
-#: server/generator/mapgen.c:2025
+#: server/generator/mapgen.c:2059
msgid "Generator 3 didn't place all big islands."
msgstr "Il generatore 3 non ha posizionato tutte le isole grandi."
-#: server/generator/mapgen.c:2054
+#: server/generator/mapgen.c:2088
#, c-format
msgid "Generator 3 left %li landmass unplaced."
msgstr "Il generatore 3 ha lasciato %li terre non piazzate."
@@ -7486,7 +7474,7 @@ msgid_plural "%3d turns"
msgstr[0] "%3d turno"
msgstr[1] "%3d turni"
-#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:631
#: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
@@ -7606,355 +7594,355 @@ msgstr "?city_state:Pace"
msgid "(worklist)"
msgstr "(lista lavori)"
-#: client/cityrepdata.c:447
-msgid "Special"
-msgstr "Specialisti"
+#: client/cityrepdata.c:446
+msgid "?city:Name"
+msgstr "?city:Nome"
-#: client/cityrepdata.c:448
-msgid "?entertainers/scientists/taxmen:E/S/T"
-msgstr "?entertainers/scientists/taxmen:An/Sc/Es"
+#: client/cityrepdata.c:446 client/gui-sdl/cityrep.c:169
+msgid "City Name"
+msgstr "Nome città"
-#: client/cityrepdata.c:449
-msgid "Entertainers, Scientists, Taxmen"
-msgstr "Animatori, Scienziati, Esattori"
+#: client/cityrepdata.c:448
+msgid "?size [short]:Sz"
+msgstr "?size:Dim"
-#: client/cityrepdata.c:452
-#, fuzzy
-msgid "Concise + Rapture, - Disorder"
-msgstr "Abbreviato + Entusiasmo, - Sommossa"
+#: client/cityrepdata.c:448
+msgid "Size"
+msgstr "Dimensione"
-#: client/cityrepdata.c:454 client/plrdlg_common.c:261
+#: client/cityrepdata.c:450 client/plrdlg_common.c:261
#: client/gui-win32/plrdlg.c:337
msgid "State"
msgstr "Stato"
-#: client/cityrepdata.c:454
+#: client/cityrepdata.c:450
msgid "Rapture/Peace/Disorder"
msgstr "Entusiasmo/Pace/Sommossa"
+#: client/cityrepdata.c:452
+#, fuzzy
+msgid "Concise *=Rapture, X=Disorder"
+msgstr "Abbreviato + Entusiasmo, - Sommossa"
+
+#: client/cityrepdata.c:456
+msgid "Special"
+msgstr "Specialisti"
+
#: client/cityrepdata.c:457
+msgid "?entertainers/scientists/taxmen:E/S/T"
+msgstr "?entertainers/scientists/taxmen:An/Sc/Es"
+
+#: client/cityrepdata.c:458
+msgid "Entertainers, Scientists, Taxmen"
+msgstr "Animatori, Scienziati, Esattori"
+
+#: client/cityrepdata.c:461
msgid "?Happy workers:H"
msgstr "?Happy workers:Co"
-#: client/cityrepdata.c:457
+#: client/cityrepdata.c:461
msgid "Workers: Happy"
msgstr "Lavoratori: Contenti"
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
msgid "?Content workers:C"
msgstr "?Content workers:So"
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
msgid "Workers: Content"
msgstr "Lavoratori: Soddisfatti"
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
msgid "?Unhappy workers:U"
msgstr "?Unhappy workers:Sc"
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
msgid "Workers: Unhappy"
msgstr "Lavoratori: Scontenti"
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
msgid "?Angry workers:A"
msgstr "?Angry workers:Ar"
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
msgid "Workers: Angry"
msgstr "Lavoratori: Arrabbiati"
-#: client/cityrepdata.c:465 client/gui-xaw/citydlg.c:2401
-#: data/default/units.ruleset:238
-msgid "Workers"
+#: client/cityrepdata.c:469 client/gui-xaw/citydlg.c:2402
+#, fuzzy
+msgid "?city:Workers"
msgstr "Lavoratori"
-#: client/cityrepdata.c:466
+#: client/cityrepdata.c:470
msgid "?happy/content/unhappy/angry:H/C/U/A"
msgstr "?happy/content/unhappy/angry:Co/So/Sc/Ar"
-#: client/cityrepdata.c:467
+#: client/cityrepdata.c:471
msgid "Workers: Happy, Content, Unhappy, Angry"
msgstr "Lavoratori: Contenti, Soddisfatti, Scontenti, Arrabbiati"
-#: client/cityrepdata.c:470 client/cityrepdata.c:472
+#: client/cityrepdata.c:474 client/cityrepdata.c:476
msgid "Best"
msgstr "Migliore"
-#: client/cityrepdata.c:470
+#: client/cityrepdata.c:474
msgid "attack"
msgstr "attacco"
-#: client/cityrepdata.c:471
+#: client/cityrepdata.c:475
msgid "Best attacking units"
msgstr "La migliore unità d'attacco"
-#: client/cityrepdata.c:472
+#: client/cityrepdata.c:476
msgid "defense"
msgstr "difesa"
-#: client/cityrepdata.c:473
+#: client/cityrepdata.c:477
msgid "Best defending units"
msgstr "La migliore unità di difesa"
-#: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
-#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
-#: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
-#: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
-#: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
-#: client/gui-win32/menu.c:351 client/gui-win32/repodlgs.c:616
-#: client/gui-win32/repodlgs.c:707 client/gui-win32/repodlgs.c:716
-#: client/gui-xaw/menu.c:157 client/gui-xaw/menu.c:219
-#: client/gui-xaw/menu.c:242 client/gui-xaw/repodlgs.c:881
-#: client/gui-xaw/repodlgs.c:1069 data/Freeciv.in:1895 data/helpdata.txt:909
+#: client/cityrepdata.c:478 client/cityrepdata.c:482
+#: client/gui-gtk-2.0/cityrep.c:1437 client/gui-gtk-2.0/cityrep.c:1456
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-gtk-2.0/cityrep.c:1494
+#: client/gui-gtk-2.0/cityrep.c:1514 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/repodlgs.c:960 client/gui-sdl/helpdlg.c:688
+#: client/gui-sdl/mapctrl.c:1605 client/gui-sdl/optiondlg.c:1827
+#: client/gui-sdl/repodlgs.c:356 client/gui-win32/menu.c:351
+#: client/gui-win32/repodlgs.c:616 client/gui-win32/repodlgs.c:707
+#: client/gui-win32/repodlgs.c:716 client/gui-xaw/menu.c:157
+#: client/gui-xaw/menu.c:219 client/gui-xaw/menu.c:242
+#: client/gui-xaw/repodlgs.c:881 client/gui-xaw/repodlgs.c:1069
+#: data/Freeciv.in:1895 data/helpdata.txt:909
msgid "Units"
msgstr "Unità"
#. TRANS: Header "Number of units inside city"
-#: client/cityrepdata.c:476
+#: client/cityrepdata.c:480
#, fuzzy
msgid "?Present (units):Here"
msgstr "?Presnt (units):Pre"
-#: client/cityrepdata.c:477
+#: client/cityrepdata.c:481
msgid "Number of units present"
msgstr "Numero di unità presenti"
#. TRANS: Header "Number of units supported by given city"
-#: client/cityrepdata.c:480
+#: client/cityrepdata.c:484
#, fuzzy
msgid "?Supported (units):Owned"
msgstr "?Supported (units):Sup"
-#: client/cityrepdata.c:481
+#: client/cityrepdata.c:485
msgid "Number of units supported"
msgstr "Numero di unità supportate"
#. TRANS: Header "It will take this many turns before city grows"
-#: client/cityrepdata.c:484
+#: client/cityrepdata.c:488
#, fuzzy
msgid "?food (population):Grow"
msgstr "Crescita"
-#: client/cityrepdata.c:485 client/cityrepdata.c:530
+#: client/cityrepdata.c:489 client/cityrepdata.c:528
#, fuzzy
msgid "?Stock/Target:(Have/Need)"
msgstr "(costruito/totale)"
-#: client/cityrepdata.c:486
+#: client/cityrepdata.c:490
msgid "Turns until growth/famine"
msgstr "Turni prima della crescita/carestia"
-#: client/cityrepdata.c:488
-msgid "?size [short]:Sz"
-msgstr "?size:Dim"
-
-#: client/cityrepdata.c:488
-msgid "Size"
-msgstr "Dimensione"
-
-#: client/cityrepdata.c:492
-msgid "?city:Name"
-msgstr "?city:Nome"
-
-#: client/cityrepdata.c:492 client/gui-sdl/cityrep.c:169
-msgid "City Name"
-msgstr "Nome città"
-
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
msgid "Surplus"
msgstr "Surplus"
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
msgid "?food/production/trade:F/P/T"
msgstr "?food/production/trade:Ci/Pr/Co"
-#: client/cityrepdata.c:496
+#: client/cityrepdata.c:494
msgid "Surplus: Food, Production, Trade"
msgstr "Surplus: Cibo, Produzione, Commercio"
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
#, fuzzy
msgid "?Food surplus [short]:+F"
msgstr "?Food surplus [short]:+Ci"
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
msgid "Surplus: Food"
msgstr "Surplus: Cibo"
-#: client/cityrepdata.c:500
+#: client/cityrepdata.c:498
#, fuzzy
msgid "?Production surplus [short]:+P"
msgstr "?Production surplus [short]:+Pr"
-#: client/cityrepdata.c:501
+#: client/cityrepdata.c:499
msgid "Surplus: Production"
msgstr "Surplus: Produzione"
-#: client/cityrepdata.c:502
+#: client/cityrepdata.c:500
#, fuzzy
msgid "?Production loss (waste) [short]:-P"
msgstr "-Pr"
-#: client/cityrepdata.c:503
+#: client/cityrepdata.c:501
msgid "Waste"
msgstr "Spreco"
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
#, fuzzy
msgid "?Trade surplus [short]:+T"
msgstr "?Trade surplus [short]:+Co"
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
msgid "Surplus: Trade"
msgstr "Surplus: Commercio"
-#: client/cityrepdata.c:506
+#: client/cityrepdata.c:504
#, fuzzy
msgid "?Trade loss (corruption) [short]:-T"
msgstr "-Co"
-#: client/cityrepdata.c:507
+#: client/cityrepdata.c:505
msgid "Corruption"
msgstr "Corruzione"
-#: client/cityrepdata.c:509 client/gui-gtk-2.0/repodlgs.c:654
+#: client/cityrepdata.c:507 client/gui-gtk-2.0/repodlgs.c:654
#: client/gui-sdl/mapctrl.c:1400 client/gui-win32/repodlgs.c:334
#: client/gui-xaw/menu.c:222 client/gui-xaw/repodlgs.c:644
#: client/gui-xaw/repodlgs.c:773 data/Freeciv.in:1819
msgid "Economy"
msgstr "Economia"
-#: client/cityrepdata.c:509
+#: client/cityrepdata.c:507
msgid "?gold/luxury/science:G/L/S"
msgstr "?gold/luxury/science:Au/Lu/Sc"
-#: client/cityrepdata.c:510
+#: client/cityrepdata.c:508
msgid "Economy: Gold, Luxuries, Science"
msgstr "Economia: Auri, Lusso, Scienza"
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
msgid "?Gold:G"
msgstr "?Gold:Au"
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
msgid "Economy: Gold"
msgstr "Economia: Auri"
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
msgid "?Luxury:L"
msgstr "?Luxury:Lu"
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
msgid "Economy: Luxury"
msgstr "Economia: Lusso"
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
msgid "?Science:S"
msgstr "?Science:Sc"
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
msgid "Economy: Science"
msgstr "Economia: Scienza"
-#: client/cityrepdata.c:518
+#: client/cityrepdata.c:516
#, fuzzy
msgid "?number_trade_routes:n"
msgstr "?number_trade_routes:n"
-#: client/cityrepdata.c:518
+#: client/cityrepdata.c:516
#, fuzzy
msgid "?number_trade_routes:R"
msgstr "?number_trade_routes:I"
-#: client/cityrepdata.c:519
+#: client/cityrepdata.c:517
msgid "Number of Trade Routes"
msgstr "Numero di rotte commerciali"
-#: client/cityrepdata.c:521
+#: client/cityrepdata.c:519
msgid "?pollution [short]:Pol"
msgstr "?pollution [short]:Inq"
-#: client/cityrepdata.c:523
+#: client/cityrepdata.c:521
#, fuzzy
msgid "?cma:Governor"
msgstr "Governatore"
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
-#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
-#: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
-#: data/Freeciv.in:1459 data/helpdata.txt:820
+#: client/cityrepdata.c:521 client/gui-gtk-2.0/cityrep.c:1766
+#: client/gui-sdl/citydlg.c:3809 client/gui-sdl/cma_fe.c:858
+#: client/gui-win32/citydlg.c:726 data/Freeciv.in:1459 data/helpdata.txt:820
#, fuzzy
msgid "Citizen Governor"
msgstr "Governatore"
-#: client/cityrepdata.c:526
+#: client/cityrepdata.c:524
#, fuzzy
msgid "Turns/Buy"
msgstr "turni/costo"
-#: client/cityrepdata.c:529 client/cityrepdata.c:531
+#: client/cityrepdata.c:527 client/cityrepdata.c:529
msgid "Currently Building"
msgstr "Costruzione in corso"
-#: client/cityrepdata.c:575
+#: client/cityrepdata.c:573
#, fuzzy
msgid "?specialist:S"
msgstr "?Risorse speciali:S"
-#: client/cityrepdata.c:578
+#: client/cityrepdata.c:576
#, fuzzy
msgid "Specialists"
msgstr "Risorse speciali"
-#: client/civclient.c:239
+#: client/civclient.c:240
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr " -a, --autoconnect\tSalta la finestra di collegamento\n"
-#: client/civclient.c:249
+#: client/civclient.c:250
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:251
+#: client/civclient.c:252
msgid " -m, --meta HOST\tConnect to the metaserver at HOST\n"
msgstr " -m, --meta HOST\tSi collega al metaserver HOST\n"
-#: client/civclient.c:253
+#: client/civclient.c:254
msgid " -n, --name NAME\tUse NAME as name\n"
msgstr " -n, --name NOME\tUsa NOME come nome utente\n"
-#: client/civclient.c:255
+#: client/civclient.c:256
#, 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:257
+#: client/civclient.c:258
#, 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:259
+#: client/civclient.c:260
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:262
+#: client/civclient.c:263
#, 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:264
+#: client/civclient.c:265
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:265
+#: client/civclient.c:266
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:268
+#: client/civclient.c:269
#, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -7964,145 +7952,155 @@ msgstr ""
"\t\t\tProva \"%s -- --help\" per maggiori informazioni.\n"
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:273
+#: client/civclient.c:274
#, fuzzy, c-format
msgid "Report bugs at %s\n"
msgstr "Riferite i bug a <%s>.\n"
-#: client/civclient.c:297
+#: client/civclient.c:298
#, 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:299 client/civclient.c:314
+#: client/civclient.c:300 client/civclient.c:315
msgid "Try using --help.\n"
msgstr "Prova ad usare --help.\n"
-#: client/civclient.c:312
+#: client/civclient.c:313
#, 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:325
+#: client/civclient.c:326
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr "Opzione sconosciuta: \"%s\"\n"
-#: client/civclient.c:539
+#: client/civclient.c:391
+#, fuzzy, c-format
+msgid "Updating old metaserver address \"%s\"."
+msgstr "metaserver <indirizzo>"
+
+#: client/civclient.c:394
+#, fuzzy, c-format
+msgid "Default metaserver has been set to \"%s\"."
+msgstr "Opzione: %s è stata impostata a \"%s\"."
+
+#: client/civclient.c:550
msgid "Game started."
msgstr "Gioco iniziato"
-#: client/civclient.c:577
+#: client/civclient.c:588
msgid "There was an error while auto connecting; aborting."
msgstr "C'è stato un errore durante l'auto connessione; abortito."
-#: client/climisc.c:176
+#: client/climisc.c:177
#, c-format
msgid "Changing production of every %s into %s."
msgstr "cambiamento della produzione di ogni %s in %s."
-#: client/climisc.c:214
+#: client/climisc.c:215
msgid "?embassy:Both"
msgstr "?embassy:Entrambi"
-#: client/climisc.c:216
+#: client/climisc.c:217
msgid "?embassy:Yes"
msgstr "?embassy:Sì"
-#: client/climisc.c:219
+#: client/climisc.c:220
msgid "?embassy:With Us"
msgstr "?embassy:Da noi"
-#: client/climisc.c:222
+#: client/climisc.c:223
msgid "?embassy:Contact"
msgstr "?embassy:Contatto"
-#: client/climisc.c:224
+#: client/climisc.c:225
msgid "?embassy:No Contact"
msgstr "?embassy:Nessun contatto"
-#: client/climisc.c:236
+#: client/climisc.c:237
msgid "?vision:Both"
msgstr "?vision:Entrambi"
-#: client/climisc.c:238
+#: client/climisc.c:239
msgid "?vision:To Them"
msgstr "?vision:A loro"
-#: client/climisc.c:241
+#: client/climisc.c:242
msgid "?vision:To Us"
msgstr "?vision:A noi"
-#: client/climisc.c:257 client/climisc.c:264
+#: client/climisc.c:258 client/climisc.c:265
#, c-format
msgid "The %s give %s"
msgstr "Gli %s danno %s"
-#: client/climisc.c:268
+#: client/climisc.c:269
#, c-format
msgid "The %s give unknown city."
msgstr "Gli %s danno una città sconosciuta."
-#: client/climisc.c:273
+#: client/climisc.c:274
#, c-format
msgid "The %s give %d gold"
msgstr "Gli %s danno %d auri"
-#: client/climisc.c:278
+#: client/climisc.c:279
#, c-format
msgid "The %s give their worldmap"
msgstr "Gli %s danno la loro mappa del mondo"
-#: client/climisc.c:282
+#: client/climisc.c:283
#, c-format
msgid "The %s give their seamap"
msgstr "Gli %s danno la loro mappa dei mari"
-#: client/climisc.c:286
+#: client/climisc.c:287
msgid "The parties agree on a cease-fire"
msgstr "Le parti si accordano per un cessate-il-fuoco"
-#: client/climisc.c:289
+#: client/climisc.c:290
msgid "The parties agree on a peace"
msgstr "Le parti si accordano per una pace"
-#: client/climisc.c:292
+#: client/climisc.c:293
msgid "The parties create an alliance"
msgstr "Le parti creano un'alleanza"
-#: client/climisc.c:295
+#: client/climisc.c:296
#, c-format
msgid "The %s give shared vision"
msgstr "Gli %s danno la visione in comune"
-#: client/climisc.c:299
+#: client/climisc.c:300
#, c-format
msgid "The %s give an embassy"
msgstr "Gli %s concedono un'ambasciata"
-#: client/climisc.c:902
+#: client/climisc.c:906
msgid "Popup Request"
msgstr "Finestra messaggio"
-#: client/climisc.c:932
+#: client/climisc.c:936
msgid "Exporting output window to civgame.log ..."
msgstr "Salvataggio della finestra messaggi in civgame.log ..."
-#: client/climisc.c:936
+#: client/climisc.c:940
msgid "Export complete."
msgstr "Salvataggio completato."
-#: client/climisc.c:938
+#: client/climisc.c:942
msgid "Export failed, couldn't write to file."
msgstr "Salvataggio fallito, impossibile scrivere sul file."
-#: client/climisc.c:1038
+#: client/climisc.c:1042
#, c-format
msgid "You don't buy %s in %s!"
msgstr "non avete comprato %s a %s!"
-#: client/climisc.c:1056
+#: client/climisc.c:1060
#, c-format
msgid "%s costs %d gold and you only have %d gold."
msgstr "%s costa %d auri e voi avete solo %d auri."
@@ -8152,19 +8150,19 @@ msgstr ""
"Collegamento automatico al server \"%s\" alla porta %d come \"%s\" ogni %f "
"secondi per %d volte"
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1289
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
msgid "novice"
msgstr "novizio"
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1289
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1358
msgid "easy"
msgstr "facile"
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1290
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
msgid "normal"
msgstr "normale"
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1290
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
msgid "hard"
msgstr "difficile"
@@ -8193,42 +8191,45 @@ msgid "We probably couldn't start it from here."
msgstr "Probabilmente non è possibile farlo partire da qui."
#: client/connectdlg_common.c:470
-msgid "We have control of the server (command access level hack)"
+#, 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
-msgid "We can't take control of server, attempting to kill it."
+msgid ""
+"Failed to obtain the required access level to take control of the server. "
+"The server will now be shutdown."
msgstr ""
-"Non è possibile prendere il controllo del server, tentativo di fermarlo."
-#: client/control.c:1104
+#: client/control.c:1123
msgid "Only transporter units can be unloaded."
msgstr "solo le unità cargo possono essere scaricate."
-#: client/control.c:1353
+#: client/control.c:1425
#, 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:1444
+#: client/control.c:1516
msgid "Only nuclear units can do this."
msgstr "solo le unità nucleari possono farlo."
-#: client/control.c:1473
+#: client/control.c:1545
msgid "Only paratrooper units can do this."
msgstr "solo le unità paracadutate possono farlo."
-#: client/control.c:1921
+#: client/control.c:2020
msgid "Too far for this unit."
msgstr "troppo lontano per questa unità."
-#: client/control.c:2131 client/control.c:2161 client/control.c:2177
+#: client/control.c:2230 client/control.c:2260 client/control.c:2276
msgid "Didn't find a route to the destination!"
msgstr "impossibile trovare un percorso fino alla destinazione!"
-#: client/control.c:2221
+#: client/control.c:2320
msgid "Oh my! You seem to have no capital!"
msgstr "Attenzione! Sembra che la nazione non abbia una capitale!"
@@ -8298,16 +8299,16 @@ msgid "Allows %s (with %s)."
msgstr "Permette %s (con %s).\n"
#. TRANS: preserve single space at beginning
-#: client/helpdata.c:418
+#: client/helpdata.c:416
msgid " Rivers"
msgstr " Fiumi"
-#: client/helpdata.c:576
+#: client/helpdata.c:574
#, c-format
msgid "Sorry, no help topic for %s.\n"
msgstr "Spiacente, nessuna guida per %s.\n"
-#: client/helpdata.c:580
+#: client/helpdata.c:578
#, c-format
msgid ""
"Sorry, no help topic for %s.\n"
@@ -8318,87 +8319,87 @@ msgstr ""
"Questa pagina è stata generata automaticamente.\n"
"\n"
-#: client/helpdata.c:670
+#: client/helpdata.c:668
#, fuzzy
msgid ""
"Requires: Nothing\n"
"\n"
msgstr "Non puoi ricercare questa tecnologia."
-#: client/helpdata.c:675
+#: client/helpdata.c:673
#, c-format
msgid "* The discovery of %s will make %s obsolete.\n"
msgstr "* La scoperta della %s renderà obsoleta qualsiasi %s esistente.\n"
-#: client/helpdata.c:694
+#: client/helpdata.c:692
#, c-format
msgid "* Allows all players with knowledge of %s to build %s units.\n"
msgstr ""
"* Permette a tutti i giocatori che conoscono %s di costruire le unità %s.\n"
-#: client/helpdata.c:706
+#: client/helpdata.c:704
#, c-format
msgid "* Allows %s (with %s).\n"
msgstr "* Permette %s (con %s).\n"
-#: client/helpdata.c:710
+#: client/helpdata.c:708
#, c-format
msgid "* Allows %s.\n"
msgstr "* Permette %s.\n"
-#: client/helpdata.c:780
+#: client/helpdata.c:778
#, c-format
msgid "* Can only be built if there is %s in the city.\n"
msgstr ""
-#: client/helpdata.c:786
+#: client/helpdata.c:784
#, c-format
msgid "* Can only be built with %s as government.\n"
msgstr ""
-#: client/helpdata.c:791
+#: client/helpdata.c:789
msgid "* May not be built in cities.\n"
msgstr "* Non può essere costruito nelle città.\n"
-#: client/helpdata.c:794
+#: client/helpdata.c:792
msgid "* Never has a home city.\n"
msgstr "* Non ha mai una città d'origine.\n"
-#: client/helpdata.c:797
+#: client/helpdata.c:795
msgid "* Losing this unit will lose you the game!\n"
msgstr "* Perder questa unità comporterà la perdita della partita!\n"
-#: client/helpdata.c:801
+#: client/helpdata.c:799
msgid "* Each player may only have one of this type of unit.\n"
msgstr "* Ogni giocatore può avere al più una unità di questo tipo.\n"
-#: client/helpdata.c:805
+#: client/helpdata.c:803
#, c-format
msgid "* Requires %d population to build.\n"
msgstr "* Richiede %d punti di popolazione per essere costruito.\n"
-#: client/helpdata.c:811
+#: client/helpdata.c:809
#, c-format
msgid "* Can carry and refuel %d air unit.\n"
msgid_plural "* Can carry and refuel %d air units.\n"
msgstr[0] "* Può trasportare e rifornire %d unità aerea.\n"
msgstr[1] "* Può trasportare e rifornire %d unità aeree.\n"
-#: client/helpdata.c:816
+#: client/helpdata.c:814
#, c-format
msgid "* Can carry and refuel %d missile unit.\n"
msgid_plural "* Can carry and refuel %d missile units.\n"
msgstr[0] "* Può trasportare e rifornire %d missile.\n"
msgstr[1] "* Può trasportare e rifornire %d missili.\n"
-#: client/helpdata.c:821
+#: client/helpdata.c:819
#, c-format
msgid "* Can carry %d ground unit across water.\n"
msgid_plural "* Can carry %d ground units across water.\n"
msgstr[0] "* Può trasportare %d unità terrestri attraverso i mari.\n"
msgstr[1] "* Può trasportare %d unità terrestri attraverso i mari.\n"
-#: client/helpdata.c:830
+#: client/helpdata.c:828
msgid ""
"* Can establish trade routes (must travel to target city and must be at "
"least 9 tiles [in Manhattan distance] from this unit's home city).\n"
@@ -8407,136 +8408,136 @@ msgstr ""
"obiettivo e deve essere ad almeno 9 quadranti di distanza (i movimenti in "
"diagonale non sono considerati) dalla città d'origine dell'unità.\n"
-#: client/helpdata.c:836
+#: client/helpdata.c:834
#, c-format
msgid "* Can help build wonders (adds %d production).\n"
msgstr ""
"* può aiutare a costruire delle meraviglie del mondo (aggiunge %d scudi alla "
"produzione).\n"
-#: client/helpdata.c:840
+#: client/helpdata.c:838
msgid "* May not be disbanded.\n"
msgstr "* non può essere congedato.\n"
-#: client/helpdata.c:842
+#: client/helpdata.c:840
#, c-format
msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
msgstr ""
"* Può essere congedata in una città per recuperare il 50%% del costo di "
"produzione.\n"
-#: client/helpdata.c:846
+#: client/helpdata.c:844
msgid "* Can build new cities.\n"
msgstr "* Può costruire nuove città.\n"
-#: client/helpdata.c:849
+#: client/helpdata.c:847
#, c-format
msgid "* Can add on %d population to cities of no more than size %d.\n"
msgstr ""
"* Può aggiungere %d punti di popolazione a città di dimensione non superiore "
"a %d.\n"
-#: client/helpdata.c:858
+#: client/helpdata.c:856
msgid "* Can build roads and railroads.\n"
msgstr "* può costruire strade e ferrovie nei quadranti.\n"
-#: client/helpdata.c:859
+#: client/helpdata.c:857
msgid "* Can build mines on tiles.\n"
msgstr "* Può costruire miniere nei quadranti.\n"
-#: client/helpdata.c:860
+#: client/helpdata.c:858
msgid "* Can build irrigation on tiles.\n"
msgstr "* Può costruire l'irrigazione nei quadranti.\n"
-#: client/helpdata.c:865
+#: client/helpdata.c:863
msgid "* Can build farmland.\n"
msgstr "* Può costruire fattorie nei quadranti.\n"
-#: client/helpdata.c:869
+#: client/helpdata.c:867
#, c-format
msgid "* Can build farmland (if %s is known).\n"
msgstr "* Può costruire fattorie nei quadranti (se %s è stata scoperta).\n"
-#: client/helpdata.c:873
+#: client/helpdata.c:871
#, c-format
msgid "* Can build farmland (if any of the following are known: %s).\n"
msgstr ""
"* Può costruire fattorie nei quadranti (se una qualsiasi delle seguenti "
"tecnologie è stata scoperta: %s).\n"
-#: client/helpdata.c:881
+#: client/helpdata.c:879
msgid "* Can build fortresses.\n"
msgstr "* Può costruire fortezze nei quadranti.\n"
-#: client/helpdata.c:885
+#: client/helpdata.c:883
#, c-format
msgid "* Can build fortresses (if %s is known).\n"
msgstr "* Può costruire fortezze nei quadranti (se %s è stata scoperta).\n"
-#: client/helpdata.c:889
+#: client/helpdata.c:887
#, c-format
msgid "* Can build fortresses (if any of the following are known: %s).\n"
msgstr ""
"* Può costruire fortezze nei quadranti (se una qualsasi delle seguenti "
"tecnologie è stata scoperta: %s).\n"
-#: client/helpdata.c:895
+#: client/helpdata.c:893
msgid "* Can clean pollution from tiles.\n"
msgstr "* Può eliminare l'inquinamento dai quadranti.\n"
-#: client/helpdata.c:896
+#: client/helpdata.c:894
msgid "* Can clean nuclear fallout from tiles.\n"
msgstr "* Può eliminare la ricaduta radioattiva dai quadranti.\n"
-#: client/helpdata.c:899
+#: client/helpdata.c:897
msgid "* Can transform tiles.\n"
msgstr "* Può trasformare il tipo di terreno dei quadranti.\n"
-#: client/helpdata.c:902
+#: client/helpdata.c:900
msgid "* Can build airbases.\n"
msgstr "* Può costruire basi aree nei quadranti.\n"
-#: client/helpdata.c:906
+#: client/helpdata.c:904
#, c-format
msgid "* May fortify, granting a 50%% defensive bonus.\n"
msgstr "* Può trincerarsi, acquisendo un bonus difensivo del 50%%.\n"
-#: client/helpdata.c:909
+#: client/helpdata.c:907
msgid "* May pillage to destroy infrastructure from tiles.\n"
msgstr "* Può saccheggiare un quadrante per distruggerne le infrastrutture.\n"
-#: client/helpdata.c:913
+#: client/helpdata.c:911
msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
msgstr ""
"* Può effettuare azioni diplomatiche ed inoltre ha le competenze speciali di "
"una spia.\n"
-#: client/helpdata.c:916
+#: client/helpdata.c:914
msgid "* Can perform diplomatic actions.\n"
msgstr "* Può effettuare azioni diplomatiche.\n"
-#: client/helpdata.c:920
+#: client/helpdata.c:918
msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
msgstr "* Non può mai perdere un combattimento a livello diplomatico.\n"
-#: client/helpdata.c:923
+#: client/helpdata.c:921
msgid "* May not be bribed.\n"
msgstr "* Non può essere corrotto.\n"
-#: client/helpdata.c:926
+#: client/helpdata.c:924
msgid "* Can attack enemy air units.\n"
msgstr "* Può attaccare unità aeree nemiche.\n"
-#: client/helpdata.c:930
+#: client/helpdata.c:928
msgid "* Is invisible except when next to an enemy unit or city.\n"
msgstr "* È invisibile, tranne quando è accanto ad una unità o città nemica.\n"
-#: client/helpdata.c:934
+#: client/helpdata.c:932
msgid "* Can only attack units on ocean squares (no land attacks).\n"
msgstr ""
"* Può attaccare solo unità nell'oceano (nessun attacco verso la terra).\n"
-#: client/helpdata.c:938
+#: client/helpdata.c:936
msgid ""
"* Can attack from aboard sea units: against enemy cities and onto land "
"squares.\n"
@@ -8544,40 +8545,40 @@ msgstr ""
"* Può attaccare direttamente da una nave: contro città nemiche o verso "
"quadranti di terra.\n"
-#: client/helpdata.c:943
+#: client/helpdata.c:941
#, c-format
msgid "* Can be paradropped from a friendly city (Range: %d).\n"
msgstr "* Può essere paracadutato da una città amica (portata: %d).\n"
-#: client/helpdata.c:949
+#: client/helpdata.c:947
msgid "* Gets double defense against units specified as 'mounted'.\n"
msgstr "* Ha una difesa doppia contro le unità a cavallo.\n"
-#: client/helpdata.c:953
+#: client/helpdata.c:951
msgid "* Counts as 'mounted' against certain defenders.\n"
msgstr "* Conta come 'unità a cavallo' contro certi difensori.\n"
-#: client/helpdata.c:957
+#: client/helpdata.c:955
msgid "* A missile unit: gets used up in making an attack.\n"
msgstr "* Un missile: è utilizzabile una sola volta.\n"
-#: client/helpdata.c:960
+#: client/helpdata.c:958
msgid "* Making an attack ends this unit's turn.\n"
msgstr "* Termina il proprio turno una volta che ha attaccato.\n"
-#: client/helpdata.c:964
+#: client/helpdata.c:962
msgid "* This unit's attack causes a nuclear explosion!\n"
msgstr "* L'attacco di quest'unità causa un'esplosione nucleare!\n"
-#: client/helpdata.c:968
+#: client/helpdata.c:966
msgid "* Gets double firepower when attacking cities.\n"
msgstr "* Raddoppia la capacità di fuoco quando attacca le città.\n"
-#: client/helpdata.c:971
+#: client/helpdata.c:969
msgid "* Ignores the effects of city walls.\n"
msgstr "* Ignora gli effetti delle cinte murarie.\n"
-#: client/helpdata.c:975
+#: client/helpdata.c:973
#, c-format
msgid ""
"* Does bombard attacks (%d per turn). These attacks will only damage (never "
@@ -8587,39 +8588,39 @@ msgstr ""
"danneggeranno (ma non uccideranno mai) il difensore senza che l'attaccante "
"corra dei rischi.\n"
-#: client/helpdata.c:982
+#: client/helpdata.c:980
msgid "* Gets quintuple defense against missiles and aircraft.\n"
msgstr "* Ha una difesa quintuplicata contro i missili e gli aerei.\n"
-#: client/helpdata.c:986
+#: client/helpdata.c:984
msgid "* Ignores terrain effects (treats all squares as roads).\n"
msgstr ""
"* Ignora gli effetti dei terreni (tratta tutti i quadranti come strade).\n"
-#: client/helpdata.c:989
+#: client/helpdata.c:987
msgid "* Ignores zones of control.\n"
msgstr "* Ignora le zone di controllo.\n"
-#: client/helpdata.c:993
+#: client/helpdata.c:991
msgid "* A non-military unit (cannot attack; no martial law).\n"
msgstr ""
"* Un'unità non militare (non può attaccare o imporre la legge marziale).\n"
-#: client/helpdata.c:997
+#: client/helpdata.c:995
msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
msgstr ""
"* Un'unità da battaglia: crea del malcontento anche se non è aggressiva.\n"
-#: client/helpdata.c:1000
+#: client/helpdata.c:998
msgid "* Will never achieve veteran status.\n"
msgstr "* Non raggiungerà mai il livello di veterano.\n"
-#: client/helpdata.c:1002
+#: client/helpdata.c:1000
msgid "* May become veteran through training or combat.\n"
msgstr ""
"* Può diventare veterano attraverso l'allenamento e il combattimento.\n"
-#: client/helpdata.c:1008
+#: client/helpdata.c:1006
#, c-format
msgid ""
"* Must end turn in a city or next to land, or has a 50%% risk of being lost "
@@ -8628,12 +8629,12 @@ msgstr ""
"* Deve terminare il turno in una città o vicino ad una costa, altrimenti ha "
"il 50%% di possibilità di sparire in mare.\n"
-#: client/helpdata.c:1012
+#: client/helpdata.c:1010
#, c-format
msgid "* The discovery of %s reduces the risk to 25%%.\n"
msgstr "* La scoperta di %s riduce il rischio di perdita al 25%%.\n"
-#: client/helpdata.c:1017
+#: client/helpdata.c:1015
#, c-format
msgid "* %s reduces the risk to 12%%.\n"
msgstr "* %s riduce il rischio al 12%%.\n"
@@ -8642,27 +8643,27 @@ msgstr "* %s riduce il rischio al 12%%.\n"
#. * last two elements
#. TRANS: List of possible output types has this between
#. * last two elements
-#: client/helpdata.c:1068 client/helpdata.c:1402
+#: client/helpdata.c:1066 client/helpdata.c:1400
msgid " or "
msgstr " o "
-#: client/helpdata.c:1070 client/helpdata.c:1390
+#: client/helpdata.c:1068 client/helpdata.c:1388
msgid "?or:, "
msgstr "?or:, "
-#: client/helpdata.c:1082
+#: 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"
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:1124
+#: client/helpdata.c:1122
#, 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:1129
+#: client/helpdata.c:1127
#, c-format
msgid ""
"To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8671,93 +8672,93 @@ msgstr ""
"Per raggiungere %s dobbiamo ottenere %d altre tecnologie in precedenza. "
"L'intero progetto richiederà %d lampadine per essere completato."
-#: client/helpdata.c:1137
+#: client/helpdata.c:1135
msgid "You cannot research this technology."
msgstr "Non puoi ricercare questa tecnologia."
-#: client/helpdata.c:1141
+#: client/helpdata.c:1139
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:1153
+#: client/helpdata.c:1151
#, 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:1158
+#: client/helpdata.c:1156
#, 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:1161
+#: client/helpdata.c:1159
#, 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:1165
+#: client/helpdata.c:1163
msgid "* Increases the pollution generated by the population.\n"
msgstr "* Aumenta l'inquinamento prodotto dalla popolazione.\n"
-#: client/helpdata.c:1170
+#: client/helpdata.c:1168
#, 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:1177
+#: client/helpdata.c:1175
#, c-format
msgid "* Allows %s to build fortresses.\n"
msgstr "* Permette ai %s di costruire fortezze.\n"
-#: client/helpdata.c:1185
+#: client/helpdata.c:1183
#, c-format
msgid "* Allows %s to build airbases.\n"
msgstr "* Permette ai %s di costruire basi aeree.\n"
-#: client/helpdata.c:1194
+#: client/helpdata.c:1192
#, 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:1202
+#: client/helpdata.c:1200
#, 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:1236
+#: client/helpdata.c:1234
msgid "* Pollution cannot be generated on this terrain."
msgstr "* L'inquinamento non può essere prodotto su questo tipo di terreno."
-#: client/helpdata.c:1241
+#: client/helpdata.c:1239
msgid "* You cannot build cities on this terrain."
msgstr "* non puoi costruire una città su questo tipo di terreno."
-#: client/helpdata.c:1247
+#: client/helpdata.c:1245
msgid "* The coastline of this terrain is unsafe."
msgstr "* La costa di questo tipo di terreno non è sicura."
-#: client/helpdata.c:1252
+#: client/helpdata.c:1250
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:1257
+#: client/helpdata.c:1255
msgid "* Land units cannot travel on oceanic terrains."
msgstr "* Unità terrestri non possono viaggiare su quadranti oceanici."
-#: client/helpdata.c:1307
+#: client/helpdata.c:1305
msgid "Features:\n"
msgstr ""
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1413 client/helpdata.c:1414
+#: client/helpdata.c:1411 client/helpdata.c:1412
msgid "?outputlist: Nothing "
msgstr ""
-#: client/helpdata.c:1421
+#: client/helpdata.c:1419
#, fuzzy, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
@@ -8768,7 +8769,7 @@ msgid_plural ""
msgstr[0] "Unità militari sul campo possono causare malcontento. "
msgstr[1] "Unità militari sul campo possono causare malcontento. "
-#: client/helpdata.c:1431
+#: client/helpdata.c:1429
#, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8776,48 +8777,48 @@ msgid ""
msgstr ""
#. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1439
+#: client/helpdata.c:1437
#, c-format
msgid "* You pay %d times normal %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1444
+#: client/helpdata.c:1442
#, 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:1449
+#: client/helpdata.c:1447
#, c-format
msgid "* You pay no %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1453
+#: client/helpdata.c:1451
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:1462
+#: client/helpdata.c:1460
#, 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:1470
+#: client/helpdata.c:1468
#, c-format
msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
msgstr ""
-#: client/helpdata.c:1477
+#: client/helpdata.c:1475
#, 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:1484
+#: client/helpdata.c:1482
#, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -8825,23 +8826,23 @@ msgid ""
msgstr ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1491
+#: client/helpdata.c:1489
#, 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:1499
+#: client/helpdata.c:1497
#, c-format
msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
msgstr ""
-#: client/helpdata.c:1504
+#: client/helpdata.c:1502
msgid "Has unlimited science/gold/luxuries rates.\n"
msgstr ""
-#: client/helpdata.c:1509
+#: client/helpdata.c:1507
#, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
@@ -8852,7 +8853,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:1521
+#: client/helpdata.c:1519
#, 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"
@@ -8860,64 +8861,64 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1532
+#: client/helpdata.c:1530
#, 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:1538
+#: client/helpdata.c:1536
#, fuzzy
msgid "* Your units cannot be bribed.\n"
msgstr "Questa unità non può essere corrotta!"
-#: client/helpdata.c:1541
+#: client/helpdata.c:1539
#, fuzzy
msgid "* Your cities cannot be incited.\n"
msgstr "La città non può essere incitata alla rivolta!"
-#: client/helpdata.c:1545
+#: client/helpdata.c:1543
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:1551
+#: client/helpdata.c:1549
msgid "* Has a senate that may prevent declaration of war.\n"
msgstr ""
-#: client/helpdata.c:1555
+#: client/helpdata.c:1553
msgid "* Allows partisans when cities are taken by the enemy.\n"
msgstr ""
-#: client/helpdata.c:1559
+#: client/helpdata.c:1557
msgid ""
"* Buildings that normally confer bonuses against unhappiness will instead "
"give gold.\n"
msgstr ""
-#: client/helpdata.c:1563
+#: client/helpdata.c:1561
msgid "* Pays no upkeep for fanatics.\n"
msgstr ""
-#: client/helpdata.c:1566
+#: client/helpdata.c:1564
#, fuzzy
msgid "* Has no unhappy citizens.\n"
msgstr "%d cittadini scontenti ulteriori."
-#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
+#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
#, c-format
msgid "* Veteran %s units.\n"
msgstr ""
-#: client/helpdata.c:1587
+#: client/helpdata.c:1585
#, fuzzy
msgid "* Veteran units.\n"
msgstr "Unità di mare"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1593
+#: client/helpdata.c:1591
#, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8925,7 +8926,7 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1602
+#: client/helpdata.c:1600
#, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8933,462 +8934,509 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1610
+#: client/helpdata.c:1608
#, 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:1619
+#: client/helpdata.c:1617
#, c-format
msgid "* %s production is increased %d%%.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1627
+#: client/helpdata.c:1625
#, c-format
msgid "* %s production will suffer massive waste.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1632
+#: client/helpdata.c:1630
#, c-format
msgid "* %s production will suffer some waste.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1637
+#: client/helpdata.c:1635
#, 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:1645
+#: client/helpdata.c:1643
#, 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:1651
+#: client/helpdata.c:1649
#, 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:1657
+#: client/helpdata.c:1655
#, c-format
msgid "* %s waste will increase slowly with distance from capital.\n"
msgstr ""
-#: client/helpdata.c:1674
+#: client/helpdata.c:1672
#, 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:1701
+#: client/helpdata.c:1699
#, fuzzy, c-format
msgid "%s%d %s"
msgstr "%3d/%3d %s"
-#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1700 client/helpdata.c:1708 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:1709
+#: client/helpdata.c:1707
#, c-format
msgid "%s%d unhappy"
msgstr "%s%d malcontento"
-#: client/mapctrl_common.c:382
+#: client/mapctrl_common.c:399
#, c-format
msgid "You don't know how to build %s!"
msgstr "Non sai come costruire %s!"
-#: client/mapctrl_common.c:392
+#: client/mapctrl_common.c:409
#, c-format
msgid "Copy %s to clipboard."
msgstr "Copia %s in memoria."
-#: client/mapctrl_common.c:408
+#: client/mapctrl_common.c:425
msgid "Clipboard is empty."
msgstr "La memoria è vuota."
-#: client/options.c:98
+#: client/options.c:102
#, fuzzy
msgid "Graphics"
msgstr "Demografia"
-#: client/options.c:99
+#: client/options.c:103
#, fuzzy
msgid "Overview"
msgstr "_Descrizione"
-#: client/options.c:100
+#: client/options.c:104
#, fuzzy
msgid "Sound"
msgstr "Giri"
-#: client/options.c:101
+#: client/options.c:105
#, fuzzy
msgid "Interface"
msgstr "Interno"
-#: client/options.c:102
+#: client/options.c:106
#, fuzzy
msgid "Network"
msgstr "Rete"
-#: client/options.c:107
+#: client/options.c:111
#, fuzzy
msgid "Login name"
msgstr "Carica partita"
-#: client/options.c:108
+#: client/options.c:112
msgid ""
"This is the default login username that will be used in the connection "
"dialogs or with the -a command-line parameter."
msgstr ""
-#: client/options.c:113
+#: client/options.c:117
#, fuzzy
msgid "Server"
msgstr "mai"
-#: client/options.c:114
+#: client/options.c:118
msgid ""
"This is the default server hostname that will be used in the connection "
"dialogs or with the -a command-line parameter."
msgstr ""
-#: client/options.c:119
+#: client/options.c:123
#, fuzzy
msgid "Server port"
msgstr "O_pzioni server"
-#: client/options.c:120
+#: client/options.c:124
msgid ""
"This is the default server port that will be used in the connection dialogs "
"or with the -a command-line parameter."
msgstr ""
-#: client/options.c:125 client/gui-win32/connectdlg.c:912 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
msgid "Metaserver"
msgstr "Metaserver"
-#: client/options.c:126
+#: client/options.c:130
msgid ""
"The metaserver is a host that the client contacts to find out about games on "
"the internet. Don't change this from its default value unless you know what "
"you're doing."
msgstr ""
-#: client/options.c:132
+#: client/options.c:136
#, fuzzy
msgid "Soundset"
msgstr "Giri"
-#: client/options.c:133
+#: client/options.c:137
msgid ""
"This is the soundset that will be used. Changing this is the same as using "
"the -S command-line parameter."
msgstr ""
-#: client/options.c:138
+#: client/options.c:142
#, fuzzy
msgid "Sound plugin"
msgstr "Plugin sonoro predefinito"
-#: client/options.c:139
+#: client/options.c:143
msgid ""
"If you have a problem with sound, try changing the sound plugin. The new "
"plugin won't take effect until you restart Freeciv. Changing this is the "
"same as using the -P command-line option."
msgstr ""
-#: client/options.c:144 client/gui-sdl/gui_main.c:162
+#: client/options.c:148 client/gui-sdl/gui_main.c:162
#, fuzzy
msgid "Theme"
msgstr "Tempio"
-#: client/options.c:145
+#: client/options.c:149
msgid "By changing this option you change the active theme."
msgstr ""
-#: client/options.c:148
+#: client/options.c:152
msgid "Tileset"
msgstr "Set grafico"
-#: client/options.c:149
+#: client/options.c:153
msgid ""
"By changing this option you change the active tileset. This is the same as "
"using the -t command-line parameter."
msgstr ""
-#: client/options.c:156
+#: client/options.c:160
msgid "Solid unit background color"
msgstr "Colore di sfondo delle unità uniforme"
-#: client/options.c:157
+#: client/options.c:161
msgid ""
"Setting this option will cause units on the map view to be drawn with a "
"solid background color instead of the flag backdrop."
msgstr ""
-#: client/options.c:161 client/gui-sdl/optiondlg.c:960
+#: client/options.c:165 client/gui-sdl/optiondlg.c:960
msgid "Sound bell at new turn"
msgstr "Suona un bip al nuovo turno"
-#: client/options.c:162
+#: client/options.c:166
msgid ""
"Set this option to have a \"bell\" event be generated at the start of a new "
"turn. You can control the behavior of the \"bell\" event by editing the "
"message options."
msgstr ""
-#: client/options.c:168
+#: client/options.c:172
msgid "Unit movement animation time (milliseconds)"
msgstr "Durata dell'animazioni del movimento delle unità (millisecondi)"
-#: client/options.c:169
+#: client/options.c:173
msgid ""
"This option controls how long unit \"animation\" takes when a unit moves on "
"the map view. Set it to 0 to disable animation entirely."
msgstr ""
-#: client/options.c:174
+#: client/options.c:178
msgid "Mapview recentering time (milliseconds)"
msgstr "Tempo di ri-centramento della mappa (millisecondi)"
-#: client/options.c:175
+#: client/options.c:179
msgid ""
"When the map view is recentered, it will slide smoothly over the map to its "
"new position. This option controls how long this slide lasts. Set it to 0 "
"to disable mapview sliding entirely."
msgstr ""
-#: client/options.c:180 client/gui-sdl/optiondlg.c:1014
+#: client/options.c:184 client/gui-sdl/optiondlg.c:1014
msgid "Show combat animation"
msgstr "Mostra l'animazione del combattimento"
-#: client/options.c:181
+#: client/options.c:185
msgid ""
"Disabling this option will turn off combat animation between units on the "
"mapview."
msgstr ""
-#: client/options.c:184
+#: client/options.c:188
msgid "Draw the citybar"
msgstr ""
-#: client/options.c:185
+#: client/options.c:189
msgid ""
"Setting this option will display a 'citybar' containing useful information "
"beneath each city. Disabling this option will display only the city's name "
"and optionally, production."
msgstr ""
-#: client/options.c:191
+#: client/options.c:195
msgid "Show icons in the technology tree"
msgstr ""
-#: client/options.c:192
+#: client/options.c:196
msgid ""
"Setting this option will display icons on the technology tree diagram. "
"Turning this option off makes the technology tree more compact."
msgstr ""
-#: client/options.c:197
+#: client/options.c:201
msgid "Draw shield graphics for units"
msgstr ""
-#: client/options.c:198
+#: client/options.c:202
msgid ""
"Setting this option will draw a shield icon as the flags on units. If "
"unset, the full flag will be drawn."
msgstr ""
-#: client/options.c:202
+#: client/options.c:206
msgid "Manual Turn Done in AI Mode"
msgstr "Fine turno manuale in modalità IA"
-#: client/options.c:203
+#: client/options.c:207
msgid ""
"Disable this option if you do not want to press the Turn Done button "
"manually when watching an AI player."
msgstr ""
-#: client/options.c:207 client/gui-sdl/optiondlg.c:1121
+#: client/options.c:211 client/gui-sdl/optiondlg.c:1121
msgid "Auto Center on Units"
msgstr "Centrare automaticamente sulle unità"
-#: client/options.c:208
+#: client/options.c:212
msgid ""
"Set this option to have the active unit centered automatically when the unit "
"focus changes."
msgstr ""
-#: client/options.c:211 client/gui-sdl/optiondlg.c:1147
+#: client/options.c:215 client/gui-sdl/optiondlg.c:1147
msgid "Auto Center on Combat"
msgstr "Centrare automaticamente sui combattimenti"
-#: client/options.c:212
+#: client/options.c:216
msgid ""
"Set this option to have any combat be centered automatically. Disabled this "
"will speed up the time between turns but may cause you to miss combat "
"entirely."
msgstr ""
-#: client/options.c:217 client/gui-sdl/optiondlg.c:1174
+#: client/options.c:221 client/gui-sdl/optiondlg.c:1174
msgid "Focus on Awakened Units"
msgstr "Selezionare le unità attive"
-#: client/options.c:218
+#: client/options.c:222
msgid "Set this option to have newly awoken units be focused automatically."
msgstr ""
-#: client/options.c:221
+#: client/options.c:225
msgid "Allow goto into the unknown"
msgstr ""
-#: client/options.c:222
+#: client/options.c:226
msgid ""
"Setting this option will make the game consider moving into unknown tiles. "
"If not, then goto routes will detour around or be blocked by unknown tiles."
msgstr ""
-#: client/options.c:226
+#: client/options.c:230
msgid "Center map when Popup city"
msgstr "Centra la mappa all'attivazione di una città"
-#: client/options.c:227
+#: client/options.c:231
msgid ""
"Setting this option makes the mapview center on a city when its city dialog "
"is popped up."
msgstr ""
-#: client/options.c:230
+#: client/options.c:234
msgid "Concise City Production"
msgstr "Produzione della città"
-#: client/options.c:231
+#: client/options.c:235
msgid ""
"Set this option to make the city production (as shown in the city dialog) to "
"be more compact."
msgstr ""
-#: client/options.c:234 client/gui-sdl/optiondlg.c:1252
+#: client/options.c:238 client/gui-sdl/optiondlg.c:1252
msgid "End Turn when done moving"
msgstr "Fine Turno alla fine dei movimenti"
-#: client/options.c:235
+#: client/options.c:239
msgid ""
"Setting this option makes your turn end automatically when all your units "
"are done moving."
msgstr ""
-#: client/options.c:238 client/gui-sdl/optiondlg.c:1226
+#: client/options.c:242 client/gui-sdl/optiondlg.c:1226
msgid "Prompt for city names"
msgstr "Richiedi nomi delle città"
-#: client/options.c:239
+#: client/options.c:243
msgid ""
"Disabling this option will make the names of newly founded cities chosen "
"automatically by the server."
msgstr ""
-#: client/options.c:242 client/gui-sdl/optiondlg.c:1200
+#: client/options.c:246 client/gui-sdl/optiondlg.c:1200
msgid "Pop up city dialog for new cities"
msgstr "Apri finestra città per le nuove città"
-#: client/options.c:243
+#: client/options.c:247
msgid ""
"Setting this option will pop up a newly-founded city's city dialog "
"automatically."
msgstr ""
-#: client/options.c:248
+#: client/options.c:250
+#, fuzzy
+msgid "Pop up caravan actions"
+msgstr "Carovana"
+
+#: client/options.c:251
+msgid ""
+"If this option is enabled, when caravans arrive at a city where they can "
+"establish a traderoute or help build a wonder, a window will popup asking "
+"which action should be performed. Disabling this option means you will have "
+"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 ""
+
+#: client/options.c:260
+msgid "Enable cursor changing"
+msgstr ""
+
+#: client/options.c:261
+msgid ""
+"This option controls whether the client should try to change the mouse "
+"cursor depending on what is being pointed at, as well as to indicate changes "
+"in the client or server state."
+msgstr ""
+
+#: client/options.c:266
+msgid "Select cities before units"
+msgstr ""
+
+#: 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 ""
+
+#: client/options.c:272
+msgid "Clear unit orders on selection"
+msgstr ""
+
+#: client/options.c:273
+msgid ""
+"Enabling this option will cause unit orders to be cleared whenever one or "
+"more units are selected. If this option is disabled, selecting units will "
+"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 ""
+
+#: client/options.c:282
msgid "Background layer"
msgstr ""
-#: client/options.c:249
+#: client/options.c:283
msgid "The background layer of the overview shows just ocean and land."
msgstr ""
-#: client/options.c:252
+#: client/options.c:286
msgid "Terrain relief map layer"
msgstr ""
-#: client/options.c:253
+#: client/options.c:287
msgid "The relief layer shows all terrains on the map."
msgstr ""
-#: client/options.c:256
+#: client/options.c:290
#, fuzzy
msgid "Borders layer"
msgstr "Confine"
-#: client/options.c:257
+#: client/options.c:291
msgid ""
"The borders layer of the overview shows which tiles are owned by each player."
msgstr ""
-#: client/options.c:261
+#: client/options.c:295
#, fuzzy
msgid "Units layer"
msgstr "Pagina Unità"
-#: client/options.c:262
+#: client/options.c:296
#, fuzzy
msgid "Enabling this will draw units on the overview."
msgstr ""
"Se abilitata, il nome predefinito per le città verrà determinato in base al "
"tipo di terreno circostante."
-#: client/options.c:265
+#: client/options.c:299
#, fuzzy
msgid "Cities layer"
msgstr "Città"
-#: client/options.c:266
+#: client/options.c:300
#, fuzzy
msgid "Enabling this will draw cities on the overview."
msgstr ""
"Se abilitata, il nome predefinito per le città verrà determinato in base al "
"tipo di terreno circostante."
-#: client/options.c:269
+#: client/options.c:303
#, fuzzy
msgid "Overview fog of war"
msgstr "Pagina descrizione"
-#: client/options.c:270
+#: client/options.c:304
#, fuzzy
msgid "Enabling this will show fog of war on the overview."
msgstr ""
"Se abilitata, il nome predefinito per le città verrà determinato in base al "
"tipo di terreno circostante."
-#: client/options.c:488
+#: client/options.c:526
msgid "If you add a preset by hand, also update \"number_of_presets\""
msgstr "Se hai aggiunto un preset a mano, aggiorna anche \"number_of_presets\""
-#: client/options.c:516
+#: client/options.c:554
msgid "Cannot find your home directory"
msgstr "Impossibile trovare la vostra home directory"
-#: client/options.c:665 client/options.c:796
+#: client/options.c:703 client/options.c:834
msgid "Save failed, cannot find a filename."
msgstr "Salvataggio fallito, non possibile trovare un nome per il file."
-#: client/options.c:678 client/options.c:859
+#: client/options.c:716 client/options.c:897
#, c-format
msgid "Save failed, cannot write to file %s"
msgstr "Salvataggio fallito, impossibile scrivere sul file %s"
-#: client/options.c:680 client/options.c:862
+#: client/options.c:718 client/options.c:900
#, c-format
msgid "Saved settings to file %s"
msgstr "Impostazioni salvate nel file %s"
@@ -9413,16 +9461,16 @@ msgstr "Stringa delle capacit
msgid "Start of turn %d"
msgstr "Inizio del %d turno"
-#: client/packhand.c:1590
+#: client/packhand.c:1591
#, c-format
msgid "AI Mode is now %s."
msgstr "La modalità IA ora è %s."
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "ON"
msgstr "attiva"
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "OFF"
msgstr "disattiva"
@@ -9455,14 +9503,15 @@ 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:2085
+#: client/gui-gtk-2.0/pages.c:2157
msgid "Flag"
msgstr "Bandiera"
#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
-#: client/gui-gtk-2.0/pages.c:1536 client/gui-gtk-2.0/pages.c:2087
-#: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
-#: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
+#: 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/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr "Nazione"
@@ -9474,7 +9523,7 @@ msgstr "Confine"
msgid "Score"
msgstr "Punteggio"
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
msgid "Team"
msgstr "Squadra"
@@ -9548,281 +9597,303 @@ msgstr "nessuna unit
msgid "Could not open temp file."
msgstr "Impossibile aprire \"%s\"."
-#: client/servers.c:407
+#: client/servers.c:410
msgid "Invalid $http_proxy or metaserver value, must start with 'http://'"
msgstr ""
"Valore di $http_proxy o metaserver non valido, deve iniziare con 'http://'"
-#: client/servers.c:413
+#: client/servers.c:416
#, fuzzy
msgid "Failed looking up metaserver's host"
msgstr "Ricerca del nome del server fallita."
-#: client/text.c:85 client/text.c:86 client/text.c:91
+#. TRANS: "AI <player name>"
+#: client/text.c:94
+#, c-format
+msgid "AI %s"
+msgstr ""
+
+#. TRANS: "<nation adjective>, team <team name>"
+#: client/text.c:118
+#, fuzzy, c-format
+msgid "%s, team %s"
+msgstr " vicino a %s"
+
+#: client/text.c:135 client/text.c:136 client/text.c:141
#: client/gui-sdl/mapview.c:752
msgid "?nation:Neutral"
msgstr "?nation:Neutrali"
-#: client/text.c:85 client/gui-sdl/mapview.c:752
+#: client/text.c:135 client/gui-sdl/mapview.c:752
msgid "?nation:Hostile"
msgstr "?nation:Ostili"
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Peaceful"
msgstr "?nation:Pacifici"
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Friendly"
msgstr "?nation:Amichevoli"
-#: client/text.c:88 client/gui-sdl/mapview.c:755
+#: client/text.c:138 client/gui-sdl/mapview.c:755
msgid "?nation:Mysterious"
msgstr "?nation:Misteriosi"
-#: client/text.c:88
+#: client/text.c:138
msgid "?nation:Friendly(team)"
msgstr "?nation:Amichevoli(squadra)"
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
msgid "?city:Neutral"
msgstr "?city:Neutrale"
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
msgid "?city:Hostile"
msgstr "?city:Ostile"
-#: client/text.c:92 client/gui-sdl/mapview.c:786
+#: client/text.c:142 client/gui-sdl/mapview.c:786
msgid "?city:Peaceful"
msgstr "?city:Pacifica"
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Friendly"
msgstr "?city:Amichevole"
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Mysterious"
msgstr "?city:Misteriosa"
-#: client/text.c:93
+#: client/text.c:143
msgid "?city:Friendly(team)"
msgstr "?city:Amichevole(squadra)"
-#: client/text.c:100
+#: client/text.c:151
#, c-format
msgid "Location: (%d, %d) [%d]"
msgstr "Posizione: (%d, %d) [%d]"
-#: client/text.c:109
+#: client/text.c:153
+#, c-format
+msgid "Native coordinates: (%d, %d)"
+msgstr ""
+
+#: client/text.c:160
#, c-format
msgid "Terrain: %s"
msgstr "Terreno: %s"
-#: client/text.c:110
+#: client/text.c:161
#, c-format
msgid "Food/Prod/Trade: %s"
msgstr "Cibo/Prod/Comm: %s"
-#: client/text.c:113
+#: client/text.c:164
msgid "Minor Tribe Village"
msgstr "Villaggio di una tribù minore"
-#: client/text.c:119
+#: client/text.c:173
#, fuzzy
msgid "Our territory"
msgstr "Il nostro territorio"
-#. TRANS: "Polish territory"
-#: client/text.c:122
+#. TRANS: "Territory of <username> (<nation + team>)"
+#: client/text.c:176
#, fuzzy, c-format
-msgid "%s territory"
-msgstr "Territorio dei %s"
+msgid "Territory of %s (%s)"
+msgstr "Territorio dei %s %s"
-#. TRANS: "Polish territory (5 turn cease-fire)"
-#: client/text.c:131
+#: client/text.c:186
#, fuzzy, c-format
-msgid "%s territory (%d turn cease-fire)"
-msgid_plural "%s territory (%d turn cease-fire)"
-msgstr[0] "territorio dei %s (%d turno di cessate-il-fuoco)"
-msgstr[1] "territorio dei %s (%d turni di cessate-il-fuoco)"
+msgid "Territory of %s (%s) (%d turn cease-fire)"
+msgid_plural "Territory of %s (%s) (%d turn cease-fire)"
+msgstr[0] "Città: %s (%s, %d turno di cessate-il-fuoco)"
+msgstr[1] "Città: %s (%s, %d turni di cessate-il-fuoco)"
-#. TRANS: "Polish territory (friendly)"
-#: client/text.c:140
+#. TRANS: "Territory of <username>
+#. * (<nation + team> | <diplomatic state>)"
+#: client/text.c:195
#, fuzzy, c-format
-msgid "%s territory (%s)"
+msgid "Territory of %s (%s | %s)"
msgstr "Territorio dei %s %s"
-#: client/text.c:145
+#: client/text.c:200
msgid "Unclaimed territory"
msgstr "Territorio di nessuno"
-#. TRANS: "City: Warsaw (Polish)"
-#: client/text.c:156
-#, c-format
-msgid "City: %s (%s)"
-msgstr "Città: %s (%s)"
+#. TRANS: "City: <city name> | <username> (<nation + team>)"
+#: client/text.c:214
+#, fuzzy, c-format
+msgid "City: %s | %s (%s)"
+msgstr "Città: %s (%s,%s)"
-#. TRANS: "City: Warsaw (Polish, 5 turn cease-fire)"
-#: client/text.c:166
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <number> turn cease-fire)"
+#: client/text.c:224
#, fuzzy, c-format
-msgid "City: %s (%s, %d turn cease-fire)"
-msgid_plural "City: %s (%s, %d turn cease-fire)"
+msgid "City: %s | %s (%s, %d turn cease-fire)"
+msgid_plural "City: %s | %s (%s, %d turn cease-fire)"
msgstr[0] "Città: %s (%s, %d turno di cessate-il-fuoco)"
msgstr[1] "Città: %s (%s, %d turni di cessate-il-fuoco)"
-#. TRANS: "City: Warsaw (Polish,friendly)"
-#: client/text.c:174
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <diplomatic state>)"
+#: client/text.c:231
#, fuzzy, c-format
-msgid "City: %s (%s, %s)"
+msgid "City: %s | %s (%s, %s)"
msgstr "Città: %s (%s,%s)"
#. TRANS: previous lines gave other information about the city.
-#: client/text.c:189
+#: client/text.c:246
#, fuzzy, c-format
msgid "?clistbegin: with %s"
msgstr " con %s"
#. TRANS: "Trade from Warsaw: 5"
-#: client/text.c:202
+#: client/text.c:259
#, c-format
msgid "Trade from %s: %d"
msgstr "Valore rotta commerciale da %s: %d"
-#: client/text.c:210
+#: client/text.c:267
#, c-format
msgid "Infrastructure: %s"
msgstr "Infrastruttura: %s"
-#: client/text.c:215
+#: client/text.c:272
#, c-format
msgid "Activity: %s"
msgstr "Attività: %s"
-#. TRANS: "Unit: Musketeers (Polish, Warsaw)"
-#. TRANS: "Unit: Musketeers (Polish,friendly)"
-#: client/text.c:226 client/text.c:253
+#. TRANS: "Unit: <unit type> | <username>
+#. * (<nation + team>, <homecity>)"
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <diplomatic state>)"
+#: client/text.c:287 client/text.c:313
#, fuzzy, c-format
-msgid "Unit: %s (%s, %s)"
+msgid "Unit: %s | %s (%s, %s)"
msgstr "Unità: %s (%s%s)"
-#. TRANS: "Unit: Musketeers (Polish)"
-#: client/text.c:232
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>)"
+#: client/text.c:292
#, fuzzy, c-format
-msgid "Unit: %s (%s)"
-msgstr "Unità: %s (%s)"
+msgid "Unit: %s | %s (%s)"
+msgstr "Unità: %s (%s%s)"
-#. TRANS: "Unit: Musketeers (Polish, 5 turn cease-fire)"
-#: client/text.c:245
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <number> turn cease-fire)"
+#: client/text.c:305
#, fuzzy, c-format
-msgid "Unit: %s (%s, %d turn cease-fire)"
-msgid_plural "Unit: %s (%s, %d turn cease-fire)"
+msgid "Unit: %s | %s (%s, %d turn cease-fire)"
+msgid_plural "Unit: %s | %s (%s, %d turn cease-fire)"
msgstr[0] "Città: %s (%s, %d turno di cessate-il-fuoco)"
msgstr[1] "Città: %s (%s, %d turni di cessate-il-fuoco)"
#. TRANS: "Chance to win: A:95% D:46%"
-#: client/text.c:279
+#: client/text.c:338
#, c-format
msgid "Chance to win: A:%d%% D:%d%%"
msgstr "Probabilità di vittoria: A:%d%% D:%d%%"
#. TRANS: A is attack power, D is defense power, FP is firepower,
#. * HP is hitpoints (current and max).
-#: client/text.c:286
+#: client/text.c:345
#, fuzzy, c-format
msgid "A:%d D:%d FP:%d HP:%d/%d (%s)"
msgstr "A:%d D:%d PF:%d PV:%d/%d%s"
#. TRANS: "5 more" units on this tile
-#: client/text.c:295
+#: client/text.c:354
#, c-format
msgid " (%d more)"
msgstr " (%d in più)"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:364
+#: client/text.c:423
#, c-format
msgid "far from %s"
msgstr "lontano da %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:367
+#: client/text.c:426
#, c-format
msgid "near %s"
msgstr "vicino a %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:370
+#: client/text.c:429
#, c-format
msgid "in %s"
msgstr "a %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:403
+#: client/text.c:462
#, c-format
msgid "from %s"
msgstr "da %s"
-#: client/text.c:466
+#: client/text.c:525
msgid "Progress: no research"
msgstr "Progresso: nessuna ricerca"
-#: client/text.c:470
+#: client/text.c:529
#, fuzzy
msgid "Progress: no research target"
msgstr "Progresso: nessuna ricerca"
-#: client/text.c:475
+#: client/text.c:534
#, fuzzy, c-format
msgid "Progress: %d turn/advance"
msgid_plural "Progress: %d turns/advance"
msgstr[0] "Progresso: %d turno/scoperta (%d punti/turno)"
msgstr[1] "Progresso: %d turni/scoperta (%d punti/turno)"
-#: client/text.c:480
+#: client/text.c:539
#, fuzzy, c-format
msgid "%d bulb/turn"
msgid_plural "%d bulbs/turn"
msgstr[0] "%d turno"
msgstr[1] "%d turni"
-#: client/text.c:485
+#: client/text.c:544
#, c-format
msgid ", %d bulb/turn from team"
msgid_plural ", %d bulbs/turn from team"
msgstr[0] ""
msgstr[1] ""
-#: client/text.c:512
+#: client/text.c:571
#, fuzzy, c-format
msgid "%d/- (never)"
msgstr "(Mai)"
-#: client/text.c:524
+#: client/text.c:583
#, fuzzy, c-format
msgid "%d/%d (%d turn)"
msgid_plural "%d/%d (%d turns)"
msgstr[0] "%d/%d %d turni"
msgstr[1] "%d/%d %d turni"
-#: client/text.c:527
+#: client/text.c:586
#, fuzzy, c-format
msgid "%d/%d (never)"
msgstr "(Mai)"
-#: client/text.c:564
+#: client/text.c:623
#, fuzzy, c-format
msgid "%d step"
msgid_plural "%d steps"
msgstr[0] "(%d passo)"
msgstr[1] "(%d passi)"
-#: client/text.c:566
+#: client/text.c:625
#, c-format
msgid "%d bulb"
msgid_plural "%d bulbs"
msgstr[0] ""
msgstr[1] ""
-#: client/text.c:570 client/agents/cma_fec.c:269 client/agents/cma_fec.c:313
+#: 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
#, c-format
msgid "%d turn"
@@ -9830,89 +9901,89 @@ msgid_plural "%d turns"
msgstr[0] "%d turno"
msgstr[1] "%d turni"
-#: client/text.c:592
+#: client/text.c:651
#, c-format
msgid "Population: %s"
msgstr "Popolazione: %s"
-#: client/text.c:595
+#: client/text.c:654
#, fuzzy, c-format
msgid "Year: %s (T%d)"
msgstr "Anno: %s"
-#: client/text.c:598
+#: client/text.c:657
#, fuzzy, c-format
msgid "Gold: %d (%+d)"
msgstr "Auri: %d"
-#: client/text.c:600
+#: client/text.c:659
#, c-format
msgid "Tax: %d Lux: %d Sci: %d"
msgstr "Imp: %d Lusso: %d Sci:%d"
-#: client/text.c:607
+#: client/text.c:666
#, fuzzy
msgid "Moving: Nobody"
msgstr "a %s"
-#: client/text.c:609
+#: client/text.c:668
#, fuzzy, c-format
msgid "Moving: %s"
msgstr "a %s"
-#: client/text.c:613
+#: client/text.c:672
msgid "(Click for more info)"
msgstr ""
-#: client/text.c:629
+#: client/text.c:688
#, fuzzy, c-format
msgid "%s People"
msgstr "%s Benveuto"
-#: client/text.c:633
+#: client/text.c:692
#, fuzzy, c-format
msgid "Turn: %d"
msgstr "Terreno: %s"
-#: client/text.c:635 client/gui-win32/inteldlg.c:111
+#: client/text.c:694 client/gui-win32/inteldlg.c:111
#: client/gui-xaw/inteldlg.c:208
#, c-format
msgid "Gold: %d"
msgstr "Auri: %d"
-#: client/text.c:636
+#: client/text.c:695
#, c-format
msgid "Net Income: %d"
msgstr ""
#. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:639
+#: client/text.c:698
#, fuzzy, c-format
msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
msgstr "Imp: %d Lusso: %d Sci:%d"
-#: client/text.c:643
+#: client/text.c:702
#, fuzzy, c-format
msgid "Researching %s: %s"
msgstr "Ricerca: %s (%d/%d)"
-#: client/text.c:650
+#: client/text.c:709
#, c-format
msgid "Global warming chance: %d%% (%+d%%/turn)"
msgstr ""
-#: client/text.c:653
+#: client/text.c:712
#, c-format
msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
msgstr ""
-#: client/text.c:658 client/gui-win32/inteldlg.c:104
+#: client/text.c:717 client/gui-win32/inteldlg.c:104
#: client/gui-xaw/inteldlg.c:200
#, c-format
msgid "Government: %s"
msgstr "Governo: %s"
-#: client/text.c:682
+#: client/text.c:741
#, fuzzy, c-format
msgid "%d unit"
msgid_plural "%d units"
@@ -9920,58 +9991,58 @@ msgstr[0] " unit
msgstr[1] " unità"
#. TRANS: Impossible to reach goto target tile
-#: client/text.c:715 client/gui-sdl/mapview.c:566
+#: client/text.c:774 client/gui-sdl/mapview.c:566
msgid "?goto:Unreachable"
msgstr ""
-#: client/text.c:717 client/gui-sdl/mapview.c:568
+#: client/text.c:776 client/gui-sdl/mapview.c:568
#, c-format
msgid "Turns to target: %d"
msgstr "Turni all'obiettivo: %d"
-#: client/text.c:719 client/gui-sdl/mapview.c:570
+#: client/text.c:778 client/gui-sdl/mapview.c:570
#, fuzzy, c-format
msgid "Turns to target: %d to %d"
msgstr "Turni all'obiettivo: %d"
-#: client/text.c:725 client/gui-sdl/mapview.c:576
+#: client/text.c:784 client/gui-sdl/mapview.c:576
#, fuzzy, c-format
msgid "%d unit selected"
msgid_plural "%d units selected"
msgstr[0] "Scelta unità"
msgstr[1] "Scelta unità"
-#: client/text.c:730 client/gui-sdl/mapview.c:581
+#: client/text.c:789 client/gui-sdl/mapview.c:581
#, fuzzy
msgid "No units selected."
msgstr "nazione selezionata"
-#: client/text.c:804 client/gui-sdl/mapview.c:654
+#: client/text.c:863 client/gui-sdl/mapview.c:654
#, c-format
msgid "Others: %d civil; %d military"
msgstr ""
-#: client/text.c:806 client/gui-sdl/mapview.c:656
+#: client/text.c:865 client/gui-sdl/mapview.c:656
#, c-format
msgid "Others: %d civilian"
msgstr ""
-#: client/text.c:808 client/gui-sdl/mapview.c:658
+#: client/text.c:867 client/gui-sdl/mapview.c:658
#, c-format
msgid "Others: %d military"
msgstr ""
-#: client/text.c:839
+#: client/text.c:898
#, fuzzy
msgid "No units to upgrade!"
msgstr "nessuna unità ha potuto essere aggiornata."
-#: client/text.c:864
+#: client/text.c:923
#, fuzzy
msgid "None of these units may be upgraded."
msgstr "nessuna unità ha potuto essere aggiornata."
-#: client/text.c:870
+#: client/text.c:929
#, fuzzy, c-format
msgid ""
"Upgrade %d unit for %d gold?\n"
@@ -9986,14 +10057,14 @@ msgstr[1] ""
"Aggiornare %s a %s per %d auri?\n"
"Il tesoro contiene %d auri."
-#: client/text.c:891
+#: client/text.c:950
#, fuzzy
msgid "Shows your progress in researching the current technology."
msgstr ""
"Mostra l'avanzamento nell'attuale ricerca tecnologica.\n"
"%s: %d/%d."
-#: client/text.c:897
+#: client/text.c:956
#, fuzzy
msgid "no research target."
msgstr ""
@@ -10001,46 +10072,46 @@ msgstr ""
"(nessuna ricerca)"
#. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:900
+#: client/text.c:959
#, c-format
msgid "%s: %d/%d."
msgstr ""
-#: client/text.c:920
+#: client/text.c:979
#, fuzzy
msgid "Shows the progress of global warming:"
msgstr ""
"Mostra l'avanzamento del riscaldamento globale:\n"
"%d."
-#: client/text.c:921
+#: client/text.c:980
#, fuzzy, c-format
msgid "Pollution rate: %d%%"
msgstr "Inquinamento: %3d"
-#: client/text.c:923
+#: client/text.c:982
#, c-format
msgid "Chance of catastrophic warming each turn: %d%%"
msgstr ""
-#: client/text.c:939
+#: client/text.c:998
#, fuzzy
msgid "Shows the progress of nuclear winter:"
msgstr ""
"Mostra l'avanzamento dell'inverno nucleare:\n"
"%d."
-#: client/text.c:940
+#: client/text.c:999
#, fuzzy, c-format
msgid "Fallout rate: %d%%"
msgstr "Tasso massimo per %s: %d%%"
-#: client/text.c:942
+#: client/text.c:1001
#, c-format
msgid "Chance of catastrophic winter each turn: %d%%"
msgstr ""
-#: client/text.c:957
+#: client/text.c:1016
#, fuzzy
msgid "Shows your current government:"
msgstr ""
@@ -10048,25 +10119,25 @@ msgstr ""
"%s."
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:981
+#: client/text.c:1040
#, c-format
msgid "Population: %5d"
msgstr "Popolazione: %5d"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:1043
#, c-format
msgid "Support: %5d %%"
msgstr "Supporto: %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:1047
#, c-format
msgid "Energy: %5d %%"
msgstr "Energia: %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:992
+#: client/text.c:1051
#, c-format
msgid "Mass: %5d ton"
msgid_plural "Mass: %5d tons"
@@ -10074,96 +10145,97 @@ msgstr[0] "Massa: %5d tonnellata"
msgstr[1] "Massa: %5d tonnellate"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1057
#, c-format
msgid "Travel time: %5.1f years"
msgstr "Tempo di viaggio: %5.1f anni"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1061
msgid "Travel time: N/A "
msgstr "Tempo di viaggio: - "
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1065
#, c-format
msgid "Success prob.: %5d %%"
msgstr "Probabilità di successo: %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1010
+#: client/text.c:1069
#, c-format
msgid "Year of arrival: %8s"
msgstr "Anno di arrivo: %8s"
-#: client/text.c:1030
+#: client/text.c:1089
msgid "?timeout:off"
msgstr "?timeout:-"
-#: client/text.c:1054
+#: client/text.c:1113
#, c-format
msgid "?seconds:%02ds"
msgstr "?seconds:%02ds"
-#: client/text.c:1056
+#: client/text.c:1115
#, c-format
msgid "?mins/secs:%02dm %02ds"
msgstr "?mins/secs:%02dm %02ds"
-#: client/text.c:1058
+#: client/text.c:1117
#, c-format
msgid "?hrs/mns:%02dh %02dm"
msgstr "?hrs/mns:%02dh %02dm"
-#: client/text.c:1060
+#: client/text.c:1119
#, c-format
msgid "?dys/hrs:%02dd %02dh"
msgstr "?dys/hrs:%02dg %02dh"
-#: client/text.c:1063
+#: client/text.c:1122
msgid "?duration:overflow"
msgstr "?duration:troppo grande"
-#: client/text.c:1084
+#: client/text.c:1143
#, c-format
msgid "%6d.%02d ms"
msgstr "%6d.%02d ms"
-#. TRANS: "Republic of the Poles"
-#: client/text.c:1127
-#, c-format
-msgid "%s of the %s"
-msgstr "%s dei %s"
+#. TRANS: <nation adjective> <government name>.
+#. * E.g. "Polish Republic".
+#: client/text.c:1188
+#, fuzzy, c-format
+msgid "?nationgovernment:%s %s"
+msgstr "Governo: %s"
#. TRANS: "Observer: 1985"
-#: client/text.c:1137
+#: client/text.c:1198
#, fuzzy, c-format
msgid "Observer: %s"
msgstr "Osservatore"
-#: client/text.c:1155
+#: client/text.c:1216
msgid "Buildings: "
msgstr "Strutture: "
-#: client/text.c:1172 client/text.c:1211
+#: client/text.c:1233 client/text.c:1272
msgid "None. "
msgstr "Nessuno. "
-#: client/text.c:1174 client/text.c:1213
+#: client/text.c:1235 client/text.c:1274
msgid "?clistend:."
msgstr "."
-#: client/text.c:1192
+#: client/text.c:1253
msgid "Wonders: "
msgstr "Meraviglie: "
-#: client/text.c:1247
+#: client/text.c:1308
#, 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:1251
+#: client/text.c:1312
#, fuzzy, c-format
msgid "%d content before penalty."
msgid_plural "%d content before penalty."
@@ -10171,45 +10243,47 @@ 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:1257
+#: client/text.c:1318
#, 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."
-#. TRANS: Martial law opening parenthesis
-#: client/text.c:1279
-msgid "Martial law in effect ("
+#: client/text.c:1339
+#, fuzzy
+msgid "Unlimited martial law in effect."
msgstr "Legge marziale in effetto ("
-#. TRANS: no [unit] maximum
-#: client/text.c:1284
-msgid "no maximum, "
-msgstr "nessun massimo, "
-
-#: client/text.c:1287
-#, c-format
-msgid "%d unit maximum, "
-msgid_plural "%d units maximum, "
-msgstr[0] "massimo %d unità massimo, "
-msgstr[1] "%d unità massimo, "
+#: client/text.c:1341
+#, fuzzy, c-format
+msgid "%d military unit may impose martial law."
+msgid_plural "Up to %d military units may impose martial law."
+msgstr[0] ""
+"* Un'unità non militare (non può attaccare o imporre la legge marziale).\n"
+msgstr[1] ""
+"* Un'unità non militare (non può attaccare o imporre la legge marziale).\n"
-#. TRANS: Martial law closing parenthesis
-#: client/text.c:1294
-#, c-format
-msgid "%d per unit). "
-msgstr "%d per unità). "
+#: client/text.c:1345
+#, fuzzy, c-format
+msgid "Each military unit makes %d unhappy citizen content."
+msgid_plural "Each military unit makes %d unhappy citizens content."
+msgstr[0] ""
+"Intrattiene i cittadini di una città, rendendo soddisfatti tre cittadini "
+"scontenti."
+msgstr[1] ""
+"Intrattiene i cittadini di una città, rendendo soddisfatti tre cittadini "
+"scontenti."
-#: client/text.c:1298
+#: client/text.c:1352
msgid "Military units in the field may cause unhappiness. "
msgstr "Unità militari sul campo possono causare malcontento. "
-#: client/text.c:1301
+#: client/text.c:1355
msgid "Military units have no happiness effect. "
msgstr "Le unità militari non hanno effetti sul malcontento. "
-#: client/text.c:1316
+#: client/text.c:1370
#, c-format
msgid "Luxury: %d total."
msgstr "Lusso: %d totale."
@@ -10234,7 +10308,7 @@ msgstr ""
"Il client non supporta la grafica top-down. Uso invece la grafica "
"predefinita."
-#: client/tilespec.c:3968
+#: client/tilespec.c:3966
#, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
@@ -10257,12 +10331,12 @@ msgid ""
"have a look."
msgstr ""
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
-#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:599
+#: client/gui-gtk-2.0/cityrep.c:624 client/gui-sdl/citydlg.c:2009
msgid "none"
msgstr "nessuno"
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:645
msgid "custom"
msgstr "personalizzato"
@@ -10571,7 +10645,7 @@ msgstr "Stabilisci una _rotta commerciale"
msgid "Enter Marketplace"
msgstr "Entra nel mercato"
-#: client/gui-gtk-2.0/chatline.c:144 client/gui-win32/chatline.c:134
+#: client/gui-gtk-2.0/chatline.c:218 client/gui-win32/chatline.c:134
#: client/gui-xaw/chatline.c:120
msgid "Cleared output window."
msgstr "Finestra messaggi cancellata."
@@ -10652,11 +10726,11 @@ msgid "%d/%d %d turns"
msgstr "%d/%d %d turni"
#: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:821
+#: client/gui-gtk-2.0/cityrep.c:1027
msgid "_Buy"
msgstr "Co_mpra"
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:869
#, fuzzy
msgid "_Production"
msgstr "Pro_duzione"
@@ -10679,12 +10753,12 @@ msgid "Entertainers"
msgstr "Animatori"
#: client/gui-gtk-2.0/citydlg.c:1029 client/gui-win32/citydlg.c:1989
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2403
msgid "Scientists"
msgstr "Scienziati"
#: client/gui-gtk-2.0/citydlg.c:1030 client/gui-win32/citydlg.c:1991
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2404
msgid "Taxmen"
msgstr "Esattori"
@@ -10778,7 +10852,7 @@ msgstr "Unit
msgid "Present units %d"
msgstr "Unità presenti %d"
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:1019
msgid "Cen_ter"
msgstr "C_entra"
@@ -10867,32 +10941,62 @@ msgstr "Rinomina citt
msgid "What should we rename the city to?"
msgstr "Qual è il nuovo nome della città?"
-#: client/gui-gtk-2.0/cityrep.c:699
+#: client/gui-gtk-2.0/cityrep.c:794
+#, fuzzy
+msgid "(no worklists defined)"
+msgstr "(lista lavori)"
+
+#: client/gui-gtk-2.0/cityrep.c:876
msgid "Chan_ge"
msgstr "_Cambia"
-#: client/gui-gtk-2.0/cityrep.c:703
+#: client/gui-gtk-2.0/cityrep.c:880
msgid "Add _First"
msgstr "Aggiungi _primo"
-#: client/gui-gtk-2.0/cityrep.c:707
+#: client/gui-gtk-2.0/cityrep.c:884
msgid "Add _Next"
msgstr "Aggiungi _prossimo"
-#: client/gui-gtk-2.0/cityrep.c:711
+#: client/gui-gtk-2.0/cityrep.c:888
+#, fuzzy
+msgid "Add _2nd Last"
+msgstr "Aggiungi _ultimo"
+
+#: client/gui-gtk-2.0/cityrep.c:892
msgid "Add _Last"
msgstr "Aggiungi _ultimo"
-#: client/gui-gtk-2.0/cityrep.c:715
+#: client/gui-gtk-2.0/cityrep.c:899
+#, fuzzy
+msgid "Set Worklist"
+msgstr "Lista lavori"
+
+#: client/gui-gtk-2.0/cityrep.c:905
+#, fuzzy
+msgid "Append Worklist"
+msgstr "Rinomina lista lavori"
+
+#: client/gui-gtk-2.0/cityrep.c:911
+#, fuzzy
+msgid "Clear _Worklist"
+msgstr "Obiettivo _Lista lavori:"
+
+#: client/gui-gtk-2.0/cityrep.c:916
+#, fuzzy
+msgid "Gover_nor"
+msgstr "Governatore"
+
+#: client/gui-gtk-2.0/cityrep.c:921
msgid "_Select"
msgstr "_Seleziona"
-#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
+#: client/gui-gtk-2.0/cityrep.c:925 client/gui-gtk-2.0/plrdlg.c:521
#, fuzzy
msgid "_Display"
msgstr "_Mostra"
-#: client/gui-gtk-2.0/cityrep.c:800 client/gui-gtk-2.0/menu.c:808
+#: 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-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
#: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -10902,101 +11006,101 @@ msgstr "_Mostra"
msgid "Cities"
msgstr "Città"
-#: client/gui-gtk-2.0/cityrep.c:817
+#: client/gui-gtk-2.0/cityrep.c:1023
#, fuzzy
msgid "_Inspect"
msgstr "F_inestra"
-#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
-#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-sdl/helpdlg.c:297 client/gui-win32/menu.c:342
-#: client/gui-xaw/menu.c:241
+#: 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
+#: client/gui-gtk-2.0/cityrep.c:1518 client/gui-gtk-2.0/menu.c:823
+#: client/gui-gtk-2.0/menu.c:825 client/gui-gtk-2.0/menu.c:827
+#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:831
+#: client/gui-gtk-2.0/menu.c:833 client/gui-sdl/helpdlg.c:297
+#: client/gui-win32/menu.c:342 client/gui-xaw/menu.c:241
msgid "Improvements"
msgstr "Strutture cittadine"
-#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
-#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
-#: client/gui-xaw/menu.c:247
+#: client/gui-gtk-2.0/cityrep.c:1441 client/gui-gtk-2.0/cityrep.c:1460
+#: client/gui-gtk-2.0/cityrep.c:1479 client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1522 client/gui-xaw/menu.c:247
msgid "Wonders"
msgstr "Meraviglie del mondo"
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1662 client/gui-win32/cityrep.c:439
#: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
msgid "All Cities"
msgstr "Tutte le città"
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1667 client/gui-win32/cityrep.c:440
msgid "No Cities"
msgstr "Nessuna città"
-#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1672 client/gui-win32/cityrep.c:441
msgid "Invert Selection"
msgstr "Inverti la selezione"
-#: client/gui-gtk-2.0/cityrep.c:1420
+#: client/gui-gtk-2.0/cityrep.c:1682
msgid "Building Units"
msgstr "Costruisci unità"
-#: client/gui-gtk-2.0/cityrep.c:1426
+#: client/gui-gtk-2.0/cityrep.c:1688
msgid "Building Improvements"
msgstr "Costruisci strutture cittadine"
-#: client/gui-gtk-2.0/cityrep.c:1432
+#: client/gui-gtk-2.0/cityrep.c:1694
msgid "Building Wonders"
msgstr "Costruisci meraviglie"
-#: client/gui-gtk-2.0/cityrep.c:1444
+#: client/gui-gtk-2.0/cityrep.c:1706
msgid "Building Unit"
msgstr "Costruisci unità"
-#: client/gui-gtk-2.0/cityrep.c:1448
+#: client/gui-gtk-2.0/cityrep.c:1710
msgid "Building Improvement"
msgstr "Costruisci struttura cittadina"
-#: client/gui-gtk-2.0/cityrep.c:1452
+#: client/gui-gtk-2.0/cityrep.c:1714
msgid "Building Wonder"
msgstr "Costruisci meraviglia"
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1722 client/gui-win32/cityrep.c:443
msgid "Coastal Cities"
msgstr "Le città sulla costa"
-#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1727 client/gui-win32/cityrep.c:444
msgid "Same Island"
msgstr "Sulla stessa isola"
-#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1737 client/gui-win32/cityrep.c:447
msgid "Supported Units"
msgstr "Unità supportate"
-#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1740 client/gui-win32/cityrep.c:454
msgid "Units Present"
msgstr "Unità presenti"
-#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1744 client/gui-win32/cityrep.c:469
msgid "Improvements in City"
msgstr "Strutture cittadine"
-#: client/gui-gtk-2.0/cityrep.c:1486
+#: client/gui-gtk-2.0/cityrep.c:1748
msgid "Wonders in City"
msgstr "Meraviglie in città"
-#: client/gui-gtk-2.0/cityrep.c:1495
+#: client/gui-gtk-2.0/cityrep.c:1757
msgid "Available Units"
msgstr "Unità disponibili"
-#: client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1760
msgid "Available Improvements"
msgstr "Strutture cittadini disponibili"
-#: client/gui-gtk-2.0/cityrep.c:1501
+#: client/gui-gtk-2.0/cityrep.c:1763
msgid "Available Wonders"
msgstr "Meraviglie disponibili"
-#: client/gui-gtk-2.0/cityrep.c:1625
+#: client/gui-gtk-2.0/cityrep.c:1882
#, fuzzy, c-format
msgid "Total Buy Cost: %d"
msgstr "Costo totale:"
@@ -11069,11 +11173,11 @@ 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:186
+#: client/gui-gtk-2.0/dialogs.c:196 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:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
#, fuzzy
msgid "Inspect _City"
msgstr "Apri finestra _città"
@@ -11102,10 +11206,10 @@ msgstr "Scegliete cosa saccheggiare:"
msgid "Unit"
msgstr "Unità"
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
-#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
-#: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
-#: manual/civmanual.c:302 data/Freeciv.in:80
+#: 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-win32/plrdlg.c:335 manual/civmanual.c:302 data/Freeciv.in:80
msgid "Name"
msgstr "Nome"
@@ -11131,7 +11235,7 @@ 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:1036 data/Freeciv.in:3371
+#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
#, fuzzy
msgid "Pick Nation"
msgstr "Centrale di polizia"
@@ -11214,7 +11318,7 @@ msgstr "_Mappe"
msgid "_Advances"
msgstr "_Tecnologie"
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:910
+#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr "_Città"
@@ -11319,108 +11423,178 @@ msgstr "Scegliete una destinazione"
msgid "Show _All Cities"
msgstr "_Mostra tutte le città"
-#: client/gui-gtk-2.0/gui_main.c:150
+#: client/gui-gtk-2.0/gui_main.c:162
msgid "Show Map Scrollbars"
msgstr "Mostra barre di scorrimento per la mappa"
-#: client/gui-gtk-2.0/gui_main.c:151
+#: client/gui-gtk-2.0/gui_main.c:163
msgid "Disable this option to hide the scrollbars on the map view."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:155
+#: client/gui-gtk-2.0/gui_main.c:167
msgid "Keyboardless goto"
msgstr "\"Vai a\" senza tastiera"
-#: client/gui-gtk-2.0/gui_main.c:156
+#: client/gui-gtk-2.0/gui_main.c:168
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:161
+#: client/gui-gtk-2.0/gui_main.c:173
msgid "Keep dialogs on top"
msgstr "Mantieni finestre in vista"
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:174
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:166
+#: client/gui-gtk-2.0/gui_main.c:178
msgid "Show worklist task icons"
msgstr "Mostra icone compiti della lista lavori"
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:179
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:171
+#: client/gui-gtk-2.0/gui_main.c:183
msgid "Enable status report tabs"
msgstr "Abilità i tab nel rapporto sullo stato"
-#: client/gui-gtk-2.0/gui_main.c:172
+#: client/gui-gtk-2.0/gui_main.c:184
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:177 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:189 client/gui-win32/gui_main.c:110
msgid "Better fog-of-war drawing"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:178 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:190 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:277 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:195
+msgid "Show time for each chat message"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:196
+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
+msgid "Split bottom notebook area"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:202
+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
+msgid "New message events go to top of list"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:208
+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
+msgid "Show extra message window buttons"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:214
+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 "
+"is disabled, these buttons will not appear (you can still double-click with "
+"the left mouse button or right-click on a row to inspect or goto "
+"respectively). This option will only take effect once the message window is "
+"closed and reopened."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:224
+#, 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
+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
+msgid "Plain chat messages are sent to allies only"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:231
+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 "
+"messages will be sent as public chat messages. To send a public chat message "
+"with this option enabled, prefix the message with a single colon ':'. This "
+"option can also be set using a toggle button beside the chat entry (only "
+"visible in multiplayer games)."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:340 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:723 client/gui-gtk-2.0/gui_main.c:1345
+#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
msgid "Freeciv"
msgstr "Freeciv"
-#: client/gui-gtk-2.0/gui_main.c:1088 client/gui-gtk-2.0/gui_main.c:1095
+#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
#: 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:1095 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1232 client/gui-sdl/mapctrl.c:1566
#: client/gui-sdl/mapview.c:1082
msgid "Shift+Return"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1127 client/gui-gtk-2.0/menu.c:770
-#: client/gui-gtk-2.0/menu.c:772 client/gui-gtk-2.0/menu.c:774
-#: client/gui-gtk-2.0/menu.c:776 client/gui-gtk-2.0/menu.c:778
-#: client/gui-gtk-2.0/menu.c:780 client/gui-gtk-2.0/menu.c:782
-#: client/gui-gtk-2.0/menu.c:784 client/gui-gtk-2.0/menu.c:786
-#: client/gui-gtk-2.0/menu.c:788 client/gui-gtk-2.0/menu.c:790
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-gtk-2.0/menu.c:804 client/gui-gtk-2.0/menu.c:806
-#: client/gui-gtk-2.0/menu.c:808 client/gui-gtk-2.0/menu.c:810
-#: client/gui-gtk-2.0/menu.c:812 client/gui-gtk-2.0/menu.c:814
-#: client/gui-gtk-2.0/menu.c:816 client/gui-gtk-2.0/menu.c:818
-#: client/gui-gtk-2.0/menu.c:820 client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/gui_main.c:1266 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
+#: client/gui-gtk-2.0/menu.c:811 client/gui-gtk-2.0/menu.c:813
+#: client/gui-gtk-2.0/menu.c:815 client/gui-gtk-2.0/menu.c:817
+#: client/gui-gtk-2.0/menu.c:819 client/gui-gtk-2.0/menu.c:821
+#: client/gui-gtk-2.0/menu.c:823 client/gui-gtk-2.0/menu.c:825
+#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
+#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
+#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
+#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
+#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
+#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
#: data/Freeciv.in:2028
msgid "View"
msgstr "Visualizza"
-#: client/gui-gtk-2.0/gui_main.c:1208
+#: client/gui-gtk-2.0/gui_main.c:1359
msgid "Chat"
msgstr "Chat"
-#: client/gui-gtk-2.0/gui_main.c:1224 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1377 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"
@@ -11431,80 +11605,84 @@ 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:1491
+#: client/gui-gtk-2.0/gui_main.c:1392
+msgid "Allies Only"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:1657
msgid "Not _ready"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
+#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
#, fuzzy
msgid "_Ready"
msgstr "_Sveglia tutti"
-#: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2132
+#: 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
msgid "_Start"
msgstr "_Inizia"
-#: client/gui-gtk-2.0/gui_main.c:1520
+#: client/gui-gtk-2.0/gui_main.c:1686
#, fuzzy
msgid "_Take Player"
msgstr "Città"
-#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
+#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
#, fuzzy
msgid "Pick _Nation"
msgstr "Centrale di polizia"
-#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
+#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
#, fuzzy
msgid "_Observe"
msgstr "Osservatore"
-#: client/gui-gtk-2.0/gui_main.c:1532
+#: client/gui-gtk-2.0/gui_main.c:1698
#, fuzzy
msgid "Do not _observe"
msgstr "%s da ora osserva %s"
-#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
#, fuzzy
msgid "<AI>"
msgstr "IA"
-#: client/gui-gtk-2.0/gui_main.c:1557
+#: client/gui-gtk-2.0/gui_main.c:1723
msgid "<Novice AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1560
+#: client/gui-gtk-2.0/gui_main.c:1726
#, fuzzy
msgid "<Easy AI>"
msgstr "IA"
-#: client/gui-gtk-2.0/gui_main.c:1563
+#: client/gui-gtk-2.0/gui_main.c:1729
msgid "<Normal AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1732
#, fuzzy
msgid "<Hard AI>"
msgstr "IA"
-#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1742 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:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
#, fuzzy
msgid "Observer"
msgstr "Osservatore"
-#: client/gui-gtk-2.0/gui_main.c:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
#, fuzzy
msgid "Detached"
msgstr "Morto"
-#: client/gui-gtk-2.0/gui_main.c:1899
+#: client/gui-gtk-2.0/gui_main.c:2073
msgid "Are you sure you want to quit?"
msgstr "Sei sicuro di voler terminare?"
@@ -11737,479 +11915,515 @@ msgstr "_Tecnologie"
msgid "Foreign Intelligence: %s Empire"
msgstr "Spionaggio: Impero %s"
-#: client/gui-gtk-2.0/mapctrl.c:195 client/gui-sdl/mapctrl.c:2565
+#: client/gui-gtk-2.0/mapctrl.c:179 client/gui-sdl/mapctrl.c:2565
#: client/gui-sdl/menu.c:839 client/gui-sdl/menu.c:1021
#: client/gui-win32/mapctrl.c:353
msgid "Build New City"
msgstr "Costruzione nuova città"
-#: client/gui-gtk-2.0/mapctrl.c:196 client/gui-sdl/mapctrl.c:2594
+#: client/gui-gtk-2.0/mapctrl.c:180 client/gui-sdl/mapctrl.c:2594
#: client/gui-win32/mapctrl.c:354 client/gui-xaw/mapctrl.c:89
msgid "What should we call our new city?"
msgstr "Come dobbiamo chiamare la nostra nuova città?"
-#: client/gui-gtk-2.0/mapview.c:147
+#: client/gui-gtk-2.0/mapview.c:158
msgid "Shows your current luxury/science/tax rates;click to toggle them."
msgstr ""
"Mostra il tasso corrente di lusso/scienza/imposte; clicca per modificarli."
-#: client/gui-gtk-2.0/mapview.c:692 client/gui-win32/canvas.c:275
+#: client/gui-gtk-2.0/mapview.c:702 client/gui-win32/canvas.c:275
msgid "Better fog will only work in truecolor. Disabling it"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:250
+#: client/gui-gtk-2.0/menu.c:256
msgid "Leaving a local game will end it!"
msgstr "Abbandonare una partita locale significa terminarla!"
-#: client/gui-gtk-2.0/menu.c:700 client/gui-win32/menu.c:303
+#: client/gui-gtk-2.0/menu.c:727 client/gui-win32/menu.c:303
msgid "_Game"
msgstr "_Gioco"
-#: client/gui-gtk-2.0/menu.c:702 client/gui-gtk-2.0/menu.c:704
-#: client/gui-gtk-2.0/menu.c:706 client/gui-gtk-2.0/menu.c:708
-#: client/gui-gtk-2.0/menu.c:710 client/gui-gtk-2.0/menu.c:712
-#: client/gui-gtk-2.0/menu.c:714 client/gui-gtk-2.0/menu.c:717
-#: client/gui-gtk-2.0/menu.c:720 client/gui-gtk-2.0/menu.c:722
-#: client/gui-gtk-2.0/menu.c:724 client/gui-gtk-2.0/menu.c:726
-#: client/gui-gtk-2.0/menu.c:728 client/gui-gtk-2.0/menu.c:730
-#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:736
-#: client/gui-gtk-2.0/menu.c:738 client/gui-gtk-2.0/menu.c:740
+#: client/gui-gtk-2.0/menu.c:729 client/gui-gtk-2.0/menu.c:731
+#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:735
+#: client/gui-gtk-2.0/menu.c:737 client/gui-gtk-2.0/menu.c:739
+#: client/gui-gtk-2.0/menu.c:741 client/gui-gtk-2.0/menu.c:744
+#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
+#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
+#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
+#: client/gui-gtk-2.0/menu.c:760 client/gui-gtk-2.0/menu.c:763
+#: client/gui-gtk-2.0/menu.c:765 client/gui-gtk-2.0/menu.c:767
#: data/Freeciv.in:2026
msgid "Game"
msgstr "Gioco"
-#: client/gui-gtk-2.0/menu.c:704 client/gui-gtk-2.0/menu.c:706
-#: client/gui-gtk-2.0/menu.c:708
+#: client/gui-gtk-2.0/menu.c:731 client/gui-gtk-2.0/menu.c:733
+#: client/gui-gtk-2.0/menu.c:735
msgid "_Chat"
msgstr "_Chat"
-#: client/gui-gtk-2.0/menu.c:706 client/gui-win32/menu.c:314
+#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:314
msgid "_Clear Log"
msgstr "_Cancella finestra messaggi"
-#: client/gui-gtk-2.0/menu.c:708 client/gui-win32/menu.c:313
+#: client/gui-gtk-2.0/menu.c:735 client/gui-win32/menu.c:313
#, fuzzy
msgid "_Write Log"
msgstr "Esp_orta log"
-#: client/gui-gtk-2.0/menu.c:710 client/gui-win32/menu.c:304
+#: client/gui-gtk-2.0/menu.c:737 client/gui-win32/menu.c:304
msgid "Local _Options"
msgstr "_Opzioni locali"
-#: client/gui-gtk-2.0/menu.c:712 client/gui-win32/menu.c:305
+#: client/gui-gtk-2.0/menu.c:739 client/gui-win32/menu.c:305
msgid "_Message Options"
msgstr "Opzioni dei _messaggi"
-#: client/gui-gtk-2.0/menu.c:717
+#: client/gui-gtk-2.0/menu.c:744
#, fuzzy
msgid "_Reload Tileset"
msgstr "Set grafico"
-#: client/gui-gtk-2.0/menu.c:720
+#: client/gui-gtk-2.0/menu.c:747
#, fuzzy
msgid "Save Options on _Exit"
msgstr "Opzioni correnti del server"
-#: client/gui-gtk-2.0/menu.c:722
+#: client/gui-gtk-2.0/menu.c:749
#, fuzzy
msgid "Sa_ve Options"
msgstr "Opzioni gioco"
-#: client/gui-gtk-2.0/menu.c:726 client/gui-win32/menu.c:308
+#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:308
msgid "Server O_ptions"
msgstr "O_pzioni server"
-#: client/gui-gtk-2.0/menu.c:730 client/gui-win32/menu.c:310
+#: client/gui-gtk-2.0/menu.c:757 client/gui-win32/menu.c:310
msgid "_Save Game"
msgstr "_Salva partita"
-#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:311
+#: client/gui-gtk-2.0/menu.c:760 client/gui-win32/menu.c:311
msgid "Save Game _As..."
msgstr "Salva partita _come..."
-#: client/gui-gtk-2.0/menu.c:738
+#: client/gui-gtk-2.0/menu.c:765
#, fuzzy
msgid "_Leave"
msgstr "_Esci"
-#: client/gui-gtk-2.0/menu.c:740 client/gui-win32/menu.c:317
+#: client/gui-gtk-2.0/menu.c:767 client/gui-win32/menu.c:317
msgid "_Quit"
msgstr "_Esci"
-#: client/gui-gtk-2.0/menu.c:745 client/gui-win32/menu.c:321
+#: client/gui-gtk-2.0/menu.c:772 client/gui-win32/menu.c:321
msgid "Gov_ernment"
msgstr "Gov_erno"
-#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
-#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
-#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:774 client/gui-gtk-2.0/menu.c:776
+#: client/gui-gtk-2.0/menu.c:778 client/gui-gtk-2.0/menu.c:780
+#: client/gui-gtk-2.0/menu.c:782 client/gui-gtk-2.0/menu.c:784
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
#: client/gui-xaw/menu.c:248 data/Freeciv.in:2027 data/helpdata.txt:1320
msgid "Government"
msgstr "Governo"
-#: client/gui-gtk-2.0/menu.c:749 client/gui-win32/menu.c:322
+#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:322
msgid "_Tax Rates"
msgstr "Livello dei _tassi"
-#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:324
+#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:324
msgid "_Find City"
msgstr "_Cerca città"
-#: client/gui-gtk-2.0/menu.c:755 client/gui-win32/menu.c:325
+#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:325
msgid "_Worklists"
msgstr "_Liste lavori"
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
-#: client/gui-gtk-2.0/menu.c:764 client/gui-win32/menu.c:327
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
+#: client/gui-gtk-2.0/menu.c:791 client/gui-win32/menu.c:327
msgid "_Change Government"
msgstr "_Cambia governo"
-#: client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:788
msgid "_Revolution..."
msgstr "_Rivoluzione..."
-#: client/gui-gtk-2.0/menu.c:764 client/gui-gtk-2.0/menu.c:970
+#: client/gui-gtk-2.0/menu.c:791 client/gui-gtk-2.0/menu.c:1013
#: client/gui-win32/menu.c:431
msgid "_Government"
msgstr "Go_verno"
-#: client/gui-gtk-2.0/menu.c:768 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:795 client/gui-gtk-2.0/menu.c:959
#: client/gui-win32/menu.c:334
msgid "_View"
msgstr "_Visualizza"
-#: client/gui-gtk-2.0/menu.c:772
+#: client/gui-gtk-2.0/menu.c:799
#, fuzzy
msgid "City Outlines"
msgstr "Opzioni della città"
-#: client/gui-gtk-2.0/menu.c:774 client/gui-win32/menu.c:335
+#: client/gui-gtk-2.0/menu.c:801 client/gui-win32/menu.c:335
msgid "Map _Grid"
msgstr "_Griglia sulla mappa"
-#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:336
+#: client/gui-gtk-2.0/menu.c:803 client/gui-win32/menu.c:336
msgid "National _Borders"
msgstr "Confini Na_zionali"
-#: client/gui-gtk-2.0/menu.c:778 client/gui-win32/menu.c:337
+#: client/gui-gtk-2.0/menu.c:805 client/gui-win32/menu.c:337
msgid "City _Names"
msgstr "_Nomi delle città"
-#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:338
+#: client/gui-gtk-2.0/menu.c:807 client/gui-win32/menu.c:338
msgid "City G_rowth"
msgstr "_Crescita Città"
-#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:339
+#: client/gui-gtk-2.0/menu.c:809 client/gui-win32/menu.c:339
msgid "City _Productions"
msgstr "_Produzione delle città"
-#: client/gui-gtk-2.0/menu.c:784 client/gui-sdl/optiondlg.c:1719
+#: client/gui-gtk-2.0/menu.c:811
+#, fuzzy
+msgid "City Buy Cost"
+msgstr "Costo totale:"
+
+#: client/gui-gtk-2.0/menu.c:813
+#, fuzzy
+msgid "City Traderoutes"
+msgstr "Rotte commerciali"
+
+#: client/gui-gtk-2.0/menu.c:815 client/gui-sdl/optiondlg.c:1719
msgid "Draw city worker map grid"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:788 client/gui-sdl/optiondlg.c:1635
+#: client/gui-gtk-2.0/menu.c:819 client/gui-sdl/optiondlg.c:1635
#: client/gui-win32/menu.c:340 client/gui-xaw/menu.c:148
#: client/gui-xaw/menu.c:246 manual/civmanual.c:220 data/helpdata.txt:1220
msgid "Terrain"
msgstr "Terreno"
-#: client/gui-gtk-2.0/menu.c:790 client/gui-win32/menu.c:341
+#: client/gui-gtk-2.0/menu.c:821 client/gui-win32/menu.c:341
#: client/gui-xaw/menu.c:149
msgid "Coastline"
msgstr "Linea costiera"
-#: client/gui-gtk-2.0/menu.c:796 client/gui-win32/menu.c:343
+#: client/gui-gtk-2.0/menu.c:827 client/gui-win32/menu.c:343
msgid "Roads & Rails"
msgstr "Strade & ferrovie"
-#: client/gui-gtk-2.0/menu.c:800 client/gui-sdl/optiondlg.c:1933
+#: client/gui-gtk-2.0/menu.c:831 client/gui-sdl/optiondlg.c:1933
#: client/gui-win32/menu.c:345 client/gui-xaw/menu.c:152
msgid "Mines"
msgstr "Miniere"
-#: client/gui-gtk-2.0/menu.c:802 client/gui-win32/menu.c:346
+#: client/gui-gtk-2.0/menu.c:833 client/gui-win32/menu.c:346
msgid "Fortress & Airbase"
msgstr "Fortezze & basi aeree"
-#: client/gui-gtk-2.0/menu.c:804 client/gui-win32/menu.c:348
+#: client/gui-gtk-2.0/menu.c:835 client/gui-win32/menu.c:348
#: client/gui-xaw/menu.c:154
msgid "Specials"
msgstr "Risorse speciali"
-#: client/gui-gtk-2.0/menu.c:806 client/gui-win32/menu.c:349
+#: client/gui-gtk-2.0/menu.c:837 client/gui-win32/menu.c:349
#: client/gui-xaw/menu.c:155
msgid "Pollution & Fallout"
msgstr "Inquinamento & fallout"
-#: client/gui-gtk-2.0/menu.c:812 client/gui-win32/menu.c:352
+#: client/gui-gtk-2.0/menu.c:843 client/gui-win32/menu.c:352
#: client/gui-xaw/menu.c:158
msgid "Focus Unit"
msgstr "Unità attiva"
-#: client/gui-gtk-2.0/menu.c:814 client/gui-sdl/optiondlg.c:1854
+#: client/gui-gtk-2.0/menu.c:845 client/gui-sdl/optiondlg.c:1854
#: client/gui-win32/menu.c:353 client/gui-xaw/menu.c:159
msgid "Fog of War"
msgstr "Nebbia di guerra"
-#: client/gui-gtk-2.0/menu.c:818
+#: client/gui-gtk-2.0/menu.c:849
#, fuzzy
msgid "_Full Screen"
msgstr "Modalità a pieno schermo"
-#: client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/menu.c:853
msgid "_Center View"
msgstr "_Centra la vista"
-#: client/gui-gtk-2.0/menu.c:825 client/gui-win32/menu.c:358
+#: client/gui-gtk-2.0/menu.c:856 client/gui-win32/menu.c:358
msgid "_Orders"
msgstr "_Ordini"
-#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
-#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
-#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
-#: client/gui-gtk-2.0/menu.c:855 client/gui-gtk-2.0/menu.c:857
-#: client/gui-gtk-2.0/menu.c:859 client/gui-gtk-2.0/menu.c:861
-#: client/gui-gtk-2.0/menu.c:863 client/gui-gtk-2.0/menu.c:865
-#: client/gui-gtk-2.0/menu.c:867 client/gui-gtk-2.0/menu.c:869
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875 client/gui-gtk-2.0/menu.c:877
-#: client/gui-gtk-2.0/menu.c:879 client/gui-gtk-2.0/menu.c:881
-#: client/gui-gtk-2.0/menu.c:883 client/gui-gtk-2.0/menu.c:885
-#: client/gui-gtk-2.0/menu.c:887 client/gui-gtk-2.0/menu.c:889
-#: client/gui-gtk-2.0/menu.c:891 client/gui-gtk-2.0/menu.c:893
-#: client/gui-gtk-2.0/menu.c:895 client/gui-gtk-2.0/menu.c:897
-#: client/gui-gtk-2.0/menu.c:899 client/gui-gtk-2.0/menu.c:901
-#: client/gui-gtk-2.0/menu.c:903 data/Freeciv.in:2029
+#: client/gui-gtk-2.0/menu.c:858 client/gui-gtk-2.0/menu.c:860
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:864
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:868
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:872
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:876
+#: client/gui-gtk-2.0/menu.c:878 client/gui-gtk-2.0/menu.c:880
+#: client/gui-gtk-2.0/menu.c:882 client/gui-gtk-2.0/menu.c:884
+#: client/gui-gtk-2.0/menu.c:886 client/gui-gtk-2.0/menu.c:888
+#: client/gui-gtk-2.0/menu.c:890 client/gui-gtk-2.0/menu.c:892
+#: client/gui-gtk-2.0/menu.c:894 client/gui-gtk-2.0/menu.c:896
+#: client/gui-gtk-2.0/menu.c:898 client/gui-gtk-2.0/menu.c:900
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906 client/gui-gtk-2.0/menu.c:908
+#: client/gui-gtk-2.0/menu.c:910 client/gui-gtk-2.0/menu.c:912
+#: client/gui-gtk-2.0/menu.c:914 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:918 client/gui-gtk-2.0/menu.c:920
+#: client/gui-gtk-2.0/menu.c:922 client/gui-gtk-2.0/menu.c:924
+#: client/gui-gtk-2.0/menu.c:926 client/gui-gtk-2.0/menu.c:928
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
+#: client/gui-gtk-2.0/menu.c:946 data/Freeciv.in:2029
msgid "Orders"
msgstr "Ordini"
-#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:1444
+#: client/gui-gtk-2.0/menu.c:860 client/gui-gtk-2.0/menu.c:1489
#: client/gui-win32/menu.c:359
msgid "_Build City"
msgstr "Costruisci città (_B)"
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:1466
-#: client/gui-gtk-2.0/menu.c:1472 client/gui-win32/menu.c:360
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:1511
+#: client/gui-gtk-2.0/menu.c:1517 client/gui-win32/menu.c:360
msgid "Build _Road"
msgstr "Costruisci st_rada"
-#: client/gui-gtk-2.0/menu.c:833 client/gui-gtk-2.0/menu.c:1360
+#: 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 "Costruisci _irrigazione"
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:1361
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:1406
#: client/gui-win32/menu.c:362
msgid "Build _Mine"
msgstr "Costruisci _miniera"
-#: client/gui-gtk-2.0/menu.c:837 client/gui-gtk-2.0/menu.c:1362
+#: client/gui-gtk-2.0/menu.c:868 client/gui-gtk-2.0/menu.c:1407
msgid "Transf_orm Terrain"
msgstr "Trasf_orma terreno"
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:1508
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:1553
#: client/gui-win32/menu.c:364
msgid "Build _Fortress"
msgstr "Costruisci _fortezza"
-#: client/gui-gtk-2.0/menu.c:841 client/gui-win32/menu.c:365
+#: client/gui-gtk-2.0/menu.c:872 client/gui-win32/menu.c:365
msgid "Build Airbas_e"
msgstr "Costruisci base a_erea"
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:1514
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:1559
#: client/gui-win32/menu.c:366
msgid "Clean _Pollution"
msgstr "_Pulisci inquinamento"
-#: client/gui-gtk-2.0/menu.c:845 client/gui-win32/menu.c:367
+#: client/gui-gtk-2.0/menu.c:876 client/gui-win32/menu.c:367
msgid "Clean _Nuclear Fallout"
msgstr "Pulisci ricad_uta radioattiva"
-#: client/gui-gtk-2.0/menu.c:849 client/gui-win32/menu.c:369
+#: client/gui-gtk-2.0/menu.c:880 client/gui-win32/menu.c:369
msgid "_Sentry"
msgstr "_Sentinella"
-#: client/gui-gtk-2.0/menu.c:855 client/gui-win32/menu.c:372
+#: client/gui-gtk-2.0/menu.c:886 client/gui-win32/menu.c:372
msgid "Make _Homecity"
msgstr "Rendi città d'ori_gine"
-#: client/gui-gtk-2.0/menu.c:857 client/gui-win32/menu.c:373
+#: client/gui-gtk-2.0/menu.c:888 client/gui-win32/menu.c:373
msgid "_Load"
msgstr "_Carica"
-#: client/gui-gtk-2.0/menu.c:859
+#: client/gui-gtk-2.0/menu.c:890
msgid "_Unload Transporter"
msgstr "_Scarica cargo"
-#: client/gui-gtk-2.0/menu.c:861 client/gui-win32/menu.c:374
+#: client/gui-gtk-2.0/menu.c:892 client/gui-win32/menu.c:374
msgid "_Unload"
msgstr "Scarica"
-#: client/gui-gtk-2.0/menu.c:863 client/gui-win32/menu.c:375
+#: client/gui-gtk-2.0/menu.c:894 client/gui-win32/menu.c:375
msgid "Wake up o_thers"
msgstr "Sveglia gli al_tri"
-#: client/gui-gtk-2.0/menu.c:867
+#: client/gui-gtk-2.0/menu.c:898
msgid "_Auto Settler"
msgstr "Colonizza _automaticamente"
-#: client/gui-gtk-2.0/menu.c:869 client/gui-win32/menu.c:378
+#: client/gui-gtk-2.0/menu.c:900 client/gui-win32/menu.c:378
msgid "Auto E_xplore"
msgstr "Esp_lora automaticamente"
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906
msgid "_Connect"
msgstr "_Collega"
-#: client/gui-gtk-2.0/menu.c:871 client/gui-win32/menu.c:380
+#: client/gui-gtk-2.0/menu.c:902 client/gui-win32/menu.c:380
msgid "_Road"
msgstr "_Strada"
-#: client/gui-gtk-2.0/menu.c:873 client/gui-win32/menu.c:381
+#: client/gui-gtk-2.0/menu.c:904 client/gui-win32/menu.c:381
msgid "Rai_l"
msgstr "_Ferrovia"
-#: client/gui-gtk-2.0/menu.c:875 client/gui-win32/menu.c:382
+#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:382
msgid "_Irrigate"
msgstr "_Irriga"
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
#, fuzzy
msgid "Go _to"
msgstr "Vai a"
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
#, fuzzy
msgid "_Build city"
msgstr "Costruisci città (_B)"
-#: client/gui-gtk-2.0/menu.c:879
+#: client/gui-gtk-2.0/menu.c:910
msgid "Patrol (_Q)"
msgstr "Pattugliame_nto"
-#: client/gui-gtk-2.0/menu.c:881 client/gui-win32/menu.c:385
+#: client/gui-gtk-2.0/menu.c:912 client/gui-win32/menu.c:385
msgid "_Go to"
msgstr "_Vai a"
-#: client/gui-gtk-2.0/menu.c:883
+#: client/gui-gtk-2.0/menu.c:914
msgid "Go\\/Airlift to City"
msgstr "Vai\\/Aereotrasporta in una città"
-#: client/gui-gtk-2.0/menu.c:885 client/gui-sdl/menu.c:450
+#: client/gui-gtk-2.0/menu.c:916 client/gui-sdl/menu.c:450
#: client/gui-win32/menu.c:387 client/gui-xaw/menu.c:203
msgid "Return to nearest city"
msgstr "Ritorna alla città più vicina"
-#: client/gui-gtk-2.0/menu.c:889 client/gui-win32/menu.c:389
+#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:389
#: client/gui-xaw/menu.c:205
msgid "Disband Unit"
msgstr "Congeda unità"
-#: client/gui-gtk-2.0/menu.c:891 client/gui-sdl/citydlg.c:532
+#: client/gui-gtk-2.0/menu.c:922 client/gui-sdl/citydlg.c:532
#: data/Freeciv.in:1186
msgid "Upgrade unit"
msgstr "Aggiorna unità"
-#: client/gui-gtk-2.0/menu.c:893
+#: client/gui-gtk-2.0/menu.c:924
msgid "Diplomat\\/Spy Actions"
msgstr "Azioni diplomatiche\\/di spionaggio"
-#: client/gui-gtk-2.0/menu.c:895 client/gui-sdl/menu.c:399
+#: client/gui-gtk-2.0/menu.c:926 client/gui-sdl/menu.c:399
#: client/gui-win32/menu.c:391 client/gui-xaw/menu.c:209
msgid "Explode Nuclear"
msgstr "Esplosione nucleare"
-#: client/gui-gtk-2.0/menu.c:899
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/cityrep.c:882
+msgid "Select"
+msgstr "Seleziona"
+
+#: client/gui-gtk-2.0/menu.c:934
#, fuzzy
-msgid "Select same type"
-msgstr "Scegliete una città"
+msgid "Single"
+msgstr "Giungla"
+
+#: client/gui-gtk-2.0/menu.c:936
+msgid "Same Type On Tile"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:938
+msgid "All On Tile"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:940
+msgid "Same Type On Continent"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:942
+msgid "Same Type Everywhere"
+msgstr ""
-#: client/gui-gtk-2.0/menu.c:901 client/gui-win32/menu.c:393
+#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:393
msgid "_Wait"
msgstr "Attendi"
-#: client/gui-gtk-2.0/menu.c:903 client/gui-win32/menu.c:394
+#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:394
#: client/gui-xaw/menu.c:213
msgid "Done"
msgstr "Finito"
-#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:398
+#: client/gui-gtk-2.0/menu.c:949 client/gui-win32/menu.c:398
msgid "_Reports"
msgstr "_Rapporti"
-#: client/gui-gtk-2.0/menu.c:908 client/gui-gtk-2.0/menu.c:910
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:914
-#: client/gui-gtk-2.0/menu.c:916 client/gui-gtk-2.0/menu.c:918
-#: client/gui-gtk-2.0/menu.c:920 client/gui-gtk-2.0/menu.c:922
-#: client/gui-gtk-2.0/menu.c:924 client/gui-gtk-2.0/menu.c:926
-#: client/gui-gtk-2.0/menu.c:928 client/gui-gtk-2.0/menu.c:930
-#: client/gui-gtk-2.0/menu.c:932 data/Freeciv.in:2030
+#: client/gui-gtk-2.0/menu.c:951 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:957
+#: client/gui-gtk-2.0/menu.c:959 client/gui-gtk-2.0/menu.c:961
+#: client/gui-gtk-2.0/menu.c:963 client/gui-gtk-2.0/menu.c:965
+#: client/gui-gtk-2.0/menu.c:967 client/gui-gtk-2.0/menu.c:969
+#: client/gui-gtk-2.0/menu.c:971 client/gui-gtk-2.0/menu.c:973
+#: client/gui-gtk-2.0/menu.c:975 data/Freeciv.in:2030
msgid "Reports"
msgstr "Rapporti"
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:958
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:1001
#: client/gui-win32/menu.c:400 client/gui-win32/menu.c:425
msgid "_Units"
msgstr "_Unità"
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/menu.c:914 client/gui-win32/menu.c:402
+#: client/gui-gtk-2.0/menu.c:957 client/gui-win32/menu.c:402
#, fuzzy
msgid "_Nations"
msgstr "_Nazioni"
-#: client/gui-gtk-2.0/menu.c:918 client/gui-win32/menu.c:403
+#: client/gui-gtk-2.0/menu.c:961 client/gui-win32/menu.c:403
msgid "_Economy"
msgstr "_Economia"
#. TRANS: Research report action
-#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:405
+#: client/gui-gtk-2.0/menu.c:963 client/gui-win32/menu.c:405
#, fuzzy
msgid "_Research"
msgstr "_Ricerca"
-#: client/gui-gtk-2.0/menu.c:924 client/gui-win32/menu.c:407
+#: client/gui-gtk-2.0/menu.c:967 client/gui-win32/menu.c:407
msgid "_Wonders of the World"
msgstr "_Meraviglie del mondo"
-#: client/gui-gtk-2.0/menu.c:926 client/gui-win32/menu.c:408
+#: client/gui-gtk-2.0/menu.c:969 client/gui-win32/menu.c:408
msgid "_Top Five Cities"
msgstr "Le cinque città più _importanti"
-#: client/gui-gtk-2.0/menu.c:928 client/gui-win32/menu.c:409
+#: client/gui-gtk-2.0/menu.c:971 client/gui-win32/menu.c:409
msgid "_Messages"
msgstr "_Messaggi"
-#: client/gui-gtk-2.0/menu.c:930 client/gui-win32/menu.c:410
+#: client/gui-gtk-2.0/menu.c:973 client/gui-win32/menu.c:410
msgid "_Demographics"
msgstr "_Demografia"
-#: client/gui-gtk-2.0/menu.c:932 client/gui-gtk-2.0/plrdlg.c:471
+#: client/gui-gtk-2.0/menu.c:975 client/gui-gtk-2.0/plrdlg.c:354
#: client/gui-win32/menu.c:411
msgid "_Spaceship"
msgstr "_Astronave"
-#: client/gui-gtk-2.0/menu.c:936 client/gui-win32/menu.c:415
+#: client/gui-gtk-2.0/menu.c:979 client/gui-win32/menu.c:415
msgid "_Help"
msgstr "_Aiuto"
-#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
-#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
-#: client/gui-gtk-2.0/menu.c:946 client/gui-gtk-2.0/menu.c:948
-#: client/gui-gtk-2.0/menu.c:950 client/gui-gtk-2.0/menu.c:952
-#: client/gui-gtk-2.0/menu.c:954 client/gui-gtk-2.0/menu.c:956
-#: client/gui-gtk-2.0/menu.c:958 client/gui-gtk-2.0/menu.c:960
-#: client/gui-gtk-2.0/menu.c:962 client/gui-gtk-2.0/menu.c:964
-#: client/gui-gtk-2.0/menu.c:966 client/gui-gtk-2.0/menu.c:968
-#: client/gui-gtk-2.0/menu.c:970 client/gui-gtk-2.0/menu.c:972
-#: client/gui-gtk-2.0/menu.c:974 client/gui-gtk-2.0/menu.c:976
-#: client/gui-gtk-2.0/menu.c:978 client/gui-gtk-2.0/menu.c:980
+#: client/gui-gtk-2.0/menu.c:981 client/gui-gtk-2.0/menu.c:983
+#: client/gui-gtk-2.0/menu.c:985 client/gui-gtk-2.0/menu.c:987
+#: client/gui-gtk-2.0/menu.c:989 client/gui-gtk-2.0/menu.c:991
+#: client/gui-gtk-2.0/menu.c:993 client/gui-gtk-2.0/menu.c:995
+#: client/gui-gtk-2.0/menu.c:997 client/gui-gtk-2.0/menu.c:999
+#: client/gui-gtk-2.0/menu.c:1001 client/gui-gtk-2.0/menu.c:1003
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-gtk-2.0/menu.c:1007
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-gtk-2.0/menu.c:1011
+#: client/gui-gtk-2.0/menu.c:1013 client/gui-gtk-2.0/menu.c:1015
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-gtk-2.0/menu.c:1019
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-gtk-2.0/menu.c:1023
#: client/gui-gtk-2.0/repodlgs.c:313 client/gui-win32/citydlg.c:1077
#: client/gui-win32/repodlgs.c:289 client/gui-win32/wldlg.c:846
#: data/Freeciv.in:1466 data/Freeciv.in:2031 data/Freeciv.in:2101
@@ -12217,119 +12431,119 @@ msgstr "_Aiuto"
msgid "Help"
msgstr "Aiuto"
-#: client/gui-gtk-2.0/menu.c:940 client/gui-win32/menu.c:416
+#: client/gui-gtk-2.0/menu.c:983 client/gui-win32/menu.c:416
msgid "Language_s"
msgstr "Li_ngue"
-#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/menu.c:417
+#: client/gui-gtk-2.0/menu.c:985 client/gui-win32/menu.c:417
msgid "Co_nnecting"
msgstr "_Collegamento"
-#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:418
+#: client/gui-gtk-2.0/menu.c:987 client/gui-win32/menu.c:418
msgid "C_ontrols"
msgstr "C_ontrolli"
-#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:419
+#: client/gui-gtk-2.0/menu.c:989 client/gui-win32/menu.c:419
msgid "C_hatline"
msgstr "Linea di c_hat"
-#: client/gui-gtk-2.0/menu.c:948 client/gui-win32/menu.c:420
+#: client/gui-gtk-2.0/menu.c:991 client/gui-win32/menu.c:420
msgid "_Worklist Editor"
msgstr "Modifica _Lista lavori"
-#: client/gui-gtk-2.0/menu.c:950 client/gui-win32/menu.c:421
+#: client/gui-gtk-2.0/menu.c:993 client/gui-win32/menu.c:421
msgid "Citizen _Management"
msgstr "G_estione Cittadini"
-#: client/gui-gtk-2.0/menu.c:952 client/gui-win32/menu.c:422
+#: client/gui-gtk-2.0/menu.c:995 client/gui-win32/menu.c:422
msgid "_Playing"
msgstr "_Giocare"
-#: client/gui-gtk-2.0/menu.c:956 client/gui-win32/menu.c:424
+#: client/gui-gtk-2.0/menu.c:999 client/gui-win32/menu.c:424
msgid "City _Improvements"
msgstr "_Strutture cittadine"
-#: client/gui-gtk-2.0/menu.c:960 client/gui-win32/menu.c:426
+#: client/gui-gtk-2.0/menu.c:1003 client/gui-win32/menu.c:426
msgid "Com_bat"
msgstr "Com_battimento"
-#: client/gui-gtk-2.0/menu.c:962 client/gui-win32/menu.c:427
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-win32/menu.c:427
msgid "_ZOC"
msgstr "_ZDC"
-#: client/gui-gtk-2.0/menu.c:964 client/gui-win32/menu.c:428
+#: client/gui-gtk-2.0/menu.c:1007 client/gui-win32/menu.c:428
msgid "Techno_logy"
msgstr "T_ecnologia"
-#: client/gui-gtk-2.0/menu.c:966 client/gui-win32/menu.c:429
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-win32/menu.c:429
msgid "_Terrain"
msgstr "_Terreno"
-#: client/gui-gtk-2.0/menu.c:968 client/gui-win32/menu.c:430
+#: client/gui-gtk-2.0/menu.c:1011 client/gui-win32/menu.c:430
msgid "Won_ders"
msgstr "_Meraviglie del mondo"
-#: client/gui-gtk-2.0/menu.c:972 client/gui-win32/menu.c:432
+#: client/gui-gtk-2.0/menu.c:1015 client/gui-win32/menu.c:432
msgid "Happin_ess"
msgstr "_Benessere"
-#: client/gui-gtk-2.0/menu.c:974 client/gui-win32/menu.c:433
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-win32/menu.c:433
msgid "Space _Race"
msgstr "Corsa allo s_pazio"
-#: client/gui-gtk-2.0/menu.c:978 client/gui-win32/menu.c:435
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-win32/menu.c:435
msgid "_Copying"
msgstr "_Licenza"
-#: client/gui-gtk-2.0/menu.c:980 client/gui-win32/menu.c:436
+#: client/gui-gtk-2.0/menu.c:1023 client/gui-win32/menu.c:436
msgid "_About"
msgstr "_Informazioni su"
-#: client/gui-gtk-2.0/menu.c:1264
+#: client/gui-gtk-2.0/menu.c:1307
#, c-format
msgid "%s..."
msgstr "%s..."
-#: client/gui-gtk-2.0/menu.c:1352
+#: client/gui-gtk-2.0/menu.c:1397
#, c-format
msgid "Change to %s (_I)"
msgstr "Cambia _in %s"
-#: client/gui-gtk-2.0/menu.c:1353
+#: client/gui-gtk-2.0/menu.c:1398
#, c-format
msgid "Change to %s (_M)"
msgstr "Ca_mbia in %s"
-#: client/gui-gtk-2.0/menu.c:1354
+#: client/gui-gtk-2.0/menu.c:1399
#, c-format
msgid "Transf_orm to %s"
msgstr "Trasf_orma in %s"
-#: client/gui-gtk-2.0/menu.c:1427
+#: client/gui-gtk-2.0/menu.c:1472
msgid "Help _Build Wonder"
msgstr "Aiuta a costruire la meraviglia (_B)"
-#: client/gui-gtk-2.0/menu.c:1441
+#: client/gui-gtk-2.0/menu.c:1486
msgid "Add to City (_B)"
msgstr "Aggiungi alla città (_B)"
-#: client/gui-gtk-2.0/menu.c:1449
+#: client/gui-gtk-2.0/menu.c:1494
msgid "Make Trade _Route"
msgstr "Crea _rotta commerciale"
-#: client/gui-gtk-2.0/menu.c:1463
+#: client/gui-gtk-2.0/menu.c:1508
msgid "Build _Railroad"
msgstr "Costruisci fe_rrovia"
-#: client/gui-gtk-2.0/menu.c:1486
+#: client/gui-gtk-2.0/menu.c:1531
msgid "Bu_ild Farmland"
msgstr "Costruisci fattor_ia"
-#: client/gui-gtk-2.0/menu.c:1506
+#: client/gui-gtk-2.0/menu.c:1551
msgid "_Fortify"
msgstr "_Fortifica"
-#: client/gui-gtk-2.0/menu.c:1512
+#: client/gui-gtk-2.0/menu.c:1557
msgid "_Paradrop"
msgstr "_Paracadutare"
@@ -12366,13 +12580,32 @@ msgstr "Mes"
msgid "Pop"
msgstr "Apri"
-#: client/gui-gtk-2.0/messagewin.c:155 client/gui-sdl/messagewin.c:247
+#: client/gui-gtk-2.0/messagewin.c:186 client/gui-sdl/messagewin.c:247
#: client/gui-win32/messagewin.c:132 client/gui-xaw/menu.c:228
#: data/Freeciv.in:3273 data/Freeciv.in:3274 data/Freeciv.in:3283
msgid "Messages"
msgstr "Messaggi"
-#: client/gui-gtk-2.0/plrdlg.c:330
+#: client/gui-gtk-2.0/plrdlg.c:317
+msgid "_Meet"
+msgstr "_Incontro"
+
+#: client/gui-gtk-2.0/plrdlg.c:323
+#, fuzzy
+msgid "Cancel _Treaty"
+msgstr "_Cancella trattato"
+
+#: client/gui-gtk-2.0/plrdlg.c:329
+#, fuzzy
+msgid "_Withdraw Vision"
+msgstr "_Ritira la visione"
+
+#: client/gui-gtk-2.0/plrdlg.c:348
+#, fuzzy
+msgid "_Report"
+msgstr "_Rapporti"
+
+#: client/gui-gtk-2.0/plrdlg.c:386
msgid "?show:Dead Players"
msgstr ""
@@ -12380,280 +12613,283 @@ msgstr ""
#. TRANS: Nations report action
#. TRANS: Nations report title
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/plrdlg.c:350 client/gui-sdl/mapctrl.c:1580
+#: client/gui-gtk-2.0/plrdlg.c:406 client/gui-sdl/mapctrl.c:1580
#: client/gui-sdl/plrdlg.c:608 client/gui-win32/plrdlg.c:344
#: client/gui-xaw/menu.c:221 data/Freeciv.in:3192 data/Freeciv.in:3193
#, fuzzy
msgid "Nations"
msgstr "Nazione"
-#: client/gui-gtk-2.0/plrdlg.c:443
-msgid "_Intelligence"
-msgstr "_Spionaggio"
-
-#: client/gui-gtk-2.0/plrdlg.c:450
-msgid "_Meet"
-msgstr "_Incontro"
-
-#: client/gui-gtk-2.0/plrdlg.c:457
+#: client/gui-gtk-2.0/plrdlg.c:511
#, fuzzy
-msgid "Cancel _Treaty"
-msgstr "_Cancella trattato"
+msgid "Di_plomacy"
+msgstr "_Diplomazia"
-#: client/gui-gtk-2.0/plrdlg.c:464
-msgid "_Withdraw vision"
-msgstr "_Ritira la visione"
+#: client/gui-gtk-2.0/plrdlg.c:516
+msgid "_Intelligence"
+msgstr "_Spionaggio"
-#: client/gui-gtk-2.0/plrdlg.c:495
+#: client/gui-gtk-2.0/plrdlg.c:526
msgid "_AI"
msgstr "_IA"
-#: client/gui-gtk-2.0/plrdlg.c:501
+#: client/gui-gtk-2.0/plrdlg.c:532
msgid "_Toggle AI Mode"
msgstr "_Cambia Modalità IA"
-#: client/gui-gtk-2.0/pages.c:208
+#: client/gui-gtk-2.0/pages.c:221
msgid "Start _New Game"
msgstr "Inizia _nuova partita"
-#: client/gui-gtk-2.0/pages.c:214
+#: client/gui-gtk-2.0/pages.c:227
msgid "Start _Scenario Game"
msgstr "Inizia nuovo _scenario"
-#: client/gui-gtk-2.0/pages.c:220
+#: client/gui-gtk-2.0/pages.c:233
msgid "_Load Saved Game"
msgstr "Carica _partita"
-#: client/gui-gtk-2.0/pages.c:229
+#: client/gui-gtk-2.0/pages.c:239
msgid "C_onnect to Network Game"
msgstr "C_onnessione a una partita in rete"
-#: client/gui-gtk-2.0/pages.c:236
+#: client/gui-gtk-2.0/pages.c:247
#, fuzzy
msgid "Connect to Gaming _Zone"
msgstr "Connessione a una partita in rete"
-#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:300
#: client/gui-xaw/connectdlg.c:326
msgid "Passwords don't match, enter password."
msgstr "Le password non coincidono, inserisci password."
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:779 client/gui-gtk-2.0/pages.c:820
+#: client/gui-win32/connectdlg.c:916
msgid "Server Name"
msgstr "Nome server"
-#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
+#: 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
+#: data/Freeciv.in:96
msgid "Port"
msgstr "Porta"
-#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
+#: client/gui-win32/connectdlg.c:917
msgid "Version"
msgstr "Versione"
-#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
-#: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
+#: 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
msgid "Status"
msgstr "Stato"
-#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
-#: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
+#: 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
msgid "Players"
msgstr "Giocatori"
-#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
+#: client/gui-win32/connectdlg.c:918
msgid "Comment"
msgstr "Commento"
-#: client/gui-gtk-2.0/pages.c:747
+#: client/gui-gtk-2.0/pages.c:786
msgid "Local _Area Network"
msgstr "_Rete locale"
-#: client/gui-gtk-2.0/pages.c:783
+#: client/gui-gtk-2.0/pages.c:827
msgid "Internet _Metaserver"
msgstr "Internet _Metaserver"
-#: client/gui-gtk-2.0/pages.c:817
+#: client/gui-gtk-2.0/pages.c:864
msgid "_Host:"
msgstr "_Host:"
-#: client/gui-gtk-2.0/pages.c:834
+#: client/gui-gtk-2.0/pages.c:881
msgid "_Port:"
msgstr "_Porta:"
-#: client/gui-gtk-2.0/pages.c:851
+#: client/gui-gtk-2.0/pages.c:898
msgid "_Login:"
msgstr "_Ingresso:"
-#: client/gui-gtk-2.0/pages.c:869
+#: client/gui-gtk-2.0/pages.c:916
msgid "Pass_word:"
msgstr "Pass_word:"
-#: client/gui-gtk-2.0/pages.c:887
+#: client/gui-gtk-2.0/pages.c:934
msgid "Conf_irm Password:"
msgstr "Conf_erma Password:"
-#: client/gui-gtk-2.0/pages.c:912
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: 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/wldlg.c:800 client/gui-win32/wldlg.c:806
+msgid "Type"
+msgstr "Tipo"
+
+#: client/gui-gtk-2.0/pages.c:952 client/gui-win32/plrdlg.c:337
+#: data/Freeciv.in:88
+msgid "Host"
+msgstr "Computer"
+
+#: client/gui-gtk-2.0/pages.c:981
#, fuzzy
msgid "C_onnect"
msgstr "Collega"
-#: client/gui-gtk-2.0/pages.c:1142
+#: client/gui-gtk-2.0/pages.c:1211
#, fuzzy, c-format
msgid "Connection name: %s"
msgstr "Connessione in avanzamento."
-#: client/gui-gtk-2.0/pages.c:1145
+#: client/gui-gtk-2.0/pages.c:1214
#, fuzzy, c-format
msgid "Player name: %s"
msgstr "?Player:Nome"
-#: client/gui-gtk-2.0/pages.c:1150
+#: client/gui-gtk-2.0/pages.c:1219
#, fuzzy, c-format
msgid "Host: %s"
msgstr "Server:"
-#: client/gui-gtk-2.0/pages.c:1158
+#: client/gui-gtk-2.0/pages.c:1227
msgid "Player/conn info"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1185
+#: client/gui-gtk-2.0/pages.c:1254
#, fuzzy, c-format
msgid "%s info"
msgstr "Informazioni città"
-#: client/gui-gtk-2.0/pages.c:1196
+#: client/gui-gtk-2.0/pages.c:1265
#, fuzzy
msgid "Toggle player ready"
msgstr "aitoggle <nome-giocatore>"
-#: client/gui-gtk-2.0/pages.c:1204
+#: client/gui-gtk-2.0/pages.c:1273
#, fuzzy
msgid "Pick nation"
msgstr "Centrale di polizia"
-#: client/gui-gtk-2.0/pages.c:1214
+#: client/gui-gtk-2.0/pages.c:1283
msgid "Observe this player"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1221
+#: client/gui-gtk-2.0/pages.c:1290
#, fuzzy
msgid "Take this player"
msgstr "Città"
-#: client/gui-gtk-2.0/pages.c:1238
+#: client/gui-gtk-2.0/pages.c:1307
#, fuzzy
msgid "Cut connection"
msgstr "Chiusura del collegamento %s."
-#: client/gui-gtk-2.0/pages.c:1248
+#: client/gui-gtk-2.0/pages.c:1317
#, fuzzy
msgid "Aitoggle player"
msgstr "aitoggle <nome-giocatore>"
-#: client/gui-gtk-2.0/pages.c:1257
+#: client/gui-gtk-2.0/pages.c:1326
#, fuzzy
msgid "Remove player"
msgstr "Rimosso giocatore %s."
-#: client/gui-gtk-2.0/pages.c:1268
+#: client/gui-gtk-2.0/pages.c:1337
msgid "Give info access"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1276
+#: client/gui-gtk-2.0/pages.c:1345
msgid "Give ctrl access"
msgstr ""
#. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1338
+#: client/gui-gtk-2.0/pages.c:1407
#, fuzzy, c-format
msgid "Put on %s"
msgstr "Popolazione: %s"
-#: client/gui-gtk-2.0/pages.c:1442
+#: client/gui-gtk-2.0/pages.c:1511
#, fuzzy
msgid "Number of _Players (including AI):"
msgstr "_Numero di giocatori (incluse le IA):"
-#: client/gui-gtk-2.0/pages.c:1465
+#: client/gui-gtk-2.0/pages.c:1534
#, fuzzy
msgid "AI Skill _Level:"
msgstr "livello _AI:"
-#: client/gui-gtk-2.0/pages.c:1481
+#: client/gui-gtk-2.0/pages.c:1550
#, fuzzy
msgid "Ruleset _Version:"
msgstr "Capo:"
-#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
msgid "_More Game Options..."
msgstr "Ulteriori _opzioni gioco..."
-#: client/gui-gtk-2.0/pages.c:1514
+#: client/gui-gtk-2.0/pages.c:1583
#, fuzzy
msgid "Record"
msgstr "Rapporto"
-#: client/gui-gtk-2.0/pages.c:1519
+#: client/gui-gtk-2.0/pages.c:1588
#, fuzzy
msgid "Rating"
msgstr "Scrittura"
-#: client/gui-gtk-2.0/pages.c:1525
+#: client/gui-gtk-2.0/pages.c:1594
#, fuzzy
msgid "Ready"
msgstr "Tutti pronti"
-#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
-#: data/nation/slovakian.ruleset:26
-msgid "Leader"
-msgstr "Capo"
+#: client/gui-gtk-2.0/pages.c:1601
+#, fuzzy
+msgid "?player:Leader"
+msgstr "?Player:Nome"
-#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1732 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:1752
+#: client/gui-gtk-2.0/pages.c:1824
msgid "Choose Saved Game to _Load:"
msgstr "Scegli la partita salvata da _caricare"
-#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
-#: client/gui-gtk-2.0/pages.c:2375
+#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
+#: client/gui-gtk-2.0/pages.c:2451
msgid "_Browse..."
msgstr "_Sfoglia..."
-#: client/gui-gtk-2.0/pages.c:1839
+#: client/gui-gtk-2.0/pages.c:1911
msgid "Choose a Scenario"
msgstr "Scegli uno scenario"
-#: client/gui-gtk-2.0/pages.c:1926
+#: client/gui-gtk-2.0/pages.c:1998
msgid "Choose a _Scenario:"
msgstr "Scegli uno _scenario:"
-#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
-#: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
-#: client/gui-win32/wldlg.c:806
-msgid "Type"
-msgstr "Tipo"
-
-#: client/gui-gtk-2.0/pages.c:2101
+#: client/gui-gtk-2.0/pages.c:2173
msgid "Choose a _nation to play:"
msgstr "Scegliete la _nazione con cui giocare:"
-#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2363 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:2372 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2448 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr "Salva partita"
-#: client/gui-gtk-2.0/pages.c:2413
+#: client/gui-gtk-2.0/pages.c:2489
msgid "Saved _Games:"
msgstr "_Salva partita:"
-#: client/gui-gtk-2.0/pages.c:2440
+#: client/gui-gtk-2.0/pages.c:2516
msgid "Save _Filename:"
msgstr "Salva nome _file:"
@@ -13008,7 +13244,7 @@ msgstr "Chiudi dialogo"
msgid "Total users logged in : %d"
msgstr ""
-#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1094
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
msgid "Back"
msgstr "Indietro"
@@ -13018,7 +13254,7 @@ msgid "Start"
msgstr "_Inizia"
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:775
+#: client/gui-win32/connectdlg.c:777
msgid "Load Game"
msgstr "Carica partita"
@@ -13057,12 +13293,12 @@ msgid "Make new homecity"
msgstr "Rendi città d'origine"
#: client/gui-sdl/citydlg.c:546 client/gui-sdl/citydlg.c:1418
-#: client/gui-sdl/connectdlg.c:307 client/gui-sdl/connectdlg.c:616
-#: client/gui-sdl/connectdlg.c:802 client/gui-sdl/connectdlg.c:984
+#: 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/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1039
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
#: 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
@@ -13110,7 +13346,7 @@ msgstr "Compra!"
#: client/gui-sdl/diplodlg.c:1335 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:2427
+#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
#: client/gui-xaw/cityrep.c:666 client/gui-xaw/cma_fe.c:327
#: client/gui-xaw/cma_fe.c:511 client/gui-xaw/cma_fe.c:765
#: client/gui-xaw/messagedlg.c:72 client/gui-xaw/optiondlg.c:76
@@ -13126,7 +13362,7 @@ msgstr "No"
#: client/gui-sdl/diplodlg.c:1345 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:2427 client/gui-xaw/cityrep.c:666
+#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
#: client/gui-xaw/cma_fe.c:327 client/gui-xaw/cma_fe.c:511
#: client/gui-xaw/cma_fe.c:765 client/gui-xaw/messagedlg.c:72
#: client/gui-xaw/optiondlg.c:76 client/gui-xaw/optiondlg.c:304
@@ -13428,41 +13664,41 @@ msgstr "Applica per una volta"
msgid "Release city"
msgstr "_Rilascia città"
-#: client/gui-sdl/connectdlg.c:238
+#: client/gui-sdl/connectdlg.c:239
#, fuzzy
msgid "Creating Server List..."
msgstr "Scelta del server per Freeciv"
-#: client/gui-sdl/connectdlg.c:279 client/gui-sdl/connectdlg.c:343
+#: client/gui-sdl/connectdlg.c:280 client/gui-sdl/connectdlg.c:344
#, fuzzy
msgid "No LAN servers found"
msgstr "Server di rete locale"
-#: client/gui-sdl/connectdlg.c:281 client/gui-sdl/connectdlg.c:345
+#: client/gui-sdl/connectdlg.c:282 client/gui-sdl/connectdlg.c:346
msgid "No public servers found"
msgstr ""
-#: client/gui-sdl/connectdlg.c:555
+#: client/gui-sdl/connectdlg.c:556
#, fuzzy
msgid "Player Name :"
msgstr "?Player:Nome"
-#: client/gui-sdl/connectdlg.c:571
+#: client/gui-sdl/connectdlg.c:572
#, fuzzy
msgid "Freeciv Server :"
msgstr "Scelta del server per Freeciv"
-#: client/gui-sdl/connectdlg.c:588
+#: client/gui-sdl/connectdlg.c:589
#, fuzzy
msgid "Port :"
msgstr "Porta:"
-#: client/gui-sdl/connectdlg.c:608 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr "Collega"
-#: client/gui-sdl/connectdlg.c:794 client/gui-sdl/connectdlg.c:977
+#: client/gui-sdl/connectdlg.c:795 client/gui-sdl/connectdlg.c:978
#: client/gui-xaw/connectdlg.c:145
msgid "Next"
msgstr "Successivo"
@@ -13755,7 +13991,7 @@ msgstr ""
#: client/gui-sdl/graphics.c:1021
#, c-format
-msgid "Unable to initialize SDL_ttf library: %s"
+msgid "Unable to initialize SDL_ttf library: %s"
msgstr ""
#: client/gui-sdl/graphics.c:1058
@@ -13842,12 +14078,6 @@ msgstr ""
msgid "Waiting for the beginning of the game"
msgstr ""
-#: client/gui-sdl/gui_string.c:608
-msgid ""
-"Couldn't find stdfont.ttf file. Please link/copy/move anyunicode ttf font to "
-"data dir as stdfont.ttf"
-msgstr ""
-
#. TRANS: Future Technology
#: client/gui-sdl/gui_tilespec.c:506
msgid "FT"
@@ -14460,12 +14690,12 @@ msgid "Leave Game"
msgstr "Salva partita"
#: client/gui-sdl/optiondlg.c:2302 client/gui-sdl/pages.c:255
-#: client/gui-win32/connectdlg.c:1098 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1100 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:963
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
msgid "Start New Game"
msgstr "Inizia nuova partita"
@@ -14592,8 +14822,8 @@ msgstr ""
msgid "%s max rate : %d%%"
msgstr "Tasso massimo per %s: %d%%"
-#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1081
-#: client/gui-win32/connectdlg.c:1089 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
+#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
msgid "Update"
msgstr "Aggiorna"
@@ -15024,10 +15254,6 @@ msgstr "Cambia tutto"
msgid "Refresh"
msgstr "Ridisegna"
-#: client/gui-win32/cityrep.c:882
-msgid "Select"
-msgstr "Seleziona"
-
#: client/gui-win32/cityrep.c:883
msgid "Configure"
msgstr "Configura"
@@ -15078,56 +15304,56 @@ msgstr "Impossibile caricare il file con la partita salvata"
msgid "Verify Password"
msgstr "Verifica password"
-#: client/gui-win32/connectdlg.c:912 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr "Scelta del server per Freeciv"
-#: client/gui-win32/connectdlg.c:913
+#: client/gui-win32/connectdlg.c:915
msgid "Local Area Network"
msgstr "Rete locale"
-#: client/gui-win32/connectdlg.c:947
+#: client/gui-win32/connectdlg.c:949
msgid "Welcome to Freeciv"
msgstr "Benvenuto a Freeciv"
-#: client/gui-win32/connectdlg.c:965
+#: client/gui-win32/connectdlg.c:967
msgid "Load Saved Game"
msgstr "Carica partita salvata"
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
msgid "Connect To Network Game"
msgstr "Connessione a una partita in rete"
-#: client/gui-win32/connectdlg.c:977
+#: client/gui-win32/connectdlg.c:979
msgid "Choose a nation to play"
msgstr "Scegli una nazione con cui giocare"
-#: client/gui-win32/connectdlg.c:1012
+#: client/gui-win32/connectdlg.c:1014
msgid "Number of players (Including AI):"
msgstr "Numero di giocatori (incluse le IA):"
-#: client/gui-win32/connectdlg.c:1020
+#: client/gui-win32/connectdlg.c:1022
msgid "AI skill level:"
msgstr "livello AI:"
-#: client/gui-win32/connectdlg.c:1034 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
msgid "Game Options"
msgstr "Opzioni gioco"
-#: client/gui-win32/connectdlg.c:1038
+#: client/gui-win32/connectdlg.c:1040
#, fuzzy
msgid "Start Game"
msgstr "Inizia nuova partita"
-#: client/gui-win32/connectdlg.c:1057
+#: client/gui-win32/connectdlg.c:1059
msgid "Login:"
msgstr "Ingresso:"
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
msgid "Host:"
msgstr "Server:"
-#: client/gui-win32/connectdlg.c:1060
+#: client/gui-win32/connectdlg.c:1062
msgid "Port:"
msgstr "Porta:"
@@ -15390,10 +15616,6 @@ msgid_plural "(idle %d turns)"
msgstr[0] "(inattivo %d turno)"
msgstr[1] "(inattivo %d turni)"
-#: client/gui-win32/plrdlg.c:337 data/Freeciv.in:88
-msgid "Host"
-msgstr "Computer"
-
#: client/gui-win32/plrdlg.c:355 data/Freeciv.in:3230
msgid "Intelligence"
msgstr "Spionaggio"
@@ -17168,12 +17390,12 @@ msgstr ""
#: data/helpdata.txt:781
msgid ""
-" To have a diplomatic relationship with another player, you must fist "
-"establish first contact with that player. To establish first contact, you "
-"have to move one of your units next to a city or unit belonging to that "
-"player, or vice versa. Unless you establish an embassy with that player, you "
-"may again lose contact with them after a set number of turns without direct "
-"physical contact."
+" To have a diplomatic relationship with another player, you must first "
+"establish contact with that player. To establish contact, you have to move "
+"one of your units next to a city or unit belonging to that player, or vice "
+"versa. Unless you establish an embassy with that player, you may again lose "
+"contact with them after a set number of turns without direct physical "
+"contact."
msgstr ""
#: data/helpdata.txt:788
@@ -20060,7 +20282,7 @@ msgid "Communism"
msgstr "Comunismo"
#: data/default/governments.ruleset:121 data/civ2/governments.ruleset:118
-#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:26
+#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:27
msgid "Comrade"
msgstr "Compagno"
@@ -21070,6 +21292,11 @@ msgstr ""
"perso ed inoltre i gruppi di lavoratori, coloni e/o ingegneri sono "
"estremamente esposti ad attacchi nemici."
+#: data/default/units.ruleset:238
+#, fuzzy
+msgid "?unit:Workers"
+msgstr "Lavoratori"
+
#: data/default/units.ruleset:264
msgid ""
"Workers are one of the key units in the game. They can be used to irrigate "
@@ -21742,6 +21969,11 @@ msgid "Explorers are very useful for mapping unknown territory."
msgstr ""
"Gli esploratori sono molto utili per esplorare il territorio sconosciuto."
+#: data/default/units.ruleset:1864
+#, fuzzy
+msgid "?unit:Leader"
+msgstr "Capo"
+
#: data/default/units.ruleset:1892
msgid "This is you. If you lose this unit, you lose the game. So don't."
msgstr ""
@@ -22005,7 +22237,7 @@ msgid "Emir"
msgstr ""
#: data/nation/afghani.ruleset:25 data/nation/slovakian.ruleset:30
-#: data/nation/soviet.ruleset:27
+#: data/nation/soviet.ruleset:28
#, fuzzy
msgid "General Secretary"
msgstr "Primo Segretario"
@@ -22136,7 +22368,7 @@ msgstr "?plural:Americani"
msgid ""
"According to legend, the Armenian people are the descendants of Haik - the "
"great-great-grandson of Noah. The modern Republic of Armenia gained "
-"independence from Soviet in 1991 AD"
+"independence from the Soviet Union in 1991."
msgstr ""
#: data/nation/assyrian.ruleset:3
@@ -23195,12 +23427,11 @@ msgstr "?plural:Italiani"
#: data/nation/illyrian.ruleset:6
msgid ""
-"Illyrians were Indo-European tribes who appeared in the western part of the "
-"Balkan Peninsula before 1000 BC, including the Dalmatians to the north, "
-"Corcyra island and Ambracia bay in prehistoric Epirus to the south, mixing "
-"with Thracians in Dardania to the east, and settling Messapia across the "
-"Adriatic Sea. Illyrian kingdoms were independent for centuries, until "
-"conquered by the Roman Republic."
+"Illyrians were Indo-European tribes who appeared in the western part of the "
+"Balkan Peninsula before 1000 BC, including Corcyra island and Ambracia bay "
+"in prehistoric Epirus to the south. They mixed with Thracians in Dardania to "
+"the east, and settled Messapia across the Adriatic Sea. Illyrian kingdoms "
+"were independent for centuries, until conquered by the Roman Republic."
msgstr ""
#: data/nation/inca.ruleset:3
@@ -23520,7 +23751,7 @@ msgid ""
"1953."
msgstr ""
-#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:28
+#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:29
#, fuzzy
msgid "Great Leader"
msgstr "Meraviglia"
@@ -23694,9 +23925,9 @@ msgstr "?plural:Malesi"
msgid ""
"Sub-Saharan Africa has been a cultural and ethnical melting pot for "
"millennia. In medieval times, the region was home to a succession of empires "
-"called the Sahelian kingdoms. Of these, the Islamic Mali empire with it's "
+"called the Sahelian kingdoms. Of these, the Islamic Mali empire with its "
"capital in Timbuktu was the most influential. This empire reigned from the "
-"14th to the 17th century and was famed for it's wealth and benevolent kings. "
+"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 ""
@@ -23763,8 +23994,8 @@ msgstr "?plural:Malesi"
#: data/nation/mayan.ruleset:6
msgid ""
-"The Mayans were a Mesoamerican civilization. Famous for building great "
-"pyramids and palaces in the jungle."
+"The Mayans were a Mesoamerican civilization. They are famous for building "
+"great pyramids and palaces in the jungle."
msgstr ""
#: data/nation/mayan.ruleset:19
@@ -24311,6 +24542,16 @@ msgstr ""
"L'odierna repubblica Ceca fu parte della Cecoslovacchia fino al 1993, che fu "
"parte dell'impero Austro-Ungarico fino al 1918."
+#: data/nation/slovakian.ruleset:26
+#, fuzzy
+msgid "?male:Leader"
+msgstr "Capo"
+
+#: data/nation/slovakian.ruleset:26
+#, fuzzy
+msgid "?female:Leader"
+msgstr "Compagno"
+
#: data/nation/slovakian.ruleset:29
#, fuzzy
msgid "Pope"
@@ -24355,11 +24596,12 @@ msgstr "?plural:Scozzesi"
#: data/nation/soviet.ruleset:6
msgid ""
-"Soviet Union's history starts in November 1917, when under Lenin's "
+"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 "
-"republics integrated into one country. Soviet Union became one of most "
-"powerful states in the 20th century. But by the end of 1991 due to many "
-"social shocks it disintegrated into fifteen independent countries"
+"republics integrated into one country. The Soviet Union became one of most "
+"powerful states in the 20th century, but by the end of 1991 it had "
+"disintegrated into fifteen independent countries due to social and economic "
+"problems."
msgstr ""
#: data/nation/spanish.ruleset:3
@@ -24769,8 +25011,8 @@ msgstr "?plural:Italiani"
#: data/nation/westphalian.ruleset:6
msgid ""
-"Westphalia, before becoming a Prussian province, was the western region the "
-"duchy of Saxony. Present-day it consists of the Northern part of the largest "
+"Westphalia, before becoming a Prussian province, was the western region of "
+"the duchy of Saxony. Today it makes up the northern part of the largest "
"German federal state, North Rhine-Westphalia."
msgstr ""
@@ -24920,7 +25162,7 @@ msgid ""
"The flag and background color indicate what civilization the city\n"
"belongs to (this will be useful when you meet other civilizations).\n"
"The top row of the bar also shows the name and size of the city, and\n"
-"will show one or more starts to indicate if there are units in the\n"
+"will show one or more stars to indicate if there are units in the\n"
"city. The bottom row shows what the city is building, and how long it\n"
"will take; it also shows how long the city will take to grow to the\n"
"next largest size."
@@ -24976,7 +25218,7 @@ msgid ""
"Now your city has grown to size five. As cities get larger unrest\n"
"becomes a problem. A city of this size will usually have one unhappy\n"
"citizen unless pacifying effects are used; meaning one entertainer\n"
-"specialist is required to keep your citzens content. This is basically\n"
+"specialist is required to keep your citizens content. This is basically\n"
"a wasted citizen.\n"
"\n"
"There are several things that can be done about this. One quick fix\n"
@@ -25048,7 +25290,7 @@ msgid ""
"existing cities. Generally when building new cities you want to make\n"
"sure that all tiles are covered by at least one city, but after that\n"
"it is best that your cities overlap as little as possible. Spreading\n"
-"out cities properly gives each city access to more resrouces, allowing\n"
+"out cities properly gives each city access to more resources, allowing\n"
"them to grow to larger sizes."
msgstr ""
@@ -25362,6 +25604,69 @@ msgstr "Squadra"
msgid "Team 31"
msgstr "Squadra"
+#, fuzzy
+#~ msgid "Auth config filename \"%s\" not allowed!"
+#~ msgstr "Quel nome non è permesso."
+
+#, fuzzy
+#~ msgid "The %s of the %s (%s)"
+#~ msgstr "La %s degli %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Illegal alliance structure detected: %s alliance to %s reduced to peace "
+#~ "treaty."
+#~ msgstr ""
+#~ "Trovata relazione di alleanza illegale: l'alleanza di %s con %s è ridotta "
+#~ "ad un trattato di pace."
+
+#, fuzzy
+#~ msgid "And, became more experienced!"
+#~ msgstr " ed è diventato più esperto!"
+
+#~ msgid "We can't take control of server, attempting to kill it."
+#~ msgstr ""
+#~ "Non è possibile prendere il controllo del server, tentativo di fermarlo."
+
+#, fuzzy
+#~ msgid "%s territory"
+#~ msgstr "Territorio dei %s"
+
+#, fuzzy
+#~ msgid "%s territory (%d turn cease-fire)"
+#~ msgid_plural "%s territory (%d turn cease-fire)"
+#~ msgstr[0] "territorio dei %s (%d turno di cessate-il-fuoco)"
+#~ msgstr[1] "territorio dei %s (%d turni di cessate-il-fuoco)"
+
+#, fuzzy
+#~ msgid "%s territory (%s)"
+#~ msgstr "Territorio dei %s %s"
+
+#~ msgid "City: %s (%s)"
+#~ msgstr "Città: %s (%s)"
+
+#, fuzzy
+#~ msgid "Unit: %s (%s)"
+#~ msgstr "Unità: %s (%s)"
+
+#~ msgid "%s of the %s"
+#~ msgstr "%s dei %s"
+
+#~ msgid "no maximum, "
+#~ msgstr "nessun massimo, "
+
+#~ msgid "%d unit maximum, "
+#~ msgid_plural "%d units maximum, "
+#~ msgstr[0] "massimo %d unità massimo, "
+#~ msgstr[1] "%d unità massimo, "
+
+#~ msgid "%d per unit). "
+#~ msgstr "%d per unità). "
+
+#, fuzzy
+#~ msgid "Select same type"
+#~ msgstr "Scegliete una città"
+
#~ msgid "Units: "
#~ msgstr "Unità: "
@@ -25475,10 +25780,6 @@ msgstr "Squadra"
#~ msgid ", nation %s"
#~ msgstr ", nazione %s"
-#, fuzzy
-#~ msgid ", team %s"
-#~ msgstr " vicino a %s"
-
#~ msgid "_Map"
#~ msgstr "_Mappa"
@@ -27375,9 +27676,6 @@ msgstr "Squadra"
#~ msgid "Error creating new AI player: %s\n"
#~ msgstr "Errore nel creare un nuovo giocatore IA: %s\n"
-#~ msgid "Metaserver topic string set to '%s'."
-#~ msgstr "Stringa del soggetto del metaserver impostata a '%s'."
-
#~ msgid "Metaserver topic string set to '%s', not reporting to metaserver."
#~ msgstr ""
#~ "Stringa del soggetto del metaserver impostata a '%s', non riportato al "
diff --git a/po/ja.gmo b/po/ja.gmo
index 2c1e49e..c238a2a 100644
Binary files a/po/ja.gmo and b/po/ja.gmo differ
diff --git a/po/ja.po b/po/ja.po
index 0ebea13..7eb6b5e 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -144,7 +144,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Freeciv 2.0.99-devel\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 07:45+0900\n"
+"POT-Creation-Date: 2009-03-29 21:13+0900\n"
"PO-Revision-Date: 2007-08-12 15:56+0300\n"
"Last-Translator: MITA Yuusuke <clefs at mail.goo.ne.jp>\n"
"Language-Team: SAWADA Katsuya <ama at petmail.net>\n"
@@ -797,7 +797,7 @@ msgid "Road"
msgstr "é“è·¯"
#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
-#: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
+#: client/gui-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"
@@ -814,7 +814,7 @@ msgid "Mine"
msgstr "資æº"
#: common/terrain.c:396 common/unit.c:548 server/report.c:124
-#: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
+#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr "公害"
@@ -863,7 +863,7 @@ msgstr "防御態勢をã¨ã£ãŸ"
msgid "Sentry"
msgstr "見張り番"
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:851 client/gui-sdl/menu.c:648
+#: common/unit.c:566 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 "略奪"
@@ -880,7 +880,7 @@ msgstr "探索"
msgid "Transform"
msgstr "変更"
-#: common/unit.c:584 client/text.c:106 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:584 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 "ä¸æ˜Ž"
@@ -957,11 +957,11 @@ msgstr "æ ¸å…µå™¨"
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1406
+#: common/unittype.c:349 client/helpdata.c:1404
msgid " and "
msgstr "ã¨"
-#: common/unittype.c:355 client/helpdata.c:1392
+#: common/unittype.c:355 client/helpdata.c:1390
msgid "?and:, "
msgstr "ã¨"
@@ -1594,38 +1594,32 @@ msgstr " (ベテラン)"
msgid "Illegal value for auth port: \"%s\""
msgstr ""
-# clefs
#: server/auth.c:281
#, fuzzy, c-format
-msgid "Auth config filename \"%s\" not allowed!"
-msgstr "ãã®åå‰ã¯è¨±å¯ã•ã‚Œã¦ã„ã¾ã›ã‚“。"
-
-#: server/auth.c:286
-#, fuzzy, c-format
msgid "Cannot load auth config file \"%s\"!"
msgstr "オーディオフィアル %s ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。"
# clefs
# ã“ã®ã‚ãŸã‚Šã¯ç¿»è¨³ã—ã¦ã‚‚，日本語ã§ã‚µãƒ¼ãƒã‚’走らã›ãªã„é™ã‚Šæ„味ãŒãªã„ã®ã§ã™ã‘ã©ã€‚
# freeciv.orgãªã©ã®ã‚µãƒ¼ãƒã‹ã‚‰ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã¯è‹±èªžã®ã¾ã¾ãªã‚ã‘ã§ã™ã€‚
-#: server/auth.c:397
+#: server/auth.c:392
#, c-format
msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
msgstr "è¦å‘Š: ゲストå '%s' ã¯æ—¢ã«ä½¿ã‚ã‚Œã¦ã„ã‚‹ã®ã§ '%s' ã«å¤‰æ›´ã—ã¾ã™ã€‚"
# clefs
-#: server/auth.c:404
+#: server/auth.c:399
msgid "Guests are not allowed on this server. Sorry."
msgstr "申ã—訳ã‚ã‚Šã¾ã›ã‚“ãŒï¼Œã“ã®ã‚µãƒ¼ãƒã§ã¯ã‚²ã‚¹ãƒˆã¯è¨±å¯ã•ã‚Œã¦ã„ã¾ã›ã‚“。"
# clefs
-#: server/auth.c:406
+#: server/auth.c:401
#, c-format
msgid "%s was rejected: Guests not allowed."
msgstr "%s ã¯æ‹’絶ã•ã‚Œã¾ã—ãŸ: ゲストã¯è¨±å¯ã•ã‚Œã¦ã„ã¾ã›ã‚“。"
# clefs
-#: server/auth.c:425
+#: server/auth.c:420
#, c-format
msgid ""
"There was an error reading the user database, logging in as guest connection "
@@ -1635,7 +1629,7 @@ msgstr ""
"グインã—ã¦ã„ã¾ã™ã€‚"
# clefs
-#: server/auth.c:431
+#: server/auth.c:426
msgid ""
"There was an error reading the user database and guest logins are not "
"allowed. Sorry"
@@ -1644,44 +1638,44 @@ msgstr ""
"ã‚Œã¦ã„ã¾ã›ã‚“。申ã—訳ãªã„。"
# clefs
-#: server/auth.c:434
+#: server/auth.c:429
#, c-format
msgid "%s was rejected: Database error and guests not allowed."
msgstr "%sã¯æ‹’絶ã•ã‚Œã¾ã—ãŸï¼šãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ãƒ»ã‚¨ãƒ©ãƒ¼ï¼Œã‹ã¤ã‚²ã‚¹ãƒˆä¸è¨±å¯"
-#: server/auth.c:441
+#: server/auth.c:436
#, c-format
msgid "Enter password for %s:"
msgstr "%sã®ãƒ‘スワードを入力ã—ã¦ãã ã•ã„："
# clefs
-#: server/auth.c:450
+#: server/auth.c:445
msgid "Enter a new password (and remember it)."
msgstr "æ–°ã—ã„パスワードを入力ã—ã¦ãã ã•ã„(後ã§ä½¿ã†ã®ã§å¿˜ã‚Œãªã„ã§)。"
# clefs
-#: server/auth.c:456
+#: server/auth.c:451
msgid "This server allows only preregistered users. Sorry."
msgstr "ã“ã®ã‚µãƒ¼ãƒã¯äº‹å‰ã«ç™»éŒ²ã—ãŸãƒ¦ãƒ¼ã‚¶ã—ã‹å—ã‘入れã¦ã„ã¾ã›ã‚“。ã”ã‚ã‚“ã。"
-#: server/auth.c:459
+#: server/auth.c:454
#, c-format
msgid "%s was rejected: Only preregister users allowed."
msgstr "%sã¯æ‹’絶ã•ã‚Œã¾ã—ãŸï¼šäº‹å‰ç™»éŒ²è€…ã®ã¿è¨±å¯ã—ã¦ã„ã¾ã™ã€‚"
# clefs
-#: server/auth.c:488 server/auth.c:547
+#: server/auth.c:483 server/auth.c:542
msgid "Sorry, too many wrong tries..."
msgstr "残念ã§ã™ãŒï¼Œå¤±æ•—回数ãŒé™åº¦ã‚’超ãˆã¾ã—ãŸâ€¦â€¦"
# clefs
-#: server/auth.c:489
+#: server/auth.c:484
#, c-format
msgid "%s was rejected: Too many wrong password verifies for new user."
msgstr "%sã¯æ‹’絶ã•ã‚Œã¾ã—ãŸï¼šæ–°è¦ãƒ¦ãƒ¼ã‚¶ã®ãƒ‘スワードèªè¨¼å¤±æ•—éŽå¤š"
# clefs
-#: server/auth.c:505
+#: server/auth.c:500
msgid ""
"Warning: There was an error in saving to the database. Continuing, but your "
"stats will not be saved."
@@ -1690,34 +1684,34 @@ msgstr ""
"ä¿å˜ã•ã‚Œã¾ã›ã‚“。"
# æ„訳 (clefs)
-#: server/auth.c:549
+#: server/auth.c:544
#, c-format
msgid "%s was rejected: Too many wrong password tries."
msgstr "%s ã¯æ‹’絶ã•ã‚Œã¾ã—ãŸ: パスワードèªè¨¼ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
# 戯訳 ;-)
-#: server/auth.c:558
+#: server/auth.c:553
msgid "Your password is incorrect. Try again."
msgstr "ã˜ã‚…ã‚‚ã‚“ãŒã€€ã¡ãŒã„ã¾ã™"
# clefs
-#: server/auth.c:569
+#: server/auth.c:564
msgid "Sorry, your connection timed out..."
msgstr "ã”ã‚ã‚“ãªã•ã„，ã‚ãªãŸã®æŽ¥ç¶šã¯ã‚¿ã‚¤ãƒ アウトã—ã¾ã—ãŸâ€¦â€¦"
# clefs
-#: server/auth.c:571
+#: server/auth.c:566
#, c-format
msgid "%s was rejected: Connection timeout waiting for password."
msgstr "%s ã¯æ‹’絶ã•ã‚Œã¾ã—ãŸ: パスワードèªè¨¼ä¸ã«ã‚¿ã‚¤ãƒ アウトã—ã¾ã—ãŸã€‚"
# clefs
-#: server/auth.c:636
+#: server/auth.c:631
#, c-format
msgid "Your password is too short, the minimum length is %d. Try again."
msgstr "ã“ã®ãƒ‘スワードã¯çŸã™ãŽã¾ã™ã€‚最低%dæ–‡å—ã§ï¼Œã‚‚ã†ä¸€åº¦ã€‚"
-#: server/auth.c:642
+#: server/auth.c:637
#, c-format
msgid ""
"The password must have at least %d capital letters, %d numbers, and be at "
@@ -2256,7 +2250,7 @@ msgstr "ã“れ㯠%s ã®ãŸã‚ã®ã‚µãƒ¼ãƒã§ã™ã€‚"
msgid "You can learn a lot about Freeciv at %s"
msgstr "Freeciv ã«ã¤ã„ã¦ã®æƒ…å ±ã‚’ %s ã§æä¾›ã—ã¦ã„ã¾ã™ã€‚"
-#: server/civserver.c:206 client/civclient.c:237 manual/civmanual.c:380
+#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
@@ -2290,14 +2284,14 @@ msgstr ""
msgid " -b --bind ADDR\tListen for clients on ADDR\n"
msgstr " -b, --bind ADDR\tアドレス ADDR ã§ã‚¯ãƒ©ã‚¤ã‚¢ãƒ³ãƒˆã‚’å¾…ã¤\n"
-#: server/civserver.c:217 client/civclient.c:241
+#: server/civserver.c:217 client/civclient.c:242
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:245
+#: server/civserver.c:221 client/civclient.c:246
msgid " -d, --debug NUM\tSet debug log level (0 to 3)\n"
msgstr " -d, --debug NUM\tデãƒãƒƒã‚¯ãƒã‚°ãƒ¬ãƒ™ãƒ«ã‚’セットã™ã‚‹(0 ã‹ã‚‰ 3)\n"
@@ -2305,7 +2299,7 @@ msgstr " -d, --debug NUM\tデãƒãƒƒã‚¯ãƒã‚°ãƒ¬ãƒ™ãƒ«ã‚’セットã™ã‚‹(0 ã‹
msgid " -f, --file FILE\tLoad saved game FILE\n"
msgstr " -f, --file FILE\tä¿å˜ã•ã‚ŒãŸã‚²ãƒ¼ãƒ FILE ã‚’ãƒãƒ¼ãƒ‰ã™ã‚‹\n"
-#: server/civserver.c:225 client/civclient.c:248 manual/civmanual.c:382
+#: server/civserver.c:225 client/civclient.c:249 manual/civmanual.c:382
msgid " -h, --help\t\tPrint a summary of the options\n"
msgstr " -h, --help\t\tオプションã®ä¸€è¦§ã‚’表示\n"
@@ -2356,11 +2350,11 @@ msgstr " -r, --read FILE\t起動スクリプト FILE ã‚’èªã‚€\n"
msgid " -R, --Ranklog FILE\tUse FILE as ranking logfile\n"
msgstr " -R, --Ranklog FILE\tランã‚ング記録ファイルã¨ã—㦠FILE を使ã†\n"
-#: server/civserver.c:247 client/civclient.c:267 manual/civmanual.c:383
+#: server/civserver.c:247 client/civclient.c:268 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:279
+#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, c-format
@@ -3690,7 +3684,7 @@ msgstr ""
"ゲーム開始時ã®æµ·ä¸Šéƒ¨éšŠã¯ã¾ã サãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ãªã„ã®ã§ï¼Œã©ã®ãƒ—レイヤーも%sã¯æŒ"
"ã¡ã¾ã›ã‚“。"
-#: server/gamehand.c:310 client/text.c:632
+#: server/gamehand.c:310 client/text.c:691
#, c-format
msgid "Year: %s"
msgstr "西暦: %s"
@@ -3994,10 +3988,10 @@ msgstr "%sã«å†…戦を起ã“ã›ã¾ã›ã‚“ã§ã—ãŸâ€•â€•ãƒ—レイヤーãŒå¤šã™
# yasu
# XXX
#: server/plrhand.c:1686
-#, c-format
+#, fuzzy, c-format
msgid ""
-"Your nation is thrust into civil war, %s is declared the leader of the "
-"rebel states."
+"Your nation is thrust into civil war! %s is declared the leader of the rebel "
+"states."
msgstr "ã‚ãªãŸã®å›½ã¯å†…戦ã«ãªã‚Šã¾ã—ãŸã€‚%sãŒå›ä¹±è€…ã®ãƒªãƒ¼ãƒ€ãƒ¼å®£è¨€ã—ã¾ã—ãŸã€‚"
# yasu
@@ -4098,7 +4092,7 @@ msgstr "ç ”ç©¶ã‚¹ãƒ”ãƒ¼ãƒ‰"
msgid "Literacy"
msgstr "èªã¿æ›¸ã"
-#: server/report.c:121 client/cityrepdata.c:526 client/cityrepdata.c:527
+#: server/report.c:121 client/cityrepdata.c:524 client/cityrepdata.c:525
#: client/gui-sdl/cityrep.c:174
msgid "Production"
msgstr "生産物"
@@ -4249,7 +4243,7 @@ msgid "Demography string contains invalid characters. Try \"help demography\"."
msgstr ""
"人å£çµ±è¨ˆè¨å®šæ–‡å—列ã«ç„¡åŠ¹ãªæ–‡å—ãŒå«ã¾ã‚Œã¦ã„ã¾ã™ã€‚\"help demography\"å‚ç…§"
-#: server/report.c:743 server/report.c:766
+#: server/report.c:743 server/report.c:768
msgid "Demographics Report:"
msgstr "人å£çµ±è¨ˆå ±å‘Š:"
@@ -4257,10 +4251,12 @@ msgstr "人å£çµ±è¨ˆå ±å‘Š:"
msgid "Sorry, the Demographics report is unavailable."
msgstr "ã™ã¿ã¾ã›ã‚“。人å£çµ±è¨ˆå ±å‘Šã¯åˆ©ç”¨ã§ãã¾ã›ã‚“。"
-#: server/report.c:748
-#, c-format
-msgid "The %s of the %s (%s)"
-msgstr "%sã®%s (%s)"
+#. TRANS: <nation adjective> <government name> (<year>).
+#. * E.g. "Polish Despotism (200 AD)".
+#: server/report.c:750
+#, fuzzy, c-format
+msgid "%s %s (%s)"
+msgstr "%s: %s(%s)\n"
#. TRANS: message about an installation error.
#: server/ruleset.c:163
@@ -4317,16 +4313,6 @@ msgstr ""
msgid "%s had invalid nation; changing to %s."
msgstr ""
-# clefs
-#. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4073
-#, fuzzy, c-format
-msgid ""
-"Illegal alliance structure detected: %s alliance to %s reduced to peace "
-"treaty."
-msgstr ""
-"ä¸æ£ãªåŒç›Ÿæ§‹é€ を探知ã—ã¾ã—ãŸï¼š%sã®%sã¨ã®åŒç›Ÿã¯å¹³å’Œæ¡ç´„ã¸ã¨æ ¼ä¸‹ã’ã—ã¾ã™ã€‚"
-
#: server/settings.c:32
msgid "Geological"
msgstr "地形"
@@ -5597,9 +5583,10 @@ msgid "Auto-save name prefix"
msgstr "自動ä¿å˜ã®åå‰æŽ¥é 辞"
#: server/settings.c:1016
+#, fuzzy
msgid ""
-"Automatically saved games will have name \"<prefix><year>.sav\". This "
-"setting sets the <prefix> part."
+"Automatically saved games will have name \"<prefix>-T<turn>-Y<year>.sav\". "
+"This setting sets the <prefix> part."
msgstr ""
"自動的ã«ä¿å˜ã•ã‚Œã‚‹ã‚²ãƒ¼ãƒ 㯠\"<接é 辞><å¹´>.sav\" ã¨ã„ã†åå‰ã«ãªã‚Šã¾ã™ã€‚\n"
"ã“ã®å¤‰æ•°ã¯ <接é 辞> ã®éƒ¨åˆ†ã‚’è¨å®šã—ã¾ã™ã€‚"
@@ -5618,11 +5605,11 @@ msgstr ""
"ã“ã®å¤‰æ•°ã‚’ 1 ã«è¨å®šã™ã‚‹ã¨ï¼Œãƒ—レイヤー統計をターン毎ã«ãƒ•ã‚¡ã‚¤ãƒ«\"civscore.log"
"\" ã«è¿½åŠ ã—ã¾ã™ã€‚ã“れらã®çµ±è¨ˆã¯ï¼Œã‚²ãƒ¼ãƒ 後パワー・グラフを作るã®ã«ä½¿ã‚ã‚Œã¾ã™ã€‚"
-#: server/sernet.c:147
+#: server/sernet.c:150
msgid "Server cannot read standard input. Ignoring input."
msgstr "サーãƒã¯æ¨™æº–入力をèªã‚€ã“ã¨ãŒã§ãã¾ã›ã‚“。入力を無視ã—ã¦ã„ã¾ã™ã€‚"
-#: server/sernet.c:922
+#: server/sernet.c:929
#, c-format
msgid "Server: bad address: [%s:%d]."
msgstr "サーãƒ: é–“é•ã£ãŸã‚¢ãƒ‰ãƒ¬ã‚¹: [%s:%d]"
@@ -5760,126 +5747,126 @@ msgstr ""
"%sã¨%sã®åœæˆ¦æœŸé–“ã¯çµ‚了ã—ã¾ã—ãŸã€‚両国ã¯æˆ¦äº‰çŠ¶æ…‹ã¨ãªã‚Šã¾ã—ãŸã€‚両方ã¨ã®åŒç›Ÿã‚’ç ´"
"棄ã—ã¾ã™ã€‚"
-#: server/srv_main.c:928
+#: server/srv_main.c:961
#, c-format
msgid "Failed saving game as %s"
msgstr "%s ã¨ã„ã†åå‰ã§ã‚²ãƒ¼ãƒ ã‚’ä¿å˜å¤±æ•—ã—ã¾ã—ãŸã€‚"
-#: server/srv_main.c:930
+#: server/srv_main.c:963
#, c-format
msgid "Game saved as %s"
msgstr "%s ã¨ã„ã†åå‰ã§ã‚²ãƒ¼ãƒ をセーブã—ã¾ã—ãŸã€‚"
-#: server/srv_main.c:962
+#: server/srv_main.c:994
msgid "The game is already running."
msgstr "ゲームã¯æ—¢ã«å§‹ã¾ã£ã¦ã„ã¾ã™ã€‚"
# clefs
-#: server/srv_main.c:970
+#: server/srv_main.c:1002
#, c-format
msgid "%s lost control cmdlevel on game start. Use voting from now on."
msgstr ""
"%sã¯ã‚²ãƒ¼ãƒ 開始ã¨åŒæ™‚ã«controlコマンドレベルを失ã„ã¾ã—ãŸã€‚以後ã¯æŠ•ç¥¨ã‚·ã‚¹ãƒ†ãƒ ã‚’"
"使用ã—ã¦ãã ã•ã„。"
-#: server/srv_main.c:977
+#: server/srv_main.c:1009
msgid "Starting game."
msgstr "ゲームを開始ã—ã¦ã„ã¾ã™ã€‚"
# clefs
-#: server/srv_main.c:1039
+#: server/srv_main.c:1071
#, c-format
msgid "request for unknown report (type %d)"
msgstr "ä¸æ˜Žãªå ±å‘Šã®è¦æ±‚ã§ã™ (タイプ %d)"
# clefs
-#: server/srv_main.c:1104
+#: server/srv_main.c:1136
#, c-format
msgid "Warning: rejecting old client %s"
msgstr "è¦å‘Š: 旧型ã®ã‚¯ãƒ©ã‚¤ã‚¢ãƒ³ãƒˆ%sã‚’æ‹’å¦ã—ã¾ã—ãŸ"
# yasu
-#: server/srv_main.c:1206
+#: server/srv_main.c:1238
#, c-format
msgid "Got a packet of type %d from a dead or observer player"
msgstr "%d タイプã®ãƒ‘ケットを全滅ã¾ãŸã¯è¦³å¯Ÿä¸ã®ãƒ—レイヤーã‹ã‚‰å—ã‘å–ã‚Šã¾ã—ãŸã€‚"
# yasu
-#: server/srv_main.c:1306
+#: server/srv_main.c:1338
msgid "Please choose a non-blank name."
msgstr "空白ã§ã¯ãªã„åå‰ã‚’é¸ã‚“ã§ä¸‹ã•ã„。"
# clefs
-#: server/srv_main.c:1322
+#: server/srv_main.c:1354
msgid "That nation is already in use."
msgstr "ãã®æ°‘æ—ã¯æ—¢ã«ä½¿ã‚ã‚Œã¦ã„ã¾ã™ã€‚"
# yasu, ama
-#: server/srv_main.c:1338
+#: server/srv_main.c:1370
#, c-format
msgid "Another player already has the name '%s'. Please choose another name."
msgstr ""
"ä»–ã®ãƒ—レイヤーãŒæ—¢ã«'%s'ã¨ã„ã†åå‰ã‚’é¸ã‚“ã§ã„ã¾ã™ã€‚ä»–ã®åå‰ã‚’é¸ã‚“ã§ãã ã•ã„。"
# yasu, clefs
-#: server/srv_main.c:1359
+#: server/srv_main.c:1391
msgid "Please choose a name containing only ASCII characters."
msgstr "ASCIIæ–‡å—ã ã‘ã§ç¶´ã‚‰ã‚ŒãŸåå‰ã«ã—ã¦ãã ã•ã„。"
# clefs
-#: server/srv_main.c:1458
+#: server/srv_main.c:1490
#, c-format
msgid "%s nation is not available in this scenario."
msgstr "ã“ã®ã‚·ãƒŠãƒªã‚ªã§ã¯%sã¯é¸æŠžã§ãã¾ã›ã‚“。"
-#: server/srv_main.c:1464
+#: server/srv_main.c:1496
#, c-format
msgid "%s nation is already in use."
msgstr "%sã¯ã‚‚ã†ä»–ã®èª°ã‹ãŒé¸æŠžã—ã¦ã„ã¾ã™ã€‚"
-#: server/srv_main.c:1482
+#: server/srv_main.c:1514
#, c-format
msgid "%s is the %s ruler %s."
msgstr "%sã¯%sã®æ”¯é…者%sã§ã™ã€‚"
# clefs
-#: server/srv_main.c:1538
+#: server/srv_main.c:1570
#, 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:1582 server/srv_main.c:1586
+#: server/srv_main.c:1614 server/srv_main.c:1618
#, c-format
msgid "%s has been added as %s level AI-controlled player."
msgstr "%s ã¯%sレベルã®AIプレイヤーã¨ã—ã¦åŠ ã‚ã‚Šã¾ã—ãŸã€‚"
-#: server/srv_main.c:1728
+#: server/srv_main.c:1760
#, c-format
msgid "Player %d"
msgstr "プレイヤー %d"
# clefs
-#: server/srv_main.c:1739 server/srv_main.c:1745
+#: server/srv_main.c:1771 server/srv_main.c:1777
#, c-format
msgid "%s rules the %s."
msgstr "%sã¯%sを統治ã—ã¾ã™ã€‚"
-#: server/srv_main.c:1910
+#: server/srv_main.c:1942
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
msgstr ""
-#: server/srv_main.c:1961
+#: server/srv_main.c:1993
#, c-format
msgid "Sending info to metaserver [%s]"
msgstr "メタサーãƒã«æƒ…å ±ã‚’é€ã£ã¦ã„ã¾ã™ [%s]"
-#: server/srv_main.c:1992
+#: server/srv_main.c:2024
msgid "The game is over..."
msgstr "ゲームオーãƒãƒ¼ã§ã™!"
-#: server/srv_main.c:2205
+#: server/srv_main.c:2237
msgid "Now accepting new client connections."
msgstr "æ–°ã—ã„クライアント接続をå—ã‘付ã‘ã¦ã„ã¾ã™ã€‚"
@@ -6746,24 +6733,24 @@ msgid "Barbarian"
msgstr "ãƒãƒ¼ãƒãƒªã‚¢ãƒ³"
#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2030 client/gui-sdl/plrdlg.c:645
+#: client/gui-gtk-2.0/pages.c:2102 client/gui-sdl/plrdlg.c:645
#: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
msgid "AI"
msgstr "AI"
#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
+#: 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
msgid "Human"
msgstr "人間"
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
-#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
+#: 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
msgid "Alive"
msgstr "æ´»èºä¸"
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
#: client/gui-win32/connectdlg.c:200
msgid "Dead"
msgstr "æ»äº¡"
@@ -7048,9 +7035,9 @@ 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:242
-#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
-#: client/text.c:1201
+#: 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
#, c-format
msgid "?clistmore:, %s"
msgstr ", %s"
@@ -7307,7 +7294,7 @@ msgstr "%sã ã‘ãŒæµ·ã‹ã‚‰æ”»æ’ƒã§ãã¾ã™ã€‚"
msgid "Cannot attack from sea."
msgstr "æµ·ã‹ã‚‰æ”»æ’ƒã§ãã¾ã›ã‚“。"
-#: server/unithand.c:996 server/unittools.c:2103
+#: server/unithand.c:996 server/unittools.c:2137
msgid "Cannot attack unless you declare war first."
msgstr "戦争を宣言ã—ãªã‘ã‚Œã°æ”»æ’ƒã§ãã¾ã›ã‚“。"
@@ -7416,104 +7403,104 @@ msgstr "%sã¯%sã¸ç„¡å„Ÿã§ã‚¢ãƒƒãƒ—グレードã•ã‚Œã¾ã—ãŸã€‚"
# clefs
# 原文: missing period
#: server/unittools.c:297
-#, c-format
-msgid "Not enough gold. %s disbanded"
+#, fuzzy, c-format
+msgid "Not enough gold to pay upkeep for %s. Unit disbanded."
msgstr "資金ãŒè¶³ã‚Šã¾ã›ã‚“。%sã¯è§£æ•£ã—ã¾ã—ãŸã€‚"
-#: server/unittools.c:342
+#: server/unittools.c:343
#, c-format
msgid "Your %s has run out of hit points."
msgstr "%sã¯ä½“力ãŒå°½ãã¾ã—ãŸã€‚"
-#: server/unittools.c:358
+#: server/unittools.c:359
#, c-format
msgid "Your %s has been lost on the high seas."
msgstr "%sを外洋ã§å¤±ã„ã¾ã—ãŸã€‚"
-#: server/unittools.c:365
+#: server/unittools.c:366
#, c-format
msgid "Your %s survived on the high seas and became more experienced!"
msgstr "%sã¯å¤–æ´‹ã§ã‚‚è€ãˆï¼Œç·´åº¦ãŒå¢—ã—ã¾ã—ãŸã€‚"
-#: server/unittools.c:376
+#: server/unittools.c:377
#, c-format
msgid "Your %s has been lost on unsafe terrain."
msgstr "%sを外洋ã§å¤±ã„ã¾ã—ãŸã€‚"
-#: server/unittools.c:430
+#: server/unittools.c:431
#, c-format
msgid "Your %s has returned to refuel."
msgstr "%s ã¯è£œçµ¦ã®ãŸã‚帰還ã—ã¾ã—ãŸã€‚"
-#: server/unittools.c:454
+#: server/unittools.c:455
#, c-format
msgid "Your %s has run out of fuel."
msgstr "%s ã®ç‡ƒæ–™ãŒåˆ‡ã‚Œã¾ã—ãŸã€‚"
-#. TRANS: And, <the unit> became ...
-#: server/unittools.c:616
-#, fuzzy
-msgid "And, became more experienced!"
-msgstr "ã®æ”»æ’ƒã«æˆåŠŸã—，練度ãŒå¢—ã—ã¾ã—ãŸã€‚"
-
#. TRANS: Your <unit> became ...
-#: server/unittools.c:620
+#: server/unittools.c:619
#, c-format
msgid "Your %s became more experienced!"
msgstr "%s ã®ç·´åº¦ãŒå¢—ã—ã¾ã—ãŸã€‚"
-#: server/unittools.c:1011
+#: server/unittools.c:1009
#, c-format
msgid "Teleported your %s to %s."
msgstr "%sã‚’%sã¸ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã—ã¾ã—ãŸã€‚"
-#: server/unittools.c:1041
+#. TRANS: A unit is moved to resolve stack conflicts.
+#: server/unittools.c:1065
+#, fuzzy, c-format
+msgid "Moved your %s."
+msgstr "%sを解散ã—ã¾ã—ãŸã€‚"
+
+#: server/unittools.c:1076
#, c-format
msgid "Disbanded your %s."
msgstr "%sを解散ã—ã¾ã—ãŸã€‚"
# clefs
-#: server/unittools.c:1363
+#: server/unittools.c:1397
#, c-format
msgid "Unable to defend %s, %s has lost the game."
msgstr "%sを守り切れãªã‹ã£ãŸã®ã§ï¼Œ%sã¯è² ã‘ã«ãªã‚Šã¾ã—ãŸã€‚"
# clefs
-#: server/unittools.c:1367
+#: server/unittools.c:1401
#, c-format
msgid "Losing %s meant losing the game! Be more careful next time!"
msgstr "%sを失ã†ã¨è² ã‘ã§ã™ï¼æ¬¡ã¯ã‚‚ã£ã¨æ°—を付ã‘ã¦ï¼"
-#: server/unittools.c:1469
+#: server/unittools.c:1503
#, c-format
msgid "%s escaped the destruction of %s, and fled to %s."
msgstr "%1$sã¯%3$sã«ã‚ã‚‹%2$så»ºé€ ç‰©ã®ç ´å£Šã«æˆåŠŸã—ã¾ã—ãŸã€‚"
-#: server/unittools.c:1478
+#: server/unittools.c:1512
#, c-format
msgid "%s lost when %s was lost."
msgstr "%2$sを失ã£ãŸæ™‚ã«%1$sを失ã„ã¾ã—ãŸã€‚"
# ama, clefs
-#: server/unittools.c:1527
+#: server/unittools.c:1561
#, c-format
msgid "Barbarian leader captured, %d gold ransom paid."
msgstr "ãƒãƒ¼ãƒãƒªã‚¢ãƒ³ã®æŒ‡å°Žè€…ãŒæ•ãˆã‚‰ã‚Œï¼Œèº«ä»£é‡‘%dãŒæ”¯æ‰•ã‚ã‚Œã¾ã—ãŸã€‚"
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unittools.c:1545
+#: server/unittools.c:1579
#, 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:1554 server/unittools.c:1612
+#: server/unittools.c:1588 server/unittools.c:1646
#, 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:1588
+#: server/unittools.c:1622
#, fuzzy, c-format
msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
msgid_plural ""
@@ -7522,7 +7509,7 @@ msgstr[0] "%sã¯%sã®%s(ãŠã‚ˆã³ãã®ä»–%d部隊)ã¸ã®æ”»æ’ƒã«æˆåŠŸã—ã¾
#. TRANS: "Cannon lost when the Polish Destroyer
#. * attacked the German Musketeers."
-#: server/unittools.c:1621
+#: server/unittools.c:1655
#, 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ãŒå¤±ã‚ã‚Œã¾ã—ãŸã€‚"
@@ -7530,7 +7517,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:1636
+#: server/unittools.c:1670
#, fuzzy, c-format
msgid "%s (and %s) lost to an attack from the %s %s."
msgstr "%3$sã®%4$sã‹ã‚‰ã®æ”»æ’ƒã§%1$s(ã¨%2$s)を失ã„ã¾ã—ãŸã€‚"
@@ -7539,7 +7526,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:1646
+#: server/unittools.c:1680
#, 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."
@@ -7548,208 +7535,208 @@ 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:1660
+#: server/unittools.c:1694
#, 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:1928
+#: server/unittools.c:1962
#, c-format
msgid "Your %s was nuked by %s."
msgstr "%sã¯%sã«ã‚ˆã£ã¦æ ¸æ”»æ’ƒã•ã‚Œã¾ã—ãŸã€‚"
-#: server/unittools.c:1931 server/unittools.c:1947
+#: server/unittools.c:1965 server/unittools.c:1981
msgid "yourself"
msgstr "ã‚ãªãŸè‡ªèº«"
-#: server/unittools.c:1935
+#: server/unittools.c:1969
#, fuzzy, c-format
msgid "The %s %s was nuked."
msgstr "%sã®%sã¯æ ¸æ”»æ’ƒã•ã‚Œã¾ã—ãŸã€‚"
-#: server/unittools.c:1944
+#: server/unittools.c:1978
#, c-format
msgid "%s was nuked by %s."
msgstr "%sã¯%sã«ã‚ˆã£ã¦æ ¸æ”»æ’ƒã•ã‚Œã¾ã—ãŸã€‚"
-#: server/unittools.c:1952
+#: server/unittools.c:1986
#, c-format
msgid "You nuked %s."
msgstr "%sã‚’æ ¸æ”»æ’ƒã—ã¾ã—ãŸã€‚"
-#: server/unittools.c:1993
+#: server/unittools.c:2027
#, fuzzy, c-format
msgid "The %s detonated a nuke!"
msgstr "%sã¯æ ¸ã‚’爆発ã•ã›ã¾ã—ãŸï¼"
-#: server/unittools.c:2017
+#: server/unittools.c:2051
#, c-format
msgid "%s transported successfully."
msgstr "%sã¯é¦–尾よã輸é€ã—ã¾ã—ãŸã€‚"
-#: server/unittools.c:2069
+#: server/unittools.c:2103
msgid "This unit type can not be paradropped."
msgstr "ã“ã®éƒ¨éšŠã®ã‚¿ã‚¤ãƒ—ã¯è½ä¸‹å‚˜é™ä¸‹ã•ã›ã‚‰ã‚Œã¾ã›ã‚“。"
-#: server/unittools.c:2079
+#: server/unittools.c:2113
#, fuzzy
msgid "You cannot paradrop a unit that is transporting other units."
msgstr "æµ·ã¸ã¯è½ä¸‹å‚˜é™ä¸‹ã§ãã¾ã›ã‚“。"
-#: server/unittools.c:2085
+#: server/unittools.c:2119
msgid "The destination location is not known."
msgstr "目的地ã¯çŸ¥ã‚‰ã‚Œã¦ã„ã¾ã›ã‚“。"
-#: server/unittools.c:2092
+#: server/unittools.c:2126
#, c-format
msgid "This unit cannot paradrop into %s."
msgstr "%sã¸ã¯è½ä¸‹å‚˜é™ä¸‹ã§ãã¾ã›ã‚“。"
-#: server/unittools.c:2112
+#: server/unittools.c:2146
#, c-format
msgid "The distance to the target (%i) is greater than the unit's range (%i)."
msgstr "目的ã¸ã®è·é›¢(%i)ã¯ï¼Œéƒ¨éšŠã®è¡Œå‹•ç¯„囲(%i)を越ãˆã¦ã„ã¾ã™ã€‚"
# clefs
-#: server/unittools.c:2123
+#: server/unittools.c:2157
#, c-format
msgid "Your %s paradropped into the %s and was lost."
msgstr "%sã¯%sã«è½ä¸‹å‚˜é™ä¸‹ã—消æ¯ã‚’絶ã¡ã¾ã—ãŸã€‚"
-#: server/unittools.c:2136
+#: server/unittools.c:2170
#, c-format
msgid "Your %s was killed by enemy units at the paradrop destination."
msgstr "%sã¯é™ä¸‹ç›®æ¨™åœ°ã«ã„ãŸæ•µéƒ¨éšŠã«ã‚ˆã£ã¦æ®ºã•ã‚Œã¾ã—ãŸã€‚"
-#: server/unittools.c:2158
+#: server/unittools.c:2192
#, c-format
msgid "You found %d gold."
msgstr "金%dを見ã¤ã‘ã¾ã—ãŸã€‚"
-#: server/unittools.c:2175
+#: server/unittools.c:2209
#, c-format
msgid "You found %s in ancient scrolls of wisdom."
msgstr "%sã‚’å¤ä»£ã®çŸ¥è˜ã®å·»ç‰©ã®ä¸ã‹ã‚‰è¦‹ã¤ã‘ã¾ã—ãŸã€‚"
-#: server/unittools.c:2182
+#: server/unittools.c:2216
#, c-format
msgid "The %s have acquired %s from ancient scrolls of wisdom."
msgstr "%sã¯å¤ä»£ã®çŸ¥è˜ã®å·»ç‰©ã‹ã‚‰%sã‚’å¾—ã¾ã—ãŸã€‚"
-#: server/unittools.c:2196
+#: server/unittools.c:2230
msgid "A band of friendly mercenaries joins your cause."
msgstr "å‹å¥½çš„ãªéƒ¨éšŠãŒåŠ ã‚ã‚Šã¾ã—ãŸã€‚"
-#: server/unittools.c:2214
+#: server/unittools.c:2248
msgid "An abandoned village is here."
msgstr "廃虚ã®æ‘ãŒã‚ã‚Šã¾ã™ã€‚"
-#: server/unittools.c:2224
+#: server/unittools.c:2258
msgid "You have unleashed a horde of barbarians!"
msgstr "ãƒãƒ¼ãƒãƒªã‚¢ãƒ³ã®å¤§ç¾¤ã‚’解放ã—ã¦ã—ã¾ã„ã¾ã—ãŸ!"
-#: server/unittools.c:2227
+#: server/unittools.c:2261
#, c-format
msgid "Your %s has been killed by barbarians!"
msgstr "%s ã¯ãƒãƒ¼ãƒãƒªã‚¢ãƒ³ã«ã‚ˆã£ã¦æ®ºã•ã‚Œã¾ã—ãŸã€‚"
-#: server/unittools.c:2243
+#: server/unittools.c:2277
msgid "You found a friendly city."
msgstr "å‹å¥½çš„ãªéƒ½å¸‚を見ã¤ã‘ã¾ã—ãŸã€‚"
-#: server/unittools.c:2257
+#: server/unittools.c:2291
msgid "Friendly nomads are impressed by you, and join you."
msgstr "å‹å¥½çš„ãªæ”¾æµªè€…ãŒã‚ãªãŸã«æ„ŸéŠ˜ã—，部隊ã«åŠ ã‚ã‚Šã¾ã—ãŸã€‚"
# clefs
-#: server/unittools.c:2282
+#: server/unittools.c:2316
msgid "Your overflight frightens the tribe; they scatter in terror."
msgstr "飛行物体を見ã¦éƒ¨æ—ã¯é©šã，æã‚ŒãŠã®ã®ã„ã¦å››æ•£ã—ã¦ã—ã¾ã„ã¾ã—ãŸã€‚"
# climb
-#: server/unittools.c:2540
+#: server/unittools.c:2574
#, c-format
msgid "Orders for %s aborted after enemy movement was spotted."
msgstr "é“ã‚’ãµã•ã„ã§ã„る部隊ãŒã„ã‚‹ã®ã§ï¼Œ%sã¯ç§»å‹•ã‚’ä¸æ–ã—ã¾ã—ãŸã€‚"
# climb
-#: server/unittools.c:2989
+#: server/unittools.c:3023
#, c-format
msgid "Orders for %s aborted as there are units nearby."
msgstr "è¿‘ãã«éƒ¨éšŠãŒã„ã‚‹ã®ã§ï¼Œ%sã¯å‘½ä»¤é‚行をä¸æ–ã—ã¾ã—ãŸã€‚"
# climb
-#: server/unittools.c:3041
+#: server/unittools.c:3075
#, c-format
msgid "Orders for %s aborted because building of city failed."
msgstr "都市を建è¨ã§ããªã‹ã£ãŸã®ã§ï¼Œ%sã¯å‘½ä»¤é‚行をä¸æ–ã—ã¾ã—ãŸã€‚"
# climb
-#: server/unittools.c:3054
+#: server/unittools.c:3088
#, c-format
msgid "Orders for %s aborted since they give an invalid activity."
msgstr "無効ãªæ´»å‹•ãŒæŒ‡å®šã•ã‚Œã¦ã„ã‚‹ã®ã§ï¼Œ%sã¯å‘½ä»¤é‚行をä¸æ–ã—ã¾ã—ãŸã€‚"
# climb
-#: server/unittools.c:3068
+#: server/unittools.c:3102
#, c-format
msgid "Orders for %s aborted since they give an invalid location."
msgstr "無効ãªä½ç½®ãŒæŒ‡å®šã•ã‚Œã¦ã„ã‚‹ã®ã§ï¼Œ%sã¯å‘½ä»¤é‚行をä¸æ–ã—ã¾ã—ãŸã€‚"
# climb
-#: server/unittools.c:3078
+#: server/unittools.c:3112
#, c-format
msgid "Orders for %s aborted as there are units in the way."
msgstr "é“ã‚’ãµã•ã„ã§ã„る部隊ãŒã„ã‚‹ã®ã§ï¼Œ%sã¯å‘½ä»¤é‚行をä¸æ–ã—ã¾ã—ãŸã€‚"
# climb
-#: server/unittools.c:3104
+#: server/unittools.c:3138
#, c-format
msgid "Orders for %s aborted because of failed move."
msgstr "移動ã«å¤±æ•—ã—ãŸãŸã‚，%sã¯å‘½ä»¤é‚行をä¸æ–ã—ã¾ã—ãŸã€‚"
# clefs
-#: server/unittools.c:3145
+#: server/unittools.c:3179
#, c-format
msgid "Attempt to change homecity for %s failed."
msgstr "帰属を%sã«å¤‰ãˆã‚‰ã‚Œã¾ã›ã‚“ã§ã—ãŸã€‚"
# clefs
-#: server/unittools.c:3156
+#: server/unittools.c:3190
#, c-format
msgid "Attempt to establish trade route for %s failed."
msgstr "%sã¨ã®äº¤æ˜“è·¯ã®ç¢ºç«‹ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
# clefs
# 建è¨ä¸ã®ä¸æ€è°ãŒãªã‹ã£ãŸå ´åˆ
-#: server/unittools.c:3168
+#: server/unittools.c:3202
#, c-format
msgid "Attempt to build wonder for %s failed."
msgstr "%sã®ãŸã‚ã«ä¸æ€è°å»ºè¨ã‚’ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚"
# clefs
-#: server/unittools.c:3177
+#: server/unittools.c:3211
#, c-format
msgid "Your %s has invalid orders."
msgstr "%sã«ã¯ç„¡åŠ¹ãªå‘½ä»¤ãŒä¸Žãˆã‚‰ã‚Œã¦ã„ã¾ã™ã€‚"
# clefs
-#: server/generator/mapgen.c:1737
+#: server/generator/mapgen.c:1771
msgid "High landmass - this may take a few seconds."
msgstr "広大ãªåœŸåœ°ã§ã™ - å°‘ã—時間ãŒã‹ã‹ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。"
# Daniel
-#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
+#: server/generator/mapgen.c:1969 server/generator/mapgen.c:2039
#, c-format
msgid "Falling back to generator %d."
msgstr "Generator %d を試ã¿ã¾ã™ã€‚"
-#: server/generator/mapgen.c:2025
+#: server/generator/mapgen.c:2059
msgid "Generator 3 didn't place all big islands."
msgstr "Generator 3 ã¯å¤§ããªå³¶ã®ã„ãã¤ã‹ã‚’é…ç½®ã§ãã¾ã›ã‚“。"
-#: server/generator/mapgen.c:2054
+#: server/generator/mapgen.c:2088
#, c-format
msgid "Generator 3 left %li landmass unplaced."
msgstr "Generator 3 ã¯é…ç½®ã—ãªã‹ã£ãŸ%liã®å³¶ã‚’残ã—ã¾ã—ãŸã€‚"
@@ -7861,7 +7848,7 @@ msgid "%3d turn"
msgid_plural "%3d turns"
msgstr[0] "%3d ターン"
-#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:631
#: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
@@ -7988,347 +7975,348 @@ msgstr "平和"
msgid "(worklist)"
msgstr "(作æ¥ãƒªã‚¹ãƒˆ)"
-#: client/cityrepdata.c:447
-msgid "Special"
-msgstr "専門家"
+#: client/cityrepdata.c:446
+msgid "?city:Name"
+msgstr "åå‰"
-#: client/cityrepdata.c:448
-msgid "?entertainers/scientists/taxmen:E/S/T"
-msgstr "?entertainers/scientists/taxmen:芸/科/税"
+#: client/cityrepdata.c:446 client/gui-sdl/cityrep.c:169
+msgid "City Name"
+msgstr "都市å"
-#: client/cityrepdata.c:449
-msgid "Entertainers, Scientists, Taxmen"
-msgstr "芸人, 科å¦è€…, 徴税者"
+#: client/cityrepdata.c:448
+msgid "?size [short]:Sz"
+msgstr "大"
-#: client/cityrepdata.c:452
-msgid "Concise + Rapture, - Disorder"
-msgstr "簡略表示 + æ“å–œ, - æ··ä¹±"
+#: client/cityrepdata.c:448
+msgid "Size"
+msgstr "都市ã®å¤§ãã•"
-#: client/cityrepdata.c:454 client/plrdlg_common.c:261
+#: client/cityrepdata.c:450 client/plrdlg_common.c:261
#: client/gui-win32/plrdlg.c:337
msgid "State"
msgstr "状態"
-#: client/cityrepdata.c:454
+#: client/cityrepdata.c:450
msgid "Rapture/Peace/Disorder"
msgstr "æ“å–œ/平和/æ··ä¹±"
+#: client/cityrepdata.c:452
+#, fuzzy
+msgid "Concise *=Rapture, X=Disorder"
+msgstr "簡略表示 + æ“å–œ, - æ··ä¹±"
+
+#: client/cityrepdata.c:456
+msgid "Special"
+msgstr "専門家"
+
#: client/cityrepdata.c:457
+msgid "?entertainers/scientists/taxmen:E/S/T"
+msgstr "?entertainers/scientists/taxmen:芸/科/税"
+
+#: client/cityrepdata.c:458
+msgid "Entertainers, Scientists, Taxmen"
+msgstr "芸人, 科å¦è€…, 徴税者"
+
+#: client/cityrepdata.c:461
msgid "?Happy workers:H"
msgstr "?Happy workers:幸"
-#: client/cityrepdata.c:457
+#: client/cityrepdata.c:461
msgid "Workers: Happy"
msgstr "労åƒè€…: 幸ç¦"
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
msgid "?Content workers:C"
msgstr "?Content workers:æ™®"
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
msgid "Workers: Content"
msgstr "労åƒè€…: 普通"
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
msgid "?Unhappy workers:U"
msgstr "?Unhappy workers:ä¸"
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
msgid "Workers: Unhappy"
msgstr "労åƒè€…: ä¸å¹¸"
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
msgid "?Angry workers:A"
msgstr "?Angry workers:怒"
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
msgid "Workers: Angry"
msgstr "労åƒè€…: 怒り"
-#: client/cityrepdata.c:465 client/gui-xaw/citydlg.c:2401
-#: data/default/units.ruleset:238
-msgid "Workers"
+#: client/cityrepdata.c:469 client/gui-xaw/citydlg.c:2402
+#, fuzzy
+msgid "?city:Workers"
msgstr "労åƒè€…"
-#: client/cityrepdata.c:466
+#: client/cityrepdata.c:470
msgid "?happy/content/unhappy/angry:H/C/U/A"
msgstr "?happy/content/unhappy/angry:幸/æ™®/ä¸/怒"
-#: client/cityrepdata.c:467
+#: client/cityrepdata.c:471
msgid "Workers: Happy, Content, Unhappy, Angry"
msgstr "労åƒè€…: 幸ç¦, 普通, ä¸å¹¸, 怒り"
-#: client/cityrepdata.c:470 client/cityrepdata.c:472
+#: client/cityrepdata.c:474 client/cityrepdata.c:476
msgid "Best"
msgstr "最é©"
# clefs
# "Best attack" ã¨ãªã£ã¦ "Best attacking units" ã¨åŒç¾©ã«ãªã‚‹
-#: client/cityrepdata.c:470
+#: client/cityrepdata.c:474
msgid "attack"
msgstr "攻撃部隊"
# clefs
# 実際ã«è¡¨ç¤ºã•ã‚Œã‚‹ã®ã¯ä¸Šä½3部隊
-#: client/cityrepdata.c:471
+#: client/cityrepdata.c:475
msgid "Best attacking units"
msgstr "攻撃ã«æœ€ã‚‚é©ã—ãŸéƒ¨éšŠ"
-#: client/cityrepdata.c:472
+#: client/cityrepdata.c:476
msgid "defense"
msgstr "防御部隊"
-#: client/cityrepdata.c:473
+#: client/cityrepdata.c:477
msgid "Best defending units"
msgstr "防御ã«æœ€ã‚‚é©ã—ãŸéƒ¨éšŠ"
-#: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
-#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
-#: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
-#: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
-#: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
-#: client/gui-win32/menu.c:351 client/gui-win32/repodlgs.c:616
-#: client/gui-win32/repodlgs.c:707 client/gui-win32/repodlgs.c:716
-#: client/gui-xaw/menu.c:157 client/gui-xaw/menu.c:219
-#: client/gui-xaw/menu.c:242 client/gui-xaw/repodlgs.c:881
-#: client/gui-xaw/repodlgs.c:1069 data/Freeciv.in:1895 data/helpdata.txt:909
+#: client/cityrepdata.c:478 client/cityrepdata.c:482
+#: client/gui-gtk-2.0/cityrep.c:1437 client/gui-gtk-2.0/cityrep.c:1456
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-gtk-2.0/cityrep.c:1494
+#: client/gui-gtk-2.0/cityrep.c:1514 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/repodlgs.c:960 client/gui-sdl/helpdlg.c:688
+#: client/gui-sdl/mapctrl.c:1605 client/gui-sdl/optiondlg.c:1827
+#: client/gui-sdl/repodlgs.c:356 client/gui-win32/menu.c:351
+#: client/gui-win32/repodlgs.c:616 client/gui-win32/repodlgs.c:707
+#: client/gui-win32/repodlgs.c:716 client/gui-xaw/menu.c:157
+#: client/gui-xaw/menu.c:219 client/gui-xaw/menu.c:242
+#: client/gui-xaw/repodlgs.c:881 client/gui-xaw/repodlgs.c:1069
+#: data/Freeciv.in:1895 data/helpdata.txt:909
msgid "Units"
msgstr "部隊"
#. TRANS: Header "Number of units inside city"
-#: client/cityrepdata.c:476
+#: client/cityrepdata.c:480
msgid "?Present (units):Here"
msgstr "å˜åœ¨"
-#: client/cityrepdata.c:477
+#: client/cityrepdata.c:481
msgid "Number of units present"
msgstr "部隊ã®æ•°: å˜åœ¨"
#. TRANS: Header "Number of units supported by given city"
-#: client/cityrepdata.c:480
+#: client/cityrepdata.c:484
msgid "?Supported (units):Owned"
msgstr "支æ´"
-#: client/cityrepdata.c:481
+#: client/cityrepdata.c:485
msgid "Number of units supported"
msgstr "部隊ã®æ•°: 支æ´"
#. TRANS: Header "It will take this many turns before city grows"
-#: client/cityrepdata.c:484
+#: client/cityrepdata.c:488
msgid "?food (population):Grow"
msgstr "拡大"
-#: client/cityrepdata.c:485 client/cityrepdata.c:530
+#: client/cityrepdata.c:489 client/cityrepdata.c:528
msgid "?Stock/Target:(Have/Need)"
msgstr "(進行/目標)"
-#: client/cityrepdata.c:486
+#: client/cityrepdata.c:490
msgid "Turns until growth/famine"
msgstr "拡大/飢饉ã¾ã§ã®ã‚¿ãƒ¼ãƒ³"
-#: client/cityrepdata.c:488
-msgid "?size [short]:Sz"
-msgstr "大"
-
-#: client/cityrepdata.c:488
-msgid "Size"
-msgstr "都市ã®å¤§ãã•"
-
-#: client/cityrepdata.c:492
-msgid "?city:Name"
-msgstr "åå‰"
-
-#: client/cityrepdata.c:492 client/gui-sdl/cityrep.c:169
-msgid "City Name"
-msgstr "都市å"
-
# was 「黒å—ã€; マイナスã®å ´åˆã‚‚ã‚ã‚‹ã®ã§å¤‰æ›´ (clefs)
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
msgid "Surplus"
msgstr "剰余"
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
msgid "?food/production/trade:F/P/T"
msgstr "食/生/交"
-#: client/cityrepdata.c:496
+#: client/cityrepdata.c:494
msgid "Surplus: Food, Production, Trade"
msgstr "剰余: 食料, 生産物, 交易"
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
msgid "?Food surplus [short]:+F"
msgstr "+食"
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
msgid "Surplus: Food"
msgstr "剰余: 食料"
-#: client/cityrepdata.c:500
+#: client/cityrepdata.c:498
msgid "?Production surplus [short]:+P"
msgstr "+生"
-#: client/cityrepdata.c:501
+#: client/cityrepdata.c:499
msgid "Surplus: Production"
msgstr "剰余: 生産物"
-#: client/cityrepdata.c:502
+#: client/cityrepdata.c:500
msgid "?Production loss (waste) [short]:-P"
msgstr "-浪"
# ntaka
-#: client/cityrepdata.c:503
+#: client/cityrepdata.c:501
msgid "Waste"
msgstr "浪費"
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
msgid "?Trade surplus [short]:+T"
msgstr "+交"
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
msgid "Surplus: Trade"
msgstr "剰余: 交易"
-#: client/cityrepdata.c:506
+#: client/cityrepdata.c:504
msgid "?Trade loss (corruption) [short]:-T"
msgstr "-汚"
-#: client/cityrepdata.c:507
+#: client/cityrepdata.c:505
msgid "Corruption"
msgstr "汚è·"
-#: client/cityrepdata.c:509 client/gui-gtk-2.0/repodlgs.c:654
+#: client/cityrepdata.c:507 client/gui-gtk-2.0/repodlgs.c:654
#: client/gui-sdl/mapctrl.c:1400 client/gui-win32/repodlgs.c:334
#: client/gui-xaw/menu.c:222 client/gui-xaw/repodlgs.c:644
#: client/gui-xaw/repodlgs.c:773 data/Freeciv.in:1819
msgid "Economy"
msgstr "経済"
-#: client/cityrepdata.c:509
+#: client/cityrepdata.c:507
msgid "?gold/luxury/science:G/L/S"
msgstr "金/贅/科"
-#: client/cityrepdata.c:510
+#: client/cityrepdata.c:508
msgid "Economy: Gold, Luxuries, Science"
msgstr "経済: 金, è´…æ²¢, 科å¦"
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
msgid "?Gold:G"
msgstr "金"
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
msgid "Economy: Gold"
msgstr "経済: 金"
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
msgid "?Luxury:L"
msgstr "è´…"
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
msgid "Economy: Luxury"
msgstr "経済: 贅沢"
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
msgid "?Science:S"
msgstr "科"
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
msgid "Economy: Science"
msgstr "経済: 科å¦"
-#: client/cityrepdata.c:518
+#: client/cityrepdata.c:516
msgid "?number_trade_routes:n"
msgstr "æ•°"
-#: client/cityrepdata.c:518
+#: client/cityrepdata.c:516
msgid "?number_trade_routes:R"
msgstr "易"
-#: client/cityrepdata.c:519
+#: client/cityrepdata.c:517
msgid "Number of Trade Routes"
msgstr "交易路ã®æ•°"
-#: client/cityrepdata.c:521
+#: client/cityrepdata.c:519
msgid "?pollution [short]:Pol"
msgstr "å…¬"
-#: client/cityrepdata.c:523
+#: client/cityrepdata.c:521
msgid "?cma:Governor"
msgstr ""
# 以å‰CMAã¨å‘¼ã‚“ã§ã„ãŸã‚„ã¤ã€‚ã©ã†è¨³ã—ãŸã‚‚ã®ã‹ (clefs)
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
-#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
-#: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
-#: data/Freeciv.in:1459 data/helpdata.txt:820
+#: client/cityrepdata.c:521 client/gui-gtk-2.0/cityrep.c:1766
+#: client/gui-sdl/citydlg.c:3809 client/gui-sdl/cma_fe.c:858
+#: client/gui-win32/citydlg.c:726 data/Freeciv.in:1459 data/helpdata.txt:820
msgid "Citizen Governor"
msgstr ""
-#: client/cityrepdata.c:526
+#: client/cityrepdata.c:524
msgid "Turns/Buy"
msgstr "å¿…è¦ã‚¿ãƒ¼ãƒ³/購入金é¡"
-#: client/cityrepdata.c:529 client/cityrepdata.c:531
+#: client/cityrepdata.c:527 client/cityrepdata.c:529
msgid "Currently Building"
msgstr "作æˆä¸"
# 科å¦è€…ã¨ã‹ã®ã“ã¨ãªã‚“ã ã‘ã© (clefs)
-#: client/cityrepdata.c:575
+#: client/cityrepdata.c:573
msgid "?specialist:S"
msgstr "専門家"
-#: client/cityrepdata.c:578
+#: client/cityrepdata.c:576
msgid "Specialists"
msgstr "専門家"
-#: client/civclient.c:239
+#: client/civclient.c:240
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr " -a, --autoconnect\t接続ダイアãƒã‚°ã‚’スã‚ップã™ã‚‹\n"
# spawned serverã£ã¦ä½•ã˜ã‚ƒã‚‰ã»ã„ (clefs)
# ãŸã¶ã‚“civclientãŒè‡ªå‹•ã§ç«‹ã¡ä¸Šã’るサーãƒã®ã“ã¨
-#: client/civclient.c:249
+#: client/civclient.c:250
msgid " -l, --log FILE\tUse FILE as logfile (spawned server also uses this)\n"
msgstr ""
" -l, --log FILE\t記録ファイルã¨ã—㦠FILE を使ㆠ(派生サーãƒã‚‚ã“れを使ã„ã¾"
"ã™\n"
-#: client/civclient.c:251
+#: client/civclient.c:252
msgid " -m, --meta HOST\tConnect to the metaserver at HOST\n"
msgstr " -m, --meta HOST\tHOST ã«ã‚るメタサーãƒã«æŽ¥ç¶šã™ã‚‹\n"
-#: client/civclient.c:253
+#: client/civclient.c:254
msgid " -n, --name NAME\tUse NAME as name\n"
msgstr " -n, --name NAME\tåå‰ã¨ã—㦠NAME を使ã„ã¾ã™\n"
-#: client/civclient.c:255
+#: client/civclient.c:256
msgid " -p, --port PORT\tConnect to server port PORT (usually with -a)\n"
msgstr ""
" -p, --port PORT\tサーãƒã®ãƒãƒ¼ãƒˆ PORT ã«æŽ¥ç¶šã—ã¾ã™ (普通ã«ã€€-aã‚’ã¤ã‘ã¦)\n"
-#: client/civclient.c:257
+#: client/civclient.c:258
#, c-format
msgid " -P, --Plugin PLUGIN\tUse PLUGIN for sound output %s\n"
msgstr " -P, --Plugin PLUGIN\tPLUGIN をサウンド出力ã«ä½¿ã† %s\n"
-#: client/civclient.c:259
+#: client/civclient.c:260
msgid " -r, --read FILE\tRead startup script FILE (for spawned server only)\n"
msgstr " -r, --read FILE\t起動スクリプト FILE ã‚’èªã‚€ (派生サーãƒã®ã¿)\n"
-#: client/civclient.c:262
+#: client/civclient.c:263
msgid " -s, --server HOST\tConnect to the server at HOST (usually with -a)\n"
msgstr ""
" -s, --server HOST\tHOST ã«ã‚るサーãƒã«æŽ¥ç¶šã—ã¾ã™ (普通ã«ã€€-aã‚’ã¤ã‘ã¦)\n"
-#: client/civclient.c:264
+#: client/civclient.c:265
msgid " -S, --Sound FILE\tRead sound tags from FILE\n"
msgstr " -S, --Sound FILE\tFILE ã‹ã‚‰éŸ³æ¥½ã‚¿ã‚°ã‚’èªã‚€\n"
-#: client/civclient.c:265
+#: client/civclient.c:266
msgid " -t, --tiles FILE\tUse data file FILE.tilespec for tiles\n"
msgstr " -t, --tiles FILE\tタイルã¨ã—ã¦ãƒ‡ãƒ¼ã‚¿ãƒ•ã‚¡ã‚¤ãƒ« FILE.tilespec を使ã†\n"
-#: client/civclient.c:268
+#: client/civclient.c:269
#, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -8338,156 +8326,166 @@ msgstr ""
"\t\t\t詳ã—ã㯠\"%s -- --help\" を試ã¿ã¦ä¸‹ã•ã„。\n"
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:273
+#: client/civclient.c:274
#, fuzzy, c-format
msgid "Report bugs at %s\n"
msgstr "<%s>ã¸ãƒã‚°ã‚’å ±å‘Šã—ã¦ä¸‹ã•ã„。\n"
# clefs
-#: client/civclient.c:297
+#: client/civclient.c:298
#, c-format
msgid "Invalid port \"%s\" specified with --port option.\n"
msgstr "--port オプションã§ç„¡åŠ¹ãªãƒãƒ¼ãƒˆ \"%s\" ãŒæŒ‡å®šã•ã‚Œã¾ã—ãŸã€‚\n"
-#: client/civclient.c:299 client/civclient.c:314
+#: client/civclient.c:300 client/civclient.c:315
msgid "Try using --help.\n"
msgstr "--help を試ã¿ã¦ä¸‹ã•ã„。\n"
# clefs
-#: client/civclient.c:312
+#: client/civclient.c:313
#, c-format
msgid "Invalid debug level \"%s\" specified with --debug option.\n"
msgstr "--debug オプションã§ç„¡åŠ¹ãªãƒ‡ãƒãƒƒã‚°ãƒ¬ãƒ™ãƒ« \"%s\" ãŒæŒ‡å®šã•ã‚Œã¾ã—ãŸã€‚\n"
-#: client/civclient.c:325
+#: client/civclient.c:326
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr "èªè˜ã§ããªã„オプション: \"%s\"\n"
-#: client/civclient.c:539
+#: client/civclient.c:391
+#, fuzzy, c-format
+msgid "Updating old metaserver address \"%s\"."
+msgstr "metaserver <所在>"
+
+#: client/civclient.c:394
+#, fuzzy, c-format
+msgid "Default metaserver has been set to \"%s\"."
+msgstr "オプション: %s 㯠\"%s\" ã«è¨å®šã•ã‚Œã¾ã—ãŸã€‚"
+
+#: client/civclient.c:550
msgid "Game started."
msgstr "ゲームãŒå§‹ã¾ã‚Šã¾ã—ãŸã€‚"
-#: client/civclient.c:577
+#: client/civclient.c:588
msgid "There was an error while auto connecting; aborting."
msgstr "自動接続ä¸ã«ã‚¨ãƒ©ãƒ¼ãŒèµ·ã“ã‚Šã¾ã—ãŸã€‚ä¸æ–ã—ã¦ã„ã¾ã™ã€‚"
-#: client/climisc.c:176
+#: client/climisc.c:177
#, c-format
msgid "Changing production of every %s into %s."
msgstr "å…¨ã¦ã®%s生産物を%sã¸å¤‰æ›´ã—ã¾ã™ã€‚"
-#: client/climisc.c:214
+#: client/climisc.c:215
msgid "?embassy:Both"
msgstr "相互"
# clefs
# 相手国ã«å¤§ä½¿é¤¨ã‚’è¨ç½®ã—ã¦ã„ã‚‹
-#: client/climisc.c:216
+#: client/climisc.c:217
msgid "?embassy:Yes"
msgstr "先方ã«è¨ç½®"
# clefs
# 相手ã®å¤§ä½¿é¤¨ãŒè‡ªå›½ã«è¨ç½®ã•ã‚Œã¦ã„ã‚‹
-#: client/climisc.c:219
+#: client/climisc.c:220
msgid "?embassy:With Us"
msgstr "自国ã«å—ã‘入れ"
# clefs
# 他国ã¨ãƒ¦ãƒ‹ãƒƒãƒˆãŒæŽ¥è§¦ã—ãŸå¾Œã®æ•°åターンã¯å¤§ä½¿é¤¨ãªã—ã§å¤–交ã§ãã‚‹
-#: client/climisc.c:222
+#: client/climisc.c:223
msgid "?embassy:Contact"
msgstr "接触ã‚ã‚Š"
# clefs
# "Contact"ã¯å¤±ã‚れるã“ã¨ãŒã‚ã‚‹ã®ã§ã€ŒæœªæŽ¥è§¦ã€ã§ã¯ã¾ãšã„
# was "外交ルートãªã—"
-#: client/climisc.c:224
+#: client/climisc.c:225
msgid "?embassy:No Contact"
msgstr "接触ãªã—"
-#: client/climisc.c:236
+#: client/climisc.c:237
msgid "?vision:Both"
msgstr "相互"
-#: client/climisc.c:238
+#: client/climisc.c:239
msgid "?vision:To Them"
msgstr "与ãˆã‚‹"
-#: client/climisc.c:241
+#: client/climisc.c:242
msgid "?vision:To Us"
msgstr "å¾—ã‚‹"
-#: client/climisc.c:257 client/climisc.c:264
+#: client/climisc.c:258 client/climisc.c:265
#, c-format
msgid "The %s give %s"
msgstr "%sã¯%sを与ãˆã‚‹"
-#: client/climisc.c:268
+#: client/climisc.c:269
#, c-format
msgid "The %s give unknown city."
msgstr "%sã¯æœªçŸ¥ã®éƒ½å¸‚を与ãˆã‚‹"
-#: client/climisc.c:273
+#: client/climisc.c:274
#, c-format
msgid "The %s give %d gold"
msgstr "%sã¯é‡‘%dを与ãˆã‚‹"
-#: client/climisc.c:278
+#: client/climisc.c:279
#, c-format
msgid "The %s give their worldmap"
msgstr "%sã¯ä¸–界地図を与ãˆã‚‹"
-#: client/climisc.c:282
+#: client/climisc.c:283
#, c-format
msgid "The %s give their seamap"
msgstr "%sã¯æµ·æ´‹åœ°å›³ã‚’与ãˆã‚‹"
-#: client/climisc.c:286
+#: client/climisc.c:287
msgid "The parties agree on a cease-fire"
msgstr "åœæˆ¦ã«åˆæ„ã™ã‚‹"
-#: client/climisc.c:289
+#: client/climisc.c:290
msgid "The parties agree on a peace"
msgstr "和平ã«åˆæ„ã™ã‚‹"
-#: client/climisc.c:292
+#: client/climisc.c:293
msgid "The parties create an alliance"
msgstr "åŒç›Ÿã«åˆæ„ã™ã‚‹"
-#: client/climisc.c:295
+#: client/climisc.c:296
#, c-format
msgid "The %s give shared vision"
msgstr "%sã¯å…±æœ‰è¦–野を与ãˆã‚‹"
-#: client/climisc.c:299
+#: client/climisc.c:300
#, c-format
msgid "The %s give an embassy"
msgstr "%sã¯å¤§ä½¿é¤¨ã®é–‹è¨ã‚’許å¯ã™ã‚‹"
-#: client/climisc.c:902
+#: client/climisc.c:906
msgid "Popup Request"
msgstr "ãƒãƒƒãƒ—アップè¦æ±‚"
-#: client/climisc.c:932
+#: client/climisc.c:936
msgid "Exporting output window to civgame.log ..."
msgstr "出力ウィンドウを civgame.log ã¸ä¿å˜ã—ã¦ã„ã¾ã™ ..."
-#: client/climisc.c:936
+#: client/climisc.c:940
msgid "Export complete."
msgstr "ä¿å˜å®Œäº†ã€‚"
-#: client/climisc.c:938
+#: client/climisc.c:942
msgid "Export failed, couldn't write to file."
msgstr "ä¿å˜ãŒå¤±æ•—ã—ã¾ã—ãŸã€‚ファイルã¸æ›¸ãè¾¼ã‚ã¾ã›ã‚“。"
# yasu, clefs
-#: client/climisc.c:1038
+#: client/climisc.c:1042
#, c-format
msgid "You don't buy %s in %s!"
msgstr "%sã®%sã¯è²·ãˆã¾ã›ã‚“!"
-#: client/climisc.c:1056
+#: client/climisc.c:1060
#, c-format
msgid "%s costs %d gold and you only have %d gold."
msgstr "%sã«ã¯é‡‘%dã‹ã‹ã‚Šã¾ã™ãŒï¼Œé‡‘%dã—ã‹æŒã£ã¦ã„ã¾ã›ã‚“。"
@@ -8539,19 +8537,19 @@ msgstr ""
"サーム\"%s\"(ãƒãƒ¼ãƒˆ %d, ユーザ \"%s\")㸠%f 秒毎㫠%d 回ã¾ã§è‡ªå‹•æŽ¥ç¶šã‚’試ã¿ã¦"
"ã„ã¾ã™ã€‚"
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1289
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
msgid "novice"
msgstr "åˆå¿ƒè€…用"
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1289
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1358
msgid "easy"
msgstr "ç°¡å˜"
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1290
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
msgid "normal"
msgstr "普通"
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1290
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
msgid "hard"
msgstr "難ã—ã„"
@@ -8587,40 +8585,43 @@ msgstr "ã“ã“ã‹ã‚‰ã ã¨èµ·å‹•ã§ããªã„ã®ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。"
# clefs
#: client/connectdlg_common.c:470
-msgid "We have control of the server (command access level hack)"
+#, fuzzy
+msgid ""
+"Established control over the server. You have command access level 'hack'."
msgstr "我々ãŒã‚µãƒ¼ãƒã‚’制御ã—ã¦ã„ã¾ã™ï¼ˆã‚³ãƒžãƒ³ãƒ‰ãƒ¬ãƒ™ãƒ«ã§æ“作ã§ãã¾ã™ï¼‰"
-# clefs
#: client/connectdlg_common.c:475
-msgid "We can't take control of server, attempting to kill it."
-msgstr "サーãƒã‚’制御ã§ããªã„ã®ã§ï¼Œkillã—ã¦ã¿ã¾ã™ã€‚"
+msgid ""
+"Failed to obtain the required access level to take control of the server. "
+"The server will now be shutdown."
+msgstr ""
-#: client/control.c:1104
+#: client/control.c:1123
msgid "Only transporter units can be unloaded."
msgstr "輸é€éƒ¨éšŠã ã‘ãŒé™ã‚ã›ã¾ã™ã€‚"
-#: client/control.c:1353
+#: client/control.c:1425
msgid "Only settler units can be put into auto mode."
msgstr "開拓者部隊ã¨éƒ½å¸‚ã«æ‰€å±žã™ã‚‹è»äº‹éƒ¨éšŠã ã‘ãŒè‡ªå‹•ãƒ¢ãƒ¼ãƒ‰ã«ã§ãã¾ã™ã€‚"
-#: client/control.c:1444
+#: client/control.c:1516
msgid "Only nuclear units can do this."
msgstr "æ ¸å…µå™¨éƒ¨éšŠã ã‘ãŒã“れを行ãˆã¾ã™ã€‚"
-#: client/control.c:1473
+#: client/control.c:1545
msgid "Only paratrooper units can do this."
msgstr "è½ä¸‹å‚˜å…µéƒ¨éšŠã ã‘ãŒã“れを行ãˆã¾ã™ã€‚"
-#: client/control.c:1921
+#: client/control.c:2020
msgid "Too far for this unit."
msgstr "ã“ã®éƒ¨éšŠã‹ã‚‰é ã™ãŽã¾ã™ã€‚"
-#: client/control.c:2131 client/control.c:2161 client/control.c:2177
+#: client/control.c:2230 client/control.c:2260 client/control.c:2276
msgid "Didn't find a route to the destination!"
msgstr "目的地ã¾ã§ã®çµŒè·¯ã‚’探ã›ã¾ã›ã‚“。"
# clefs
-#: client/control.c:2221
+#: client/control.c:2320
msgid "Oh my! You seem to have no capital!"
msgstr "ã‚ã„ã‚„ï¼ã€€é¦–都ãŒãªã„ã¿ãŸã„ã§ã™ã‚ˆï¼"
@@ -8704,16 +8705,16 @@ msgid "Allows %s (with %s)."
msgstr "%s を建è¨å¯èƒ½ã«ã—ã¾ã™(%sã‚‚å¿…è¦ã§ã™)。"
#. TRANS: preserve single space at beginning
-#: client/helpdata.c:418
+#: client/helpdata.c:416
msgid " Rivers"
msgstr " å·"
-#: client/helpdata.c:576
+#: client/helpdata.c:574
#, c-format
msgid "Sorry, no help topic for %s.\n"
msgstr "ã™ã¿ã¾ã›ã‚“。%sã®ãƒ˜ãƒ«ãƒ—トピックã¯ã‚ã‚Šã¾ã›ã‚“。\n"
-#: client/helpdata.c:580
+#: client/helpdata.c:578
#, c-format
msgid ""
"Sorry, no help topic for %s.\n"
@@ -8725,7 +8726,7 @@ msgstr ""
"\n"
# Daniel
-#: client/helpdata.c:670
+#: client/helpdata.c:668
msgid ""
"Requires: Nothing\n"
"\n"
@@ -8734,83 +8735,83 @@ msgstr ""
"\n"
# Daniel
-#: client/helpdata.c:675
+#: client/helpdata.c:673
#, c-format
msgid "* The discovery of %s will make %s obsolete.\n"
msgstr "* %sãŒç™ºè¦‹ã•ã‚Œã‚‹ã¨%sã¯å¤ããªã‚Šã¾ã™ã€‚\n"
-#: client/helpdata.c:694
+#: client/helpdata.c:692
#, c-format
msgid "* Allows all players with knowledge of %s to build %s units.\n"
msgstr "%sを知ã£ã¦ã„ã‚‹å…¨ã¦ã®ãƒ—レイヤーãŒ%sを作れるよã†ã«ãªã‚Šã¾ã™ã€‚\n"
# clefs
-#: client/helpdata.c:706
+#: client/helpdata.c:704
#, c-format
msgid "* Allows %s (with %s).\n"
msgstr "* %s ã‚’å¯èƒ½ã«ã—ã¾ã™(%s ã‚‚å¿…è¦ã§ã™)。\n"
# clefs
-#: client/helpdata.c:710
+#: client/helpdata.c:708
#, c-format
msgid "* Allows %s.\n"
msgstr "* %s ã‚’å¯èƒ½ã«ã—ã¾ã™ã€‚\n"
# Daniel
-#: client/helpdata.c:780
+#: client/helpdata.c:778
#, c-format
msgid "* Can only be built if there is %s in the city.\n"
msgstr "* 都市ã«%sã®ã‚る時ã ã‘作れã¾ã™ã€‚\n"
# clefs
-#: client/helpdata.c:786
+#: client/helpdata.c:784
#, c-format
msgid "* Can only be built with %s as government.\n"
msgstr "* 政治体制%sã®æ™‚ã ã‘作れã¾ã™ã€‚\n"
-#: client/helpdata.c:791
+#: client/helpdata.c:789
msgid "* May not be built in cities.\n"
msgstr "* 都市ã§ä½œã‚‰ã‚Œã‚‹ã“ã¨ã¯ã‚ã‚Šã¾ã›ã‚“。\n"
-#: client/helpdata.c:794
+#: client/helpdata.c:792
msgid "* Never has a home city.\n"
msgstr "* 所属ã®éƒ½å¸‚ã‚’æŒã¡ã¾ã›ã‚“。\n"
# clefs
-#: client/helpdata.c:797
+#: client/helpdata.c:795
msgid "* Losing this unit will lose you the game!\n"
msgstr "* ã“ã®ãƒ¦ãƒ‹ãƒƒãƒˆã‚’失ã†ã¨ã‚²ãƒ¼ãƒ ã¯è² ã‘ã«ãªã‚Šã¾ã™ï¼\n"
-#: client/helpdata.c:801
+#: client/helpdata.c:799
msgid "* Each player may only have one of this type of unit.\n"
msgstr "* ã“ã®ãƒ¦ãƒ‹ãƒƒãƒˆã¯å„プレイヤーã«ã¤ã1ã¤ã—ã‹æŒã¤ã“ã¨ãŒã§ãã¾ã›ã‚“。\n"
# clefs
-#: client/helpdata.c:805
+#: client/helpdata.c:803
#, c-format
msgid "* Requires %d population to build.\n"
msgstr "* 生産ã™ã‚‹ã«ã¯äººå£%dãŒå¿…è¦ã§ã™ã€‚\n"
-#: client/helpdata.c:811
+#: client/helpdata.c:809
#, c-format
msgid "* Can carry and refuel %d air unit.\n"
msgid_plural "* Can carry and refuel %d air units.\n"
msgstr[0] "* %dã®èˆªç©ºéƒ¨éšŠã‚’é‹æ¬ãƒ»çµ¦æ²¹ã§ãã¾ã™ã€‚\n"
-#: client/helpdata.c:816
+#: client/helpdata.c:814
#, c-format
msgid "* Can carry and refuel %d missile unit.\n"
msgid_plural "* Can carry and refuel %d missile units.\n"
msgstr[0] "* %dã®ãƒŸã‚µã‚¤ãƒ«ã‚’é‹æ¬ï¼Œçµ¦æ²¹ã§ãã¾ã™ã€‚\n"
-#: client/helpdata.c:821
+#: client/helpdata.c:819
#, c-format
msgid "* Can carry %d ground unit across water.\n"
msgid_plural "* Can carry %d ground units across water.\n"
msgstr[0] "* 海を渡ã£ã¦%d地上部隊を輸é€ã§ãã¾ã™ã€‚\n"
# clefs XXX
-#: client/helpdata.c:830
+#: client/helpdata.c:828
msgid ""
"* Can establish trade routes (must travel to target city and must be at "
"least 9 tiles [in Manhattan distance] from this unit's home city).\n"
@@ -8818,178 +8819,178 @@ msgstr ""
"* 交易路を確立ã§ãã¾ã™(æœ¬æ‹ åœ°ã‹ã‚‰æœ€ä½Ž9タイル離れãŸéƒ½å¸‚ã¾ã§è¡Œã‹ãã°ãªã‚Šã¾ã›ã‚“"
"[è·é›¢ã¯ã‚°ãƒªãƒƒãƒ‰(x+y)ã§è¨ˆç®—ã—ã¾ã™])。\n"
-#: client/helpdata.c:836
+#: client/helpdata.c:834
#, c-format
msgid "* Can help build wonders (adds %d production).\n"
msgstr "* ä¸æ€è°å»ºç¯‰ã‚’手ä¼ã†ã“ã¨ãŒã§ãã¾ã™(生産物%dã‚’åŠ ãˆã¾ã™)。\n"
# ntaka ã“ã‚Œã§ã„ã„ã¨ã¯æ€ã†ãŒ
-#: client/helpdata.c:840
+#: client/helpdata.c:838
msgid "* May not be disbanded.\n"
msgstr "* 解散ã™ã‚‹ã“ã¨ã¯ã‚ã‚Šã¾ã›ã‚“。\n"
# clefs
-#: client/helpdata.c:842
+#: client/helpdata.c:840
#, c-format
msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
msgstr "* 都市ã§è§£æ•£ã•ã›ã‚‹ã¨ç”Ÿç”£ã‚³ã‚¹ãƒˆã®50%%ã‚’å†åˆ©ç”¨ã§ãã¾ã™ã€‚\n"
-#: client/helpdata.c:846
+#: client/helpdata.c:844
msgid "* Can build new cities.\n"
msgstr "* æ–°ã—ã„都市を作るã“ã¨ãŒã§ãã¾ã™ã€‚\n"
# clefs XXX
-#: client/helpdata.c:849
+#: client/helpdata.c:847
#, c-format
msgid "* Can add on %d population to cities of no more than size %d.\n"
msgstr "*%2$d以下ã®è¦æ¨¡ã®éƒ½å¸‚ã«%1$dã®äººå£ã‚’åŠ ãˆã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚\n"
-#: client/helpdata.c:858
+#: client/helpdata.c:856
msgid "* Can build roads and railroads.\n"
msgstr "* é“路や鉄é“を作るã“ã¨ãŒã§ãã¾ã™ã€‚\n"
-#: client/helpdata.c:859
+#: client/helpdata.c:857
msgid "* Can build mines on tiles.\n"
msgstr "* タイル上ã§è³‡æºåŒ–ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚\n"
-#: client/helpdata.c:860
+#: client/helpdata.c:858
msgid "* Can build irrigation on tiles.\n"
msgstr "* タイル上ã§çŒæ¼‘ã‚’è¡Œã†ã“ã¨ãŒã§ãã¾ã™ã€‚\n"
-#: client/helpdata.c:865
+#: client/helpdata.c:863
msgid "* Can build farmland.\n"
msgstr "* 農地を作るã“ã¨ãŒã§ãã¾ã™ã€‚\n"
-#: client/helpdata.c:869
+#: client/helpdata.c:867
#, c-format
msgid "* Can build farmland (if %s is known).\n"
msgstr "* 農地を作るã“ã¨ãŒã§ãã¾ã™(%sãŒç™ºè¦‹ã•ã‚Œã¦ã„ã‚Œã°)。\n"
# clefs
-#: client/helpdata.c:873
+#: client/helpdata.c:871
#, c-format
msgid "* Can build farmland (if any of the following are known: %s).\n"
msgstr "* è¾²å ´ã‚’ä½œã‚Œã¾ã™ (ã‚‚ã—以下ã®ã‚‚ã®ãŒçŸ¥ã‚‰ã‚Œã¦ã„ã‚Œã°: %s)。\n"
-#: client/helpdata.c:881
+#: client/helpdata.c:879
msgid "* Can build fortresses.\n"
msgstr "* è¦å¡žã‚’作るã“ã¨ãŒã§ãã¾ã™ã€‚\n"
-#: client/helpdata.c:885
+#: client/helpdata.c:883
#, c-format
msgid "* Can build fortresses (if %s is known).\n"
msgstr "* è¦å¡žã‚’作るã“ã¨ãŒã§ãã¾ã™(%sãŒç™ºè¦‹ã•ã‚Œã¦ã„ã‚Œã°)。\n"
# clefs
-#: client/helpdata.c:889
+#: client/helpdata.c:887
#, c-format
msgid "* Can build fortresses (if any of the following are known: %s).\n"
msgstr ""
"* è¦å¡žã‚’作るã“ã¨ãŒã§ãã¾ã™(以下ã®ã†ã¡ã„ãšã‚Œã‹ãŒç™ºè¦‹ã•ã‚Œã¦ã„ã‚Œã°: %s)。\n"
-#: client/helpdata.c:895
+#: client/helpdata.c:893
msgid "* Can clean pollution from tiles.\n"
msgstr "* タイル上ã®æ±šæŸ“を除去ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚\n"
-#: client/helpdata.c:896
+#: client/helpdata.c:894
msgid "* Can clean nuclear fallout from tiles.\n"
msgstr "* タイル上ã®æ»ã®ç°ã‚’除去ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚\n"
-#: client/helpdata.c:899
+#: client/helpdata.c:897
msgid "* Can transform tiles.\n"
msgstr "* 地形を変ãˆã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚\n"
-#: client/helpdata.c:902
+#: client/helpdata.c:900
msgid "* Can build airbases.\n"
msgstr "* é£›è¡Œå ´ã‚’ä½œã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚\n"
-#: client/helpdata.c:906
+#: client/helpdata.c:904
#, c-format
msgid "* May fortify, granting a 50%% defensive bonus.\n"
msgstr "* 防御態勢をã¨ã‚‹ã¨ï¼Œ50%% 防御力ãŒå¢—åŠ ã—ã¾ã™ã€‚\n"
-#: client/helpdata.c:909
+#: client/helpdata.c:907
msgid "* May pillage to destroy infrastructure from tiles.\n"
msgstr "* 略奪ã«ã‚ˆã‚Šã‚¿ã‚¤ãƒ«ä¸Šã®ã‚¤ãƒ³ãƒ•ãƒ©ã‚’ç ´å£Šã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚\n"
-#: client/helpdata.c:913
+#: client/helpdata.c:911
msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
msgstr "* 外交行為を行ãˆï¼Œã•ã‚‰ã«ç‰¹åˆ¥ãªã‚¹ãƒ‘イ能力をæŒã¡ã¾ã™ã€‚\n"
-#: client/helpdata.c:916
+#: client/helpdata.c:914
msgid "* Can perform diplomatic actions.\n"
msgstr "* 外交行為を行ãˆã¾ã™ã€‚\n"
# ã„ã¾ã„ã¡ (clefs)
-#: client/helpdata.c:920
+#: client/helpdata.c:918
msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
msgstr "* ユニット間ã®å¤–交戦ã§æ•—れるã“ã¨ã¯ã‚ã‚Šã¾ã›ã‚“。\n"
-#: client/helpdata.c:923
+#: client/helpdata.c:921
msgid "* May not be bribed.\n"
msgstr "* è²·åŽã•ã‚Œã‚‹ã“ã¨ã¯ã‚ã‚Šã¾ã›ã‚“。\n"
-#: client/helpdata.c:926
+#: client/helpdata.c:924
msgid "* Can attack enemy air units.\n"
msgstr "* 敵ã®é£›è¡Œéƒ¨éšŠã«æ”»æ’ƒã§ãã¾ã™ã€‚\n"
-#: client/helpdata.c:930
+#: client/helpdata.c:928
msgid "* Is invisible except when next to an enemy unit or city.\n"
msgstr "* 隣りã«æ•µéƒ¨éšŠã‚„都市ãŒãªã„é™ã‚Šä¸å¯è¦–。\n"
-#: client/helpdata.c:934
+#: client/helpdata.c:932
msgid "* Can only attack units on ocean squares (no land attacks).\n"
msgstr "* 海上ã«ã„る部隊ã«ã®ã¿æ”»æ’ƒã§ãã¾ã™ã€‚(地上攻撃ä¸å¯)\n"
# ama, yasu
-#: client/helpdata.c:938
+#: client/helpdata.c:936
msgid ""
"* Can attack from aboard sea units: against enemy cities and onto land "
"squares.\n"
msgstr "* 船上ã‹ã‚‰æ•µéƒ½å¸‚や陸上ã®ã‚¿ã‚¤ãƒ«ã‚’攻撃ã§ãã¾ã™ã€‚\n"
# yasu, ama
-#: client/helpdata.c:943
+#: client/helpdata.c:941
#, c-format
msgid "* Can be paradropped from a friendly city (Range: %d).\n"
msgstr "* å‹å¥½éƒ½å¸‚ã‹ã‚‰è½ä¸‹å‚˜é™ä¸‹ã§ãã¾ã™ã€‚(範囲: %d)\n"
-#: client/helpdata.c:949
+#: client/helpdata.c:947
msgid "* Gets double defense against units specified as 'mounted'.\n"
msgstr "* 「乗馬ã—ã¦ã„ã‚‹ã€éƒ¨éšŠã«å¯¾ã—ã¦2å€ã®é˜²å¾¡åŠ›ãŒã‚ã‚Šã¾ã™ã€‚\n"
-#: client/helpdata.c:953
+#: client/helpdata.c:951
msgid "* Counts as 'mounted' against certain defenders.\n"
msgstr "* 「乗馬ã—ã¦ã„ã‚‹ã€ã¨æ‰±ã‚ã‚Œã¾ã™ã€‚\n"
# yasu, ama, clefs
# ミサイル
# was " * 攻撃開始時ã«ä½¿ã„切りã¾ã™ã€‚\n"
-#: client/helpdata.c:957
+#: client/helpdata.c:955
msgid "* A missile unit: gets used up in making an attack.\n"
msgstr " * ミサイル部隊：攻撃を実行ã™ã‚‹ã¨æ¶ˆæ»…ã—ã¾ã™ã€‚\n"
# ama, clefs
# (ä¿®æ£å‰)msgstr "* ターンã®çµ‚ã‚ã‚Šã«æ”»æ’ƒã—ã¾ã™ã€‚\n"
-#: client/helpdata.c:960
+#: client/helpdata.c:958
msgid "* Making an attack ends this unit's turn.\n"
msgstr "* 攻撃ã™ã‚‹ã¨ãã®ã‚¿ãƒ¼ãƒ³ã¯ãれ以上行動ã§ãã¾ã›ã‚“。\n"
-#: client/helpdata.c:964
+#: client/helpdata.c:962
msgid "* This unit's attack causes a nuclear explosion!\n"
msgstr "* ã“ã®éƒ¨éšŠã®æ”»æ’ƒã¯æ ¸çˆ†ç™ºã‚’引ãèµ·ã“ã—ã¾ã™!\n"
-#: client/helpdata.c:968
+#: client/helpdata.c:966
msgid "* Gets double firepower when attacking cities.\n"
msgstr "* 都市を攻撃ã™ã‚‹ã¨ãã¯ç«åŠ›ãŒ2å€ã«ãªã‚Šã¾ã™ã€‚\n"
-#: client/helpdata.c:971
+#: client/helpdata.c:969
msgid "* Ignores the effects of city walls.\n"
msgstr "* 城å£ã®åŠ¹æžœã‚’無視ã—ã¾ã™ã€‚\n"
# clefs
# 未実装ã®featureãªã®ã‹ãª
-#: client/helpdata.c:975
+#: client/helpdata.c:973
#, c-format
msgid ""
"* Does bombard attacks (%d per turn). These attacks will only damage (never "
@@ -8998,35 +8999,35 @@ msgstr ""
"* 爆撃ã§ãã¾ã™(1ターンã«%d回)。爆撃ã¯é˜²å¾¡å´ã«ãƒ€ãƒ¡ãƒ¼ã‚¸ã‚’与ãˆã‚‹ã ã‘(ã§ï¼ŒæŠ¹æ®ºã¯"
"ã§ãã¾ã›ã‚“)ãŒï¼Œæ”»æ’ƒå´ã«ã¯å…¨ãå±é™ºãŒã‚ã‚Šã¾ã›ã‚“。\n"
-#: client/helpdata.c:982
+#: client/helpdata.c:980
msgid "* Gets quintuple defense against missiles and aircraft.\n"
msgstr "* ミサイルã¨é£›è¡Œæ©Ÿã«å¯¾ã—ã¦5å€ã®é˜²å¾¡åŠ›ã‚’発æ®ã—ã¾ã™ã€‚\n"
-#: client/helpdata.c:986
+#: client/helpdata.c:984
msgid "* Ignores terrain effects (treats all squares as roads).\n"
msgstr "* 地形効果を無視ã—ã¾ã™(å…¨ã¦ã®åœŸåœ°ã‚’é“è·¯ã¨ã¿ãªã—ã¾ã™)。\n"
-#: client/helpdata.c:989
+#: client/helpdata.c:987
msgid "* Ignores zones of control.\n"
msgstr "* ゾーンコントãƒãƒ¼ãƒ«ã‚’無視ã—ã¾ã™ã€‚\n"
-#: client/helpdata.c:993
+#: client/helpdata.c:991
msgid "* A non-military unit (cannot attack; no martial law).\n"
msgstr "* éžæˆ¦é—˜éƒ¨éšŠã§ã™ã€‚(攻撃ã§ãã¾ã›ã‚“。戒厳令ã¯é©ç”¨ã•ã‚Œã¾ã›ã‚“。)\n"
-#: client/helpdata.c:997
+#: client/helpdata.c:995
msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
msgstr "* フィールド部隊ã§ã™ã€‚ç©æ¥µçš„ã«æˆ¦é—˜ã—ãªãã¦ã‚‚ä¸å¹¸å¸‚æ°‘ãŒ1生ã¾ã‚Œã¾ã™ã€‚\n"
-#: client/helpdata.c:1000
+#: client/helpdata.c:998
msgid "* Will never achieve veteran status.\n"
msgstr "* ベテランã«ãªã‚‹ã“ã¨ã¯ã‚ã‚Šã¾ã›ã‚“。\n"
-#: client/helpdata.c:1002
+#: client/helpdata.c:1000
msgid "* May become veteran through training or combat.\n"
msgstr "* 訓練ã‹æˆ¦é—˜ã‚’通ã˜ã¦ãƒ™ãƒ†ãƒ©ãƒ³ã«ãªã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚\n"
-#: client/helpdata.c:1008
+#: client/helpdata.c:1006
#, c-format
msgid ""
"* Must end turn in a city or next to land, or has a 50%% risk of being lost "
@@ -9036,13 +9037,13 @@ msgstr ""
"ã‚ã‚Šã¾ã™ã€‚\n"
# clefs
-#: client/helpdata.c:1012
+#: client/helpdata.c:1010
#, c-format
msgid "* The discovery of %s reduces the risk to 25%%.\n"
msgstr "* %sを発見ã™ã‚‹ã¨é›£ç ´ã®ç¢ºçŽ‡ã¯25%%ã«ãªã‚Šã¾ã™ã€‚\n"
# clefs
-#: client/helpdata.c:1017
+#: client/helpdata.c:1015
#, c-format
msgid "* %s reduces the risk to 12%%.\n"
msgstr "* %sを発見ã™ã‚‹ã¨é›£ç ´ã®ç¢ºçŽ‡ã¯12%%ã«ãªã‚Šã¾ã™ã€‚\n"
@@ -9051,26 +9052,26 @@ msgstr "* %sを発見ã™ã‚‹ã¨é›£ç ´ã®ç¢ºçŽ‡ã¯12%%ã«ãªã‚Šã¾ã™ã€‚\n"
#. * last two elements
#. TRANS: List of possible output types has this between
#. * last two elements
-#: client/helpdata.c:1068 client/helpdata.c:1402
+#: client/helpdata.c:1066 client/helpdata.c:1400
msgid " or "
msgstr "ã‹"
-#: client/helpdata.c:1070 client/helpdata.c:1390
+#: client/helpdata.c:1068 client/helpdata.c:1388
msgid "?or:, "
msgstr "ã‹"
-#: client/helpdata.c:1082
+#: 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"
msgstr[0] "* %2$dターンéŽãŽãŸã‚‰éƒ¨éšŠã¯éƒ½å¸‚ã‹%1$sã«ã„ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。\n"
-#: client/helpdata.c:1124
+#: client/helpdata.c:1122
#, c-format
msgid "If we would now start with %s we would need %d bulbs."
msgstr "今%sを開始ã—ãŸã‚‰ï¼Œ%då˜ä½å¿…è¦ã§ã™ã€‚"
-#: client/helpdata.c:1129
+#: client/helpdata.c:1127
#, c-format
msgid ""
"To reach %s we need to obtain %d other technologies first. The whole project "
@@ -9080,94 +9081,94 @@ msgstr ""
"らã›ã‚‹ã«ã¯ï¼Œ%då˜ä½å¿…è¦ã§ã™ã€‚"
# clefs
-#: client/helpdata.c:1137
+#: client/helpdata.c:1135
msgid "You cannot research this technology."
msgstr "ã“ã®æŠ€è¡“ã¯ç ”究ã§ãã¾ã›ã‚“。"
-#: client/helpdata.c:1141
+#: client/helpdata.c:1139
msgid " This number may vary depending on what other players will research.\n"
msgstr ""
" ã“ã®æ•°ã¯ä»–ã®ãƒ—レイヤーãŒç ”究ã—ã¦ã„る物ã«ã‚ˆã£ã¦ã¯ç•°ãªã‚‹ã“ã¨ãŒã‚ã‚Šã¾ã™ã€‚\n"
-#: client/helpdata.c:1153
+#: client/helpdata.c:1151
#, 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:1158
+#: client/helpdata.c:1156
#, c-format
msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
msgstr "* 外海ã§å°èˆŸãŒé›£ç ´ã™ã‚‹ç¢ºçŽ‡ã‚’25%%ã«æŠ‘ãˆã¾ã™ã€‚\n"
-#: client/helpdata.c:1161
+#: client/helpdata.c:1159
#, c-format
msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
msgstr "* 外海ã§å°èˆŸãŒé›£ç ´ã™ã‚‹ç¢ºçŽ‡ã‚’12%%ã«æŠ‘ãˆã¾ã™ã€‚\n"
-#: client/helpdata.c:1165
+#: client/helpdata.c:1163
msgid "* Increases the pollution generated by the population.\n"
msgstr "* 人å£ã«ã‚ˆã£ã¦å¼•ãèµ·ã“ã•ã‚Œã‚‹å…¬å®³ã‚’増やã—ã¾ã™ã€‚\n"
-#: client/helpdata.c:1170
+#: client/helpdata.c:1168
#, c-format
msgid "* Allows %s to build roads on river squares.\n"
msgstr "* %sã§å·ã®ä¸Šã«é“路を作れるよã†ã«ãªã‚Šã¾ã™ã€‚\n"
-#: client/helpdata.c:1177
+#: client/helpdata.c:1175
#, c-format
msgid "* Allows %s to build fortresses.\n"
msgstr "* %sã§è¦å¡žã‚’作れるよã†ã«ãªã‚Šã¾ã™ã€‚\n"
-#: client/helpdata.c:1185
+#: client/helpdata.c:1183
#, c-format
msgid "* Allows %s to build airbases.\n"
msgstr "* %sã§é£›è¡Œå ´ã‚’作れるよã†ã«ãªã‚Šã¾ã™ã€‚\n"
-#: client/helpdata.c:1194
+#: client/helpdata.c:1192
#, c-format
msgid "* Allows %s to upgrade roads to railroads.\n"
msgstr "* %sã§é“路を鉄é“ã¸ã‚¢ãƒƒãƒ—グレードã§ãるよã†ã«ãªã‚Šã¾ã™ã€‚\n"
-#: client/helpdata.c:1202
+#: client/helpdata.c:1200
#, c-format
msgid "* Allows %s to upgrade irrigation to farmland.\n"
msgstr "* %sã§çŒæ¼‘を農地ã¸ã‚¢ãƒƒãƒ—グレードã§ãるよã†ã«ãªã‚Šã¾ã™ã€‚\n"
-#: client/helpdata.c:1236
+#: client/helpdata.c:1234
msgid "* Pollution cannot be generated on this terrain."
msgstr "* ã“ã®åœ°å½¢ã«ã¯å…¬å®³ã¯ç™ºç”Ÿã—ã¾ã›ã‚“。"
-#: client/helpdata.c:1241
+#: client/helpdata.c:1239
msgid "* You cannot build cities on this terrain."
msgstr "* ã“ã®åœ°å½¢ã«éƒ½å¸‚ã¯å»ºè¨ã§ãã¾ã›ã‚“。"
# clefs
# ã¾ã å˜åœ¨ã—ãªã„ãŒï¼Œå°†æ¥å°Žå…¥ã•ã‚Œã‚‹ã‚‰ã—ã„
-#: client/helpdata.c:1247
+#: client/helpdata.c:1245
msgid "* The coastline of this terrain is unsafe."
msgstr "* ã“ã®åœ°å½¢ã®æµ·å²¸ç·šã¯å±é™ºã§ã™ã€‚"
-#: client/helpdata.c:1252
+#: client/helpdata.c:1250
msgid "* This terrain is unsafe for units to travel on."
msgstr "* ã“ã®åœ°å½¢ã§ã®éƒ¨éšŠã®ç§»å‹•ã¯å±é™ºã§ã™ã€‚"
# clefs
-#: client/helpdata.c:1257
+#: client/helpdata.c:1255
msgid "* Land units cannot travel on oceanic terrains."
msgstr "* 陸上部隊ã¯æµ·æ´‹åœ°å½¢ã®ä¸Šã«ã¯ç§»å‹•ã§ãã¾ã›ã‚“。"
-#: client/helpdata.c:1307
+#: client/helpdata.c:1305
msgid "Features:\n"
msgstr ""
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1413 client/helpdata.c:1414
+#: client/helpdata.c:1411 client/helpdata.c:1412
msgid "?outputlist: Nothing "
msgstr ""
-#: client/helpdata.c:1421
+#: client/helpdata.c:1419
#, fuzzy, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
@@ -9179,7 +9180,7 @@ msgstr[0] ""
"æœ¬æ‹ åœ°ã‚’é›¢ã‚ŒãŸè»äº‹éƒ¨éšŠï¼ŒãŠã‚ˆã³å…¨ã¦ã®ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰éƒ¨éšŠã¯%d市民をä¸å¹¸ã«ã—ã¾ã™ã€‚\n"
# clefs
-#: client/helpdata.c:1431
+#: client/helpdata.c:1429
#, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -9189,26 +9190,26 @@ msgstr ""
# clefs
#. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1439
+#: client/helpdata.c:1437
#, c-format
msgid "* You pay %d times normal %s upkeep for your units.\n"
msgstr "* 部隊ç¶æŒã«å¿…è¦ãª%2$sã¯é€šå¸¸ã®%1$då€ã«ãªã‚Šã¾ã™ã€‚\n"
# clefs
-#: client/helpdata.c:1444
+#: client/helpdata.c:1442
#, 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:1449
+#: client/helpdata.c:1447
#, c-format
msgid "* You pay no %s upkeep for your units.\n"
msgstr "* 部隊ç¶æŒã«%sã®å¿…è¦ã¯ã‚ã‚Šã¾ã›ã‚“。\n"
# Daniel
-#: client/helpdata.c:1453
+#: client/helpdata.c:1451
msgid "* You pay no upkeep for your units.\n"
msgstr "* 部隊ç¶æŒã‚³ã‚¹ãƒˆã¯ã‚ã‚Šã¾ã›ã‚“。\n"
@@ -9216,7 +9217,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:1462
+#: client/helpdata.c:1460
#, c-format
msgid "* Each of your cities will avoid paying %d %s towards unit upkeep.\n"
msgstr "* å„都市ã§ï¼Œ%d%sã¾ã§ã®éƒ¨éšŠç¶æŒã‚³ã‚¹ãƒˆã¯å…除ã•ã‚Œã¾ã™ã€‚\n"
@@ -9224,13 +9225,13 @@ msgstr "* å„都市ã§ï¼Œ%d%sã¾ã§ã®éƒ¨éšŠç¶æŒã‚³ã‚¹ãƒˆã¯å…除ã•ã‚Œã¾ã™
# clefs
#. TRANS: Amount is subtracted from upkeep cost
#. * for each upkeep type.
-#: client/helpdata.c:1470
+#: client/helpdata.c:1468
#, c-format
msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
msgstr "* å„都市ã§ï¼Œ%dã¾ã§ã®éƒ¨éšŠç¶æŒã‚³ã‚¹ãƒˆã¯å…除ã•ã‚Œã¾ã™ã€‚\n"
# clefs
-#: client/helpdata.c:1477
+#: client/helpdata.c:1475
#, c-format
msgid "* Chance of civil war is %d%% if you lose your capital.\n"
msgstr "* 首都を失ã£ãŸå ´åˆï¼Œ%d%%ã®ç¢ºçŽ‡ã§å†…戦ã«ãªã‚Šã¾ã™ã€‚\n"
@@ -9238,7 +9239,7 @@ msgstr "* 首都を失ã£ãŸå ´åˆï¼Œ%d%%ã®ç¢ºçŽ‡ã§å†…戦ã«ãªã‚Šã¾ã™ã€‚\n"
# clefs
# XXX
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1484
+#: client/helpdata.c:1482
#, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -9249,7 +9250,7 @@ msgstr ""
# clefs
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1491
+#: client/helpdata.c:1489
#, c-format
msgid ""
"* After the first unhappy citizen due to city size, for each %d additional "
@@ -9259,18 +9260,18 @@ msgstr ""
"出ç¾ã—ã¾ã™ã€‚\n"
# clefs
-#: client/helpdata.c:1499
+#: client/helpdata.c:1497
#, c-format
msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
msgstr "科å¦ï¼ç¾é‡‘ï¼è´…æ²¢ã®æ¯”率ã¯æœ€å¤§%d%%ã¾ã§ã§ã™ã€‚\n"
# clefs
-#: client/helpdata.c:1504
+#: client/helpdata.c:1502
msgid "Has unlimited science/gold/luxuries rates.\n"
msgstr "科å¦ï¼ç¾é‡‘ï¼è´…æ²¢ã®æ¯”率ã«åˆ¶é™ã¯ã‚ã‚Šã¾ã›ã‚“。\n"
# clefs
-#: client/helpdata.c:1509
+#: client/helpdata.c:1507
#, fuzzy, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
@@ -9283,7 +9284,7 @@ msgstr[0] ""
"制的ã«æº€è¶³çŠ¶æ…‹ã«ã—ã¾ã™ã€‚\n"
# clefs
-#: client/helpdata.c:1521
+#: client/helpdata.c:1519
#, 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"
@@ -9291,7 +9292,7 @@ msgstr[0] "* 1ã¤ã®éƒ½å¸‚ã«ã¤ã最大%dã®éƒ¨éšŠã§æˆ’厳令を強ã„ã‚‹ã“
# clefs
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1532
+#: client/helpdata.c:1530
#, c-format
msgid ""
"* You may grow your cities by means of celebrations. Your cities must be at "
@@ -9301,18 +9302,18 @@ msgstr ""
"上ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。\n"
# clefs
-#: client/helpdata.c:1538
+#: client/helpdata.c:1536
msgid "* Your units cannot be bribed.\n"
msgstr "* ã‚ãªãŸã®éƒ¨éšŠã¯è²·åŽã‚’å—ã‘付ã‘ã¾ã›ã‚“。\n"
# clefs
-#: client/helpdata.c:1541
+#: client/helpdata.c:1539
msgid "* Your cities cannot be incited.\n"
msgstr "* ã‚ãªãŸã®éƒ½å¸‚ã¯ç…½å‹•ã‚’å—ã‘付ã‘ã¾ã›ã‚“。\n"
# clefs
# 「政府ã¯ç„¡æ”¿åºœã€ã„ã‚„ã‚“
-#: client/helpdata.c:1545
+#: client/helpdata.c:1543
msgid ""
"* Government will fall into anarchy if any city is in disorder for more than "
"two turns in a row.\n"
@@ -9320,48 +9321,48 @@ msgstr ""
"* 1ã¤ã®éƒ½å¸‚ãŒ2ターン以上続ã‘ã¦æ··ä¹±ã™ã‚‹ã¨ï¼Œæ”¿åºœã¯ç„¡æ”¿åºœçŠ¶æ…‹ã«é™¥ã‚Šã¾ã™ã€‚\n"
# clefs
-#: client/helpdata.c:1551
+#: client/helpdata.c:1549
msgid "* Has a senate that may prevent declaration of war.\n"
msgstr "* 上院ãŒå†…戦ã®å®£æˆ¦ã‚’防ãŽæ¢ã‚ã¦ãれるã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。\n"
# clefs
# ã‚„ã‚„æ„訳
-#: client/helpdata.c:1555
+#: client/helpdata.c:1553
msgid "* Allows partisans when cities are taken by the enemy.\n"
msgstr "* 都市ãŒæ•µã«å é ˜ã•ã‚ŒãŸéš›ã«ãƒ‘ルãƒã‚¶ãƒ³ã®èœ‚èµ·ãŒã‚ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。\n"
# clefs
-#: client/helpdata.c:1559
+#: client/helpdata.c:1557
msgid ""
"* Buildings that normally confer bonuses against unhappiness will instead "
"give gold.\n"
msgstr "* 通常ã§ã¯ä¸å¹¸å¯¾ç–ã¨ãªã‚‹å»ºé€ 物ã¯ã‹ã‚ã‚Šã«ç¾é‡‘ã‚’ã‚‚ãŸã‚‰ã—ã¾ã™ã€‚\n"
# clefs
-#: client/helpdata.c:1563
+#: client/helpdata.c:1561
msgid "* Pays no upkeep for fanatics.\n"
msgstr "* 熱狂兵ã®ç¶æŒã«ã‚³ã‚¹ãƒˆãŒã‹ã‹ã‚Šã¾ã›ã‚“。\n"
# clefs
-#: client/helpdata.c:1566
+#: client/helpdata.c:1564
msgid "* Has no unhappy citizens.\n"
msgstr "* ä¸å¹¸ãªå¸‚æ°‘ã¯å˜åœ¨ã—ã¾ã›ã‚“。\n"
# clefs
-#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
+#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
#, c-format
msgid "* Veteran %s units.\n"
msgstr "* %s部隊ã¯å…¨ã¦ãƒ™ãƒ†ãƒ©ãƒ³ã«ãªã‚Šã¾ã™ã€‚\n"
# clefs
-#: client/helpdata.c:1587
+#: client/helpdata.c:1585
msgid "* Veteran units.\n"
msgstr "* 部隊ã¯å…¨ã¦ãƒ™ãƒ†ãƒ©ãƒ³ã«ãªã‚Šã¾ã™ã€‚\n"
# clefs
# XXX %sãŒ"all"ã ã¨ãƒ˜ãƒœã„ã“ã¨ã«
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1593
+#: client/helpdata.c:1591
#, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -9372,7 +9373,7 @@ msgstr ""
# clefs
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1602
+#: client/helpdata.c:1600
#, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -9383,7 +9384,7 @@ msgstr ""
# clefs
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1610
+#: client/helpdata.c:1608
#, c-format
msgid "* Each worked tile with at least 1 %s will yield %d more of it.\n"
msgstr ""
@@ -9392,7 +9393,7 @@ msgstr ""
# Daniel
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1619
+#: client/helpdata.c:1617
#, c-format
msgid "* %s production is increased %d%%.\n"
msgstr "* %sã®ç”Ÿç”£ã¯%d%%増やã—ã¾ã™ã€‚\n"
@@ -9400,111 +9401,111 @@ msgstr "* %sã®ç”Ÿç”£ã¯%d%%増やã—ã¾ã™ã€‚\n"
# clefs
# 「交易ã®ç”Ÿç”£ã€ã¨ã‹ã«ãªã£ã¦ã—ã¾ã†ã®ã ã‘ã‚Œã©ã€ã¾ã‚仕方ãªã„ã‹
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1627
+#: client/helpdata.c:1625
#, 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:1632
+#: client/helpdata.c:1630
#, 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:1637
+#: client/helpdata.c:1635
#, 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:1645
+#: client/helpdata.c:1643
#, 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:1651
+#: client/helpdata.c:1649
#, 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:1657
+#: client/helpdata.c:1655
#, c-format
msgid "* %s waste will increase slowly with distance from capital.\n"
msgstr "* %sã®æµªè²»ã¯é¦–都ã‹ã‚‰é›¢ã‚Œã‚‹ã«ã¤ã‚Œå°‘ã—ãšã¤å¤šããªã‚Šã¾ã™ã€‚\n"
-#: client/helpdata.c:1674
+#: client/helpdata.c:1672
#, c-format
msgid "* Allows you to build %s.\n"
msgstr "* %sを作れるよã†ã«ãªã‚Šã¾ã™ã€‚\n"
#. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1701
+#: client/helpdata.c:1699
#, c-format
msgid "%s%d %s"
msgstr ""
-#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1700 client/helpdata.c:1708 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:1709
+#: client/helpdata.c:1707
#, c-format
msgid "%s%d unhappy"
msgstr "%s%d ä¸å¹¸"
# clefs
-#: client/mapctrl_common.c:382
+#: client/mapctrl_common.c:399
#, c-format
msgid "You don't know how to build %s!"
msgstr "ã‚ãªãŸã¯%sã®ä½œã‚Šæ–¹ã‚’知りã¾ã›ã‚“!"
# clefs
-#: client/mapctrl_common.c:392
+#: client/mapctrl_common.c:409
#, c-format
msgid "Copy %s to clipboard."
msgstr "%s をクリップボードã«ã‚³ãƒ”ーã—ã¾ã™ã€‚"
# clefs
-#: client/mapctrl_common.c:408
+#: client/mapctrl_common.c:425
msgid "Clipboard is empty."
msgstr "クリップボードã¯ç©ºã§ã™ã€‚"
-#: client/options.c:98
+#: client/options.c:102
msgid "Graphics"
msgstr "グラフィック"
-#: client/options.c:99
+#: client/options.c:103
msgid "Overview"
msgstr "概観"
-#: client/options.c:100
+#: client/options.c:104
msgid "Sound"
msgstr "サウンド"
-#: client/options.c:101
+#: client/options.c:105
msgid "Interface"
msgstr "インターフェイス"
-#: client/options.c:102
+#: client/options.c:106
msgid "Network"
msgstr "ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯"
-#: client/options.c:107
+#: client/options.c:111
msgid "Login name"
msgstr "ãƒã‚°ã‚¤ãƒ³å"
# clefs
-#: client/options.c:108
+#: client/options.c:112
msgid ""
"This is the default login username that will be used in the connection "
"dialogs or with the -a command-line parameter."
@@ -9512,12 +9513,12 @@ msgstr ""
"接続ダイアãƒã‚°ï¼ŒãŠã‚ˆã³ã‚³ãƒžãƒ³ãƒ‰ãƒ©ã‚¤ãƒ³ã§-aを指定ã—ãŸæ™‚ã«ä½¿ç”¨ã•ã‚Œã‚‹ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®"
"ãƒã‚°ã‚¤ãƒ³åã§ã™ã€‚"
-#: client/options.c:113
+#: client/options.c:117
msgid "Server"
msgstr "サーãƒ"
# clefs
-#: client/options.c:114
+#: client/options.c:118
msgid ""
"This is the default server hostname that will be used in the connection "
"dialogs or with the -a command-line parameter."
@@ -9525,12 +9526,12 @@ msgstr ""
"接続ダイアãƒã‚°ï¼ŒãŠã‚ˆã³ã‚³ãƒžãƒ³ãƒ‰ãƒ©ã‚¤ãƒ³ã§-aを指定ã—ãŸæ™‚ã«ä½¿ç”¨ã•ã‚Œã‚‹ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®"
"サーãƒãƒ»ãƒ›ã‚¹ãƒˆåã§ã™ã€‚"
-#: client/options.c:119
+#: client/options.c:123
msgid "Server port"
msgstr "サーãƒã®ãƒãƒ¼ãƒˆç•ªå·"
# clefs
-#: client/options.c:120
+#: client/options.c:124
msgid ""
"This is the default server port that will be used in the connection dialogs "
"or with the -a command-line parameter."
@@ -9538,12 +9539,12 @@ msgstr ""
"接続ダイアãƒã‚°ï¼ŒãŠã‚ˆã³ã‚³ãƒžãƒ³ãƒ‰ãƒ©ã‚¤ãƒ³ã§-aを指定ã—ãŸæ™‚ã«ä½¿ç”¨ã•ã‚Œã‚‹ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®"
"ãƒãƒ¼ãƒˆç•ªå·ã§ã™ã€‚"
-#: client/options.c:125 client/gui-win32/connectdlg.c:912 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
msgid "Metaserver"
msgstr "メタサーãƒ"
# clefs
-#: client/options.c:126
+#: client/options.c:130
msgid ""
"The metaserver is a host that the client contacts to find out about games on "
"the internet. Don't change this from its default value unless you know what "
@@ -9554,12 +9555,12 @@ msgstr ""
"デフォルトã‹ã‚‰å¤‰æ›´ã—ãªã„ã§ãã ã•ã„。[訳註: サーãƒä¸€è¦§ãŒå‡ºãªããªã£ã¦æ…Œã¦ã‚‹ã®ãŒ"
"オãƒã§ã™]"
-#: client/options.c:132
+#: client/options.c:136
msgid "Soundset"
msgstr "サウンドセット"
# clefs
-#: client/options.c:133
+#: client/options.c:137
msgid ""
"This is the soundset that will be used. Changing this is the same as using "
"the -S command-line parameter."
@@ -9568,11 +9569,11 @@ msgstr ""
"指定ã™ã‚‹ã®ã¨åŒã˜ã§ã™ã€‚"
# ã“ã®ã‚ãŸã‚Šã¯åŽŸèªžã§å‡ºã¦ãã‚ŒãŸæ–¹ãŒã‚ã‹ã‚Šã‚„ã™ã„æ°—ã‚‚ (clefs)
-#: client/options.c:138
+#: client/options.c:142
msgid "Sound plugin"
msgstr "サウンドプラグイン"
-#: client/options.c:139
+#: client/options.c:143
msgid ""
"If you have a problem with sound, try changing the sound plugin. The new "
"plugin won't take effect until you restart Freeciv. Changing this is the "
@@ -9582,22 +9583,22 @@ msgstr ""
"ã—ãŸãƒ—ラグインã¯ï¼ŒFreecivã‚’å†èµ·å‹•ã™ã‚‹ã¾ã§æœ‰åŠ¹ã«ãªã‚Šã¾ã›ã‚“。ã“れを変更ã™ã‚‹ã®"
"ã¯ï¼Œã‚³ãƒžãƒ³ãƒ‰ãƒ©ã‚¤ãƒ³ã§ -P ã«ã‚ˆã£ã¦æŒ‡å®šã™ã‚‹ã®ã¨åŒã˜ã§ã™ã€‚"
-#: client/options.c:144 client/gui-sdl/gui_main.c:162
+#: client/options.c:148 client/gui-sdl/gui_main.c:162
msgid "Theme"
msgstr "テーマ"
# Daniel
-#: client/options.c:145
+#: client/options.c:149
msgid "By changing this option you change the active theme."
msgstr "ã“ã®ã‚ªãƒ—ションを変更ã—ã¦ï¼Œç¾åœ¨è¡¨ç¤ºã«ä½¿ã‚ã‚Œã¦ã„るテーマを変更ã§ãã¾ã™ã€‚"
# ntaka
-#: client/options.c:148
+#: client/options.c:152
msgid "Tileset"
msgstr "タイルセット"
# clefs
-#: client/options.c:149
+#: client/options.c:153
msgid ""
"By changing this option you change the active tileset. This is the same as "
"using the -t command-line parameter."
@@ -9605,12 +9606,12 @@ msgstr ""
"ã“ã®ã‚ªãƒ—ションを変更ã—ã¦ï¼Œç¾åœ¨è¡¨ç¤ºã«ä½¿ã‚ã‚Œã¦ã„るタイルセットを変更ã§ãã¾ã™ã€‚"
"ã“れを変更ã™ã‚‹ã®ã¯ï¼Œã‚³ãƒžãƒ³ãƒ‰ãƒ©ã‚¤ãƒ³ã§ -t ã«ã‚ˆã£ã¦æŒ‡å®šã™ã‚‹ã®ã¨åŒã˜ã§ã™ã€‚"
-#: client/options.c:156
+#: client/options.c:160
msgid "Solid unit background color"
msgstr "å˜ä¸€ã®éƒ¨éšŠèƒŒæ™¯è‰² "
# clefs
-#: client/options.c:157
+#: client/options.c:161
msgid ""
"Setting this option will cause units on the map view to be drawn with a "
"solid background color instead of the flag backdrop."
@@ -9618,12 +9619,12 @@ msgstr ""
"è¨å®šã™ã‚‹ã¨ï¼Œåœ°å›³ä¸Šã®éƒ¨éšŠã®èƒŒæ™¯ã«ï¼Œæ——å°ã®ä»£ã‚ã‚Šã«å˜ä¸€ã®èƒŒæ™¯è‰²ãŒå¡—られるよã†ã«"
"ãªã‚Šã¾ã™ã€‚"
-#: client/options.c:161 client/gui-sdl/optiondlg.c:960
+#: client/options.c:165 client/gui-sdl/optiondlg.c:960
msgid "Sound bell at new turn"
msgstr "æ–°ã—ã„ターンã«ãƒ™ãƒ«ã‚’鳴らã™"
# clefs
-#: client/options.c:162
+#: client/options.c:166
msgid ""
"Set this option to have a \"bell\" event be generated at the start of a new "
"turn. You can control the behavior of the \"bell\" event by editing the "
@@ -9633,12 +9634,12 @@ msgstr ""
"らã—æ–¹ã¯ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚ªãƒ—ションã‹ã‚‰å¤‰æ›´ã§ãã¾ã™ã€‚"
# clefs
-#: client/options.c:168
+#: client/options.c:172
msgid "Unit movement animation time (milliseconds)"
msgstr "部隊移動ã®ã‚¢ãƒ‹ãƒ¡ãƒ¼ã‚·ãƒ§ãƒ³ã«ã‹ã‘る時間 (ミリ秒)"
# clefs
-#: client/options.c:169
+#: client/options.c:173
msgid ""
"This option controls how long unit \"animation\" takes when a unit moves on "
"the map view. Set it to 0 to disable animation entirely."
@@ -9649,12 +9650,12 @@ msgstr ""
"ã‚Šã¾ã™ãŒã€‚]"
# clefs
-#: client/options.c:174
+#: client/options.c:178
msgid "Mapview recentering time (milliseconds)"
msgstr "地図ã®ã‚»ãƒ³ã‚¿ãƒªãƒ³ã‚°ã«ã‹ã‘る時間 (ミリ秒)"
# clefs
-#: client/options.c:175
+#: client/options.c:179
msgid ""
"When the map view is recentered, it will slide smoothly over the map to its "
"new position. This option controls how long this slide lasts. Set it to 0 "
@@ -9664,12 +9665,12 @@ msgstr ""
"å‹•ã«ã©ã®ãらã„時間をã‹ã‘ã‚‹ã‹ã‚’ã“ã®ã‚ªãƒ—ションã¯æ±ºå®šã—ã¾ã™ã€‚0ã«ã™ã‚Œã°å®Œå…¨ã«ç„¡åŠ¹"
"ã«ãªã‚Šã¾ã™ã€‚"
-#: client/options.c:180 client/gui-sdl/optiondlg.c:1014
+#: client/options.c:184 client/gui-sdl/optiondlg.c:1014
msgid "Show combat animation"
msgstr "戦闘アニメーションを表示"
# clefs
-#: client/options.c:181
+#: client/options.c:185
msgid ""
"Disabling this option will turn off combat animation between units on the "
"mapview."
@@ -9678,12 +9679,12 @@ msgstr ""
"メータã®è¡¨ç¤ºã¨çˆ†ç™ºã®ã“ã¨ã§ã™]"
# clefs
-#: client/options.c:184
+#: client/options.c:188
msgid "Draw the citybar"
msgstr "éƒ½å¸‚æƒ…å ±ãƒãƒ¼ã‚’表示ã™ã‚‹"
# clefs
-#: client/options.c:185
+#: client/options.c:189
msgid ""
"Setting this option will display a 'citybar' containing useful information "
"beneath each city. Disabling this option will display only the city's name "
@@ -9693,12 +9694,12 @@ msgstr ""
"ã™ã‚‹ã¨ï¼Œéƒ½å¸‚ã®åå‰ã¨ï¼Œä»»æ„ã§ç”Ÿç”£ç‰©ã®ã¿ãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚"
# clefs
-#: client/options.c:191
+#: client/options.c:195
msgid "Show icons in the technology tree"
msgstr "科å¦ãƒ„リーã«ã‚¢ã‚¤ã‚³ãƒ³ã‚’表示ã™ã‚‹"
# clefs
-#: client/options.c:192
+#: client/options.c:196
msgid ""
"Setting this option will display icons on the technology tree diagram. "
"Turning this option off makes the technology tree more compact."
@@ -9706,12 +9707,12 @@ msgstr ""
"è¨å®šã™ã‚‹ã¨ï¼Œç§‘å¦æŠ€è¡“ã®ãƒ„リー・ダイアグラムã«å„種ã®ã‚¢ã‚¤ã‚³ãƒ³ã‚’表示ã—ã¾ã™ã€‚無効"
"ã«ã™ã‚‹ã¨ãƒ„リーã¯ã‚ˆã‚Šã‚³ãƒ³ãƒ‘クトã«ãªã‚Šã¾ã™ã€‚"
-#: client/options.c:197
+#: client/options.c:201
msgid "Draw shield graphics for units"
msgstr "部隊ã«ã‚·ãƒ¼ãƒ«ãƒ‰ã®çµµã‚’表示ã™ã‚‹"
# clefs
-#: client/options.c:198
+#: client/options.c:202
msgid ""
"Setting this option will draw a shield icon as the flags on units. If "
"unset, the full flag will be drawn."
@@ -9720,12 +9721,12 @@ msgstr ""
"セットã—ãªã‘ã‚Œã°ï¼Œæ——ãã®ã‚‚ã®ãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚"
# ama
-#: client/options.c:202
+#: client/options.c:206
msgid "Manual Turn Done in AI Mode"
msgstr "AI モードã§ã®æ‰‹å‹•ã‚¿ãƒ¼ãƒ³çµ‚了"
# clefs
-#: client/options.c:203
+#: client/options.c:207
msgid ""
"Disable this option if you do not want to press the Turn Done button "
"manually when watching an AI player."
@@ -9733,12 +9734,12 @@ msgstr ""
"AIプレイヤーを観察ã™ã‚‹æ™‚ã«ï¼Œæ‰‹ã§ã€Œã‚¿ãƒ¼ãƒ³çµ‚了ã€ãƒœã‚¿ãƒ³ã‚’押ã—ãŸããªã„å ´åˆã¯ã“ã®"
"オプションを無効ã«ã—ã¦ãã ã•ã„。"
-#: client/options.c:207 client/gui-sdl/optiondlg.c:1121
+#: client/options.c:211 client/gui-sdl/optiondlg.c:1121
msgid "Auto Center on Units"
msgstr "部隊を自動的ã«ç”»é¢ã®ä¸å¿ƒã¸"
# clefs
-#: client/options.c:208
+#: client/options.c:212
msgid ""
"Set this option to have the active unit centered automatically when the unit "
"focus changes."
@@ -9746,12 +9747,12 @@ msgstr ""
"è¨å®šã™ã‚‹ã¨ï¼Œé¸æŠžã•ã‚Œã¦ã„る部隊ãŒä»£ã‚ã£ãŸæ™‚ã«è‡ªå‹•çš„ã«ãã®éƒ¨éšŠãŒç”»é¢ã®ä¸å¿ƒã«ãª"
"ã‚Šã¾ã™ã€‚"
-#: client/options.c:211 client/gui-sdl/optiondlg.c:1147
+#: client/options.c:215 client/gui-sdl/optiondlg.c:1147
msgid "Auto Center on Combat"
msgstr "戦闘を自動的ã«ç”»é¢ã®ä¸å¿ƒã¸"
# clefs
-#: client/options.c:212
+#: client/options.c:216
msgid ""
"Set this option to have any combat be centered automatically. Disabled this "
"will speed up the time between turns but may cause you to miss combat "
@@ -9761,22 +9762,22 @@ msgstr ""
"ã¨ï¼Œã‚¿ãƒ¼ãƒ³é–“ã®å¾…ã¡æ™‚é–“ã‚’çŸç¸®ã§ãã¾ã™ãŒï¼Œæˆ¦é—˜ã‚’完全ã«è¦‹è½ã¨ã—ã¦ã—ã¾ã†ã‹ã‚‚ã—ã‚Œ"
"ã¾ã›ã‚“。"
-#: client/options.c:217 client/gui-sdl/optiondlg.c:1174
+#: client/options.c:221 client/gui-sdl/optiondlg.c:1174
msgid "Focus on Awakened Units"
msgstr "èµ·ã“ã•ã‚ŒãŸéƒ¨éšŠã«ãƒ•ã‚©ãƒ¼ã‚«ã‚¹"
# clefs
-#: client/options.c:218
+#: client/options.c:222
msgid "Set this option to have newly awoken units be focused automatically."
msgstr ""
"è¨å®šã™ã‚‹ã¨ï¼Œ[見張り状態ã‹ã‚‰]覚醒ã—ãŸãƒ¦ãƒ‹ãƒƒãƒˆãŒè‡ªå‹•çš„ã«ãƒ•ã‚©ãƒ¼ã‚«ã‚¹ã•ã‚Œã¾ã™ã€‚"
-#: client/options.c:221
+#: client/options.c:225
msgid "Allow goto into the unknown"
msgstr "[gotoコマンドã§]未知ã®é ˜åŸŸã¸ã®ç§»å‹•ã‚’許å¯ã™ã‚‹"
# clefs
-#: client/options.c:222
+#: client/options.c:226
msgid ""
"Setting this option will make the game consider moving into unknown tiles. "
"If not, then goto routes will detour around or be blocked by unknown tiles."
@@ -9784,46 +9785,46 @@ msgstr ""
"有効ã«ã™ã‚‹ã¨ï¼Œgotoコマンドã§ã¯æœªçŸ¥ã®é ˜åŸŸã‚’通るã“ã¨ã‚‚考慮ã«å…¥ã‚Œã‚‰ã‚Œã¾ã™ã€‚無効"
"ã«ã™ã‚‹ã¨ï¼ŒæœªçŸ¥ã®é ˜åŸŸã¯è¿‚回ã—，ã§ããªã‘ã‚Œã°åˆ°é”ä¸èƒ½ã¨ãªã‚Šã¾ã™ã€‚"
-#: client/options.c:226
+#: client/options.c:230
msgid "Center map when Popup city"
msgstr "都市を開ã時地図ã®ä¸å¿ƒã¸"
-#: client/options.c:227
+#: client/options.c:231
msgid ""
"Setting this option makes the mapview center on a city when its city dialog "
"is popped up."
msgstr "都市ダイアãƒã‚°ã‚’é–‹ã„ãŸæ™‚ã«ï¼Œãã®éƒ½å¸‚を地図ã®ä¸å¿ƒã«ã—ã¾ã™ã€‚"
-#: client/options.c:230
+#: client/options.c:234
msgid "Concise City Production"
msgstr "ç°¡æ½”ãªéƒ½å¸‚生産物表示"
# clefs
-#: client/options.c:231
+#: client/options.c:235
msgid ""
"Set this option to make the city production (as shown in the city dialog) to "
"be more compact."
msgstr ""
"(都市ダイアãƒã‚°ãªã©ã«è¡¨ç¤ºã•ã‚Œã‚‹)都市生産物ã®è¡¨ç¤ºã‚’よりコンパクトã«ã—ã¾ã™ã€‚"
-#: client/options.c:234 client/gui-sdl/optiondlg.c:1252
+#: client/options.c:238 client/gui-sdl/optiondlg.c:1252
msgid "End Turn when done moving"
msgstr "移動を終ãˆãŸæ™‚ターンを終了"
# clefs
-#: client/options.c:235
+#: client/options.c:239
msgid ""
"Setting this option makes your turn end automatically when all your units "
"are done moving."
msgstr "å…¨ã¦ã®éƒ¨éšŠã®ç§»å‹•ãŒçµ‚了ã—ãŸæ™‚点ã§è‡ªå‹•çš„ã«ã‚¿ãƒ¼ãƒ³ã‚’終了ã•ã›ã¾ã™ã€‚"
# ntaka
-#: client/options.c:238 client/gui-sdl/optiondlg.c:1226
+#: client/options.c:242 client/gui-sdl/optiondlg.c:1226
msgid "Prompt for city names"
msgstr "æ–°ã—ã„都市を作る時ã«éƒ½å¸‚åã‚’å°‹ãã‚‹"
# clefs
-#: client/options.c:239
+#: client/options.c:243
msgid ""
"Disabling this option will make the names of newly founded cities chosen "
"automatically by the server."
@@ -9832,97 +9833,144 @@ msgstr ""
"ã§ãã¾ã™]"
# ntaka
-#: client/options.c:242 client/gui-sdl/optiondlg.c:1200
+#: client/options.c:246 client/gui-sdl/optiondlg.c:1200
msgid "Pop up city dialog for new cities"
msgstr "æ–°ã—ã„都市を作る時ã«éƒ½å¸‚ウィンドウを開ã"
# clefs
-#: client/options.c:243
+#: client/options.c:247
msgid ""
"Setting this option will pop up a newly-founded city's city dialog "
"automatically."
msgstr "都市を新è¨ã—ãŸæ™‚ã«è‡ªå‹•çš„ã«éƒ½å¸‚ダイアãƒã‚°ã‚’é–‹ãã¾ã™ã€‚"
+#: client/options.c:250
+#, fuzzy
+msgid "Pop up caravan actions"
+msgstr "ã‚ャラãƒãƒ³æ´»å‹•"
+
+#: client/options.c:251
+msgid ""
+"If this option is enabled, when caravans arrive at a city where they can "
+"establish a traderoute or help build a wonder, a window will popup asking "
+"which action should be performed. Disabling this option means you will have "
+"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 ""
+
+#: client/options.c:260
+msgid "Enable cursor changing"
+msgstr ""
+
+#: client/options.c:261
+msgid ""
+"This option controls whether the client should try to change the mouse "
+"cursor depending on what is being pointed at, as well as to indicate changes "
+"in the client or server state."
+msgstr ""
+
+#: client/options.c:266
+msgid "Select cities before units"
+msgstr ""
+
+#: 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 ""
+
+#: client/options.c:272
+msgid "Clear unit orders on selection"
+msgstr ""
+
+#: client/options.c:273
+msgid ""
+"Enabling this option will cause unit orders to be cleared whenever one or "
+"more units are selected. If this option is disabled, selecting units will "
+"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 ""
+
# clefs
-#: client/options.c:248
+#: client/options.c:282
msgid "Background layer"
msgstr "背景レイヤ"
# clefs
-#: client/options.c:249
+#: client/options.c:283
msgid "The background layer of the overview shows just ocean and land."
msgstr "背景レイヤã«ã¯æµ·ã¨é™¸ã®é•ã„ã ã‘ãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚"
# clefs
# 「地形ã®èµ·ä¼ã®åœ°å›³ãƒ¬ã‚¤ãƒ¤ã€ã˜ã‚ƒãã©ã„ã‹ãªã‚ã¨
-#: client/options.c:252
+#: client/options.c:286
msgid "Terrain relief map layer"
msgstr "地形レイヤ"
# clefs
-#: client/options.c:253
+#: client/options.c:287
msgid "The relief layer shows all terrains on the map."
msgstr "地形レイヤã«ã¯å…¨ã¦ã®åœ°å½¢ãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚"
# clefs
-#: client/options.c:256
+#: client/options.c:290
msgid "Borders layer"
msgstr "国境線レイヤ"
# clefs
-#: client/options.c:257
+#: client/options.c:291
msgid ""
"The borders layer of the overview shows which tiles are owned by each player."
msgstr "国境線レイヤã«ã¯å„タイルãŒã©ã®ãƒ—レイヤーã«å±žã—ã¦ã„ã‚‹ã‹ã‚’表示ã—ã¾ã™ã€‚"
-#: client/options.c:261
+#: client/options.c:295
msgid "Units layer"
msgstr "部隊レイヤ"
# 原文もä¸çµ±ä¸€
-#: client/options.c:262
+#: client/options.c:296
msgid "Enabling this will draw units on the overview."
msgstr "有効ã«ã™ã‚‹ã¨ï¼Œéƒ¨éšŠã‚’概観図ã«è¡¨ç¤ºã—ã¾ã™ã€‚"
-#: client/options.c:265
+#: client/options.c:299
msgid "Cities layer"
msgstr "都市レイヤ"
-#: client/options.c:266
+#: client/options.c:300
msgid "Enabling this will draw cities on the overview."
msgstr "有効ã«ã™ã‚‹ã¨ï¼Œéƒ½å¸‚を概観図ã«è¡¨ç¤ºã—ã¾ã™ã€‚"
# clefs
-#: client/options.c:269
+#: client/options.c:303
msgid "Overview fog of war"
msgstr "fog of war概観"
# clefs
-#: client/options.c:270
+#: client/options.c:304
msgid "Enabling this will show fog of war on the overview."
msgstr ""
"有効ã«ã™ã‚‹ã¨ï¼Œfog of warを概観図ã«è¡¨ç¤ºã—ã¾ã™ã€‚[訳註:プレイヤーã«ã€Œè¦‹ãˆãªã„ã€"
"部分をグレイアウトã—ã¾ã™]"
-#: client/options.c:488
+#: client/options.c:526
msgid "If you add a preset by hand, also update \"number_of_presets\""
msgstr ""
"手ã§ãƒ—ãƒªã‚»ãƒƒãƒˆã‚’è¿½åŠ ã™ã‚‹ãªã‚‰ï¼Œ \"number_of_presets\" もアップデートã—ã¦ä¸‹ã•ã„"
-#: client/options.c:516
+#: client/options.c:554
msgid "Cannot find your home directory"
msgstr "ホームディレクトリãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。"
-#: client/options.c:665 client/options.c:796
+#: client/options.c:703 client/options.c:834
msgid "Save failed, cannot find a filename."
msgstr "ä¿å˜ã¯å¤±æ•—ã—ã¾ã—ãŸã€‚ファイルåを見ã¤ã‘ã‚Œã¾ã›ã‚“。"
-#: client/options.c:678 client/options.c:859
+#: client/options.c:716 client/options.c:897
#, c-format
msgid "Save failed, cannot write to file %s"
msgstr "ä¿å˜ãŒå¤±æ•—ã—ã¾ã—ãŸã€‚ファイル %s ã¸æ›¸ãè¾¼ã‚ã¾ã›ã‚“"
-#: client/options.c:680 client/options.c:862
+#: client/options.c:718 client/options.c:900
#, c-format
msgid "Saved settings to file %s"
msgstr "è¨å®šã‚’ファイル %s ã¸ä¿å˜ã—ã¾ã—ãŸã€‚"
@@ -9947,16 +9995,16 @@ msgstr "サーãƒã®æ©Ÿèƒ½: %s"
msgid "Start of turn %d"
msgstr "ターン%d ã®é–‹å§‹"
-#: client/packhand.c:1590
+#: client/packhand.c:1591
#, c-format
msgid "AI Mode is now %s."
msgstr "AI モードã¯%sã§ã™ã€‚"
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "ON"
msgstr "オン"
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "OFF"
msgstr "オフ"
@@ -9990,14 +10038,15 @@ msgid "Username"
msgstr "ユーザå"
#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
-#: client/gui-gtk-2.0/pages.c:2085
+#: client/gui-gtk-2.0/pages.c:2157
msgid "Flag"
msgstr "æ——"
#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
-#: client/gui-gtk-2.0/pages.c:1536 client/gui-gtk-2.0/pages.c:2087
-#: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
-#: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
+#: 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/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr "æ°‘æ—"
@@ -10010,7 +10059,7 @@ msgstr "国境線"
msgid "Score"
msgstr "スコア"
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
msgid "Team"
msgstr "ãƒãƒ¼ãƒ "
@@ -10086,212 +10135,237 @@ msgstr "%sã¯è§£æ•£ã•ã›ã‚‰ã‚Œã¾ã›ã‚“ã§ã—ãŸã€‚"
msgid "Could not open temp file."
msgstr "一時ファイルをオープンã§ãã¾ã›ã‚“。"
-#: client/servers.c:407
+#: client/servers.c:410
msgid "Invalid $http_proxy or metaserver value, must start with 'http://'"
msgstr "無効㪠$http プãƒã‚シ値ã§ã™ã€‚ `http://' ã§å§‹ã‚ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。"
-#: client/servers.c:413
+#: client/servers.c:416
msgid "Failed looking up metaserver's host"
msgstr "メタサーãƒã®ãƒ›ã‚¹ãƒˆã®ãƒ«ãƒƒã‚¯ã‚¢ãƒƒãƒ—ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
-#: client/text.c:85 client/text.c:86 client/text.c:91
+#. TRANS: "AI <player name>"
+#: client/text.c:94
+#, c-format
+msgid "AI %s"
+msgstr ""
+
+#. TRANS: "<nation adjective>, team <team name>"
+#: client/text.c:118
+#, fuzzy, c-format
+msgid "%s, team %s"
+msgstr ", ãƒãƒ¼ãƒ %s"
+
+#: client/text.c:135 client/text.c:136 client/text.c:141
#: client/gui-sdl/mapview.c:752
msgid "?nation:Neutral"
msgstr "ä¸ç«‹å›½"
-#: client/text.c:85 client/gui-sdl/mapview.c:752
+#: client/text.c:135 client/gui-sdl/mapview.c:752
msgid "?nation:Hostile"
msgstr "敵国"
# ntaka ãªã‚“ã¦è¨³ã›ã°ã‚ˆã„ã‹æ‚©ã‚“ã ãŒã€å’Œå¹³ã‚’çµã‚“ã 国ã§ã¯é•·ã„ã®ã§å‹å¥½å›½
# clefs å‹å¥½é€šå•†æ¡ç´„ã‚ãŸã‚Šã‚’çµã‚“ã§ã„るよã†ãªé–¢ä¿‚ã§ã™ã
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Peaceful"
msgstr "å‹å¥½å›½"
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Friendly"
msgstr "åŒç›Ÿå›½"
-#: client/text.c:88 client/gui-sdl/mapview.c:755
+#: client/text.c:138 client/gui-sdl/mapview.c:755
msgid "?nation:Mysterious"
msgstr "未接触ã®å›½"
-#: client/text.c:88
+#: client/text.c:138
msgid "?nation:Friendly(team)"
msgstr "åŒç›Ÿå›½(ãƒãƒ¼ãƒ )"
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
msgid "?city:Neutral"
msgstr "?city:ä¸ç«‹"
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
msgid "?city:Hostile"
msgstr "?city:敵対"
-#: client/text.c:92 client/gui-sdl/mapview.c:786
+#: client/text.c:142 client/gui-sdl/mapview.c:786
msgid "?city:Peaceful"
msgstr "和平"
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Friendly"
msgstr "åŒç›Ÿ"
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Mysterious"
msgstr "未接触"
# clefs
-#: client/text.c:93
+#: client/text.c:143
msgid "?city:Friendly(team)"
msgstr "åŒç›Ÿå›½ã®éƒ½å¸‚(ãƒãƒ¼ãƒ )"
-#: client/text.c:100
+#: client/text.c:151
#, c-format
msgid "Location: (%d, %d) [%d]"
msgstr "座標: (%d, %d) [%d]"
-#: client/text.c:109
+#: client/text.c:153
+#, c-format
+msgid "Native coordinates: (%d, %d)"
+msgstr ""
+
+#: client/text.c:160
#, c-format
msgid "Terrain: %s"
msgstr "地形: %s"
-#: client/text.c:110
+#: client/text.c:161
#, c-format
msgid "Food/Prod/Trade: %s"
msgstr "食料/資æº/交易: %s"
-#: client/text.c:113
+#: client/text.c:164
msgid "Minor Tribe Village"
msgstr "少数部æ—ã®æ‘"
# ntaka é ˜åŸŸ(ã¾ãŸã¯å›½åœŸ)ã¨ã¯ã€é ˜åœŸã€é ˜æµ·ã€é ˜ç©ºã®ï¼“ã¤ã‚’å«ã‚€æ¦‚念ã ãã†ãªã€‚
-#: client/text.c:119
+#: client/text.c:173
#, fuzzy
msgid "Our territory"
msgstr "我ãŒå›½ã®é ˜åŸŸ"
-#. TRANS: "Polish territory"
-#: client/text.c:122
+#. TRANS: "Territory of <username> (<nation + team>)"
+#: client/text.c:176
#, fuzzy, c-format
-msgid "%s territory"
-msgstr "%sã®é ˜åŸŸ"
+msgid "Territory of %s (%s)"
+msgstr ""
+"\n"
+"%sã®%sã®é ˜åŸŸ"
-# clefs
-#. TRANS: "Polish territory (5 turn cease-fire)"
-#: client/text.c:131
-#, c-format
-msgid "%s territory (%d turn cease-fire)"
-msgid_plural "%s territory (%d turn cease-fire)"
-msgstr[0] "%sã®é ˜åŸŸ (%dターンã®åœæˆ¦ä¸)"
+#: client/text.c:186
+#, fuzzy, c-format
+msgid "Territory of %s (%s) (%d turn cease-fire)"
+msgid_plural "Territory of %s (%s) (%d turn cease-fire)"
+msgstr[0] "都市: %s (%s,%dターンã®åœæˆ¦ä¸)"
-#. TRANS: "Polish territory (friendly)"
-#: client/text.c:140
+#. TRANS: "Territory of <username>
+#. * (<nation + team> | <diplomatic state>)"
+#: client/text.c:195
#, fuzzy, c-format
-msgid "%s territory (%s)"
-msgstr "%2$s(%1$s)ã®é ˜åŸŸ"
+msgid "Territory of %s (%s | %s)"
+msgstr ""
+"\n"
+"%sã®%sã®é ˜åŸŸ"
# ntaka
-#: client/text.c:145
+#: client/text.c:200
msgid "Unclaimed territory"
msgstr "公海 ã‚‚ã—ã㯠未å 有地"
-#. TRANS: "City: Warsaw (Polish)"
-#: client/text.c:156
-#, c-format
-msgid "City: %s (%s)"
-msgstr "都市: %s (%s)"
+#. TRANS: "City: <city name> | <username> (<nation + team>)"
+#: client/text.c:214
+#, fuzzy, c-format
+msgid "City: %s | %s (%s)"
+msgstr "都市: %s (%s, %s)"
-#. TRANS: "City: Warsaw (Polish, 5 turn cease-fire)"
-#: client/text.c:166
-#, c-format
-msgid "City: %s (%s, %d turn cease-fire)"
-msgid_plural "City: %s (%s, %d turn cease-fire)"
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <number> turn cease-fire)"
+#: client/text.c:224
+#, fuzzy, c-format
+msgid "City: %s | %s (%s, %d turn cease-fire)"
+msgid_plural "City: %s | %s (%s, %d turn cease-fire)"
msgstr[0] "都市: %s (%s,%dターンã®åœæˆ¦ä¸)"
-#. TRANS: "City: Warsaw (Polish,friendly)"
-#: client/text.c:174
-#, c-format
-msgid "City: %s (%s, %s)"
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <diplomatic state>)"
+#: client/text.c:231
+#, fuzzy, c-format
+msgid "City: %s | %s (%s, %s)"
msgstr "都市: %s (%s, %s)"
#. TRANS: previous lines gave other information about the city.
-#: client/text.c:189
+#: client/text.c:246
#, fuzzy, c-format
msgid "?clistbegin: with %s"
msgstr " å…±åŒ %s"
#. TRANS: "Trade from Warsaw: 5"
-#: client/text.c:202
+#: client/text.c:259
#, c-format
msgid "Trade from %s: %d"
msgstr "%sã‹ã‚‰ã®äº¤æ˜“: %d"
-#: client/text.c:210
+#: client/text.c:267
#, c-format
msgid "Infrastructure: %s"
msgstr "インフラ: %s"
-#: client/text.c:215
+#: client/text.c:272
#, c-format
msgid "Activity: %s"
msgstr "活動: %s"
-#. TRANS: "Unit: Musketeers (Polish, Warsaw)"
-#. TRANS: "Unit: Musketeers (Polish,friendly)"
-#: client/text.c:226 client/text.c:253
-#, c-format
-msgid "Unit: %s (%s, %s)"
+#. TRANS: "Unit: <unit type> | <username>
+#. * (<nation + team>, <homecity>)"
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <diplomatic state>)"
+#: client/text.c:287 client/text.c:313
+#, fuzzy, c-format
+msgid "Unit: %s | %s (%s, %s)"
msgstr "部隊: %s (%s, %s)"
-#. TRANS: "Unit: Musketeers (Polish)"
-#: client/text.c:232
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>)"
+#: client/text.c:292
#, fuzzy, c-format
-msgid "Unit: %s (%s)"
-msgstr "部隊: %s (%s)"
+msgid "Unit: %s | %s (%s)"
+msgstr "部隊: %s (%s, %s)"
-#. TRANS: "Unit: Musketeers (Polish, 5 turn cease-fire)"
-#: client/text.c:245
-#, c-format
-msgid "Unit: %s (%s, %d turn cease-fire)"
-msgid_plural "Unit: %s (%s, %d turn cease-fire)"
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <number> turn cease-fire)"
+#: client/text.c:305
+#, fuzzy, c-format
+msgid "Unit: %s | %s (%s, %d turn cease-fire)"
+msgid_plural "Unit: %s | %s (%s, %d turn cease-fire)"
msgstr[0] "部隊: %s (%s,%dターンã®åœæˆ¦ä¸)"
# 「å‹çŽ‡ã€ã§ã‚‚ã„ã„ã‹ãªã‚ (clefs)
#. TRANS: "Chance to win: A:95% D:46%"
-#: client/text.c:279
+#: client/text.c:338
#, c-format
msgid "Chance to win: A:%d%% D:%d%%"
msgstr "å‹åˆ©ç¢ºçŽ‡: æ”»:%d%% 守:%d%%"
#. TRANS: A is attack power, D is defense power, FP is firepower,
#. * HP is hitpoints (current and max).
-#: client/text.c:286
+#: client/text.c:345
#, c-format
msgid "A:%d D:%d FP:%d HP:%d/%d (%s)"
msgstr "æ”»:%d 防:%d ç«:%d 体:%d/%d (%s)"
#. TRANS: "5 more" units on this tile
-#: client/text.c:295
+#: client/text.c:354
#, c-format
msgid " (%d more)"
msgstr " (+%d部隊)"
# 試ã—ã« (clefs)
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:364
+#: client/text.c:423
#, c-format
msgid "far from %s"
msgstr "%sé æ–¹"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:367
+#: client/text.c:426
#, c-format
msgid "near %s"
msgstr "%sã®è¿‘ãã«ã„ã‚‹"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:370
+#: client/text.c:429
#, c-format
msgid "in %s"
msgstr "%sã«é§ç•™"
@@ -10299,60 +10373,60 @@ msgstr "%sã«é§ç•™"
# clefs
# 部隊ã®æœ¬æ‹ 地
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:403
+#: client/text.c:462
#, c-format
msgid "from %s"
msgstr "%s出身"
# yasu ntaka
-#: client/text.c:466
+#: client/text.c:525
msgid "Progress: no research"
msgstr "ç ”ç©¶: ãªã—"
# yasu ntaka clefs
-#: client/text.c:470
+#: client/text.c:529
msgid "Progress: no research target"
msgstr "ç ”ç©¶: 目標ãªã—"
-#: client/text.c:475
+#: client/text.c:534
#, c-format
msgid "Progress: %d turn/advance"
msgid_plural "Progress: %d turns/advance"
msgstr[0] "ç ”ç©¶: %dターン/発見"
# clefs
-#: client/text.c:480
+#: client/text.c:539
#, c-format
msgid "%d bulb/turn"
msgid_plural "%d bulbs/turn"
msgstr[0] "%då˜ä½/ターン"
# clefs
-#: client/text.c:485
+#: client/text.c:544
#, c-format
msgid ", %d bulb/turn from team"
msgid_plural ", %d bulbs/turn from team"
msgstr[0] "，ãƒãƒ¼ãƒ ã‹ã‚‰ %då˜ä½/ターン"
-#: client/text.c:512
+#: client/text.c:571
#, c-format
msgid "%d/- (never)"
msgstr "%d/- (見込ã¿ãªã—)"
-#: client/text.c:524
+#: client/text.c:583
#, c-format
msgid "%d/%d (%d turn)"
msgid_plural "%d/%d (%d turns)"
msgstr[0] "%d/%d (%d ターン)"
# clefs
-#: client/text.c:527
+#: client/text.c:586
#, c-format
msgid "%d/%d (never)"
msgstr "%d/%d (見込ã¿ãªã—)"
# clefs
-#: client/text.c:564
+#: client/text.c:623
#, c-format
msgid "%d step"
msgid_plural "%d steps"
@@ -10360,13 +10434,13 @@ msgstr[0] "%d ステップ"
# clefs
# æ–‡å—通り「電çƒã€ã®æ•°ãªã‚“ã ã‘ã©ã€æ„訳ã—ã¦ãŠãã¾ã—ょã†ã‹
-#: client/text.c:566
+#: client/text.c:625
#, c-format
msgid "%d bulb"
msgid_plural "%d bulbs"
msgstr[0] "%d 開発å˜ä½"
-#: client/text.c:570 client/agents/cma_fec.c:269 client/agents/cma_fec.c:313
+#: 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
#, c-format
msgid "%d turn"
@@ -10374,159 +10448,159 @@ msgid_plural "%d turns"
msgstr[0] "%d ターン"
# Daniel
-#: client/text.c:592
+#: client/text.c:651
#, c-format
msgid "Population: %s"
msgstr "人å£: %s"
-#: client/text.c:595
+#: client/text.c:654
#, c-format
msgid "Year: %s (T%d)"
msgstr "西暦: %s (T%d)"
-#: client/text.c:598
+#: client/text.c:657
#, c-format
msgid "Gold: %d (%+d)"
msgstr "金: %d (%+d)"
# Daniel
-#: client/text.c:600
+#: client/text.c:659
#, c-format
msgid "Tax: %d Lux: %d Sci: %d"
msgstr "税: %d è´…æ²¢: %d 科å¦: %d"
-#: client/text.c:607
+#: client/text.c:666
#, fuzzy
msgid "Moving: Nobody"
msgstr "移動ä¸: %s"
-#: client/text.c:609
+#: client/text.c:668
#, c-format
msgid "Moving: %s"
msgstr "移動ä¸: %s"
# clefs
-#: client/text.c:613
+#: client/text.c:672
msgid "(Click for more info)"
msgstr "(クリックã§è©³ç´°è¡¨ç¤º)"
# clefs
-#: client/text.c:629
+#: client/text.c:688
#, c-format
msgid "%s People"
msgstr "人å£: %s 人"
-#: client/text.c:633
+#: client/text.c:692
#, c-format
msgid "Turn: %d"
msgstr "ターン: %d"
-#: client/text.c:635 client/gui-win32/inteldlg.c:111
+#: client/text.c:694 client/gui-win32/inteldlg.c:111
#: client/gui-xaw/inteldlg.c:208
#, c-format
msgid "Gold: %d"
msgstr "金: %d"
# clefs
-#: client/text.c:636
+#: client/text.c:695
#, c-format
msgid "Net Income: %d"
msgstr "åŽæ”¯: %d"
# Daniel
#. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:639
+#: client/text.c:698
#, c-format
msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
msgstr "税率:　金:%d%% è´…æ²¢:%d%% 科å¦:%d%%"
-#: client/text.c:643
+#: client/text.c:702
#, c-format
msgid "Researching %s: %s"
msgstr "ç ”ç©¶ä¸ %s: %s"
# clefs
-#: client/text.c:650
+#: client/text.c:709
#, c-format
msgid "Global warming chance: %d%% (%+d%%/turn)"
msgstr "地çƒæ¸©æš–化ã®ç™ºç”Ÿç¢ºçŽ‡: %d%% (%+d%%/ターン)"
# clefs
-#: client/text.c:653
+#: client/text.c:712
#, c-format
msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
msgstr "æ ¸ã®å†¬ã®ç™ºç”Ÿç¢ºçŽ‡: %d%% (%+d%%/ターン)"
-#: client/text.c:658 client/gui-win32/inteldlg.c:104
+#: client/text.c:717 client/gui-win32/inteldlg.c:104
#: client/gui-xaw/inteldlg.c:200
#, c-format
msgid "Government: %s"
msgstr "政治体制: %s"
-#: client/text.c:682
+#: client/text.c:741
#, c-format
msgid "%d unit"
msgid_plural "%d units"
msgstr[0] "%d 部隊"
#. TRANS: Impossible to reach goto target tile
-#: client/text.c:715 client/gui-sdl/mapview.c:566
+#: client/text.c:774 client/gui-sdl/mapview.c:566
msgid "?goto:Unreachable"
msgstr ""
# clefs
-#: client/text.c:717 client/gui-sdl/mapview.c:568
+#: client/text.c:776 client/gui-sdl/mapview.c:568
#, c-format
msgid "Turns to target: %d"
msgstr "目的地ã¾ã§ã®ã‚¿ãƒ¼ãƒ³æ•°: %d"
# clefs
-#: client/text.c:719 client/gui-sdl/mapview.c:570
+#: client/text.c:778 client/gui-sdl/mapview.c:570
#, c-format
msgid "Turns to target: %d to %d"
msgstr "目的地ã¾ã§ã®ã‚¿ãƒ¼ãƒ³æ•°: %d ã‹ã‚‰ %d"
# clefs
-#: client/text.c:725 client/gui-sdl/mapview.c:576
+#: client/text.c:784 client/gui-sdl/mapview.c:576
#, c-format
msgid "%d unit selected"
msgid_plural "%d units selected"
msgstr[0] "%d部隊ãŒé¸æŠžã•ã‚Œã¦ã„ã¾ã™"
# clefs
-#: client/text.c:730 client/gui-sdl/mapview.c:581
+#: client/text.c:789 client/gui-sdl/mapview.c:581
msgid "No units selected."
msgstr "部隊ãŒé¸æŠžã•ã‚Œã¦ã„ã¾ã›ã‚“"
# clefs
-#: client/text.c:804 client/gui-sdl/mapview.c:654
+#: client/text.c:863 client/gui-sdl/mapview.c:654
#, c-format
msgid "Others: %d civil; %d military"
msgstr "ãã®ä»–: %d 民間人; %d è»äºº"
# clefs
-#: client/text.c:806 client/gui-sdl/mapview.c:656
+#: client/text.c:865 client/gui-sdl/mapview.c:656
#, c-format
msgid "Others: %d civilian"
msgstr "ãã®ä»–: %d 民間人"
# clefs
-#: client/text.c:808 client/gui-sdl/mapview.c:658
+#: client/text.c:867 client/gui-sdl/mapview.c:658
#, c-format
msgid "Others: %d military"
msgstr "ãã®ä»–: %d è»äºº"
-#: client/text.c:839
+#: client/text.c:898
msgid "No units to upgrade!"
msgstr "アップグレードã•ã‚Œã‚‹éƒ¨éšŠãŒã„ã¾ã›ã‚“。"
# clefs
-#: client/text.c:864
+#: client/text.c:923
msgid "None of these units may be upgraded."
msgstr "アップグレードã§ãる部隊ãŒã„ã¾ã›ã‚“。"
# clefs
-#: client/text.c:870
+#: client/text.c:929
#, c-format
msgid ""
"Upgrade %d unit for %d gold?\n"
@@ -10539,178 +10613,179 @@ msgstr[0] ""
"ç¾åœ¨ã®è³‡é‡‘ã¯%dã§ã™ã€‚"
# ntaka
-#: client/text.c:891
+#: client/text.c:950
msgid "Shows your progress in researching the current technology."
msgstr "ç¾åœ¨ç ”究ä¸ã®ç§‘å¦ã®é€²è¡Œåº¦"
# clefs
-#: client/text.c:897
+#: client/text.c:956
msgid "no research target."
msgstr "ç ”ç©¶ç›®æ¨™ãªã—"
#. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:900
+#: client/text.c:959
#, c-format
msgid "%s: %d/%d."
msgstr ""
# ntaka
-#: client/text.c:920
+#: client/text.c:979
msgid "Shows the progress of global warming:"
msgstr "地çƒæ¸©æš–化ã®é€²è¡Œåº¦:"
-#: client/text.c:921
+#: client/text.c:980
#, c-format
msgid "Pollution rate: %d%%"
msgstr "公害レート: %d"
# clefs
-#: client/text.c:923
+#: client/text.c:982
#, c-format
msgid "Chance of catastrophic warming each turn: %d%%"
msgstr "å„ターンã«å£Šæ»…çš„ãªæ¸©æš–化ãŒç™ºç”Ÿã™ã‚‹ç¢ºçŽ‡: %d%%"
# ntaka
-#: client/text.c:939
+#: client/text.c:998
msgid "Shows the progress of nuclear winter:"
msgstr "æ ¸ã®å†¬ã®é€²è¡Œåº¦:"
-#: client/text.c:940
+#: client/text.c:999
#, c-format
msgid "Fallout rate: %d%%"
msgstr "ç°é™ä¸‹ãƒ¬ãƒ¼ãƒˆ: %d%%"
# clefs
-#: client/text.c:942
+#: client/text.c:1001
#, c-format
msgid "Chance of catastrophic winter each turn: %d%%"
msgstr "å„ターンã«å£Šæ»…çš„ãªæ ¸ã®å†¬ãŒç™ºç”Ÿã™ã‚‹ç¢ºçŽ‡: %d%%"
# ntaka
-#: client/text.c:957
+#: client/text.c:1016
msgid "Shows your current government:"
msgstr "ç¾åœ¨ã®æ”¿æ²»ä½“制:"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:981
+#: client/text.c:1040
#, c-format
msgid "Population: %5d"
msgstr "人å£: %5d"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:1043
#, c-format
msgid "Support: %5d %%"
msgstr "サãƒãƒ¼ãƒˆ: %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:1047
#, c-format
msgid "Energy: %5d %%"
msgstr "燃料: %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:992
+#: client/text.c:1051
#, c-format
msgid "Mass: %5d ton"
msgid_plural "Mass: %5d tons"
msgstr[0] "質é‡: %5d トン"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1057
#, c-format
msgid "Travel time: %5.1f years"
msgstr "旅行時間: %5.1f 年"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1061
msgid "Travel time: N/A "
msgstr "旅行時間: é©ç”¨ä¸å¯"
# clefs
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1065
#, c-format
msgid "Success prob.: %5d %%"
msgstr "æˆåŠŸç¢ºçŽ‡: %5d %%"
# clefs
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1010
+#: client/text.c:1069
#, c-format
msgid "Year of arrival: %8s"
msgstr "到ç€äºˆå®šå¹´: %8s"
-#: client/text.c:1030
+#: client/text.c:1089
msgid "?timeout:off"
msgstr "ç„¡é™"
-#: client/text.c:1054
+#: client/text.c:1113
#, c-format
msgid "?seconds:%02ds"
msgstr "%02d秒"
-#: client/text.c:1056
+#: client/text.c:1115
#, c-format
msgid "?mins/secs:%02dm %02ds"
msgstr "%02d分%02d秒"
-#: client/text.c:1058
+#: client/text.c:1117
#, c-format
msgid "?hrs/mns:%02dh %02dm"
msgstr "%02d時間%02d分"
-#: client/text.c:1060
+#: client/text.c:1119
#, c-format
msgid "?dys/hrs:%02dd %02dh"
msgstr "%02d日%02d時間"
-#: client/text.c:1063
+#: client/text.c:1122
msgid "?duration:overflow"
msgstr "オーãƒãƒ¼ãƒ•ãƒãƒ¼"
-#: client/text.c:1084
+#: client/text.c:1143
#, c-format
msgid "%6d.%02d ms"
msgstr ""
-#. TRANS: "Republic of the Poles"
-#: client/text.c:1127
-#, c-format
-msgid "%s of the %s"
-msgstr "%sã®%s"
+#. TRANS: <nation adjective> <government name>.
+#. * E.g. "Polish Republic".
+#: client/text.c:1188
+#, fuzzy, c-format
+msgid "?nationgovernment:%s %s"
+msgstr "政治体制: %s"
# Daniel
#. TRANS: "Observer: 1985"
-#: client/text.c:1137
+#: client/text.c:1198
#, c-format
msgid "Observer: %s"
msgstr "観察者: %s"
-#: client/text.c:1155
+#: client/text.c:1216
msgid "Buildings: "
msgstr "å»ºé€ ç‰©: "
-#: client/text.c:1172 client/text.c:1211
+#: client/text.c:1233 client/text.c:1272
msgid "None. "
msgstr "ãªã—"
-#: client/text.c:1174 client/text.c:1213
+#: client/text.c:1235 client/text.c:1274
msgid "?clistend:."
msgstr "?clistend:"
-#: client/text.c:1192
+#: client/text.c:1253
msgid "Wonders: "
msgstr "ä¸æ€è°: "
-#: client/text.c:1247
+#: client/text.c:1308
#, 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:1251
+#: client/text.c:1312
#, fuzzy, c-format
msgid "%d content before penalty."
msgid_plural "%d content before penalty."
@@ -10719,43 +10794,38 @@ msgstr[0] "%d番目ã®å¸‚æ°‘ã¾ã§ã¯æœ€åˆã‹ã‚‰åŸºæœ¬çš„ã«æº€è¶³ã—ã¦ã„ã¾
# clefs
# 都市ã®ç·æ•°ãŒå¢—ãˆã‚‹ã¨ãƒšãƒŠãƒ«ãƒ†ã‚£ãŒèª²ã›ã‚‰ã‚Œã¾ã™
#. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1257
+#: client/text.c:1318
#, fuzzy, c-format
msgid "%d additional unhappy citizen."
msgid_plural "%d additional unhappy citizens."
msgstr[0] "ã†ã¡%dã®å¸‚æ°‘ã¯ãƒšãƒŠãƒ«ãƒ†ã‚£ã§ä¸å¹¸ã«ãªã‚Šã¾ã™ã€‚"
-#. TRANS: Martial law opening parenthesis
-#: client/text.c:1279
-msgid "Martial law in effect ("
+#: client/text.c:1339
+#, fuzzy
+msgid "Unlimited martial law in effect."
msgstr "戒厳令ãŒæœ‰åŠ¹("
-#. TRANS: no [unit] maximum
-#: client/text.c:1284
-msgid "no maximum, "
-msgstr "é™åº¦ãªã—,"
-
-#: client/text.c:1287
-#, c-format
-msgid "%d unit maximum, "
-msgid_plural "%d units maximum, "
-msgstr[0] "最大%d部隊"
+#: client/text.c:1341
+#, 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"
-#. TRANS: Martial law closing parenthesis
-#: client/text.c:1294
-#, c-format
-msgid "%d per unit). "
-msgstr "部隊ã«ã¤ã%d)"
+#: client/text.c:1345
+#, 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:1298
+#: client/text.c:1352
msgid "Military units in the field may cause unhappiness. "
msgstr "æˆ¦å ´ã®è»äº‹éƒ¨éšŠã¯ä¸å¹¸ã®åŽŸå› ã«ãªã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。"
-#: client/text.c:1301
+#: client/text.c:1355
msgid "Military units have no happiness effect. "
msgstr "è»äº‹éƒ¨éšŠã¯å¹¸ç¦ã«å½±éŸ¿ã‚’与ãˆã¾ã›ã‚“。"
-#: client/text.c:1316
+#: client/text.c:1370
#, c-format
msgid "Luxury: %d total."
msgstr "è´…æ²¢: åˆè¨ˆ %d"
@@ -10780,7 +10850,7 @@ msgstr ""
"ルトタイルセットを使ã„ã¾ã™ã€‚"
# clefs
-#: client/tilespec.c:3968
+#: client/tilespec.c:3966
#, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
@@ -10808,12 +10878,12 @@ msgstr ""
"citizen governor㯠%s ã®æ‰±ã„ã«æ··ä¹±ã—ã¦ã—ã¾ã„ã¾ã—ãŸã€‚ãƒã‚§ãƒƒã‚¯ã—ã¦ã¿ãŸæ–¹ãŒè‰¯ã„"
"ã§ã—ょã†ã€‚"
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
-#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:599
+#: client/gui-gtk-2.0/cityrep.c:624 client/gui-sdl/citydlg.c:2009
msgid "none"
msgstr "ãªã—"
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:645
msgid "custom"
msgstr "自在"
@@ -11136,7 +11206,7 @@ msgstr "交易路を確立ã™ã‚‹(_T)"
msgid "Enter Marketplace"
msgstr "å¸‚å ´ã«å‚å…¥ã™ã‚‹"
-#: client/gui-gtk-2.0/chatline.c:144 client/gui-win32/chatline.c:134
+#: client/gui-gtk-2.0/chatline.c:218 client/gui-win32/chatline.c:134
#: client/gui-xaw/chatline.c:120
msgid "Cleared output window."
msgstr "出力ウィンドウを消去ã—ã¾ã—ãŸã€‚"
@@ -11218,11 +11288,11 @@ msgid "%d/%d %d turns"
msgstr "%d/%d %d ターン"
#: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:821
+#: client/gui-gtk-2.0/cityrep.c:1027
msgid "_Buy"
msgstr "è²·ã†(_B)"
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:869
#, fuzzy
msgid "_Production"
msgstr "生産物(_P)"
@@ -11244,12 +11314,12 @@ msgid "Entertainers"
msgstr "芸人"
#: client/gui-gtk-2.0/citydlg.c:1029 client/gui-win32/citydlg.c:1989
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2403
msgid "Scientists"
msgstr "科å¦è€…"
#: client/gui-gtk-2.0/citydlg.c:1030 client/gui-win32/citydlg.c:1991
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2404
msgid "Taxmen"
msgstr "徴税者"
@@ -11344,7 +11414,7 @@ msgstr "æ´åŠ©ã•ã‚Œã¦ã„る部隊: %d"
msgid "Present units %d"
msgstr "都市ã«ã„る部隊: %d"
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:1019
msgid "Cen_ter"
msgstr "ä¸å¿ƒã¸(_T)"
@@ -11435,36 +11505,67 @@ msgstr "都市åã®å¤‰æ›´"
msgid "What should we rename the city to?"
msgstr "æ–°ã—ã„都市åを何ã¨åã¥ã‘ã¾ã™ã‹?"
-#: client/gui-gtk-2.0/cityrep.c:699
+#: client/gui-gtk-2.0/cityrep.c:794
+#, fuzzy
+msgid "(no worklists defined)"
+msgstr "(作æ¥ãƒªã‚¹ãƒˆ)"
+
+#: client/gui-gtk-2.0/cityrep.c:876
msgid "Chan_ge"
msgstr "変更(_G)"
# ntaka
# 当åˆã€ä½œæ¥ãƒªã‚¹ãƒˆã®ã€ã¨æ›¸ã„ã¦ã„ãŸãŒã€é•·ã„ã®ã§çœç•¥ã€‚
# å…ƒã®è‹±èªžè‡ªä½“çœç•¥ã—ã¦ã‚ã‚‹ã—。
-#: client/gui-gtk-2.0/cityrep.c:703
+#: client/gui-gtk-2.0/cityrep.c:880
msgid "Add _First"
msgstr "å…ˆé ã«åŠ ãˆã‚‹(_F)"
-#: client/gui-gtk-2.0/cityrep.c:707
+#: client/gui-gtk-2.0/cityrep.c:884
msgid "Add _Next"
msgstr "次ã®é …ç›®ã¨ã—ã¦åŠ ãˆã‚‹(_N)"
-#: client/gui-gtk-2.0/cityrep.c:711
+#: client/gui-gtk-2.0/cityrep.c:888
+#, fuzzy
+msgid "Add _2nd Last"
+msgstr "最後ã«åŠ ãˆã‚‹(_L)"
+
+#: client/gui-gtk-2.0/cityrep.c:892
msgid "Add _Last"
msgstr "最後ã«åŠ ãˆã‚‹(_L)"
+#: client/gui-gtk-2.0/cityrep.c:899
+#, fuzzy
+msgid "Set Worklist"
+msgstr "作æ¥ãƒªã‚¹ãƒˆ"
+
+#: client/gui-gtk-2.0/cityrep.c:905
+#, fuzzy
+msgid "Append Worklist"
+msgstr "作æ¥ãƒªã‚¹ãƒˆã®æ”¹å"
+
+#: client/gui-gtk-2.0/cityrep.c:911
+#, fuzzy
+msgid "Clear _Worklist"
+msgstr "作æ¥ãƒªã‚¹ãƒˆ(_W):"
+
+# Daniel
+#: client/gui-gtk-2.0/cityrep.c:916
+#, fuzzy
+msgid "Gover_nor"
+msgstr "ç·ç£"
+
# ntaka
-#: client/gui-gtk-2.0/cityrep.c:715
+#: client/gui-gtk-2.0/cityrep.c:921
msgid "_Select"
msgstr "都市ã®é¸æŠž(_S)"
-#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
+#: client/gui-gtk-2.0/cityrep.c:925 client/gui-gtk-2.0/plrdlg.c:521
#, fuzzy
msgid "_Display"
msgstr "表示è¨å®š(_D)..."
-#: client/gui-gtk-2.0/cityrep.c:800 client/gui-gtk-2.0/menu.c:808
+#: 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-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
#: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -11474,104 +11575,104 @@ msgstr "表示è¨å®š(_D)..."
msgid "Cities"
msgstr "都市"
-#: client/gui-gtk-2.0/cityrep.c:817
+#: client/gui-gtk-2.0/cityrep.c:1023
#, fuzzy
msgid "_Inspect"
msgstr "ãƒãƒƒãƒ—(_I)"
-#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
-#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-sdl/helpdlg.c:297 client/gui-win32/menu.c:342
-#: client/gui-xaw/menu.c:241
+#: 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
+#: client/gui-gtk-2.0/cityrep.c:1518 client/gui-gtk-2.0/menu.c:823
+#: client/gui-gtk-2.0/menu.c:825 client/gui-gtk-2.0/menu.c:827
+#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:831
+#: client/gui-gtk-2.0/menu.c:833 client/gui-sdl/helpdlg.c:297
+#: client/gui-win32/menu.c:342 client/gui-xaw/menu.c:241
msgid "Improvements"
msgstr "å»ºé€ ç‰©"
-#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
-#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
-#: client/gui-xaw/menu.c:247
+#: client/gui-gtk-2.0/cityrep.c:1441 client/gui-gtk-2.0/cityrep.c:1460
+#: client/gui-gtk-2.0/cityrep.c:1479 client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1522 client/gui-xaw/menu.c:247
msgid "Wonders"
msgstr "ä¸æ€è°"
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1662 client/gui-win32/cityrep.c:439
#: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
msgid "All Cities"
msgstr "å…¨ã¦ã®éƒ½å¸‚"
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1667 client/gui-win32/cityrep.c:440
msgid "No Cities"
msgstr "ã©ã‚Œã‚‚é¸æŠžã—ãªã„"
-#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1672 client/gui-win32/cityrep.c:441
msgid "Invert Selection"
msgstr "å転ã™ã‚‹"
# clefs
# 都市一覧ã§ã®ã€Œé¸æŠžã€ãƒ¡ãƒ‹ãƒ¥ãƒ¼
-#: client/gui-gtk-2.0/cityrep.c:1420
+#: client/gui-gtk-2.0/cityrep.c:1682
msgid "Building Units"
msgstr "éƒ¨éšŠã‚’å»ºé€ ä¸"
-#: client/gui-gtk-2.0/cityrep.c:1426
+#: client/gui-gtk-2.0/cityrep.c:1688
msgid "Building Improvements"
msgstr "å»ºé€ ç‰©ã‚’å»ºç¯‰ä¸"
-#: client/gui-gtk-2.0/cityrep.c:1432
+#: client/gui-gtk-2.0/cityrep.c:1694
msgid "Building Wonders"
msgstr "ä¸æ€è°ã‚’建築ä¸"
-#: client/gui-gtk-2.0/cityrep.c:1444
+#: client/gui-gtk-2.0/cityrep.c:1706
msgid "Building Unit"
msgstr "éƒ¨éšŠã‚’å»ºé€ ä¸"
-#: client/gui-gtk-2.0/cityrep.c:1448
+#: client/gui-gtk-2.0/cityrep.c:1710
msgid "Building Improvement"
msgstr "å»ºé€ ç‰©ã‚’å»ºç¯‰ä¸"
-#: client/gui-gtk-2.0/cityrep.c:1452
+#: client/gui-gtk-2.0/cityrep.c:1714
msgid "Building Wonder"
msgstr "ä¸æ€è°ã‚’建築ä¸"
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1722 client/gui-win32/cityrep.c:443
msgid "Coastal Cities"
msgstr "沿岸都市"
-#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1727 client/gui-win32/cityrep.c:444
msgid "Same Island"
msgstr "åŒã˜å³¶"
-#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1737 client/gui-win32/cityrep.c:447
msgid "Supported Units"
msgstr "æ´åŠ©ã•ã‚Œã¦ã„る部隊"
-#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1740 client/gui-win32/cityrep.c:454
msgid "Units Present"
msgstr "都市ã«ã„る部隊"
-#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1744 client/gui-win32/cityrep.c:469
msgid "Improvements in City"
msgstr "都市ã®å»ºé€ 物"
-#: client/gui-gtk-2.0/cityrep.c:1486
+#: client/gui-gtk-2.0/cityrep.c:1748
msgid "Wonders in City"
msgstr "都市ã®ä¸æ€è°"
# clefs
-#: client/gui-gtk-2.0/cityrep.c:1495
+#: client/gui-gtk-2.0/cityrep.c:1757
msgid "Available Units"
msgstr "å»ºé€ ã§ãる部隊"
-#: client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1760
msgid "Available Improvements"
msgstr "建è¨ã§ãã‚‹å»ºé€ ç‰©"
-#: client/gui-gtk-2.0/cityrep.c:1501
+#: client/gui-gtk-2.0/cityrep.c:1763
msgid "Available Wonders"
msgstr "建è¨ã§ãã‚‹ä¸æ€è°"
-#: client/gui-gtk-2.0/cityrep.c:1625
+#: client/gui-gtk-2.0/cityrep.c:1882
#, fuzzy, c-format
msgid "Total Buy Cost: %d"
msgstr "åˆè¨ˆçµŒè²»: "
@@ -11641,11 +11742,11 @@ msgstr "æ–°ã—ã„プリセットを何ã¨åã¥ã‘ã¾ã™ã‹?"
msgid "Remove this preset?"
msgstr "ã“ã®ãƒ—リセットを削除ã—ã¦ã„ã„ã§ã™ã‹?"
-#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:186
+#: client/gui-gtk-2.0/dialogs.c:196 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:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
#, fuzzy
msgid "Inspect _City"
msgstr "都市をãƒãƒƒãƒ—アップ(_C)"
@@ -11676,10 +11777,10 @@ msgstr "略奪対象をé¸æŠž:"
msgid "Unit"
msgstr "部隊"
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
-#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
-#: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
-#: manual/civmanual.c:302 data/Freeciv.in:80
+#: 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-win32/plrdlg.c:335 manual/civmanual.c:302 data/Freeciv.in:80
msgid "Name"
msgstr "åå‰"
@@ -11705,7 +11806,7 @@ 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:1036 data/Freeciv.in:3371
+#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
msgid "Pick Nation"
msgstr "æ°‘æ—é¸æŠž"
@@ -11790,7 +11891,7 @@ msgstr "地図(_M)"
msgid "_Advances"
msgstr "科å¦(_A)"
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:910
+#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr "都市(_C)"
@@ -11898,33 +11999,33 @@ msgstr "è¡Œãå…ˆã®é¸æŠž"
msgid "Show _All Cities"
msgstr "å…¨ã¦ã®éƒ½å¸‚を表示(_A)"
-#: client/gui-gtk-2.0/gui_main.c:150
+#: client/gui-gtk-2.0/gui_main.c:162
msgid "Show Map Scrollbars"
msgstr "地図ã®ã‚¹ã‚¯ãƒãƒ¼ãƒ«ãƒãƒ¼ã‚’表示"
# clefs
-#: client/gui-gtk-2.0/gui_main.c:151
+#: client/gui-gtk-2.0/gui_main.c:163
msgid "Disable this option to hide the scrollbars on the map view."
msgstr "無効ã«ã™ã‚‹ã¨åœ°å›³è„‡ã®ã‚¹ã‚¯ãƒãƒ¼ãƒ«ãƒãƒ¼ã‚’éžè¡¨ç¤ºã«ã—ã¾ã™ã€‚"
-#: client/gui-gtk-2.0/gui_main.c:155
+#: client/gui-gtk-2.0/gui_main.c:167
msgid "Keyboardless goto"
msgstr "ã‚ーボードãªã—ã§ã®gotoコマンド"
# clefs
-#: client/gui-gtk-2.0/gui_main.c:156
+#: client/gui-gtk-2.0/gui_main.c:168
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:161
+#: client/gui-gtk-2.0/gui_main.c:173
msgid "Keep dialogs on top"
msgstr "ダイアãƒã‚°ã‚’トップレベルã«ä¿ã¤"
# clefs
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:174
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."
@@ -11932,12 +12033,12 @@ msgstr ""
"ã“ã®ã‚ªãƒ—ションをセットã™ã‚‹ã¨ï¼Œãƒ€ã‚¤ã‚¢ãƒã‚°ã¯å¸¸ã«Freecivã®ãƒ¡ã‚¤ãƒ³ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã®å‰ã«"
"ã¨ã©ã¾ã‚Šã¾ã™ã€‚フルスクリーンモードã§ã¯ï¼Œã“れをオフã«ã—ã¦ã‚‚効果ã¯ã‚ã‚Šã¾ã›ã‚“。"
-#: client/gui-gtk-2.0/gui_main.c:166
+#: client/gui-gtk-2.0/gui_main.c:178
msgid "Show worklist task icons"
msgstr "作æ¥ãƒªã‚¹ãƒˆã«ã‚¢ã‚¤ã‚³ãƒ³ã‚’表示ã™ã‚‹"
# clefs
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:179
msgid ""
"Disabling this will turn off the unit and building icons in the worklist "
"dialog and the production tab of the city dialog."
@@ -11946,13 +12047,13 @@ msgstr ""
"éšŠã‚„å»ºé€ ç‰©ã®ã‚¢ã‚¤ã‚³ãƒ³ã‚’表示ã—ãªããªã‚Šã¾ã™ã€‚"
# clefs
-#: client/gui-gtk-2.0/gui_main.c:171
+#: client/gui-gtk-2.0/gui_main.c:183
msgid "Enable status report tabs"
msgstr "çŠ¶æ…‹å ±å‘Šã‚¿ãƒ–ã‚’ä½¿ç”¨ã™ã‚‹"
# clefs
# 便利
-#: client/gui-gtk-2.0/gui_main.c:172
+#: client/gui-gtk-2.0/gui_main.c:184
msgid ""
"If this option is enabled then report dialogs will be shown as separate tabs "
"rather than in popup dialogs."
@@ -11961,12 +12062,12 @@ msgstr ""
"ã，独立ã—ãŸã‚¿ãƒ–ã¨ã—ã¦è¡¨ç¤ºã•ã‚Œã‚‹ã‚ˆã†ã«ãªã‚Šã¾ã™ã€‚"
# clefs
-#: client/gui-gtk-2.0/gui_main.c:177 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:189 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:178 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:190 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."
@@ -11974,7 +12075,76 @@ msgstr ""
"オンã«ã™ã‚‹ã¨ï¼Œã‚ˆã‚Šçµæžœã®è‰¯ã„fog of war表示方法を使用ã—ã¾ã™ã€‚ã“ã‚Œã¯è¡¨ç¤ºã‚’é…ã"
"ã™ã‚‹ã“ã¨ã¯ã‚ã‚Šã¾ã›ã‚“ãŒï¼Œãƒ¡ãƒ¢ãƒªã‚’ãŠã‚ˆã2å€æ¶ˆè²»ã—ã¾ã™ã€‚"
-#: client/gui-gtk-2.0/gui_main.c:277 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:195
+msgid "Show time for each chat message"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:196
+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
+msgid "Split bottom notebook area"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:202
+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
+msgid "New message events go to top of list"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:208
+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
+msgid "Show extra message window buttons"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:214
+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 "
+"is disabled, these buttons will not appear (you can still double-click with "
+"the left mouse button or right-click on a row to inspect or goto "
+"respectively). This option will only take effect once the message window is "
+"closed and reopened."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:224
+#, fuzzy
+msgid "Metaserver tab first in network page"
+msgstr "メタサーãƒã®æƒ…å ±æ–‡å—列を '%s' ã¸è¨å®šã—ã¾ã™ã€‚"
+
+#: client/gui-gtk-2.0/gui_main.c:225
+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
+msgid "Plain chat messages are sent to allies only"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:231
+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 "
+"messages will be sent as public chat messages. To send a public chat message "
+"with this option enabled, prefix the message with a single colon ':'. This "
+"option can also be set using a toggle button beside the chat entry (only "
+"visible in multiplayer games)."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:340 client/gui-xaw/gui_main.c:245
msgid ""
"This client has no special command line options\n"
"\n"
@@ -11984,47 +12154,48 @@ 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:723 client/gui-gtk-2.0/gui_main.c:1345
+#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
msgid "Freeciv"
msgstr "Freeciv"
-#: client/gui-gtk-2.0/gui_main.c:1088 client/gui-gtk-2.0/gui_main.c:1095
+#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
#: 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:1095 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1232 client/gui-sdl/mapctrl.c:1566
#: client/gui-sdl/mapview.c:1082
msgid "Shift+Return"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1127 client/gui-gtk-2.0/menu.c:770
-#: client/gui-gtk-2.0/menu.c:772 client/gui-gtk-2.0/menu.c:774
-#: client/gui-gtk-2.0/menu.c:776 client/gui-gtk-2.0/menu.c:778
-#: client/gui-gtk-2.0/menu.c:780 client/gui-gtk-2.0/menu.c:782
-#: client/gui-gtk-2.0/menu.c:784 client/gui-gtk-2.0/menu.c:786
-#: client/gui-gtk-2.0/menu.c:788 client/gui-gtk-2.0/menu.c:790
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-gtk-2.0/menu.c:804 client/gui-gtk-2.0/menu.c:806
-#: client/gui-gtk-2.0/menu.c:808 client/gui-gtk-2.0/menu.c:810
-#: client/gui-gtk-2.0/menu.c:812 client/gui-gtk-2.0/menu.c:814
-#: client/gui-gtk-2.0/menu.c:816 client/gui-gtk-2.0/menu.c:818
-#: client/gui-gtk-2.0/menu.c:820 client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/gui_main.c:1266 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
+#: client/gui-gtk-2.0/menu.c:811 client/gui-gtk-2.0/menu.c:813
+#: client/gui-gtk-2.0/menu.c:815 client/gui-gtk-2.0/menu.c:817
+#: client/gui-gtk-2.0/menu.c:819 client/gui-gtk-2.0/menu.c:821
+#: client/gui-gtk-2.0/menu.c:823 client/gui-gtk-2.0/menu.c:825
+#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
+#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
+#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
+#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
+#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
+#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
#: data/Freeciv.in:2028
msgid "View"
msgstr "ビュー(V)"
-#: client/gui-gtk-2.0/gui_main.c:1208
+#: client/gui-gtk-2.0/gui_main.c:1359
msgid "Chat"
msgstr "ãƒãƒ£ãƒƒãƒˆ"
# ama, clefs
# was "ã•ãã€åœ°ç„ã¸è½ã¡ã‚!"
# ã‹ã£ã“ã„ã„訳語募集ä¸
-#: client/gui-gtk-2.0/gui_main.c:1224 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1377 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"
@@ -12035,78 +12206,82 @@ msgstr ""
"ã‚’é…布ã™ã‚‹ã“ã¨ã‚’æ“è¿Žã—ã¾ã™ã€‚ヘルプメニューã®\"著作権\"ã®é …目を見ã¦ä¸‹ã•ã„。\n"
"……ã•ã，やã¤ã‚‰ã‚’地ç„ã¸é€ã£ã¦ã‚„ã‚ã†ãœ!"
+#: client/gui-gtk-2.0/gui_main.c:1392
+msgid "Allies Only"
+msgstr ""
+
# clefs
# XXX ãƒãƒƒãƒˆå¯¾æˆ¦ã§ã€Œã¾ã ã よã€ã¨å¾…ã£ã¦ã‚‚らã†ãƒœã‚¿ãƒ³
-#: client/gui-gtk-2.0/gui_main.c:1491
+#: client/gui-gtk-2.0/gui_main.c:1657
msgid "Not _ready"
msgstr "準備ä¸(_R)"
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
+#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
msgid "_Ready"
msgstr "準備完了(_R)"
-#: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2132
+#: 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
msgid "_Start"
msgstr "開始(_S)"
-#: client/gui-gtk-2.0/gui_main.c:1520
+#: client/gui-gtk-2.0/gui_main.c:1686
#, fuzzy
msgid "_Take Player"
msgstr "プレイヤー(_P)"
-#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
+#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
msgid "Pick _Nation"
msgstr "æ°‘æ—ã‚’é¸æŠžã™ã‚‹(_N)"
# Daniel
-#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
+#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
msgid "_Observe"
msgstr "観察ã™ã‚‹(_O)"
-#: client/gui-gtk-2.0/gui_main.c:1532
+#: client/gui-gtk-2.0/gui_main.c:1698
#, fuzzy
msgid "Do not _observe"
msgstr "観察をå–ã‚Šæ¢ã‚ã‚‹(_O)"
# 訳ã•ãªã„æ–¹ãŒã‚ã‹ã‚Šã‚„ã™ã„å ´åˆã‚‚ã‚ã‚‹ã‚‚ã®ã§ã™ (clefs)
-#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
msgid "<AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1557
+#: client/gui-gtk-2.0/gui_main.c:1723
msgid "<Novice AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1560
+#: client/gui-gtk-2.0/gui_main.c:1726
msgid "<Easy AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1563
+#: client/gui-gtk-2.0/gui_main.c:1729
msgid "<Normal AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1732
msgid "<Hard AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1742 client/gui-win32/dialogs.c:594
#: client/gui-xaw/pages.c:217
msgid "Random"
msgstr "ランダム"
# Daniel
-#: client/gui-gtk-2.0/gui_main.c:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
msgid "Observer"
msgstr "観察者"
# clefs XXX
-#: client/gui-gtk-2.0/gui_main.c:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
msgid "Detached"
msgstr "未割当"
# Daniel
-#: client/gui-gtk-2.0/gui_main.c:1899
+#: client/gui-gtk-2.0/gui_main.c:2073
msgid "Are you sure you want to quit?"
msgstr "ゲームを終了ã—ã¦ã‚ˆã‚ã—ã„ã§ã™ã‹ï¼Ÿ"
@@ -12344,487 +12519,523 @@ msgstr "技術(_T)"
msgid "Foreign Intelligence: %s Empire"
msgstr "è«œå ±: %sã®å›½"
-#: client/gui-gtk-2.0/mapctrl.c:195 client/gui-sdl/mapctrl.c:2565
+#: client/gui-gtk-2.0/mapctrl.c:179 client/gui-sdl/mapctrl.c:2565
#: client/gui-sdl/menu.c:839 client/gui-sdl/menu.c:1021
#: client/gui-win32/mapctrl.c:353
msgid "Build New City"
msgstr "æ–°ã—ã„都市を作る"
-#: client/gui-gtk-2.0/mapctrl.c:196 client/gui-sdl/mapctrl.c:2594
+#: client/gui-gtk-2.0/mapctrl.c:180 client/gui-sdl/mapctrl.c:2594
#: client/gui-win32/mapctrl.c:354 client/gui-xaw/mapctrl.c:89
msgid "What should we call our new city?"
msgstr "æ–°ã—ã„都市を何ã¨å‘¼ã³ã¾ã™ã‹?"
# ntaka, clefs
-#: client/gui-gtk-2.0/mapview.c:147
+#: client/gui-gtk-2.0/mapview.c:158
msgid "Shows your current luxury/science/tax rates;click to toggle them."
msgstr "ç¾åœ¨ã®è´…æ²¢/科å¦/税ã®æ¯”率; クリックã§å¤‰æ›´"
-#: client/gui-gtk-2.0/mapview.c:692 client/gui-win32/canvas.c:275
+#: client/gui-gtk-2.0/mapview.c:702 client/gui-win32/canvas.c:275
msgid "Better fog will only work in truecolor. Disabling it"
msgstr ""
# Daniel
-#: client/gui-gtk-2.0/menu.c:250
+#: client/gui-gtk-2.0/menu.c:256
msgid "Leaving a local game will end it!"
msgstr "ãƒãƒ¼ã‚«ãƒ«ã‚²ãƒ¼ãƒ ã‹ã‚‰è½ã¡ã‚‹ã¨ã‚²ãƒ¼ãƒ ã¯çµ‚了ã—ã¾ã™ãŒï¼Œã‚ˆã‚ã—ã„ã§ã™ã‹ï¼Ÿ"
-#: client/gui-gtk-2.0/menu.c:700 client/gui-win32/menu.c:303
+#: client/gui-gtk-2.0/menu.c:727 client/gui-win32/menu.c:303
msgid "_Game"
msgstr "ゲーム(_G)"
-#: client/gui-gtk-2.0/menu.c:702 client/gui-gtk-2.0/menu.c:704
-#: client/gui-gtk-2.0/menu.c:706 client/gui-gtk-2.0/menu.c:708
-#: client/gui-gtk-2.0/menu.c:710 client/gui-gtk-2.0/menu.c:712
-#: client/gui-gtk-2.0/menu.c:714 client/gui-gtk-2.0/menu.c:717
-#: client/gui-gtk-2.0/menu.c:720 client/gui-gtk-2.0/menu.c:722
-#: client/gui-gtk-2.0/menu.c:724 client/gui-gtk-2.0/menu.c:726
-#: client/gui-gtk-2.0/menu.c:728 client/gui-gtk-2.0/menu.c:730
-#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:736
-#: client/gui-gtk-2.0/menu.c:738 client/gui-gtk-2.0/menu.c:740
+#: client/gui-gtk-2.0/menu.c:729 client/gui-gtk-2.0/menu.c:731
+#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:735
+#: client/gui-gtk-2.0/menu.c:737 client/gui-gtk-2.0/menu.c:739
+#: client/gui-gtk-2.0/menu.c:741 client/gui-gtk-2.0/menu.c:744
+#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
+#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
+#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
+#: client/gui-gtk-2.0/menu.c:760 client/gui-gtk-2.0/menu.c:763
+#: client/gui-gtk-2.0/menu.c:765 client/gui-gtk-2.0/menu.c:767
#: data/Freeciv.in:2026
msgid "Game"
msgstr "ゲーム"
# Daniel
-#: client/gui-gtk-2.0/menu.c:704 client/gui-gtk-2.0/menu.c:706
-#: client/gui-gtk-2.0/menu.c:708
+#: client/gui-gtk-2.0/menu.c:731 client/gui-gtk-2.0/menu.c:733
+#: client/gui-gtk-2.0/menu.c:735
msgid "_Chat"
msgstr "ãƒãƒ£ãƒƒãƒˆ(_C)"
-#: client/gui-gtk-2.0/menu.c:706 client/gui-win32/menu.c:314
+#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:314
msgid "_Clear Log"
msgstr "ãƒã‚°ã®æ¶ˆåŽ»(_C)"
-#: client/gui-gtk-2.0/menu.c:708 client/gui-win32/menu.c:313
+#: client/gui-gtk-2.0/menu.c:735 client/gui-win32/menu.c:313
#, fuzzy
msgid "_Write Log"
msgstr "ãƒã‚°ã®ä¿å˜(_X)"
-#: client/gui-gtk-2.0/menu.c:710 client/gui-win32/menu.c:304
+#: client/gui-gtk-2.0/menu.c:737 client/gui-win32/menu.c:304
msgid "Local _Options"
msgstr "ãƒãƒ¼ã‚«ãƒ«è¨å®š(_O)"
-#: client/gui-gtk-2.0/menu.c:712 client/gui-win32/menu.c:305
+#: client/gui-gtk-2.0/menu.c:739 client/gui-win32/menu.c:305
msgid "_Message Options"
msgstr "メッセージè¨å®š(_M)"
# ntaka, clefs
-#: client/gui-gtk-2.0/menu.c:717
+#: client/gui-gtk-2.0/menu.c:744
msgid "_Reload Tileset"
msgstr "タイルセットã®å†èªè¾¼(_R)"
# clefs
-#: client/gui-gtk-2.0/menu.c:720
+#: client/gui-gtk-2.0/menu.c:747
msgid "Save Options on _Exit"
msgstr "終了時ã«ã‚ªãƒ—ションをä¿å˜ã™ã‚‹(_E)"
-#: client/gui-gtk-2.0/menu.c:722
+#: client/gui-gtk-2.0/menu.c:749
msgid "Sa_ve Options"
msgstr "オプションをä¿å˜(_V)"
-#: client/gui-gtk-2.0/menu.c:726 client/gui-win32/menu.c:308
+#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:308
msgid "Server O_ptions"
msgstr "サーãƒè¨å®š(_P)"
-#: client/gui-gtk-2.0/menu.c:730 client/gui-win32/menu.c:310
+#: client/gui-gtk-2.0/menu.c:757 client/gui-win32/menu.c:310
msgid "_Save Game"
msgstr "ゲームをä¿å˜(_S)"
-#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:311
+#: client/gui-gtk-2.0/menu.c:760 client/gui-win32/menu.c:311
msgid "Save Game _As..."
msgstr "ゲームを別åã§ä¿å˜(_A)..."
# Daniel
-#: client/gui-gtk-2.0/menu.c:738
+#: client/gui-gtk-2.0/menu.c:765
msgid "_Leave"
msgstr "è½ã¡ã‚‹(_L)"
-#: client/gui-gtk-2.0/menu.c:740 client/gui-win32/menu.c:317
+#: client/gui-gtk-2.0/menu.c:767 client/gui-win32/menu.c:317
msgid "_Quit"
msgstr "終了(_Q)"
-#: client/gui-gtk-2.0/menu.c:745 client/gui-win32/menu.c:321
+#: client/gui-gtk-2.0/menu.c:772 client/gui-win32/menu.c:321
msgid "Gov_ernment"
msgstr "政治体制(_E)"
-#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
-#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
-#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:774 client/gui-gtk-2.0/menu.c:776
+#: client/gui-gtk-2.0/menu.c:778 client/gui-gtk-2.0/menu.c:780
+#: client/gui-gtk-2.0/menu.c:782 client/gui-gtk-2.0/menu.c:784
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
#: client/gui-xaw/menu.c:248 data/Freeciv.in:2027 data/helpdata.txt:1320
msgid "Government"
msgstr "政治体制"
-#: client/gui-gtk-2.0/menu.c:749 client/gui-win32/menu.c:322
+#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:322
msgid "_Tax Rates"
msgstr "税率(_T)"
-#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:324
+#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:324
msgid "_Find City"
msgstr "都市をã•ãŒã™(_F)"
-#: client/gui-gtk-2.0/menu.c:755 client/gui-win32/menu.c:325
+#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:325
msgid "_Worklists"
msgstr "作æ¥ãƒªã‚¹ãƒˆ(_W)"
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
-#: client/gui-gtk-2.0/menu.c:764 client/gui-win32/menu.c:327
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
+#: client/gui-gtk-2.0/menu.c:791 client/gui-win32/menu.c:327
msgid "_Change Government"
msgstr "政治体制ã®å¤‰æ›´(_C)"
# Daniel
-#: client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:788
msgid "_Revolution..."
msgstr "é©å‘½(_R)..."
-#: client/gui-gtk-2.0/menu.c:764 client/gui-gtk-2.0/menu.c:970
+#: client/gui-gtk-2.0/menu.c:791 client/gui-gtk-2.0/menu.c:1013
#: client/gui-win32/menu.c:431
msgid "_Government"
msgstr "政治体制(_G)"
-#: client/gui-gtk-2.0/menu.c:768 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:795 client/gui-gtk-2.0/menu.c:959
#: client/gui-win32/menu.c:334
msgid "_View"
msgstr "ビュー(_V)"
# clefs
# ã“ã‚Œã¯ã€Œæ¦‚ç•¥ã€ã§ã¯ãªã，都市ã®å½±éŸ¿ç¯„囲を示ã™ãƒ©ã‚¤ãƒ³
-#: client/gui-gtk-2.0/menu.c:772
+#: client/gui-gtk-2.0/menu.c:799
msgid "City Outlines"
msgstr "都市ã®ã‚¢ã‚¦ãƒˆãƒ©ã‚¤ãƒ³"
-#: client/gui-gtk-2.0/menu.c:774 client/gui-win32/menu.c:335
+#: client/gui-gtk-2.0/menu.c:801 client/gui-win32/menu.c:335
msgid "Map _Grid"
msgstr "æ ¼å(_G)"
-#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:336
+#: client/gui-gtk-2.0/menu.c:803 client/gui-win32/menu.c:336
msgid "National _Borders"
msgstr "国境線(_B)"
-#: client/gui-gtk-2.0/menu.c:778 client/gui-win32/menu.c:337
+#: client/gui-gtk-2.0/menu.c:805 client/gui-win32/menu.c:337
msgid "City _Names"
msgstr "都市ã®åå‰(_N)"
# clefs
-#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:338
+#: client/gui-gtk-2.0/menu.c:807 client/gui-win32/menu.c:338
msgid "City G_rowth"
msgstr "都市ã®æ‹¡å¤§(_R)"
-#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:339
+#: client/gui-gtk-2.0/menu.c:809 client/gui-win32/menu.c:339
msgid "City _Productions"
msgstr "都市ã®ç”Ÿç”£ç‰©(_P)"
-#: client/gui-gtk-2.0/menu.c:784 client/gui-sdl/optiondlg.c:1719
+#: client/gui-gtk-2.0/menu.c:811
+#, fuzzy
+msgid "City Buy Cost"
+msgstr "åˆè¨ˆçµŒè²»: "
+
+#: client/gui-gtk-2.0/menu.c:813
+#, fuzzy
+msgid "City Traderoutes"
+msgstr "交易路: "
+
+#: client/gui-gtk-2.0/menu.c:815 client/gui-sdl/optiondlg.c:1719
msgid "Draw city worker map grid"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:788 client/gui-sdl/optiondlg.c:1635
+#: client/gui-gtk-2.0/menu.c:819 client/gui-sdl/optiondlg.c:1635
#: client/gui-win32/menu.c:340 client/gui-xaw/menu.c:148
#: client/gui-xaw/menu.c:246 manual/civmanual.c:220 data/helpdata.txt:1220
msgid "Terrain"
msgstr "地形"
-#: client/gui-gtk-2.0/menu.c:790 client/gui-win32/menu.c:341
+#: client/gui-gtk-2.0/menu.c:821 client/gui-win32/menu.c:341
#: client/gui-xaw/menu.c:149
msgid "Coastline"
msgstr "海岸線"
-#: client/gui-gtk-2.0/menu.c:796 client/gui-win32/menu.c:343
+#: client/gui-gtk-2.0/menu.c:827 client/gui-win32/menu.c:343
msgid "Roads & Rails"
msgstr "é“è·¯ã¨é‰„é“"
-#: client/gui-gtk-2.0/menu.c:800 client/gui-sdl/optiondlg.c:1933
+#: client/gui-gtk-2.0/menu.c:831 client/gui-sdl/optiondlg.c:1933
#: client/gui-win32/menu.c:345 client/gui-xaw/menu.c:152
msgid "Mines"
msgstr "資æº"
-#: client/gui-gtk-2.0/menu.c:802 client/gui-win32/menu.c:346
+#: client/gui-gtk-2.0/menu.c:833 client/gui-win32/menu.c:346
msgid "Fortress & Airbase"
msgstr "è¦å¡žã¨é£›è¡Œå ´"
-#: client/gui-gtk-2.0/menu.c:804 client/gui-win32/menu.c:348
+#: client/gui-gtk-2.0/menu.c:835 client/gui-win32/menu.c:348
#: client/gui-xaw/menu.c:154
msgid "Specials"
msgstr "特別"
-#: client/gui-gtk-2.0/menu.c:806 client/gui-win32/menu.c:349
+#: client/gui-gtk-2.0/menu.c:837 client/gui-win32/menu.c:349
#: client/gui-xaw/menu.c:155
msgid "Pollution & Fallout"
msgstr "公害 & æ»ã®ç°"
-#: client/gui-gtk-2.0/menu.c:812 client/gui-win32/menu.c:352
+#: client/gui-gtk-2.0/menu.c:843 client/gui-win32/menu.c:352
#: client/gui-xaw/menu.c:158
msgid "Focus Unit"
msgstr "部隊ã¸ç§»å‹•"
# was 「霧戦ã€ï¼Œç„¡ç†ã«è¨³ã•ãªã„ã§ãŠãã¾ã—ょㆠ(clefs)
-#: client/gui-gtk-2.0/menu.c:814 client/gui-sdl/optiondlg.c:1854
+#: client/gui-gtk-2.0/menu.c:845 client/gui-sdl/optiondlg.c:1854
#: client/gui-win32/menu.c:353 client/gui-xaw/menu.c:159
msgid "Fog of War"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:818
+#: client/gui-gtk-2.0/menu.c:849
msgid "_Full Screen"
msgstr "フルスクリーン表示(_F)"
-#: client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/menu.c:853
msgid "_Center View"
msgstr "ä¸å¿ƒã¸(_C)"
-#: client/gui-gtk-2.0/menu.c:825 client/gui-win32/menu.c:358
+#: client/gui-gtk-2.0/menu.c:856 client/gui-win32/menu.c:358
msgid "_Orders"
msgstr "命令(_O)"
-#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
-#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
-#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
-#: client/gui-gtk-2.0/menu.c:855 client/gui-gtk-2.0/menu.c:857
-#: client/gui-gtk-2.0/menu.c:859 client/gui-gtk-2.0/menu.c:861
-#: client/gui-gtk-2.0/menu.c:863 client/gui-gtk-2.0/menu.c:865
-#: client/gui-gtk-2.0/menu.c:867 client/gui-gtk-2.0/menu.c:869
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875 client/gui-gtk-2.0/menu.c:877
-#: client/gui-gtk-2.0/menu.c:879 client/gui-gtk-2.0/menu.c:881
-#: client/gui-gtk-2.0/menu.c:883 client/gui-gtk-2.0/menu.c:885
-#: client/gui-gtk-2.0/menu.c:887 client/gui-gtk-2.0/menu.c:889
-#: client/gui-gtk-2.0/menu.c:891 client/gui-gtk-2.0/menu.c:893
-#: client/gui-gtk-2.0/menu.c:895 client/gui-gtk-2.0/menu.c:897
-#: client/gui-gtk-2.0/menu.c:899 client/gui-gtk-2.0/menu.c:901
-#: client/gui-gtk-2.0/menu.c:903 data/Freeciv.in:2029
+#: client/gui-gtk-2.0/menu.c:858 client/gui-gtk-2.0/menu.c:860
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:864
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:868
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:872
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:876
+#: client/gui-gtk-2.0/menu.c:878 client/gui-gtk-2.0/menu.c:880
+#: client/gui-gtk-2.0/menu.c:882 client/gui-gtk-2.0/menu.c:884
+#: client/gui-gtk-2.0/menu.c:886 client/gui-gtk-2.0/menu.c:888
+#: client/gui-gtk-2.0/menu.c:890 client/gui-gtk-2.0/menu.c:892
+#: client/gui-gtk-2.0/menu.c:894 client/gui-gtk-2.0/menu.c:896
+#: client/gui-gtk-2.0/menu.c:898 client/gui-gtk-2.0/menu.c:900
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906 client/gui-gtk-2.0/menu.c:908
+#: client/gui-gtk-2.0/menu.c:910 client/gui-gtk-2.0/menu.c:912
+#: client/gui-gtk-2.0/menu.c:914 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:918 client/gui-gtk-2.0/menu.c:920
+#: client/gui-gtk-2.0/menu.c:922 client/gui-gtk-2.0/menu.c:924
+#: client/gui-gtk-2.0/menu.c:926 client/gui-gtk-2.0/menu.c:928
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
+#: client/gui-gtk-2.0/menu.c:946 data/Freeciv.in:2029
msgid "Orders"
msgstr "命令(O)"
-#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:1444
+#: client/gui-gtk-2.0/menu.c:860 client/gui-gtk-2.0/menu.c:1489
#: client/gui-win32/menu.c:359
msgid "_Build City"
msgstr "都市を作る(_B)"
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:1466
-#: client/gui-gtk-2.0/menu.c:1472 client/gui-win32/menu.c:360
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:1511
+#: client/gui-gtk-2.0/menu.c:1517 client/gui-win32/menu.c:360
msgid "Build _Road"
msgstr "é“路を作る(_R)"
-#: client/gui-gtk-2.0/menu.c:833 client/gui-gtk-2.0/menu.c:1360
+#: 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 "çŒæ¼‘ã‚’è¡Œã†(_I)"
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:1361
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:1406
#: client/gui-win32/menu.c:362
msgid "Build _Mine"
msgstr "資æºåŒ–ã™ã‚‹(_M)"
-#: client/gui-gtk-2.0/menu.c:837 client/gui-gtk-2.0/menu.c:1362
+#: client/gui-gtk-2.0/menu.c:868 client/gui-gtk-2.0/menu.c:1407
msgid "Transf_orm Terrain"
msgstr "地形を変ãˆã‚‹(_O)"
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:1508
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:1553
#: client/gui-win32/menu.c:364
msgid "Build _Fortress"
msgstr "è¦å¡žã‚’築ã(_F)"
-#: client/gui-gtk-2.0/menu.c:841 client/gui-win32/menu.c:365
+#: client/gui-gtk-2.0/menu.c:872 client/gui-win32/menu.c:365
msgid "Build Airbas_e"
msgstr "é£›è¡Œå ´ã‚’ä½œã‚‹(_E)"
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:1514
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:1559
#: client/gui-win32/menu.c:366
msgid "Clean _Pollution"
msgstr "汚染を除去ã™ã‚‹(_P)"
-#: client/gui-gtk-2.0/menu.c:845 client/gui-win32/menu.c:367
+#: client/gui-gtk-2.0/menu.c:876 client/gui-win32/menu.c:367
msgid "Clean _Nuclear Fallout"
msgstr "æ»ã®ç°ã‚’除去ã™ã‚‹(_N)"
-#: client/gui-gtk-2.0/menu.c:849 client/gui-win32/menu.c:369
+#: client/gui-gtk-2.0/menu.c:880 client/gui-win32/menu.c:369
msgid "_Sentry"
msgstr "見張り番(_S)"
-#: client/gui-gtk-2.0/menu.c:855 client/gui-win32/menu.c:372
+#: client/gui-gtk-2.0/menu.c:886 client/gui-win32/menu.c:372
msgid "Make _Homecity"
msgstr "ä½äººã«ã™ã‚‹(_H)"
-#: client/gui-gtk-2.0/menu.c:857 client/gui-win32/menu.c:373
+#: client/gui-gtk-2.0/menu.c:888 client/gui-win32/menu.c:373
msgid "_Load"
msgstr "載ã›ã‚‹(_L)"
-#: client/gui-gtk-2.0/menu.c:859
+#: client/gui-gtk-2.0/menu.c:890
msgid "_Unload Transporter"
msgstr "輸é€éƒ¨éšŠã‚’é™ã‚ã™(_U)"
-#: client/gui-gtk-2.0/menu.c:861 client/gui-win32/menu.c:374
+#: client/gui-gtk-2.0/menu.c:892 client/gui-win32/menu.c:374
msgid "_Unload"
msgstr "é™ã‚ã™(_U)"
-#: client/gui-gtk-2.0/menu.c:863 client/gui-win32/menu.c:375
+#: client/gui-gtk-2.0/menu.c:894 client/gui-win32/menu.c:375
msgid "Wake up o_thers"
msgstr "ä»–ã‚’èµ·ã“ã™(_T)"
-#: client/gui-gtk-2.0/menu.c:867
+#: client/gui-gtk-2.0/menu.c:898
msgid "_Auto Settler"
msgstr "自動開拓(_A)"
-#: client/gui-gtk-2.0/menu.c:869 client/gui-win32/menu.c:378
+#: client/gui-gtk-2.0/menu.c:900 client/gui-win32/menu.c:378
msgid "Auto E_xplore"
msgstr "自動探索(_X)"
# clefs
# 2点間をé“è·¯ãªã©ã§çµã°ã›ã‚‹ã‚³ãƒžãƒ³ãƒ‰
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906
msgid "_Connect"
msgstr "連çµ(_C)"
# Daniel
-#: client/gui-gtk-2.0/menu.c:871 client/gui-win32/menu.c:380
+#: client/gui-gtk-2.0/menu.c:902 client/gui-win32/menu.c:380
msgid "_Road"
msgstr "é“è·¯(_R)"
# Daniel
-#: client/gui-gtk-2.0/menu.c:873 client/gui-win32/menu.c:381
+#: client/gui-gtk-2.0/menu.c:904 client/gui-win32/menu.c:381
msgid "Rai_l"
msgstr "鉄é“(_L)"
# Daniel
-#: client/gui-gtk-2.0/menu.c:875 client/gui-win32/menu.c:382
+#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:382
msgid "_Irrigate"
msgstr "çŒæ¼‘(_I)"
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
msgid "Go _to"
msgstr "移動(T)"
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
msgid "_Build city"
msgstr "都市を作る(_B)"
-#: client/gui-gtk-2.0/menu.c:879
+#: client/gui-gtk-2.0/menu.c:910
msgid "Patrol (_Q)"
msgstr "パトãƒãƒ¼ãƒ«(_Q)"
-#: client/gui-gtk-2.0/menu.c:881 client/gui-win32/menu.c:385
+#: client/gui-gtk-2.0/menu.c:912 client/gui-win32/menu.c:385
msgid "_Go to"
msgstr "移動(_G)"
-#: client/gui-gtk-2.0/menu.c:883
+#: client/gui-gtk-2.0/menu.c:914
msgid "Go\\/Airlift to City"
msgstr "都市ã¸ç§»å‹•\\/空輸"
# ntaka
-#: client/gui-gtk-2.0/menu.c:885 client/gui-sdl/menu.c:450
+#: client/gui-gtk-2.0/menu.c:916 client/gui-sdl/menu.c:450
#: client/gui-win32/menu.c:387 client/gui-xaw/menu.c:203
msgid "Return to nearest city"
msgstr "è¿‘ãã®éƒ½å¸‚ã¸æˆ»ã‚‹"
-#: client/gui-gtk-2.0/menu.c:889 client/gui-win32/menu.c:389
+#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:389
#: client/gui-xaw/menu.c:205
msgid "Disband Unit"
msgstr "部隊解散"
-#: client/gui-gtk-2.0/menu.c:891 client/gui-sdl/citydlg.c:532
+#: client/gui-gtk-2.0/menu.c:922 client/gui-sdl/citydlg.c:532
#: data/Freeciv.in:1186
msgid "Upgrade unit"
msgstr "æ–°åž‹ã«ã™ã‚‹"
-#: client/gui-gtk-2.0/menu.c:893
+#: client/gui-gtk-2.0/menu.c:924
msgid "Diplomat\\/Spy Actions"
msgstr "外交官\\/スパイ活動"
-#: client/gui-gtk-2.0/menu.c:895 client/gui-sdl/menu.c:399
+#: client/gui-gtk-2.0/menu.c:926 client/gui-sdl/menu.c:399
#: client/gui-win32/menu.c:391 client/gui-xaw/menu.c:209
msgid "Explode Nuclear"
msgstr "æ ¸å…µå™¨ã‚’çˆ†ç™ºã•ã›ã‚‹"
-# clefs
-#: client/gui-gtk-2.0/menu.c:899
-msgid "Select same type"
-msgstr "åŒä¸€ã‚¿ã‚¤ãƒ—ã‚’é¸æŠž"
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/cityrep.c:882
+msgid "Select"
+msgstr "é¸æŠž"
+
+#: client/gui-gtk-2.0/menu.c:934
+#, fuzzy
+msgid "Single"
+msgstr "ジャングル"
+
+#: client/gui-gtk-2.0/menu.c:936
+msgid "Same Type On Tile"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:938
+msgid "All On Tile"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:940
+msgid "Same Type On Continent"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:942
+msgid "Same Type Everywhere"
+msgstr ""
-#: client/gui-gtk-2.0/menu.c:901 client/gui-win32/menu.c:393
+#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:393
msgid "_Wait"
msgstr "å¾…æ©Ÿ(_W)"
-#: client/gui-gtk-2.0/menu.c:903 client/gui-win32/menu.c:394
+#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:394
#: client/gui-xaw/menu.c:213
msgid "Done"
msgstr "終了"
-#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:398
+#: client/gui-gtk-2.0/menu.c:949 client/gui-win32/menu.c:398
msgid "_Reports"
msgstr "å ±å‘Š(_R)"
-#: client/gui-gtk-2.0/menu.c:908 client/gui-gtk-2.0/menu.c:910
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:914
-#: client/gui-gtk-2.0/menu.c:916 client/gui-gtk-2.0/menu.c:918
-#: client/gui-gtk-2.0/menu.c:920 client/gui-gtk-2.0/menu.c:922
-#: client/gui-gtk-2.0/menu.c:924 client/gui-gtk-2.0/menu.c:926
-#: client/gui-gtk-2.0/menu.c:928 client/gui-gtk-2.0/menu.c:930
-#: client/gui-gtk-2.0/menu.c:932 data/Freeciv.in:2030
+#: client/gui-gtk-2.0/menu.c:951 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:957
+#: client/gui-gtk-2.0/menu.c:959 client/gui-gtk-2.0/menu.c:961
+#: client/gui-gtk-2.0/menu.c:963 client/gui-gtk-2.0/menu.c:965
+#: client/gui-gtk-2.0/menu.c:967 client/gui-gtk-2.0/menu.c:969
+#: client/gui-gtk-2.0/menu.c:971 client/gui-gtk-2.0/menu.c:973
+#: client/gui-gtk-2.0/menu.c:975 data/Freeciv.in:2030
msgid "Reports"
msgstr "å ±å‘Š(R)"
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:958
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:1001
#: client/gui-win32/menu.c:400 client/gui-win32/menu.c:425
msgid "_Units"
msgstr "部隊(_U)"
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/menu.c:914 client/gui-win32/menu.c:402
+#: client/gui-gtk-2.0/menu.c:957 client/gui-win32/menu.c:402
#, fuzzy
msgid "_Nations"
msgstr "æ°‘æ—(_N)"
-#: client/gui-gtk-2.0/menu.c:918 client/gui-win32/menu.c:403
+#: client/gui-gtk-2.0/menu.c:961 client/gui-win32/menu.c:403
msgid "_Economy"
msgstr "経済(_E)"
#. TRANS: Research report action
-#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:405
+#: client/gui-gtk-2.0/menu.c:963 client/gui-win32/menu.c:405
#, fuzzy
msgid "_Research"
msgstr "ç ”ç©¶(_R)"
-#: client/gui-gtk-2.0/menu.c:924 client/gui-win32/menu.c:407
+#: client/gui-gtk-2.0/menu.c:967 client/gui-win32/menu.c:407
msgid "_Wonders of the World"
msgstr "世界ã®ä¸æ€è°(_W)"
-#: client/gui-gtk-2.0/menu.c:926 client/gui-win32/menu.c:408
+#: client/gui-gtk-2.0/menu.c:969 client/gui-win32/menu.c:408
msgid "_Top Five Cities"
msgstr "上ä½5ä½ã®éƒ½å¸‚(_T)"
-#: client/gui-gtk-2.0/menu.c:928 client/gui-win32/menu.c:409
+#: client/gui-gtk-2.0/menu.c:971 client/gui-win32/menu.c:409
msgid "_Messages"
msgstr "メッセージ(_M)"
-#: client/gui-gtk-2.0/menu.c:930 client/gui-win32/menu.c:410
+#: client/gui-gtk-2.0/menu.c:973 client/gui-win32/menu.c:410
msgid "_Demographics"
msgstr "人å£çµ±è¨ˆ(_D)"
-#: client/gui-gtk-2.0/menu.c:932 client/gui-gtk-2.0/plrdlg.c:471
+#: client/gui-gtk-2.0/menu.c:975 client/gui-gtk-2.0/plrdlg.c:354
#: client/gui-win32/menu.c:411
msgid "_Spaceship"
msgstr "宇宙船(_S)"
-#: client/gui-gtk-2.0/menu.c:936 client/gui-win32/menu.c:415
+#: client/gui-gtk-2.0/menu.c:979 client/gui-win32/menu.c:415
msgid "_Help"
msgstr "ヘルプ(_H)"
-#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
-#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
-#: client/gui-gtk-2.0/menu.c:946 client/gui-gtk-2.0/menu.c:948
-#: client/gui-gtk-2.0/menu.c:950 client/gui-gtk-2.0/menu.c:952
-#: client/gui-gtk-2.0/menu.c:954 client/gui-gtk-2.0/menu.c:956
-#: client/gui-gtk-2.0/menu.c:958 client/gui-gtk-2.0/menu.c:960
-#: client/gui-gtk-2.0/menu.c:962 client/gui-gtk-2.0/menu.c:964
-#: client/gui-gtk-2.0/menu.c:966 client/gui-gtk-2.0/menu.c:968
-#: client/gui-gtk-2.0/menu.c:970 client/gui-gtk-2.0/menu.c:972
-#: client/gui-gtk-2.0/menu.c:974 client/gui-gtk-2.0/menu.c:976
-#: client/gui-gtk-2.0/menu.c:978 client/gui-gtk-2.0/menu.c:980
+#: client/gui-gtk-2.0/menu.c:981 client/gui-gtk-2.0/menu.c:983
+#: client/gui-gtk-2.0/menu.c:985 client/gui-gtk-2.0/menu.c:987
+#: client/gui-gtk-2.0/menu.c:989 client/gui-gtk-2.0/menu.c:991
+#: client/gui-gtk-2.0/menu.c:993 client/gui-gtk-2.0/menu.c:995
+#: client/gui-gtk-2.0/menu.c:997 client/gui-gtk-2.0/menu.c:999
+#: client/gui-gtk-2.0/menu.c:1001 client/gui-gtk-2.0/menu.c:1003
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-gtk-2.0/menu.c:1007
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-gtk-2.0/menu.c:1011
+#: client/gui-gtk-2.0/menu.c:1013 client/gui-gtk-2.0/menu.c:1015
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-gtk-2.0/menu.c:1019
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-gtk-2.0/menu.c:1023
#: client/gui-gtk-2.0/repodlgs.c:313 client/gui-win32/citydlg.c:1077
#: client/gui-win32/repodlgs.c:289 client/gui-win32/wldlg.c:846
#: data/Freeciv.in:1466 data/Freeciv.in:2031 data/Freeciv.in:2101
@@ -12832,121 +13043,121 @@ msgstr "ヘルプ(_H)"
msgid "Help"
msgstr "ヘルプ(H)"
-#: client/gui-gtk-2.0/menu.c:940 client/gui-win32/menu.c:416
+#: client/gui-gtk-2.0/menu.c:983 client/gui-win32/menu.c:416
msgid "Language_s"
msgstr "言語(_S)"
-#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/menu.c:417
+#: client/gui-gtk-2.0/menu.c:985 client/gui-win32/menu.c:417
msgid "Co_nnecting"
msgstr "接続(_N)"
-#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:418
+#: client/gui-gtk-2.0/menu.c:987 client/gui-win32/menu.c:418
msgid "C_ontrols"
msgstr "æ“作(_O)"
-#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:419
+#: client/gui-gtk-2.0/menu.c:989 client/gui-win32/menu.c:419
msgid "C_hatline"
msgstr "ãƒãƒ£ãƒƒãƒˆè¡Œ(_H)"
-#: client/gui-gtk-2.0/menu.c:948 client/gui-win32/menu.c:420
+#: client/gui-gtk-2.0/menu.c:991 client/gui-win32/menu.c:420
msgid "_Worklist Editor"
msgstr "作æ¥ãƒªã‚¹ãƒˆã‚¨ãƒ‡ã‚£ã‚¿(_W)"
# 原文ã«å•é¡Œã‚ã‚Š
-#: client/gui-gtk-2.0/menu.c:950 client/gui-win32/menu.c:421
+#: client/gui-gtk-2.0/menu.c:993 client/gui-win32/menu.c:421
msgid "Citizen _Management"
msgstr "市民管ç†(CMA)(_M)"
-#: client/gui-gtk-2.0/menu.c:952 client/gui-win32/menu.c:422
+#: client/gui-gtk-2.0/menu.c:995 client/gui-win32/menu.c:422
msgid "_Playing"
msgstr "éŠã³æ–¹(_P)"
-#: client/gui-gtk-2.0/menu.c:956 client/gui-win32/menu.c:424
+#: client/gui-gtk-2.0/menu.c:999 client/gui-win32/menu.c:424
msgid "City _Improvements"
msgstr "éƒ½å¸‚å»ºé€ ç‰©(_I)"
-#: client/gui-gtk-2.0/menu.c:960 client/gui-win32/menu.c:426
+#: client/gui-gtk-2.0/menu.c:1003 client/gui-win32/menu.c:426
msgid "Com_bat"
msgstr "戦闘(_B)"
-#: client/gui-gtk-2.0/menu.c:962 client/gui-win32/menu.c:427
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-win32/menu.c:427
msgid "_ZOC"
msgstr "_ZOC"
-#: client/gui-gtk-2.0/menu.c:964 client/gui-win32/menu.c:428
+#: client/gui-gtk-2.0/menu.c:1007 client/gui-win32/menu.c:428
msgid "Techno_logy"
msgstr "科å¦(_L)"
-#: client/gui-gtk-2.0/menu.c:966 client/gui-win32/menu.c:429
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-win32/menu.c:429
msgid "_Terrain"
msgstr "地形(_T)"
-#: client/gui-gtk-2.0/menu.c:968 client/gui-win32/menu.c:430
+#: client/gui-gtk-2.0/menu.c:1011 client/gui-win32/menu.c:430
msgid "Won_ders"
msgstr "ä¸æ€è°(_D)"
-#: client/gui-gtk-2.0/menu.c:972 client/gui-win32/menu.c:432
+#: client/gui-gtk-2.0/menu.c:1015 client/gui-win32/menu.c:432
msgid "Happin_ess"
msgstr "幸ç¦(_E)"
-#: client/gui-gtk-2.0/menu.c:974 client/gui-win32/menu.c:433
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-win32/menu.c:433
msgid "Space _Race"
msgstr "宇宙開発競争(_R)"
-#: client/gui-gtk-2.0/menu.c:978 client/gui-win32/menu.c:435
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-win32/menu.c:435
msgid "_Copying"
msgstr "著作権(_C)"
-#: client/gui-gtk-2.0/menu.c:980 client/gui-win32/menu.c:436
+#: client/gui-gtk-2.0/menu.c:1023 client/gui-win32/menu.c:436
msgid "_About"
msgstr "Freeciv ã«ã¤ã„ã¦(_A)"
-#: client/gui-gtk-2.0/menu.c:1264
+#: client/gui-gtk-2.0/menu.c:1307
#, c-format
msgid "%s..."
msgstr "%s..."
-#: client/gui-gtk-2.0/menu.c:1352
+#: client/gui-gtk-2.0/menu.c:1397
#, c-format
msgid "Change to %s (_I)"
msgstr "%sã«å¤‰ãˆã‚‹(_I)"
-#: client/gui-gtk-2.0/menu.c:1353
+#: client/gui-gtk-2.0/menu.c:1398
#, c-format
msgid "Change to %s (_M)"
msgstr "%sã«å¤‰ãˆã‚‹(_M)"
-#: client/gui-gtk-2.0/menu.c:1354
+#: client/gui-gtk-2.0/menu.c:1399
#, c-format
msgid "Transf_orm to %s"
msgstr "%sã«å¤‰ãˆã‚‹(_O)"
-#: client/gui-gtk-2.0/menu.c:1427
+#: client/gui-gtk-2.0/menu.c:1472
msgid "Help _Build Wonder"
msgstr "ä¸æ€è°å»ºç¯‰ã‚’手ä¼ã†(_B)"
-#: client/gui-gtk-2.0/menu.c:1441
+#: client/gui-gtk-2.0/menu.c:1486
msgid "Add to City (_B)"
msgstr "都市ã«åŠ ãˆã‚‹(_B)"
-#: client/gui-gtk-2.0/menu.c:1449
+#: client/gui-gtk-2.0/menu.c:1494
msgid "Make Trade _Route"
msgstr "交易路を確立ã™ã‚‹(_R)"
-#: client/gui-gtk-2.0/menu.c:1463
+#: client/gui-gtk-2.0/menu.c:1508
msgid "Build _Railroad"
msgstr "鉄é“を作る(_R)"
-#: client/gui-gtk-2.0/menu.c:1486
+#: client/gui-gtk-2.0/menu.c:1531
msgid "Bu_ild Farmland"
msgstr "農地を作る(_I)"
# yasu
-#: client/gui-gtk-2.0/menu.c:1506
+#: client/gui-gtk-2.0/menu.c:1551
msgid "_Fortify"
msgstr "防御態勢(_F)"
-#: client/gui-gtk-2.0/menu.c:1512
+#: client/gui-gtk-2.0/menu.c:1557
msgid "_Paradrop"
msgstr "è½ä¸‹å‚˜é™ä¸‹(_P)"
@@ -12980,13 +13191,32 @@ msgstr "メ"
msgid "Pop"
msgstr "ãƒ"
-#: client/gui-gtk-2.0/messagewin.c:155 client/gui-sdl/messagewin.c:247
+#: client/gui-gtk-2.0/messagewin.c:186 client/gui-sdl/messagewin.c:247
#: client/gui-win32/messagewin.c:132 client/gui-xaw/menu.c:228
#: data/Freeciv.in:3273 data/Freeciv.in:3274 data/Freeciv.in:3283
msgid "Messages"
msgstr "メッセージ"
-#: client/gui-gtk-2.0/plrdlg.c:330
+#: client/gui-gtk-2.0/plrdlg.c:317
+msgid "_Meet"
+msgstr "会åˆ(_M)"
+
+#: client/gui-gtk-2.0/plrdlg.c:323
+#, fuzzy
+msgid "Cancel _Treaty"
+msgstr "æ¡ç´„å–り消ã—(_C)"
+
+#: client/gui-gtk-2.0/plrdlg.c:329
+#, fuzzy
+msgid "_Withdraw Vision"
+msgstr "視野撤回(_W)"
+
+#: client/gui-gtk-2.0/plrdlg.c:348
+#, fuzzy
+msgid "_Report"
+msgstr "å ±å‘Š(_R)"
+
+#: client/gui-gtk-2.0/plrdlg.c:386
msgid "?show:Dead Players"
msgstr "æ»äº¡ã—ãŸãƒ—レイヤー"
@@ -12994,301 +13224,305 @@ msgstr "æ»äº¡ã—ãŸãƒ—レイヤー"
#. TRANS: Nations report action
#. TRANS: Nations report title
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/plrdlg.c:350 client/gui-sdl/mapctrl.c:1580
+#: client/gui-gtk-2.0/plrdlg.c:406 client/gui-sdl/mapctrl.c:1580
#: client/gui-sdl/plrdlg.c:608 client/gui-win32/plrdlg.c:344
#: client/gui-xaw/menu.c:221 data/Freeciv.in:3192 data/Freeciv.in:3193
msgid "Nations"
msgstr "æ°‘æ—"
+# Daniel
+#: client/gui-gtk-2.0/plrdlg.c:511
+#, fuzzy
+msgid "Di_plomacy"
+msgstr "外交"
+
# clefs
-#: client/gui-gtk-2.0/plrdlg.c:443
+#: client/gui-gtk-2.0/plrdlg.c:516
msgid "_Intelligence"
msgstr "è«œå ±(_I)"
-#: client/gui-gtk-2.0/plrdlg.c:450
-msgid "_Meet"
-msgstr "会åˆ(_M)"
-
-#: client/gui-gtk-2.0/plrdlg.c:457
-#, fuzzy
-msgid "Cancel _Treaty"
-msgstr "æ¡ç´„å–り消ã—(_C)"
-
-#: client/gui-gtk-2.0/plrdlg.c:464
-msgid "_Withdraw vision"
-msgstr "視野撤回(_W)"
-
-#: client/gui-gtk-2.0/plrdlg.c:495
+#: client/gui-gtk-2.0/plrdlg.c:526
msgid "_AI"
msgstr "_AI"
# Daniel
-#: client/gui-gtk-2.0/plrdlg.c:501
+#: client/gui-gtk-2.0/plrdlg.c:532
msgid "_Toggle AI Mode"
msgstr "AI状態を切り替ãˆã‚‹(_T)"
# Daniel
-#: client/gui-gtk-2.0/pages.c:208
+#: client/gui-gtk-2.0/pages.c:221
msgid "Start _New Game"
msgstr "æ–°ã—ã„ゲームã®é–‹å§‹(_N)"
# Daniel
-#: client/gui-gtk-2.0/pages.c:214
+#: client/gui-gtk-2.0/pages.c:227
msgid "Start _Scenario Game"
msgstr "シナリオã®ãƒãƒ¼ãƒ‰(_S)"
-#: client/gui-gtk-2.0/pages.c:220
+#: client/gui-gtk-2.0/pages.c:233
msgid "_Load Saved Game"
msgstr "ä¿å˜ã•ã‚ŒãŸã‚²ãƒ¼ãƒ ã®ãƒãƒ¼ãƒ‰(_L)"
# Daniel
-#: client/gui-gtk-2.0/pages.c:229
+#: client/gui-gtk-2.0/pages.c:239
msgid "C_onnect to Network Game"
msgstr "ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚²ãƒ¼ãƒ ã¸æŽ¥ç¶š(_O)"
-#: client/gui-gtk-2.0/pages.c:236
+#: client/gui-gtk-2.0/pages.c:247
msgid "Connect to Gaming _Zone"
msgstr "Gaming _Zoneã¸æŽ¥ç¶š"
# clefs
-#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:300
#: client/gui-xaw/connectdlg.c:326
msgid "Passwords don't match, enter password."
msgstr "パスワードãŒä¸€è‡´ã—ã¾ã›ã‚“。パスワードを入力ã—ã¦ãã ã•ã„。"
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:779 client/gui-gtk-2.0/pages.c:820
+#: client/gui-win32/connectdlg.c:916
msgid "Server Name"
msgstr "サーãƒå"
-#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
+#: 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
+#: data/Freeciv.in:96
msgid "Port"
msgstr "ãƒãƒ¼ãƒˆ"
-#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
+#: client/gui-win32/connectdlg.c:917
msgid "Version"
msgstr "ãƒãƒ¼ã‚¸ãƒ§ãƒ³"
-#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
-#: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
+#: 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
msgid "Status"
msgstr "状態"
-#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
-#: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
+#: 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
msgid "Players"
msgstr "プレイヤー"
-#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
+#: client/gui-win32/connectdlg.c:918
msgid "Comment"
msgstr "コメント"
# ntaka, Daniel
-#: client/gui-gtk-2.0/pages.c:747
+#: client/gui-gtk-2.0/pages.c:786
msgid "Local _Area Network"
msgstr "L_AN"
# Daniel
-#: client/gui-gtk-2.0/pages.c:783
+#: client/gui-gtk-2.0/pages.c:827
msgid "Internet _Metaserver"
msgstr "メタサーãƒ(_M)"
-#: client/gui-gtk-2.0/pages.c:817
+#: client/gui-gtk-2.0/pages.c:864
msgid "_Host:"
msgstr "ホスト(_H):"
-#: client/gui-gtk-2.0/pages.c:834
+#: client/gui-gtk-2.0/pages.c:881
msgid "_Port:"
msgstr "ãƒãƒ¼ãƒˆ(_P):"
-#: client/gui-gtk-2.0/pages.c:851
+#: client/gui-gtk-2.0/pages.c:898
msgid "_Login:"
msgstr "ãƒã‚°ã‚¤ãƒ³(_L):"
# Daniel
-#: client/gui-gtk-2.0/pages.c:869
+#: client/gui-gtk-2.0/pages.c:916
msgid "Pass_word:"
msgstr "パスワード(_W):"
# Daniel
-#: client/gui-gtk-2.0/pages.c:887
+#: client/gui-gtk-2.0/pages.c:934
msgid "Conf_irm Password:"
msgstr "パスワードã®ç¢ºèª(_I):"
-#: client/gui-gtk-2.0/pages.c:912
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: 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/wldlg.c:800 client/gui-win32/wldlg.c:806
+msgid "Type"
+msgstr "タイプ"
+
+#: client/gui-gtk-2.0/pages.c:952 client/gui-win32/plrdlg.c:337
+#: data/Freeciv.in:88
+msgid "Host"
+msgstr "ホスト"
+
+#: client/gui-gtk-2.0/pages.c:981
msgid "C_onnect"
msgstr "接続(_O)"
-#: client/gui-gtk-2.0/pages.c:1142
+#: client/gui-gtk-2.0/pages.c:1211
#, c-format
msgid "Connection name: %s"
msgstr "接続å: %s"
-#: client/gui-gtk-2.0/pages.c:1145
+#: client/gui-gtk-2.0/pages.c:1214
#, c-format
msgid "Player name: %s"
msgstr "プレイヤーå: %s"
-#: client/gui-gtk-2.0/pages.c:1150
+#: client/gui-gtk-2.0/pages.c:1219
#, c-format
msgid "Host: %s"
msgstr "ホスト: %s"
# clefs
-#: client/gui-gtk-2.0/pages.c:1158
+#: client/gui-gtk-2.0/pages.c:1227
msgid "Player/conn info"
msgstr "プレイヤー/æŽ¥ç¶šæƒ…å ±"
# clefs
-#: client/gui-gtk-2.0/pages.c:1185
+#: client/gui-gtk-2.0/pages.c:1254
#, c-format
msgid "%s info"
msgstr "%sæƒ…å ±"
# clefs
-#: client/gui-gtk-2.0/pages.c:1196
+#: client/gui-gtk-2.0/pages.c:1265
msgid "Toggle player ready"
msgstr "プレイヤーã®æº–備状態をトグル"
# clefs
-#: client/gui-gtk-2.0/pages.c:1204
+#: client/gui-gtk-2.0/pages.c:1273
msgid "Pick nation"
msgstr "æ°‘æ—é¸æŠž"
# clefs
-#: client/gui-gtk-2.0/pages.c:1214
+#: client/gui-gtk-2.0/pages.c:1283
msgid "Observe this player"
msgstr "ã“ã®ãƒ—レイヤーを観察ã™ã‚‹"
# clefs
-#: client/gui-gtk-2.0/pages.c:1221
+#: client/gui-gtk-2.0/pages.c:1290
msgid "Take this player"
msgstr "ã“ã®ãƒ—レイヤーをæ“作ã™ã‚‹"
# clefs
-#: client/gui-gtk-2.0/pages.c:1238
+#: client/gui-gtk-2.0/pages.c:1307
msgid "Cut connection"
msgstr "接続切æ–"
# clefs
-#: client/gui-gtk-2.0/pages.c:1248
+#: client/gui-gtk-2.0/pages.c:1317
msgid "Aitoggle player"
msgstr "プレイヤーã®AI状態を切り替ãˆã‚‹"
# clefs
-#: client/gui-gtk-2.0/pages.c:1257
+#: client/gui-gtk-2.0/pages.c:1326
msgid "Remove player"
msgstr "プレイヤー除去"
# clefs
-#: client/gui-gtk-2.0/pages.c:1268
+#: client/gui-gtk-2.0/pages.c:1337
msgid "Give info access"
msgstr "infoレベルã®ã‚¢ã‚¯ã‚»ã‚¹ã‚’与ãˆã‚‹"
# clefs
-#: client/gui-gtk-2.0/pages.c:1276
+#: client/gui-gtk-2.0/pages.c:1345
msgid "Give ctrl access"
msgstr "ctrlレベルã®ã‚¢ã‚¯ã‚»ã‚¹ã‚’与ãˆã‚‹"
# clefs
#. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1338
+#: client/gui-gtk-2.0/pages.c:1407
#, c-format
msgid "Put on %s"
msgstr "%s ã«åŠ ãˆã‚‹"
# Daniel
-#: client/gui-gtk-2.0/pages.c:1442
+#: client/gui-gtk-2.0/pages.c:1511
#, fuzzy
msgid "Number of _Players (including AI):"
msgstr "プレイヤーã®æ•°(AIã‚‚å«ã‚€)(_P):"
# Daniel
-#: client/gui-gtk-2.0/pages.c:1465
+#: client/gui-gtk-2.0/pages.c:1534
#, fuzzy
msgid "AI Skill _Level:"
msgstr "_AIã®ãƒ¬ãƒ™ãƒ«:"
-#: client/gui-gtk-2.0/pages.c:1481
+#: client/gui-gtk-2.0/pages.c:1550
#, fuzzy
msgid "Ruleset _Version:"
msgstr "ルールセット(_V):"
# clefs
-#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
msgid "_More Game Options..."
msgstr "詳細ãªã‚²ãƒ¼ãƒ è¨å®š..."
-#: client/gui-gtk-2.0/pages.c:1514
+#: client/gui-gtk-2.0/pages.c:1583
msgid "Record"
msgstr "記録"
# ã¾ã 使ã‚ã‚Œã¦ã„ãªã„関数ãªã®ã‹ãª
-#: client/gui-gtk-2.0/pages.c:1519
+#: client/gui-gtk-2.0/pages.c:1588
msgid "Rating"
msgstr "レーティング"
# clefs
-#: client/gui-gtk-2.0/pages.c:1525
+#: client/gui-gtk-2.0/pages.c:1594
msgid "Ready"
msgstr "準備完了"
-# Daniel
-#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
-#: data/nation/slovakian.ruleset:26
-msgid "Leader"
-msgstr "指æ®"
+# clefs
+#: client/gui-gtk-2.0/pages.c:1601
+#, fuzzy
+msgid "?player:Leader"
+msgstr "指導者"
-#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1732 client/gui-sdl/chatline.c:185
msgid "Choose Saved Game to Load"
msgstr "ãƒãƒ¼ãƒ‰ã™ã‚‹ã‚»ãƒ¼ãƒ–ファイルをé¸æŠž"
# Daniel
-#: client/gui-gtk-2.0/pages.c:1752
+#: client/gui-gtk-2.0/pages.c:1824
msgid "Choose Saved Game to _Load:"
msgstr "ãƒãƒ¼ãƒ‰ã™ã‚‹ã‚»ãƒ¼ãƒ–ファイルをé¸æŠž(_L):"
# Daniel
-#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
-#: client/gui-gtk-2.0/pages.c:2375
+#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
+#: client/gui-gtk-2.0/pages.c:2451
msgid "_Browse..."
msgstr "ブラウズ(_B)..."
# Daniel
-#: client/gui-gtk-2.0/pages.c:1839
+#: client/gui-gtk-2.0/pages.c:1911
msgid "Choose a Scenario"
msgstr "ãƒãƒ¼ãƒ‰ã™ã‚‹ã‚·ãƒŠãƒªã‚ªã‚’é¸æŠž"
# Daniel
-#: client/gui-gtk-2.0/pages.c:1926
+#: client/gui-gtk-2.0/pages.c:1998
msgid "Choose a _Scenario:"
msgstr "シナリオをé¸æŠž(_S):"
-#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
-#: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
-#: client/gui-win32/wldlg.c:806
-msgid "Type"
-msgstr "タイプ"
-
# Daniel
-#: client/gui-gtk-2.0/pages.c:2101
+#: client/gui-gtk-2.0/pages.c:2173
msgid "Choose a _nation to play:"
msgstr "ãªã‚ŠãŸã„æ°‘æ—ã‚’é¸æŠžã—ã¦ãã ã•ã„(_N)："
-#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2363 client/gui-win32/menu.c:581
msgid "Select Location to Save"
msgstr "ä¿å˜å…ˆã‚’é¸æŠžã—ã¦ãã ã•ã„"
-#: client/gui-gtk-2.0/pages.c:2372 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2448 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr "ゲームä¿å˜"
-#: client/gui-gtk-2.0/pages.c:2413
+#: client/gui-gtk-2.0/pages.c:2489
msgid "Saved _Games:"
msgstr "ä¿å˜ã•ã‚ŒãŸã‚²ãƒ¼ãƒ (_G):"
-#: client/gui-gtk-2.0/pages.c:2440
+#: client/gui-gtk-2.0/pages.c:2516
msgid "Save _Filename:"
msgstr "ä¿å˜ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«å:"
@@ -13659,7 +13893,7 @@ msgid "Total users logged in : %d"
msgstr "ãƒã‚°ã‚¤ãƒ³ã—ã¦ã„るユーザ数: %d"
# clefs
-#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1094
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
msgid "Back"
msgstr "戻る"
@@ -13669,7 +13903,7 @@ msgid "Start"
msgstr "開始"
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:775
+#: client/gui-win32/connectdlg.c:777
msgid "Load Game"
msgstr "ゲームをãƒãƒ¼ãƒ‰ã™ã‚‹"
@@ -13706,12 +13940,12 @@ msgid "Make new homecity"
msgstr "ä½äººã«ã™ã‚‹"
#: client/gui-sdl/citydlg.c:546 client/gui-sdl/citydlg.c:1418
-#: client/gui-sdl/connectdlg.c:307 client/gui-sdl/connectdlg.c:616
-#: client/gui-sdl/connectdlg.c:802 client/gui-sdl/connectdlg.c:984
+#: 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/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1039
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
#: 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
@@ -13758,7 +13992,7 @@ msgstr "買�"
#: client/gui-sdl/diplodlg.c:1335 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:2427
+#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
#: client/gui-xaw/cityrep.c:666 client/gui-xaw/cma_fe.c:327
#: client/gui-xaw/cma_fe.c:511 client/gui-xaw/cma_fe.c:765
#: client/gui-xaw/messagedlg.c:72 client/gui-xaw/optiondlg.c:76
@@ -13774,7 +14008,7 @@ msgstr "ã„ã„ãˆ"
#: client/gui-sdl/diplodlg.c:1345 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:2427 client/gui-xaw/cityrep.c:666
+#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
#: client/gui-xaw/cma_fe.c:327 client/gui-xaw/cma_fe.c:511
#: client/gui-xaw/cma_fe.c:765 client/gui-xaw/messagedlg.c:72
#: client/gui-xaw/optiondlg.c:76 client/gui-xaw/optiondlg.c:304
@@ -14056,38 +14290,38 @@ msgstr "1回é©ç”¨"
msgid "Release city"
msgstr "都市を解放(_R)"
-#: client/gui-sdl/connectdlg.c:238
+#: client/gui-sdl/connectdlg.c:239
msgid "Creating Server List..."
msgstr "サーãƒä¸€è¦§ã‚’生æˆ..."
# Daniel
-#: client/gui-sdl/connectdlg.c:279 client/gui-sdl/connectdlg.c:343
+#: client/gui-sdl/connectdlg.c:280 client/gui-sdl/connectdlg.c:344
msgid "No LAN servers found"
msgstr "LAN サーãƒã¯è¦‹ã¤ã‹ã‚Šã¾ã›ã‚“"
-#: client/gui-sdl/connectdlg.c:281 client/gui-sdl/connectdlg.c:345
+#: client/gui-sdl/connectdlg.c:282 client/gui-sdl/connectdlg.c:346
msgid "No public servers found"
msgstr ""
# Daniel
-#: client/gui-sdl/connectdlg.c:555
+#: client/gui-sdl/connectdlg.c:556
msgid "Player Name :"
msgstr "プレイヤーå :"
-#: client/gui-sdl/connectdlg.c:571
+#: client/gui-sdl/connectdlg.c:572
msgid "Freeciv Server :"
msgstr "Freeciv サーム:"
-#: client/gui-sdl/connectdlg.c:588
+#: client/gui-sdl/connectdlg.c:589
msgid "Port :"
msgstr "ãƒãƒ¼ãƒˆ:"
-#: client/gui-sdl/connectdlg.c:608 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr "接続"
-#: client/gui-sdl/connectdlg.c:794 client/gui-sdl/connectdlg.c:977
+#: client/gui-sdl/connectdlg.c:795 client/gui-sdl/connectdlg.c:978
#: client/gui-xaw/connectdlg.c:145
msgid "Next"
msgstr ""
@@ -14368,7 +14602,7 @@ msgstr ""
#: client/gui-sdl/graphics.c:1021
#, c-format
-msgid "Unable to initialize SDL_ttf library: %s"
+msgid "Unable to initialize SDL_ttf library: %s"
msgstr ""
#: client/gui-sdl/graphics.c:1058
@@ -14458,12 +14692,6 @@ msgstr ""
msgid "Waiting for the beginning of the game"
msgstr ""
-#: client/gui-sdl/gui_string.c:608
-msgid ""
-"Couldn't find stdfont.ttf file. Please link/copy/move anyunicode ttf font to "
-"data dir as stdfont.ttf"
-msgstr ""
-
#. TRANS: Future Technology
#: client/gui-sdl/gui_tilespec.c:506
msgid "FT"
@@ -15056,12 +15284,12 @@ msgid "Leave Game"
msgstr "ゲームä¿å˜"
#: client/gui-sdl/optiondlg.c:2302 client/gui-sdl/pages.c:255
-#: client/gui-win32/connectdlg.c:1098 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1100 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:963
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
msgid "Start New Game"
msgstr "æ–°ã—ã„ゲームを開始ã™ã‚‹"
@@ -15175,8 +15403,8 @@ msgstr "実åŽå…¥: "
msgid "%s max rate : %d%%"
msgstr "%s 最大: %d%%"
-#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1081
-#: client/gui-win32/connectdlg.c:1089 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
+#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
msgid "Update"
msgstr "æ›´æ–°"
@@ -15633,10 +15861,6 @@ msgstr "å…¨ã¦å¤‰æ›´"
msgid "Refresh"
msgstr "å†è¡¨ç¤º"
-#: client/gui-win32/cityrep.c:882
-msgid "Select"
-msgstr "é¸æŠž"
-
#: client/gui-win32/cityrep.c:883
msgid "Configure"
msgstr "è¨å®š"
@@ -15688,59 +15912,59 @@ msgstr "セーブファイルをãƒãƒ¼ãƒ‰ã§ãã¾ã›ã‚“"
msgid "Verify Password"
msgstr "パスワード確èª"
-#: client/gui-win32/connectdlg.c:912 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr "Freeciv サーãƒé¸æŠž"
# ntaka
-#: client/gui-win32/connectdlg.c:913
+#: client/gui-win32/connectdlg.c:915
msgid "Local Area Network"
msgstr "LAN"
-#: client/gui-win32/connectdlg.c:947
+#: client/gui-win32/connectdlg.c:949
msgid "Welcome to Freeciv"
msgstr "Freecivã®ä¸–ç•Œã¸ã‚ˆã†ã“ã!"
-#: client/gui-win32/connectdlg.c:965
+#: client/gui-win32/connectdlg.c:967
msgid "Load Saved Game"
msgstr "ä¿å˜ã•ã‚ŒãŸã‚²ãƒ¼ãƒ ã®ãƒãƒ¼ãƒ‰"
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
msgid "Connect To Network Game"
msgstr "ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚²ãƒ¼ãƒ ã¸æŽ¥ç¶š"
# Daniel
-#: client/gui-win32/connectdlg.c:977
+#: client/gui-win32/connectdlg.c:979
msgid "Choose a nation to play"
msgstr "ãªã‚ŠãŸã„æ°‘æ—ã‚’é¸æŠžã—ã¦ãã ã•ã„："
-#: client/gui-win32/connectdlg.c:1012
+#: client/gui-win32/connectdlg.c:1014
msgid "Number of players (Including AI):"
msgstr "プレイヤーã®æ•°(AIã‚‚å«ã‚€)"
-#: client/gui-win32/connectdlg.c:1020
+#: client/gui-win32/connectdlg.c:1022
msgid "AI skill level:"
msgstr "AIã®ãƒ¬ãƒ™ãƒ«"
# Daniel
-#: client/gui-win32/connectdlg.c:1034 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
msgid "Game Options"
msgstr "ゲームオプション"
-#: client/gui-win32/connectdlg.c:1038
+#: client/gui-win32/connectdlg.c:1040
msgid "Start Game"
msgstr "ゲーム開始"
# Daniel
-#: client/gui-win32/connectdlg.c:1057
+#: client/gui-win32/connectdlg.c:1059
msgid "Login:"
msgstr "ãƒã‚°ã‚¤ãƒ³ï¼š"
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
msgid "Host:"
msgstr "ホスト:"
-#: client/gui-win32/connectdlg.c:1060
+#: client/gui-win32/connectdlg.c:1062
msgid "Port:"
msgstr "ãƒãƒ¼ãƒˆ:"
@@ -16001,10 +16225,6 @@ msgid "(idle %d turn)"
msgid_plural "(idle %d turns)"
msgstr[0] "(アイドル %dターン)"
-#: client/gui-win32/plrdlg.c:337 data/Freeciv.in:88
-msgid "Host"
-msgstr "ホスト"
-
#: client/gui-win32/plrdlg.c:355 data/Freeciv.in:3230
msgid "Intelligence"
msgstr "技術"
@@ -17831,12 +18051,12 @@ msgstr ""
#: data/helpdata.txt:781
msgid ""
-" To have a diplomatic relationship with another player, you must fist "
-"establish first contact with that player. To establish first contact, you "
-"have to move one of your units next to a city or unit belonging to that "
-"player, or vice versa. Unless you establish an embassy with that player, you "
-"may again lose contact with them after a set number of turns without direct "
-"physical contact."
+" To have a diplomatic relationship with another player, you must first "
+"establish contact with that player. To establish contact, you have to move "
+"one of your units next to a city or unit belonging to that player, or vice "
+"versa. Unless you establish an embassy with that player, you may again lose "
+"contact with them after a set number of turns without direct physical "
+"contact."
msgstr ""
#: data/helpdata.txt:788
@@ -20625,7 +20845,7 @@ msgstr "共産主義"
# yasu
#: data/default/governments.ruleset:121 data/civ2/governments.ruleset:118
-#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:26
+#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:27
msgid "Comrade"
msgstr "åŒå¿—"
@@ -21610,6 +21830,11 @@ msgstr ""
"一ã¤ã®ä½œæ¥ã«å¯¾ã—ã¦å¤šã™ãŽã‚‹éƒ¨éšŠã‚’割りã‚ã¦ãªã„よã†ã«ã—ã¾ã—ょã†ã€‚余分ãªåŠ´åŠ›ã¯ç„¡"
"駄ã«ãªã‚Šã¾ã™ã—，部隊ã®ã¾ã¨ã¾ã‚Šã¯æ•µã®æ”»æ’ƒã«ã¨ã¦ã‚‚無防備ã§ã™ã€‚"
+#: data/default/units.ruleset:238
+#, fuzzy
+msgid "?unit:Workers"
+msgstr "労åƒè€…"
+
# clefs
# 原文もヘン
#: data/default/units.ruleset:264
@@ -22274,6 +22499,12 @@ msgstr "探索者"
msgid "Explorers are very useful for mapping unknown territory."
msgstr "探索者ã¯æœªçŸ¥ã®é ˜åŸŸã®åœ°å›³ä½œæˆã«ã¨ã¦ã‚‚役立ã¡ã¾ã™ã€‚"
+# Daniel
+#: data/default/units.ruleset:1864
+#, fuzzy
+msgid "?unit:Leader"
+msgstr "指æ®"
+
# clefs
#: data/default/units.ruleset:1892
msgid "This is you. If you lose this unit, you lose the game. So don't."
@@ -22544,7 +22775,7 @@ msgstr "首長"
# ntaka 一ç‰æ›¸è¨˜å®˜ã¨è¨³ã™ã‚ˆã‚Šã¯ã€æ›¸è¨˜é•·
#: data/nation/afghani.ruleset:25 data/nation/slovakian.ruleset:30
-#: data/nation/soviet.ruleset:27
+#: data/nation/soviet.ruleset:28
msgid "General Secretary"
msgstr "書記長"
@@ -22668,10 +22899,11 @@ msgstr "アルメニア人"
# clefs
#: 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 "
-"independence from Soviet in 1991 AD"
+"independence from the Soviet Union in 1991."
msgstr ""
"ä¼èª¬ã«ã‚ˆã‚Œã°ï¼Œã‚¢ãƒ«ãƒ¡ãƒ‹ã‚¢äººã¯ãƒã‚¤ã‚¯â€•â€•ãƒŽã‚¢ã®çŽ„å«[訳註:å«ã®å«]――ã®æœ«è£”ãªã®ã ãã†"
"ã§ã™ã€‚ç¾ä»£ã®ã‚¢ãƒ«ãƒ¡ãƒ‹ã‚¢å…±å’Œå›½ã¯1991å¹´ã«ã‚½ãƒ´ã‚£ã‚¨ãƒˆã‹ã‚‰ã®ç‹¬ç«‹ã‚’ç²å¾—ã—ã¾ã—ãŸã€‚"
@@ -23872,13 +24104,13 @@ msgstr "イリュリア人"
# clefs
#: 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 the Dalmatians to the north, "
-"Corcyra island and Ambracia bay in prehistoric Epirus to the south, mixing "
-"with Thracians in Dardania to the east, and settling Messapia across the "
-"Adriatic Sea. Illyrian kingdoms were independent for centuries, until "
-"conquered by the Roman Republic."
+"Illyrians were Indo-European tribes who appeared in the western part of the "
+"Balkan Peninsula before 1000 BC, including Corcyra island and Ambracia bay "
+"in prehistoric Epirus to the south. They mixed with Thracians in Dardania to "
+"the east, and settled Messapia across the Adriatic Sea. Illyrian kingdoms "
+"were independent for centuries, until conquered by the Roman Republic."
msgstr ""
"イリュリアã¯ã‚¤ãƒ³ãƒ‰ãƒ¨ãƒ¼ãƒãƒƒãƒ‘語æ—ã«å±žã—，紀元å‰1000年以å‰ã«ãƒãƒ«ã‚«ãƒ³åŠå³¶ã®è¥¿éƒ¨"
"ã«å‡ºç¾ã—ã¾ã—ãŸã€‚北ã¯ãƒ€ãƒ«ãƒžãƒã‚¢ï¼Œå—ã¯ã‚³ãƒ«ã‚·ã‚«å³¶ã‚„å‰å²ã‚¨ãƒ”ラスã®ã‚¢ãƒ³ãƒ–ラã‚ア湾"
@@ -24249,7 +24481,7 @@ msgstr ""
"æœé®®æˆ¦äº‰ã®è† ç€çŠ¶æ…‹ã®çµæžœï¼Œæœé®®åŠå³¶ã¯å—北æœé®®ã®äºŒå›½å®¶ã«åˆ†æ–ã•ã‚Œã¦ã„ã¾ã™ã€‚"
# イメージã¯ã‚¹ã‚¿ãƒ¼ãƒªãƒ³? (clefs)
-#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:28
+#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:29
msgid "Great Leader"
msgstr "å‰å¤§ãªã‚‹æŒ‡å°Žè€…"
@@ -24443,12 +24675,13 @@ msgstr "マリ人"
# clefs
#: 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 "
-"called the Sahelian kingdoms. Of these, the Islamic Mali empire with it's "
+"called the Sahelian kingdoms. Of these, the Islamic Mali empire with its "
"capital in Timbuktu was the most influential. This empire reigned from the "
-"14th to the 17th century and was famed for it's wealth and benevolent kings. "
+"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 ""
"サãƒãƒ©ç ‚æ¼ ä»¥å—ã®ã‚¢ãƒ•ãƒªã‚«ã¯æ•°åƒå¹´ã«äº™ã£ã¦æ–‡åŒ–・民æ—ã®å©å ã¨ãªã£ã¦ã„ã¾ã™ã€‚ä¸ä¸–"
@@ -24526,9 +24759,10 @@ msgstr "マヤæ—"
# clefs
#: data/nation/mayan.ruleset:6
+#, fuzzy
msgid ""
-"The Mayans were a Mesoamerican civilization. Famous for building great "
-"pyramids and palaces in the jungle."
+"The Mayans were a Mesoamerican civilization. They are famous for building "
+"great pyramids and palaces in the jungle."
msgstr ""
"マヤæ—ã¯ä¸å¤®ã‚¢ãƒ¡ãƒªã‚«ã®æ–‡æ˜Žã§ã—ãŸã€‚ジャングルã«å‰å¤§ãªãƒ”ラミッドや宮殿を建è¨ã—"
"ãŸã“ã¨ã§é«˜åã§ã™ã€‚"
@@ -25135,6 +25369,17 @@ msgstr ""
"ã„ã¾ã—ãŸã€‚"
# clefs
+#: data/nation/slovakian.ruleset:26
+#, fuzzy
+msgid "?male:Leader"
+msgstr "指導者"
+
+# clefs
+#: data/nation/slovakian.ruleset:26
+msgid "?female:Leader"
+msgstr "指導者"
+
+# clefs
# 原ç†ä¸»ç¾©EUã®å…ƒé¦–ã¯ãƒãƒ¼ãƒžæ³•çŽ‹ï¼Œã¨ã„ã†ã“ã¨ã«ãªã‚‹ã‚ˆã†ã§ã™
#: data/nation/slovakian.ruleset:29
msgid "Pope"
@@ -25185,12 +25430,14 @@ msgstr "ソビエト人"
# clefs
# æ´å²ãŒèˆˆå‘³ã‚’æŒã¤ã®ã¯ã„ã¤ã ã£ã¦å§‹ã‚ã¨çµ‚ã‚ã‚Šã ã‘
#: data/nation/soviet.ruleset:6
+#, fuzzy
msgid ""
-"Soviet Union's history starts in November 1917, when under Lenin's "
+"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 "
-"republics integrated into one country. Soviet Union became one of most "
-"powerful states in the 20th century. But by the end of 1991 due to many "
-"social shocks it disintegrated into fifteen independent countries"
+"republics integrated into one country. The Soviet Union became one of most "
+"powerful states in the 20th century, but by the end of 1991 it had "
+"disintegrated into fifteen independent countries due to social and economic "
+"problems."
msgstr ""
"ソビエト連邦ã®æ´å²ã¯1917å¹´12月，レーニンã®æŒ‡æ®ã®ä¸‹ã§ãƒœãƒªã‚·ã‚§ãƒ´ã‚£ã‚é©å‘½ãŒèµ·ã"
"ãŸæ™‚ã«å§‹ã¾ã‚Šã¾ã™ã€‚1922å¹´12月31æ—¥ã«ã¯ï¼Œ4ã¤ã®ã‚½ãƒ“エト共和国ãŒä¸€ã¤ã®å›½å®¶ã¸çµ±åˆã—"
@@ -25670,9 +25917,10 @@ msgstr "ウエストファリア人"
# clefs
# "...was the western region {->of }the " 原文typo
#: data/nation/westphalian.ruleset:6
+#, fuzzy
msgid ""
-"Westphalia, before becoming a Prussian province, was the western region the "
-"duchy of Saxony. Present-day it consists of the Northern part of the largest "
+"Westphalia, before becoming a Prussian province, was the western region of "
+"the duchy of Saxony. Today it makes up the northern part of the largest "
"German federal state, North Rhine-Westphalia."
msgstr ""
"ウェストファリアã¯ï¼Œãƒ—ãƒã‚¤ã‚»ãƒ³ã®å·žã«ãªã‚‹ã¾ã§ã¯ï¼Œã‚µã‚¯ã‚½ãƒ‹ãƒ¼å…¬å›½è¥¿éƒ¨ã®åœ°åŸŸã§ã—"
@@ -25836,7 +26084,7 @@ msgid ""
"The flag and background color indicate what civilization the city\n"
"belongs to (this will be useful when you meet other civilizations).\n"
"The top row of the bar also shows the name and size of the city, and\n"
-"will show one or more starts to indicate if there are units in the\n"
+"will show one or more stars to indicate if there are units in the\n"
"city. The bottom row shows what the city is building, and how long it\n"
"will take; it also shows how long the city will take to grow to the\n"
"next largest size."
@@ -25892,7 +26140,7 @@ msgid ""
"Now your city has grown to size five. As cities get larger unrest\n"
"becomes a problem. A city of this size will usually have one unhappy\n"
"citizen unless pacifying effects are used; meaning one entertainer\n"
-"specialist is required to keep your citzens content. This is basically\n"
+"specialist is required to keep your citizens content. This is basically\n"
"a wasted citizen.\n"
"\n"
"There are several things that can be done about this. One quick fix\n"
@@ -25964,7 +26212,7 @@ msgid ""
"existing cities. Generally when building new cities you want to make\n"
"sure that all tiles are covered by at least one city, but after that\n"
"it is best that your cities overlap as little as possible. Spreading\n"
-"out cities properly gives each city access to more resrouces, allowing\n"
+"out cities properly gives each city access to more resources, allowing\n"
"them to grow to larger sizes."
msgstr ""
@@ -26246,6 +26494,67 @@ msgstr "ãƒãƒ¼ãƒ 30"
msgid "Team 31"
msgstr "ãƒãƒ¼ãƒ 31"
+# clefs
+#, fuzzy
+#~ msgid "Auth config filename \"%s\" not allowed!"
+#~ msgstr "ãã®åå‰ã¯è¨±å¯ã•ã‚Œã¦ã„ã¾ã›ã‚“。"
+
+#~ msgid "The %s of the %s (%s)"
+#~ msgstr "%sã®%s (%s)"
+
+# clefs
+#, fuzzy
+#~ msgid ""
+#~ "Illegal alliance structure detected: %s alliance to %s reduced to peace "
+#~ "treaty."
+#~ msgstr ""
+#~ "ä¸æ£ãªåŒç›Ÿæ§‹é€ を探知ã—ã¾ã—ãŸï¼š%sã®%sã¨ã®åŒç›Ÿã¯å¹³å’Œæ¡ç´„ã¸ã¨æ ¼ä¸‹ã’ã—ã¾ã™ã€‚"
+
+#, fuzzy
+#~ msgid "And, became more experienced!"
+#~ msgstr "ã®æ”»æ’ƒã«æˆåŠŸã—，練度ãŒå¢—ã—ã¾ã—ãŸã€‚"
+
+# clefs
+#~ msgid "We can't take control of server, attempting to kill it."
+#~ msgstr "サーãƒã‚’制御ã§ããªã„ã®ã§ï¼Œkillã—ã¦ã¿ã¾ã™ã€‚"
+
+#, fuzzy
+#~ msgid "%s territory"
+#~ msgstr "%sã®é ˜åŸŸ"
+
+# clefs
+#~ msgid "%s territory (%d turn cease-fire)"
+#~ msgid_plural "%s territory (%d turn cease-fire)"
+#~ msgstr[0] "%sã®é ˜åŸŸ (%dターンã®åœæˆ¦ä¸)"
+
+#, fuzzy
+#~ msgid "%s territory (%s)"
+#~ msgstr "%2$s(%1$s)ã®é ˜åŸŸ"
+
+#~ msgid "City: %s (%s)"
+#~ msgstr "都市: %s (%s)"
+
+#, fuzzy
+#~ msgid "Unit: %s (%s)"
+#~ msgstr "部隊: %s (%s)"
+
+#~ msgid "%s of the %s"
+#~ msgstr "%sã®%s"
+
+#~ msgid "no maximum, "
+#~ msgstr "é™åº¦ãªã—,"
+
+#~ msgid "%d unit maximum, "
+#~ msgid_plural "%d units maximum, "
+#~ msgstr[0] "最大%d部隊"
+
+#~ msgid "%d per unit). "
+#~ msgstr "部隊ã«ã¤ã%d)"
+
+# clefs
+#~ msgid "Select same type"
+#~ msgstr "åŒä¸€ã‚¿ã‚¤ãƒ—ã‚’é¸æŠž"
+
#~ msgid "Units: "
#~ msgstr "部隊: "
@@ -26367,9 +26676,6 @@ msgstr "ãƒãƒ¼ãƒ 31"
#~ msgid ", nation %s"
#~ msgstr ", æ°‘æ— %s"
-#~ msgid ", team %s"
-#~ msgstr ", ãƒãƒ¼ãƒ %s"
-
# Daniel
#~ msgid "_Map"
#~ msgstr "地図(_M)"
@@ -27696,10 +28002,6 @@ msgstr "ãƒãƒ¼ãƒ 31"
#~ msgid "?female:Encik"
#~ msgstr "閣下"
-# clefs
-#~ msgid "?female:Leader"
-#~ msgstr "指導者"
-
# ntaka 一ç‰æ›¸è¨˜å®˜ã¨è¨³ã™ã‚ˆã‚Šã¯ã€æ›¸è¨˜é•·
#~ msgid "?female:General Secretary"
#~ msgstr "書記長"
@@ -28866,10 +29168,6 @@ msgstr "ãƒãƒ¼ãƒ 31"
#~ msgstr "最後ã®ãƒ—レイヤーãŒåˆ‡æ–ã—ã¾ã—ãŸã€‚å†ã‚¹ã‚¿ãƒ¼ãƒˆã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚"
#, fuzzy
-#~ msgid "Metaserver topic string set to '%s'."
-#~ msgstr "メタサーãƒã®æƒ…å ±æ–‡å—列を '%s' ã¸è¨å®šã—ã¾ã™ã€‚"
-
-#, fuzzy
#~ msgid "Metaserver topic string set to '%s', not reporting to metaserver."
#~ msgstr "メタサーãƒã®æƒ…å ±æ–‡å—列を '%s' ã¸è¨å®šã—ã¾ã™ã€‚"
diff --git a/po/ko.gmo b/po/ko.gmo
index 80e2ae7..806e728 100644
Binary files a/po/ko.gmo and b/po/ko.gmo differ
diff --git a/po/ko.po b/po/ko.po
index 354f930..08aa247 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,14 +1,14 @@
# Korean localization of Freeciv
# Copyright (C) 1996 A Kjeldberg, L Gregersen, P Unold
# This file is distributed under the same license as the Freeciv package.
-# Daniel Markstedt <himasaram at spray.se>, 2007 - 2008
+# Daniel Markstedt <himasaram at spray.se>, 2007 - 2009
# Jungho Lee <junghoya at gmail.com>, 2007
#
msgid ""
msgstr ""
"Project-Id-Version: Freeciv 2.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 07:45+0900\n"
+"POT-Creation-Date: 2009-03-29 21:13+0900\n"
"PO-Revision-Date: 2007-12-10 21:13+0900\n"
"Last-Translator: Daniel\n"
"Language-Team: Korean language team\n"
@@ -144,7 +144,7 @@ msgstr "ë„ì‹œ : êµí†µ"
#: common/events.c:57
msgid "City: Was Built"
-msgstr "ë„ì‹œ : 건설ë˜ì—ˆìŒ"
+msgstr "ë„ì‹œ : 건설ë˜ì—ˆìŠ´"
#: common/events.c:58
msgid "City: Worklist Events"
@@ -196,7 +196,7 @@ msgstr "ë„ì‹œ : ìš°ì£¼ì„ ì‚¬ê±´"
#: common/events.c:70
msgid "Diplomat Action: Bribe"
-msgstr "외êµê´€ í–‰ë™ : 뇌물"
+msgstr "외êµê´€ í–‰ë™ : 매수"
#: common/events.c:71
msgid "Diplomat Action: Caused Incident"
@@ -232,7 +232,7 @@ msgstr "외êµê´€ í–‰ë™ : ì ˆë„"
#: common/events.c:79
msgid "Enemy Diplomat: Bribe"
-msgstr "ì êµ° 외êµê´€ : 뇌물"
+msgstr "ì êµ° 외êµê´€ : 매수"
#: common/events.c:80
msgid "Enemy Diplomat: Embassy"
@@ -635,7 +635,7 @@ msgid "Road"
msgstr "ë„ë¡œ"
#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
-#: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
+#: client/gui-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"
@@ -652,7 +652,7 @@ msgid "Mine"
msgstr "관갱"
#: common/terrain.c:396 common/unit.c:548 server/report.c:124
-#: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
+#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr "공해"
@@ -698,7 +698,7 @@ msgstr "요새화ë¨"
msgid "Sentry"
msgstr "ë³´ì´ˆ"
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:851 client/gui-sdl/menu.c:648
+#: common/unit.c:566 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 "약탈"
@@ -715,7 +715,7 @@ msgstr "íƒí—˜"
msgid "Transform"
msgstr "개조"
-#: common/unit.c:584 client/text.c:106 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:584 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 "ì•Œë ¤ì§€ì§€ ì•Šì€"
@@ -730,8 +730,8 @@ msgid ""
"Upgrade %s to %s for %d gold?\n"
"Treasury contains %d gold."
msgstr ""
-"%sì—ì„œ %së¡œ %dì˜ ê¸ˆì´ í•„ìš”í•œë° ì—…ê·¸ë ˆì´ë“œ í•˜ì‹œê² ìŠµë‹ˆê¹Œ?\n"
-" %dì˜ ê¸ˆì„ ìžê¸ˆìœ¼ë¡œ ê°–ê³ ìžˆìŠµë‹ˆë‹¤."
+"%sì—ì„œ %s(으)ë¡œ %dì˜ ê¸ˆì´ í•„ìš”í•œë° ì—…ê·¸ë ˆì´ë“œ í•˜ì‹œê² ìŠµë‹ˆê¹Œ?\n"
+"%dì˜ ê¸ˆì„ ìžê¸ˆìœ¼ë¡œ ê°–ê³ ìžˆìŠµë‹ˆë‹¤."
#: common/unit.c:1579
#, c-format
@@ -744,8 +744,8 @@ msgid ""
"Upgrading %s to %s costs %d gold.\n"
"Treasury contains %d gold."
msgstr ""
-"%sì—ì„œ %së¡œ %dì˜ ê¸ˆì„ ì†Œë¹„í•˜ì—¬ ì—…ê·¸ë ˆì´ë“œ 합니다\n"
-" %dì˜ ê¸ˆì„ ìžê¸ˆìœ¼ë¡œ ê°–ê³ ìžˆìŠµë‹ˆë‹¤."
+"%sì—ì„œ %s(으)ë¡œ %dì˜ ê¸ˆì„ ì†Œë¹„í•˜ì—¬ ì—…ê·¸ë ˆì´ë“œ 합니다.\n"
+"%dì˜ ê¸ˆì„ ìžê¸ˆìœ¼ë¡œ ê°–ê³ ìžˆìŠµë‹ˆë‹¤."
#: common/unit.c:1594
msgid "You can only upgrade units in your cities."
@@ -754,7 +754,7 @@ msgstr "ë‹¹ì‹ ì€ ì˜¤ì§ ë‹¹ì‹ ë„ì‹œ 안ì—ì„œ 부대를 ì—…ê·¸ë ˆì´ë“œ 시킬
#: common/unit.c:1598
#, c-format
msgid "Upgrading this %s would strand units it transports."
-msgstr "ì´ %sì˜ ì—…ê·¸ë ˆì´ë“œëŠ” 해안가로 ìš´ë°˜í• ê²ƒìž…ë‹ˆë‹¤"
+msgstr "ì´ %sì˜ ì—…ê·¸ë ˆì´ë“œëŠ” 해안가로 ìš´ë°˜í• ê²ƒìž…ë‹ˆë‹¤"
#: common/unittype.c:61
msgid "Missile"
@@ -784,11 +784,11 @@ msgstr "핵병기"
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1406
+#: common/unittype.c:349 client/helpdata.c:1404
msgid " and "
msgstr " ê·¸ë¦¬ê³ "
-#: common/unittype.c:355 client/helpdata.c:1392
+#: common/unittype.c:355 client/helpdata.c:1390
msgid "?and:, "
msgstr ", "
@@ -1037,12 +1037,12 @@ msgstr "ì—러 %d(sterrorì´ ì—†ëŠ” 컴파ì¼)"
#: ai/aicity.c:1043 server/citytools.c:1932
#, c-format
msgid "The %s have stopped building The %s in %s."
-msgstr ""
+msgstr "%s(ì€)는 %sì˜ ê±´ì„¤ì„ %sì–´ì„œ 중단했습니다."
#: ai/aicity.c:1054 server/citytools.c:1973
#, c-format
msgid "The %s have started building The %s in %s."
-msgstr ""
+msgstr "%s(ì€)는 %sì˜ ê±´ì„¤ì„ %sì–´ì„œ 시작했습니다."
#: ai/aicity.c:1381
#, c-format
@@ -1346,31 +1346,26 @@ msgstr ""
#: server/auth.c:281
#, c-format
-msgid "Auth config filename \"%s\" not allowed!"
-msgstr "권한ì´ìžˆëŠ” 편집화ì¼ì´ë¦„ \"%s\"는 허용ë˜ì§€ 않습니다!"
-
-#: server/auth.c:286
-#, c-format
msgid "Cannot load auth config file \"%s\"!"
msgstr "권한있는 íŽ¸ì§‘í™”ì¼ \"%s\"는 ì½ì„ 수 없습니다!"
-#: server/auth.c:397
+#: server/auth.c:392
#, c-format
msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
msgstr ""
"ê²½ê³ : '%s' ì´ë¦„ì˜ ì†ë‹˜ì´ë¦„ì€ ì´ë¯¸ 있습니다, ì‚¬ìš©ìž '%s'ì˜ ì´ë¦„ì„ ë‹¤ì‹œ ì´"
"름바꾸세요."
-#: server/auth.c:404
+#: server/auth.c:399
msgid "Guests are not allowed on this server. Sorry."
msgstr "죄송하지만 ì†ë‹˜ì€ ì´ê³³ 서버ì—ì„œ 허용하지 않습니다"
-#: server/auth.c:406
+#: server/auth.c:401
#, c-format
msgid "%s was rejected: Guests not allowed."
msgstr "%s는 거부당했습니다:ì†ë‹˜ì€ 허용ë˜ì§€ 않습니다"
-#: server/auth.c:425
+#: server/auth.c:420
#, c-format
msgid ""
"There was an error reading the user database, logging in as guest connection "
@@ -1378,7 +1373,7 @@ msgid ""
msgstr ""
"ì†ë‹˜ %së¡œ 로그ì¸í•˜ì—¬ ì‚¬ìš©ìž ë°ì´í„°ë² ì´ìŠ¤ë¥¼ ì½ëŠ” ë„중 ì—러가 ë°œìƒí–ˆìŠµë‹ˆë‹¤."
-#: server/auth.c:431
+#: server/auth.c:426
msgid ""
"There was an error reading the user database and guest logins are not "
"allowed. Sorry"
@@ -1386,41 +1381,41 @@ msgstr ""
"ì‚¬ìš©ìž ë°ì´í„°ë² ì´ìŠ¤ë¥¼ ì½ëŠ”ë„중 ì—러가 ë°œìƒí•˜ê³ ì†ë‹˜ë¡œê·¸ì¸ì´ 허용ë˜ì§€ 않습니"
"다. 죄송합니다"
-#: server/auth.c:434
+#: server/auth.c:429
#, c-format
msgid "%s was rejected: Database error and guests not allowed."
msgstr ""
"%s는 거부당했습니다 : ë°ì´í„°ë² ì´ìŠ¤ 오류, ê·¸ë¦¬ê³ ì†ë‹˜ì€ 허용ë˜ì§€ 않습니다"
-#: server/auth.c:441
+#: server/auth.c:436
#, c-format
msgid "Enter password for %s:"
msgstr "%sì— ëŒ€í•œ 암호를 ìž…ë ¥í•˜ì„¸ìš”:"
-#: server/auth.c:450
+#: server/auth.c:445
msgid "Enter a new password (and remember it)."
msgstr "새로운 암호를 ìž…ë ¥í•˜ì„¸ìš”(ê·¸ë¦¬ê³ ê¸°ì–µí•´ë‘세요)"
-#: server/auth.c:456
+#: server/auth.c:451
msgid "This server allows only preregistered users. Sorry."
msgstr "ì´ ì„œë²„ëŠ” ì˜¤ì§ ë¯¸ë¦¬ë“±ë¡í•œ 사용ìžì—게만 허용합니다. 미안합니다"
-#: server/auth.c:459
+#: server/auth.c:454
#, c-format
msgid "%s was rejected: Only preregister users allowed."
msgstr "%s는 거부ë˜ì—ˆìŠµë‹ˆë‹¤ : ì˜¤ì§ ë¯¸ë¦¬ë“±ë¡ì‚¬ìš©ìžì—게만 허용ë©ë‹ˆë‹¤."
-#: server/auth.c:488 server/auth.c:547
+#: server/auth.c:483 server/auth.c:542
msgid "Sorry, too many wrong tries..."
msgstr "미안하지만 ìž˜ëª»ëœ ì‹œë„를 너무 ë§Žì´ í•˜ì…¨ìŠµë‹ˆë‹¤"
-#: server/auth.c:489
+#: server/auth.c:484
#, c-format
msgid "%s was rejected: Too many wrong password verifies for new user."
msgstr ""
"%s 는 거부당했습니다: 새로운 사용ìžë¥¼ 위한 암호검ì¦íšŸìˆ˜ê°€ 너무 많습니다"
-#: server/auth.c:505
+#: server/auth.c:500
msgid ""
"Warning: There was an error in saving to the database. Continuing, but your "
"stats will not be saved."
@@ -1428,30 +1423,30 @@ msgstr ""
"ê²½ê³ : ë°ì´í„°ë² ì´ìŠ¤ì— ì €ìž¥í•˜ëŠ”ë° ì—러가 ë°œìƒí•˜ì˜€ìŠµë‹ˆë‹¤. 진행ë˜ì§€ë§Œ ì €ìž¥ë˜ì§€ ì•Š"
"습니다."
-#: server/auth.c:549
+#: server/auth.c:544
#, c-format
msgid "%s was rejected: Too many wrong password tries."
msgstr "%s번 거부ë˜ì—ˆìŠµë‹ˆë‹¤: 너무 ë§Žì€ ë¹„ë°€ë²ˆí˜¸ì‹œë„를 했습니다"
-#: server/auth.c:558
+#: server/auth.c:553
msgid "Your password is incorrect. Try again."
msgstr "ë‹¹ì‹ ì˜ ì•”í˜¸ëŠ” ì •í™•í•˜ì§€ 않습니다. 다시 ì‹œë„하세요."
-#: server/auth.c:569
+#: server/auth.c:564
msgid "Sorry, your connection timed out..."
msgstr "죄송하지만 ë‹¹ì‹ ì˜ ì—°ê²° 시간 초과 ë˜ì—ˆìŠµë‹ˆë‹¤..."
-#: server/auth.c:571
+#: server/auth.c:566
#, c-format
msgid "%s was rejected: Connection timeout waiting for password."
msgstr "%s ì´(ê°€) ê±°ë¶€ë‹¹í–ˆìŒ : ì•”í˜¸ì— ëŒ€í•œ ìž…ë ¥ ì‹œê°„ì´ ì´ˆê³¼ë˜ì—ˆìŠµë‹ˆë‹¤"
-#: server/auth.c:636
+#: server/auth.c:631
#, c-format
msgid "Your password is too short, the minimum length is %d. Try again."
msgstr "ë‹¹ì‹ ì˜ ì•”í˜¸ëŠ” 너무 짧습니다, 최소길ì´ëŠ” %d입니다. 다시 ì‹œë„하세요"
-#: server/auth.c:642
+#: server/auth.c:637
#, c-format
msgid ""
"The password must have at least %d capital letters, %d numbers, and be at "
@@ -1941,7 +1936,7 @@ msgstr "여기는 %s 서버입니다"
msgid "You can learn a lot about Freeciv at %s"
msgstr ""
-#: server/civserver.c:206 client/civclient.c:237 manual/civmanual.c:380
+#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
@@ -1968,12 +1963,12 @@ msgstr ""
msgid " -b --bind ADDR\tListen for clients on ADDR\n"
msgstr ""
-#: server/civserver.c:217 client/civclient.c:241
+#: server/civserver.c:217 client/civclient.c:242
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:245
+#: server/civserver.c:221 client/civclient.c:246
msgid " -d, --debug NUM\tSet debug log level (0 to 3)\n"
msgstr ""
@@ -1981,7 +1976,7 @@ msgstr ""
msgid " -f, --file FILE\tLoad saved game FILE\n"
msgstr ""
-#: server/civserver.c:225 client/civclient.c:248 manual/civmanual.c:382
+#: server/civserver.c:225 client/civclient.c:249 manual/civmanual.c:382
msgid " -h, --help\t\tPrint a summary of the options\n"
msgstr ""
@@ -2029,11 +2024,11 @@ msgstr ""
msgid " -R, --Ranklog FILE\tUse FILE as ranking logfile\n"
msgstr ""
-#: server/civserver.c:247 client/civclient.c:267 manual/civmanual.c:383
+#: server/civserver.c:247 client/civclient.c:268 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:279
+#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, c-format
@@ -2944,23 +2939,23 @@ msgstr ""
#: server/diplomats.c:411
msgid "You can't bribe a unit from this nation."
-msgstr ""
+msgstr "ì´ ë‚˜ë¼ì˜ 부대를 ë§¤ìˆ˜í• ìˆ˜ 없습니다."
#: server/diplomats.c:422
#, c-format
msgid "You don't have enough gold to bribe the %s %s."
-msgstr ""
+msgstr "%s %s(ì„)를 매수 í• ê¸ˆì•¡ì´ ì—†ìŠµë‹ˆë‹¤."
#: server/diplomats.c:432
#, c-format
msgid "You cannot bribe the %s!"
-msgstr "%sì—게 ë‡Œë¬¼ì„ ì¤„ìˆ˜ 없습니다"
+msgstr "%s(ì„)를 ë§¤ìˆ˜í• ìˆ˜ 없습니다!"
#. TRANS: <diplomat> ... <unit>
#: server/diplomats.c:455
#, c-format
msgid "Your %s succeeded in bribing the %s."
-msgstr ""
+msgstr "ë‹¹ì‹ ì˜ %s(ì€)는 %s(ì„)를 성공ì 으로 매수하였습니다."
#. TRANS: <unit> ... <Poles>
#: server/diplomats.c:463
@@ -3158,7 +3153,7 @@ msgstr ""
msgid "Sea moving start units are not yet supported. Nobody gets %s."
msgstr ""
-#: server/gamehand.c:310 client/text.c:632
+#: server/gamehand.c:310 client/text.c:691
#, c-format
msgid "Year: %s"
msgstr "서기: %s"
@@ -3422,8 +3417,8 @@ msgstr ""
#: server/plrhand.c:1686
#, c-format
msgid ""
-"Your nation is thrust into civil war, %s is declared the leader of the "
-"rebel states."
+"Your nation is thrust into civil war! %s is declared the leader of the rebel "
+"states."
msgstr ""
#: server/plrhand.c:1707
@@ -3518,7 +3513,7 @@ msgstr "연구 ì†ë„"
msgid "Literacy"
msgstr "êµìœ¡"
-#: server/report.c:121 client/cityrepdata.c:526 client/cityrepdata.c:527
+#: server/report.c:121 client/cityrepdata.c:524 client/cityrepdata.c:525
#: client/gui-sdl/cityrep.c:174
msgid "Production"
msgstr "ìƒì‚°í’ˆ"
@@ -3668,7 +3663,7 @@ msgstr "번"
msgid "Demography string contains invalid characters. Try \"help demography\"."
msgstr ""
-#: server/report.c:743 server/report.c:766
+#: server/report.c:743 server/report.c:768
msgid "Demographics Report:"
msgstr "ì¸êµ¬ 통계 ë³´ê³ ì„œ:"
@@ -3676,10 +3671,12 @@ msgstr "ì¸êµ¬ 통계 ë³´ê³ ì„œ:"
msgid "Sorry, the Demographics report is unavailable."
msgstr ""
-#: server/report.c:748
+#. TRANS: <nation adjective> <government name> (<year>).
+#. * E.g. "Polish Despotism (200 AD)".
+#: server/report.c:750
#, c-format
-msgid "The %s of the %s (%s)"
-msgstr "%2$sì˜ %1$sêµê°€ (서기%3$s)"
+msgid "%s %s (%s)"
+msgstr "%sì˜ %s êµê°€ (%s)"
#. TRANS: message about an installation error.
#: server/ruleset.c:163
@@ -3726,14 +3723,6 @@ msgstr ""
msgid "%s had invalid nation; changing to %s."
msgstr ""
-#. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4073
-#, c-format
-msgid ""
-"Illegal alliance structure detected: %s alliance to %s reduced to peace "
-"treaty."
-msgstr ""
-
#: server/settings.c:32
msgid "Geological"
msgstr "지질"
@@ -4667,8 +4656,8 @@ msgstr ""
#: server/settings.c:1016
msgid ""
-"Automatically saved games will have name \"<prefix><year>.sav\". This "
-"setting sets the <prefix> part."
+"Automatically saved games will have name \"<prefix>-T<turn>-Y<year>.sav\". "
+"This setting sets the <prefix> part."
msgstr ""
#: server/settings.c:1023
@@ -4682,11 +4671,11 @@ msgid ""
"the game."
msgstr ""
-#: server/sernet.c:147
+#: server/sernet.c:150
msgid "Server cannot read standard input. Ignoring input."
msgstr ""
-#: server/sernet.c:922
+#: server/sernet.c:929
#, c-format
msgid "Server: bad address: [%s:%d]."
msgstr ""
@@ -4805,112 +4794,112 @@ msgid ""
"alliance with both."
msgstr ""
-#: server/srv_main.c:928
+#: server/srv_main.c:961
#, c-format
msgid "Failed saving game as %s"
msgstr "%s ë¡œ ê²Œìž„ì €ìž¥ 실패"
-#: server/srv_main.c:930
+#: server/srv_main.c:963
#, c-format
msgid "Game saved as %s"
msgstr ""
-#: server/srv_main.c:962
+#: server/srv_main.c:994
msgid "The game is already running."
msgstr "ê²Œìž„ì€ ì´ë¯¸ 진행중입니다."
-#: server/srv_main.c:970
+#: server/srv_main.c:1002
#, c-format
msgid "%s lost control cmdlevel on game start. Use voting from now on."
msgstr ""
-#: server/srv_main.c:977
+#: server/srv_main.c:1009
msgid "Starting game."
msgstr "게임 시작"
-#: server/srv_main.c:1039
+#: server/srv_main.c:1071
#, c-format
msgid "request for unknown report (type %d)"
msgstr ""
-#: server/srv_main.c:1104
+#: server/srv_main.c:1136
#, c-format
msgid "Warning: rejecting old client %s"
msgstr "ê²½ê³ : ì˜¤ëž˜ëœ í´ë¼ì´ì–¸íŠ¸ %s ê°€(ì´) 거부ë¨"
-#: server/srv_main.c:1206
+#: server/srv_main.c:1238
#, c-format
msgid "Got a packet of type %d from a dead or observer player"
msgstr ""
-#: server/srv_main.c:1306
+#: server/srv_main.c:1338
msgid "Please choose a non-blank name."
msgstr ""
-#: server/srv_main.c:1322
+#: server/srv_main.c:1354
msgid "That nation is already in use."
msgstr "ê·¸ êµê°€ëŠ” ì´ë¯¸ 사용ë˜ê³ 있습니다."
-#: server/srv_main.c:1338
+#: server/srv_main.c:1370
#, c-format
msgid "Another player already has the name '%s'. Please choose another name."
msgstr "ë˜ë‹¤ë¥¸ í”Œë ˆì´ì–´ê°€ ì´ë¯¸ %s ì´ë¦„ì„ ê°–ê³ ìžˆìŠµë‹ˆë‹¤. 다른 ì´ë¦„ì„ ì‚¬ìš©í•˜ì„¸ìš”"
-#: server/srv_main.c:1359
+#: server/srv_main.c:1391
msgid "Please choose a name containing only ASCII characters."
msgstr ""
-#: server/srv_main.c:1458
+#: server/srv_main.c:1490
#, c-format
msgid "%s nation is not available in this scenario."
msgstr "%s ì´ë¦„ì˜ ë‚˜ë¼ëŠ” ì´ ì‹œë‚˜ë¦¬ì˜¤ì—ì„œ 가능하지 않습니다"
-#: server/srv_main.c:1464
+#: server/srv_main.c:1496
#, c-format
msgid "%s nation is already in use."
msgstr ""
-#: server/srv_main.c:1482
+#: server/srv_main.c:1514
#, c-format
msgid "%s is the %s ruler %s."
msgstr "%s(ì€)는 %sì˜ í†µì¹˜ìž %s입니다."
-#: server/srv_main.c:1538
+#: server/srv_main.c:1570
#, c-format
msgid "Waiting to start game: %d out of %d players are ready to start."
msgstr "ê²Œìž„ì‹œìž‘ì„ ê¸°ë‹¤ë¦½ë‹ˆë‹¤: (%d 명 ì´ %d 명중) ì´ ì´ë¯¸ 시작하였습니다"
-#: server/srv_main.c:1582 server/srv_main.c:1586
+#: server/srv_main.c:1614 server/srv_main.c:1618
#, c-format
msgid "%s has been added as %s level AI-controlled player."
msgstr ""
-#: server/srv_main.c:1728
+#: server/srv_main.c:1760
#, c-format
msgid "Player %d"
msgstr "ì‚¬ìš©ìž %d"
-#: server/srv_main.c:1739 server/srv_main.c:1745
+#: server/srv_main.c:1771 server/srv_main.c:1777
#, c-format
msgid "%s rules the %s."
msgstr "%s(ì€)는 %s(ì„)를 통치합니다."
-#: server/srv_main.c:1910
+#: server/srv_main.c:1942
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
msgstr ""
-#: server/srv_main.c:1961
+#: server/srv_main.c:1993
#, c-format
msgid "Sending info to metaserver [%s]"
msgstr ""
-#: server/srv_main.c:1992
+#: server/srv_main.c:2024
msgid "The game is over..."
msgstr "ê²Œìž„ì´ ë났습니다..."
-#: server/srv_main.c:2205
+#: server/srv_main.c:2237
msgid "Now accepting new client connections."
msgstr ""
@@ -5702,24 +5691,24 @@ msgid "Barbarian"
msgstr "야만ì¸"
#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2030 client/gui-sdl/plrdlg.c:645
+#: client/gui-gtk-2.0/pages.c:2102 client/gui-sdl/plrdlg.c:645
#: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
msgid "AI"
msgstr "AI"
#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
+#: 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
msgid "Human"
msgstr "ì¸ê°„"
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
-#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
+#: 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
msgid "Alive"
msgstr "활약중"
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
#: client/gui-win32/connectdlg.c:200
msgid "Dead"
msgstr "사ë§"
@@ -5963,9 +5952,9 @@ 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:242
-#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
-#: client/text.c:1201
+#: 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
#, c-format
msgid "?clistmore:, %s"
msgstr ", %s"
@@ -6212,7 +6201,7 @@ msgstr ""
msgid "Cannot attack from sea."
msgstr ""
-#: server/unithand.c:996 server/unittools.c:2103
+#: server/unithand.c:996 server/unittools.c:2137
msgid "Cannot attack unless you declare war first."
msgstr ""
@@ -6309,99 +6298,100 @@ msgstr ""
#: server/unittools.c:297
#, c-format
-msgid "Not enough gold. %s disbanded"
-msgstr ""
+msgid "Not enough gold to pay upkeep for %s. Unit disbanded."
+msgstr "%s(ì„)를 ìœ ì§€í• ìˆ˜ 없으며 해산시켰습니다"
-#: server/unittools.c:342
+#: server/unittools.c:343
#, c-format
msgid "Your %s has run out of hit points."
msgstr ""
-#: server/unittools.c:358
+#: server/unittools.c:359
#, c-format
msgid "Your %s has been lost on the high seas."
msgstr ""
-#: server/unittools.c:365
+#: server/unittools.c:366
#, c-format
msgid "Your %s survived on the high seas and became more experienced!"
msgstr ""
-#: server/unittools.c:376
+#: server/unittools.c:377
#, c-format
msgid "Your %s has been lost on unsafe terrain."
msgstr ""
-#: server/unittools.c:430
+#: server/unittools.c:431
#, c-format
msgid "Your %s has returned to refuel."
msgstr ""
-#: server/unittools.c:454
+#: server/unittools.c:455
#, c-format
msgid "Your %s has run out of fuel."
msgstr ""
-#. TRANS: And, <the unit> became ...
-#: server/unittools.c:616
-msgid "And, became more experienced!"
-msgstr ""
-
#. TRANS: Your <unit> became ...
-#: server/unittools.c:620
+#: server/unittools.c:619
#, c-format
msgid "Your %s became more experienced!"
msgstr ""
-#: server/unittools.c:1011
+#: server/unittools.c:1009
#, c-format
msgid "Teleported your %s to %s."
msgstr ""
-#: server/unittools.c:1041
+#. TRANS: A unit is moved to resolve stack conflicts.
+#: server/unittools.c:1065
+#, c-format
+msgid "Moved your %s."
+msgstr "ë‹¹ì‹ ì˜ %s(ì„)를 ì´ë™ì‹œì¼°ìŠµë‹ˆë‹¤."
+
+#: server/unittools.c:1076
#, c-format
msgid "Disbanded your %s."
msgstr ""
-#: server/unittools.c:1363
+#: server/unittools.c:1397
#, c-format
msgid "Unable to defend %s, %s has lost the game."
msgstr ""
-#: server/unittools.c:1367
+#: server/unittools.c:1401
#, c-format
msgid "Losing %s meant losing the game! Be more careful next time!"
msgstr ""
-#: server/unittools.c:1469
+#: server/unittools.c:1503
#, c-format
msgid "%s escaped the destruction of %s, and fled to %s."
msgstr ""
-#: server/unittools.c:1478
+#: server/unittools.c:1512
#, c-format
msgid "%s lost when %s was lost."
msgstr ""
-#: server/unittools.c:1527
+#: server/unittools.c:1561
#, c-format
msgid "Barbarian leader captured, %d gold ransom paid."
msgstr ""
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unittools.c:1545
+#: server/unittools.c:1579
#, c-format
msgid "Your attacking %s succeeded against the %s %s!"
msgstr ""
#. TRANS: "Cannon ... the Polish Destroyer."
-#: server/unittools.c:1554 server/unittools.c:1612
+#: server/unittools.c:1588 server/unittools.c:1646
#, c-format
msgid "%s lost to an attack by the %s %s."
msgstr ""
#. TRANS: "... Cannon ... the Polish Destroyer ...."
-#: server/unittools.c:1588
+#: server/unittools.c:1622
#, c-format
msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
msgid_plural ""
@@ -6411,14 +6401,14 @@ msgstr[1] ""
#. TRANS: "Cannon lost when the Polish Destroyer
#. * attacked the German Musketeers."
-#: server/unittools.c:1621
+#: server/unittools.c:1655
#, 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:1636
+#: server/unittools.c:1670
#, c-format
msgid "%s (and %s) lost to an attack from the %s %s."
msgstr ""
@@ -6426,7 +6416,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:1646
+#: server/unittools.c:1680
#, 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."
@@ -6436,192 +6426,192 @@ 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:1660
+#: server/unittools.c:1694
#, 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:1928
+#: server/unittools.c:1962
#, c-format
msgid "Your %s was nuked by %s."
msgstr ""
-#: server/unittools.c:1931 server/unittools.c:1947
+#: server/unittools.c:1965 server/unittools.c:1981
msgid "yourself"
msgstr ""
-#: server/unittools.c:1935
+#: server/unittools.c:1969
#, c-format
msgid "The %s %s was nuked."
msgstr ""
-#: server/unittools.c:1944
+#: server/unittools.c:1978
#, c-format
msgid "%s was nuked by %s."
msgstr ""
-#: server/unittools.c:1952
+#: server/unittools.c:1986
#, c-format
msgid "You nuked %s."
msgstr ""
-#: server/unittools.c:1993
+#: server/unittools.c:2027
#, c-format
msgid "The %s detonated a nuke!"
msgstr ""
-#: server/unittools.c:2017
+#: server/unittools.c:2051
#, c-format
msgid "%s transported successfully."
msgstr ""
-#: server/unittools.c:2069
+#: server/unittools.c:2103
msgid "This unit type can not be paradropped."
msgstr ""
-#: server/unittools.c:2079
+#: server/unittools.c:2113
msgid "You cannot paradrop a unit that is transporting other units."
msgstr ""
-#: server/unittools.c:2085
+#: server/unittools.c:2119
msgid "The destination location is not known."
msgstr ""
-#: server/unittools.c:2092
+#: server/unittools.c:2126
#, c-format
msgid "This unit cannot paradrop into %s."
msgstr ""
-#: server/unittools.c:2112
+#: server/unittools.c:2146
#, c-format
msgid "The distance to the target (%i) is greater than the unit's range (%i)."
msgstr ""
-#: server/unittools.c:2123
+#: server/unittools.c:2157
#, c-format
msgid "Your %s paradropped into the %s and was lost."
msgstr ""
-#: server/unittools.c:2136
+#: server/unittools.c:2170
#, c-format
msgid "Your %s was killed by enemy units at the paradrop destination."
msgstr ""
-#: server/unittools.c:2158
+#: server/unittools.c:2192
#, c-format
msgid "You found %d gold."
msgstr "%dê¸ˆì„ ì°¾ì•˜ìŠµë‹ˆë‹¤."
-#: server/unittools.c:2175
+#: server/unittools.c:2209
#, c-format
msgid "You found %s in ancient scrolls of wisdom."
msgstr ""
-#: server/unittools.c:2182
+#: server/unittools.c:2216
#, c-format
msgid "The %s have acquired %s from ancient scrolls of wisdom."
msgstr ""
-#: server/unittools.c:2196
+#: server/unittools.c:2230
msgid "A band of friendly mercenaries joins your cause."
msgstr ""
-#: server/unittools.c:2214
+#: server/unittools.c:2248
msgid "An abandoned village is here."
msgstr ""
-#: server/unittools.c:2224
+#: server/unittools.c:2258
msgid "You have unleashed a horde of barbarians!"
msgstr ""
-#: server/unittools.c:2227
+#: server/unittools.c:2261
#, c-format
msgid "Your %s has been killed by barbarians!"
msgstr ""
-#: server/unittools.c:2243
+#: server/unittools.c:2277
msgid "You found a friendly city."
msgstr ""
-#: server/unittools.c:2257
+#: server/unittools.c:2291
msgid "Friendly nomads are impressed by you, and join you."
msgstr ""
-#: server/unittools.c:2282
+#: server/unittools.c:2316
msgid "Your overflight frightens the tribe; they scatter in terror."
msgstr ""
-#: server/unittools.c:2540
+#: server/unittools.c:2574
#, c-format
msgid "Orders for %s aborted after enemy movement was spotted."
msgstr ""
-#: server/unittools.c:2989
+#: server/unittools.c:3023
#, c-format
msgid "Orders for %s aborted as there are units nearby."
msgstr ""
-#: server/unittools.c:3041
+#: server/unittools.c:3075
#, c-format
msgid "Orders for %s aborted because building of city failed."
msgstr ""
-#: server/unittools.c:3054
+#: server/unittools.c:3088
#, c-format
msgid "Orders for %s aborted since they give an invalid activity."
msgstr ""
-#: server/unittools.c:3068
+#: server/unittools.c:3102
#, c-format
msgid "Orders for %s aborted since they give an invalid location."
msgstr ""
-#: server/unittools.c:3078
+#: server/unittools.c:3112
#, c-format
msgid "Orders for %s aborted as there are units in the way."
msgstr ""
-#: server/unittools.c:3104
+#: server/unittools.c:3138
#, c-format
msgid "Orders for %s aborted because of failed move."
msgstr ""
-#: server/unittools.c:3145
+#: server/unittools.c:3179
#, c-format
msgid "Attempt to change homecity for %s failed."
msgstr ""
-#: server/unittools.c:3156
+#: server/unittools.c:3190
#, c-format
msgid "Attempt to establish trade route for %s failed."
msgstr ""
-#: server/unittools.c:3168
+#: server/unittools.c:3202
#, c-format
msgid "Attempt to build wonder for %s failed."
msgstr ""
-#: server/unittools.c:3177
+#: server/unittools.c:3211
#, c-format
msgid "Your %s has invalid orders."
msgstr ""
-#: server/generator/mapgen.c:1737
+#: server/generator/mapgen.c:1771
msgid "High landmass - this may take a few seconds."
msgstr ""
-#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
+#: server/generator/mapgen.c:1969 server/generator/mapgen.c:2039
#, c-format
msgid "Falling back to generator %d."
msgstr ""
-#: server/generator/mapgen.c:2025
+#: server/generator/mapgen.c:2059
msgid "Generator 3 didn't place all big islands."
msgstr ""
-#: server/generator/mapgen.c:2054
+#: server/generator/mapgen.c:2088
#, c-format
msgid "Generator 3 left %li landmass unplaced."
msgstr ""
@@ -6724,7 +6714,7 @@ msgid_plural "%3d turns"
msgstr[0] "%3d í„´"
msgstr[1] "%3d í„´"
-#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:631
#: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
@@ -6842,333 +6832,332 @@ msgstr "í‰í™”"
msgid "(worklist)"
msgstr "(작업리스트)"
-#: client/cityrepdata.c:447
-msgid "Special"
-msgstr ""
+#: client/cityrepdata.c:446
+msgid "?city:Name"
+msgstr "ì´ë¦„"
-#: client/cityrepdata.c:448
-msgid "?entertainers/scientists/taxmen:E/S/T"
-msgstr ""
+#: client/cityrepdata.c:446 client/gui-sdl/cityrep.c:169
+msgid "City Name"
+msgstr "ë„ì‹œ ì´ë¦„"
-#: client/cityrepdata.c:449
-msgid "Entertainers, Scientists, Taxmen"
-msgstr ""
+#: client/cityrepdata.c:448
+msgid "?size [short]:Sz"
+msgstr "í¬"
-#: client/cityrepdata.c:452
-msgid "Concise + Rapture, - Disorder"
-msgstr ""
+#: client/cityrepdata.c:448
+msgid "Size"
+msgstr "í¬ê¸°"
-#: client/cityrepdata.c:454 client/plrdlg_common.c:261
+#: client/cityrepdata.c:450 client/plrdlg_common.c:261
#: client/gui-win32/plrdlg.c:337
msgid "State"
msgstr "ìƒíƒœ"
-#: client/cityrepdata.c:454
+#: client/cityrepdata.c:450
msgid "Rapture/Peace/Disorder"
msgstr "황홀/í‰í™”/혼란"
+#: client/cityrepdata.c:452
+msgid "Concise *=Rapture, X=Disorder"
+msgstr ""
+
+#: client/cityrepdata.c:456
+msgid "Special"
+msgstr ""
+
#: client/cityrepdata.c:457
+msgid "?entertainers/scientists/taxmen:E/S/T"
+msgstr ""
+
+#: client/cityrepdata.c:458
+msgid "Entertainers, Scientists, Taxmen"
+msgstr ""
+
+#: client/cityrepdata.c:461
msgid "?Happy workers:H"
msgstr "í–‰"
-#: client/cityrepdata.c:457
+#: client/cityrepdata.c:461
msgid "Workers: Happy"
msgstr "ë…¸ë™ìž: 행복"
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
msgid "?Content workers:C"
msgstr "만"
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
msgid "Workers: Content"
msgstr "ë…¸ë™ìž: 만족"
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
msgid "?Unhappy workers:U"
msgstr "불"
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
msgid "Workers: Unhappy"
msgstr "ë…¸ë™ìž: 불만"
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
msgid "?Angry workers:A"
msgstr "í™”"
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
msgid "Workers: Angry"
msgstr "ë…¸ë™ìž: 화가난"
-#: client/cityrepdata.c:465 client/gui-xaw/citydlg.c:2401
-#: data/default/units.ruleset:238
-msgid "Workers"
+#: client/cityrepdata.c:469 client/gui-xaw/citydlg.c:2402
+msgid "?city:Workers"
msgstr "ë…¸ë™ìž"
-#: client/cityrepdata.c:466
+#: client/cityrepdata.c:470
msgid "?happy/content/unhappy/angry:H/C/U/A"
msgstr "행/만/불/화"
-#: client/cityrepdata.c:467
+#: client/cityrepdata.c:471
msgid "Workers: Happy, Content, Unhappy, Angry"
msgstr "ë…¸ë™ìž: 행복, 만족, 불만, 화가난"
-#: client/cityrepdata.c:470 client/cityrepdata.c:472
+#: client/cityrepdata.c:474 client/cityrepdata.c:476
msgid "Best"
msgstr "ìµœê³ "
-#: client/cityrepdata.c:470
+#: client/cityrepdata.c:474
msgid "attack"
msgstr "공격"
-#: client/cityrepdata.c:471
+#: client/cityrepdata.c:475
msgid "Best attacking units"
msgstr "ìµœê³ ì˜ ê³µê²©ë¶€ëŒ€"
-#: client/cityrepdata.c:472
+#: client/cityrepdata.c:476
msgid "defense"
msgstr "ë°©ì–´"
-#: client/cityrepdata.c:473
+#: client/cityrepdata.c:477
msgid "Best defending units"
msgstr "ìµœê³ ì˜ ë°©ì–´ë¶€ëŒ€"
-#: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
-#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
-#: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
-#: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
-#: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
-#: client/gui-win32/menu.c:351 client/gui-win32/repodlgs.c:616
-#: client/gui-win32/repodlgs.c:707 client/gui-win32/repodlgs.c:716
-#: client/gui-xaw/menu.c:157 client/gui-xaw/menu.c:219
-#: client/gui-xaw/menu.c:242 client/gui-xaw/repodlgs.c:881
-#: client/gui-xaw/repodlgs.c:1069 data/Freeciv.in:1895 data/helpdata.txt:909
+#: client/cityrepdata.c:478 client/cityrepdata.c:482
+#: client/gui-gtk-2.0/cityrep.c:1437 client/gui-gtk-2.0/cityrep.c:1456
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-gtk-2.0/cityrep.c:1494
+#: client/gui-gtk-2.0/cityrep.c:1514 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/repodlgs.c:960 client/gui-sdl/helpdlg.c:688
+#: client/gui-sdl/mapctrl.c:1605 client/gui-sdl/optiondlg.c:1827
+#: client/gui-sdl/repodlgs.c:356 client/gui-win32/menu.c:351
+#: client/gui-win32/repodlgs.c:616 client/gui-win32/repodlgs.c:707
+#: client/gui-win32/repodlgs.c:716 client/gui-xaw/menu.c:157
+#: client/gui-xaw/menu.c:219 client/gui-xaw/menu.c:242
+#: client/gui-xaw/repodlgs.c:881 client/gui-xaw/repodlgs.c:1069
+#: data/Freeciv.in:1895 data/helpdata.txt:909
msgid "Units"
msgstr "부대"
#. TRANS: Header "Number of units inside city"
-#: client/cityrepdata.c:476
+#: client/cityrepdata.c:480
msgid "?Present (units):Here"
msgstr "여기"
-#: client/cityrepdata.c:477
+#: client/cityrepdata.c:481
msgid "Number of units present"
msgstr "현재 ë¶€ëŒ€ì˜ ìˆ˜"
#. TRANS: Header "Number of units supported by given city"
-#: client/cityrepdata.c:480
+#: client/cityrepdata.c:484
msgid "?Supported (units):Owned"
msgstr "ì›ì¡°"
-#: client/cityrepdata.c:481
+#: client/cityrepdata.c:485
msgid "Number of units supported"
msgstr "ì›ì¡°í•˜ëŠ” ë¶€ëŒ€ì˜ ìˆ˜"
#. TRANS: Header "It will take this many turns before city grows"
-#: client/cityrepdata.c:484
+#: client/cityrepdata.c:488
msgid "?food (population):Grow"
msgstr ""
-#: client/cityrepdata.c:485 client/cityrepdata.c:530
+#: client/cityrepdata.c:489 client/cityrepdata.c:528
msgid "?Stock/Target:(Have/Need)"
msgstr ""
-#: client/cityrepdata.c:486
+#: client/cityrepdata.c:490
msgid "Turns until growth/famine"
msgstr ""
-#: client/cityrepdata.c:488
-msgid "?size [short]:Sz"
-msgstr "í¬"
-
-#: client/cityrepdata.c:488
-msgid "Size"
-msgstr "í¬ê¸°"
-
-#: client/cityrepdata.c:492
-msgid "?city:Name"
-msgstr "ì´ë¦„"
-
-#: client/cityrepdata.c:492 client/gui-sdl/cityrep.c:169
-msgid "City Name"
-msgstr "ë„ì‹œ ì´ë¦„"
-
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
msgid "Surplus"
msgstr "잉여"
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
msgid "?food/production/trade:F/P/T"
msgstr "ì‹/ìƒ/무"
-#: client/cityrepdata.c:496
+#: client/cityrepdata.c:494
msgid "Surplus: Food, Production, Trade"
msgstr "잉여: ì‹ëŸ‰, ìƒì‚°, 무ì—"
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
msgid "?Food surplus [short]:+F"
msgstr "+ì‹"
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
msgid "Surplus: Food"
msgstr "잉여: ì‹ëŸ‰"
-#: client/cityrepdata.c:500
+#: client/cityrepdata.c:498
msgid "?Production surplus [short]:+P"
msgstr "+ìƒ"
-#: client/cityrepdata.c:501
+#: client/cityrepdata.c:499
msgid "Surplus: Production"
msgstr "잉여: ìƒì‚°"
-#: client/cityrepdata.c:502
+#: client/cityrepdata.c:500
msgid "?Production loss (waste) [short]:-P"
msgstr "-ìƒ"
-#: client/cityrepdata.c:503
+#: client/cityrepdata.c:501
msgid "Waste"
msgstr ""
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
msgid "?Trade surplus [short]:+T"
msgstr "+무"
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
msgid "Surplus: Trade"
msgstr "잉여: 무ì—"
-#: client/cityrepdata.c:506
+#: client/cityrepdata.c:504
msgid "?Trade loss (corruption) [short]:-T"
msgstr "-무"
-#: client/cityrepdata.c:507
+#: client/cityrepdata.c:505
msgid "Corruption"
msgstr "부패"
-#: client/cityrepdata.c:509 client/gui-gtk-2.0/repodlgs.c:654
+#: client/cityrepdata.c:507 client/gui-gtk-2.0/repodlgs.c:654
#: client/gui-sdl/mapctrl.c:1400 client/gui-win32/repodlgs.c:334
#: client/gui-xaw/menu.c:222 client/gui-xaw/repodlgs.c:644
#: client/gui-xaw/repodlgs.c:773 data/Freeciv.in:1819
msgid "Economy"
msgstr "ê²½ì œ"
-#: client/cityrepdata.c:509
+#: client/cityrepdata.c:507
msgid "?gold/luxury/science:G/L/S"
msgstr "?금화/복지/과학:금/복/과"
-#: client/cityrepdata.c:510
+#: client/cityrepdata.c:508
msgid "Economy: Gold, Luxuries, Science"
msgstr "ê²½ì œ: 금화, 복지, 과학"
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
msgid "?Gold:G"
msgstr "금"
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
msgid "Economy: Gold"
msgstr "ê²½ì œ: 금화"
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
msgid "?Luxury:L"
msgstr "?복지:복"
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
msgid "Economy: Luxury"
msgstr "ê²½ì œ: 복지"
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
msgid "?Science:S"
msgstr "ê³¼"
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
msgid "Economy: Science"
msgstr "ê²½ì œ: 과학"
-#: client/cityrepdata.c:518
+#: client/cityrepdata.c:516
msgid "?number_trade_routes:n"
msgstr "수"
-#: client/cityrepdata.c:518
+#: client/cityrepdata.c:516
msgid "?number_trade_routes:R"
msgstr "무"
-#: client/cityrepdata.c:519
+#: client/cityrepdata.c:517
msgid "Number of Trade Routes"
msgstr "ë¬´ì— ê²½ë¡œ 수"
-#: client/cityrepdata.c:521
+#: client/cityrepdata.c:519
msgid "?pollution [short]:Pol"
msgstr "?오염:오"
-#: client/cityrepdata.c:523
+#: client/cityrepdata.c:521
msgid "?cma:Governor"
msgstr "ë„지사"
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
-#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
-#: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
-#: data/Freeciv.in:1459 data/helpdata.txt:820
+#: client/cityrepdata.c:521 client/gui-gtk-2.0/cityrep.c:1766
+#: client/gui-sdl/citydlg.c:3809 client/gui-sdl/cma_fe.c:858
+#: client/gui-win32/citydlg.c:726 data/Freeciv.in:1459 data/helpdata.txt:820
msgid "Citizen Governor"
msgstr "ë„지사"
-#: client/cityrepdata.c:526
+#: client/cityrepdata.c:524
msgid "Turns/Buy"
msgstr ""
-#: client/cityrepdata.c:529 client/cityrepdata.c:531
+#: client/cityrepdata.c:527 client/cityrepdata.c:529
msgid "Currently Building"
msgstr ""
-#: client/cityrepdata.c:575
+#: client/cityrepdata.c:573
msgid "?specialist:S"
msgstr "?ì „ë¬¸ê°€:ì „"
-#: client/cityrepdata.c:578
+#: client/cityrepdata.c:576
msgid "Specialists"
msgstr "ì „ë¬¸ê°€"
-#: client/civclient.c:239
+#: client/civclient.c:240
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr ""
-#: client/civclient.c:249
+#: client/civclient.c:250
msgid " -l, --log FILE\tUse FILE as logfile (spawned server also uses this)\n"
msgstr ""
-#: client/civclient.c:251
+#: client/civclient.c:252
msgid " -m, --meta HOST\tConnect to the metaserver at HOST\n"
msgstr ""
-#: client/civclient.c:253
+#: client/civclient.c:254
msgid " -n, --name NAME\tUse NAME as name\n"
msgstr ""
-#: client/civclient.c:255
+#: client/civclient.c:256
msgid " -p, --port PORT\tConnect to server port PORT (usually with -a)\n"
msgstr ""
-#: client/civclient.c:257
+#: client/civclient.c:258
#, c-format
msgid " -P, --Plugin PLUGIN\tUse PLUGIN for sound output %s\n"
msgstr ""
-#: client/civclient.c:259
+#: client/civclient.c:260
msgid " -r, --read FILE\tRead startup script FILE (for spawned server only)\n"
msgstr ""
-#: client/civclient.c:262
+#: client/civclient.c:263
msgid " -s, --server HOST\tConnect to the server at HOST (usually with -a)\n"
msgstr ""
-#: client/civclient.c:264
+#: client/civclient.c:265
msgid " -S, --Sound FILE\tRead sound tags from FILE\n"
msgstr ""
-#: client/civclient.c:265
+#: client/civclient.c:266
msgid " -t, --tiles FILE\tUse data file FILE.tilespec for tiles\n"
msgstr ""
-#: client/civclient.c:268
+#: client/civclient.c:269
#, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -7176,144 +7165,154 @@ msgid ""
msgstr ""
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:273
+#: client/civclient.c:274
#, c-format
msgid "Report bugs at %s\n"
msgstr "%sì— ë²„ê·¸ë¦¬í¬íŠ¸.\n"
-#: client/civclient.c:297
+#: client/civclient.c:298
#, c-format
msgid "Invalid port \"%s\" specified with --port option.\n"
msgstr ""
-#: client/civclient.c:299 client/civclient.c:314
+#: client/civclient.c:300 client/civclient.c:315
msgid "Try using --help.\n"
msgstr ""
-#: client/civclient.c:312
+#: client/civclient.c:313
#, c-format
msgid "Invalid debug level \"%s\" specified with --debug option.\n"
msgstr ""
-#: client/civclient.c:325
+#: client/civclient.c:326
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr ""
-#: client/civclient.c:539
+#: client/civclient.c:391
+#, fuzzy, c-format
+msgid "Updating old metaserver address \"%s\"."
+msgstr "metaserver <주소>"
+
+#: client/civclient.c:394
+#, c-format
+msgid "Default metaserver has been set to \"%s\"."
+msgstr ""
+
+#: client/civclient.c:550
msgid "Game started."
msgstr "ê²Œìž„ì´ ì‹œìž‘ë˜ì—ˆìŠµë‹ˆë‹¤"
-#: client/civclient.c:577
+#: client/civclient.c:588
msgid "There was an error while auto connecting; aborting."
msgstr "ìžë™ì—°ê²°ì¤‘ ì´ìƒì´ ë°œìƒë˜ì—ˆìŠµë‹ˆë‹¤; 중단"
-#: client/climisc.c:176
+#: client/climisc.c:177
#, c-format
msgid "Changing production of every %s into %s."
msgstr ""
-#: client/climisc.c:214
+#: client/climisc.c:215
msgid "?embassy:Both"
msgstr "서로"
-#: client/climisc.c:216
+#: client/climisc.c:217
msgid "?embassy:Yes"
msgstr "우리 있슴"
-#: client/climisc.c:219
+#: client/climisc.c:220
msgid "?embassy:With Us"
msgstr "ìƒëŒ€ 있슴"
-#: client/climisc.c:222
+#: client/climisc.c:223
msgid "?embassy:Contact"
msgstr "ì ‘ì´‰"
-#: client/climisc.c:224
+#: client/climisc.c:225
msgid "?embassy:No Contact"
msgstr "ë¯¸ì ‘ì´‰"
-#: client/climisc.c:236
+#: client/climisc.c:237
msgid "?vision:Both"
msgstr "서로"
-#: client/climisc.c:238
+#: client/climisc.c:239
msgid "?vision:To Them"
msgstr "ìƒëŒ€í•œí…Œ"
-#: client/climisc.c:241
+#: client/climisc.c:242
msgid "?vision:To Us"
msgstr "우리한테"
-#: client/climisc.c:257 client/climisc.c:264
+#: client/climisc.c:258 client/climisc.c:265
#, c-format
msgid "The %s give %s"
msgstr ""
-#: client/climisc.c:268
+#: client/climisc.c:269
#, c-format
msgid "The %s give unknown city."
msgstr ""
-#: client/climisc.c:273
+#: client/climisc.c:274
#, c-format
msgid "The %s give %d gold"
msgstr ""
-#: client/climisc.c:278
+#: client/climisc.c:279
#, c-format
msgid "The %s give their worldmap"
msgstr ""
-#: client/climisc.c:282
+#: client/climisc.c:283
#, c-format
msgid "The %s give their seamap"
msgstr ""
-#: client/climisc.c:286
+#: client/climisc.c:287
msgid "The parties agree on a cease-fire"
msgstr ""
-#: client/climisc.c:289
+#: client/climisc.c:290
msgid "The parties agree on a peace"
msgstr ""
-#: client/climisc.c:292
+#: client/climisc.c:293
msgid "The parties create an alliance"
msgstr ""
-#: client/climisc.c:295
+#: client/climisc.c:296
#, c-format
msgid "The %s give shared vision"
msgstr ""
-#: client/climisc.c:299
+#: client/climisc.c:300
#, c-format
msgid "The %s give an embassy"
msgstr ""
-#: client/climisc.c:902
+#: client/climisc.c:906
msgid "Popup Request"
msgstr ""
-#: client/climisc.c:932
+#: client/climisc.c:936
msgid "Exporting output window to civgame.log ..."
msgstr ""
-#: client/climisc.c:936
+#: client/climisc.c:940
msgid "Export complete."
msgstr ""
-#: client/climisc.c:938
+#: client/climisc.c:942
msgid "Export failed, couldn't write to file."
msgstr ""
-#: client/climisc.c:1038
+#: client/climisc.c:1042
#, c-format
msgid "You don't buy %s in %s!"
msgstr ""
-#: client/climisc.c:1056
+#: client/climisc.c:1060
#, c-format
msgid "%s costs %d gold and you only have %d gold."
msgstr ""
@@ -7357,19 +7356,19 @@ msgid ""
"%d times"
msgstr ""
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1289
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
msgid "novice"
msgstr "초보"
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1289
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1358
msgid "easy"
msgstr "쉬움"
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1290
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
msgid "normal"
msgstr "보통"
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1290
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
msgid "hard"
msgstr "ì–´ë ¤ì›€"
@@ -7398,38 +7397,41 @@ msgid "We probably couldn't start it from here."
msgstr ""
#: client/connectdlg_common.c:470
-msgid "We have control of the server (command access level hack)"
+msgid ""
+"Established control over the server. You have command access level 'hack'."
msgstr ""
#: client/connectdlg_common.c:475
-msgid "We can't take control of server, attempting to kill it."
+msgid ""
+"Failed to obtain the required access level to take control of the server. "
+"The server will now be shutdown."
msgstr ""
-#: client/control.c:1104
+#: client/control.c:1123
msgid "Only transporter units can be unloaded."
msgstr ""
-#: client/control.c:1353
+#: client/control.c:1425
msgid "Only settler units can be put into auto mode."
msgstr ""
-#: client/control.c:1444
+#: client/control.c:1516
msgid "Only nuclear units can do this."
msgstr "ì˜¤ì§ í•µ ë¶€ëŒ€ë§Œì´ ì´ê²ƒì„ í• ìˆ˜ 있습니다"
-#: client/control.c:1473
+#: client/control.c:1545
msgid "Only paratrooper units can do this."
msgstr ""
-#: client/control.c:1921
+#: client/control.c:2020
msgid "Too far for this unit."
msgstr "ì´ ë¶€ëŒ€ë¡œë¶€í„° 너무 멀리 있습니다"
-#: client/control.c:2131 client/control.c:2161 client/control.c:2177
+#: client/control.c:2230 client/control.c:2260 client/control.c:2276
msgid "Didn't find a route to the destination!"
msgstr ""
-#: client/control.c:2221
+#: client/control.c:2320
msgid "Oh my! You seem to have no capital!"
msgstr "오 세ìƒì—! ë‹¹ì‹ ì€ ìˆ˜ë„ê°€ 없어 보입니다."
@@ -7497,16 +7499,16 @@ msgid "Allows %s (with %s)."
msgstr ""
#. TRANS: preserve single space at beginning
-#: client/helpdata.c:418
+#: client/helpdata.c:416
msgid " Rivers"
msgstr ""
-#: client/helpdata.c:576
+#: client/helpdata.c:574
#, c-format
msgid "Sorry, no help topic for %s.\n"
msgstr ""
-#: client/helpdata.c:580
+#: client/helpdata.c:578
#, c-format
msgid ""
"Sorry, no help topic for %s.\n"
@@ -7514,293 +7516,293 @@ msgid ""
"\n"
msgstr ""
-#: client/helpdata.c:670
+#: client/helpdata.c:668
msgid ""
"Requires: Nothing\n"
"\n"
msgstr ""
-#: client/helpdata.c:675
+#: client/helpdata.c:673
#, c-format
msgid "* The discovery of %s will make %s obsolete.\n"
msgstr ""
-#: client/helpdata.c:694
+#: client/helpdata.c:692
#, c-format
msgid "* Allows all players with knowledge of %s to build %s units.\n"
msgstr ""
-#: client/helpdata.c:706
+#: client/helpdata.c:704
#, c-format
msgid "* Allows %s (with %s).\n"
msgstr ""
-#: client/helpdata.c:710
+#: client/helpdata.c:708
#, c-format
msgid "* Allows %s.\n"
msgstr ""
-#: client/helpdata.c:780
+#: client/helpdata.c:778
#, c-format
msgid "* Can only be built if there is %s in the city.\n"
msgstr ""
-#: client/helpdata.c:786
+#: client/helpdata.c:784
#, c-format
msgid "* Can only be built with %s as government.\n"
msgstr ""
-#: client/helpdata.c:791
+#: client/helpdata.c:789
msgid "* May not be built in cities.\n"
msgstr ""
-#: client/helpdata.c:794
+#: client/helpdata.c:792
msgid "* Never has a home city.\n"
msgstr ""
-#: client/helpdata.c:797
+#: client/helpdata.c:795
msgid "* Losing this unit will lose you the game!\n"
msgstr ""
-#: client/helpdata.c:801
+#: client/helpdata.c:799
msgid "* Each player may only have one of this type of unit.\n"
msgstr ""
-#: client/helpdata.c:805
+#: client/helpdata.c:803
#, c-format
msgid "* Requires %d population to build.\n"
msgstr ""
-#: client/helpdata.c:811
+#: client/helpdata.c:809
#, c-format
msgid "* Can carry and refuel %d air unit.\n"
msgid_plural "* Can carry and refuel %d air units.\n"
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:816
+#: client/helpdata.c:814
#, c-format
msgid "* Can carry and refuel %d missile unit.\n"
msgid_plural "* Can carry and refuel %d missile units.\n"
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:821
+#: client/helpdata.c:819
#, c-format
msgid "* Can carry %d ground unit across water.\n"
msgid_plural "* Can carry %d ground units across water.\n"
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:830
+#: client/helpdata.c:828
msgid ""
"* Can establish trade routes (must travel to target city and must be at "
"least 9 tiles [in Manhattan distance] from this unit's home city).\n"
msgstr ""
-#: client/helpdata.c:836
+#: client/helpdata.c:834
#, c-format
msgid "* Can help build wonders (adds %d production).\n"
msgstr ""
-#: client/helpdata.c:840
+#: client/helpdata.c:838
msgid "* May not be disbanded.\n"
msgstr ""
-#: client/helpdata.c:842
+#: client/helpdata.c:840
#, c-format
msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
msgstr ""
-#: client/helpdata.c:846
+#: client/helpdata.c:844
msgid "* Can build new cities.\n"
msgstr ""
-#: client/helpdata.c:849
+#: client/helpdata.c:847
#, c-format
msgid "* Can add on %d population to cities of no more than size %d.\n"
msgstr ""
-#: client/helpdata.c:858
+#: client/helpdata.c:856
msgid "* Can build roads and railroads.\n"
msgstr ""
-#: client/helpdata.c:859
+#: client/helpdata.c:857
msgid "* Can build mines on tiles.\n"
msgstr ""
-#: client/helpdata.c:860
+#: client/helpdata.c:858
msgid "* Can build irrigation on tiles.\n"
msgstr ""
-#: client/helpdata.c:865
+#: client/helpdata.c:863
msgid "* Can build farmland.\n"
msgstr ""
-#: client/helpdata.c:869
+#: client/helpdata.c:867
#, c-format
msgid "* Can build farmland (if %s is known).\n"
msgstr ""
-#: client/helpdata.c:873
+#: client/helpdata.c:871
#, c-format
msgid "* Can build farmland (if any of the following are known: %s).\n"
msgstr ""
-#: client/helpdata.c:881
+#: client/helpdata.c:879
msgid "* Can build fortresses.\n"
-msgstr "* 요새를 세울 수 있슴.\n"
+msgstr "※ 요새를 세울 수 있슴.\n"
-#: client/helpdata.c:885
+#: client/helpdata.c:883
#, c-format
msgid "* Can build fortresses (if %s is known).\n"
msgstr ""
-#: client/helpdata.c:889
+#: client/helpdata.c:887
#, c-format
msgid "* Can build fortresses (if any of the following are known: %s).\n"
msgstr ""
-#: client/helpdata.c:895
+#: client/helpdata.c:893
msgid "* Can clean pollution from tiles.\n"
msgstr ""
-#: client/helpdata.c:896
+#: client/helpdata.c:894
msgid "* Can clean nuclear fallout from tiles.\n"
msgstr ""
-#: client/helpdata.c:899
+#: client/helpdata.c:897
msgid "* Can transform tiles.\n"
-msgstr "* ì§€í˜•ì„ ê°œì¡°í• ìˆ˜ 있슴.\n"
+msgstr "※ ì§€í˜•ì„ ê°œì¡°í• ìˆ˜ 있슴.\n"
-#: client/helpdata.c:902
+#: client/helpdata.c:900
msgid "* Can build airbases.\n"
-msgstr "* 공군 기지를 세울 수 있슴.\n"
+msgstr "※ 공군 기지를 세울 수 있슴.\n"
-#: client/helpdata.c:906
+#: client/helpdata.c:904
#, c-format
msgid "* May fortify, granting a 50%% defensive bonus.\n"
msgstr ""
-#: client/helpdata.c:909
+#: client/helpdata.c:907
msgid "* May pillage to destroy infrastructure from tiles.\n"
msgstr ""
-#: client/helpdata.c:913
+#: client/helpdata.c:911
msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
msgstr ""
-#: client/helpdata.c:916
+#: client/helpdata.c:914
msgid "* Can perform diplomatic actions.\n"
msgstr ""
-#: client/helpdata.c:920
+#: client/helpdata.c:918
msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
msgstr ""
-#: client/helpdata.c:923
+#: client/helpdata.c:921
msgid "* May not be bribed.\n"
-msgstr ""
+msgstr "※ 매수시킬 수 ì—†ìŒ.\n"
-#: client/helpdata.c:926
+#: client/helpdata.c:924
msgid "* Can attack enemy air units.\n"
msgstr ""
-#: client/helpdata.c:930
+#: client/helpdata.c:928
msgid "* Is invisible except when next to an enemy unit or city.\n"
msgstr ""
-#: client/helpdata.c:934
+#: client/helpdata.c:932
msgid "* Can only attack units on ocean squares (no land attacks).\n"
msgstr ""
-#: client/helpdata.c:938
+#: client/helpdata.c:936
msgid ""
"* Can attack from aboard sea units: against enemy cities and onto land "
"squares.\n"
msgstr ""
-#: client/helpdata.c:943
+#: client/helpdata.c:941
#, c-format
msgid "* Can be paradropped from a friendly city (Range: %d).\n"
msgstr ""
-#: client/helpdata.c:949
+#: client/helpdata.c:947
msgid "* Gets double defense against units specified as 'mounted'.\n"
msgstr ""
-#: client/helpdata.c:953
+#: client/helpdata.c:951
msgid "* Counts as 'mounted' against certain defenders.\n"
msgstr ""
-#: client/helpdata.c:957
+#: client/helpdata.c:955
msgid "* A missile unit: gets used up in making an attack.\n"
msgstr ""
-#: client/helpdata.c:960
+#: client/helpdata.c:958
msgid "* Making an attack ends this unit's turn.\n"
msgstr ""
-#: client/helpdata.c:964
+#: client/helpdata.c:962
msgid "* This unit's attack causes a nuclear explosion!\n"
msgstr ""
-#: client/helpdata.c:968
+#: client/helpdata.c:966
msgid "* Gets double firepower when attacking cities.\n"
msgstr ""
-#: client/helpdata.c:971
+#: client/helpdata.c:969
msgid "* Ignores the effects of city walls.\n"
msgstr ""
-#: client/helpdata.c:975
+#: client/helpdata.c:973
#, c-format
msgid ""
"* Does bombard attacks (%d per turn). These attacks will only damage (never "
"kill) the defender, but have no risk for the attacker.\n"
msgstr ""
-#: client/helpdata.c:982
+#: client/helpdata.c:980
msgid "* Gets quintuple defense against missiles and aircraft.\n"
msgstr ""
-#: client/helpdata.c:986
+#: client/helpdata.c:984
msgid "* Ignores terrain effects (treats all squares as roads).\n"
msgstr ""
-#: client/helpdata.c:989
+#: client/helpdata.c:987
msgid "* Ignores zones of control.\n"
msgstr ""
-#: client/helpdata.c:993
+#: client/helpdata.c:991
msgid "* A non-military unit (cannot attack; no martial law).\n"
msgstr ""
-#: client/helpdata.c:997
+#: client/helpdata.c:995
msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
msgstr ""
-#: client/helpdata.c:1000
+#: client/helpdata.c:998
msgid "* Will never achieve veteran status.\n"
msgstr ""
-#: client/helpdata.c:1002
+#: client/helpdata.c:1000
msgid "* May become veteran through training or combat.\n"
msgstr ""
-#: client/helpdata.c:1008
+#: client/helpdata.c:1006
#, c-format
msgid ""
"* Must end turn in a city or next to land, or has a 50%% risk of being lost "
"at sea.\n"
msgstr ""
-#: client/helpdata.c:1012
+#: client/helpdata.c:1010
#, c-format
msgid "* The discovery of %s reduces the risk to 25%%.\n"
msgstr ""
-#: client/helpdata.c:1017
+#: client/helpdata.c:1015
#, c-format
msgid "* %s reduces the risk to 12%%.\n"
msgstr ""
@@ -7809,115 +7811,115 @@ msgstr ""
#. * last two elements
#. TRANS: List of possible output types has this between
#. * last two elements
-#: client/helpdata.c:1068 client/helpdata.c:1402
+#: client/helpdata.c:1066 client/helpdata.c:1400
msgid " or "
msgstr ""
-#: client/helpdata.c:1070 client/helpdata.c:1390
+#: client/helpdata.c:1068 client/helpdata.c:1388
msgid "?or:, "
msgstr ""
-#: client/helpdata.c:1082
+#: 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"
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:1124
+#: client/helpdata.c:1122
#, c-format
msgid "If we would now start with %s we would need %d bulbs."
msgstr ""
-#: client/helpdata.c:1129
+#: client/helpdata.c:1127
#, 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:1137
+#: client/helpdata.c:1135
msgid "You cannot research this technology."
msgstr ""
-#: client/helpdata.c:1141
+#: client/helpdata.c:1139
msgid " This number may vary depending on what other players will research.\n"
msgstr ""
-#: client/helpdata.c:1153
+#: client/helpdata.c:1151
#, c-format
msgid "* The first player to research %s gets an immediate advance.\n"
msgstr ""
-#: client/helpdata.c:1158
+#: client/helpdata.c:1156
#, c-format
msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
msgstr ""
-#: client/helpdata.c:1161
+#: client/helpdata.c:1159
#, c-format
msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
msgstr ""
-#: client/helpdata.c:1165
+#: client/helpdata.c:1163
msgid "* Increases the pollution generated by the population.\n"
msgstr ""
-#: client/helpdata.c:1170
+#: client/helpdata.c:1168
#, c-format
msgid "* Allows %s to build roads on river squares.\n"
msgstr ""
-#: client/helpdata.c:1177
+#: client/helpdata.c:1175
#, c-format
msgid "* Allows %s to build fortresses.\n"
msgstr ""
-#: client/helpdata.c:1185
+#: client/helpdata.c:1183
#, c-format
msgid "* Allows %s to build airbases.\n"
msgstr ""
-#: client/helpdata.c:1194
+#: client/helpdata.c:1192
#, c-format
msgid "* Allows %s to upgrade roads to railroads.\n"
msgstr ""
-#: client/helpdata.c:1202
+#: client/helpdata.c:1200
#, c-format
msgid "* Allows %s to upgrade irrigation to farmland.\n"
msgstr ""
-#: client/helpdata.c:1236
+#: client/helpdata.c:1234
msgid "* Pollution cannot be generated on this terrain."
msgstr ""
-#: client/helpdata.c:1241
+#: client/helpdata.c:1239
msgid "* You cannot build cities on this terrain."
msgstr ""
-#: client/helpdata.c:1247
+#: client/helpdata.c:1245
msgid "* The coastline of this terrain is unsafe."
msgstr ""
-#: client/helpdata.c:1252
+#: client/helpdata.c:1250
msgid "* This terrain is unsafe for units to travel on."
msgstr ""
-#: client/helpdata.c:1257
+#: client/helpdata.c:1255
msgid "* Land units cannot travel on oceanic terrains."
msgstr ""
-#: client/helpdata.c:1307
+#: client/helpdata.c:1305
msgid "Features:\n"
msgstr ""
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1413 client/helpdata.c:1414
+#: client/helpdata.c:1411 client/helpdata.c:1412
msgid "?outputlist: Nothing "
msgstr ""
-#: client/helpdata.c:1421
+#: client/helpdata.c:1419
#, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
@@ -7928,7 +7930,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:1431
+#: client/helpdata.c:1429
#, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -7936,48 +7938,48 @@ msgid ""
msgstr ""
#. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1439
+#: client/helpdata.c:1437
#, c-format
msgid "* You pay %d times normal %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1444
+#: client/helpdata.c:1442
#, 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:1449
+#: client/helpdata.c:1447
#, c-format
msgid "* You pay no %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1453
+#: client/helpdata.c:1451
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:1462
+#: client/helpdata.c:1460
#, 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:1470
+#: client/helpdata.c:1468
#, c-format
msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
msgstr ""
-#: client/helpdata.c:1477
+#: client/helpdata.c:1475
#, 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:1484
+#: client/helpdata.c:1482
#, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -7985,23 +7987,23 @@ msgid ""
msgstr ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1491
+#: client/helpdata.c:1489
#, 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:1499
+#: client/helpdata.c:1497
#, c-format
msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
msgstr ""
-#: client/helpdata.c:1504
+#: client/helpdata.c:1502
msgid "Has unlimited science/gold/luxuries rates.\n"
msgstr ""
-#: client/helpdata.c:1509
+#: client/helpdata.c:1507
#, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
@@ -8012,7 +8014,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:1521
+#: client/helpdata.c:1519
#, 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"
@@ -8020,60 +8022,60 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1532
+#: client/helpdata.c:1530
#, 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:1538
+#: client/helpdata.c:1536
msgid "* Your units cannot be bribed.\n"
-msgstr ""
+msgstr "※ ë‹¹ì‹ ì˜ ë¶€ëŒ€ë¥¼ 매수시킬 수 없습니다.\n"
-#: client/helpdata.c:1541
+#: client/helpdata.c:1539
msgid "* Your cities cannot be incited.\n"
msgstr ""
-#: client/helpdata.c:1545
+#: client/helpdata.c:1543
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:1551
+#: client/helpdata.c:1549
msgid "* Has a senate that may prevent declaration of war.\n"
msgstr ""
-#: client/helpdata.c:1555
+#: client/helpdata.c:1553
msgid "* Allows partisans when cities are taken by the enemy.\n"
msgstr ""
-#: client/helpdata.c:1559
+#: client/helpdata.c:1557
msgid ""
"* Buildings that normally confer bonuses against unhappiness will instead "
"give gold.\n"
msgstr ""
-#: client/helpdata.c:1563
+#: client/helpdata.c:1561
msgid "* Pays no upkeep for fanatics.\n"
msgstr ""
-#: client/helpdata.c:1566
+#: client/helpdata.c:1564
msgid "* Has no unhappy citizens.\n"
msgstr ""
-#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
+#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
#, c-format
msgid "* Veteran %s units.\n"
msgstr ""
-#: client/helpdata.c:1587
+#: client/helpdata.c:1585
msgid "* Veteran units.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1593
+#: client/helpdata.c:1591
#, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8081,7 +8083,7 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1602
+#: client/helpdata.c:1600
#, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8089,438 +8091,484 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1610
+#: client/helpdata.c:1608
#, 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:1619
+#: client/helpdata.c:1617
#, c-format
msgid "* %s production is increased %d%%.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1627
+#: client/helpdata.c:1625
#, c-format
msgid "* %s production will suffer massive waste.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1632
+#: client/helpdata.c:1630
#, c-format
msgid "* %s production will suffer some waste.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1637
+#: client/helpdata.c:1635
#, 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:1645
+#: client/helpdata.c:1643
#, 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:1651
+#: client/helpdata.c:1649
#, 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:1657
+#: client/helpdata.c:1655
#, c-format
msgid "* %s waste will increase slowly with distance from capital.\n"
msgstr ""
-#: client/helpdata.c:1674
+#: client/helpdata.c:1672
#, c-format
msgid "* Allows you to build %s.\n"
msgstr ""
#. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1701
+#: client/helpdata.c:1699
#, c-format
msgid "%s%d %s"
msgstr ""
-#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1700 client/helpdata.c:1708 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:1709
+#: client/helpdata.c:1707
#, c-format
msgid "%s%d unhappy"
-msgstr ""
+msgstr "%s%d 불만"
-#: client/mapctrl_common.c:382
+#: client/mapctrl_common.c:399
#, c-format
msgid "You don't know how to build %s!"
msgstr ""
-#: client/mapctrl_common.c:392
+#: client/mapctrl_common.c:409
#, c-format
msgid "Copy %s to clipboard."
msgstr ""
-#: client/mapctrl_common.c:408
+#: client/mapctrl_common.c:425
msgid "Clipboard is empty."
msgstr ""
-#: client/options.c:98
+#: client/options.c:102
msgid "Graphics"
msgstr "그래픽"
-#: client/options.c:99
+#: client/options.c:103
msgid "Overview"
msgstr ""
-#: client/options.c:100
+#: client/options.c:104
msgid "Sound"
msgstr "소리"
-#: client/options.c:101
+#: client/options.c:105
msgid "Interface"
msgstr "ì¸í„°íŒ¨ì´ìŠ¤"
-#: client/options.c:102
+#: client/options.c:106
msgid "Network"
msgstr "네트워í¬"
-#: client/options.c:107
+#: client/options.c:111
msgid "Login name"
msgstr "ë¡œê·¸ì¸ ì´ë¦„"
-#: client/options.c:108
+#: client/options.c:112
msgid ""
"This is the default login username that will be used in the connection "
"dialogs or with the -a command-line parameter."
msgstr ""
-#: client/options.c:113
+#: client/options.c:117
msgid "Server"
msgstr "서버"
-#: client/options.c:114
+#: client/options.c:118
msgid ""
"This is the default server hostname that will be used in the connection "
"dialogs or with the -a command-line parameter."
msgstr ""
-#: client/options.c:119
+#: client/options.c:123
msgid "Server port"
msgstr "서버 í¬íŠ¸"
-#: client/options.c:120
+#: client/options.c:124
msgid ""
"This is the default server port that will be used in the connection dialogs "
"or with the -a command-line parameter."
msgstr ""
-#: client/options.c:125 client/gui-win32/connectdlg.c:912 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
msgid "Metaserver"
msgstr "메타 서버"
-#: client/options.c:126
+#: client/options.c:130
msgid ""
"The metaserver is a host that the client contacts to find out about games on "
"the internet. Don't change this from its default value unless you know what "
"you're doing."
msgstr ""
-#: client/options.c:132
+#: client/options.c:136
msgid "Soundset"
msgstr "사운드세트"
-#: client/options.c:133
+#: client/options.c:137
msgid ""
"This is the soundset that will be used. Changing this is the same as using "
"the -S command-line parameter."
msgstr ""
-#: client/options.c:138
+#: client/options.c:142
msgid "Sound plugin"
msgstr "ìŒì„± 플러그ì¸"
-#: client/options.c:139
+#: client/options.c:143
msgid ""
"If you have a problem with sound, try changing the sound plugin. The new "
"plugin won't take effect until you restart Freeciv. Changing this is the "
"same as using the -P command-line option."
msgstr ""
-#: client/options.c:144 client/gui-sdl/gui_main.c:162
+#: client/options.c:148 client/gui-sdl/gui_main.c:162
msgid "Theme"
msgstr "테마"
-#: client/options.c:145
+#: client/options.c:149
msgid "By changing this option you change the active theme."
msgstr ""
-#: client/options.c:148
+#: client/options.c:152
msgid "Tileset"
msgstr "타ì¼ì„¸íŠ¸"
-#: client/options.c:149
+#: client/options.c:153
msgid ""
"By changing this option you change the active tileset. This is the same as "
"using the -t command-line parameter."
msgstr ""
-#: client/options.c:156
+#: client/options.c:160
msgid "Solid unit background color"
msgstr ""
-#: client/options.c:157
+#: client/options.c:161
msgid ""
"Setting this option will cause units on the map view to be drawn with a "
"solid background color instead of the flag backdrop."
msgstr ""
-#: client/options.c:161 client/gui-sdl/optiondlg.c:960
+#: client/options.c:165 client/gui-sdl/optiondlg.c:960
msgid "Sound bell at new turn"
msgstr ""
-#: client/options.c:162
+#: client/options.c:166
msgid ""
"Set this option to have a \"bell\" event be generated at the start of a new "
"turn. You can control the behavior of the \"bell\" event by editing the "
"message options."
msgstr ""
-#: client/options.c:168
+#: client/options.c:172
msgid "Unit movement animation time (milliseconds)"
msgstr ""
-#: client/options.c:169
+#: client/options.c:173
msgid ""
"This option controls how long unit \"animation\" takes when a unit moves on "
"the map view. Set it to 0 to disable animation entirely."
msgstr ""
-#: client/options.c:174
+#: client/options.c:178
msgid "Mapview recentering time (milliseconds)"
msgstr ""
-#: client/options.c:175
+#: client/options.c:179
msgid ""
"When the map view is recentered, it will slide smoothly over the map to its "
"new position. This option controls how long this slide lasts. Set it to 0 "
"to disable mapview sliding entirely."
msgstr ""
-#: client/options.c:180 client/gui-sdl/optiondlg.c:1014
+#: client/options.c:184 client/gui-sdl/optiondlg.c:1014
msgid "Show combat animation"
msgstr ""
-#: client/options.c:181
+#: client/options.c:185
msgid ""
"Disabling this option will turn off combat animation between units on the "
"mapview."
msgstr ""
-#: client/options.c:184
+#: client/options.c:188
msgid "Draw the citybar"
msgstr ""
-#: client/options.c:185
+#: client/options.c:189
msgid ""
"Setting this option will display a 'citybar' containing useful information "
"beneath each city. Disabling this option will display only the city's name "
"and optionally, production."
msgstr ""
-#: client/options.c:191
+#: client/options.c:195
msgid "Show icons in the technology tree"
msgstr ""
-#: client/options.c:192
+#: client/options.c:196
msgid ""
"Setting this option will display icons on the technology tree diagram. "
"Turning this option off makes the technology tree more compact."
msgstr ""
-#: client/options.c:197
+#: client/options.c:201
msgid "Draw shield graphics for units"
msgstr ""
-#: client/options.c:198
+#: client/options.c:202
msgid ""
"Setting this option will draw a shield icon as the flags on units. If "
"unset, the full flag will be drawn."
msgstr ""
-#: client/options.c:202
+#: client/options.c:206
msgid "Manual Turn Done in AI Mode"
msgstr ""
-#: client/options.c:203
+#: client/options.c:207
msgid ""
"Disable this option if you do not want to press the Turn Done button "
"manually when watching an AI player."
msgstr ""
-#: client/options.c:207 client/gui-sdl/optiondlg.c:1121
+#: client/options.c:211 client/gui-sdl/optiondlg.c:1121
msgid "Auto Center on Units"
msgstr ""
-#: client/options.c:208
+#: client/options.c:212
msgid ""
"Set this option to have the active unit centered automatically when the unit "
"focus changes."
msgstr ""
-#: client/options.c:211 client/gui-sdl/optiondlg.c:1147
+#: client/options.c:215 client/gui-sdl/optiondlg.c:1147
msgid "Auto Center on Combat"
msgstr ""
-#: client/options.c:212
+#: client/options.c:216
msgid ""
"Set this option to have any combat be centered automatically. Disabled this "
"will speed up the time between turns but may cause you to miss combat "
"entirely."
msgstr ""
-#: client/options.c:217 client/gui-sdl/optiondlg.c:1174
+#: client/options.c:221 client/gui-sdl/optiondlg.c:1174
msgid "Focus on Awakened Units"
msgstr ""
-#: client/options.c:218
+#: client/options.c:222
msgid "Set this option to have newly awoken units be focused automatically."
msgstr ""
-#: client/options.c:221
+#: client/options.c:225
msgid "Allow goto into the unknown"
msgstr ""
-#: client/options.c:222
+#: client/options.c:226
msgid ""
"Setting this option will make the game consider moving into unknown tiles. "
"If not, then goto routes will detour around or be blocked by unknown tiles."
msgstr ""
-#: client/options.c:226
+#: client/options.c:230
msgid "Center map when Popup city"
msgstr ""
-#: client/options.c:227
+#: client/options.c:231
msgid ""
"Setting this option makes the mapview center on a city when its city dialog "
"is popped up."
msgstr ""
-#: client/options.c:230
+#: client/options.c:234
msgid "Concise City Production"
msgstr ""
-#: client/options.c:231
+#: client/options.c:235
msgid ""
"Set this option to make the city production (as shown in the city dialog) to "
"be more compact."
msgstr ""
-#: client/options.c:234 client/gui-sdl/optiondlg.c:1252
+#: client/options.c:238 client/gui-sdl/optiondlg.c:1252
msgid "End Turn when done moving"
msgstr ""
-#: client/options.c:235
+#: client/options.c:239
msgid ""
"Setting this option makes your turn end automatically when all your units "
"are done moving."
msgstr ""
-#: client/options.c:238 client/gui-sdl/optiondlg.c:1226
+#: client/options.c:242 client/gui-sdl/optiondlg.c:1226
msgid "Prompt for city names"
msgstr ""
-#: client/options.c:239
+#: client/options.c:243
msgid ""
"Disabling this option will make the names of newly founded cities chosen "
"automatically by the server."
msgstr ""
-#: client/options.c:242 client/gui-sdl/optiondlg.c:1200
+#: client/options.c:246 client/gui-sdl/optiondlg.c:1200
msgid "Pop up city dialog for new cities"
msgstr ""
-#: client/options.c:243
+#: client/options.c:247
msgid ""
"Setting this option will pop up a newly-founded city's city dialog "
"automatically."
msgstr ""
-#: client/options.c:248
+#: client/options.c:250
+msgid "Pop up caravan actions"
+msgstr ""
+
+#: client/options.c:251
+msgid ""
+"If this option is enabled, when caravans arrive at a city where they can "
+"establish a traderoute or help build a wonder, a window will popup asking "
+"which action should be performed. Disabling this option means you will have "
+"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 ""
+
+#: client/options.c:260
+msgid "Enable cursor changing"
+msgstr ""
+
+#: client/options.c:261
+msgid ""
+"This option controls whether the client should try to change the mouse "
+"cursor depending on what is being pointed at, as well as to indicate changes "
+"in the client or server state."
+msgstr ""
+
+#: client/options.c:266
+msgid "Select cities before units"
+msgstr ""
+
+#: 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 ""
+
+#: client/options.c:272
+msgid "Clear unit orders on selection"
+msgstr ""
+
+#: client/options.c:273
+msgid ""
+"Enabling this option will cause unit orders to be cleared whenever one or "
+"more units are selected. If this option is disabled, selecting units will "
+"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 ""
+
+#: client/options.c:282
msgid "Background layer"
msgstr ""
-#: client/options.c:249
+#: client/options.c:283
msgid "The background layer of the overview shows just ocean and land."
msgstr ""
-#: client/options.c:252
+#: client/options.c:286
msgid "Terrain relief map layer"
msgstr ""
-#: client/options.c:253
+#: client/options.c:287
msgid "The relief layer shows all terrains on the map."
msgstr ""
-#: client/options.c:256
+#: client/options.c:290
msgid "Borders layer"
msgstr "êµê²½ 층"
-#: client/options.c:257
+#: client/options.c:291
msgid ""
"The borders layer of the overview shows which tiles are owned by each player."
msgstr ""
-#: client/options.c:261
+#: client/options.c:295
msgid "Units layer"
msgstr "부대 층"
-#: client/options.c:262
+#: client/options.c:296
msgid "Enabling this will draw units on the overview."
msgstr ""
-#: client/options.c:265
+#: client/options.c:299
msgid "Cities layer"
msgstr "ë„ì‹œ 층"
-#: client/options.c:266
+#: client/options.c:300
msgid "Enabling this will draw cities on the overview."
msgstr ""
-#: client/options.c:269
+#: client/options.c:303
msgid "Overview fog of war"
msgstr ""
-#: client/options.c:270
+#: client/options.c:304
msgid "Enabling this will show fog of war on the overview."
msgstr ""
-#: client/options.c:488
+#: client/options.c:526
msgid "If you add a preset by hand, also update \"number_of_presets\""
msgstr ""
-#: client/options.c:516
+#: client/options.c:554
msgid "Cannot find your home directory"
msgstr ""
-#: client/options.c:665 client/options.c:796
+#: client/options.c:703 client/options.c:834
msgid "Save failed, cannot find a filename."
msgstr ""
-#: client/options.c:678 client/options.c:859
+#: client/options.c:716 client/options.c:897
#, c-format
msgid "Save failed, cannot write to file %s"
msgstr ""
-#: client/options.c:680 client/options.c:862
+#: client/options.c:718 client/options.c:900
#, c-format
msgid "Saved settings to file %s"
msgstr ""
@@ -8544,16 +8592,16 @@ msgstr ""
msgid "Start of turn %d"
msgstr ""
-#: client/packhand.c:1590
+#: client/packhand.c:1591
#, c-format
msgid "AI Mode is now %s."
msgstr ""
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "ON"
msgstr ""
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "OFF"
msgstr ""
@@ -8585,14 +8633,15 @@ msgid "Username"
msgstr "사용ìžëª…"
#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
-#: client/gui-gtk-2.0/pages.c:2085
+#: client/gui-gtk-2.0/pages.c:2157
msgid "Flag"
msgstr "êµê¸°"
#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
-#: client/gui-gtk-2.0/pages.c:1536 client/gui-gtk-2.0/pages.c:2087
-#: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
-#: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
+#: 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/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr "민족"
@@ -8604,7 +8653,7 @@ msgstr "êµê²½"
msgid "Score"
msgstr "ë“ì "
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
msgid "Team"
msgstr "팀"
@@ -8675,277 +8724,299 @@ msgstr ""
msgid "Could not open temp file."
msgstr ""
-#: client/servers.c:407
+#: client/servers.c:410
msgid "Invalid $http_proxy or metaserver value, must start with 'http://'"
msgstr ""
-#: client/servers.c:413
+#: client/servers.c:416
msgid "Failed looking up metaserver's host"
msgstr ""
-#: client/text.c:85 client/text.c:86 client/text.c:91
+#. TRANS: "AI <player name>"
+#: client/text.c:94
+#, c-format
+msgid "AI %s"
+msgstr ""
+
+#. TRANS: "<nation adjective>, team <team name>"
+#: client/text.c:118
+#, c-format
+msgid "%s, team %s"
+msgstr "%s, %s팀"
+
+#: client/text.c:135 client/text.c:136 client/text.c:141
#: client/gui-sdl/mapview.c:752
msgid "?nation:Neutral"
msgstr ""
-#: client/text.c:85 client/gui-sdl/mapview.c:752
+#: client/text.c:135 client/gui-sdl/mapview.c:752
msgid "?nation:Hostile"
msgstr ""
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Peaceful"
msgstr ""
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Friendly"
msgstr ""
-#: client/text.c:88 client/gui-sdl/mapview.c:755
+#: client/text.c:138 client/gui-sdl/mapview.c:755
msgid "?nation:Mysterious"
msgstr ""
-#: client/text.c:88
+#: client/text.c:138
msgid "?nation:Friendly(team)"
msgstr ""
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
msgid "?city:Neutral"
msgstr ""
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
msgid "?city:Hostile"
msgstr ""
-#: client/text.c:92 client/gui-sdl/mapview.c:786
+#: client/text.c:142 client/gui-sdl/mapview.c:786
msgid "?city:Peaceful"
msgstr ""
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Friendly"
msgstr ""
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Mysterious"
msgstr ""
-#: client/text.c:93
+#: client/text.c:143
msgid "?city:Friendly(team)"
msgstr ""
-#: client/text.c:100
+#: client/text.c:151
#, c-format
msgid "Location: (%d, %d) [%d]"
msgstr ""
-#: client/text.c:109
+#: client/text.c:153
+#, c-format
+msgid "Native coordinates: (%d, %d)"
+msgstr ""
+
+#: client/text.c:160
#, c-format
msgid "Terrain: %s"
msgstr "지형: %s"
-#: client/text.c:110
+#: client/text.c:161
#, c-format
msgid "Food/Prod/Trade: %s"
msgstr "ì‹ëŸ‰/ìƒì‚°/무ì—: %s"
-#: client/text.c:113
+#: client/text.c:164
msgid "Minor Tribe Village"
msgstr ""
-#: client/text.c:119
+#: client/text.c:173
msgid "Our territory"
msgstr "우리 땅"
-#. TRANS: "Polish territory"
-#: client/text.c:122
+#. TRANS: "Territory of <username> (<nation + team>)"
+#: client/text.c:176
#, c-format
-msgid "%s territory"
-msgstr "%sì˜ ë•…"
+msgid "Territory of %s (%s)"
+msgstr "%sì˜ ë•… (%s)"
-#. TRANS: "Polish territory (5 turn cease-fire)"
-#: client/text.c:131
+#: client/text.c:186
#, c-format
-msgid "%s territory (%d turn cease-fire)"
-msgid_plural "%s territory (%d turn cease-fire)"
+msgid "Territory of %s (%s) (%d turn cease-fire)"
+msgid_plural "Territory of %s (%s) (%d turn cease-fire)"
msgstr[0] ""
msgstr[1] ""
-#. TRANS: "Polish territory (friendly)"
-#: client/text.c:140
+#. TRANS: "Territory of <username>
+#. * (<nation + team> | <diplomatic state>)"
+#: client/text.c:195
#, c-format
-msgid "%s territory (%s)"
-msgstr "%sì˜ ë•… (%s)"
+msgid "Territory of %s (%s | %s)"
+msgstr "%sì˜ ë•… (%s | %s)"
-#: client/text.c:145
+#: client/text.c:200
msgid "Unclaimed territory"
msgstr ""
-#. TRANS: "City: Warsaw (Polish)"
-#: client/text.c:156
+#. TRANS: "City: <city name> | <username> (<nation + team>)"
+#: client/text.c:214
#, c-format
-msgid "City: %s (%s)"
-msgstr "ë„ì‹œ: %s (%s)"
+msgid "City: %s | %s (%s)"
+msgstr "ë„ì‹œ: %s | %s (%s)"
-#. TRANS: "City: Warsaw (Polish, 5 turn cease-fire)"
-#: client/text.c:166
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <number> turn cease-fire)"
+#: client/text.c:224
#, c-format
-msgid "City: %s (%s, %d turn cease-fire)"
-msgid_plural "City: %s (%s, %d turn cease-fire)"
-msgstr[0] ""
-msgstr[1] ""
+msgid "City: %s | %s (%s, %d turn cease-fire)"
+msgid_plural "City: %s | %s (%s, %d turn cease-fire)"
+msgstr[0] "ë„ì‹œ: %s | %s (%s, ì •ì „ %dí„´)"
+msgstr[1] "ë„ì‹œ: %s | %s (%s, ì •ì „ %dí„´)"
-#. TRANS: "City: Warsaw (Polish,friendly)"
-#: client/text.c:174
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <diplomatic state>)"
+#: client/text.c:231
#, c-format
-msgid "City: %s (%s, %s)"
-msgstr "ë„ì‹œ: %s (%s, %s)"
+msgid "City: %s | %s (%s, %s)"
+msgstr "ë„ì‹œ: %s | %s (%s, %s)"
#. TRANS: previous lines gave other information about the city.
-#: client/text.c:189
+#: client/text.c:246
#, c-format
msgid "?clistbegin: with %s"
msgstr "?clistbegin:, %s"
#. TRANS: "Trade from Warsaw: 5"
-#: client/text.c:202
+#: client/text.c:259
#, c-format
msgid "Trade from %s: %d"
msgstr ""
-#: client/text.c:210
+#: client/text.c:267
#, c-format
msgid "Infrastructure: %s"
msgstr ""
-#: client/text.c:215
+#: client/text.c:272
#, c-format
msgid "Activity: %s"
msgstr ""
-#. TRANS: "Unit: Musketeers (Polish, Warsaw)"
-#. TRANS: "Unit: Musketeers (Polish,friendly)"
-#: client/text.c:226 client/text.c:253
+#. TRANS: "Unit: <unit type> | <username>
+#. * (<nation + team>, <homecity>)"
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <diplomatic state>)"
+#: client/text.c:287 client/text.c:313
#, c-format
-msgid "Unit: %s (%s, %s)"
-msgstr "부대: %s (%s, %s)"
+msgid "Unit: %s | %s (%s, %s)"
+msgstr "부대: %s | %s (%s, %s)"
-#. TRANS: "Unit: Musketeers (Polish)"
-#: client/text.c:232
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>)"
+#: client/text.c:292
#, c-format
-msgid "Unit: %s (%s)"
-msgstr "부대: %s (%s)"
+msgid "Unit: %s | %s (%s)"
+msgstr "부대: %s | %s (%s)"
-#. TRANS: "Unit: Musketeers (Polish, 5 turn cease-fire)"
-#: client/text.c:245
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <number> turn cease-fire)"
+#: client/text.c:305
#, c-format
-msgid "Unit: %s (%s, %d turn cease-fire)"
-msgid_plural "Unit: %s (%s, %d turn cease-fire)"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Unit: %s | %s (%s, %d turn cease-fire)"
+msgid_plural "Unit: %s | %s (%s, %d turn cease-fire)"
+msgstr[0] "부대: %s | %s (%s, ì •ì „ %dí„´)"
+msgstr[1] "부대: %s | %s (%s, ì •ì „ %dí„´)"
#. TRANS: "Chance to win: A:95% D:46%"
-#: client/text.c:279
+#: client/text.c:338
#, c-format
msgid "Chance to win: A:%d%% D:%d%%"
msgstr ""
#. TRANS: A is attack power, D is defense power, FP is firepower,
#. * HP is hitpoints (current and max).
-#: client/text.c:286
+#: client/text.c:345
#, c-format
msgid "A:%d D:%d FP:%d HP:%d/%d (%s)"
msgstr "ê³µ:%d ë°©:%d í™”:%d ì²´:%d/%d (%s)"
#. TRANS: "5 more" units on this tile
-#: client/text.c:295
+#: client/text.c:354
#, c-format
msgid " (%d more)"
msgstr ""
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:364
+#: client/text.c:423
#, c-format
msgid "far from %s"
msgstr " %s 로 부터 멀리 있습니다"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:367
+#: client/text.c:426
#, c-format
msgid "near %s"
msgstr "%s ë¡œ 부터 ê°€ê¹ìŠµë‹ˆë‹¤"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:370
+#: client/text.c:429
#, c-format
msgid "in %s"
msgstr "%s체재"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:403
+#: client/text.c:462
#, c-format
msgid "from %s"
msgstr "%sì¶œì‹ "
-#: client/text.c:466
+#: client/text.c:525
msgid "Progress: no research"
msgstr "진보: 연구 안 함"
-#: client/text.c:470
+#: client/text.c:529
msgid "Progress: no research target"
msgstr "진보: 연구 목ì ì—†ìŒ"
-#: client/text.c:475
+#: client/text.c:534
#, c-format
msgid "Progress: %d turn/advance"
msgid_plural "Progress: %d turns/advance"
msgstr[0] "진보: 매진보당 %d턴"
msgstr[1] "진보: 매진보당 %d턴"
-#: client/text.c:480
+#: client/text.c:539
#, c-format
msgid "%d bulb/turn"
msgid_plural "%d bulbs/turn"
msgstr[0] "매턴당 %dì „êµ¬"
msgstr[1] "매턴당 %dì „êµ¬"
-#: client/text.c:485
+#: client/text.c:544
#, c-format
msgid ", %d bulb/turn from team"
msgid_plural ", %d bulbs/turn from team"
msgstr[0] ", 팀ì—ì„œ 매턴당 %dì „êµ¬"
msgstr[1] ", 팀ì—ì„œ 매턴당 %dì „êµ¬"
-#: client/text.c:512
+#: client/text.c:571
#, c-format
msgid "%d/- (never)"
msgstr "%d/- (진보 ì—†ìŒ)"
-#: client/text.c:524
+#: client/text.c:583
#, c-format
msgid "%d/%d (%d turn)"
msgid_plural "%d/%d (%d turns)"
msgstr[0] "%d/%d (%d í„´)"
msgstr[1] "%d/%d (%d í„´)"
-#: client/text.c:527
+#: client/text.c:586
#, c-format
msgid "%d/%d (never)"
msgstr "%d/%d (진보 ì—†ìŒ)"
-#: client/text.c:564
+#: client/text.c:623
#, c-format
msgid "%d step"
msgid_plural "%d steps"
msgstr[0] "%d 단계"
msgstr[1] "%d 단계"
-#: client/text.c:566
+#: client/text.c:625
#, c-format
msgid "%d bulb"
msgid_plural "%d bulbs"
msgstr[0] "%d ì „êµ¬"
msgstr[1] "%d ì „êµ¬"
-#: client/text.c:570 client/agents/cma_fec.c:269 client/agents/cma_fec.c:313
+#: 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
#, c-format
msgid "%d turn"
@@ -8953,88 +9024,88 @@ msgid_plural "%d turns"
msgstr[0] "%d í„´"
msgstr[1] "%d í„´"
-#: client/text.c:592
+#: client/text.c:651
#, c-format
msgid "Population: %s"
msgstr "ì¸êµ¬: %s"
-#: client/text.c:595
+#: client/text.c:654
#, c-format
msgid "Year: %s (T%d)"
msgstr "서기: %s (%d 턴)"
-#: client/text.c:598
+#: client/text.c:657
#, c-format
msgid "Gold: %d (%+d)"
msgstr "금화: %d (%+d)"
-#: client/text.c:600
+#: client/text.c:659
#, c-format
msgid "Tax: %d Lux: %d Sci: %d"
msgstr "세금: %d 복지: %d 과학: %d"
-#: client/text.c:607
+#: client/text.c:666
msgid "Moving: Nobody"
msgstr "활ë™ì¤‘: ì—†ìŒ"
-#: client/text.c:609
+#: client/text.c:668
#, c-format
msgid "Moving: %s"
msgstr "활ë™ì¤‘: %s"
-#: client/text.c:613
+#: client/text.c:672
msgid "(Click for more info)"
msgstr "(ë” ë§Žì€ ì •ë³´ëŠ” 여기 í´ë¦)"
-#: client/text.c:629
+#: client/text.c:688
#, c-format
msgid "%s People"
msgstr "ì¸êµ¬: %s"
-#: client/text.c:633
+#: client/text.c:692
#, c-format
msgid "Turn: %d"
msgstr "í„´: %d"
-#: client/text.c:635 client/gui-win32/inteldlg.c:111
+#: client/text.c:694 client/gui-win32/inteldlg.c:111
#: client/gui-xaw/inteldlg.c:208
#, c-format
msgid "Gold: %d"
msgstr "금화: %d"
-#: client/text.c:636
+#: client/text.c:695
#, c-format
msgid "Net Income: %d"
msgstr "수지: %d"
#. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:639
+#: client/text.c:698
#, c-format
msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
msgstr "세율: 금화:%d%% 복지:%d%% 과학:%d%%"
-#: client/text.c:643
+#: client/text.c:702
#, c-format
msgid "Researching %s: %s"
msgstr "연구중 %s: %s"
-#: client/text.c:650
+#: client/text.c:709
#, c-format
msgid "Global warming chance: %d%% (%+d%%/turn)"
msgstr "지구 온난화 위험: %d%% (%+d%%/턴)"
-#: client/text.c:653
+#: client/text.c:712
#, c-format
msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
msgstr "핵 겨울 위험: %d%% (%+d%%/턴)"
-#: client/text.c:658 client/gui-win32/inteldlg.c:104
+#: client/text.c:717 client/gui-win32/inteldlg.c:104
#: client/gui-xaw/inteldlg.c:200
#, c-format
msgid "Government: %s"
msgstr "ì •ë¶€ ì œë„: %s"
-#: client/text.c:682
+#: client/text.c:741
#, c-format
msgid "%d unit"
msgid_plural "%d units"
@@ -9042,55 +9113,55 @@ msgstr[0] "%d 부대"
msgstr[1] "%d 부대"
#. TRANS: Impossible to reach goto target tile
-#: client/text.c:715 client/gui-sdl/mapview.c:566
+#: client/text.c:774 client/gui-sdl/mapview.c:566
msgid "?goto:Unreachable"
msgstr ""
-#: client/text.c:717 client/gui-sdl/mapview.c:568
+#: client/text.c:776 client/gui-sdl/mapview.c:568
#, c-format
msgid "Turns to target: %d"
msgstr ""
-#: client/text.c:719 client/gui-sdl/mapview.c:570
+#: client/text.c:778 client/gui-sdl/mapview.c:570
#, c-format
msgid "Turns to target: %d to %d"
msgstr ""
-#: client/text.c:725 client/gui-sdl/mapview.c:576
+#: client/text.c:784 client/gui-sdl/mapview.c:576
#, c-format
msgid "%d unit selected"
msgid_plural "%d units selected"
msgstr[0] "%d부대 ì„ íƒë¨"
msgstr[1] "%d부대 ì„ íƒë¨"
-#: client/text.c:730 client/gui-sdl/mapview.c:581
+#: client/text.c:789 client/gui-sdl/mapview.c:581
msgid "No units selected."
msgstr "ì„ íƒëœ 부대 ì—†ìŒ"
-#: client/text.c:804 client/gui-sdl/mapview.c:654
+#: client/text.c:863 client/gui-sdl/mapview.c:654
#, c-format
msgid "Others: %d civil; %d military"
msgstr ""
-#: client/text.c:806 client/gui-sdl/mapview.c:656
+#: client/text.c:865 client/gui-sdl/mapview.c:656
#, c-format
msgid "Others: %d civilian"
msgstr ""
-#: client/text.c:808 client/gui-sdl/mapview.c:658
+#: client/text.c:867 client/gui-sdl/mapview.c:658
#, c-format
msgid "Others: %d military"
msgstr ""
-#: client/text.c:839
+#: client/text.c:898
msgid "No units to upgrade!"
-msgstr "ì—…ê·¸ë ˆì´ë“œ í• ìˆ˜ 있는 부대가 없습니다"
+msgstr "ì—…ê·¸ë ˆì´ë“œ í• ìˆ˜ 있는 부대가 없습니다!"
-#: client/text.c:864
+#: client/text.c:923
msgid "None of these units may be upgraded."
-msgstr ""
+msgstr "ì´ ë¶€ëŒ€ë¥¼ ì—…ê·¸ë ˆì´ë“œ í• ìˆ˜ 없습니다!"
-#: client/text.c:870
+#: client/text.c:929
#, c-format
msgid ""
"Upgrade %d unit for %d gold?\n"
@@ -9099,74 +9170,78 @@ msgid_plural ""
"Upgrade %d units for %d gold?\n"
"Treasury contains %d gold."
msgstr[0] ""
+"%d부대를 %dì˜ ê¸ˆìœ¼ë¡œ ì—…ê·¸ë ˆì´ë“œ í•˜ì‹œê² ìŠµë‹ˆê¹Œ?\n"
+"%dì˜ ê¸ˆì„ ìžê¸ˆìœ¼ë¡œ ê°–ê³ ìžˆìŠµë‹ˆë‹¤."
msgstr[1] ""
+"%d부대를 %dì˜ ê¸ˆìœ¼ë¡œ ì—…ê·¸ë ˆì´ë“œ í•˜ì‹œê² ìŠµë‹ˆê¹Œ?\n"
+"%dì˜ ê¸ˆì„ ìžê¸ˆìœ¼ë¡œ ê°–ê³ ìžˆìŠµë‹ˆë‹¤."
-#: client/text.c:891
+#: client/text.c:950
msgid "Shows your progress in researching the current technology."
msgstr ""
-#: client/text.c:897
+#: client/text.c:956
msgid "no research target."
msgstr "연구대ìƒì´ ì—†ìŒ"
#. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:900
+#: client/text.c:959
#, c-format
msgid "%s: %d/%d."
msgstr "%s: %d/%d."
-#: client/text.c:920
+#: client/text.c:979
msgid "Shows the progress of global warming:"
msgstr ""
-#: client/text.c:921
+#: client/text.c:980
#, c-format
msgid "Pollution rate: %d%%"
msgstr "ì˜¤ì—¼ë„ : %d%%"
-#: client/text.c:923
+#: client/text.c:982
#, c-format
msgid "Chance of catastrophic warming each turn: %d%%"
msgstr ""
-#: client/text.c:939
+#: client/text.c:998
msgid "Shows the progress of nuclear winter:"
msgstr ""
-#: client/text.c:940
+#: client/text.c:999
#, c-format
msgid "Fallout rate: %d%%"
msgstr ""
-#: client/text.c:942
+#: client/text.c:1001
#, c-format
msgid "Chance of catastrophic winter each turn: %d%%"
msgstr ""
-#: client/text.c:957
+#: client/text.c:1016
msgid "Shows your current government:"
msgstr "ë‹¹ì‹ ì˜ í˜„ìž¬ì •ë¶€ ë³´ì´ê¸°"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:981
+#: client/text.c:1040
#, c-format
msgid "Population: %5d"
msgstr "ì¸êµ¬ : %5d"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:1043
#, c-format
msgid "Support: %5d %%"
msgstr "ì§€ì› : %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:1047
#, c-format
msgid "Energy: %5d %%"
msgstr "ì—너지 : %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:992
+#: client/text.c:1051
#, c-format
msgid "Mass: %5d ton"
msgid_plural "Mass: %5d tons"
@@ -9174,96 +9249,97 @@ msgstr[0] "질량 : %5d 톤"
msgstr[1] "질량 : %5d 톤"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1057
#, c-format
msgid "Travel time: %5.1f years"
msgstr "여행 시간 : %5.1f 년"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1061
msgid "Travel time: N/A "
msgstr "여행 시간 : N/A "
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1065
#, c-format
msgid "Success prob.: %5d %%"
msgstr "성공 율 : %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1010
+#: client/text.c:1069
#, c-format
msgid "Year of arrival: %8s"
msgstr "ë„ì°© í• ë•Œ : %8s"
-#: client/text.c:1030
+#: client/text.c:1089
msgid "?timeout:off"
msgstr "꺼ì§"
-#: client/text.c:1054
+#: client/text.c:1113
#, c-format
msgid "?seconds:%02ds"
msgstr "%02dì´ˆ"
-#: client/text.c:1056
+#: client/text.c:1115
#, c-format
msgid "?mins/secs:%02dm %02ds"
msgstr "%02d분 %02d초"
-#: client/text.c:1058
+#: client/text.c:1117
#, c-format
msgid "?hrs/mns:%02dh %02dm"
msgstr "%02d시간 %02d분"
-#: client/text.c:1060
+#: client/text.c:1119
#, c-format
msgid "?dys/hrs:%02dd %02dh"
msgstr "%02dì¼ %02d시간"
-#: client/text.c:1063
+#: client/text.c:1122
msgid "?duration:overflow"
msgstr ""
-#: client/text.c:1084
+#: client/text.c:1143
#, c-format
msgid "%6d.%02d ms"
msgstr "%6d.%02d ms"
-#. TRANS: "Republic of the Poles"
-#: client/text.c:1127
+#. TRANS: <nation adjective> <government name>.
+#. * E.g. "Polish Republic".
+#: client/text.c:1188
#, c-format
-msgid "%s of the %s"
-msgstr "%2$sì˜ %1$sêµê°€"
+msgid "?nationgovernment:%s %s"
+msgstr "%sì˜ %s êµê°€"
#. TRANS: "Observer: 1985"
-#: client/text.c:1137
+#: client/text.c:1198
#, c-format
msgid "Observer: %s"
msgstr "관찰ìž: %s"
-#: client/text.c:1155
+#: client/text.c:1216
msgid "Buildings: "
msgstr "건물: "
-#: client/text.c:1172 client/text.c:1211
+#: client/text.c:1233 client/text.c:1272
msgid "None. "
msgstr "ì—†ìŒ."
-#: client/text.c:1174 client/text.c:1213
+#: client/text.c:1235 client/text.c:1274
msgid "?clistend:."
msgstr "."
-#: client/text.c:1192
+#: client/text.c:1253
msgid "Wonders: "
msgstr "불가사ì˜: "
-#: client/text.c:1247
+#: client/text.c:1308
#, c-format
msgid "Cities: %d total, %d over threshold of %d cities."
msgstr ""
#. TRANS: 0-21 content [citizen(s)] ...
-#: client/text.c:1251
+#: client/text.c:1312
#, c-format
msgid "%d content before penalty."
msgid_plural "%d content before penalty."
@@ -9271,45 +9347,40 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1257
+#: client/text.c:1318
#, c-format
msgid "%d additional unhappy citizen."
msgid_plural "%d additional unhappy citizens."
msgstr[0] ""
msgstr[1] ""
-#. TRANS: Martial law opening parenthesis
-#: client/text.c:1279
-msgid "Martial law in effect ("
+#: client/text.c:1339
+msgid "Unlimited martial law in effect."
msgstr ""
-#. TRANS: no [unit] maximum
-#: client/text.c:1284
-msgid "no maximum, "
-msgstr "최대 ì œí•œ ì—†ìŒ, "
-
-#: client/text.c:1287
+#: client/text.c:1341
#, c-format
-msgid "%d unit maximum, "
-msgid_plural "%d units maximum, "
-msgstr[0] "최대 부대수 %d, "
-msgstr[1] "최대 부대수 %d, "
+msgid "%d military unit may impose martial law."
+msgid_plural "Up to %d military units may impose martial law."
+msgstr[0] ""
+msgstr[1] ""
-#. TRANS: Martial law closing parenthesis
-#: client/text.c:1294
+#: client/text.c:1345
#, c-format
-msgid "%d per unit). "
-msgstr "한 부대당 %d)."
+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:1298
+#: client/text.c:1352
msgid "Military units in the field may cause unhappiness. "
msgstr "í‰ì§€ìƒì—ì„œ êµ° 부대는 ë¶ˆí–‰ì„ ì•¼ê¸°í• ìˆ˜ 있습니다."
-#: client/text.c:1301
+#: client/text.c:1355
msgid "Military units have no happiness effect. "
msgstr ""
-#: client/text.c:1316
+#: client/text.c:1370
#, c-format
msgid "Luxury: %d total."
msgstr "복지: ì´ì•¡ %d."
@@ -9329,7 +9400,7 @@ msgid ""
"instead."
msgstr ""
-#: client/tilespec.c:3968
+#: client/tilespec.c:3966
#, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
@@ -9350,12 +9421,12 @@ msgid ""
"have a look."
msgstr ""
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
-#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:599
+#: client/gui-gtk-2.0/cityrep.c:624 client/gui-sdl/citydlg.c:2009
msgid "none"
msgstr "ì—†ìŒ"
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:645
msgid "custom"
msgstr "관습"
@@ -9398,12 +9469,12 @@ msgstr ""
#: client/gui-gtk-2.0/diplomat_dialog.c:85 client/gui-win32/dialogs.c:1363
msgid "Ooops..."
-msgstr "ì›ìŠ¤..."
+msgstr "ì•„ì´êµ¬..."
#: client/gui-gtk-2.0/diplomat_dialog.c:86 client/gui-win32/dialogs.c:1364
#: client/gui-xaw/diplomat_dialog.c:110
msgid "This unit cannot be bribed!"
-msgstr "ì´ ë¶€ëŒ€ëŠ” ë‡Œë¬¼ì„ ë°›ì„수 없습니다"
+msgstr "ì´ ë¶€ëŒ€ë¥¼ ë§¤ìˆ˜í• ìˆ˜ 없습니다!"
#: client/gui-gtk-2.0/diplomat_dialog.c:93
#: client/gui-sdl/diplomat_dialog.c:1395 client/gui-win32/dialogs.c:1368
@@ -9413,6 +9484,8 @@ msgid ""
"Bribe unit for %d gold?\n"
"Treasury contains %d gold."
msgstr ""
+"ì´ ë¶€ëŒ€ë¥¼ %d금으로 ë§¤ìˆ˜í•˜ì‹œê² ìŠµë‹ˆê¹Œ?\n"
+"%dì˜ ê¸ˆì„ ìžê¸ˆìœ¼ë¡œ ê°–ê³ ìžˆìŠµë‹ˆë‹¤."
#: client/gui-gtk-2.0/diplomat_dialog.c:95
#: client/gui-sdl/diplomat_dialog.c:701 client/gui-sdl/diplomat_dialog.c:1377
@@ -9428,6 +9501,8 @@ msgid ""
"Bribing the unit costs %d gold.\n"
"Treasury contains %d gold."
msgstr ""
+"ì´ ë¶€ëŒ€ë¥¼ 매수 í•˜ë ¤ë©´ %dì˜ ê¸ˆì„ ì†Œë¹„í•©ë‹ˆë‹¤.\n"
+"%dì˜ ê¸ˆì„ ìžê¸ˆìœ¼ë¡œ ê°–ê³ ìžˆìŠµë‹ˆë‹¤."
#: client/gui-gtk-2.0/diplomat_dialog.c:103
#: client/gui-gtk-2.0/diplomat_dialog.c:560
@@ -9644,7 +9719,7 @@ msgstr "무ì—경로 확립"
msgid "Enter Marketplace"
msgstr "시장 들어가기"
-#: client/gui-gtk-2.0/chatline.c:144 client/gui-win32/chatline.c:134
+#: client/gui-gtk-2.0/chatline.c:218 client/gui-win32/chatline.c:134
#: client/gui-xaw/chatline.c:120
msgid "Cleared output window."
msgstr ""
@@ -9725,11 +9800,11 @@ msgid "%d/%d %d turns"
msgstr "%d/%d %d í„´"
#: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:821
+#: client/gui-gtk-2.0/cityrep.c:1027
msgid "_Buy"
msgstr "구메(_B)"
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:869
msgid "_Production"
msgstr "ìƒì‚°(_P)"
@@ -9750,12 +9825,12 @@ msgid "Entertainers"
msgstr "예능ì¸"
#: client/gui-gtk-2.0/citydlg.c:1029 client/gui-win32/citydlg.c:1989
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2403
msgid "Scientists"
msgstr "과학ìž"
#: client/gui-gtk-2.0/citydlg.c:1030 client/gui-win32/citydlg.c:1991
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2404
msgid "Taxmen"
msgstr "징세ìž"
@@ -9848,7 +9923,7 @@ msgstr "%d부대 ì›ì¡°ë¨"
msgid "Present units %d"
msgstr "%d부대 있슴"
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:1019
msgid "Cen_ter"
msgstr ""
@@ -9885,7 +9960,7 @@ msgstr "부대를 요새화시킴(_F)"
#: client/gui-gtk-2.0/citydlg.c:2101 client/gui-win32/citydlg.c:1520
msgid "Make new _homecity"
-msgstr ""
+msgstr "홈 ë„시로 하기(_H)"
#: client/gui-gtk-2.0/citydlg.c:2108
msgid "U_pgrade unit"
@@ -9898,6 +9973,8 @@ msgid ""
"Buy %s for %d gold?\n"
"Treasury contains %d gold."
msgstr ""
+"%s(ì„)를 %dì˜ ê¸ˆìœ¼ë¡œ ì‚¬ì‹œê² ìŠµë‹ˆê¹Œ?\n"
+"%dì˜ ê¸ˆì„ ìžê¸ˆìœ¼ë¡œ ê°–ê³ ìžˆìŠµë‹ˆë‹¤."
#: client/gui-gtk-2.0/citydlg.c:2429 client/gui-gtk-2.0/citydlg.c:2441
#: client/gui-win32/citydlg.c:906 client/gui-win32/citydlg.c:915
@@ -9912,12 +9989,14 @@ msgid ""
"%s costs %d gold.\n"
"Treasury contains %d gold."
msgstr ""
+"%s(ì€)는 %dì˜ ê¸ˆì„ ì†Œë¹„í•©ë‹ˆë‹¤.\n"
+"%dì˜ ê¸ˆì„ ìžê¸ˆìœ¼ë¡œ ê°–ê³ ìžˆìŠµë‹ˆë‹¤."
#: client/gui-gtk-2.0/citydlg.c:2491 client/gui-sdl/citydlg.c:1406
#: client/gui-win32/citydlg.c:957 client/gui-xaw/citydlg.c:2301
#, c-format
msgid "Sell %s for %d gold?"
-msgstr ""
+msgstr "%s(ì„)를 %dì˜ ê¸ˆìœ¼ë¡œ íŒ”ê² ìŠµë‹ˆê¹Œ?"
#: client/gui-gtk-2.0/citydlg.c:2496 client/gui-win32/citydlg.c:962
#: data/Freeciv.in:2239
@@ -9931,33 +10010,57 @@ msgstr "ë„ì‹œì´ë¦„ 바꾸기"
#: client/gui-gtk-2.0/citydlg.c:2573 client/gui-win32/citydlg.c:1202
#: client/gui-xaw/citydlg.c:1380
msgid "What should we rename the city to?"
-msgstr ""
+msgstr "ë„ì‹œ ì´ë¦„ì„ ë¬´ì—‡ìœ¼ë¡œ ë°”ê¾¸ê² ìŠµë‹ˆê¹Œ?"
-#: client/gui-gtk-2.0/cityrep.c:699
+#: client/gui-gtk-2.0/cityrep.c:794
+msgid "(no worklists defined)"
+msgstr "(작업리스트 ì—†ìŒ)"
+
+#: client/gui-gtk-2.0/cityrep.c:876
msgid "Chan_ge"
msgstr "변환(_G)"
-#: client/gui-gtk-2.0/cityrep.c:703
+#: client/gui-gtk-2.0/cityrep.c:880
msgid "Add _First"
-msgstr ""
+msgstr "ì•žì— ì¶”ê°€(_F)"
-#: client/gui-gtk-2.0/cityrep.c:707
+#: client/gui-gtk-2.0/cityrep.c:884
msgid "Add _Next"
-msgstr ""
+msgstr "다ìŒì— 추가(_N)"
-#: client/gui-gtk-2.0/cityrep.c:711
+#: client/gui-gtk-2.0/cityrep.c:888
+msgid "Add _2nd Last"
+msgstr "맨뒤 ì´ì „ì— ì¶”ê°€(_2)"
+
+#: client/gui-gtk-2.0/cityrep.c:892
msgid "Add _Last"
-msgstr ""
+msgstr "ë’¤ì— ì¶”ê°€(_L)"
+
+#: client/gui-gtk-2.0/cityrep.c:899
+msgid "Set Worklist"
+msgstr "작업리스트 ê²°ì •"
+
+#: client/gui-gtk-2.0/cityrep.c:905
+msgid "Append Worklist"
+msgstr "작업리스트 첨부"
+
+#: client/gui-gtk-2.0/cityrep.c:911
+msgid "Clear _Worklist"
+msgstr "작업리스트 지우기(_W)"
-#: client/gui-gtk-2.0/cityrep.c:715
+#: client/gui-gtk-2.0/cityrep.c:916
+msgid "Gover_nor"
+msgstr "통치ìž(_N)"
+
+#: client/gui-gtk-2.0/cityrep.c:921
msgid "_Select"
msgstr "ì„ íƒ(_S)"
-#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
+#: client/gui-gtk-2.0/cityrep.c:925 client/gui-gtk-2.0/plrdlg.c:521
msgid "_Display"
msgstr "표시(_D)"
-#: client/gui-gtk-2.0/cityrep.c:800 client/gui-gtk-2.0/menu.c:808
+#: 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-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
#: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -9967,100 +10070,100 @@ msgstr "표시(_D)"
msgid "Cities"
msgstr "ë„ì‹œ"
-#: client/gui-gtk-2.0/cityrep.c:817
+#: client/gui-gtk-2.0/cityrep.c:1023
msgid "_Inspect"
msgstr "ì 검하기(_I)"
-#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
-#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-sdl/helpdlg.c:297 client/gui-win32/menu.c:342
-#: client/gui-xaw/menu.c:241
+#: 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
+#: client/gui-gtk-2.0/cityrep.c:1518 client/gui-gtk-2.0/menu.c:823
+#: client/gui-gtk-2.0/menu.c:825 client/gui-gtk-2.0/menu.c:827
+#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:831
+#: client/gui-gtk-2.0/menu.c:833 client/gui-sdl/helpdlg.c:297
+#: client/gui-win32/menu.c:342 client/gui-xaw/menu.c:241
msgid "Improvements"
msgstr "건축물"
-#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
-#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
-#: client/gui-xaw/menu.c:247
+#: client/gui-gtk-2.0/cityrep.c:1441 client/gui-gtk-2.0/cityrep.c:1460
+#: client/gui-gtk-2.0/cityrep.c:1479 client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1522 client/gui-xaw/menu.c:247
msgid "Wonders"
msgstr "불가사ì˜í•œ 것들"
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1662 client/gui-win32/cityrep.c:439
#: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
msgid "All Cities"
msgstr "ëª¨ë“ ë„ì‹œ"
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1667 client/gui-win32/cityrep.c:440
msgid "No Cities"
msgstr "ë„ì‹œ ì—†ìŒ"
-#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1672 client/gui-win32/cityrep.c:441
msgid "Invert Selection"
-msgstr ""
+msgstr "ì„ íƒ ê±°ê¾¸ë¡œ 하기"
-#: client/gui-gtk-2.0/cityrep.c:1420
+#: client/gui-gtk-2.0/cityrep.c:1682
msgid "Building Units"
msgstr "부대 건설중"
-#: client/gui-gtk-2.0/cityrep.c:1426
+#: client/gui-gtk-2.0/cityrep.c:1688
msgid "Building Improvements"
msgstr "건축물 건설중"
-#: client/gui-gtk-2.0/cityrep.c:1432
+#: client/gui-gtk-2.0/cityrep.c:1694
msgid "Building Wonders"
msgstr "ë¶ˆê°€ì‚¬ì˜ ê±´ì„¤ì¤‘"
-#: client/gui-gtk-2.0/cityrep.c:1444
+#: client/gui-gtk-2.0/cityrep.c:1706
msgid "Building Unit"
msgstr "부대 건설중"
-#: client/gui-gtk-2.0/cityrep.c:1448
+#: client/gui-gtk-2.0/cityrep.c:1710
msgid "Building Improvement"
msgstr "건축물 건설중"
-#: client/gui-gtk-2.0/cityrep.c:1452
+#: client/gui-gtk-2.0/cityrep.c:1714
msgid "Building Wonder"
msgstr "ë¶ˆê°€ì‚¬ì˜ ê±´ì„¤ì¤‘"
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1722 client/gui-win32/cityrep.c:443
msgid "Coastal Cities"
msgstr "ì—°ì•ˆì˜ ë„ì‹œ"
-#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1727 client/gui-win32/cityrep.c:444
msgid "Same Island"
msgstr "ê°™ì€ ì„¬"
-#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1737 client/gui-win32/cityrep.c:447
msgid "Supported Units"
msgstr "ì›ì¡°í•˜ëŠ” 부대"
-#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1740 client/gui-win32/cityrep.c:454
msgid "Units Present"
msgstr "부대 ìƒíƒœ"
-#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1744 client/gui-win32/cityrep.c:469
msgid "Improvements in City"
msgstr "ë„ì‹œì˜ ê±´ì¶•ë¬¼"
-#: client/gui-gtk-2.0/cityrep.c:1486
+#: client/gui-gtk-2.0/cityrep.c:1748
msgid "Wonders in City"
msgstr "ë„ì‹œì•ˆì˜ ë¶ˆê°€ì‚¬ì˜ "
-#: client/gui-gtk-2.0/cityrep.c:1495
+#: client/gui-gtk-2.0/cityrep.c:1757
msgid "Available Units"
msgstr "가능한 부대"
-#: client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1760
msgid "Available Improvements"
msgstr "가능한 건축물"
-#: client/gui-gtk-2.0/cityrep.c:1501
+#: client/gui-gtk-2.0/cityrep.c:1763
msgid "Available Wonders"
msgstr "가능한 불가사ì˜"
-#: client/gui-gtk-2.0/cityrep.c:1625
+#: client/gui-gtk-2.0/cityrep.c:1882
#, c-format
msgid "Total Buy Cost: %d"
msgstr "ì´ë¹„ìš© : %d"
@@ -10120,17 +10223,17 @@ msgstr "새로운 ë¯¸ë¦¬ì„¤ì • ì´ë¦„짓기"
#: client/gui-gtk-2.0/cma_fe.c:541 client/gui-sdl/cma_fe.c:297
#: client/gui-win32/cma_fe.c:384
msgid "What should we name the preset?"
-msgstr ""
+msgstr "ë¯¸ë¦¬ì„¤ì • ì´ë¦„ì„ ì§€ì–´ 주세요."
#: client/gui-gtk-2.0/cma_fe.c:648
msgid "Remove this preset?"
msgstr "ì´ ë¯¸ë¦¬ì„¤ì •ì„ ì§€ìš°ì‹œê² ìŠµë‹ˆê¹Œ?"
-#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:186
+#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:222
msgid "Goto _Location"
-msgstr ""
+msgstr "장소로 ì´ë™í•˜ê¸°(_L)"
-#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
msgid "Inspect _City"
msgstr "ë„ì‹œ 조사(_C)"
@@ -10152,16 +10255,16 @@ msgstr "약탈하기"
#: client/gui-gtk-2.0/dialogs.c:312 client/gui-win32/dialogs.c:1755
#: data/Freeciv.in:2502
msgid "Select what to pillage:"
-msgstr ""
+msgstr "약탈 í• ê²ƒì„ ì„ íƒí•˜ì„¸ìš”:"
#: client/gui-gtk-2.0/dialogs.c:506
msgid "Unit"
msgstr "부대"
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
-#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
-#: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
-#: manual/civmanual.c:302 data/Freeciv.in:80
+#: 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-win32/plrdlg.c:335 manual/civmanual.c:302 data/Freeciv.in:80
msgid "Name"
msgstr "ì´ë¦„"
@@ -10186,7 +10289,7 @@ 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:1036 data/Freeciv.in:3371
+#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
msgid "Pick Nation"
msgstr "ë¯¼ì¡±ì„ ì„ íƒ"
@@ -10265,7 +10368,7 @@ msgstr "지ë„(_M)"
msgid "_Advances"
msgstr "ê¸°ìˆ (_A)"
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:910
+#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr "ë„ì‹œ(_C)"
@@ -10370,65 +10473,133 @@ msgstr "목ì 지 ì„¤ì •"
msgid "Show _All Cities"
msgstr "ëª¨ë“ ë„ì‹œ 보기"
-#: client/gui-gtk-2.0/gui_main.c:150
+#: client/gui-gtk-2.0/gui_main.c:162
msgid "Show Map Scrollbars"
msgstr "맵 스í¬ë¡¤ ë°” ë³´ì´ê¸°"
-#: client/gui-gtk-2.0/gui_main.c:151
+#: client/gui-gtk-2.0/gui_main.c:163
msgid "Disable this option to hide the scrollbars on the map view."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:155
+#: client/gui-gtk-2.0/gui_main.c:167
msgid "Keyboardless goto"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:156
+#: client/gui-gtk-2.0/gui_main.c:168
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:161
+#: client/gui-gtk-2.0/gui_main.c:173
msgid "Keep dialogs on top"
msgstr "다ì´ì–¼ë¡œê·¸ í•ìƒ 위ì—"
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:174
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:166
+#: client/gui-gtk-2.0/gui_main.c:178
msgid "Show worklist task icons"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:179
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:171
+#: client/gui-gtk-2.0/gui_main.c:183
msgid "Enable status report tabs"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:172
+#: client/gui-gtk-2.0/gui_main.c:184
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:177 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:189 client/gui-win32/gui_main.c:110
msgid "Better fog-of-war drawing"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:178 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:190 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:277 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:195
+msgid "Show time for each chat message"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:196
+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
+msgid "Split bottom notebook area"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:202
+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
+msgid "New message events go to top of list"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:208
+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
+msgid "Show extra message window buttons"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:214
+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 "
+"is disabled, these buttons will not appear (you can still double-click with "
+"the left mouse button or right-click on a row to inspect or goto "
+"respectively). This option will only take effect once the message window is "
+"closed and reopened."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:224
+msgid "Metaserver tab first in network page"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:225
+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
+msgid "Plain chat messages are sent to allies only"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:231
+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 "
+"messages will be sent as public chat messages. To send a public chat message "
+"with this option enabled, prefix the message with a single colon ':'. This "
+"option can also be set using a toggle button beside the chat entry (only "
+"visible in multiplayer games)."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:340 client/gui-xaw/gui_main.c:245
msgid ""
"This client has no special command line options\n"
"\n"
@@ -10436,44 +10607,45 @@ msgstr ""
"ì´ í´ë¼ì´ì–¸íŠ¸ëŠ” 특별한 ëª…ë ¹ì¤„ ì˜µì…˜ì´ ì—†ìŠµë‹ˆë‹¤\n"
"\n"
-#: client/gui-gtk-2.0/gui_main.c:723 client/gui-gtk-2.0/gui_main.c:1345
+#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
msgid "Freeciv"
msgstr "Freeciv"
-#: client/gui-gtk-2.0/gui_main.c:1088 client/gui-gtk-2.0/gui_main.c:1095
+#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
#: 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:1095 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1232 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:1127 client/gui-gtk-2.0/menu.c:770
-#: client/gui-gtk-2.0/menu.c:772 client/gui-gtk-2.0/menu.c:774
-#: client/gui-gtk-2.0/menu.c:776 client/gui-gtk-2.0/menu.c:778
-#: client/gui-gtk-2.0/menu.c:780 client/gui-gtk-2.0/menu.c:782
-#: client/gui-gtk-2.0/menu.c:784 client/gui-gtk-2.0/menu.c:786
-#: client/gui-gtk-2.0/menu.c:788 client/gui-gtk-2.0/menu.c:790
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-gtk-2.0/menu.c:804 client/gui-gtk-2.0/menu.c:806
-#: client/gui-gtk-2.0/menu.c:808 client/gui-gtk-2.0/menu.c:810
-#: client/gui-gtk-2.0/menu.c:812 client/gui-gtk-2.0/menu.c:814
-#: client/gui-gtk-2.0/menu.c:816 client/gui-gtk-2.0/menu.c:818
-#: client/gui-gtk-2.0/menu.c:820 client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/gui_main.c:1266 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
+#: client/gui-gtk-2.0/menu.c:811 client/gui-gtk-2.0/menu.c:813
+#: client/gui-gtk-2.0/menu.c:815 client/gui-gtk-2.0/menu.c:817
+#: client/gui-gtk-2.0/menu.c:819 client/gui-gtk-2.0/menu.c:821
+#: client/gui-gtk-2.0/menu.c:823 client/gui-gtk-2.0/menu.c:825
+#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
+#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
+#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
+#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
+#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
+#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
#: data/Freeciv.in:2028
msgid "View"
msgstr "보기"
-#: client/gui-gtk-2.0/gui_main.c:1208
+#: client/gui-gtk-2.0/gui_main.c:1359
msgid "Chat"
msgstr "대화"
-#: client/gui-gtk-2.0/gui_main.c:1224 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1377 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"
@@ -10485,69 +10657,73 @@ msgstr ""
"다.\n"
" ê·¸ë¦¬ê³ ... í•´ë³´ìžêµ¬ìš”."
-#: client/gui-gtk-2.0/gui_main.c:1491
+#: client/gui-gtk-2.0/gui_main.c:1392
+msgid "Allies Only"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:1657
msgid "Not _ready"
-msgstr "준비 안 ëìŒ(_R)"
+msgstr "준비 안 ë슴(_R)"
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
+#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
msgid "_Ready"
-msgstr "준비 ëìŒ(_R)"
+msgstr "준비 ë슴(_R)"
-#: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2132
+#: 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
msgid "_Start"
msgstr "시작(_S)"
-#: client/gui-gtk-2.0/gui_main.c:1520
+#: client/gui-gtk-2.0/gui_main.c:1686
msgid "_Take Player"
msgstr "ì´ ì‚¬ìš©ìž ë°ë ¤ì˜¤ê¸°(_T)"
-#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
+#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
msgid "Pick _Nation"
-msgstr "ë¯¼ì¡±ì„ ì„ íƒ(_N)"
+msgstr "민족 ì„ íƒ(_N)"
-#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
+#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
msgid "_Observe"
msgstr "관찰하기(_O)"
-#: client/gui-gtk-2.0/gui_main.c:1532
+#: client/gui-gtk-2.0/gui_main.c:1698
msgid "Do not _observe"
msgstr "ê´€ì°°ì„ ì·¨ì†Œí•˜ê¸°(_O)"
-#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
msgid "<AI>"
msgstr "<AI>"
-#: client/gui-gtk-2.0/gui_main.c:1557
+#: client/gui-gtk-2.0/gui_main.c:1723
msgid "<Novice AI>"
msgstr "<초보 AI>"
-#: client/gui-gtk-2.0/gui_main.c:1560
+#: client/gui-gtk-2.0/gui_main.c:1726
msgid "<Easy AI>"
msgstr "<쉬운 AI>"
-#: client/gui-gtk-2.0/gui_main.c:1563
+#: client/gui-gtk-2.0/gui_main.c:1729
msgid "<Normal AI>"
msgstr "<보통 AI>"
-#: client/gui-gtk-2.0/gui_main.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1732
msgid "<Hard AI>"
msgstr "<ì–´ë ¤ìš´ AI>"
-#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1742 client/gui-win32/dialogs.c:594
#: client/gui-xaw/pages.c:217
msgid "Random"
msgstr "무작위"
-#: client/gui-gtk-2.0/gui_main.c:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
msgid "Observer"
msgstr "관찰ìž"
-#: client/gui-gtk-2.0/gui_main.c:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
msgid "Detached"
msgstr "붙임"
-#: client/gui-gtk-2.0/gui_main.c:1899
+#: client/gui-gtk-2.0/gui_main.c:2073
msgid "Are you sure you want to quit?"
msgstr "ì •ë§ ëë‚´ì‹œê² ìŠµë‹ˆê¹Œ?"
@@ -10779,466 +10955,500 @@ msgstr "기슬(_T)"
msgid "Foreign Intelligence: %s Empire"
msgstr "%sì˜ ì œêµì— 대한 첩보"
-#: client/gui-gtk-2.0/mapctrl.c:195 client/gui-sdl/mapctrl.c:2565
+#: client/gui-gtk-2.0/mapctrl.c:179 client/gui-sdl/mapctrl.c:2565
#: client/gui-sdl/menu.c:839 client/gui-sdl/menu.c:1021
#: client/gui-win32/mapctrl.c:353
msgid "Build New City"
msgstr "새로운 ë„ì‹œ 건설"
-#: client/gui-gtk-2.0/mapctrl.c:196 client/gui-sdl/mapctrl.c:2594
+#: client/gui-gtk-2.0/mapctrl.c:180 client/gui-sdl/mapctrl.c:2594
#: client/gui-win32/mapctrl.c:354 client/gui-xaw/mapctrl.c:89
msgid "What should we call our new city?"
msgstr "ì´ ë„시는 ëë¼ê³ í•˜ê² ìŠµë‹ˆê¹Œ?"
-#: client/gui-gtk-2.0/mapview.c:147
+#: client/gui-gtk-2.0/mapview.c:158
msgid "Shows your current luxury/science/tax rates;click to toggle them."
msgstr ""
-#: client/gui-gtk-2.0/mapview.c:692 client/gui-win32/canvas.c:275
+#: client/gui-gtk-2.0/mapview.c:702 client/gui-win32/canvas.c:275
msgid "Better fog will only work in truecolor. Disabling it"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:250
+#: client/gui-gtk-2.0/menu.c:256
msgid "Leaving a local game will end it!"
msgstr "로컬 게임으로부터 나가면 종료ë©ë‹ˆë‹¤!"
-#: client/gui-gtk-2.0/menu.c:700 client/gui-win32/menu.c:303
+#: client/gui-gtk-2.0/menu.c:727 client/gui-win32/menu.c:303
msgid "_Game"
msgstr "게임(_G)"
-#: client/gui-gtk-2.0/menu.c:702 client/gui-gtk-2.0/menu.c:704
-#: client/gui-gtk-2.0/menu.c:706 client/gui-gtk-2.0/menu.c:708
-#: client/gui-gtk-2.0/menu.c:710 client/gui-gtk-2.0/menu.c:712
-#: client/gui-gtk-2.0/menu.c:714 client/gui-gtk-2.0/menu.c:717
-#: client/gui-gtk-2.0/menu.c:720 client/gui-gtk-2.0/menu.c:722
-#: client/gui-gtk-2.0/menu.c:724 client/gui-gtk-2.0/menu.c:726
-#: client/gui-gtk-2.0/menu.c:728 client/gui-gtk-2.0/menu.c:730
-#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:736
-#: client/gui-gtk-2.0/menu.c:738 client/gui-gtk-2.0/menu.c:740
+#: client/gui-gtk-2.0/menu.c:729 client/gui-gtk-2.0/menu.c:731
+#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:735
+#: client/gui-gtk-2.0/menu.c:737 client/gui-gtk-2.0/menu.c:739
+#: client/gui-gtk-2.0/menu.c:741 client/gui-gtk-2.0/menu.c:744
+#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
+#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
+#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
+#: client/gui-gtk-2.0/menu.c:760 client/gui-gtk-2.0/menu.c:763
+#: client/gui-gtk-2.0/menu.c:765 client/gui-gtk-2.0/menu.c:767
#: data/Freeciv.in:2026
msgid "Game"
msgstr "게임"
-#: client/gui-gtk-2.0/menu.c:704 client/gui-gtk-2.0/menu.c:706
-#: client/gui-gtk-2.0/menu.c:708
+#: client/gui-gtk-2.0/menu.c:731 client/gui-gtk-2.0/menu.c:733
+#: client/gui-gtk-2.0/menu.c:735
msgid "_Chat"
msgstr "대화(_C)"
-#: client/gui-gtk-2.0/menu.c:706 client/gui-win32/menu.c:314
+#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:314
msgid "_Clear Log"
msgstr "로그 지우기(_C)"
-#: client/gui-gtk-2.0/menu.c:708 client/gui-win32/menu.c:313
+#: client/gui-gtk-2.0/menu.c:735 client/gui-win32/menu.c:313
msgid "_Write Log"
msgstr "로그 쓰기(_W)"
-#: client/gui-gtk-2.0/menu.c:710 client/gui-win32/menu.c:304
+#: client/gui-gtk-2.0/menu.c:737 client/gui-win32/menu.c:304
msgid "Local _Options"
msgstr "로컬 옵션(_O)"
-#: client/gui-gtk-2.0/menu.c:712 client/gui-win32/menu.c:305
+#: client/gui-gtk-2.0/menu.c:739 client/gui-win32/menu.c:305
msgid "_Message Options"
msgstr "메세지 옵션(_M)"
-#: client/gui-gtk-2.0/menu.c:717
+#: client/gui-gtk-2.0/menu.c:744
msgid "_Reload Tileset"
msgstr "타ì¼ì„¸íŠ¸ ìž¬ìž¥ì „(_R)"
-#: client/gui-gtk-2.0/menu.c:720
+#: client/gui-gtk-2.0/menu.c:747
msgid "Save Options on _Exit"
msgstr "ì¢…ë£Œí• ë•Œ 옵션 ì €ìž¥(_E)"
-#: client/gui-gtk-2.0/menu.c:722
+#: client/gui-gtk-2.0/menu.c:749
msgid "Sa_ve Options"
msgstr "옵션 ì €ìž¥(_V)"
-#: client/gui-gtk-2.0/menu.c:726 client/gui-win32/menu.c:308
+#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:308
msgid "Server O_ptions"
msgstr "서버 옵션(_P)"
-#: client/gui-gtk-2.0/menu.c:730 client/gui-win32/menu.c:310
+#: client/gui-gtk-2.0/menu.c:757 client/gui-win32/menu.c:310
msgid "_Save Game"
msgstr "게임 ì €ìž¥(_S)"
-#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:311
+#: client/gui-gtk-2.0/menu.c:760 client/gui-win32/menu.c:311
msgid "Save Game _As..."
msgstr "다른 ì´ë¦„으로 게임 ì €ìž¥(_A)"
-#: client/gui-gtk-2.0/menu.c:738
+#: client/gui-gtk-2.0/menu.c:765
msgid "_Leave"
msgstr "나가기(_L)"
-#: client/gui-gtk-2.0/menu.c:740 client/gui-win32/menu.c:317
+#: client/gui-gtk-2.0/menu.c:767 client/gui-win32/menu.c:317
msgid "_Quit"
msgstr "ë내기(_Q)"
-#: client/gui-gtk-2.0/menu.c:745 client/gui-win32/menu.c:321
+#: client/gui-gtk-2.0/menu.c:772 client/gui-win32/menu.c:321
msgid "Gov_ernment"
msgstr "ì •ë¶€(_E)"
-#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
-#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
-#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:774 client/gui-gtk-2.0/menu.c:776
+#: client/gui-gtk-2.0/menu.c:778 client/gui-gtk-2.0/menu.c:780
+#: client/gui-gtk-2.0/menu.c:782 client/gui-gtk-2.0/menu.c:784
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
#: client/gui-xaw/menu.c:248 data/Freeciv.in:2027 data/helpdata.txt:1320
msgid "Government"
msgstr "ì •ë¶€"
-#: client/gui-gtk-2.0/menu.c:749 client/gui-win32/menu.c:322
+#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:322
msgid "_Tax Rates"
msgstr "세율(_T)"
-#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:324
+#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:324
msgid "_Find City"
msgstr "ë„ì‹œ 찾기(_F)"
-#: client/gui-gtk-2.0/menu.c:755 client/gui-win32/menu.c:325
+#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:325
msgid "_Worklists"
msgstr "작업 리스트(_W)"
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
-#: client/gui-gtk-2.0/menu.c:764 client/gui-win32/menu.c:327
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
+#: client/gui-gtk-2.0/menu.c:791 client/gui-win32/menu.c:327
msgid "_Change Government"
msgstr "ì •ë¶€ë¥¼ 바꾸기(_C)"
-#: client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:788
msgid "_Revolution..."
msgstr "형명...(_R)"
-#: client/gui-gtk-2.0/menu.c:764 client/gui-gtk-2.0/menu.c:970
+#: client/gui-gtk-2.0/menu.c:791 client/gui-gtk-2.0/menu.c:1013
#: client/gui-win32/menu.c:431
msgid "_Government"
msgstr "ì •ë¶€(_G)"
-#: client/gui-gtk-2.0/menu.c:768 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:795 client/gui-gtk-2.0/menu.c:959
#: client/gui-win32/menu.c:334
msgid "_View"
msgstr "보기(_V)"
-#: client/gui-gtk-2.0/menu.c:772
+#: client/gui-gtk-2.0/menu.c:799
msgid "City Outlines"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:774 client/gui-win32/menu.c:335
+#: client/gui-gtk-2.0/menu.c:801 client/gui-win32/menu.c:335
msgid "Map _Grid"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:336
+#: client/gui-gtk-2.0/menu.c:803 client/gui-win32/menu.c:336
msgid "National _Borders"
msgstr "êµê²½(_B)"
-#: client/gui-gtk-2.0/menu.c:778 client/gui-win32/menu.c:337
+#: client/gui-gtk-2.0/menu.c:805 client/gui-win32/menu.c:337
msgid "City _Names"
msgstr "ë„ì‹œ ì´ë¦„(_N)"
-#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:338
+#: client/gui-gtk-2.0/menu.c:807 client/gui-win32/menu.c:338
msgid "City G_rowth"
msgstr "ë„ì‹œ 성장(_R)"
-#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:339
+#: client/gui-gtk-2.0/menu.c:809 client/gui-win32/menu.c:339
msgid "City _Productions"
msgstr "ë„ì‹œ ìƒì‚°(_P)"
-#: client/gui-gtk-2.0/menu.c:784 client/gui-sdl/optiondlg.c:1719
+#: client/gui-gtk-2.0/menu.c:811
+msgid "City Buy Cost"
+msgstr "ë„ì‹œ ìƒì‚° 구입 비용"
+
+#: client/gui-gtk-2.0/menu.c:813
+msgid "City Traderoutes"
+msgstr "ë„ì‹œ ë¬´ì— ê²½ë¡œ"
+
+#: client/gui-gtk-2.0/menu.c:815 client/gui-sdl/optiondlg.c:1719
msgid "Draw city worker map grid"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:788 client/gui-sdl/optiondlg.c:1635
+#: client/gui-gtk-2.0/menu.c:819 client/gui-sdl/optiondlg.c:1635
#: client/gui-win32/menu.c:340 client/gui-xaw/menu.c:148
#: client/gui-xaw/menu.c:246 manual/civmanual.c:220 data/helpdata.txt:1220
msgid "Terrain"
msgstr "지형"
-#: client/gui-gtk-2.0/menu.c:790 client/gui-win32/menu.c:341
+#: client/gui-gtk-2.0/menu.c:821 client/gui-win32/menu.c:341
#: client/gui-xaw/menu.c:149
msgid "Coastline"
msgstr "í•´ì•ˆì„ "
-#: client/gui-gtk-2.0/menu.c:796 client/gui-win32/menu.c:343
+#: client/gui-gtk-2.0/menu.c:827 client/gui-win32/menu.c:343
msgid "Roads & Rails"
-msgstr "다리와 ì² ë„"
+msgstr "ë„로와 ì² ë„"
-#: client/gui-gtk-2.0/menu.c:800 client/gui-sdl/optiondlg.c:1933
+#: client/gui-gtk-2.0/menu.c:831 client/gui-sdl/optiondlg.c:1933
#: client/gui-win32/menu.c:345 client/gui-xaw/menu.c:152
msgid "Mines"
msgstr "ê´‘ì‚°"
-#: client/gui-gtk-2.0/menu.c:802 client/gui-win32/menu.c:346
+#: client/gui-gtk-2.0/menu.c:833 client/gui-win32/menu.c:346
msgid "Fortress & Airbase"
msgstr "요새 ë° ê³µêµ° 기지"
-#: client/gui-gtk-2.0/menu.c:804 client/gui-win32/menu.c:348
+#: client/gui-gtk-2.0/menu.c:835 client/gui-win32/menu.c:348
#: client/gui-xaw/menu.c:154
msgid "Specials"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:806 client/gui-win32/menu.c:349
+#: client/gui-gtk-2.0/menu.c:837 client/gui-win32/menu.c:349
#: client/gui-xaw/menu.c:155
msgid "Pollution & Fallout"
msgstr "오염과 ë°©ì‚¬ì „ 낙진"
-#: client/gui-gtk-2.0/menu.c:812 client/gui-win32/menu.c:352
+#: client/gui-gtk-2.0/menu.c:843 client/gui-win32/menu.c:352
#: client/gui-xaw/menu.c:158
msgid "Focus Unit"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:814 client/gui-sdl/optiondlg.c:1854
+#: client/gui-gtk-2.0/menu.c:845 client/gui-sdl/optiondlg.c:1854
#: client/gui-win32/menu.c:353 client/gui-xaw/menu.c:159
msgid "Fog of War"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:818
+#: client/gui-gtk-2.0/menu.c:849
msgid "_Full Screen"
msgstr "ì „í™”ë©´(_F)"
-#: client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/menu.c:853
msgid "_Center View"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:825 client/gui-win32/menu.c:358
+#: client/gui-gtk-2.0/menu.c:856 client/gui-win32/menu.c:358
msgid "_Orders"
msgstr "ëª…ë ¹(_O)"
-#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
-#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
-#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
-#: client/gui-gtk-2.0/menu.c:855 client/gui-gtk-2.0/menu.c:857
-#: client/gui-gtk-2.0/menu.c:859 client/gui-gtk-2.0/menu.c:861
-#: client/gui-gtk-2.0/menu.c:863 client/gui-gtk-2.0/menu.c:865
-#: client/gui-gtk-2.0/menu.c:867 client/gui-gtk-2.0/menu.c:869
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875 client/gui-gtk-2.0/menu.c:877
-#: client/gui-gtk-2.0/menu.c:879 client/gui-gtk-2.0/menu.c:881
-#: client/gui-gtk-2.0/menu.c:883 client/gui-gtk-2.0/menu.c:885
-#: client/gui-gtk-2.0/menu.c:887 client/gui-gtk-2.0/menu.c:889
-#: client/gui-gtk-2.0/menu.c:891 client/gui-gtk-2.0/menu.c:893
-#: client/gui-gtk-2.0/menu.c:895 client/gui-gtk-2.0/menu.c:897
-#: client/gui-gtk-2.0/menu.c:899 client/gui-gtk-2.0/menu.c:901
-#: client/gui-gtk-2.0/menu.c:903 data/Freeciv.in:2029
+#: client/gui-gtk-2.0/menu.c:858 client/gui-gtk-2.0/menu.c:860
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:864
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:868
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:872
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:876
+#: client/gui-gtk-2.0/menu.c:878 client/gui-gtk-2.0/menu.c:880
+#: client/gui-gtk-2.0/menu.c:882 client/gui-gtk-2.0/menu.c:884
+#: client/gui-gtk-2.0/menu.c:886 client/gui-gtk-2.0/menu.c:888
+#: client/gui-gtk-2.0/menu.c:890 client/gui-gtk-2.0/menu.c:892
+#: client/gui-gtk-2.0/menu.c:894 client/gui-gtk-2.0/menu.c:896
+#: client/gui-gtk-2.0/menu.c:898 client/gui-gtk-2.0/menu.c:900
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906 client/gui-gtk-2.0/menu.c:908
+#: client/gui-gtk-2.0/menu.c:910 client/gui-gtk-2.0/menu.c:912
+#: client/gui-gtk-2.0/menu.c:914 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:918 client/gui-gtk-2.0/menu.c:920
+#: client/gui-gtk-2.0/menu.c:922 client/gui-gtk-2.0/menu.c:924
+#: client/gui-gtk-2.0/menu.c:926 client/gui-gtk-2.0/menu.c:928
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
+#: client/gui-gtk-2.0/menu.c:946 data/Freeciv.in:2029
msgid "Orders"
msgstr "ëª…ë ¹"
-#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:1444
+#: client/gui-gtk-2.0/menu.c:860 client/gui-gtk-2.0/menu.c:1489
#: client/gui-win32/menu.c:359
msgid "_Build City"
msgstr "ë„ì‹œ 건설(_B)"
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:1466
-#: client/gui-gtk-2.0/menu.c:1472 client/gui-win32/menu.c:360
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:1511
+#: client/gui-gtk-2.0/menu.c:1517 client/gui-win32/menu.c:360
msgid "Build _Road"
msgstr "다리 건설(_R)"
-#: client/gui-gtk-2.0/menu.c:833 client/gui-gtk-2.0/menu.c:1360
+#: 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 "관개 작업(_I)"
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:1361
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:1406
#: client/gui-win32/menu.c:362
msgid "Build _Mine"
msgstr "광산 짓기(_M)"
-#: client/gui-gtk-2.0/menu.c:837 client/gui-gtk-2.0/menu.c:1362
+#: client/gui-gtk-2.0/menu.c:868 client/gui-gtk-2.0/menu.c:1407
msgid "Transf_orm Terrain"
msgstr "지형 개조(_O)"
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:1508
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:1553
#: client/gui-win32/menu.c:364
msgid "Build _Fortress"
msgstr "요새 세우기(_F)"
-#: client/gui-gtk-2.0/menu.c:841 client/gui-win32/menu.c:365
+#: client/gui-gtk-2.0/menu.c:872 client/gui-win32/menu.c:365
msgid "Build Airbas_e"
msgstr "공군 기지 세우기(_E)"
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:1514
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:1559
#: client/gui-win32/menu.c:366
msgid "Clean _Pollution"
msgstr "오염 없앰(_P)"
-#: client/gui-gtk-2.0/menu.c:845 client/gui-win32/menu.c:367
+#: client/gui-gtk-2.0/menu.c:876 client/gui-win32/menu.c:367
msgid "Clean _Nuclear Fallout"
msgstr "핵낙진 없앰(_N)"
-#: client/gui-gtk-2.0/menu.c:849 client/gui-win32/menu.c:369
+#: client/gui-gtk-2.0/menu.c:880 client/gui-win32/menu.c:369
msgid "_Sentry"
msgstr "ë³´ì´ˆ(_S)"
-#: client/gui-gtk-2.0/menu.c:855 client/gui-win32/menu.c:372
+#: client/gui-gtk-2.0/menu.c:886 client/gui-win32/menu.c:372
msgid "Make _Homecity"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:857 client/gui-win32/menu.c:373
+#: client/gui-gtk-2.0/menu.c:888 client/gui-win32/menu.c:373
msgid "_Load"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:859
+#: client/gui-gtk-2.0/menu.c:890
msgid "_Unload Transporter"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:861 client/gui-win32/menu.c:374
+#: client/gui-gtk-2.0/menu.c:892 client/gui-win32/menu.c:374
msgid "_Unload"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:863 client/gui-win32/menu.c:375
+#: client/gui-gtk-2.0/menu.c:894 client/gui-win32/menu.c:375
msgid "Wake up o_thers"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:867
+#: client/gui-gtk-2.0/menu.c:898
msgid "_Auto Settler"
msgstr "ìžë™ ì´ì£¼ë¯¼(_A)"
-#: client/gui-gtk-2.0/menu.c:869 client/gui-win32/menu.c:378
+#: client/gui-gtk-2.0/menu.c:900 client/gui-win32/menu.c:378
msgid "Auto E_xplore"
msgstr "ìžë™ íƒí—˜(_X)"
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906
msgid "_Connect"
msgstr "ì—°ê²°(_C)"
-#: client/gui-gtk-2.0/menu.c:871 client/gui-win32/menu.c:380
+#: client/gui-gtk-2.0/menu.c:902 client/gui-win32/menu.c:380
msgid "_Road"
msgstr "ë„ë¡œ(_R)"
-#: client/gui-gtk-2.0/menu.c:873 client/gui-win32/menu.c:381
+#: client/gui-gtk-2.0/menu.c:904 client/gui-win32/menu.c:381
msgid "Rai_l"
msgstr "ì² ë„(_L)"
-#: client/gui-gtk-2.0/menu.c:875 client/gui-win32/menu.c:382
+#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:382
msgid "_Irrigate"
msgstr "관개(_I)"
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
msgid "Go _to"
msgstr "ì´ë™(_T)"
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
msgid "_Build city"
msgstr "ë„ì‹œ 세우기(_B)"
-#: client/gui-gtk-2.0/menu.c:879
+#: client/gui-gtk-2.0/menu.c:910
msgid "Patrol (_Q)"
msgstr "순찰(_Q)"
-#: client/gui-gtk-2.0/menu.c:881 client/gui-win32/menu.c:385
+#: client/gui-gtk-2.0/menu.c:912 client/gui-win32/menu.c:385
msgid "_Go to"
msgstr "ì´ë™(_G)"
-#: client/gui-gtk-2.0/menu.c:883
+#: client/gui-gtk-2.0/menu.c:914
msgid "Go\\/Airlift to City"
msgstr "ë„ì‹œì— ì´ë™\\/공수하기"
-#: client/gui-gtk-2.0/menu.c:885 client/gui-sdl/menu.c:450
+#: client/gui-gtk-2.0/menu.c:916 client/gui-sdl/menu.c:450
#: client/gui-win32/menu.c:387 client/gui-xaw/menu.c:203
msgid "Return to nearest city"
msgstr "ì œì¼ ê°€ê¹Œìš´ ë„시로 복귀"
-#: client/gui-gtk-2.0/menu.c:889 client/gui-win32/menu.c:389
+#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:389
#: client/gui-xaw/menu.c:205
msgid "Disband Unit"
msgstr "부대해산"
-#: client/gui-gtk-2.0/menu.c:891 client/gui-sdl/citydlg.c:532
+#: client/gui-gtk-2.0/menu.c:922 client/gui-sdl/citydlg.c:532
#: data/Freeciv.in:1186
msgid "Upgrade unit"
msgstr "ë¶€ëŒ€ì—…ê·¸ë ˆì´ë“œ"
-#: client/gui-gtk-2.0/menu.c:893
+#: client/gui-gtk-2.0/menu.c:924
msgid "Diplomat\\/Spy Actions"
msgstr "외êµê´€\\/스파ì´í–‰ìœ„"
-#: client/gui-gtk-2.0/menu.c:895 client/gui-sdl/menu.c:399
+#: client/gui-gtk-2.0/menu.c:926 client/gui-sdl/menu.c:399
#: client/gui-win32/menu.c:391 client/gui-xaw/menu.c:209
msgid "Explode Nuclear"
msgstr "핵íë°œ"
-#: client/gui-gtk-2.0/menu.c:899
-msgid "Select same type"
-msgstr "ê°™ì€ ìœ í˜• ì„ íƒ"
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/cityrep.c:882
+msgid "Select"
+msgstr "ì„ íƒ"
+
+#: client/gui-gtk-2.0/menu.c:934
+msgid "Single"
+msgstr "단 부대"
-#: client/gui-gtk-2.0/menu.c:901 client/gui-win32/menu.c:393
+#: client/gui-gtk-2.0/menu.c:936
+msgid "Same Type On Tile"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:938
+msgid "All On Tile"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:940
+msgid "Same Type On Continent"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:942
+msgid "Same Type Everywhere"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:393
msgid "_Wait"
msgstr "기대(_W)"
-#: client/gui-gtk-2.0/menu.c:903 client/gui-win32/menu.c:394
+#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:394
#: client/gui-xaw/menu.c:213
msgid "Done"
msgstr "ë"
-#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:398
+#: client/gui-gtk-2.0/menu.c:949 client/gui-win32/menu.c:398
msgid "_Reports"
msgstr "ë³´ê³ (_R)"
-#: client/gui-gtk-2.0/menu.c:908 client/gui-gtk-2.0/menu.c:910
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:914
-#: client/gui-gtk-2.0/menu.c:916 client/gui-gtk-2.0/menu.c:918
-#: client/gui-gtk-2.0/menu.c:920 client/gui-gtk-2.0/menu.c:922
-#: client/gui-gtk-2.0/menu.c:924 client/gui-gtk-2.0/menu.c:926
-#: client/gui-gtk-2.0/menu.c:928 client/gui-gtk-2.0/menu.c:930
-#: client/gui-gtk-2.0/menu.c:932 data/Freeciv.in:2030
+#: client/gui-gtk-2.0/menu.c:951 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:957
+#: client/gui-gtk-2.0/menu.c:959 client/gui-gtk-2.0/menu.c:961
+#: client/gui-gtk-2.0/menu.c:963 client/gui-gtk-2.0/menu.c:965
+#: client/gui-gtk-2.0/menu.c:967 client/gui-gtk-2.0/menu.c:969
+#: client/gui-gtk-2.0/menu.c:971 client/gui-gtk-2.0/menu.c:973
+#: client/gui-gtk-2.0/menu.c:975 data/Freeciv.in:2030
msgid "Reports"
msgstr "ë³´ê³ "
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:958
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:1001
#: client/gui-win32/menu.c:400 client/gui-win32/menu.c:425
msgid "_Units"
msgstr "부대(_U)"
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/menu.c:914 client/gui-win32/menu.c:402
+#: client/gui-gtk-2.0/menu.c:957 client/gui-win32/menu.c:402
msgid "_Nations"
msgstr "민족(_N)"
-#: client/gui-gtk-2.0/menu.c:918 client/gui-win32/menu.c:403
+#: client/gui-gtk-2.0/menu.c:961 client/gui-win32/menu.c:403
msgid "_Economy"
msgstr "ê²½ì œ(_E)"
#. TRANS: Research report action
-#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:405
+#: client/gui-gtk-2.0/menu.c:963 client/gui-win32/menu.c:405
msgid "_Research"
msgstr "연구(_R)"
-#: client/gui-gtk-2.0/menu.c:924 client/gui-win32/menu.c:407
+#: client/gui-gtk-2.0/menu.c:967 client/gui-win32/menu.c:407
msgid "_Wonders of the World"
msgstr "세계 불가사ì˜(_W)"
-#: client/gui-gtk-2.0/menu.c:926 client/gui-win32/menu.c:408
+#: client/gui-gtk-2.0/menu.c:969 client/gui-win32/menu.c:408
msgid "_Top Five Cities"
msgstr "ìƒìœ„ 5ìœ„ì˜ ë„ì‹œ(_T)"
-#: client/gui-gtk-2.0/menu.c:928 client/gui-win32/menu.c:409
+#: client/gui-gtk-2.0/menu.c:971 client/gui-win32/menu.c:409
msgid "_Messages"
msgstr "메세지(_M)"
-#: client/gui-gtk-2.0/menu.c:930 client/gui-win32/menu.c:410
+#: client/gui-gtk-2.0/menu.c:973 client/gui-win32/menu.c:410
msgid "_Demographics"
msgstr "ì¸êµ¬ 통계 ë³´ê³ (_D)"
-#: client/gui-gtk-2.0/menu.c:932 client/gui-gtk-2.0/plrdlg.c:471
+#: client/gui-gtk-2.0/menu.c:975 client/gui-gtk-2.0/plrdlg.c:354
#: client/gui-win32/menu.c:411
msgid "_Spaceship"
msgstr "ìš°ì£¼ì„ (_S)"
-#: client/gui-gtk-2.0/menu.c:936 client/gui-win32/menu.c:415
+#: client/gui-gtk-2.0/menu.c:979 client/gui-win32/menu.c:415
msgid "_Help"
msgstr "ë„움ë§(_H)"
-#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
-#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
-#: client/gui-gtk-2.0/menu.c:946 client/gui-gtk-2.0/menu.c:948
-#: client/gui-gtk-2.0/menu.c:950 client/gui-gtk-2.0/menu.c:952
-#: client/gui-gtk-2.0/menu.c:954 client/gui-gtk-2.0/menu.c:956
-#: client/gui-gtk-2.0/menu.c:958 client/gui-gtk-2.0/menu.c:960
-#: client/gui-gtk-2.0/menu.c:962 client/gui-gtk-2.0/menu.c:964
-#: client/gui-gtk-2.0/menu.c:966 client/gui-gtk-2.0/menu.c:968
-#: client/gui-gtk-2.0/menu.c:970 client/gui-gtk-2.0/menu.c:972
-#: client/gui-gtk-2.0/menu.c:974 client/gui-gtk-2.0/menu.c:976
-#: client/gui-gtk-2.0/menu.c:978 client/gui-gtk-2.0/menu.c:980
+#: client/gui-gtk-2.0/menu.c:981 client/gui-gtk-2.0/menu.c:983
+#: client/gui-gtk-2.0/menu.c:985 client/gui-gtk-2.0/menu.c:987
+#: client/gui-gtk-2.0/menu.c:989 client/gui-gtk-2.0/menu.c:991
+#: client/gui-gtk-2.0/menu.c:993 client/gui-gtk-2.0/menu.c:995
+#: client/gui-gtk-2.0/menu.c:997 client/gui-gtk-2.0/menu.c:999
+#: client/gui-gtk-2.0/menu.c:1001 client/gui-gtk-2.0/menu.c:1003
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-gtk-2.0/menu.c:1007
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-gtk-2.0/menu.c:1011
+#: client/gui-gtk-2.0/menu.c:1013 client/gui-gtk-2.0/menu.c:1015
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-gtk-2.0/menu.c:1019
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-gtk-2.0/menu.c:1023
#: client/gui-gtk-2.0/repodlgs.c:313 client/gui-win32/citydlg.c:1077
#: client/gui-win32/repodlgs.c:289 client/gui-win32/wldlg.c:846
#: data/Freeciv.in:1466 data/Freeciv.in:2031 data/Freeciv.in:2101
@@ -11246,119 +11456,119 @@ msgstr "ë„움ë§(_H)"
msgid "Help"
msgstr "ë„움ë§"
-#: client/gui-gtk-2.0/menu.c:940 client/gui-win32/menu.c:416
+#: client/gui-gtk-2.0/menu.c:983 client/gui-win32/menu.c:416
msgid "Language_s"
msgstr "언어(_S)"
-#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/menu.c:417
+#: client/gui-gtk-2.0/menu.c:985 client/gui-win32/menu.c:417
msgid "Co_nnecting"
msgstr "ì—°ê²°(_N)"
-#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:418
+#: client/gui-gtk-2.0/menu.c:987 client/gui-win32/menu.c:418
msgid "C_ontrols"
msgstr "사용 방법(_O)"
-#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:419
+#: client/gui-gtk-2.0/menu.c:989 client/gui-win32/menu.c:419
msgid "C_hatline"
msgstr "채팅 ë¼ì¸(_H)"
-#: client/gui-gtk-2.0/menu.c:948 client/gui-win32/menu.c:420
+#: client/gui-gtk-2.0/menu.c:991 client/gui-win32/menu.c:420
msgid "_Worklist Editor"
msgstr "작업리스트 편집(_W)"
-#: client/gui-gtk-2.0/menu.c:950 client/gui-win32/menu.c:421
+#: client/gui-gtk-2.0/menu.c:993 client/gui-win32/menu.c:421
msgid "Citizen _Management"
msgstr "시민 관리(_M)"
-#: client/gui-gtk-2.0/menu.c:952 client/gui-win32/menu.c:422
+#: client/gui-gtk-2.0/menu.c:995 client/gui-win32/menu.c:422
msgid "_Playing"
msgstr "노는 방법(_P)"
-#: client/gui-gtk-2.0/menu.c:956 client/gui-win32/menu.c:424
+#: client/gui-gtk-2.0/menu.c:999 client/gui-win32/menu.c:424
msgid "City _Improvements"
msgstr "ë„ì‹œ 건축물(_I)"
-#: client/gui-gtk-2.0/menu.c:960 client/gui-win32/menu.c:426
+#: client/gui-gtk-2.0/menu.c:1003 client/gui-win32/menu.c:426
msgid "Com_bat"
msgstr "ì „ìŸ(_B)"
-#: client/gui-gtk-2.0/menu.c:962 client/gui-win32/menu.c:427
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-win32/menu.c:427
msgid "_ZOC"
msgstr "조종가능한 구ì—(_Z)"
-#: client/gui-gtk-2.0/menu.c:964 client/gui-win32/menu.c:428
+#: client/gui-gtk-2.0/menu.c:1007 client/gui-win32/menu.c:428
msgid "Techno_logy"
msgstr "ê¸°ìˆ (_L)"
-#: client/gui-gtk-2.0/menu.c:966 client/gui-win32/menu.c:429
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-win32/menu.c:429
msgid "_Terrain"
msgstr "지형(_T)"
-#: client/gui-gtk-2.0/menu.c:968 client/gui-win32/menu.c:430
+#: client/gui-gtk-2.0/menu.c:1011 client/gui-win32/menu.c:430
msgid "Won_ders"
msgstr "불가사ì˜(_D)"
-#: client/gui-gtk-2.0/menu.c:972 client/gui-win32/menu.c:432
+#: client/gui-gtk-2.0/menu.c:1015 client/gui-win32/menu.c:432
msgid "Happin_ess"
msgstr "만족(_E)"
-#: client/gui-gtk-2.0/menu.c:974 client/gui-win32/menu.c:433
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-win32/menu.c:433
msgid "Space _Race"
msgstr "우주 ê²½ìŸ(_R)"
-#: client/gui-gtk-2.0/menu.c:978 client/gui-win32/menu.c:435
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-win32/menu.c:435
msgid "_Copying"
msgstr "복사(_C)"
-#: client/gui-gtk-2.0/menu.c:980 client/gui-win32/menu.c:436
+#: client/gui-gtk-2.0/menu.c:1023 client/gui-win32/menu.c:436
msgid "_About"
msgstr "Freecivì— ëŒ€í•´ì„œ(_A)"
-#: client/gui-gtk-2.0/menu.c:1264
+#: client/gui-gtk-2.0/menu.c:1307
#, c-format
msgid "%s..."
msgstr "%s..."
-#: client/gui-gtk-2.0/menu.c:1352
+#: client/gui-gtk-2.0/menu.c:1397
#, c-format
msgid "Change to %s (_I)"
msgstr "%s(으)로 바꾸기(_I)"
-#: client/gui-gtk-2.0/menu.c:1353
+#: client/gui-gtk-2.0/menu.c:1398
#, c-format
msgid "Change to %s (_M)"
msgstr "%s(으)로 변경(_M)"
-#: client/gui-gtk-2.0/menu.c:1354
+#: client/gui-gtk-2.0/menu.c:1399
#, c-format
msgid "Transf_orm to %s"
msgstr "%s(으)로 개조(_I)"
-#: client/gui-gtk-2.0/menu.c:1427
+#: client/gui-gtk-2.0/menu.c:1472
msgid "Help _Build Wonder"
msgstr "ë¶ˆê°€ì‚¬ì˜ ê±´ì„¤ì„ ë„와주기(_B)"
-#: client/gui-gtk-2.0/menu.c:1441
+#: client/gui-gtk-2.0/menu.c:1486
msgid "Add to City (_B)"
msgstr "ë„시로 추가(_B)"
-#: client/gui-gtk-2.0/menu.c:1449
+#: client/gui-gtk-2.0/menu.c:1494
msgid "Make Trade _Route"
msgstr "ë¬´ì— ê²½ë¡œ 만들기"
-#: client/gui-gtk-2.0/menu.c:1463
+#: client/gui-gtk-2.0/menu.c:1508
msgid "Build _Railroad"
msgstr "ì² ë„ ê±´ì„¤(_R)"
-#: client/gui-gtk-2.0/menu.c:1486
+#: client/gui-gtk-2.0/menu.c:1531
msgid "Bu_ild Farmland"
msgstr "ë†ì§€ 건설(_I)"
-#: client/gui-gtk-2.0/menu.c:1506
+#: client/gui-gtk-2.0/menu.c:1551
msgid "_Fortify"
msgstr "요새화(_F)"
-#: client/gui-gtk-2.0/menu.c:1512
+#: client/gui-gtk-2.0/menu.c:1557
msgid "_Paradrop"
msgstr "공중 낙하(_P)"
@@ -11390,13 +11600,29 @@ msgstr ""
msgid "Pop"
msgstr ""
-#: client/gui-gtk-2.0/messagewin.c:155 client/gui-sdl/messagewin.c:247
+#: client/gui-gtk-2.0/messagewin.c:186 client/gui-sdl/messagewin.c:247
#: client/gui-win32/messagewin.c:132 client/gui-xaw/menu.c:228
#: data/Freeciv.in:3273 data/Freeciv.in:3274 data/Freeciv.in:3283
msgid "Messages"
msgstr "메세지"
-#: client/gui-gtk-2.0/plrdlg.c:330
+#: client/gui-gtk-2.0/plrdlg.c:317
+msgid "_Meet"
+msgstr "회합(_M)"
+
+#: client/gui-gtk-2.0/plrdlg.c:323
+msgid "Cancel _Treaty"
+msgstr "조약 파기(_T)"
+
+#: client/gui-gtk-2.0/plrdlg.c:329
+msgid "_Withdraw Vision"
+msgstr "시야 ì œê±°(_W)"
+
+#: client/gui-gtk-2.0/plrdlg.c:348
+msgid "_Report"
+msgstr "ë³´ê³ (_R)"
+
+#: client/gui-gtk-2.0/plrdlg.c:386
msgid "?show:Dead Players"
msgstr "ì£½ì€ ì‚¬ìš©ìž"
@@ -11404,264 +11630,266 @@ msgstr "ì£½ì€ ì‚¬ìš©ìž"
#. TRANS: Nations report action
#. TRANS: Nations report title
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/plrdlg.c:350 client/gui-sdl/mapctrl.c:1580
+#: client/gui-gtk-2.0/plrdlg.c:406 client/gui-sdl/mapctrl.c:1580
#: client/gui-sdl/plrdlg.c:608 client/gui-win32/plrdlg.c:344
#: client/gui-xaw/menu.c:221 data/Freeciv.in:3192 data/Freeciv.in:3193
msgid "Nations"
msgstr "민족"
-#: client/gui-gtk-2.0/plrdlg.c:443
+#: client/gui-gtk-2.0/plrdlg.c:511
+msgid "Di_plomacy"
+msgstr "외êµ(_P)"
+
+#: client/gui-gtk-2.0/plrdlg.c:516
msgid "_Intelligence"
msgstr "첩보(_I)"
-#: client/gui-gtk-2.0/plrdlg.c:450
-msgid "_Meet"
-msgstr "회합(_M)"
-
-#: client/gui-gtk-2.0/plrdlg.c:457
-msgid "Cancel _Treaty"
-msgstr "조약 파기(_T)"
-
-#: client/gui-gtk-2.0/plrdlg.c:464
-msgid "_Withdraw vision"
-msgstr "시야 ì œê±°(_W)"
-
-#: client/gui-gtk-2.0/plrdlg.c:495
+#: client/gui-gtk-2.0/plrdlg.c:526
msgid "_AI"
msgstr "_AI"
-#: client/gui-gtk-2.0/plrdlg.c:501
+#: client/gui-gtk-2.0/plrdlg.c:532
msgid "_Toggle AI Mode"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:208
+#: client/gui-gtk-2.0/pages.c:221
msgid "Start _New Game"
msgstr "새로운 게임 시작(_N)"
-#: client/gui-gtk-2.0/pages.c:214
+#: client/gui-gtk-2.0/pages.c:227
msgid "Start _Scenario Game"
msgstr "시나리오 게임 시작(_S)"
-#: client/gui-gtk-2.0/pages.c:220
+#: client/gui-gtk-2.0/pages.c:233
msgid "_Load Saved Game"
msgstr "ì €ìž¥ëœ ê²Œìž„ì„ ë¡œë”©(_L)"
-#: client/gui-gtk-2.0/pages.c:229
+#: client/gui-gtk-2.0/pages.c:239
msgid "C_onnect to Network Game"
msgstr "ë„¤íŠ¸ì› ê²Œìž„ì— ì—°ê²°(_O)"
-#: client/gui-gtk-2.0/pages.c:236
+#: client/gui-gtk-2.0/pages.c:247
msgid "Connect to Gaming _Zone"
msgstr "Gaming Zone으로 연결(_Z)"
-#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:300
#: client/gui-xaw/connectdlg.c:326
msgid "Passwords don't match, enter password."
msgstr ""
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:779 client/gui-gtk-2.0/pages.c:820
+#: client/gui-win32/connectdlg.c:916
msgid "Server Name"
msgstr "서버명"
-#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
+#: 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
+#: data/Freeciv.in:96
msgid "Port"
msgstr "í¬íŠ¸"
-#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
+#: client/gui-win32/connectdlg.c:917
msgid "Version"
msgstr "ë²„ì „"
-#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
-#: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
+#: 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
msgid "Status"
msgstr "ìƒíƒœ"
-#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
-#: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
+#: 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
msgid "Players"
msgstr "사용ìž"
-#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
+#: client/gui-win32/connectdlg.c:918
msgid "Comment"
msgstr "비í‰"
-#: client/gui-gtk-2.0/pages.c:747
+#: client/gui-gtk-2.0/pages.c:786
msgid "Local _Area Network"
msgstr "L_AN"
-#: client/gui-gtk-2.0/pages.c:783
+#: client/gui-gtk-2.0/pages.c:827
msgid "Internet _Metaserver"
msgstr "메타서버(_M)"
-#: client/gui-gtk-2.0/pages.c:817
+#: client/gui-gtk-2.0/pages.c:864
msgid "_Host:"
msgstr "호스트:(_H)"
-#: client/gui-gtk-2.0/pages.c:834
+#: client/gui-gtk-2.0/pages.c:881
msgid "_Port:"
msgstr "í¬íŠ¸:(_P)"
-#: client/gui-gtk-2.0/pages.c:851
+#: client/gui-gtk-2.0/pages.c:898
msgid "_Login:"
msgstr "로그ì¸:(_L)"
-#: client/gui-gtk-2.0/pages.c:869
+#: client/gui-gtk-2.0/pages.c:916
msgid "Pass_word:"
msgstr "암호:(_W)"
-#: client/gui-gtk-2.0/pages.c:887
+#: client/gui-gtk-2.0/pages.c:934
msgid "Conf_irm Password:"
msgstr "암호 확ì¸:(_I)"
-#: client/gui-gtk-2.0/pages.c:912
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: 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/wldlg.c:800 client/gui-win32/wldlg.c:806
+msgid "Type"
+msgstr "형ì‹"
+
+#: client/gui-gtk-2.0/pages.c:952 client/gui-win32/plrdlg.c:337
+#: data/Freeciv.in:88
+msgid "Host"
+msgstr "호스트"
+
+#: client/gui-gtk-2.0/pages.c:981
msgid "C_onnect"
msgstr "ì—°ê²°(_O)"
-#: client/gui-gtk-2.0/pages.c:1142
+#: client/gui-gtk-2.0/pages.c:1211
#, c-format
msgid "Connection name: %s"
msgstr "ì—°ê²° ì´ë¦„: %s"
-#: client/gui-gtk-2.0/pages.c:1145
+#: client/gui-gtk-2.0/pages.c:1214
#, c-format
msgid "Player name: %s"
msgstr "사용ìžëª…: %s"
-#: client/gui-gtk-2.0/pages.c:1150
+#: client/gui-gtk-2.0/pages.c:1219
#, c-format
msgid "Host: %s"
msgstr "호스트: %s"
-#: client/gui-gtk-2.0/pages.c:1158
+#: client/gui-gtk-2.0/pages.c:1227
msgid "Player/conn info"
msgstr "사용ìž/ì ‘ì† ì •ë³´"
-#: client/gui-gtk-2.0/pages.c:1185
+#: client/gui-gtk-2.0/pages.c:1254
#, c-format
msgid "%s info"
msgstr "%s ì •ë³´"
-#: client/gui-gtk-2.0/pages.c:1196
+#: client/gui-gtk-2.0/pages.c:1265
msgid "Toggle player ready"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1204
+#: client/gui-gtk-2.0/pages.c:1273
msgid "Pick nation"
msgstr "ë¯¼ì¡±ì„ ì„ íƒ"
-#: client/gui-gtk-2.0/pages.c:1214
+#: client/gui-gtk-2.0/pages.c:1283
msgid "Observe this player"
msgstr "ì´ í”Œë ˆì´ì–´ë¥¼ 관찰하기"
-#: client/gui-gtk-2.0/pages.c:1221
+#: client/gui-gtk-2.0/pages.c:1290
msgid "Take this player"
msgstr "ì´ ì‚¬ìš©ìž ë°ë ¤ì˜¤ê¸°"
-#: client/gui-gtk-2.0/pages.c:1238
+#: client/gui-gtk-2.0/pages.c:1307
msgid "Cut connection"
msgstr "ì—°ê²° ëŠê¸°"
-#: client/gui-gtk-2.0/pages.c:1248
+#: client/gui-gtk-2.0/pages.c:1317
msgid "Aitoggle player"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1257
+#: client/gui-gtk-2.0/pages.c:1326
msgid "Remove player"
msgstr "ì‚¬ìš©ìž ì œê±°"
-#: client/gui-gtk-2.0/pages.c:1268
+#: client/gui-gtk-2.0/pages.c:1337
msgid "Give info access"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1276
+#: client/gui-gtk-2.0/pages.c:1345
msgid "Give ctrl access"
msgstr ""
#. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1338
+#: client/gui-gtk-2.0/pages.c:1407
#, c-format
msgid "Put on %s"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1442
+#: client/gui-gtk-2.0/pages.c:1511
msgid "Number of _Players (including AI):"
msgstr "í”Œë ˆì´ì–´ 수(AI í¬í•¨):"
-#: client/gui-gtk-2.0/pages.c:1465
+#: client/gui-gtk-2.0/pages.c:1534
msgid "AI Skill _Level:"
msgstr "AI ìˆ™ë ¨ ë ˆë²¨:(_L)"
-#: client/gui-gtk-2.0/pages.c:1481
+#: client/gui-gtk-2.0/pages.c:1550
msgid "Ruleset _Version:"
msgstr "룰세트:(_V)"
-#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
msgid "_More Game Options..."
-msgstr "다른 게임 옵션...(_M)"
+msgstr "기타 게임 옵션...(_M)"
-#: client/gui-gtk-2.0/pages.c:1514
+#: client/gui-gtk-2.0/pages.c:1583
msgid "Record"
msgstr "기ë¡"
-#: client/gui-gtk-2.0/pages.c:1519
+#: client/gui-gtk-2.0/pages.c:1588
msgid "Rating"
msgstr "비율"
-#: client/gui-gtk-2.0/pages.c:1525
+#: client/gui-gtk-2.0/pages.c:1594
msgid "Ready"
msgstr "준비"
-#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
-#: data/nation/slovakian.ruleset:26
-msgid "Leader"
+#: client/gui-gtk-2.0/pages.c:1601
+msgid "?player:Leader"
msgstr "지ë„ìž"
-#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1732 client/gui-sdl/chatline.c:185
msgid "Choose Saved Game to Load"
msgstr "로드하기 위해 ì €ìž¥ëœ ê²Œìž„ì„ ì„ íƒí•˜ì„¸ìš”"
-#: client/gui-gtk-2.0/pages.c:1752
+#: client/gui-gtk-2.0/pages.c:1824
msgid "Choose Saved Game to _Load:"
msgstr "로드하기 위해 ì €ìž¥ëœ ê²Œìž„ì„ ì„ íƒí•˜ì„¸ìš”:"
-#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
-#: client/gui-gtk-2.0/pages.c:2375
+#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
+#: client/gui-gtk-2.0/pages.c:2451
msgid "_Browse..."
msgstr "찾아보기(_B)"
-#: client/gui-gtk-2.0/pages.c:1839
+#: client/gui-gtk-2.0/pages.c:1911
msgid "Choose a Scenario"
msgstr "시나리오 ì„ íƒ"
-#: client/gui-gtk-2.0/pages.c:1926
+#: client/gui-gtk-2.0/pages.c:1998
msgid "Choose a _Scenario:"
msgstr "시나리오 ì„ íƒ:(_S)"
-#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
-#: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
-#: client/gui-win32/wldlg.c:806
-msgid "Type"
-msgstr "형ì‹"
-
-#: client/gui-gtk-2.0/pages.c:2101
+#: client/gui-gtk-2.0/pages.c:2173
msgid "Choose a _nation to play:"
msgstr "ë¯¼ì¡±ì„ ì„ íƒí•˜ì„¸ìš”:(_N)"
-#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2363 client/gui-win32/menu.c:581
msgid "Select Location to Save"
msgstr "ì €ìž¥í•˜ê¸° 위한 장소 ì„ íƒ"
-#: client/gui-gtk-2.0/pages.c:2372 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2448 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr "게임 ì €ìž¥"
-#: client/gui-gtk-2.0/pages.c:2413
+#: client/gui-gtk-2.0/pages.c:2489
msgid "Saved _Games:"
msgstr "ì €ìž¥ëœ ê²Œìž„ë“¤ :"
-#: client/gui-gtk-2.0/pages.c:2440
+#: client/gui-gtk-2.0/pages.c:2516
msgid "Save _Filename:"
msgstr "파ì¼ì´ë¦„ ì €ìž¥ :"
@@ -12002,7 +12230,7 @@ msgstr "창 닫기 (Esc)"
msgid "Total users logged in : %d"
msgstr ""
-#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1094
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
msgid "Back"
msgstr "뒤로"
@@ -12011,7 +12239,7 @@ msgid "Start"
msgstr "시작"
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:775
+#: client/gui-win32/connectdlg.c:777
msgid "Load Game"
msgstr "로드 게임"
@@ -12048,12 +12276,12 @@ msgid "Make new homecity"
msgstr ""
#: client/gui-sdl/citydlg.c:546 client/gui-sdl/citydlg.c:1418
-#: client/gui-sdl/connectdlg.c:307 client/gui-sdl/connectdlg.c:616
-#: client/gui-sdl/connectdlg.c:802 client/gui-sdl/connectdlg.c:984
+#: 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/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1039
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
#: 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
@@ -12098,7 +12326,7 @@ msgstr "êµ¬ìž…í•˜ì‹œê² ìŠµë‹ˆê¹Œ?"
#: client/gui-sdl/diplodlg.c:1335 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:2427
+#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
#: client/gui-xaw/cityrep.c:666 client/gui-xaw/cma_fe.c:327
#: client/gui-xaw/cma_fe.c:511 client/gui-xaw/cma_fe.c:765
#: client/gui-xaw/messagedlg.c:72 client/gui-xaw/optiondlg.c:76
@@ -12114,7 +12342,7 @@ msgstr "아니오"
#: client/gui-sdl/diplodlg.c:1345 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:2427 client/gui-xaw/cityrep.c:666
+#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
#: client/gui-xaw/cma_fe.c:327 client/gui-xaw/cma_fe.c:511
#: client/gui-xaw/cma_fe.c:765 client/gui-xaw/messagedlg.c:72
#: client/gui-xaw/optiondlg.c:76 client/gui-xaw/optiondlg.c:304
@@ -12389,36 +12617,36 @@ msgstr ""
msgid "Release city"
msgstr ""
-#: client/gui-sdl/connectdlg.c:238
+#: client/gui-sdl/connectdlg.c:239
msgid "Creating Server List..."
msgstr "서버 리스트를 ë§Œë“¤ê³ ìžˆìŠµë‹ˆë‹¤..."
-#: client/gui-sdl/connectdlg.c:279 client/gui-sdl/connectdlg.c:343
+#: client/gui-sdl/connectdlg.c:280 client/gui-sdl/connectdlg.c:344
msgid "No LAN servers found"
msgstr "LAN서버를 못 찾았습니다"
-#: client/gui-sdl/connectdlg.c:281 client/gui-sdl/connectdlg.c:345
+#: client/gui-sdl/connectdlg.c:282 client/gui-sdl/connectdlg.c:346
msgid "No public servers found"
msgstr "공개서버를 못 찾았습니다"
-#: client/gui-sdl/connectdlg.c:555
+#: client/gui-sdl/connectdlg.c:556
msgid "Player Name :"
msgstr "사용ìžëª… :"
-#: client/gui-sdl/connectdlg.c:571
+#: client/gui-sdl/connectdlg.c:572
msgid "Freeciv Server :"
msgstr "Freeciv 서버 :"
-#: client/gui-sdl/connectdlg.c:588
+#: client/gui-sdl/connectdlg.c:589
msgid "Port :"
msgstr "í¬íŠ¸ :"
-#: client/gui-sdl/connectdlg.c:608 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr "ì—°ê²°"
-#: client/gui-sdl/connectdlg.c:794 client/gui-sdl/connectdlg.c:977
+#: client/gui-sdl/connectdlg.c:795 client/gui-sdl/connectdlg.c:978
#: client/gui-xaw/connectdlg.c:145
msgid "Next"
msgstr "다ìŒ"
@@ -12695,7 +12923,7 @@ msgstr ""
#: client/gui-sdl/graphics.c:1021
#, c-format
-msgid "Unable to initialize SDL_ttf library: %s"
+msgid "Unable to initialize SDL_ttf library: %s"
msgstr ""
#: client/gui-sdl/graphics.c:1058
@@ -12780,12 +13008,6 @@ msgstr ""
msgid "Waiting for the beginning of the game"
msgstr ""
-#: client/gui-sdl/gui_string.c:608
-msgid ""
-"Couldn't find stdfont.ttf file. Please link/copy/move anyunicode ttf font to "
-"data dir as stdfont.ttf"
-msgstr ""
-
#. TRANS: Future Technology
#: client/gui-sdl/gui_tilespec.c:506
msgid "FT"
@@ -13365,12 +13587,12 @@ msgid "Leave Game"
msgstr "게임 나가기"
#: client/gui-sdl/optiondlg.c:2302 client/gui-sdl/pages.c:255
-#: client/gui-win32/connectdlg.c:1098 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1100 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:963
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
msgid "Start New Game"
msgstr "새로운 게임 시작"
@@ -13482,8 +13704,8 @@ msgstr "순수입: "
msgid "%s max rate : %d%%"
msgstr "%s 최대율 : %d%%"
-#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1081
-#: client/gui-win32/connectdlg.c:1089 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
+#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
msgid "Update"
msgstr "세로 ê³ ì¹¨"
@@ -13745,7 +13967,7 @@ msgstr "ë„ì‹œ 개괄"
#: client/gui-win32/citydlg.c:725 client/gui-win32/wldlg.c:1088
#: client/gui-win32/wldlg.c:1138
msgid "Worklist"
-msgstr "작업목ë¡"
+msgstr "작업리스트"
#: client/gui-win32/citydlg.c:727 data/Freeciv.in:2231
msgid "Trade Routes"
@@ -13929,10 +14151,6 @@ msgstr ""
msgid "Refresh"
msgstr "ìƒˆë¡œê³ ì¹¨"
-#: client/gui-win32/cityrep.c:882
-msgid "Select"
-msgstr "ì„ íƒ"
-
#: client/gui-win32/cityrep.c:883
msgid "Configure"
msgstr ""
@@ -13982,55 +14200,55 @@ msgstr "세ì´ë¸Œëœ ê²Œìž„ì„ ì½ì„수가 없습니다"
msgid "Verify Password"
msgstr "암호 ìˆ˜ì •"
-#: client/gui-win32/connectdlg.c:912 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr "Freeciv 서버 ì„ íƒ"
-#: client/gui-win32/connectdlg.c:913
+#: client/gui-win32/connectdlg.c:915
msgid "Local Area Network"
msgstr "ì§€ì— ë„¤íŠ¸ì›Œí¬"
-#: client/gui-win32/connectdlg.c:947
+#: client/gui-win32/connectdlg.c:949
msgid "Welcome to Freeciv"
msgstr "Freecivì— ì˜¤ì‹ ê±¸ 환ì˜í•©ë‹ˆë‹¤"
-#: client/gui-win32/connectdlg.c:965
+#: client/gui-win32/connectdlg.c:967
msgid "Load Saved Game"
msgstr "ì €ìž¥ëœ ê²Œìž„ 불러오기"
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
msgid "Connect To Network Game"
msgstr "ë„¤íŠ¸ì›Œí¬ ê²Œìž„ 연결하기"
-#: client/gui-win32/connectdlg.c:977
+#: client/gui-win32/connectdlg.c:979
msgid "Choose a nation to play"
msgstr "í”Œë ˆì´ë¥¼ 위한 êµê°€ì„ íƒ"
-#: client/gui-win32/connectdlg.c:1012
+#: client/gui-win32/connectdlg.c:1014
msgid "Number of players (Including AI):"
msgstr "í”Œë ˆì´ì–´ 수(AI í¬í•¨)"
-#: client/gui-win32/connectdlg.c:1020
+#: client/gui-win32/connectdlg.c:1022
msgid "AI skill level:"
msgstr "AI ìˆ™ë ¨ ë ˆë²¨ :"
-#: client/gui-win32/connectdlg.c:1034 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
msgid "Game Options"
msgstr "게임 ì„¤ì •"
-#: client/gui-win32/connectdlg.c:1038
+#: client/gui-win32/connectdlg.c:1040
msgid "Start Game"
msgstr "게임 시작"
-#: client/gui-win32/connectdlg.c:1057
+#: client/gui-win32/connectdlg.c:1059
msgid "Login:"
msgstr "ë¡œê·¸ì¸ :"
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
msgid "Host:"
-msgstr "호스트 ip :"
+msgstr "호스트 :"
-#: client/gui-win32/connectdlg.c:1060
+#: client/gui-win32/connectdlg.c:1062
msgid "Port:"
msgstr "í¬íŠ¸ :"
@@ -14040,7 +14258,7 @@ msgstr ""
#: client/gui-win32/dialogs.c:555
msgid "Leader:"
-msgstr "지ë„ìž:"
+msgstr "지ë„ìž :"
#: client/gui-win32/dialogs.c:575
msgid "City Style:"
@@ -14282,10 +14500,6 @@ msgid_plural "(idle %d turns)"
msgstr[0] ""
msgstr[1] ""
-#: client/gui-win32/plrdlg.c:337 data/Freeciv.in:88
-msgid "Host"
-msgstr ""
-
#: client/gui-win32/plrdlg.c:355 data/Freeciv.in:3230
msgid "Intelligence"
msgstr "첩보"
@@ -14337,7 +14551,7 @@ msgstr "ì´í•©"
#: client/gui-win32/wldlg.c:362
msgid "Rename Worklist"
-msgstr "ìž‘ì—…ëª©ë¡ ì´ë¦„바꾸기"
+msgstr "작업리스트 ì´ë¦„바꾸기"
#: client/gui-win32/wldlg.c:363 client/gui-xaw/wldlg.c:623
msgid "What should the new name be?"
@@ -14345,7 +14559,7 @@ msgstr "ì´ë¦„ì€ ëë¼ê³ í•˜ê² ìŠµë‹ˆê¹Œ"
#: client/gui-win32/wldlg.c:425 data/Freeciv.in:1973
msgid "Available worklists"
-msgstr "가능한 작업목ë¡"
+msgstr "가능한 작업리스트"
#: client/gui-win32/wldlg.c:429 data/Freeciv.in:1995
msgid "Edit"
@@ -14357,7 +14571,7 @@ msgstr "ë¼ì›Œë„£ê¸°"
#: client/gui-win32/wldlg.c:826 data/Freeciv.in:2113
msgid "Current worklist"
-msgstr "현재 작업목ë¡"
+msgstr "현재 작업리스트"
#: client/gui-win32/wldlg.c:832 data/Freeciv.in:2164
msgid "Up"
@@ -14417,7 +14631,7 @@ msgstr ""
#: client/gui-xaw/citydlg.c:308
msgid "(is empty)"
-msgstr "(비어있ìŒ)"
+msgstr "(비어있슴)"
#: client/gui-xaw/citydlg.c:310
msgid "(in prog.)"
@@ -15169,7 +15383,9 @@ msgstr " í™•ì¸ "
msgid ""
"Name Nation Embassy Dipl.State Vision "
"Reputation State Host"
-msgstr " "
+msgstr ""
+"ì´ë¦„ 민족 대사관 ì™¸êµ ì‹œì•¼ í‰"
+"íŒ ìƒíƒœ 호스트"
#: data/Freeciv.in:3246
msgid "Cancel pact"
@@ -15177,11 +15393,11 @@ msgstr "계약 파기"
#: data/Freeciv.in:3333 data/Freeciv.in:3334
msgid "Pregame"
-msgstr "ê²Œìž„ì „"
+msgstr "게임 ì „"
#: data/Freeciv.in:3350
msgid "Name Ready Leader Nation "
-msgstr "ì´ë¦„ 준비뇜 지ë„ìž ë¯¼ì¡±"
+msgstr "ì´ë¦„ ì¤€ë¹„ë¨ ì§€ë„ìž ë¯¼ì¡± "
#: data/helpdata.txt:38
msgid ""
@@ -15448,7 +15664,7 @@ msgstr ""
#: data/helpdata.txt:567
msgid "Worklist Editor"
-msgstr "ìž‘ì—…ëª©ë¡ íŽ¸ì§‘ê¸°"
+msgstr "작업리스트 편집기"
#: data/helpdata.txt:568
msgid ""
@@ -15741,12 +15957,12 @@ msgstr ""
#: data/helpdata.txt:781
msgid ""
-" To have a diplomatic relationship with another player, you must fist "
-"establish first contact with that player. To establish first contact, you "
-"have to move one of your units next to a city or unit belonging to that "
-"player, or vice versa. Unless you establish an embassy with that player, you "
-"may again lose contact with them after a set number of turns without direct "
-"physical contact."
+" To have a diplomatic relationship with another player, you must first "
+"establish contact with that player. To establish contact, you have to move "
+"one of your units next to a city or unit belonging to that player, or vice "
+"versa. Unless you establish an embassy with that player, you may again lose "
+"contact with them after a set number of turns without direct physical "
+"contact."
msgstr ""
#: data/helpdata.txt:788
@@ -16131,7 +16347,7 @@ msgstr ""
#: data/helpdata.txt:1089
msgid " Combat example 1"
-msgstr "ì „íˆ¬ 예 1"
+msgstr "ì „íˆ¬ ì˜ˆì œ 1"
#: data/helpdata.txt:1090
msgid ""
@@ -16179,7 +16395,7 @@ msgstr ""
#: data/helpdata.txt:1127
msgid " Combat example 2"
-msgstr "ì „íˆ¬ ì˜ˆì œ2"
+msgstr "ì „íˆ¬ ì˜ˆì œ 2"
#: data/helpdata.txt:1128
msgid ""
@@ -17880,7 +18096,7 @@ msgid "Communism"
msgstr "공산주ì˜"
#: data/default/governments.ruleset:121 data/civ2/governments.ruleset:118
-#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:26
+#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:27
msgid "Comrade"
msgstr "ë™ë¬´"
@@ -18747,6 +18963,10 @@ msgid ""
"attacks."
msgstr ""
+#: data/default/units.ruleset:238
+msgid "?unit:Workers"
+msgstr "ë…¸ë™ìž"
+
#: data/default/units.ruleset:264
msgid ""
"Workers are one of the key units in the game. They can be used to irrigate "
@@ -19308,6 +19528,10 @@ msgstr "íƒí—˜ê°€"
msgid "Explorers are very useful for mapping unknown territory."
msgstr ""
+#: data/default/units.ruleset:1864
+msgid "?unit:Leader"
+msgstr "지ë„ìž"
+
#: data/default/units.ruleset:1892
msgid "This is you. If you lose this unit, you lose the game. So don't."
msgstr ""
@@ -19507,7 +19731,7 @@ msgid "Emir"
msgstr "족장"
#: data/nation/afghani.ruleset:25 data/nation/slovakian.ruleset:30
-#: data/nation/soviet.ruleset:27
+#: data/nation/soviet.ruleset:28
msgid "General Secretary"
msgstr "서기장"
@@ -19622,7 +19846,7 @@ msgstr "아르메니아 사람"
msgid ""
"According to legend, the Armenian people are the descendants of Haik - the "
"great-great-grandson of Noah. The modern Republic of Armenia gained "
-"independence from Soviet in 1991 AD"
+"independence from the Soviet Union in 1991."
msgstr ""
#: data/nation/assyrian.ruleset:3
@@ -20569,12 +20793,11 @@ msgstr "ì¼ë¦¬ë¦¬ì•„ 사람"
#: data/nation/illyrian.ruleset:6
msgid ""
-"Illyrians were Indo-European tribes who appeared in the western part of the "
-"Balkan Peninsula before 1000 BC, including the Dalmatians to the north, "
-"Corcyra island and Ambracia bay in prehistoric Epirus to the south, mixing "
-"with Thracians in Dardania to the east, and settling Messapia across the "
-"Adriatic Sea. Illyrian kingdoms were independent for centuries, until "
-"conquered by the Roman Republic."
+"Illyrians were Indo-European tribes who appeared in the western part of the "
+"Balkan Peninsula before 1000 BC, including Corcyra island and Ambracia bay "
+"in prehistoric Epirus to the south. They mixed with Thracians in Dardania to "
+"the east, and settled Messapia across the Adriatic Sea. Illyrian kingdoms "
+"were independent for centuries, until conquered by the Roman Republic."
msgstr ""
#: data/nation/inca.ruleset:3
@@ -20860,7 +21083,7 @@ msgid ""
"1953."
msgstr ""
-#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:28
+#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:29
msgid "Great Leader"
msgstr "위대한 지ë„ìž"
@@ -21018,9 +21241,9 @@ msgstr "ë§ë¦¬ 사람"
msgid ""
"Sub-Saharan Africa has been a cultural and ethnical melting pot for "
"millennia. In medieval times, the region was home to a succession of empires "
-"called the Sahelian kingdoms. Of these, the Islamic Mali empire with it's "
+"called the Sahelian kingdoms. Of these, the Islamic Mali empire with its "
"capital in Timbuktu was the most influential. This empire reigned from the "
-"14th to the 17th century and was famed for it's wealth and benevolent kings. "
+"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 ""
@@ -21080,8 +21303,8 @@ msgstr "마야 사람"
#: data/nation/mayan.ruleset:6
msgid ""
-"The Mayans were a Mesoamerican civilization. Famous for building great "
-"pyramids and palaces in the jungle."
+"The Mayans were a Mesoamerican civilization. They are famous for building "
+"great pyramids and palaces in the jungle."
msgstr ""
#: data/nation/mayan.ruleset:19
@@ -21567,6 +21790,14 @@ msgid ""
"Czechoslovakia, until 1918 it was part of the Austro-Hungarian Empire."
msgstr ""
+#: data/nation/slovakian.ruleset:26
+msgid "?male:Leader"
+msgstr "지ë„ìž"
+
+#: data/nation/slovakian.ruleset:26
+msgid "?female:Leader"
+msgstr "지ë„ìž"
+
#: data/nation/slovakian.ruleset:29
msgid "Pope"
msgstr "êµí™©"
@@ -21605,11 +21836,12 @@ msgstr "소비ì—트 사람"
#: data/nation/soviet.ruleset:6
msgid ""
-"Soviet Union's history starts in November 1917, when under Lenin's "
+"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 "
-"republics integrated into one country. Soviet Union became one of most "
-"powerful states in the 20th century. But by the end of 1991 due to many "
-"social shocks it disintegrated into fifteen independent countries"
+"republics integrated into one country. The Soviet Union became one of most "
+"powerful states in the 20th century, but by the end of 1991 it had "
+"disintegrated into fifteen independent countries due to social and economic "
+"problems."
msgstr ""
#: data/nation/spanish.ruleset:3
@@ -21976,8 +22208,8 @@ msgstr "ë² ìŠ¤íŠ¸íŒ”ë¦¬ì•„ 사람"
#: data/nation/westphalian.ruleset:6
msgid ""
-"Westphalia, before becoming a Prussian province, was the western region the "
-"duchy of Saxony. Present-day it consists of the Northern part of the largest "
+"Westphalia, before becoming a Prussian province, was the western region of "
+"the duchy of Saxony. Today it makes up the northern part of the largest "
"German federal state, North Rhine-Westphalia."
msgstr ""
@@ -22165,7 +22397,7 @@ msgid ""
"The flag and background color indicate what civilization the city\n"
"belongs to (this will be useful when you meet other civilizations).\n"
"The top row of the bar also shows the name and size of the city, and\n"
-"will show one or more starts to indicate if there are units in the\n"
+"will show one or more stars to indicate if there are units in the\n"
"city. The bottom row shows what the city is building, and how long it\n"
"will take; it also shows how long the city will take to grow to the\n"
"next largest size."
@@ -22221,7 +22453,7 @@ msgid ""
"Now your city has grown to size five. As cities get larger unrest\n"
"becomes a problem. A city of this size will usually have one unhappy\n"
"citizen unless pacifying effects are used; meaning one entertainer\n"
-"specialist is required to keep your citzens content. This is basically\n"
+"specialist is required to keep your citizens content. This is basically\n"
"a wasted citizen.\n"
"\n"
"There are several things that can be done about this. One quick fix\n"
@@ -22293,7 +22525,7 @@ msgid ""
"existing cities. Generally when building new cities you want to make\n"
"sure that all tiles are covered by at least one city, but after that\n"
"it is best that your cities overlap as little as possible. Spreading\n"
-"out cities properly gives each city access to more resrouces, allowing\n"
+"out cities properly gives each city access to more resources, allowing\n"
"them to grow to larger sizes."
msgstr ""
diff --git a/po/lt.gmo b/po/lt.gmo
index cbfe33e..f39cd9b 100644
Binary files a/po/lt.gmo and b/po/lt.gmo differ
diff --git a/po/lt.po b/po/lt.po
index 76905a8..cbc7a37 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: freeciv\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 07:45+0900\n"
+"POT-Creation-Date: 2009-03-29 21:13+0900\n"
"PO-Revision-Date: 2007-12-16 11:12+0300\n"
"Last-Translator: Andrius Å tikonas <stikonas at gmail.com>\n"
"Language-Team: Lithuanian <komp_lt at konferencijos.lt>\n"
@@ -635,7 +635,7 @@ msgid "Road"
msgstr "Kelias"
#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
-#: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
+#: client/gui-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"
@@ -652,7 +652,7 @@ msgid "Mine"
msgstr "Kasykla"
#: common/terrain.c:396 common/unit.c:548 server/report.c:124
-#: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
+#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr "Tarša"
@@ -698,7 +698,7 @@ msgstr "Įtvirtinta"
msgid "Sentry"
msgstr "Sargyba"
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:851 client/gui-sdl/menu.c:648
+#: common/unit.c:566 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"
@@ -715,7 +715,7 @@ msgstr "TyrinÄ—ti"
msgid "Transform"
msgstr "Keisti"
-#: common/unit.c:584 client/text.c:106 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:584 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"
@@ -784,11 +784,11 @@ msgstr "Branduolinis_ginklas"
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1406
+#: common/unittype.c:349 client/helpdata.c:1404
msgid " and "
msgstr " ir "
-#: common/unittype.c:355 client/helpdata.c:1392
+#: common/unittype.c:355 client/helpdata.c:1390
msgid "?and:, "
msgstr "?and:, "
@@ -1429,31 +1429,26 @@ msgid "Illegal value for auth port: \"%s\""
msgstr ""
#: server/auth.c:281
-#, fuzzy, c-format
-msgid "Auth config filename \"%s\" not allowed!"
-msgstr "Šis vardas neleidžiamas"
-
-#: server/auth.c:286
#, c-format
msgid "Cannot load auth config file \"%s\"!"
msgstr "Nepavyksta įkelti konfigūracinio failo „%s“!"
-#: server/auth.c:397
+#: server/auth.c:392
#, c-format
msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
msgstr ""
"Ä®spÄ—jimas: sveÄio vardas „%s“ jau užimtas, vartotojas pervadinamas į „%s“."
-#: server/auth.c:404
+#: server/auth.c:399
msgid "Guests are not allowed on this server. Sorry."
msgstr "SveÄiai į šį serverį neįleidžiami. Apgailestaujame"
-#: server/auth.c:406
+#: server/auth.c:401
#, c-format
msgid "%s was rejected: Guests not allowed."
msgstr "%s atmestas: SveÄiai neįleidžiami."
-#: server/auth.c:425
+#: server/auth.c:420
#, c-format
msgid ""
"There was an error reading the user database, logging in as guest connection "
@@ -1462,7 +1457,7 @@ msgstr ""
"Ä®vyko klaida skaitant vartotojų duomenų bazÄ™, todÄ—l jungiamasi sveÄio "
"vartotoju '%s'."
-#: server/auth.c:431
+#: server/auth.c:426
msgid ""
"There was an error reading the user database and guest logins are not "
"allowed. Sorry"
@@ -1470,42 +1465,42 @@ msgstr ""
"Ä®vyko klaida skaitant vartotojų duomenų bazÄ™ ir sveÄių prisijungimai "
"negalimi. Apgailestaujame."
-#: server/auth.c:434
+#: server/auth.c:429
#, c-format
msgid "%s was rejected: Database error and guests not allowed."
msgstr "%s buvo atmestas: Klaida duomenų bazÄ—je ir sveÄiai neleidžiami."
-#: server/auth.c:441
+#: server/auth.c:436
#, c-format
msgid "Enter password for %s:"
msgstr "Įveskite %s slaptažodį:"
-#: server/auth.c:450
+#: server/auth.c:445
msgid "Enter a new password (and remember it)."
msgstr "Įveskite naują slaptažodį(ir jį prisiminkite)."
-#: server/auth.c:456
+#: server/auth.c:451
msgid "This server allows only preregistered users. Sorry."
msgstr ""
"Prie serverio jungtis leidžiama tik registruotiems vartotojams. "
"Apgailestaujame."
-#: server/auth.c:459
+#: server/auth.c:454
#, c-format
msgid "%s was rejected: Only preregister users allowed."
msgstr "%s buvo atmestas, nes leidžiami tik registruoti vartotojai."
-#: server/auth.c:488 server/auth.c:547
+#: server/auth.c:483 server/auth.c:542
msgid "Sorry, too many wrong tries..."
msgstr "Apgailestaujame, per daug blogų bandymų..."
-#: server/auth.c:489
+#: server/auth.c:484
#, c-format
msgid "%s was rejected: Too many wrong password verifies for new user."
msgstr ""
"%s buvo atmestas: Per daug blogų slaptažodžio patvirtinimų naujam vartotojui."
-#: server/auth.c:505
+#: server/auth.c:500
msgid ""
"Warning: There was an error in saving to the database. Continuing, but your "
"stats will not be saved."
@@ -1513,33 +1508,33 @@ msgstr ""
"Įspėjimas: Saugant į duombazę įvyko klaida. Tęsiama, bet jūsų rezultatai "
"nebus išsaugomi."
-#: server/auth.c:549
+#: server/auth.c:544
#, c-format
msgid "%s was rejected: Too many wrong password tries."
msgstr ""
"%s buvo atmestas: Per daug blogų bandymų įvedant neteisingą slaptažodį."
-#: server/auth.c:558
+#: server/auth.c:553
msgid "Your password is incorrect. Try again."
msgstr "Jūsų slaptažodis klaidingas. Bandykite dar kartą."
-#: server/auth.c:569
+#: server/auth.c:564
msgid "Sorry, your connection timed out..."
msgstr "Deja, Jūsų jungimosi laikas baigėsi."
-#: server/auth.c:571
+#: server/auth.c:566
#, c-format
msgid "%s was rejected: Connection timeout waiting for password."
msgstr "%s buvo atmestas: belaukiant slaptažodžio baigėsi jungimosi laikas."
-#: server/auth.c:636
+#: server/auth.c:631
#, c-format
msgid "Your password is too short, the minimum length is %d. Try again."
msgstr ""
"Jūsų slaptažodis yra per trumpas, mažiausias ilgis yra %d. Pabandykite dar "
"kartÄ…."
-#: server/auth.c:642
+#: server/auth.c:637
#, c-format
msgid ""
"The password must have at least %d capital letters, %d numbers, and be at "
@@ -2054,7 +2049,7 @@ msgstr "Tai yra %s serveris"
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:237 manual/civmanual.c:380
+#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
@@ -2080,12 +2075,12 @@ msgstr ""
msgid " -b --bind ADDR\tListen for clients on ADDR\n"
msgstr ""
-#: server/civserver.c:217 client/civclient.c:241
+#: server/civserver.c:217 client/civclient.c:242
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:245
+#: server/civserver.c:221 client/civclient.c:246
msgid " -d, --debug NUM\tSet debug log level (0 to 3)\n"
msgstr ""
@@ -2093,7 +2088,7 @@ msgstr ""
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:248 manual/civmanual.c:382
+#: server/civserver.c:225 client/civclient.c:249 manual/civmanual.c:382
msgid " -h, --help\t\tPrint a summary of the options\n"
msgstr ""
@@ -2141,11 +2136,11 @@ msgstr ""
msgid " -R, --Ranklog FILE\tUse FILE as ranking logfile\n"
msgstr ""
-#: server/civserver.c:247 client/civclient.c:267 manual/civmanual.c:383
+#: server/civserver.c:247 client/civclient.c:268 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:279
+#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, c-format
@@ -3266,7 +3261,7 @@ msgstr "%s sukÄ—lÄ— incidentÄ… bandydamas sukelti sukilimÄ… mieste %s."
msgid "Sea moving start units are not yet supported. Nobody gets %s."
msgstr "JÅ«riniai daliniai dar nepalaikomi. Nieks negauna %s."
-#: server/gamehand.c:310 client/text.c:632
+#: server/gamehand.c:310 client/text.c:691
#, c-format
msgid "Year: %s"
msgstr "Metai: %s"
@@ -3550,10 +3545,10 @@ 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
-#, c-format
+#, fuzzy, c-format
msgid ""
-"Your nation is thrust into civil war, %s is declared the leader of the "
-"rebel states."
+"Your nation is thrust into civil war! %s is declared the leader of the rebel "
+"states."
msgstr ""
"Jūsų valstybėje kilo pilietinis karas, %s pasiskelbė sukilusių valstijų "
"vadu."
@@ -3651,7 +3646,7 @@ msgstr "Mokslinių tyrinėjimų greitis"
msgid "Literacy"
msgstr "Raštingumas"
-#: server/report.c:121 client/cityrepdata.c:526 client/cityrepdata.c:527
+#: server/report.c:121 client/cityrepdata.c:524 client/cityrepdata.c:525
#: client/gui-sdl/cityrep.c:174
msgid "Production"
msgstr "Produkcija"
@@ -3805,7 +3800,7 @@ 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:766
+#: server/report.c:743 server/report.c:768
msgid "Demographics Report:"
msgstr "Demografų ataskaita:"
@@ -3813,10 +3808,12 @@ msgstr "Demografų ataskaita:"
msgid "Sorry, the Demographics report is unavailable."
msgstr "Apgailestaujame, taÄiau demografinÄ— ataskaita negalima."
-#: server/report.c:748
-#, c-format
-msgid "The %s of the %s (%s)"
-msgstr ""
+#. TRANS: <nation adjective> <government name> (<year>).
+#. * E.g. "Polish Despotism (200 AD)".
+#: server/report.c:750
+#, fuzzy, c-format
+msgid "%s %s (%s)"
+msgstr "%s esantis %s (%s)\n"
#. TRANS: message about an installation error.
#: server/ruleset.c:163
@@ -3867,14 +3864,6 @@ msgstr ""
msgid "%s had invalid nation; changing to %s."
msgstr ""
-#. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4073
-#, c-format
-msgid ""
-"Illegal alliance structure detected: %s alliance to %s reduced to peace "
-"treaty."
-msgstr ""
-
#: server/settings.c:32
msgid "Geological"
msgstr "Geologiniai"
@@ -4817,8 +4806,8 @@ msgstr "Auto-išsaugojimo vardo priešdėlis"
#: server/settings.c:1016
msgid ""
-"Automatically saved games will have name \"<prefix><year>.sav\". This "
-"setting sets the <prefix> part."
+"Automatically saved games will have name \"<prefix>-T<turn>-Y<year>.sav\". "
+"This setting sets the <prefix> part."
msgstr ""
#: server/settings.c:1023
@@ -4832,12 +4821,12 @@ msgid ""
"the game."
msgstr ""
-#: server/sernet.c:147
+#: server/sernet.c:150
msgid "Server cannot read standard input. Ignoring input."
msgstr ""
"Serveris negali nuskaityti standartinės įvesties. Įvesties ignoruojama."
-#: server/sernet.c:922
+#: server/sernet.c:929
#, c-format
msgid "Server: bad address: [%s:%d]."
msgstr "Serveris: blogas adresas: [%s:%d]."
@@ -4959,112 +4948,112 @@ msgstr ""
"%s ir %s susitiko ir vienas kitam paskelbÄ— karÄ…. JÅ«s nutraukiate sÄ…jungÄ… su "
"abiem."
-#: server/srv_main.c:928
+#: server/srv_main.c:961
#, c-format
msgid "Failed saving game as %s"
msgstr "Nepavyko išsaugoti žaidimo kaip %s"
-#: server/srv_main.c:930
+#: server/srv_main.c:963
#, c-format
msgid "Game saved as %s"
msgstr "Žaidimas išsaugotas kaip %s"
-#: server/srv_main.c:962
+#: server/srv_main.c:994
msgid "The game is already running."
msgstr "Žaidimas jau paleistas."
-#: server/srv_main.c:970
+#: server/srv_main.c:1002
#, c-format
msgid "%s lost control cmdlevel on game start. Use voting from now on."
msgstr ""
-#: server/srv_main.c:977
+#: server/srv_main.c:1009
msgid "Starting game."
msgstr "Paleidžiamas žaidimas."
-#: server/srv_main.c:1039
+#: server/srv_main.c:1071
#, c-format
msgid "request for unknown report (type %d)"
msgstr ""
-#: server/srv_main.c:1104
+#: server/srv_main.c:1136
#, c-format
msgid "Warning: rejecting old client %s"
msgstr "DÄ—mesio: atmetamas senas klientas %s"
-#: server/srv_main.c:1206
+#: server/srv_main.c:1238
#, c-format
msgid "Got a packet of type %d from a dead or observer player"
msgstr ""
-#: server/srv_main.c:1306
+#: server/srv_main.c:1338
msgid "Please choose a non-blank name."
msgstr "Pasirinkite ne tuÅ¡ÄiÄ… vardÄ…"
-#: server/srv_main.c:1322
+#: server/srv_main.c:1354
msgid "That nation is already in use."
msgstr "Å i tauta jau pasirinkta."
-#: server/srv_main.c:1338
+#: server/srv_main.c:1370
#, 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:1359
+#: server/srv_main.c:1391
msgid "Please choose a name containing only ASCII characters."
msgstr ""
-#: server/srv_main.c:1458
+#: server/srv_main.c:1490
#, c-format
msgid "%s nation is not available in this scenario."
msgstr "%s tauta yra negalima Å¡iam scenarijuje."
-#: server/srv_main.c:1464
+#: server/srv_main.c:1496
#, c-format
msgid "%s nation is already in use."
msgstr "%s tauta jau pasirinkta."
-#: server/srv_main.c:1482
+#: server/srv_main.c:1514
#, c-format
msgid "%s is the %s ruler %s."
msgstr "%s yra %s valdovas %s."
-#: server/srv_main.c:1538
+#: server/srv_main.c:1570
#, c-format
msgid "Waiting to start game: %d out of %d players are ready to start."
msgstr ""
-#: server/srv_main.c:1582 server/srv_main.c:1586
+#: server/srv_main.c:1614 server/srv_main.c:1618
#, c-format
msgid "%s has been added as %s level AI-controlled player."
msgstr ""
-#: server/srv_main.c:1728
+#: server/srv_main.c:1760
#, c-format
msgid "Player %d"
msgstr "Žaidėjas %d"
-#: server/srv_main.c:1739 server/srv_main.c:1745
+#: server/srv_main.c:1771 server/srv_main.c:1777
#, c-format
msgid "%s rules the %s."
msgstr "%s valdo %s."
-#: server/srv_main.c:1910
+#: server/srv_main.c:1942
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
msgstr ""
-#: server/srv_main.c:1961
+#: server/srv_main.c:1993
#, c-format
msgid "Sending info to metaserver [%s]"
msgstr "Informacija siunÄiama į metaserverį [%s]"
-#: server/srv_main.c:1992
+#: server/srv_main.c:2024
msgid "The game is over..."
msgstr "Žaidimas baigtas..."
-#: server/srv_main.c:2205
+#: server/srv_main.c:2237
msgid "Now accepting new client connections."
msgstr "Dabar priimami nauji klientų prisijungimai."
@@ -5861,24 +5850,24 @@ msgid "Barbarian"
msgstr "Barbaras"
#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2030 client/gui-sdl/plrdlg.c:645
+#: client/gui-gtk-2.0/pages.c:2102 client/gui-sdl/plrdlg.c:645
#: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
msgid "AI"
msgstr "DI"
#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
+#: 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
msgid "Human"
msgstr "Žmogus"
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
-#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
+#: 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
msgid "Alive"
msgstr "Gyvas"
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
#: client/gui-win32/connectdlg.c:200
msgid "Dead"
msgstr "Miręs"
@@ -6127,9 +6116,9 @@ 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:242
-#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
-#: client/text.c:1201
+#: 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
#, c-format
msgid "?clistmore:, %s"
msgstr ", %s"
@@ -6382,7 +6371,7 @@ msgstr "Tik %s gali atakuoti iš jūros."
msgid "Cannot attack from sea."
msgstr "Negali atakuoti iš jūros."
-#: server/unithand.c:996 server/unittools.c:2103
+#: server/unithand.c:996 server/unittools.c:2137
msgid "Cannot attack unless you declare war first."
msgstr "Negalite atakuoti prieš tai nepasklebę karo."
@@ -6488,102 +6477,102 @@ msgid "%s was upgraded for free to %s."
msgstr "%s nemokamai patobulintas iki %s."
#: server/unittools.c:297
-#, c-format
-msgid "Not enough gold. %s disbanded"
+#, fuzzy, c-format
+msgid "Not enough gold to pay upkeep for %s. Unit disbanded."
msgstr "Nepakanka aukso. IÅ¡montuojamas %s"
-#: server/unittools.c:342
+#: server/unittools.c:343
#, c-format
msgid "Your %s has run out of hit points."
msgstr "Jūsų %s baigėsi gyvybės taškai."
-#: server/unittools.c:358
+#: server/unittools.c:359
#, c-format
msgid "Your %s has been lost on the high seas."
msgstr "JÅ«sų %s buvo prarastas plaÄiosiose jÅ«rose."
-#: server/unittools.c:365
+#: server/unittools.c:366
#, c-format
msgid "Your %s survived on the high seas and became more experienced!"
msgstr "JÅ«sų %s buvo iÅ¡gyveno plaÄiosiose jÅ«rose ir įgavo patirties."
-#: server/unittools.c:376
+#: server/unittools.c:377
#, c-format
msgid "Your %s has been lost on unsafe terrain."
msgstr "Jūsų %s buvo prarastas, nes atsidūrė ant nesaugaus reljefo."
-#: server/unittools.c:430
+#: server/unittools.c:431
#, c-format
msgid "Your %s has returned to refuel."
msgstr "Jūsų %s grįžo pasipildyti degalų."
-#: server/unittools.c:454
+#: server/unittools.c:455
#, c-format
msgid "Your %s has run out of fuel."
msgstr "Jūsų %s pasibaigė degalai."
-#. TRANS: And, <the unit> became ...
-#: server/unittools.c:616
-#, fuzzy
-msgid "And, became more experienced!"
-msgstr " ir dalinys įgavo patirties!"
-
#. TRANS: Your <unit> became ...
-#: server/unittools.c:620
+#: server/unittools.c:619
#, c-format
msgid "Your %s became more experienced!"
msgstr "Jūsų %s tapo labiau patyręs!"
-#: server/unittools.c:1011
+#: server/unittools.c:1009
#, c-format
msgid "Teleported your %s to %s."
msgstr "Jūsų %s teleportuotas į %s."
-#: server/unittools.c:1041
+#. TRANS: A unit is moved to resolve stack conflicts.
+#: server/unittools.c:1065
+#, fuzzy, c-format
+msgid "Moved your %s."
+msgstr "Išmontuotas Jūsų %s."
+
+#: server/unittools.c:1076
#, c-format
msgid "Disbanded your %s."
msgstr "Išmontuotas Jūsų %s."
-#: server/unittools.c:1363
+#: server/unittools.c:1397
#, c-format
msgid "Unable to defend %s, %s has lost the game."
msgstr "Negalime apginti %s, %s pralošė žaidimą."
-#: server/unittools.c:1367
+#: server/unittools.c:1401
#, 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:1469
+#: server/unittools.c:1503
#, 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:1478
+#: server/unittools.c:1512
#, c-format
msgid "%s lost when %s was lost."
msgstr "%s prarastas, kai %s buvo prarastas."
-#: server/unittools.c:1527
+#: server/unittools.c:1561
#, 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:1545
+#: server/unittools.c:1579
#, 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:1554 server/unittools.c:1612
+#: server/unittools.c:1588 server/unittools.c:1646
#, 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:1588
+#: server/unittools.c:1622
#, c-format
msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
msgid_plural ""
@@ -6594,14 +6583,14 @@ msgstr[2] ""
#. TRANS: "Cannon lost when the Polish Destroyer
#. * attacked the German Musketeers."
-#: server/unittools.c:1621
+#: server/unittools.c:1655
#, 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:1636
+#: server/unittools.c:1670
#, c-format
msgid "%s (and %s) lost to an attack from the %s %s."
msgstr ""
@@ -6609,7 +6598,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:1646
+#: server/unittools.c:1680
#, 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."
@@ -6620,7 +6609,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:1660
+#: server/unittools.c:1694
#, 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."
@@ -6628,187 +6617,187 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: server/unittools.c:1928
+#: server/unittools.c:1962
#, c-format
msgid "Your %s was nuked by %s."
msgstr "Ant Jūsų %s buvo numesta branduolinė bomba, kurią numetė %s."
-#: server/unittools.c:1931 server/unittools.c:1947
+#: server/unittools.c:1965 server/unittools.c:1981
msgid "yourself"
msgstr "patį save"
-#: server/unittools.c:1935
+#: server/unittools.c:1969
#, fuzzy, c-format
msgid "The %s %s was nuked."
msgstr "Ant %s %s buvo numesta branduolinÄ— bomba."
-#: server/unittools.c:1944
+#: server/unittools.c:1978
#, c-format
msgid "%s was nuked by %s."
msgstr "Ant %s buvo numesta branduolinÄ— bomba. JÄ… numetÄ— %s."
-#: server/unittools.c:1952
+#: server/unittools.c:1986
#, c-format
msgid "You nuked %s."
msgstr "JÅ«s numetÄ—te branduolinÄ™ bombÄ… ant %s."
-#: server/unittools.c:1993
+#: server/unittools.c:2027
#, fuzzy, c-format
msgid "The %s detonated a nuke!"
msgstr "%s susprogdino branduolinÄ™ bombÄ…!"
-#: server/unittools.c:2017
+#: server/unittools.c:2051
#, c-format
msgid "%s transported successfully."
msgstr "%s sÄ—kmingai transportuotas."
-#: server/unittools.c:2069
+#: server/unittools.c:2103
msgid "This unit type can not be paradropped."
msgstr "Šio tipo dalinys negali būti nuliestas parašiutu."
-#: server/unittools.c:2079
+#: server/unittools.c:2113
#, fuzzy
msgid "You cannot paradrop a unit that is transporting other units."
msgstr "Negalite nuleisti parašiutu trasportinio dalinio."
-#: server/unittools.c:2085
+#: server/unittools.c:2119
msgid "The destination location is not known."
msgstr "Tikslo vieta nežinoma."
-#: server/unittools.c:2092
+#: server/unittools.c:2126
#, c-format
msgid "This unit cannot paradrop into %s."
msgstr "Šitas dalinys negali nusileisti parašiutu į %s."
-#: server/unittools.c:2112
+#: server/unittools.c:2146
#, 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:2123
+#: server/unittools.c:2157
#, 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:2136
+#: server/unittools.c:2170
#, 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:2158
+#: server/unittools.c:2192
#, c-format
msgid "You found %d gold."
msgstr "JÅ«s radote %d aukso."
-#: server/unittools.c:2175
+#: server/unittools.c:2209
#, c-format
msgid "You found %s in ancient scrolls of wisdom."
msgstr "JÅ«s atradote %s senoviniuose iÅ¡minties rankraÅ¡Äiuose."
-#: server/unittools.c:2182
+#: server/unittools.c:2216
#, 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:2196
+#: server/unittools.c:2230
msgid "A band of friendly mercenaries joins your cause."
msgstr "Prie Jūsų prisijungia draugiškų samdinių būrys."
-#: server/unittools.c:2214
+#: server/unittools.c:2248
msgid "An abandoned village is here."
msgstr "ÄŒia yra apleista gyvenvietÄ—."
-#: server/unittools.c:2224
+#: server/unittools.c:2258
msgid "You have unleashed a horde of barbarians!"
msgstr "Jūs išlaisvinote barbarų ordą."
-#: server/unittools.c:2227
+#: server/unittools.c:2261
#, c-format
msgid "Your %s has been killed by barbarians!"
msgstr "Jūsų %s buvo užmuštas barbarų!"
-#: server/unittools.c:2243
+#: server/unittools.c:2277
msgid "You found a friendly city."
msgstr "Jūs radote draugišką miestą."
-#: server/unittools.c:2257
+#: server/unittools.c:2291
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:2282
+#: server/unittools.c:2316
msgid "Your overflight frightens the tribe; they scatter in terror."
msgstr ""
-#: server/unittools.c:2540
+#: server/unittools.c:2574
#, 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:2989
+#: server/unittools.c:3023
#, 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:3041
+#: server/unittools.c:3075
#, c-format
msgid "Orders for %s aborted because building of city failed."
msgstr "Dalinio %s įsakymai nutraukti, nes žlugo miesto statyba."
-#: server/unittools.c:3054
+#: server/unittools.c:3088
#, 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:3068
+#: server/unittools.c:3102
#, 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:3078
+#: server/unittools.c:3112
#, 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:3104
+#: server/unittools.c:3138
#, c-format
msgid "Orders for %s aborted because of failed move."
msgstr "Dalinio %s įsakymai nutraukti dėl blogo ėjimo."
-#: server/unittools.c:3145
+#: server/unittools.c:3179
#, c-format
msgid "Attempt to change homecity for %s failed."
msgstr "Bandymas daliniui %s pakeisti namų miestą žlugo."
-#: server/unittools.c:3156
+#: server/unittools.c:3190
#, c-format
msgid "Attempt to establish trade route for %s failed."
msgstr "Bandymas sukurti prekybos kelią miestui %s žlugo."
-#: server/unittools.c:3168
+#: server/unittools.c:3202
#, c-format
msgid "Attempt to build wonder for %s failed."
msgstr "Pastangos pastatyti stebukla mieste %s žlugo."
-#: server/unittools.c:3177
+#: server/unittools.c:3211
#, c-format
msgid "Your %s has invalid orders."
msgstr "Jūsų %s gavo klaidingus nurodymus."
-#: server/generator/mapgen.c:1737
+#: 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."
-#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
+#: server/generator/mapgen.c:1969 server/generator/mapgen.c:2039
#, c-format
msgid "Falling back to generator %d."
msgstr "Grįžtama į generatorių %d."
-#: server/generator/mapgen.c:2025
+#: server/generator/mapgen.c:2059
msgid "Generator 3 didn't place all big islands."
msgstr "3 generatorius nepaskirstė didelių salų."
-#: server/generator/mapgen.c:2054
+#: server/generator/mapgen.c:2088
#, c-format
msgid "Generator 3 left %li landmass unplaced."
msgstr "3 generatorius paliko %li sausumos nepaskirstęs."
@@ -6912,7 +6901,7 @@ msgstr[0] "%3d Ä—jimas"
msgstr[1] "%3d Ä—jimai"
msgstr[2] "%3d ėjimų"
-#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:631
#: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
@@ -7031,343 +7020,343 @@ msgstr "?city_state:Taika"
msgid "(worklist)"
msgstr "(darbų sąrašas)"
-#: client/cityrepdata.c:447
-msgid "Special"
-msgstr "Specialūs"
+#: client/cityrepdata.c:446
+msgid "?city:Name"
+msgstr "?city:Pavadinimas"
-#: client/cityrepdata.c:448
-msgid "?entertainers/scientists/taxmen:E/S/T"
-msgstr ""
+#: client/cityrepdata.c:446 client/gui-sdl/cityrep.c:169
+msgid "City Name"
+msgstr "Miesto pavadinimas"
-#: client/cityrepdata.c:449
-msgid "Entertainers, Scientists, Taxmen"
-msgstr "Paslaugų teikÄ—jai, mokslininkai, mokesÄių rinkÄ—jai"
+#: client/cityrepdata.c:448
+msgid "?size [short]:Sz"
+msgstr "?size [short]:Dy"
-#: client/cityrepdata.c:452
-#, fuzzy
-msgid "Concise + Rapture, - Disorder"
-msgstr "+ Susižavėjęs, - Netvarka"
+#: client/cityrepdata.c:448
+msgid "Size"
+msgstr "Dydis"
-#: client/cityrepdata.c:454 client/plrdlg_common.c:261
+#: client/cityrepdata.c:450 client/plrdlg_common.c:261
#: client/gui-win32/plrdlg.c:337
msgid "State"
msgstr "BÅ«sena"
-#: client/cityrepdata.c:454
+#: client/cityrepdata.c:450
msgid "Rapture/Peace/Disorder"
msgstr "Susižavėjęs/Taika/Netvarka"
+#: client/cityrepdata.c:452
+#, fuzzy
+msgid "Concise *=Rapture, X=Disorder"
+msgstr "+ Susižavėjęs, - Netvarka"
+
+#: client/cityrepdata.c:456
+msgid "Special"
+msgstr "Specialūs"
+
#: client/cityrepdata.c:457
+msgid "?entertainers/scientists/taxmen:E/S/T"
+msgstr ""
+
+#: client/cityrepdata.c:458
+msgid "Entertainers, Scientists, Taxmen"
+msgstr "Paslaugų teikÄ—jai, mokslininkai, mokesÄių rinkÄ—jai"
+
+#: client/cityrepdata.c:461
msgid "?Happy workers:H"
msgstr "?Happy workers:L"
-#: client/cityrepdata.c:457
+#: client/cityrepdata.c:461
msgid "Workers: Happy"
msgstr "Darbininkai: laimingi"
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
msgid "?Content workers:C"
msgstr "?Content workers:P"
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
msgid "Workers: Content"
msgstr "Darbininkai: patenkinti"
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
msgid "?Unhappy workers:U"
msgstr "?Unhappy workers:N"
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
msgid "Workers: Unhappy"
msgstr "Darbininkai: nelaimingi"
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
msgid "?Angry workers:A"
msgstr "?Angry workers:S"
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
msgid "Workers: Angry"
msgstr "Darbininkai: susierzinÄ™"
-#: client/cityrepdata.c:465 client/gui-xaw/citydlg.c:2401
-#: data/default/units.ruleset:238
-msgid "Workers"
+#: client/cityrepdata.c:469 client/gui-xaw/citydlg.c:2402
+#, fuzzy
+msgid "?city:Workers"
msgstr "Darbininkai"
-#: client/cityrepdata.c:466
+#: client/cityrepdata.c:470
msgid "?happy/content/unhappy/angry:H/C/U/A"
msgstr "?happy/content/unhappy/angry:L/P/N/S"
-#: client/cityrepdata.c:467
+#: client/cityrepdata.c:471
msgid "Workers: Happy, Content, Unhappy, Angry"
msgstr "Darbininkai: laimingi, patenkinti, nelaimingi, supykÄ™"
-#: client/cityrepdata.c:470 client/cityrepdata.c:472
+#: client/cityrepdata.c:474 client/cityrepdata.c:476
msgid "Best"
msgstr "Geriausi"
-#: client/cityrepdata.c:470
+#: client/cityrepdata.c:474
msgid "attack"
msgstr "ataka"
-#: client/cityrepdata.c:471
+#: client/cityrepdata.c:475
msgid "Best attacking units"
msgstr "Geriausiai atakuojantys daliniai"
-#: client/cityrepdata.c:472
+#: client/cityrepdata.c:476
msgid "defense"
msgstr "gynyba"
-#: client/cityrepdata.c:473
+#: client/cityrepdata.c:477
msgid "Best defending units"
msgstr "Geriausiai besiginantys daliniai"
-#: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
-#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
-#: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
-#: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
-#: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
-#: client/gui-win32/menu.c:351 client/gui-win32/repodlgs.c:616
-#: client/gui-win32/repodlgs.c:707 client/gui-win32/repodlgs.c:716
-#: client/gui-xaw/menu.c:157 client/gui-xaw/menu.c:219
-#: client/gui-xaw/menu.c:242 client/gui-xaw/repodlgs.c:881
-#: client/gui-xaw/repodlgs.c:1069 data/Freeciv.in:1895 data/helpdata.txt:909
+#: client/cityrepdata.c:478 client/cityrepdata.c:482
+#: client/gui-gtk-2.0/cityrep.c:1437 client/gui-gtk-2.0/cityrep.c:1456
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-gtk-2.0/cityrep.c:1494
+#: client/gui-gtk-2.0/cityrep.c:1514 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/repodlgs.c:960 client/gui-sdl/helpdlg.c:688
+#: client/gui-sdl/mapctrl.c:1605 client/gui-sdl/optiondlg.c:1827
+#: client/gui-sdl/repodlgs.c:356 client/gui-win32/menu.c:351
+#: client/gui-win32/repodlgs.c:616 client/gui-win32/repodlgs.c:707
+#: client/gui-win32/repodlgs.c:716 client/gui-xaw/menu.c:157
+#: client/gui-xaw/menu.c:219 client/gui-xaw/menu.c:242
+#: client/gui-xaw/repodlgs.c:881 client/gui-xaw/repodlgs.c:1069
+#: data/Freeciv.in:1895 data/helpdata.txt:909
msgid "Units"
msgstr "Daliniai"
#. TRANS: Header "Number of units inside city"
-#: client/cityrepdata.c:476
+#: client/cityrepdata.c:480
#, fuzzy
msgid "?Present (units):Here"
msgstr "Esantys daliniai %d"
-#: client/cityrepdata.c:477
+#: client/cityrepdata.c:481
msgid "Number of units present"
msgstr "EsanÄių dalinių dalinių"
#. TRANS: Header "Number of units supported by given city"
-#: client/cityrepdata.c:480
+#: client/cityrepdata.c:484
#, fuzzy
msgid "?Supported (units):Owned"
msgstr "Palaikomi daliniai:"
-#: client/cityrepdata.c:481
+#: client/cityrepdata.c:485
msgid "Number of units supported"
msgstr "Palaikomų dalinių skaiÄius"
#. TRANS: Header "It will take this many turns before city grows"
-#: client/cityrepdata.c:484
+#: client/cityrepdata.c:488
#, fuzzy
msgid "?food (population):Grow"
msgstr "augimo"
-#: client/cityrepdata.c:485 client/cityrepdata.c:530
+#: client/cityrepdata.c:489 client/cityrepdata.c:528
#, fuzzy
msgid "?Stock/Target:(Have/Need)"
msgstr "atsargos"
-#: client/cityrepdata.c:486
+#: client/cityrepdata.c:490
msgid "Turns until growth/famine"
msgstr "Ä–jimai iki augimo/bado"
-#: client/cityrepdata.c:488
-msgid "?size [short]:Sz"
-msgstr "?size [short]:Dy"
-
-#: client/cityrepdata.c:488
-msgid "Size"
-msgstr "Dydis"
-
-#: client/cityrepdata.c:492
-msgid "?city:Name"
-msgstr "?city:Pavadinimas"
-
-#: client/cityrepdata.c:492 client/gui-sdl/cityrep.c:169
-msgid "City Name"
-msgstr "Miesto pavadinimas"
-
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
msgid "Surplus"
msgstr "Perteklius"
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
msgid "?food/production/trade:F/P/T"
msgstr "?food/production/trade:M/G/P"
-#: client/cityrepdata.c:496
+#: client/cityrepdata.c:494
msgid "Surplus: Food, Production, Trade"
msgstr "Perteklius: maistas, gamyba, prekyba"
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
msgid "?Food surplus [short]:+F"
msgstr "?Food surplus [short]:+M"
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
msgid "Surplus: Food"
msgstr "Perteklius: maistas"
-#: client/cityrepdata.c:500
+#: client/cityrepdata.c:498
msgid "?Production surplus [short]:+P"
msgstr "?Production surplus [short]:+G"
-#: client/cityrepdata.c:501
+#: client/cityrepdata.c:499
msgid "Surplus: Production"
msgstr "Perteklius: gamyba"
-#: client/cityrepdata.c:502
+#: client/cityrepdata.c:500
msgid "?Production loss (waste) [short]:-P"
msgstr "?Production loss (waste) [short]:-G"
-#: client/cityrepdata.c:503
+#: client/cityrepdata.c:501
msgid "Waste"
msgstr "Atliekos"
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
msgid "?Trade surplus [short]:+T"
msgstr "?Trade surplus [short]:+P"
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
msgid "Surplus: Trade"
msgstr "Perteklius: prekyba"
-#: client/cityrepdata.c:506
+#: client/cityrepdata.c:504
msgid "?Trade loss (corruption) [short]:-T"
msgstr "?Trade loss (corruption) [short]:-P"
-#: client/cityrepdata.c:507
+#: client/cityrepdata.c:505
msgid "Corruption"
msgstr "Korupcija"
-#: client/cityrepdata.c:509 client/gui-gtk-2.0/repodlgs.c:654
+#: client/cityrepdata.c:507 client/gui-gtk-2.0/repodlgs.c:654
#: client/gui-sdl/mapctrl.c:1400 client/gui-win32/repodlgs.c:334
#: client/gui-xaw/menu.c:222 client/gui-xaw/repodlgs.c:644
#: client/gui-xaw/repodlgs.c:773 data/Freeciv.in:1819
msgid "Economy"
msgstr "Ekonomika"
-#: client/cityrepdata.c:509
+#: client/cityrepdata.c:507
msgid "?gold/luxury/science:G/L/S"
msgstr "?gold/luxury/science:A/P/M"
-#: client/cityrepdata.c:510
+#: client/cityrepdata.c:508
msgid "Economy: Gold, Luxuries, Science"
msgstr "Ekonomika: Auksas, Prabanga, Mokslas"
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
msgid "?Gold:G"
msgstr "?Gold:A"
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
msgid "Economy: Gold"
msgstr "Ekonomika: Auksas"
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
msgid "?Luxury:L"
msgstr "?Luxury:P"
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
msgid "Economy: Luxury"
msgstr "Ekonomika: Prabanga"
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
msgid "?Science:S"
msgstr "?Science:M"
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
msgid "Economy: Science"
msgstr "Ekonomika: Mokslas"
-#: client/cityrepdata.c:518
+#: client/cityrepdata.c:516
#, fuzzy
msgid "?number_trade_routes:n"
msgstr "s"
-#: client/cityrepdata.c:518
+#: client/cityrepdata.c:516
#, fuzzy
msgid "?number_trade_routes:R"
msgstr "s"
-#: client/cityrepdata.c:519
+#: client/cityrepdata.c:517
msgid "Number of Trade Routes"
msgstr "Prekybos marÅ¡rutų skaiÄius"
-#: client/cityrepdata.c:521
+#: client/cityrepdata.c:519
msgid "?pollution [short]:Pol"
msgstr "?pollution [short]:Tar"
-#: client/cityrepdata.c:523
+#: client/cityrepdata.c:521
msgid "?cma:Governor"
msgstr "?cma:Valdytojas"
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
-#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
-#: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
-#: data/Freeciv.in:1459 data/helpdata.txt:820
+#: client/cityrepdata.c:521 client/gui-gtk-2.0/cityrep.c:1766
+#: client/gui-sdl/citydlg.c:3809 client/gui-sdl/cma_fe.c:858
+#: client/gui-win32/citydlg.c:726 data/Freeciv.in:1459 data/helpdata.txt:820
msgid "Citizen Governor"
msgstr "PilieÄių valdytojas"
-#: client/cityrepdata.c:526
+#: client/cityrepdata.c:524
msgid "Turns/Buy"
msgstr "Ä–jimai/Pirkti"
-#: client/cityrepdata.c:529 client/cityrepdata.c:531
+#: client/cityrepdata.c:527 client/cityrepdata.c:529
msgid "Currently Building"
msgstr "Dabar statoma"
-#: client/cityrepdata.c:575
+#: client/cityrepdata.c:573
msgid "?specialist:S"
msgstr "?specialist:S"
-#: client/cityrepdata.c:578
+#: client/cityrepdata.c:576
msgid "Specialists"
msgstr "Specialistai"
-#: client/civclient.c:239
+#: client/civclient.c:240
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr " -a, --autoconnect\tPraleisti prisijungimo dialogÄ…\n"
-#: client/civclient.c:249
+#: client/civclient.c:250
msgid " -l, --log FILE\tUse FILE as logfile (spawned server also uses this)\n"
msgstr ""
-#: client/civclient.c:251
+#: client/civclient.c:252
msgid " -m, --meta HOST\tConnect to the metaserver at HOST\n"
msgstr ""
-#: client/civclient.c:253
+#: client/civclient.c:254
msgid " -n, --name NAME\tUse NAME as name\n"
msgstr ""
-#: client/civclient.c:255
+#: client/civclient.c:256
msgid " -p, --port PORT\tConnect to server port PORT (usually with -a)\n"
msgstr ""
" -p, --port PRIEVADAS\tPrisijungti prie serverio prievado PRIEVADAS "
"(paprastai su -a)\n"
-#: client/civclient.c:257
+#: client/civclient.c:258
#, c-format
msgid " -P, --Plugin PLUGIN\tUse PLUGIN for sound output %s\n"
msgstr ""
-#: client/civclient.c:259
+#: client/civclient.c:260
msgid " -r, --read FILE\tRead startup script FILE (for spawned server only)\n"
msgstr ""
-#: client/civclient.c:262
+#: client/civclient.c:263
#, 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:264
+#: client/civclient.c:265
msgid " -S, --Sound FILE\tRead sound tags from FILE\n"
msgstr ""
-#: client/civclient.c:265
+#: client/civclient.c:266
msgid " -t, --tiles FILE\tUse data file FILE.tilespec for tiles\n"
msgstr ""
-#: client/civclient.c:268
+#: client/civclient.c:269
#, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -7375,144 +7364,154 @@ msgid ""
msgstr ""
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:273
+#: client/civclient.c:274
#, fuzzy, c-format
msgid "Report bugs at %s\n"
msgstr "Pranešti apie klaidas į %s.\n"
-#: client/civclient.c:297
+#: client/civclient.c:298
#, c-format
msgid "Invalid port \"%s\" specified with --port option.\n"
msgstr "Su --port parametru nurodytas netinkamas prievadas „%s“.\n"
-#: client/civclient.c:299 client/civclient.c:314
+#: client/civclient.c:300 client/civclient.c:315
msgid "Try using --help.\n"
msgstr "Bandykite --help.\n"
-#: client/civclient.c:312
+#: client/civclient.c:313
#, c-format
msgid "Invalid debug level \"%s\" specified with --debug option.\n"
msgstr ""
-#: client/civclient.c:325
+#: client/civclient.c:326
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr "Neatpažintas parametras: „%s“\n"
-#: client/civclient.c:539
+#: client/civclient.c:391
+#, fuzzy, c-format
+msgid "Updating old metaserver address \"%s\"."
+msgstr "metaserver <adresas>"
+
+#: client/civclient.c:394
+#, fuzzy, c-format
+msgid "Default metaserver has been set to \"%s\"."
+msgstr "Parinktis %s buvo nustatyta į \"%s\"."
+
+#: client/civclient.c:550
msgid "Game started."
msgstr "Žaidimas paleistas."
-#: client/civclient.c:577
+#: client/civclient.c:588
msgid "There was an error while auto connecting; aborting."
msgstr ""
-#: client/climisc.c:176
+#: client/climisc.c:177
#, c-format
msgid "Changing production of every %s into %s."
msgstr ""
-#: client/climisc.c:214
+#: client/climisc.c:215
msgid "?embassy:Both"
msgstr "?embassy:Abu"
-#: client/climisc.c:216
+#: client/climisc.c:217
msgid "?embassy:Yes"
msgstr "?embassy:Taip"
-#: client/climisc.c:219
+#: client/climisc.c:220
msgid "?embassy:With Us"
msgstr "?embassy:Su mumis"
-#: client/climisc.c:222
+#: client/climisc.c:223
msgid "?embassy:Contact"
msgstr "?embassy:Kontaktas"
-#: client/climisc.c:224
+#: client/climisc.c:225
msgid "?embassy:No Contact"
msgstr "?embassy:NÄ—ra kontakto"
-#: client/climisc.c:236
+#: client/climisc.c:237
msgid "?vision:Both"
msgstr "?vision:Abiems"
-#: client/climisc.c:238
+#: client/climisc.c:239
msgid "?vision:To Them"
msgstr "?vision:Jiems"
-#: client/climisc.c:241
+#: client/climisc.c:242
msgid "?vision:To Us"
msgstr "?vision:Mums"
-#: client/climisc.c:257 client/climisc.c:264
+#: client/climisc.c:258 client/climisc.c:265
#, c-format
msgid "The %s give %s"
msgstr "%s duoda %s"
-#: client/climisc.c:268
+#: client/climisc.c:269
#, c-format
msgid "The %s give unknown city."
msgstr "%s duoda nežinomą miestą."
-#: client/climisc.c:273
+#: client/climisc.c:274
#, c-format
msgid "The %s give %d gold"
msgstr "%s duoda %d aukso"
-#: client/climisc.c:278
+#: client/climisc.c:279
#, c-format
msgid "The %s give their worldmap"
msgstr "%s davė savo pasaulio žemėlapį"
-#: client/climisc.c:282
+#: client/climisc.c:283
#, c-format
msgid "The %s give their seamap"
msgstr "%s davė savo jūros žemėlapį"
-#: client/climisc.c:286
+#: client/climisc.c:287
msgid "The parties agree on a cease-fire"
msgstr "Šalys susitaria dėl trumpų paliaubų"
-#: client/climisc.c:289
+#: client/climisc.c:290
msgid "The parties agree on a peace"
msgstr "Å alys susitaria dÄ—l taikos"
-#: client/climisc.c:292
+#: client/climisc.c:293
msgid "The parties create an alliance"
msgstr "Å alys susitaria dÄ—l sÄ…jungos"
-#: client/climisc.c:295
+#: client/climisc.c:296
#, c-format
msgid "The %s give shared vision"
msgstr "%s duoda mums bendrÄ… regÄ—jimo laukÄ…"
-#: client/climisc.c:299
+#: client/climisc.c:300
#, c-format
msgid "The %s give an embassy"
msgstr "%s duoda ambasadÄ…"
-#: client/climisc.c:902
+#: client/climisc.c:906
msgid "Popup Request"
msgstr ""
-#: client/climisc.c:932
+#: client/climisc.c:936
msgid "Exporting output window to civgame.log ..."
msgstr "Įrašome išvesties langą į civgame.log ..."
-#: client/climisc.c:936
+#: client/climisc.c:940
msgid "Export complete."
msgstr "Eksportavimas baigtas."
-#: client/climisc.c:938
+#: client/climisc.c:942
msgid "Export failed, couldn't write to file."
msgstr "Įrašymas nepavyko, negalime rašyti į failą."
-#: client/climisc.c:1038
+#: client/climisc.c:1042
#, c-format
msgid "You don't buy %s in %s!"
msgstr "JÅ«s neperkate %s mieste %s!"
-#: client/climisc.c:1056
+#: client/climisc.c:1060
#, c-format
msgid "%s costs %d gold and you only have %d gold."
msgstr "%s kainuoja %d aukso, bet jūs turite tik %d aukso."
@@ -7556,19 +7555,19 @@ msgid ""
"%d times"
msgstr ""
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1289
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
msgid "novice"
msgstr "pradedantis"
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1289
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1358
msgid "easy"
msgstr "lengvas"
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1290
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
msgid "normal"
msgstr "vidutinis"
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1290
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
msgid "hard"
msgstr "sunkus"
@@ -7597,38 +7596,41 @@ msgid "We probably couldn't start it from here."
msgstr "Mes tikriausiai iÅ¡ Äia negalime jo paleisti."
#: client/connectdlg_common.c:470
-msgid "We have control of the server (command access level hack)"
+msgid ""
+"Established control over the server. You have command access level 'hack'."
msgstr ""
#: client/connectdlg_common.c:475
-msgid "We can't take control of server, attempting to kill it."
-msgstr "Mes negalime kontroliuoti serverio, bandome jį išjungti."
+msgid ""
+"Failed to obtain the required access level to take control of the server. "
+"The server will now be shutdown."
+msgstr ""
-#: client/control.c:1104
+#: client/control.c:1123
msgid "Only transporter units can be unloaded."
msgstr "Išlaipinti galima tik iš transporto dalinių."
-#: client/control.c:1353
+#: client/control.c:1425
msgid "Only settler units can be put into auto mode."
msgstr "Tik naujakuriai gali būti įvesti į auto būseną."
-#: client/control.c:1444
+#: client/control.c:1516
msgid "Only nuclear units can do this."
msgstr "Tik branduoliniai daliniai gali tai padaryti."
-#: client/control.c:1473
+#: client/control.c:1545
msgid "Only paratrooper units can do this."
msgstr "Tik parašiutininkai tai gali."
-#: client/control.c:1921
+#: client/control.c:2020
msgid "Too far for this unit."
msgstr "Per toli Å¡iam daliniui."
-#: client/control.c:2131 client/control.c:2161 client/control.c:2177
+#: client/control.c:2230 client/control.c:2260 client/control.c:2276
msgid "Didn't find a route to the destination!"
msgstr "Nerastas kelias iki tikslo."
-#: client/control.c:2221
+#: client/control.c:2320
msgid "Oh my! You seem to have no capital!"
msgstr "O ne! Atrodo, kad neturi sostinÄ—s!"
@@ -7697,16 +7699,16 @@ msgid "Allows %s (with %s)."
msgstr "Leidžia %s (kartu su %s)."
#. TRANS: preserve single space at beginning
-#: client/helpdata.c:418
+#: client/helpdata.c:416
msgid " Rivers"
msgstr " UpÄ—s"
-#: client/helpdata.c:576
+#: client/helpdata.c:574
#, c-format
msgid "Sorry, no help topic for %s.\n"
msgstr "Apgailestaujame, nÄ—ra pagalbos temai%s.\n"
-#: client/helpdata.c:580
+#: client/helpdata.c:578
#, c-format
msgid ""
"Sorry, no help topic for %s.\n"
@@ -7717,7 +7719,7 @@ msgstr ""
"Šis puslapis buvo automatiškai sugeneruotas.\n"
"\n"
-#: client/helpdata.c:670
+#: client/helpdata.c:668
msgid ""
"Requires: Nothing\n"
"\n"
@@ -7725,58 +7727,58 @@ msgstr ""
"Reikalauja: Nieko.\n"
"\n"
-#: client/helpdata.c:675
+#: client/helpdata.c:673
#, c-format
msgid "* The discovery of %s will make %s obsolete.\n"
msgstr "* %s atradimas padarys %s nebenaudingÄ….\n"
-#: client/helpdata.c:694
+#: client/helpdata.c:692
#, c-format
msgid "* Allows all players with knowledge of %s to build %s units.\n"
msgstr "* Leidžia visiems žaidėjams su %s žiniomis statyti %s dalinius.\n"
-#: client/helpdata.c:706
+#: client/helpdata.c:704
#, c-format
msgid "* Allows %s (with %s).\n"
msgstr "* Leidžia %s (kartu su %s).\n"
-#: client/helpdata.c:710
+#: client/helpdata.c:708
#, c-format
msgid "* Allows %s.\n"
msgstr "* Leidiža %s.\n"
-#: client/helpdata.c:780
+#: client/helpdata.c:778
#, c-format
msgid "* Can only be built if there is %s in the city.\n"
msgstr "* Gali būti pastatytas tik, kai mieste yra %s.\n"
-#: client/helpdata.c:786
+#: client/helpdata.c:784
#, c-format
msgid "* Can only be built with %s as government.\n"
msgstr "* Gali būti pastatytas tik, kai vyriausybė yra %s.\n"
-#: client/helpdata.c:791
+#: client/helpdata.c:789
msgid "* May not be built in cities.\n"
msgstr "* Negali būti statomas miestuose.\n"
-#: client/helpdata.c:794
+#: client/helpdata.c:792
msgid "* Never has a home city.\n"
msgstr "* Niekada neturi gimtojo miesto.\n"
-#: client/helpdata.c:797
+#: client/helpdata.c:795
msgid "* Losing this unit will lose you the game!\n"
msgstr "* Prarasdami šį dalinį Jūs pralaimėsite žaidimą!\n"
-#: client/helpdata.c:801
+#: client/helpdata.c:799
msgid "* Each player may only have one of this type of unit.\n"
msgstr "*Kiekvienas žaidėjas gali turėti tik vieną šio tipo dalinį.\n"
-#: client/helpdata.c:805
+#: client/helpdata.c:803
#, c-format
msgid "* Requires %d population to build.\n"
msgstr "* Reikalauja %d gyventojų, kad pastatytum.\n"
-#: client/helpdata.c:811
+#: client/helpdata.c:809
#, c-format
msgid "* Can carry and refuel %d air unit.\n"
msgid_plural "* Can carry and refuel %d air units.\n"
@@ -7784,7 +7786,7 @@ msgstr[0] "* Gali nešti ir papildyti degalais %d aviacijos dalinį.\n"
msgstr[1] "* Gali nešti ir papildyti degalais %d aviacijos dalinius.\n"
msgstr[2] "* Gali nešti ir papildyti degalais %d aviacijos dalinių.\n"
-#: client/helpdata.c:816
+#: client/helpdata.c:814
#, fuzzy, c-format
msgid "* Can carry and refuel %d missile unit.\n"
msgid_plural "* Can carry and refuel %d missile units.\n"
@@ -7794,7 +7796,7 @@ msgstr[1] ""
msgstr[2] ""
"* Gali nešti ir papildyti degalais %d aviacijos dalinių iš klasių:\n"
-#: client/helpdata.c:821
+#: client/helpdata.c:819
#, fuzzy, c-format
msgid "* Can carry %d ground unit across water.\n"
msgid_plural "* Can carry %d ground units across water.\n"
@@ -7804,220 +7806,220 @@ msgstr[1] ""
msgstr[2] ""
"* Gali nešti ir papildyti degalais %d aviacijos dalinių iš klasių:\n"
-#: client/helpdata.c:830
+#: client/helpdata.c:828
msgid ""
"* Can establish trade routes (must travel to target city and must be at "
"least 9 tiles [in Manhattan distance] from this unit's home city).\n"
msgstr ""
-#: client/helpdata.c:836
+#: client/helpdata.c:834
#, c-format
msgid "* Can help build wonders (adds %d production).\n"
msgstr "* Gali padÄ—ti statyti stebuklus (prideda %d gamybos).\n"
-#: client/helpdata.c:840
+#: client/helpdata.c:838
msgid "* May not be disbanded.\n"
msgstr "* Negali būti išformuotas.\n"
-#: client/helpdata.c:842
+#: client/helpdata.c:840
#, c-format
msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
msgstr "* Gali būti išformuotas mieste, atgaunant 50%% gamybos kainos.\n"
-#: client/helpdata.c:846
+#: client/helpdata.c:844
msgid "* Can build new cities.\n"
msgstr "* Gali statyti naujus miestus.\n"
-#: client/helpdata.c:849
+#: client/helpdata.c:847
#, c-format
msgid "* Can add on %d population to cities of no more than size %d.\n"
msgstr ""
-#: client/helpdata.c:858
+#: client/helpdata.c:856
msgid "* Can build roads and railroads.\n"
msgstr "* Gali tiesti kelius ir geležinkelius.\n"
-#: client/helpdata.c:859
+#: client/helpdata.c:857
msgid "* Can build mines on tiles.\n"
msgstr "* Gali statyti kasyklas.\n"
-#: client/helpdata.c:860
+#: client/helpdata.c:858
msgid "* Can build irrigation on tiles.\n"
msgstr "* Gali statyti drÄ—kinimo sistemas.\n"
-#: client/helpdata.c:865
+#: client/helpdata.c:863
msgid "* Can build farmland.\n"
msgstr "* Gali statyti dirbamąsias žemes.\n"
-#: client/helpdata.c:869
+#: client/helpdata.c:867
#, c-format
msgid "* Can build farmland (if %s is known).\n"
msgstr "* Gali statyti dirbamąsias žemes (jei %s yra žinomas).\n"
-#: client/helpdata.c:873
+#: client/helpdata.c:871
#, c-format
msgid "* Can build farmland (if any of the following are known: %s).\n"
msgstr ""
"* Gali statyti dirbamąsias žemes (jei bent 1 iš šių yra žinomas: %s).\n"
-#: client/helpdata.c:881
+#: client/helpdata.c:879
msgid "* Can build fortresses.\n"
msgstr "* Gali statyti fortus.\n"
-#: client/helpdata.c:885
+#: client/helpdata.c:883
#, c-format
msgid "* Can build fortresses (if %s is known).\n"
msgstr "* Gali statyti fortus (jei %s yra žinomas).\n"
-#: client/helpdata.c:889
+#: client/helpdata.c:887
#, c-format
msgid "* Can build fortresses (if any of the following are known: %s).\n"
msgstr "* Gali statyti fortus (jei bent 1 iš šių yra žinomas: %s).\n"
-#: client/helpdata.c:895
+#: client/helpdata.c:893
msgid "* Can clean pollution from tiles.\n"
msgstr "* Iš laukelių gali išvalyti taršą.\n"
-#: client/helpdata.c:896
+#: client/helpdata.c:894
msgid "* Can clean nuclear fallout from tiles.\n"
msgstr "* Iš laukelių gali išvalyti radioaktyviąsias dulkes.\n"
-#: client/helpdata.c:899
+#: client/helpdata.c:897
msgid "* Can transform tiles.\n"
msgstr "* Gali transformuoti laukelius.\n"
-#: client/helpdata.c:902
+#: client/helpdata.c:900
msgid "* Can build airbases.\n"
msgstr "* Gali statyti oro bazes.\n"
-#: client/helpdata.c:906
+#: client/helpdata.c:904
#, c-format
msgid "* May fortify, granting a 50%% defensive bonus.\n"
msgstr ""
-#: client/helpdata.c:909
+#: client/helpdata.c:907
msgid "* May pillage to destroy infrastructure from tiles.\n"
msgstr "* galė plėšti ir taip sunakinti laukelių infrastruktūrą.\n"
-#: client/helpdata.c:913
+#: client/helpdata.c:911
msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
msgstr ""
"* Gali atlikti diplomatinius veiksmus ir turi specialių šnipinųjimo "
"gebėjimų.\n"
-#: client/helpdata.c:916
+#: client/helpdata.c:914
msgid "* Can perform diplomatic actions.\n"
msgstr "* Gali atlikti diplomatinius veiksmus.\n"
-#: client/helpdata.c:920
+#: client/helpdata.c:918
msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
msgstr "* Niekada nepralaimės diplomatas prieš diplomatą kovos.\n"
-#: client/helpdata.c:923
+#: client/helpdata.c:921
msgid "* May not be bribed.\n"
msgstr "* Negali būti papirktas.\n"
-#: client/helpdata.c:926
+#: client/helpdata.c:924
msgid "* Can attack enemy air units.\n"
msgstr "* Gali pulti priešo oro dalinius.\n"
-#: client/helpdata.c:930
+#: client/helpdata.c:928
msgid "* Is invisible except when next to an enemy unit or city.\n"
msgstr "* Yra nematomas išskyrus kai būna šalia priešo dalinio arba miesto.\n"
-#: client/helpdata.c:934
+#: client/helpdata.c:932
msgid "* Can only attack units on ocean squares (no land attacks).\n"
msgstr ""
"* Gali atakuoti tik jūrų dalinius (negali atakuoti sausumos dalinių).\n"
-#: client/helpdata.c:938
+#: client/helpdata.c:936
msgid ""
"* Can attack from aboard sea units: against enemy cities and onto land "
"squares.\n"
msgstr ""
-#: client/helpdata.c:943
+#: client/helpdata.c:941
#, c-format
msgid "* Can be paradropped from a friendly city (Range: %d).\n"
msgstr "* Gali būti išmesti parašiutu iš draugiško miesto (Atstumas: %d).\n"
-#: client/helpdata.c:949
+#: client/helpdata.c:947
msgid "* Gets double defense against units specified as 'mounted'.\n"
msgstr ""
-#: client/helpdata.c:953
+#: client/helpdata.c:951
msgid "* Counts as 'mounted' against certain defenders.\n"
msgstr ""
-#: client/helpdata.c:957
+#: client/helpdata.c:955
#, fuzzy
msgid "* A missile unit: gets used up in making an attack.\n"
msgstr " * Sunaudojamas įvykdžius ataką.\n"
-#: client/helpdata.c:960
+#: client/helpdata.c:958
msgid "* Making an attack ends this unit's turn.\n"
msgstr "* Atakos įvykdymas reiškia šio dalinio ėjimo baigtį.\n"
-#: client/helpdata.c:964
+#: client/helpdata.c:962
msgid "* This unit's attack causes a nuclear explosion!\n"
msgstr "* Šio dalinio ataka sukelia branduolinį sprogimą!\n"
-#: client/helpdata.c:968
+#: client/helpdata.c:966
msgid "* Gets double firepower when attacking cities.\n"
msgstr "Puolamoji galia padvigubÄ—ja puolant miestus.\n"
-#: client/helpdata.c:971
+#: client/helpdata.c:969
msgid "* Ignores the effects of city walls.\n"
msgstr "* Ignoruoja miesto sienų efektus.\n"
-#: client/helpdata.c:975
+#: client/helpdata.c:973
#, c-format
msgid ""
"* Does bombard attacks (%d per turn). These attacks will only damage (never "
"kill) the defender, but have no risk for the attacker.\n"
msgstr ""
-#: client/helpdata.c:982
+#: client/helpdata.c:980
msgid "* Gets quintuple defense against missiles and aircraft.\n"
msgstr ""
-#: client/helpdata.c:986
+#: client/helpdata.c:984
msgid "* Ignores terrain effects (treats all squares as roads).\n"
msgstr ""
-#: client/helpdata.c:989
+#: client/helpdata.c:987
msgid "* Ignores zones of control.\n"
msgstr "* Ignoruoja valdymo zonas.\n"
-#: client/helpdata.c:993
+#: client/helpdata.c:991
msgid "* A non-military unit (cannot attack; no martial law).\n"
msgstr ""
-#: client/helpdata.c:997
+#: client/helpdata.c:995
msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
msgstr ""
-#: client/helpdata.c:1000
+#: client/helpdata.c:998
msgid "* Will never achieve veteran status.\n"
msgstr "* Niekada netaps veteranu.\n"
-#: client/helpdata.c:1002
+#: client/helpdata.c:1000
msgid "* May become veteran through training or combat.\n"
msgstr "* Kovodamas arba treniruodamasis gali tapti veteranu.\n"
-#: client/helpdata.c:1008
+#: client/helpdata.c:1006
#, c-format
msgid ""
"* Must end turn in a city or next to land, or has a 50%% risk of being lost "
"at sea.\n"
msgstr ""
-#: client/helpdata.c:1012
+#: client/helpdata.c:1010
#, c-format
msgid "* The discovery of %s reduces the risk to 25%%.\n"
msgstr "* %s atradimas sumažina riziką iki 25%%.\n"
-#: client/helpdata.c:1017
+#: client/helpdata.c:1015
#, c-format
msgid "* %s reduces the risk to 12%%.\n"
msgstr "* %s sumažina riziką iki 12%%.\n"
@@ -8026,15 +8028,15 @@ msgstr "* %s sumažina riziką iki 12%%.\n"
#. * last two elements
#. TRANS: List of possible output types has this between
#. * last two elements
-#: client/helpdata.c:1068 client/helpdata.c:1402
+#: client/helpdata.c:1066 client/helpdata.c:1400
msgid " or "
msgstr " arba "
-#: client/helpdata.c:1070 client/helpdata.c:1390
+#: client/helpdata.c:1068 client/helpdata.c:1388
msgid "?or:, "
msgstr "?or:, "
-#: client/helpdata.c:1082
+#: 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"
@@ -8042,102 +8044,102 @@ msgstr[0] "* Dalinys turi būti mieste arba ant %s po %d ėjimo.\n"
msgstr[1] "* Dalinys turi būti mieste arba ant %s po %d ėjimų.\n"
msgstr[2] "* Dalinys turi būti mieste arba ant %s po %d ėjimų.\n"
-#: client/helpdata.c:1124
+#: client/helpdata.c:1122
#, 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:1129
+#: client/helpdata.c:1127
#, 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:1137
+#: client/helpdata.c:1135
msgid "You cannot research this technology."
msgstr "Jūs negalite išrasti šios technologijos."
-#: client/helpdata.c:1141
+#: client/helpdata.c:1139
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:1153
+#: client/helpdata.c:1151
#, 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:1158
+#: client/helpdata.c:1156
#, 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:1161
+#: client/helpdata.c:1159
#, 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:1165
+#: client/helpdata.c:1163
msgid "* Increases the pollution generated by the population.\n"
msgstr "* Padidina gyventojų sukuriamą taršą.\n"
-#: client/helpdata.c:1170
+#: client/helpdata.c:1168
#, c-format
msgid "* Allows %s to build roads on river squares.\n"
msgstr "* %s gali statyti kelius upių laukeliuose.\n"
-#: client/helpdata.c:1177
+#: client/helpdata.c:1175
#, c-format
msgid "* Allows %s to build fortresses.\n"
msgstr "* Leidžia %s statyti fortus.\n"
-#: client/helpdata.c:1185
+#: client/helpdata.c:1183
#, c-format
msgid "* Allows %s to build airbases.\n"
msgstr "* Leidžia %s statyti oro bazes.\n"
-#: client/helpdata.c:1194
+#: client/helpdata.c:1192
#, c-format
msgid "* Allows %s to upgrade roads to railroads.\n"
msgstr "* Leidžia %s patobulinti kelius į geležinkelius.\n"
-#: client/helpdata.c:1202
+#: client/helpdata.c:1200
#, 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:1236
+#: client/helpdata.c:1234
msgid "* Pollution cannot be generated on this terrain."
msgstr "* Toks reljefas negali būti užterštas."
-#: client/helpdata.c:1241
+#: client/helpdata.c:1239
msgid "* You cannot build cities on this terrain."
msgstr "* Ant tokio reljefo negalite statyti miestų."
-#: client/helpdata.c:1247
+#: client/helpdata.c:1245
msgid "* The coastline of this terrain is unsafe."
msgstr "* Å io reljefo pakrantÄ— nesaugi."
-#: client/helpdata.c:1252
+#: client/helpdata.c:1250
msgid "* This terrain is unsafe for units to travel on."
msgstr "* Å is reljefas nesaugus keliauti daliniams."
-#: client/helpdata.c:1257
+#: client/helpdata.c:1255
msgid "* Land units cannot travel on oceanic terrains."
msgstr "Sausumos daliniai negali keliauti vandenynais."
-#: client/helpdata.c:1307
+#: client/helpdata.c:1305
msgid "Features:\n"
msgstr "SavybÄ—s:\n"
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1413 client/helpdata.c:1414
+#: client/helpdata.c:1411 client/helpdata.c:1412
msgid "?outputlist: Nothing "
msgstr "?outputlist: Nieko "
-#: client/helpdata.c:1421
+#: client/helpdata.c:1419
#, fuzzy, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
@@ -8155,7 +8157,7 @@ msgstr[2] ""
"* Kariniai daliniai toli nuo namų ir lauko daliniai %d gyventojus padarys "
"nelaimingÄ….\n"
-#: client/helpdata.c:1431
+#: client/helpdata.c:1429
#, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8163,23 +8165,23 @@ msgid ""
msgstr ""
#. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1439
+#: client/helpdata.c:1437
#, c-format
msgid "* You pay %d times normal %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1444
+#: client/helpdata.c:1442
#, 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:1449
+#: client/helpdata.c:1447
#, fuzzy, c-format
msgid "* You pay no %s upkeep for your units.\n"
msgstr "* Fanatikams nereikia išlaikymo.\n"
-#: client/helpdata.c:1453
+#: client/helpdata.c:1451
#, fuzzy
msgid "* You pay no upkeep for your units.\n"
msgstr "* Fanatikams nereikia išlaikymo.\n"
@@ -8187,25 +8189,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:1462
+#: client/helpdata.c:1460
#, 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:1470
+#: client/helpdata.c:1468
#, c-format
msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
msgstr ""
-#: client/helpdata.c:1477
+#: client/helpdata.c:1475
#, 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:1484
+#: client/helpdata.c:1482
#, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -8213,25 +8215,25 @@ msgid ""
msgstr ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1491
+#: client/helpdata.c:1489
#, 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:1499
+#: client/helpdata.c:1497
#, 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:1504
+#: client/helpdata.c:1502
msgid "Has unlimited science/gold/luxuries rates.\n"
msgstr "Turi neribotus mokslo/aukso/prabangos tarifus.\n"
-#: client/helpdata.c:1509
+#: client/helpdata.c:1507
#, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
@@ -8243,7 +8245,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: client/helpdata.c:1521
+#: client/helpdata.c:1519
#, 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"
@@ -8252,7 +8254,7 @@ msgstr[1] ""
msgstr[2] ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1532
+#: client/helpdata.c:1530
#, c-format
msgid ""
"* You may grow your cities by means of celebrations. Your cities must be at "
@@ -8261,53 +8263,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:1538
+#: client/helpdata.c:1536
msgid "* Your units cannot be bribed.\n"
msgstr "* Jūsų daliniai negali būti papirkti.\n"
-#: client/helpdata.c:1541
+#: client/helpdata.c:1539
msgid "* Your cities cannot be incited.\n"
msgstr "* Jūsų miestai negali būti pakurstyti.\n"
-#: client/helpdata.c:1545
+#: client/helpdata.c:1543
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:1551
+#: client/helpdata.c:1549
msgid "* Has a senate that may prevent declaration of war.\n"
msgstr "* Turi senatÄ…, kuris gali sutrukdyti karo paskelbimui.\n"
-#: client/helpdata.c:1555
+#: client/helpdata.c:1553
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:1559
+#: client/helpdata.c:1557
msgid ""
"* Buildings that normally confer bonuses against unhappiness will instead "
"give gold.\n"
msgstr ""
-#: client/helpdata.c:1563
+#: client/helpdata.c:1561
msgid "* Pays no upkeep for fanatics.\n"
msgstr "* Fanatikams nereikia išlaikymo.\n"
-#: client/helpdata.c:1566
+#: client/helpdata.c:1564
msgid "* Has no unhappy citizens.\n"
msgstr "* Neturi nelaimingų pilieÄių.\n"
-#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
+#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
#, c-format
msgid "* Veteran %s units.\n"
msgstr "* Veteranų daliniai %s.\n"
-#: client/helpdata.c:1587
+#: client/helpdata.c:1585
msgid "* Veteran units.\n"
msgstr "* Daliniai veteranai.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1593
+#: client/helpdata.c:1591
#, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8315,7 +8317,7 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1602
+#: client/helpdata.c:1600
#, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8323,438 +8325,486 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1610
+#: client/helpdata.c:1608
#, 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:1619
+#: client/helpdata.c:1617
#, c-format
msgid "* %s production is increased %d%%.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1627
+#: client/helpdata.c:1625
#, c-format
msgid "* %s production will suffer massive waste.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1632
+#: client/helpdata.c:1630
#, c-format
msgid "* %s production will suffer some waste.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1637
+#: client/helpdata.c:1635
#, 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:1645
+#: client/helpdata.c:1643
#, 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:1651
+#: client/helpdata.c:1649
#, 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:1657
+#: client/helpdata.c:1655
#, 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:1674
+#: client/helpdata.c:1672
#, 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:1701
+#: client/helpdata.c:1699
#, c-format
msgid "%s%d %s"
msgstr "%s%d %s"
-#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1700 client/helpdata.c:1708 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:1709
+#: client/helpdata.c:1707
#, c-format
msgid "%s%d unhappy"
msgstr "%s%d nepatenkintų"
-#: client/mapctrl_common.c:382
+#: client/mapctrl_common.c:399
#, c-format
msgid "You don't know how to build %s!"
msgstr "Jūs nežinote, kaip statyti %s!"
-#: client/mapctrl_common.c:392
+#: client/mapctrl_common.c:409
#, c-format
msgid "Copy %s to clipboard."
msgstr "Nukopijuoti %s į iškarpinę."
-#: client/mapctrl_common.c:408
+#: client/mapctrl_common.c:425
msgid "Clipboard is empty."
msgstr "IÅ¡karpinÄ— yra tuÅ¡Äia."
-#: client/options.c:98
+#: client/options.c:102
msgid "Graphics"
msgstr "Grafika"
-#: client/options.c:99
+#: client/options.c:103
msgid "Overview"
msgstr "Apžvalga"
-#: client/options.c:100
+#: client/options.c:104
msgid "Sound"
msgstr "Garsas"
-#: client/options.c:101
+#: client/options.c:105
msgid "Interface"
msgstr "SÄ…saja"
-#: client/options.c:102
+#: client/options.c:106
msgid "Network"
msgstr "Tinklas"
-#: client/options.c:107
+#: client/options.c:111
msgid "Login name"
msgstr "Prisijungimo vardas"
-#: client/options.c:108
+#: client/options.c:112
msgid ""
"This is the default login username that will be used in the connection "
"dialogs or with the -a command-line parameter."
msgstr ""
-#: client/options.c:113
+#: client/options.c:117
msgid "Server"
msgstr "Serveris"
-#: client/options.c:114
+#: client/options.c:118
msgid ""
"This is the default server hostname that will be used in the connection "
"dialogs or with the -a command-line parameter."
msgstr ""
-#: client/options.c:119
+#: client/options.c:123
msgid "Server port"
msgstr "Serverio prievadas"
-#: client/options.c:120
+#: client/options.c:124
msgid ""
"This is the default server port that will be used in the connection dialogs "
"or with the -a command-line parameter."
msgstr ""
-#: client/options.c:125 client/gui-win32/connectdlg.c:912 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
msgid "Metaserver"
msgstr "Metaserveris"
-#: client/options.c:126
+#: client/options.c:130
msgid ""
"The metaserver is a host that the client contacts to find out about games on "
"the internet. Don't change this from its default value unless you know what "
"you're doing."
msgstr ""
-#: client/options.c:132
+#: client/options.c:136
msgid "Soundset"
msgstr "Garsų rinkinys"
-#: client/options.c:133
+#: client/options.c:137
msgid ""
"This is the soundset that will be used. Changing this is the same as using "
"the -S command-line parameter."
msgstr ""
-#: client/options.c:138
+#: client/options.c:142
msgid "Sound plugin"
msgstr "Garso įskiepis"
-#: client/options.c:139
+#: client/options.c:143
msgid ""
"If you have a problem with sound, try changing the sound plugin. The new "
"plugin won't take effect until you restart Freeciv. Changing this is the "
"same as using the -P command-line option."
msgstr ""
-#: client/options.c:144 client/gui-sdl/gui_main.c:162
+#: client/options.c:148 client/gui-sdl/gui_main.c:162
msgid "Theme"
msgstr "Tema"
-#: client/options.c:145
+#: client/options.c:149
msgid "By changing this option you change the active theme."
msgstr ""
-#: client/options.c:148
+#: client/options.c:152
msgid "Tileset"
msgstr "Laukelių rinkinys"
-#: client/options.c:149
+#: client/options.c:153
msgid ""
"By changing this option you change the active tileset. This is the same as "
"using the -t command-line parameter."
msgstr ""
-#: client/options.c:156
+#: client/options.c:160
msgid "Solid unit background color"
msgstr ""
-#: client/options.c:157
+#: client/options.c:161
msgid ""
"Setting this option will cause units on the map view to be drawn with a "
"solid background color instead of the flag backdrop."
msgstr ""
-#: client/options.c:161 client/gui-sdl/optiondlg.c:960
+#: client/options.c:165 client/gui-sdl/optiondlg.c:960
msgid "Sound bell at new turn"
msgstr "Kiekvieno ėjimo pradžią pranešti garsu."
-#: client/options.c:162
+#: client/options.c:166
msgid ""
"Set this option to have a \"bell\" event be generated at the start of a new "
"turn. You can control the behavior of the \"bell\" event by editing the "
"message options."
msgstr ""
-#: client/options.c:168
+#: client/options.c:172
msgid "Unit movement animation time (milliseconds)"
msgstr ""
-#: client/options.c:169
+#: client/options.c:173
msgid ""
"This option controls how long unit \"animation\" takes when a unit moves on "
"the map view. Set it to 0 to disable animation entirely."
msgstr ""
-#: client/options.c:174
+#: client/options.c:178
msgid "Mapview recentering time (milliseconds)"
msgstr ""
-#: client/options.c:175
+#: client/options.c:179
msgid ""
"When the map view is recentered, it will slide smoothly over the map to its "
"new position. This option controls how long this slide lasts. Set it to 0 "
"to disable mapview sliding entirely."
msgstr ""
-#: client/options.c:180 client/gui-sdl/optiondlg.c:1014
+#: client/options.c:184 client/gui-sdl/optiondlg.c:1014
msgid "Show combat animation"
msgstr "Rodyti mūšio animaciją"
-#: client/options.c:181
+#: client/options.c:185
msgid ""
"Disabling this option will turn off combat animation between units on the "
"mapview."
msgstr ""
-#: client/options.c:184
+#: client/options.c:188
msgid "Draw the citybar"
msgstr ""
-#: client/options.c:185
+#: client/options.c:189
msgid ""
"Setting this option will display a 'citybar' containing useful information "
"beneath each city. Disabling this option will display only the city's name "
"and optionally, production."
msgstr ""
-#: client/options.c:191
+#: client/options.c:195
msgid "Show icons in the technology tree"
msgstr "Rodo ikonas technologijų medyje"
-#: client/options.c:192
+#: client/options.c:196
msgid ""
"Setting this option will display icons on the technology tree diagram. "
"Turning this option off makes the technology tree more compact."
msgstr ""
-#: client/options.c:197
+#: client/options.c:201
msgid "Draw shield graphics for units"
msgstr ""
-#: client/options.c:198
+#: client/options.c:202
msgid ""
"Setting this option will draw a shield icon as the flags on units. If "
"unset, the full flag will be drawn."
msgstr ""
-#: client/options.c:202
+#: client/options.c:206
msgid "Manual Turn Done in AI Mode"
msgstr ""
-#: client/options.c:203
+#: client/options.c:207
msgid ""
"Disable this option if you do not want to press the Turn Done button "
"manually when watching an AI player."
msgstr ""
-#: client/options.c:207 client/gui-sdl/optiondlg.c:1121
+#: client/options.c:211 client/gui-sdl/optiondlg.c:1121
msgid "Auto Center on Units"
msgstr ""
-#: client/options.c:208
+#: client/options.c:212
msgid ""
"Set this option to have the active unit centered automatically when the unit "
"focus changes."
msgstr ""
-#: client/options.c:211 client/gui-sdl/optiondlg.c:1147
+#: client/options.c:215 client/gui-sdl/optiondlg.c:1147
msgid "Auto Center on Combat"
msgstr "Automatiškai sucentruoti vykstant kovai"
-#: client/options.c:212
+#: client/options.c:216
msgid ""
"Set this option to have any combat be centered automatically. Disabled this "
"will speed up the time between turns but may cause you to miss combat "
"entirely."
msgstr ""
-#: client/options.c:217 client/gui-sdl/optiondlg.c:1174
+#: client/options.c:221 client/gui-sdl/optiondlg.c:1174
msgid "Focus on Awakened Units"
msgstr ""
-#: client/options.c:218
+#: client/options.c:222
msgid "Set this option to have newly awoken units be focused automatically."
msgstr ""
-#: client/options.c:221
+#: client/options.c:225
msgid "Allow goto into the unknown"
msgstr "Leisti eiti į nežinomą"
-#: client/options.c:222
+#: client/options.c:226
msgid ""
"Setting this option will make the game consider moving into unknown tiles. "
"If not, then goto routes will detour around or be blocked by unknown tiles."
msgstr ""
-#: client/options.c:226
+#: client/options.c:230
msgid "Center map when Popup city"
msgstr ""
-#: client/options.c:227
+#: client/options.c:231
msgid ""
"Setting this option makes the mapview center on a city when its city dialog "
"is popped up."
msgstr ""
-#: client/options.c:230
+#: client/options.c:234
msgid "Concise City Production"
msgstr ""
-#: client/options.c:231
+#: client/options.c:235
msgid ""
"Set this option to make the city production (as shown in the city dialog) to "
"be more compact."
msgstr ""
-#: client/options.c:234 client/gui-sdl/optiondlg.c:1252
+#: client/options.c:238 client/gui-sdl/optiondlg.c:1252
msgid "End Turn when done moving"
msgstr "Baigti Ä—jimÄ… kai baigiasi Ä—jimai"
-#: client/options.c:235
+#: client/options.c:239
msgid ""
"Setting this option makes your turn end automatically when all your units "
"are done moving."
msgstr ""
-#: client/options.c:238 client/gui-sdl/optiondlg.c:1226
+#: client/options.c:242 client/gui-sdl/optiondlg.c:1226
msgid "Prompt for city names"
msgstr ""
-#: client/options.c:239
+#: client/options.c:243
msgid ""
"Disabling this option will make the names of newly founded cities chosen "
"automatically by the server."
msgstr ""
-#: client/options.c:242 client/gui-sdl/optiondlg.c:1200
+#: client/options.c:246 client/gui-sdl/optiondlg.c:1200
msgid "Pop up city dialog for new cities"
msgstr ""
-#: client/options.c:243
+#: client/options.c:247
msgid ""
"Setting this option will pop up a newly-founded city's city dialog "
"automatically."
msgstr ""
-#: client/options.c:248
+#: client/options.c:250
+#, fuzzy
+msgid "Pop up caravan actions"
+msgstr "Karavano veiksmai"
+
+#: client/options.c:251
+msgid ""
+"If this option is enabled, when caravans arrive at a city where they can "
+"establish a traderoute or help build a wonder, a window will popup asking "
+"which action should be performed. Disabling this option means you will have "
+"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 ""
+
+#: client/options.c:260
+#, fuzzy
+msgid "Enable cursor changing"
+msgstr "Įjungti permatomumą (alpha blending)"
+
+#: client/options.c:261
+msgid ""
+"This option controls whether the client should try to change the mouse "
+"cursor depending on what is being pointed at, as well as to indicate changes "
+"in the client or server state."
+msgstr ""
+
+#: client/options.c:266
+msgid "Select cities before units"
+msgstr ""
+
+#: 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 ""
+
+#: client/options.c:272
+msgid "Clear unit orders on selection"
+msgstr ""
+
+#: client/options.c:273
+msgid ""
+"Enabling this option will cause unit orders to be cleared whenever one or "
+"more units are selected. If this option is disabled, selecting units will "
+"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 ""
+
+#: client/options.c:282
msgid "Background layer"
msgstr "Fono sluoksnis"
-#: client/options.c:249
+#: client/options.c:283
msgid "The background layer of the overview shows just ocean and land."
msgstr ""
-#: client/options.c:252
+#: client/options.c:286
msgid "Terrain relief map layer"
msgstr ""
-#: client/options.c:253
+#: client/options.c:287
msgid "The relief layer shows all terrains on the map."
msgstr ""
-#: client/options.c:256
+#: client/options.c:290
msgid "Borders layer"
msgstr "Sienų sluoksnis"
-#: client/options.c:257
+#: client/options.c:291
msgid ""
"The borders layer of the overview shows which tiles are owned by each player."
msgstr ""
-#: client/options.c:261
+#: client/options.c:295
msgid "Units layer"
msgstr "Dalinių sluoksnis"
-#: client/options.c:262
+#: client/options.c:296
msgid "Enabling this will draw units on the overview."
msgstr ""
-#: client/options.c:265
+#: client/options.c:299
msgid "Cities layer"
msgstr "Miestų sluoksnis"
-#: client/options.c:266
+#: client/options.c:300
msgid "Enabling this will draw cities on the overview."
msgstr ""
-#: client/options.c:269
+#: client/options.c:303
msgid "Overview fog of war"
msgstr "Karo rūko apžvalga"
-#: client/options.c:270
+#: client/options.c:304
msgid "Enabling this will show fog of war on the overview."
msgstr ""
-#: client/options.c:488
+#: client/options.c:526
msgid "If you add a preset by hand, also update \"number_of_presets\""
msgstr ""
-#: client/options.c:516
+#: client/options.c:554
msgid "Cannot find your home directory"
msgstr "Negaliu surasti Jūsų namų direktorijos"
-#: client/options.c:665 client/options.c:796
+#: client/options.c:703 client/options.c:834
msgid "Save failed, cannot find a filename."
msgstr "IÅ¡saugoti nepavyko, negaliu surasti tokio failo pavadinimo."
-#: client/options.c:678 client/options.c:859
+#: client/options.c:716 client/options.c:897
#, c-format
msgid "Save failed, cannot write to file %s"
msgstr ""
-#: client/options.c:680 client/options.c:862
+#: client/options.c:718 client/options.c:900
#, c-format
msgid "Saved settings to file %s"
msgstr "Išsaugoti nustatymus į failą %s"
@@ -8779,16 +8829,16 @@ msgstr "Serverio galimybių eilutė: %s"
msgid "Start of turn %d"
msgstr "%d ėjimo pradžia"
-#: client/packhand.c:1590
+#: client/packhand.c:1591
#, c-format
msgid "AI Mode is now %s."
msgstr "DI režimas dabar yra %s."
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "ON"
msgstr "Įjungta"
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "OFF"
msgstr "IÅ¡jungta"
@@ -8820,14 +8870,15 @@ 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:2085
+#: client/gui-gtk-2.0/pages.c:2157
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:1536 client/gui-gtk-2.0/pages.c:2087
-#: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
-#: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
+#: 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/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr "Tauta"
@@ -8839,7 +8890,7 @@ msgstr "Siena"
msgid "Score"
msgstr "Taškai"
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
msgid "Team"
msgstr "Komanda"
@@ -8910,230 +8961,256 @@ msgstr "Joks %s negali būti išformuotas."
msgid "Could not open temp file."
msgstr "Negalima atverti laikino failo."
-#: client/servers.c:407
+#: client/servers.c:410
msgid "Invalid $http_proxy or metaserver value, must start with 'http://'"
msgstr ""
"Bloga $http_proxy arba metaserverio reikšmė, turi prasidėti su 'http://'"
-#: client/servers.c:413
+#: client/servers.c:416
msgid "Failed looking up metaserver's host"
msgstr ""
-#: client/text.c:85 client/text.c:86 client/text.c:91
+#. TRANS: "AI <player name>"
+#: client/text.c:94
+#, c-format
+msgid "AI %s"
+msgstr ""
+
+#. TRANS: "<nation adjective>, team <team name>"
+#: client/text.c:118
+#, fuzzy, c-format
+msgid "%s, team %s"
+msgstr ", komanda %s"
+
+#: client/text.c:135 client/text.c:136 client/text.c:141
#: client/gui-sdl/mapview.c:752
msgid "?nation:Neutral"
msgstr "?nation:Neutrali"
-#: client/text.c:85 client/gui-sdl/mapview.c:752
+#: client/text.c:135 client/gui-sdl/mapview.c:752
msgid "?nation:Hostile"
msgstr "?nation:Priešiška"
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Peaceful"
msgstr "?nation:Taiki"
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Friendly"
msgstr "?nation:Draugiška"
-#: client/text.c:88 client/gui-sdl/mapview.c:755
+#: client/text.c:138 client/gui-sdl/mapview.c:755
msgid "?nation:Mysterious"
msgstr "?nation:Paslaptinga"
-#: client/text.c:88
+#: client/text.c:138
msgid "?nation:Friendly(team)"
msgstr "?nation:Draugiška(komanda)"
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
msgid "?city:Neutral"
msgstr "?city:Neutralus"
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
msgid "?city:Hostile"
msgstr "?city:Priešiškas"
-#: client/text.c:92 client/gui-sdl/mapview.c:786
+#: client/text.c:142 client/gui-sdl/mapview.c:786
msgid "?city:Peaceful"
msgstr "?city:Taikus"
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Friendly"
msgstr "?city:Draugiškas"
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Mysterious"
msgstr "?city:Paslaptingas"
-#: client/text.c:93
+#: client/text.c:143
msgid "?city:Friendly(team)"
msgstr "?city:Draugiškas(komanda)"
-#: client/text.c:100
+#: client/text.c:151
#, c-format
msgid "Location: (%d, %d) [%d]"
msgstr "Vieta: (%d, %d) [%d]"
-#: client/text.c:109
+#: client/text.c:153
+#, c-format
+msgid "Native coordinates: (%d, %d)"
+msgstr ""
+
+#: client/text.c:160
#, c-format
msgid "Terrain: %s"
msgstr "Reljefas: %s"
-#: client/text.c:110
+#: client/text.c:161
#, c-format
msgid "Food/Prod/Trade: %s"
msgstr "Maistas/Gamyba/Prekyba: %s"
-#: client/text.c:113
+#: client/text.c:164
msgid "Minor Tribe Village"
msgstr ""
-#: client/text.c:119
+#: client/text.c:173
#, fuzzy
msgid "Our territory"
msgstr "Mūsų teritorija"
-#. TRANS: "Polish territory"
-#: client/text.c:122
+#. TRANS: "Territory of <username> (<nation + team>)"
+#: client/text.c:176
#, fuzzy, c-format
-msgid "%s territory"
-msgstr "%s teritorija"
+msgid "Territory of %s (%s)"
+msgstr ""
+"\n"
+"Teritorija, priklausanti %s %s"
-#. TRANS: "Polish territory (5 turn cease-fire)"
-#: client/text.c:131
-#, c-format
-msgid "%s territory (%d turn cease-fire)"
-msgid_plural "%s territory (%d turn cease-fire)"
-msgstr[0] "%s teritorija (%d Ä—jimo paliaubos)"
-msgstr[1] "%s teritorija (%d ėjimų paliaubos)"
-msgstr[2] "%s teritorija (%d ėjimų paliaubos)"
+#: client/text.c:186
+#, fuzzy, c-format
+msgid "Territory of %s (%s) (%d turn cease-fire)"
+msgid_plural "Territory of %s (%s) (%d turn cease-fire)"
+msgstr[0] "Miestas: %s (%s, %d Ä—jimo paliaubos)"
+msgstr[1] "Miestas: %s (%s, %d ėjimų paliaubos)"
+msgstr[2] "Miestas: %s (%s, %d ėjimų paliaubos)"
-#. TRANS: "Polish territory (friendly)"
-#: client/text.c:140
+#. TRANS: "Territory of <username>
+#. * (<nation + team> | <diplomatic state>)"
+#: client/text.c:195
#, fuzzy, c-format
-msgid "%s territory (%s)"
-msgstr "%s %s teritorija"
+msgid "Territory of %s (%s | %s)"
+msgstr ""
+"\n"
+"Teritorija, priklausanti %s %s"
-#: client/text.c:145
+#: client/text.c:200
msgid "Unclaimed territory"
msgstr "Nepriklausoma teritorija."
-#. TRANS: "City: Warsaw (Polish)"
-#: client/text.c:156
-#, c-format
-msgid "City: %s (%s)"
-msgstr "Miestas: %s (%s)"
+#. TRANS: "City: <city name> | <username> (<nation + team>)"
+#: client/text.c:214
+#, fuzzy, c-format
+msgid "City: %s | %s (%s)"
+msgstr "Miestas: %s (%s, %s)"
-#. TRANS: "City: Warsaw (Polish, 5 turn cease-fire)"
-#: client/text.c:166
-#, c-format
-msgid "City: %s (%s, %d turn cease-fire)"
-msgid_plural "City: %s (%s, %d turn cease-fire)"
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <number> turn cease-fire)"
+#: client/text.c:224
+#, fuzzy, c-format
+msgid "City: %s | %s (%s, %d turn cease-fire)"
+msgid_plural "City: %s | %s (%s, %d turn cease-fire)"
msgstr[0] "Miestas: %s (%s, %d Ä—jimo paliaubos)"
msgstr[1] "Miestas: %s (%s, %d ėjimų paliaubos)"
msgstr[2] "Miestas: %s (%s, %d ėjimų paliaubos)"
-#. TRANS: "City: Warsaw (Polish,friendly)"
-#: client/text.c:174
-#, c-format
-msgid "City: %s (%s, %s)"
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <diplomatic state>)"
+#: client/text.c:231
+#, fuzzy, c-format
+msgid "City: %s | %s (%s, %s)"
msgstr "Miestas: %s (%s, %s)"
#. TRANS: previous lines gave other information about the city.
-#: client/text.c:189
+#: client/text.c:246
#, fuzzy, c-format
msgid "?clistbegin: with %s"
msgstr " su %s"
#. TRANS: "Trade from Warsaw: 5"
-#: client/text.c:202
+#: client/text.c:259
#, c-format
msgid "Trade from %s: %d"
msgstr ""
-#: client/text.c:210
+#: client/text.c:267
#, c-format
msgid "Infrastructure: %s"
msgstr "Infrastruktūra: %s"
-#: client/text.c:215
+#: client/text.c:272
#, c-format
msgid "Activity: %s"
msgstr ""
-#. TRANS: "Unit: Musketeers (Polish, Warsaw)"
-#. TRANS: "Unit: Musketeers (Polish,friendly)"
-#: client/text.c:226 client/text.c:253
-#, c-format
-msgid "Unit: %s (%s, %s)"
+#. TRANS: "Unit: <unit type> | <username>
+#. * (<nation + team>, <homecity>)"
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <diplomatic state>)"
+#: client/text.c:287 client/text.c:313
+#, fuzzy, c-format
+msgid "Unit: %s | %s (%s, %s)"
msgstr "Dalinys: %s (%s, %s)"
-#. TRANS: "Unit: Musketeers (Polish)"
-#: client/text.c:232
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>)"
+#: client/text.c:292
#, fuzzy, c-format
-msgid "Unit: %s (%s)"
-msgstr "Dalinys: %s (%s)"
+msgid "Unit: %s | %s (%s)"
+msgstr "Dalinys: %s (%s, %s)"
-#. TRANS: "Unit: Musketeers (Polish, 5 turn cease-fire)"
-#: client/text.c:245
-#, c-format
-msgid "Unit: %s (%s, %d turn cease-fire)"
-msgid_plural "Unit: %s (%s, %d turn cease-fire)"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <number> turn cease-fire)"
+#: client/text.c:305
+#, fuzzy, c-format
+msgid "Unit: %s | %s (%s, %d turn cease-fire)"
+msgid_plural "Unit: %s | %s (%s, %d turn cease-fire)"
+msgstr[0] "Miestas: %s (%s, %d Ä—jimo paliaubos)"
+msgstr[1] "Miestas: %s (%s, %d ėjimų paliaubos)"
+msgstr[2] "Miestas: %s (%s, %d ėjimų paliaubos)"
#. TRANS: "Chance to win: A:95% D:46%"
-#: client/text.c:279
+#: client/text.c:338
#, c-format
msgid "Chance to win: A:%d%% D:%d%%"
msgstr "TikimybÄ— laimÄ—ti: P:%d%% G:%d%%"
#. TRANS: A is attack power, D is defense power, FP is firepower,
#. * HP is hitpoints (current and max).
-#: client/text.c:286
+#: client/text.c:345
#, c-format
msgid "A:%d D:%d FP:%d HP:%d/%d (%s)"
msgstr ""
#. TRANS: "5 more" units on this tile
-#: client/text.c:295
+#: client/text.c:354
#, c-format
msgid " (%d more)"
msgstr " (dar %d)"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:364
+#: client/text.c:423
#, c-format
msgid "far from %s"
msgstr "toli nuo %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:367
+#: client/text.c:426
#, c-format
msgid "near %s"
msgstr "\"arti %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:370
+#: client/text.c:429
#, c-format
msgid "in %s"
msgstr ""
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:403
+#: client/text.c:462
#, c-format
msgid "from %s"
msgstr "iš %s"
-#: client/text.c:466
+#: client/text.c:525
msgid "Progress: no research"
msgstr "Pažanga: netyrinėjama"
-#: client/text.c:470
+#: client/text.c:529
msgid "Progress: no research target"
msgstr "Progresas: nėra paieškos tikslo"
-#: client/text.c:475
+#: client/text.c:534
#, c-format
msgid "Progress: %d turn/advance"
msgid_plural "Progress: %d turns/advance"
@@ -9141,7 +9218,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: client/text.c:480
+#: client/text.c:539
#, c-format
msgid "%d bulb/turn"
msgid_plural "%d bulbs/turn"
@@ -9149,7 +9226,7 @@ msgstr[0] "%d lemputÄ—/Ä—jimÄ…"
msgstr[1] "%d lemputÄ—s/Ä—jimÄ…"
msgstr[2] "%d lempuÄių/Ä—jimÄ…"
-#: client/text.c:485
+#: client/text.c:544
#, c-format
msgid ", %d bulb/turn from team"
msgid_plural ", %d bulbs/turn from team"
@@ -9157,12 +9234,12 @@ msgstr[0] ", %d lemputė/ėjimą iš komandos"
msgstr[1] ", %d lemputės/ėjimą iš komandos"
msgstr[2] ", %d lempuÄių/Ä—jimÄ… iÅ¡ komandos"
-#: client/text.c:512
+#: client/text.c:571
#, c-format
msgid "%d/- (never)"
msgstr "%d/- (niekada)"
-#: client/text.c:524
+#: client/text.c:583
#, c-format
msgid "%d/%d (%d turn)"
msgid_plural "%d/%d (%d turns)"
@@ -9170,12 +9247,12 @@ msgstr[0] "%d/%d (%d Ä—jimas)"
msgstr[1] "%d/%d (%d Ä—jimai)"
msgstr[2] "%d/%d (%d ėjimų)"
-#: client/text.c:527
+#: client/text.c:586
#, c-format
msgid "%d/%d (never)"
msgstr "%d/%d (niekada)"
-#: client/text.c:564
+#: client/text.c:623
#, c-format
msgid "%d step"
msgid_plural "%d steps"
@@ -9183,7 +9260,7 @@ msgstr[0] "%d žingsnis"
msgstr[1] "%d žingsniai"
msgstr[2] "%d žingsnių"
-#: client/text.c:566
+#: client/text.c:625
#, c-format
msgid "%d bulb"
msgid_plural "%d bulbs"
@@ -9191,7 +9268,7 @@ msgstr[0] "%d lemputÄ—"
msgstr[1] "%d lemputÄ—s"
msgstr[2] "%d lempuÄių"
-#: client/text.c:570 client/agents/cma_fec.c:269 client/agents/cma_fec.c:313
+#: 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
#, c-format
msgid "%d turn"
@@ -9200,88 +9277,88 @@ msgstr[0] "%d Ä—jimas"
msgstr[1] "%d Ä—jimai"
msgstr[2] "%d ėjimų"
-#: client/text.c:592
+#: client/text.c:651
#, c-format
msgid "Population: %s"
msgstr "Gyventojai: %s"
-#: client/text.c:595
+#: client/text.c:654
#, c-format
msgid "Year: %s (T%d)"
msgstr "Metai: %s (Ä–%d)"
-#: client/text.c:598
+#: client/text.c:657
#, c-format
msgid "Gold: %d (%+d)"
msgstr "Auksas: %d (%+d)"
-#: client/text.c:600
+#: client/text.c:659
#, c-format
msgid "Tax: %d Lux: %d Sci: %d"
msgstr ""
-#: client/text.c:607
+#: client/text.c:666
msgid "Moving: Nobody"
msgstr ""
-#: client/text.c:609
+#: client/text.c:668
#, c-format
msgid "Moving: %s"
msgstr ""
-#: client/text.c:613
+#: client/text.c:672
msgid "(Click for more info)"
msgstr "(Paspauskite norėdami sužinoti daugiau informacijos)"
-#: client/text.c:629
+#: client/text.c:688
#, c-format
msgid "%s People"
msgstr "%s žmonių"
-#: client/text.c:633
+#: client/text.c:692
#, c-format
msgid "Turn: %d"
msgstr "Ä–jimas: %d"
-#: client/text.c:635 client/gui-win32/inteldlg.c:111
+#: client/text.c:694 client/gui-win32/inteldlg.c:111
#: client/gui-xaw/inteldlg.c:208
#, c-format
msgid "Gold: %d"
msgstr "Aukso: %d"
-#: client/text.c:636
+#: client/text.c:695
#, c-format
msgid "Net Income: %d"
msgstr ""
#. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:639
+#: client/text.c:698
#, c-format
msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
msgstr ""
-#: client/text.c:643
+#: client/text.c:702
#, c-format
msgid "Researching %s: %s"
msgstr "TyrinÄ—jama %s: %s"
-#: client/text.c:650
+#: client/text.c:709
#, c-format
msgid "Global warming chance: %d%% (%+d%%/turn)"
msgstr "Globalinio atšilimo tikimybė: %d%% (%+d%%/ėjimą)"
-#: client/text.c:653
+#: client/text.c:712
#, c-format
msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
msgstr "Branduolinės žiemos tikimybė: %d%% (%+d%%/ėjimą)"
-#: client/text.c:658 client/gui-win32/inteldlg.c:104
+#: client/text.c:717 client/gui-win32/inteldlg.c:104
#: client/gui-xaw/inteldlg.c:200
#, c-format
msgid "Government: %s"
msgstr "VyriausybÄ—: %s"
-#: client/text.c:682
+#: client/text.c:741
#, c-format
msgid "%d unit"
msgid_plural "%d units"
@@ -9290,21 +9367,21 @@ msgstr[1] "%d daliniai"
msgstr[2] "%d dalinių"
#. TRANS: Impossible to reach goto target tile
-#: client/text.c:715 client/gui-sdl/mapview.c:566
+#: client/text.c:774 client/gui-sdl/mapview.c:566
msgid "?goto:Unreachable"
msgstr ""
-#: client/text.c:717 client/gui-sdl/mapview.c:568
+#: client/text.c:776 client/gui-sdl/mapview.c:568
#, c-format
msgid "Turns to target: %d"
msgstr "Ä–jimai iki tikslo: %d"
-#: client/text.c:719 client/gui-sdl/mapview.c:570
+#: client/text.c:778 client/gui-sdl/mapview.c:570
#, c-format
msgid "Turns to target: %d to %d"
msgstr ""
-#: client/text.c:725 client/gui-sdl/mapview.c:576
+#: client/text.c:784 client/gui-sdl/mapview.c:576
#, c-format
msgid "%d unit selected"
msgid_plural "%d units selected"
@@ -9312,34 +9389,34 @@ msgstr[0] "Pažymėtas %d dalinys"
msgstr[1] "Pažymėti %d daliniai"
msgstr[2] "Pažymėti %d dalinių"
-#: client/text.c:730 client/gui-sdl/mapview.c:581
+#: client/text.c:789 client/gui-sdl/mapview.c:581
msgid "No units selected."
msgstr "Daliniai nepažymėti."
-#: client/text.c:804 client/gui-sdl/mapview.c:654
+#: client/text.c:863 client/gui-sdl/mapview.c:654
#, c-format
msgid "Others: %d civil; %d military"
msgstr ""
-#: client/text.c:806 client/gui-sdl/mapview.c:656
+#: client/text.c:865 client/gui-sdl/mapview.c:656
#, c-format
msgid "Others: %d civilian"
msgstr ""
-#: client/text.c:808 client/gui-sdl/mapview.c:658
+#: client/text.c:867 client/gui-sdl/mapview.c:658
#, c-format
msgid "Others: %d military"
msgstr ""
-#: client/text.c:839
+#: client/text.c:898
msgid "No units to upgrade!"
msgstr "Nėra tobulintinų dalinių!"
-#: client/text.c:864
+#: client/text.c:923
msgid "None of these units may be upgraded."
msgstr "Nei vienas iš šių dalinių negali būti patobulintas."
-#: client/text.c:870
+#: client/text.c:929
#, c-format
msgid ""
"Upgrade %d unit for %d gold?\n"
@@ -9357,72 +9434,72 @@ msgstr[2] ""
"Patobulinti %d dalinių už %d aukso?\n"
"Ižde yra %d aukso."
-#: client/text.c:891
+#: client/text.c:950
msgid "Shows your progress in researching the current technology."
msgstr "Rodo Jūsų pažangą, beieškant dabar nustatytos technologijos."
-#: client/text.c:897
+#: client/text.c:956
msgid "no research target."
msgstr "Nėra paieškų tikslo."
#. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:900
+#: client/text.c:959
#, c-format
msgid "%s: %d/%d."
msgstr "%s: %d/%d."
-#: client/text.c:920
+#: client/text.c:979
msgid "Shows the progress of global warming:"
msgstr "Rodo globalinio atšilimo eigą:"
-#: client/text.c:921
+#: client/text.c:980
#, c-format
msgid "Pollution rate: %d%%"
msgstr "Užterštumo norma: %d%%"
-#: client/text.c:923
+#: client/text.c:982
#, c-format
msgid "Chance of catastrophic warming each turn: %d%%"
msgstr "Katastrofinio klimato atšilimo tikimybė kiekvienu ėjimu: %d%%"
-#: client/text.c:939
+#: client/text.c:998
msgid "Shows the progress of nuclear winter:"
msgstr "Rodo branduolinės žiemos galimybės progresą:"
-#: client/text.c:940
+#: client/text.c:999
#, c-format
msgid "Fallout rate: %d%%"
msgstr "Radioaktyvių dulkių kritimo norma: %d%%"
-#: client/text.c:942
+#: client/text.c:1001
#, c-format
msgid "Chance of catastrophic winter each turn: %d%%"
msgstr "Branduolinės žiemos pasireiškimo tikimybė kiekvienu ėjimu: %d%%"
-#: client/text.c:957
+#: client/text.c:1016
msgid "Shows your current government:"
msgstr "Rodo Jūsų dabartinę vyriausybę:"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:981
+#: client/text.c:1040
#, c-format
msgid "Population: %5d"
msgstr "Gyventojai: %5d"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:1043
#, c-format
msgid "Support: %5d %%"
msgstr "Palaikymas: %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:1047
#, c-format
msgid "Energy: %5d %%"
msgstr "Energija: %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:992
+#: client/text.c:1051
#, c-format
msgid "Mass: %5d ton"
msgid_plural "Mass: %5d tons"
@@ -9431,97 +9508,98 @@ msgstr[1] "Mass: %5d tonos"
msgstr[2] "Mass: %5d tonų"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1057
#, c-format
msgid "Travel time: %5.1f years"
msgstr "KelionÄ—s laikas: %5.1f years"
# Kaip išvert N/A?
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1061
msgid "Travel time: N/A "
msgstr "KelionÄ—s laikas: N/A"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1065
#, c-format
msgid "Success prob.: %5d %%"
msgstr "SÄ—kmÄ—s tikim.: %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1010
+#: client/text.c:1069
#, c-format
msgid "Year of arrival: %8s"
msgstr "Atvykimo metai: %8s"
-#: client/text.c:1030
+#: client/text.c:1089
msgid "?timeout:off"
msgstr "?timeout:išjungta"
-#: client/text.c:1054
+#: client/text.c:1113
#, c-format
msgid "?seconds:%02ds"
msgstr "?seconds:%02ds"
-#: client/text.c:1056
+#: client/text.c:1115
#, c-format
msgid "?mins/secs:%02dm %02ds"
msgstr "?mins/secs:%02dm %02ds"
-#: client/text.c:1058
+#: client/text.c:1117
#, c-format
msgid "?hrs/mns:%02dh %02dm"
msgstr "?hrs/mns:%02dh %02dm"
-#: client/text.c:1060
+#: client/text.c:1119
#, c-format
msgid "?dys/hrs:%02dd %02dh"
msgstr "?dys/hrs:%02dd %02dh"
-#: client/text.c:1063
+#: client/text.c:1122
msgid "?duration:overflow"
msgstr ""
-#: client/text.c:1084
+#: client/text.c:1143
#, c-format
msgid "%6d.%02d ms"
msgstr ""
-#. TRANS: "Republic of the Poles"
-#: client/text.c:1127
-#, c-format
-msgid "%s of the %s"
-msgstr ""
+#. TRANS: <nation adjective> <government name>.
+#. * E.g. "Polish Republic".
+#: client/text.c:1188
+#, fuzzy, c-format
+msgid "?nationgovernment:%s %s"
+msgstr "VyriausybÄ—: %s"
#. TRANS: "Observer: 1985"
-#: client/text.c:1137
+#: client/text.c:1198
#, c-format
msgid "Observer: %s"
msgstr "StebÄ—tojas: %s"
-#: client/text.c:1155
+#: client/text.c:1216
msgid "Buildings: "
msgstr "Pastatai: "
-#: client/text.c:1172 client/text.c:1211
+#: client/text.c:1233 client/text.c:1272
msgid "None. "
msgstr "NÄ—ra. "
-#: client/text.c:1174 client/text.c:1213
+#: client/text.c:1235 client/text.c:1274
msgid "?clistend:."
msgstr "."
-#: client/text.c:1192
+#: client/text.c:1253
msgid "Wonders: "
msgstr "Stebuklai: "
-#: client/text.c:1247
+#: client/text.c:1308
#, c-format
msgid "Cities: %d total, %d over threshold of %d cities."
msgstr ""
#. TRANS: 0-21 content [citizen(s)] ...
-#: client/text.c:1251
+#: client/text.c:1312
#, c-format
msgid "%d content before penalty."
msgid_plural "%d content before penalty."
@@ -9530,7 +9608,7 @@ msgstr[1] ""
msgstr[2] ""
#. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1257
+#: client/text.c:1318
#, fuzzy, c-format
msgid "%d additional unhappy citizen."
msgid_plural "%d additional unhappy citizens."
@@ -9538,39 +9616,35 @@ msgstr[0] "* Neturi nelaimingų pilieÄių.\n"
msgstr[1] "* Neturi nelaimingų pilieÄių.\n"
msgstr[2] "* Neturi nelaimingų pilieÄių.\n"
-#. TRANS: Martial law opening parenthesis
-#: client/text.c:1279
-msgid "Martial law in effect ("
+#: client/text.c:1339
+msgid "Unlimited martial law in effect."
msgstr ""
-#. TRANS: no [unit] maximum
-#: client/text.c:1284
-msgid "no maximum, "
-msgstr "nÄ—ra maksimumo,"
-
-#: client/text.c:1287
+#: client/text.c:1341
#, c-format
-msgid "%d unit maximum, "
-msgid_plural "%d units maximum, "
+msgid "%d military unit may impose martial law."
+msgid_plural "Up to %d military units may impose martial law."
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#. TRANS: Martial law closing parenthesis
-#: client/text.c:1294
-#, c-format
-msgid "%d per unit). "
-msgstr ""
+#: client/text.c:1345
+#, fuzzy, c-format
+msgid "Each military unit makes %d unhappy citizen content."
+msgid_plural "Each military unit makes %d unhappy citizens content."
+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:1298
+#: client/text.c:1352
msgid "Military units in the field may cause unhappiness. "
msgstr "Kariniai daliniai lauke gali kelti nepasitenkinimÄ…."
-#: client/text.c:1301
+#: client/text.c:1355
msgid "Military units have no happiness effect. "
msgstr "Kariniai daliniai neveikia laimingumo efekto. "
-#: client/text.c:1316
+#: client/text.c:1370
#, c-format
msgid "Luxury: %d total."
msgstr "Prabanga: %d iš viso."
@@ -9590,7 +9664,7 @@ msgid ""
"instead."
msgstr ""
-#: client/tilespec.c:3968
+#: client/tilespec.c:3966
#, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
@@ -9611,12 +9685,12 @@ msgid ""
"have a look."
msgstr ""
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
-#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:599
+#: client/gui-gtk-2.0/cityrep.c:624 client/gui-sdl/citydlg.c:2009
msgid "none"
msgstr "nÄ—ra"
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:645
msgid "custom"
msgstr "pasirinktinis"
@@ -9916,7 +9990,7 @@ msgstr "Įsteigti _prekybos maršrutą"
msgid "Enter Marketplace"
msgstr "Aplankyti turgų"
-#: client/gui-gtk-2.0/chatline.c:144 client/gui-win32/chatline.c:134
+#: client/gui-gtk-2.0/chatline.c:218 client/gui-win32/chatline.c:134
#: client/gui-xaw/chatline.c:120
msgid "Cleared output window."
msgstr "Išvesties langas išvalytas."
@@ -9999,11 +10073,11 @@ msgid "%d/%d %d turns"
msgstr ""
#: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:821
+#: client/gui-gtk-2.0/cityrep.c:1027
msgid "_Buy"
msgstr "_Pirkti"
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:869
msgid "_Production"
msgstr "_Gamyba"
@@ -10024,12 +10098,12 @@ msgid "Entertainers"
msgstr "Linksmintojai"
#: client/gui-gtk-2.0/citydlg.c:1029 client/gui-win32/citydlg.c:1989
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2403
msgid "Scientists"
msgstr "Mokslininkai"
#: client/gui-gtk-2.0/citydlg.c:1030 client/gui-win32/citydlg.c:1991
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2404
msgid "Taxmen"
msgstr "MokesÄių rinkÄ—jai"
@@ -10122,7 +10196,7 @@ msgstr "Palaikomi daliniai %d"
msgid "Present units %d"
msgstr "Esantys daliniai %d"
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:1019
msgid "Cen_ter"
msgstr ""
@@ -10211,31 +10285,60 @@ msgstr "Pervadinti miestÄ…"
msgid "What should we rename the city to?"
msgstr "Kaip mes turÄ—tume pervadinti miestÄ…?"
-#: client/gui-gtk-2.0/cityrep.c:699
+#: client/gui-gtk-2.0/cityrep.c:794
+#, fuzzy
+msgid "(no worklists defined)"
+msgstr "(darbų sąrašas)"
+
+#: client/gui-gtk-2.0/cityrep.c:876
msgid "Chan_ge"
msgstr "_Keisti"
-#: client/gui-gtk-2.0/cityrep.c:703
+#: client/gui-gtk-2.0/cityrep.c:880
msgid "Add _First"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:707
+#: client/gui-gtk-2.0/cityrep.c:884
msgid "Add _Next"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:711
+#: client/gui-gtk-2.0/cityrep.c:888
+msgid "Add _2nd Last"
+msgstr ""
+
+#: client/gui-gtk-2.0/cityrep.c:892
msgid "Add _Last"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:715
+#: client/gui-gtk-2.0/cityrep.c:899
+#, fuzzy
+msgid "Set Worklist"
+msgstr "Darbų sąrašas"
+
+#: client/gui-gtk-2.0/cityrep.c:905
+#, fuzzy
+msgid "Append Worklist"
+msgstr "Pervadinti darbų sąrašą"
+
+#: client/gui-gtk-2.0/cityrep.c:911
+#, fuzzy
+msgid "Clear _Worklist"
+msgstr "Pervadinti darbų sąrašą"
+
+#: client/gui-gtk-2.0/cityrep.c:916
+#, fuzzy
+msgid "Gover_nor"
+msgstr "Gubernatorius"
+
+#: client/gui-gtk-2.0/cityrep.c:921
msgid "_Select"
msgstr "_Pašymėti"
-#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
+#: client/gui-gtk-2.0/cityrep.c:925 client/gui-gtk-2.0/plrdlg.c:521
msgid "_Display"
msgstr "_Rodyti"
-#: client/gui-gtk-2.0/cityrep.c:800 client/gui-gtk-2.0/menu.c:808
+#: 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-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
#: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -10245,100 +10348,100 @@ msgstr "_Rodyti"
msgid "Cities"
msgstr "Miestai"
-#: client/gui-gtk-2.0/cityrep.c:817
+#: client/gui-gtk-2.0/cityrep.c:1023
msgid "_Inspect"
msgstr ""
-#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
-#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-sdl/helpdlg.c:297 client/gui-win32/menu.c:342
-#: client/gui-xaw/menu.c:241
+#: 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
+#: client/gui-gtk-2.0/cityrep.c:1518 client/gui-gtk-2.0/menu.c:823
+#: client/gui-gtk-2.0/menu.c:825 client/gui-gtk-2.0/menu.c:827
+#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:831
+#: client/gui-gtk-2.0/menu.c:833 client/gui-sdl/helpdlg.c:297
+#: client/gui-win32/menu.c:342 client/gui-xaw/menu.c:241
msgid "Improvements"
msgstr "Patobulinimai"
-#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
-#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
-#: client/gui-xaw/menu.c:247
+#: client/gui-gtk-2.0/cityrep.c:1441 client/gui-gtk-2.0/cityrep.c:1460
+#: client/gui-gtk-2.0/cityrep.c:1479 client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1522 client/gui-xaw/menu.c:247
msgid "Wonders"
msgstr "Stebuklai"
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1662 client/gui-win32/cityrep.c:439
#: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
msgid "All Cities"
msgstr "Visi miestai"
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1667 client/gui-win32/cityrep.c:440
msgid "No Cities"
msgstr "Nėra miestų"
-#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1672 client/gui-win32/cityrep.c:441
msgid "Invert Selection"
msgstr "Invertuoti pažymėjimą"
-#: client/gui-gtk-2.0/cityrep.c:1420
+#: client/gui-gtk-2.0/cityrep.c:1682
msgid "Building Units"
msgstr "Statomi dalinai"
-#: client/gui-gtk-2.0/cityrep.c:1426
+#: client/gui-gtk-2.0/cityrep.c:1688
msgid "Building Improvements"
msgstr "Statomi patobulinimai"
-#: client/gui-gtk-2.0/cityrep.c:1432
+#: client/gui-gtk-2.0/cityrep.c:1694
msgid "Building Wonders"
msgstr "Statomi stebuklai"
-#: client/gui-gtk-2.0/cityrep.c:1444
+#: client/gui-gtk-2.0/cityrep.c:1706
msgid "Building Unit"
msgstr "Statomas dalinys"
-#: client/gui-gtk-2.0/cityrep.c:1448
+#: client/gui-gtk-2.0/cityrep.c:1710
msgid "Building Improvement"
msgstr "Statomas patobulinimas"
-#: client/gui-gtk-2.0/cityrep.c:1452
+#: client/gui-gtk-2.0/cityrep.c:1714
msgid "Building Wonder"
msgstr "Statomas stebuklas"
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1722 client/gui-win32/cityrep.c:443
msgid "Coastal Cities"
msgstr "PakrantÄ—s miestai"
-#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1727 client/gui-win32/cityrep.c:444
msgid "Same Island"
msgstr "Ta pati sala"
-#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1737 client/gui-win32/cityrep.c:447
msgid "Supported Units"
msgstr "Palaikomi daliniai"
-#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1740 client/gui-win32/cityrep.c:454
msgid "Units Present"
msgstr "Esantys daliniai"
-#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1744 client/gui-win32/cityrep.c:469
msgid "Improvements in City"
msgstr "Miesto patobulinimai"
-#: client/gui-gtk-2.0/cityrep.c:1486
+#: client/gui-gtk-2.0/cityrep.c:1748
msgid "Wonders in City"
msgstr "Stebuklai mieste"
-#: client/gui-gtk-2.0/cityrep.c:1495
+#: client/gui-gtk-2.0/cityrep.c:1757
msgid "Available Units"
msgstr "Prieinami daliniai"
-#: client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1760
msgid "Available Improvements"
msgstr "Prieinami patobulinimai"
-#: client/gui-gtk-2.0/cityrep.c:1501
+#: client/gui-gtk-2.0/cityrep.c:1763
msgid "Available Wonders"
msgstr "Prieinami stebuklai"
-#: client/gui-gtk-2.0/cityrep.c:1625
+#: client/gui-gtk-2.0/cityrep.c:1882
#, fuzzy, c-format
msgid "Total Buy Cost: %d"
msgstr "Visa kaina:"
@@ -10404,11 +10507,11 @@ msgstr ""
msgid "Remove this preset?"
msgstr ""
-#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:186
+#: client/gui-gtk-2.0/dialogs.c:196 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:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
msgid "Inspect _City"
msgstr ""
@@ -10436,10 +10539,10 @@ msgstr "Pasirinkite, kÄ… plÄ—Å¡ti:"
msgid "Unit"
msgstr "Dalinys"
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
-#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
-#: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
-#: manual/civmanual.c:302 data/Freeciv.in:80
+#: 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-win32/plrdlg.c:335 manual/civmanual.c:302 data/Freeciv.in:80
msgid "Name"
msgstr "Vardas"
@@ -10464,7 +10567,7 @@ 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:1036 data/Freeciv.in:3371
+#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
msgid "Pick Nation"
msgstr "Pasirinkite tautÄ…"
@@ -10546,7 +10649,7 @@ msgstr "Že_mėlapiai"
msgid "_Advances"
msgstr "_Pasiekimai"
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:910
+#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr "_Miestai"
@@ -10651,108 +10754,177 @@ msgstr "Pasirinkti tikslÄ…"
msgid "Show _All Cities"
msgstr "Rodyti _visus miestus"
-#: client/gui-gtk-2.0/gui_main.c:150
+#: client/gui-gtk-2.0/gui_main.c:162
msgid "Show Map Scrollbars"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:151
+#: client/gui-gtk-2.0/gui_main.c:163
msgid "Disable this option to hide the scrollbars on the map view."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:155
+#: client/gui-gtk-2.0/gui_main.c:167
msgid "Keyboardless goto"
msgstr "Nereikalaujantis klaviatūros eiti į"
-#: client/gui-gtk-2.0/gui_main.c:156
+#: client/gui-gtk-2.0/gui_main.c:168
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:161
+#: client/gui-gtk-2.0/gui_main.c:173
msgid "Keep dialogs on top"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:174
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:166
+#: client/gui-gtk-2.0/gui_main.c:178
msgid "Show worklist task icons"
msgstr "Rodyti darbų sÄ…rašų užduoÄių ikonas"
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:179
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:171
+#: client/gui-gtk-2.0/gui_main.c:183
msgid "Enable status report tabs"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:172
+#: client/gui-gtk-2.0/gui_main.c:184
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:177 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:189 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:178 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:190 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:277 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:195
+msgid "Show time for each chat message"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:196
+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
+msgid "Split bottom notebook area"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:202
+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
+msgid "New message events go to top of list"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:208
+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
+msgid "Show extra message window buttons"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:214
+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 "
+"is disabled, these buttons will not appear (you can still double-click with "
+"the left mouse button or right-click on a row to inspect or goto "
+"respectively). This option will only take effect once the message window is "
+"closed and reopened."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:224
+msgid "Metaserver tab first in network page"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:225
+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
+msgid "Plain chat messages are sent to allies only"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:231
+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 "
+"messages will be sent as public chat messages. To send a public chat message "
+"with this option enabled, prefix the message with a single colon ':'. This "
+"option can also be set using a toggle button beside the chat entry (only "
+"visible in multiplayer games)."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:340 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:723 client/gui-gtk-2.0/gui_main.c:1345
+#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
msgid "Freeciv"
msgstr "Freeciv"
-#: client/gui-gtk-2.0/gui_main.c:1088 client/gui-gtk-2.0/gui_main.c:1095
+#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
#: 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:1095 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1232 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:1127 client/gui-gtk-2.0/menu.c:770
-#: client/gui-gtk-2.0/menu.c:772 client/gui-gtk-2.0/menu.c:774
-#: client/gui-gtk-2.0/menu.c:776 client/gui-gtk-2.0/menu.c:778
-#: client/gui-gtk-2.0/menu.c:780 client/gui-gtk-2.0/menu.c:782
-#: client/gui-gtk-2.0/menu.c:784 client/gui-gtk-2.0/menu.c:786
-#: client/gui-gtk-2.0/menu.c:788 client/gui-gtk-2.0/menu.c:790
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-gtk-2.0/menu.c:804 client/gui-gtk-2.0/menu.c:806
-#: client/gui-gtk-2.0/menu.c:808 client/gui-gtk-2.0/menu.c:810
-#: client/gui-gtk-2.0/menu.c:812 client/gui-gtk-2.0/menu.c:814
-#: client/gui-gtk-2.0/menu.c:816 client/gui-gtk-2.0/menu.c:818
-#: client/gui-gtk-2.0/menu.c:820 client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/gui_main.c:1266 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
+#: client/gui-gtk-2.0/menu.c:811 client/gui-gtk-2.0/menu.c:813
+#: client/gui-gtk-2.0/menu.c:815 client/gui-gtk-2.0/menu.c:817
+#: client/gui-gtk-2.0/menu.c:819 client/gui-gtk-2.0/menu.c:821
+#: client/gui-gtk-2.0/menu.c:823 client/gui-gtk-2.0/menu.c:825
+#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
+#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
+#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
+#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
+#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
+#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
#: data/Freeciv.in:2028
msgid "View"
msgstr "Rodymas"
-#: client/gui-gtk-2.0/gui_main.c:1208
+#: client/gui-gtk-2.0/gui_main.c:1359
msgid "Chat"
msgstr "Pokalbis"
-#: client/gui-gtk-2.0/gui_main.c:1224 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1377 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"
@@ -10763,71 +10935,75 @@ 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:1491
+#: client/gui-gtk-2.0/gui_main.c:1392
+msgid "Allies Only"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:1657
msgid "Not _ready"
msgstr "_Nepasiruošęs"
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
+#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
msgid "_Ready"
msgstr "_Pasiruošęs"
-#: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2132
+#: 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
msgid "_Start"
msgstr "_PradÄ—ti"
-#: client/gui-gtk-2.0/gui_main.c:1520
+#: client/gui-gtk-2.0/gui_main.c:1686
#, fuzzy
msgid "_Take Player"
msgstr "Pasiimti šitą žaidėją"
-#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
+#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
msgid "Pick _Nation"
msgstr "IÅ¡sirink _tautÄ…"
-#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
+#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
msgid "_Observe"
msgstr "_StebÄ—ti"
-#: client/gui-gtk-2.0/gui_main.c:1532
+#: client/gui-gtk-2.0/gui_main.c:1698
#, fuzzy
msgid "Do not _observe"
msgstr "_NebestebÄ—ti"
-#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
msgid "<AI>"
msgstr "<DI>"
-#: client/gui-gtk-2.0/gui_main.c:1557
+#: client/gui-gtk-2.0/gui_main.c:1723
msgid "<Novice AI>"
msgstr "<Pradedantysis DI>"
-#: client/gui-gtk-2.0/gui_main.c:1560
+#: client/gui-gtk-2.0/gui_main.c:1726
msgid "<Easy AI>"
msgstr "<Lengvas DI>"
-#: client/gui-gtk-2.0/gui_main.c:1563
+#: client/gui-gtk-2.0/gui_main.c:1729
msgid "<Normal AI>"
msgstr "<Vidutinis DI>"
-#: client/gui-gtk-2.0/gui_main.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1732
msgid "<Hard AI>"
msgstr "<Sunkus DI>"
-#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1742 client/gui-win32/dialogs.c:594
#: client/gui-xaw/pages.c:217
msgid "Random"
msgstr "AtsitiktinÄ—"
-#: client/gui-gtk-2.0/gui_main.c:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
msgid "Observer"
msgstr "StebÄ—tojas"
-#: client/gui-gtk-2.0/gui_main.c:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
msgid "Detached"
msgstr "Atsijungęs"
-#: client/gui-gtk-2.0/gui_main.c:1899
+#: client/gui-gtk-2.0/gui_main.c:2073
msgid "Are you sure you want to quit?"
msgstr "Ar tikrai norite išeiti?"
@@ -11057,470 +11233,507 @@ msgstr "_Technologijos"
msgid "Foreign Intelligence: %s Empire"
msgstr "Užsienio žvalgyba: %s imperija"
-#: client/gui-gtk-2.0/mapctrl.c:195 client/gui-sdl/mapctrl.c:2565
+#: client/gui-gtk-2.0/mapctrl.c:179 client/gui-sdl/mapctrl.c:2565
#: client/gui-sdl/menu.c:839 client/gui-sdl/menu.c:1021
#: client/gui-win32/mapctrl.c:353
msgid "Build New City"
msgstr "Statyti naujÄ… miestÄ…"
-#: client/gui-gtk-2.0/mapctrl.c:196 client/gui-sdl/mapctrl.c:2594
+#: client/gui-gtk-2.0/mapctrl.c:180 client/gui-sdl/mapctrl.c:2594
#: client/gui-win32/mapctrl.c:354 client/gui-xaw/mapctrl.c:89
msgid "What should we call our new city?"
msgstr "Kaip turėtume pavadinti mūsų naująjį miestą?"
-#: client/gui-gtk-2.0/mapview.c:147
+#: client/gui-gtk-2.0/mapview.c:158
msgid "Shows your current luxury/science/tax rates;click to toggle them."
msgstr ""
-#: client/gui-gtk-2.0/mapview.c:692 client/gui-win32/canvas.c:275
+#: client/gui-gtk-2.0/mapview.c:702 client/gui-win32/canvas.c:275
msgid "Better fog will only work in truecolor. Disabling it"
msgstr ""
"Geresnis rūkas bus naudojamas dirbant tikrų spalvų režimu, todėl palaikymas "
"išjungiamas."
-#: client/gui-gtk-2.0/menu.c:250
+#: client/gui-gtk-2.0/menu.c:256
msgid "Leaving a local game will end it!"
msgstr "Išėjimas iš vietinio žaidimo jį užbaigs"
-#: client/gui-gtk-2.0/menu.c:700 client/gui-win32/menu.c:303
+#: client/gui-gtk-2.0/menu.c:727 client/gui-win32/menu.c:303
msgid "_Game"
msgstr "Žai_dimas"
-#: client/gui-gtk-2.0/menu.c:702 client/gui-gtk-2.0/menu.c:704
-#: client/gui-gtk-2.0/menu.c:706 client/gui-gtk-2.0/menu.c:708
-#: client/gui-gtk-2.0/menu.c:710 client/gui-gtk-2.0/menu.c:712
-#: client/gui-gtk-2.0/menu.c:714 client/gui-gtk-2.0/menu.c:717
-#: client/gui-gtk-2.0/menu.c:720 client/gui-gtk-2.0/menu.c:722
-#: client/gui-gtk-2.0/menu.c:724 client/gui-gtk-2.0/menu.c:726
-#: client/gui-gtk-2.0/menu.c:728 client/gui-gtk-2.0/menu.c:730
-#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:736
-#: client/gui-gtk-2.0/menu.c:738 client/gui-gtk-2.0/menu.c:740
+#: client/gui-gtk-2.0/menu.c:729 client/gui-gtk-2.0/menu.c:731
+#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:735
+#: client/gui-gtk-2.0/menu.c:737 client/gui-gtk-2.0/menu.c:739
+#: client/gui-gtk-2.0/menu.c:741 client/gui-gtk-2.0/menu.c:744
+#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
+#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
+#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
+#: client/gui-gtk-2.0/menu.c:760 client/gui-gtk-2.0/menu.c:763
+#: client/gui-gtk-2.0/menu.c:765 client/gui-gtk-2.0/menu.c:767
#: data/Freeciv.in:2026
msgid "Game"
msgstr "Žaidimas"
-#: client/gui-gtk-2.0/menu.c:704 client/gui-gtk-2.0/menu.c:706
-#: client/gui-gtk-2.0/menu.c:708
+#: client/gui-gtk-2.0/menu.c:731 client/gui-gtk-2.0/menu.c:733
+#: client/gui-gtk-2.0/menu.c:735
msgid "_Chat"
msgstr "_Pokalbis"
-#: client/gui-gtk-2.0/menu.c:706 client/gui-win32/menu.c:314
+#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:314
msgid "_Clear Log"
msgstr "_Valyti žurnalą"
-#: client/gui-gtk-2.0/menu.c:708 client/gui-win32/menu.c:313
+#: client/gui-gtk-2.0/menu.c:735 client/gui-win32/menu.c:313
msgid "_Write Log"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:710 client/gui-win32/menu.c:304
+#: client/gui-gtk-2.0/menu.c:737 client/gui-win32/menu.c:304
msgid "Local _Options"
msgstr "Vietiniai _nustatymai"
-#: client/gui-gtk-2.0/menu.c:712 client/gui-win32/menu.c:305
+#: client/gui-gtk-2.0/menu.c:739 client/gui-win32/menu.c:305
msgid "_Message Options"
msgstr "_Pranešimų nustatymai"
-#: client/gui-gtk-2.0/menu.c:717
+#: client/gui-gtk-2.0/menu.c:744
msgid "_Reload Tileset"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:720
+#: client/gui-gtk-2.0/menu.c:747
msgid "Save Options on _Exit"
msgstr "Išsaugoti nustatymus _išeinant"
-#: client/gui-gtk-2.0/menu.c:722
+#: client/gui-gtk-2.0/menu.c:749
msgid "Sa_ve Options"
msgstr "IÅ¡saugoti _nustatymus"
-#: client/gui-gtk-2.0/menu.c:726 client/gui-win32/menu.c:308
+#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:308
msgid "Server O_ptions"
msgstr "Serverio n_ustatymai"
-#: client/gui-gtk-2.0/menu.c:730 client/gui-win32/menu.c:310
+#: client/gui-gtk-2.0/menu.c:757 client/gui-win32/menu.c:310
msgid "_Save Game"
msgstr "_Išsaugoti žaidimą"
-#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:311
+#: client/gui-gtk-2.0/menu.c:760 client/gui-win32/menu.c:311
msgid "Save Game _As..."
msgstr "Išsaugoti žaidimą _kaip..."
-#: client/gui-gtk-2.0/menu.c:738
+#: client/gui-gtk-2.0/menu.c:765
msgid "_Leave"
msgstr "IÅ¡ei_ti"
-#: client/gui-gtk-2.0/menu.c:740 client/gui-win32/menu.c:317
+#: client/gui-gtk-2.0/menu.c:767 client/gui-win32/menu.c:317
msgid "_Quit"
msgstr "_IÅ¡jungti"
-#: client/gui-gtk-2.0/menu.c:745 client/gui-win32/menu.c:321
+#: client/gui-gtk-2.0/menu.c:772 client/gui-win32/menu.c:321
msgid "Gov_ernment"
msgstr "_VyriausybÄ—"
-#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
-#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
-#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:774 client/gui-gtk-2.0/menu.c:776
+#: client/gui-gtk-2.0/menu.c:778 client/gui-gtk-2.0/menu.c:780
+#: client/gui-gtk-2.0/menu.c:782 client/gui-gtk-2.0/menu.c:784
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
#: client/gui-xaw/menu.c:248 data/Freeciv.in:2027 data/helpdata.txt:1320
msgid "Government"
msgstr "VyriausybÄ—"
-#: client/gui-gtk-2.0/menu.c:749 client/gui-win32/menu.c:322
+#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:322
msgid "_Tax Rates"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:324
+#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:324
msgid "_Find City"
msgstr "_Rasti miestÄ…"
-#: client/gui-gtk-2.0/menu.c:755 client/gui-win32/menu.c:325
+#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:325
msgid "_Worklists"
msgstr "_Darbų sąrašai"
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
-#: client/gui-gtk-2.0/menu.c:764 client/gui-win32/menu.c:327
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
+#: client/gui-gtk-2.0/menu.c:791 client/gui-win32/menu.c:327
msgid "_Change Government"
msgstr "_Keisti vyriausybÄ™"
-#: client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:788
msgid "_Revolution..."
msgstr "_Revoliucija..."
-#: client/gui-gtk-2.0/menu.c:764 client/gui-gtk-2.0/menu.c:970
+#: client/gui-gtk-2.0/menu.c:791 client/gui-gtk-2.0/menu.c:1013
#: client/gui-win32/menu.c:431
msgid "_Government"
msgstr "_VyriausybÄ—"
-#: client/gui-gtk-2.0/menu.c:768 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:795 client/gui-gtk-2.0/menu.c:959
#: client/gui-win32/menu.c:334
msgid "_View"
msgstr "_Rodymas"
-#: client/gui-gtk-2.0/menu.c:772
+#: client/gui-gtk-2.0/menu.c:799
msgid "City Outlines"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:774 client/gui-win32/menu.c:335
+#: client/gui-gtk-2.0/menu.c:801 client/gui-win32/menu.c:335
msgid "Map _Grid"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:336
+#: client/gui-gtk-2.0/menu.c:803 client/gui-win32/menu.c:336
msgid "National _Borders"
msgstr "NacionalinÄ—s _sienos"
-#: client/gui-gtk-2.0/menu.c:778 client/gui-win32/menu.c:337
+#: client/gui-gtk-2.0/menu.c:805 client/gui-win32/menu.c:337
msgid "City _Names"
msgstr "Miestų _vardai"
-#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:338
+#: client/gui-gtk-2.0/menu.c:807 client/gui-win32/menu.c:338
msgid "City G_rowth"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:339
+#: client/gui-gtk-2.0/menu.c:809 client/gui-win32/menu.c:339
msgid "City _Productions"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:784 client/gui-sdl/optiondlg.c:1719
+#: client/gui-gtk-2.0/menu.c:811
+#, fuzzy
+msgid "City Buy Cost"
+msgstr "Visa kaina:"
+
+#: client/gui-gtk-2.0/menu.c:813
+#, fuzzy
+msgid "City Traderoutes"
+msgstr "Prekybos maršrutai: "
+
+#: client/gui-gtk-2.0/menu.c:815 client/gui-sdl/optiondlg.c:1719
msgid "Draw city worker map grid"
msgstr "Piešti miesto darbuotojų žemėlapio tinklą"
-#: client/gui-gtk-2.0/menu.c:788 client/gui-sdl/optiondlg.c:1635
+#: client/gui-gtk-2.0/menu.c:819 client/gui-sdl/optiondlg.c:1635
#: client/gui-win32/menu.c:340 client/gui-xaw/menu.c:148
#: client/gui-xaw/menu.c:246 manual/civmanual.c:220 data/helpdata.txt:1220
msgid "Terrain"
msgstr "Reljefas"
-#: client/gui-gtk-2.0/menu.c:790 client/gui-win32/menu.c:341
+#: client/gui-gtk-2.0/menu.c:821 client/gui-win32/menu.c:341
#: client/gui-xaw/menu.c:149
msgid "Coastline"
msgstr "PakrantÄ—"
-#: client/gui-gtk-2.0/menu.c:796 client/gui-win32/menu.c:343
+#: client/gui-gtk-2.0/menu.c:827 client/gui-win32/menu.c:343
msgid "Roads & Rails"
msgstr "Keliai ir geležinkeliai"
-#: client/gui-gtk-2.0/menu.c:800 client/gui-sdl/optiondlg.c:1933
+#: client/gui-gtk-2.0/menu.c:831 client/gui-sdl/optiondlg.c:1933
#: client/gui-win32/menu.c:345 client/gui-xaw/menu.c:152
msgid "Mines"
msgstr "Kasyklos"
-#: client/gui-gtk-2.0/menu.c:802 client/gui-win32/menu.c:346
+#: client/gui-gtk-2.0/menu.c:833 client/gui-win32/menu.c:346
msgid "Fortress & Airbase"
msgstr "Fortai ir oro bazÄ—s"
-#: client/gui-gtk-2.0/menu.c:804 client/gui-win32/menu.c:348
+#: client/gui-gtk-2.0/menu.c:835 client/gui-win32/menu.c:348
#: client/gui-xaw/menu.c:154
msgid "Specials"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:806 client/gui-win32/menu.c:349
+#: client/gui-gtk-2.0/menu.c:837 client/gui-win32/menu.c:349
#: client/gui-xaw/menu.c:155
msgid "Pollution & Fallout"
msgstr "Užterštumas ir radioaktyvios dulkės"
-#: client/gui-gtk-2.0/menu.c:812 client/gui-win32/menu.c:352
+#: client/gui-gtk-2.0/menu.c:843 client/gui-win32/menu.c:352
#: client/gui-xaw/menu.c:158
msgid "Focus Unit"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:814 client/gui-sdl/optiondlg.c:1854
+#: client/gui-gtk-2.0/menu.c:845 client/gui-sdl/optiondlg.c:1854
#: client/gui-win32/menu.c:353 client/gui-xaw/menu.c:159
msgid "Fog of War"
msgstr "Karo rūkas"
-#: client/gui-gtk-2.0/menu.c:818
+#: client/gui-gtk-2.0/menu.c:849
msgid "_Full Screen"
msgstr "_Visas ekranas"
-#: client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/menu.c:853
msgid "_Center View"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:825 client/gui-win32/menu.c:358
+#: client/gui-gtk-2.0/menu.c:856 client/gui-win32/menu.c:358
msgid "_Orders"
msgstr "_Nurodymai"
-#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
-#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
-#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
-#: client/gui-gtk-2.0/menu.c:855 client/gui-gtk-2.0/menu.c:857
-#: client/gui-gtk-2.0/menu.c:859 client/gui-gtk-2.0/menu.c:861
-#: client/gui-gtk-2.0/menu.c:863 client/gui-gtk-2.0/menu.c:865
-#: client/gui-gtk-2.0/menu.c:867 client/gui-gtk-2.0/menu.c:869
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875 client/gui-gtk-2.0/menu.c:877
-#: client/gui-gtk-2.0/menu.c:879 client/gui-gtk-2.0/menu.c:881
-#: client/gui-gtk-2.0/menu.c:883 client/gui-gtk-2.0/menu.c:885
-#: client/gui-gtk-2.0/menu.c:887 client/gui-gtk-2.0/menu.c:889
-#: client/gui-gtk-2.0/menu.c:891 client/gui-gtk-2.0/menu.c:893
-#: client/gui-gtk-2.0/menu.c:895 client/gui-gtk-2.0/menu.c:897
-#: client/gui-gtk-2.0/menu.c:899 client/gui-gtk-2.0/menu.c:901
-#: client/gui-gtk-2.0/menu.c:903 data/Freeciv.in:2029
+#: client/gui-gtk-2.0/menu.c:858 client/gui-gtk-2.0/menu.c:860
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:864
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:868
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:872
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:876
+#: client/gui-gtk-2.0/menu.c:878 client/gui-gtk-2.0/menu.c:880
+#: client/gui-gtk-2.0/menu.c:882 client/gui-gtk-2.0/menu.c:884
+#: client/gui-gtk-2.0/menu.c:886 client/gui-gtk-2.0/menu.c:888
+#: client/gui-gtk-2.0/menu.c:890 client/gui-gtk-2.0/menu.c:892
+#: client/gui-gtk-2.0/menu.c:894 client/gui-gtk-2.0/menu.c:896
+#: client/gui-gtk-2.0/menu.c:898 client/gui-gtk-2.0/menu.c:900
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906 client/gui-gtk-2.0/menu.c:908
+#: client/gui-gtk-2.0/menu.c:910 client/gui-gtk-2.0/menu.c:912
+#: client/gui-gtk-2.0/menu.c:914 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:918 client/gui-gtk-2.0/menu.c:920
+#: client/gui-gtk-2.0/menu.c:922 client/gui-gtk-2.0/menu.c:924
+#: client/gui-gtk-2.0/menu.c:926 client/gui-gtk-2.0/menu.c:928
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
+#: client/gui-gtk-2.0/menu.c:946 data/Freeciv.in:2029
msgid "Orders"
msgstr "Nurodymai"
-#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:1444
+#: client/gui-gtk-2.0/menu.c:860 client/gui-gtk-2.0/menu.c:1489
#: client/gui-win32/menu.c:359
msgid "_Build City"
msgstr "_Statyti miestÄ…"
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:1466
-#: client/gui-gtk-2.0/menu.c:1472 client/gui-win32/menu.c:360
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:1511
+#: client/gui-gtk-2.0/menu.c:1517 client/gui-win32/menu.c:360
msgid "Build _Road"
msgstr "Statyti _keliÄ…"
-#: client/gui-gtk-2.0/menu.c:833 client/gui-gtk-2.0/menu.c:1360
+#: 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 "Statyti _drÄ—kinimÄ…"
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:1361
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:1406
#: client/gui-win32/menu.c:362
msgid "Build _Mine"
msgstr "Statyti ka_syklÄ…"
-#: client/gui-gtk-2.0/menu.c:837 client/gui-gtk-2.0/menu.c:1362
+#: client/gui-gtk-2.0/menu.c:868 client/gui-gtk-2.0/menu.c:1407
msgid "Transf_orm Terrain"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:1508
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:1553
#: client/gui-win32/menu.c:364
msgid "Build _Fortress"
msgstr "Statyti _FortÄ…"
-#: client/gui-gtk-2.0/menu.c:841 client/gui-win32/menu.c:365
+#: client/gui-gtk-2.0/menu.c:872 client/gui-win32/menu.c:365
msgid "Build Airbas_e"
msgstr "Statyti _oro bazÄ™"
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:1514
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:1559
#: client/gui-win32/menu.c:366
msgid "Clean _Pollution"
msgstr "Valyti _taršą"
-#: client/gui-gtk-2.0/menu.c:845 client/gui-win32/menu.c:367
+#: client/gui-gtk-2.0/menu.c:876 client/gui-win32/menu.c:367
msgid "Clean _Nuclear Fallout"
msgstr "Valyti _radioaktyviÄ…sias dulkes"
-#: client/gui-gtk-2.0/menu.c:849 client/gui-win32/menu.c:369
+#: client/gui-gtk-2.0/menu.c:880 client/gui-win32/menu.c:369
msgid "_Sentry"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:855 client/gui-win32/menu.c:372
+#: client/gui-gtk-2.0/menu.c:886 client/gui-win32/menu.c:372
msgid "Make _Homecity"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:857 client/gui-win32/menu.c:373
+#: client/gui-gtk-2.0/menu.c:888 client/gui-win32/menu.c:373
msgid "_Load"
msgstr "Į_kelti"
-#: client/gui-gtk-2.0/menu.c:859
+#: client/gui-gtk-2.0/menu.c:890
msgid "_Unload Transporter"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:861 client/gui-win32/menu.c:374
+#: client/gui-gtk-2.0/menu.c:892 client/gui-win32/menu.c:374
msgid "_Unload"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:863 client/gui-win32/menu.c:375
+#: client/gui-gtk-2.0/menu.c:894 client/gui-win32/menu.c:375
msgid "Wake up o_thers"
msgstr "Pažadinti _kitus"
-#: client/gui-gtk-2.0/menu.c:867
+#: client/gui-gtk-2.0/menu.c:898
msgid "_Auto Settler"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:869 client/gui-win32/menu.c:378
+#: client/gui-gtk-2.0/menu.c:900 client/gui-win32/menu.c:378
msgid "Auto E_xplore"
msgstr "Automatiškai _tyrinėti"
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906
msgid "_Connect"
msgstr "_Sujungti"
-#: client/gui-gtk-2.0/menu.c:871 client/gui-win32/menu.c:380
+#: client/gui-gtk-2.0/menu.c:902 client/gui-win32/menu.c:380
msgid "_Road"
msgstr "_Kelias"
-#: client/gui-gtk-2.0/menu.c:873 client/gui-win32/menu.c:381
+#: client/gui-gtk-2.0/menu.c:904 client/gui-win32/menu.c:381
msgid "Rai_l"
msgstr "_Geležinkelis"
-#: client/gui-gtk-2.0/menu.c:875 client/gui-win32/menu.c:382
+#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:382
msgid "_Irrigate"
msgstr "_DrÄ—kinti"
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
msgid "Go _to"
msgstr "_Eiti į"
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
msgid "_Build city"
msgstr "_Statyti miestÄ…"
-#: client/gui-gtk-2.0/menu.c:879
+#: client/gui-gtk-2.0/menu.c:910
msgid "Patrol (_Q)"
msgstr "Patruliuoti (_Q)"
-#: client/gui-gtk-2.0/menu.c:881 client/gui-win32/menu.c:385
+#: client/gui-gtk-2.0/menu.c:912 client/gui-win32/menu.c:385
msgid "_Go to"
msgstr "_Eiti į"
-#: client/gui-gtk-2.0/menu.c:883
+#: client/gui-gtk-2.0/menu.c:914
msgid "Go\\/Airlift to City"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:885 client/gui-sdl/menu.c:450
+#: client/gui-gtk-2.0/menu.c:916 client/gui-sdl/menu.c:450
#: client/gui-win32/menu.c:387 client/gui-xaw/menu.c:203
msgid "Return to nearest city"
msgstr "Grįžti į artimiausią miestą"
-#: client/gui-gtk-2.0/menu.c:889 client/gui-win32/menu.c:389
+#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:389
#: client/gui-xaw/menu.c:205
msgid "Disband Unit"
msgstr "Išformuoti dalinį"
-#: client/gui-gtk-2.0/menu.c:891 client/gui-sdl/citydlg.c:532
+#: client/gui-gtk-2.0/menu.c:922 client/gui-sdl/citydlg.c:532
#: data/Freeciv.in:1186
msgid "Upgrade unit"
msgstr "Patobulinti dalinį"
-#: client/gui-gtk-2.0/menu.c:893
+#: client/gui-gtk-2.0/menu.c:924
msgid "Diplomat\\/Spy Actions"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:895 client/gui-sdl/menu.c:399
+#: client/gui-gtk-2.0/menu.c:926 client/gui-sdl/menu.c:399
#: client/gui-win32/menu.c:391 client/gui-xaw/menu.c:209
msgid "Explode Nuclear"
msgstr "Susprogduinti atominÄ™ jÄ—gainÄ™"
-#: client/gui-gtk-2.0/menu.c:899
-msgid "Select same type"
-msgstr "Pažymėti tokio pat tipo"
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/cityrep.c:882
+msgid "Select"
+msgstr "Pasirinkti"
+
+#: client/gui-gtk-2.0/menu.c:934
+#, fuzzy
+msgid "Single"
+msgstr "Džiunglės"
+
+#: client/gui-gtk-2.0/menu.c:936
+msgid "Same Type On Tile"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:938
+msgid "All On Tile"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:940
+msgid "Same Type On Continent"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:942
+msgid "Same Type Everywhere"
+msgstr ""
-#: client/gui-gtk-2.0/menu.c:901 client/gui-win32/menu.c:393
+#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:393
msgid "_Wait"
msgstr "_Laukti"
-#: client/gui-gtk-2.0/menu.c:903 client/gui-win32/menu.c:394
+#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:394
#: client/gui-xaw/menu.c:213
msgid "Done"
msgstr "Baigta"
-#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:398
+#: client/gui-gtk-2.0/menu.c:949 client/gui-win32/menu.c:398
msgid "_Reports"
msgstr "_Ataskaitos"
-#: client/gui-gtk-2.0/menu.c:908 client/gui-gtk-2.0/menu.c:910
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:914
-#: client/gui-gtk-2.0/menu.c:916 client/gui-gtk-2.0/menu.c:918
-#: client/gui-gtk-2.0/menu.c:920 client/gui-gtk-2.0/menu.c:922
-#: client/gui-gtk-2.0/menu.c:924 client/gui-gtk-2.0/menu.c:926
-#: client/gui-gtk-2.0/menu.c:928 client/gui-gtk-2.0/menu.c:930
-#: client/gui-gtk-2.0/menu.c:932 data/Freeciv.in:2030
+#: client/gui-gtk-2.0/menu.c:951 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:957
+#: client/gui-gtk-2.0/menu.c:959 client/gui-gtk-2.0/menu.c:961
+#: client/gui-gtk-2.0/menu.c:963 client/gui-gtk-2.0/menu.c:965
+#: client/gui-gtk-2.0/menu.c:967 client/gui-gtk-2.0/menu.c:969
+#: client/gui-gtk-2.0/menu.c:971 client/gui-gtk-2.0/menu.c:973
+#: client/gui-gtk-2.0/menu.c:975 data/Freeciv.in:2030
msgid "Reports"
msgstr "Ataskaitos"
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:958
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:1001
#: client/gui-win32/menu.c:400 client/gui-win32/menu.c:425
msgid "_Units"
msgstr "_Daliniai"
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/menu.c:914 client/gui-win32/menu.c:402
+#: client/gui-gtk-2.0/menu.c:957 client/gui-win32/menu.c:402
#, fuzzy
msgid "_Nations"
msgstr "_Tautos"
-#: client/gui-gtk-2.0/menu.c:918 client/gui-win32/menu.c:403
+#: client/gui-gtk-2.0/menu.c:961 client/gui-win32/menu.c:403
msgid "_Economy"
msgstr "_Ekonomika"
#. TRANS: Research report action
-#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:405
+#: client/gui-gtk-2.0/menu.c:963 client/gui-win32/menu.c:405
#, fuzzy
msgid "_Research"
msgstr "_TyrinÄ—jimai"
-#: client/gui-gtk-2.0/menu.c:924 client/gui-win32/menu.c:407
+#: client/gui-gtk-2.0/menu.c:967 client/gui-win32/menu.c:407
msgid "_Wonders of the World"
msgstr "Pasaulio _stebuklai"
-#: client/gui-gtk-2.0/menu.c:926 client/gui-win32/menu.c:408
+#: client/gui-gtk-2.0/menu.c:969 client/gui-win32/menu.c:408
msgid "_Top Five Cities"
msgstr "Penki _geriausi miestai"
-#: client/gui-gtk-2.0/menu.c:928 client/gui-win32/menu.c:409
+#: client/gui-gtk-2.0/menu.c:971 client/gui-win32/menu.c:409
msgid "_Messages"
msgstr "_Pranešimai"
-#: client/gui-gtk-2.0/menu.c:930 client/gui-win32/menu.c:410
+#: client/gui-gtk-2.0/menu.c:973 client/gui-win32/menu.c:410
msgid "_Demographics"
msgstr "_Demografiniai duomenys"
-#: client/gui-gtk-2.0/menu.c:932 client/gui-gtk-2.0/plrdlg.c:471
+#: client/gui-gtk-2.0/menu.c:975 client/gui-gtk-2.0/plrdlg.c:354
#: client/gui-win32/menu.c:411
msgid "_Spaceship"
msgstr "_ErdvÄ—laivis"
-#: client/gui-gtk-2.0/menu.c:936 client/gui-win32/menu.c:415
+#: client/gui-gtk-2.0/menu.c:979 client/gui-win32/menu.c:415
msgid "_Help"
msgstr "_Pagalba"
-#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
-#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
-#: client/gui-gtk-2.0/menu.c:946 client/gui-gtk-2.0/menu.c:948
-#: client/gui-gtk-2.0/menu.c:950 client/gui-gtk-2.0/menu.c:952
-#: client/gui-gtk-2.0/menu.c:954 client/gui-gtk-2.0/menu.c:956
-#: client/gui-gtk-2.0/menu.c:958 client/gui-gtk-2.0/menu.c:960
-#: client/gui-gtk-2.0/menu.c:962 client/gui-gtk-2.0/menu.c:964
-#: client/gui-gtk-2.0/menu.c:966 client/gui-gtk-2.0/menu.c:968
-#: client/gui-gtk-2.0/menu.c:970 client/gui-gtk-2.0/menu.c:972
-#: client/gui-gtk-2.0/menu.c:974 client/gui-gtk-2.0/menu.c:976
-#: client/gui-gtk-2.0/menu.c:978 client/gui-gtk-2.0/menu.c:980
+#: client/gui-gtk-2.0/menu.c:981 client/gui-gtk-2.0/menu.c:983
+#: client/gui-gtk-2.0/menu.c:985 client/gui-gtk-2.0/menu.c:987
+#: client/gui-gtk-2.0/menu.c:989 client/gui-gtk-2.0/menu.c:991
+#: client/gui-gtk-2.0/menu.c:993 client/gui-gtk-2.0/menu.c:995
+#: client/gui-gtk-2.0/menu.c:997 client/gui-gtk-2.0/menu.c:999
+#: client/gui-gtk-2.0/menu.c:1001 client/gui-gtk-2.0/menu.c:1003
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-gtk-2.0/menu.c:1007
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-gtk-2.0/menu.c:1011
+#: client/gui-gtk-2.0/menu.c:1013 client/gui-gtk-2.0/menu.c:1015
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-gtk-2.0/menu.c:1019
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-gtk-2.0/menu.c:1023
#: client/gui-gtk-2.0/repodlgs.c:313 client/gui-win32/citydlg.c:1077
#: client/gui-win32/repodlgs.c:289 client/gui-win32/wldlg.c:846
#: data/Freeciv.in:1466 data/Freeciv.in:2031 data/Freeciv.in:2101
@@ -11528,120 +11741,120 @@ msgstr "_Pagalba"
msgid "Help"
msgstr "Pagalba"
-#: client/gui-gtk-2.0/menu.c:940 client/gui-win32/menu.c:416
+#: client/gui-gtk-2.0/menu.c:983 client/gui-win32/menu.c:416
msgid "Language_s"
msgstr "_Kalbos"
-#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/menu.c:417
+#: client/gui-gtk-2.0/menu.c:985 client/gui-win32/menu.c:417
msgid "Co_nnecting"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:418
+#: client/gui-gtk-2.0/menu.c:987 client/gui-win32/menu.c:418
msgid "C_ontrols"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:419
+#: client/gui-gtk-2.0/menu.c:989 client/gui-win32/menu.c:419
msgid "C_hatline"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:948 client/gui-win32/menu.c:420
+#: client/gui-gtk-2.0/menu.c:991 client/gui-win32/menu.c:420
msgid "_Worklist Editor"
msgstr "_Darbų sąrašo redaktorius"
-#: client/gui-gtk-2.0/menu.c:950 client/gui-win32/menu.c:421
+#: client/gui-gtk-2.0/menu.c:993 client/gui-win32/menu.c:421
msgid "Citizen _Management"
msgstr "PilieÄių _valdymas"
-#: client/gui-gtk-2.0/menu.c:952 client/gui-win32/menu.c:422
+#: client/gui-gtk-2.0/menu.c:995 client/gui-win32/menu.c:422
msgid "_Playing"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:956 client/gui-win32/menu.c:424
+#: client/gui-gtk-2.0/menu.c:999 client/gui-win32/menu.c:424
msgid "City _Improvements"
msgstr "Miestų _patobulinimai"
-#: client/gui-gtk-2.0/menu.c:960 client/gui-win32/menu.c:426
+#: client/gui-gtk-2.0/menu.c:1003 client/gui-win32/menu.c:426
msgid "Com_bat"
msgstr "_MÅ«Å¡is"
-#: client/gui-gtk-2.0/menu.c:962 client/gui-win32/menu.c:427
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-win32/menu.c:427
msgid "_ZOC"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:964 client/gui-win32/menu.c:428
+#: client/gui-gtk-2.0/menu.c:1007 client/gui-win32/menu.c:428
msgid "Techno_logy"
msgstr "_Technologija"
-#: client/gui-gtk-2.0/menu.c:966 client/gui-win32/menu.c:429
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-win32/menu.c:429
msgid "_Terrain"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:968 client/gui-win32/menu.c:430
+#: client/gui-gtk-2.0/menu.c:1011 client/gui-win32/menu.c:430
msgid "Won_ders"
msgstr "_Stebuklai"
-#: client/gui-gtk-2.0/menu.c:972 client/gui-win32/menu.c:432
+#: client/gui-gtk-2.0/menu.c:1015 client/gui-win32/menu.c:432
msgid "Happin_ess"
msgstr "_Laimingumas"
-#: client/gui-gtk-2.0/menu.c:974 client/gui-win32/menu.c:433
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-win32/menu.c:433
msgid "Space _Race"
msgstr "_KosminÄ— rasÄ—"
-#: client/gui-gtk-2.0/menu.c:978 client/gui-win32/menu.c:435
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-win32/menu.c:435
msgid "_Copying"
msgstr "_Kopijavimas"
-#: client/gui-gtk-2.0/menu.c:980 client/gui-win32/menu.c:436
+#: client/gui-gtk-2.0/menu.c:1023 client/gui-win32/menu.c:436
msgid "_About"
msgstr "_Apie"
-#: client/gui-gtk-2.0/menu.c:1264
+#: client/gui-gtk-2.0/menu.c:1307
#, c-format
msgid "%s..."
msgstr "%s..."
-#: client/gui-gtk-2.0/menu.c:1352
+#: client/gui-gtk-2.0/menu.c:1397
#, c-format
msgid "Change to %s (_I)"
msgstr "Keisti į %s (_D)"
# Atrodo Äia kasykla
-#: client/gui-gtk-2.0/menu.c:1353
+#: client/gui-gtk-2.0/menu.c:1398
#, c-format
msgid "Change to %s (_M)"
msgstr "Keisti į %s (_K)"
-#: client/gui-gtk-2.0/menu.c:1354
+#: client/gui-gtk-2.0/menu.c:1399
#, c-format
msgid "Transf_orm to %s"
msgstr "Transformuoti į %s"
-#: client/gui-gtk-2.0/menu.c:1427
+#: client/gui-gtk-2.0/menu.c:1472
msgid "Help _Build Wonder"
msgstr "PadÄ—ti pastatyti _stebuklÄ…"
-#: client/gui-gtk-2.0/menu.c:1441
+#: client/gui-gtk-2.0/menu.c:1486
msgid "Add to City (_B)"
msgstr "Pridėti į miestą (_S)"
-#: client/gui-gtk-2.0/menu.c:1449
+#: client/gui-gtk-2.0/menu.c:1494
msgid "Make Trade _Route"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:1463
+#: client/gui-gtk-2.0/menu.c:1508
msgid "Build _Railroad"
msgstr "Tiesti _geležinkelį"
-#: client/gui-gtk-2.0/menu.c:1486
+#: client/gui-gtk-2.0/menu.c:1531
msgid "Bu_ild Farmland"
msgstr "Suformuoti _dirbamąją žemę"
-#: client/gui-gtk-2.0/menu.c:1506
+#: client/gui-gtk-2.0/menu.c:1551
msgid "_Fortify"
msgstr "Į_tvirtinti"
-#: client/gui-gtk-2.0/menu.c:1512
+#: client/gui-gtk-2.0/menu.c:1557
msgid "_Paradrop"
msgstr ""
@@ -11673,13 +11886,31 @@ msgstr ""
msgid "Pop"
msgstr ""
-#: client/gui-gtk-2.0/messagewin.c:155 client/gui-sdl/messagewin.c:247
+#: client/gui-gtk-2.0/messagewin.c:186 client/gui-sdl/messagewin.c:247
#: client/gui-win32/messagewin.c:132 client/gui-xaw/menu.c:228
#: data/Freeciv.in:3273 data/Freeciv.in:3274 data/Freeciv.in:3283
msgid "Messages"
msgstr "Pranešimai"
-#: client/gui-gtk-2.0/plrdlg.c:330
+#: client/gui-gtk-2.0/plrdlg.c:317
+msgid "_Meet"
+msgstr "_Susitikti"
+
+#: client/gui-gtk-2.0/plrdlg.c:323
+msgid "Cancel _Treaty"
+msgstr "_Atšaukti sutartį"
+
+#: client/gui-gtk-2.0/plrdlg.c:329
+#, fuzzy
+msgid "_Withdraw Vision"
+msgstr "Atsiimti bendro regÄ—jimo laukÄ…"
+
+#: client/gui-gtk-2.0/plrdlg.c:348
+#, fuzzy
+msgid "_Report"
+msgstr "_Ataskaitos"
+
+#: client/gui-gtk-2.0/plrdlg.c:386
msgid "?show:Dead Players"
msgstr "?show:Mirę žaidėjai"
@@ -11687,267 +11918,271 @@ msgstr "?show:Mirę žaidėjai"
#. TRANS: Nations report action
#. TRANS: Nations report title
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/plrdlg.c:350 client/gui-sdl/mapctrl.c:1580
+#: client/gui-gtk-2.0/plrdlg.c:406 client/gui-sdl/mapctrl.c:1580
#: client/gui-sdl/plrdlg.c:608 client/gui-win32/plrdlg.c:344
#: client/gui-xaw/menu.c:221 data/Freeciv.in:3192 data/Freeciv.in:3193
msgid "Nations"
msgstr "Tautos"
-#: client/gui-gtk-2.0/plrdlg.c:443
+#: client/gui-gtk-2.0/plrdlg.c:511
+#, fuzzy
+msgid "Di_plomacy"
+msgstr "Diplomatija"
+
+#: client/gui-gtk-2.0/plrdlg.c:516
msgid "_Intelligence"
msgstr "_Žvalgyba"
-#: client/gui-gtk-2.0/plrdlg.c:450
-msgid "_Meet"
-msgstr "_Susitikti"
-
-#: client/gui-gtk-2.0/plrdlg.c:457
-msgid "Cancel _Treaty"
-msgstr "_Atšaukti sutartį"
-
-#: client/gui-gtk-2.0/plrdlg.c:464
-msgid "_Withdraw vision"
-msgstr ""
-
-#: client/gui-gtk-2.0/plrdlg.c:495
+#: client/gui-gtk-2.0/plrdlg.c:526
msgid "_AI"
msgstr "_DI"
-#: client/gui-gtk-2.0/plrdlg.c:501
+#: client/gui-gtk-2.0/plrdlg.c:532
msgid "_Toggle AI Mode"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:208
+#: client/gui-gtk-2.0/pages.c:221
msgid "Start _New Game"
msgstr "Pradėti _naują žaidimą"
-#: client/gui-gtk-2.0/pages.c:214
+#: client/gui-gtk-2.0/pages.c:227
msgid "Start _Scenario Game"
msgstr "Žaisti _scenarijų"
-#: client/gui-gtk-2.0/pages.c:220
+#: client/gui-gtk-2.0/pages.c:233
msgid "_Load Saved Game"
msgstr "Į_kelti išsaugotą žaidimą"
-#: client/gui-gtk-2.0/pages.c:229
+#: client/gui-gtk-2.0/pages.c:239
msgid "C_onnect to Network Game"
msgstr "_Prisijungti prie tinklo žaidimo"
-#: client/gui-gtk-2.0/pages.c:236
+#: client/gui-gtk-2.0/pages.c:247
#, fuzzy
msgid "Connect to Gaming _Zone"
msgstr "Prisijungti prie tinklo žaidimo"
-#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:300
#: client/gui-xaw/connectdlg.c:326
msgid "Passwords don't match, enter password."
msgstr "Slaptažodžiai nesutampa. Įvesk slaptažodį."
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:779 client/gui-gtk-2.0/pages.c:820
+#: client/gui-win32/connectdlg.c:916
msgid "Server Name"
msgstr "Serverio pavadinimas"
-#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
+#: 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
+#: data/Freeciv.in:96
msgid "Port"
msgstr "Prievadas"
-#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
+#: client/gui-win32/connectdlg.c:917
msgid "Version"
msgstr "Versija"
-#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
-#: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
+#: 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
msgid "Status"
msgstr "BÅ«sena"
-#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
-#: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
+#: 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
msgid "Players"
msgstr "Žaidėjai"
-#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
+#: client/gui-win32/connectdlg.c:918
msgid "Comment"
msgstr "Komentaras"
-#: client/gui-gtk-2.0/pages.c:747
+#: client/gui-gtk-2.0/pages.c:786
msgid "Local _Area Network"
msgstr "_Vietinis tinklas"
-#: client/gui-gtk-2.0/pages.c:783
+#: client/gui-gtk-2.0/pages.c:827
msgid "Internet _Metaserver"
msgstr "Interneto _metaserveris"
-#: client/gui-gtk-2.0/pages.c:817
+#: client/gui-gtk-2.0/pages.c:864
msgid "_Host:"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:834
+#: client/gui-gtk-2.0/pages.c:881
msgid "_Port:"
msgstr "_Prievadas:"
-#: client/gui-gtk-2.0/pages.c:851
+#: client/gui-gtk-2.0/pages.c:898
msgid "_Login:"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:869
+#: client/gui-gtk-2.0/pages.c:916
msgid "Pass_word:"
msgstr "_Slaptažodis"
-#: client/gui-gtk-2.0/pages.c:887
+#: client/gui-gtk-2.0/pages.c:934
msgid "Conf_irm Password:"
msgstr "_Patvirtinti slaptažodį"
-#: client/gui-gtk-2.0/pages.c:912
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: 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/wldlg.c:800 client/gui-win32/wldlg.c:806
+msgid "Type"
+msgstr "Tipas"
+
+#: client/gui-gtk-2.0/pages.c:952 client/gui-win32/plrdlg.c:337
+#: data/Freeciv.in:88
+msgid "Host"
+msgstr ""
+
+#: client/gui-gtk-2.0/pages.c:981
msgid "C_onnect"
msgstr "'_Prisijungti"
-#: client/gui-gtk-2.0/pages.c:1142
+#: client/gui-gtk-2.0/pages.c:1211
#, c-format
msgid "Connection name: %s"
msgstr "Ryšio pavadinimas: %s"
-#: client/gui-gtk-2.0/pages.c:1145
+#: client/gui-gtk-2.0/pages.c:1214
#, c-format
msgid "Player name: %s"
msgstr "Žaidėjo vardas: %s"
-#: client/gui-gtk-2.0/pages.c:1150
+#: client/gui-gtk-2.0/pages.c:1219
#, c-format
msgid "Host: %s"
msgstr "Mazgas: %s"
-#: client/gui-gtk-2.0/pages.c:1158
+#: client/gui-gtk-2.0/pages.c:1227
msgid "Player/conn info"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1185
+#: client/gui-gtk-2.0/pages.c:1254
#, c-format
msgid "%s info"
msgstr "%s informacija"
-#: client/gui-gtk-2.0/pages.c:1196
+#: client/gui-gtk-2.0/pages.c:1265
msgid "Toggle player ready"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1204
+#: client/gui-gtk-2.0/pages.c:1273
msgid "Pick nation"
msgstr "Pasirinkite tautÄ…"
-#: client/gui-gtk-2.0/pages.c:1214
+#: client/gui-gtk-2.0/pages.c:1283
msgid "Observe this player"
msgstr "Stebėti šį žaidėją"
-#: client/gui-gtk-2.0/pages.c:1221
+#: client/gui-gtk-2.0/pages.c:1290
msgid "Take this player"
msgstr "Pasiimti šitą žaidėją"
-#: client/gui-gtk-2.0/pages.c:1238
+#: client/gui-gtk-2.0/pages.c:1307
msgid "Cut connection"
msgstr "Nutraukti susijungimÄ…"
-#: client/gui-gtk-2.0/pages.c:1248
+#: client/gui-gtk-2.0/pages.c:1317
msgid "Aitoggle player"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1257
+#: client/gui-gtk-2.0/pages.c:1326
msgid "Remove player"
msgstr "Pašalinti žaidėją"
-#: client/gui-gtk-2.0/pages.c:1268
+#: client/gui-gtk-2.0/pages.c:1337
msgid "Give info access"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1276
+#: client/gui-gtk-2.0/pages.c:1345
msgid "Give ctrl access"
msgstr ""
#. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1338
+#: client/gui-gtk-2.0/pages.c:1407
#, c-format
msgid "Put on %s"
msgstr "Priimti į %s"
-#: client/gui-gtk-2.0/pages.c:1442
+#: client/gui-gtk-2.0/pages.c:1511
#, fuzzy
msgid "Number of _Players (including AI):"
msgstr "_ŽaidÄ—jų skaiÄius (įskaitant DI):"
-#: client/gui-gtk-2.0/pages.c:1465
+#: client/gui-gtk-2.0/pages.c:1534
#, fuzzy
msgid "AI Skill _Level:"
msgstr "_DI meistriškumo lygis:"
-#: client/gui-gtk-2.0/pages.c:1481
+#: client/gui-gtk-2.0/pages.c:1550
msgid "Ruleset _Version:"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
msgid "_More Game Options..."
msgstr "Daugiau žaidimo _nustatymų"
-#: client/gui-gtk-2.0/pages.c:1514
+#: client/gui-gtk-2.0/pages.c:1583
msgid "Record"
msgstr "Įrašas"
-#: client/gui-gtk-2.0/pages.c:1519
+#: client/gui-gtk-2.0/pages.c:1588
msgid "Rating"
msgstr "Reitingas"
-#: client/gui-gtk-2.0/pages.c:1525
+#: client/gui-gtk-2.0/pages.c:1594
msgid "Ready"
msgstr "Pasiruošęs"
-#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
-#: data/nation/slovakian.ruleset:26
-msgid "Leader"
-msgstr "Vadas"
+#: client/gui-gtk-2.0/pages.c:1601
+#, fuzzy
+msgid "?player:Leader"
+msgstr "?Player:Vardas"
-#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1732 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:1752
+#: client/gui-gtk-2.0/pages.c:1824
msgid "Choose Saved Game to _Load:"
msgstr "Pasirinkite išsaugotą žaidimą į_kėlimui:"
-#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
-#: client/gui-gtk-2.0/pages.c:2375
+#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
+#: client/gui-gtk-2.0/pages.c:2451
msgid "_Browse..."
msgstr "_Naršyti..."
-#: client/gui-gtk-2.0/pages.c:1839
+#: client/gui-gtk-2.0/pages.c:1911
msgid "Choose a Scenario"
msgstr "Pasirinkite scenarijų"
-#: client/gui-gtk-2.0/pages.c:1926
+#: client/gui-gtk-2.0/pages.c:1998
msgid "Choose a _Scenario:"
msgstr "Pasirinkite _scenarijų"
-#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
-#: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
-#: client/gui-win32/wldlg.c:806
-msgid "Type"
-msgstr "Tipas"
-
-#: client/gui-gtk-2.0/pages.c:2101
+#: client/gui-gtk-2.0/pages.c:2173
msgid "Choose a _nation to play:"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2363 client/gui-win32/menu.c:581
msgid "Select Location to Save"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:2372 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2448 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr "Išsaugoti žaidimą"
-#: client/gui-gtk-2.0/pages.c:2413
+#: client/gui-gtk-2.0/pages.c:2489
msgid "Saved _Games:"
msgstr "_Išsaugoti žaidimai:"
-#: client/gui-gtk-2.0/pages.c:2440
+#: client/gui-gtk-2.0/pages.c:2516
msgid "Save _Filename:"
msgstr ""
@@ -12298,7 +12533,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:1094
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
msgid "Back"
msgstr "Atgal"
@@ -12307,7 +12542,7 @@ msgid "Start"
msgstr "PradÄ—ti"
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:775
+#: client/gui-win32/connectdlg.c:777
msgid "Load Game"
msgstr "Įkelti žaidimą"
@@ -12344,12 +12579,12 @@ msgid "Make new homecity"
msgstr ""
#: client/gui-sdl/citydlg.c:546 client/gui-sdl/citydlg.c:1418
-#: client/gui-sdl/connectdlg.c:307 client/gui-sdl/connectdlg.c:616
-#: client/gui-sdl/connectdlg.c:802 client/gui-sdl/connectdlg.c:984
+#: 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/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1039
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
#: 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
@@ -12397,7 +12632,7 @@ msgstr "Ar pirkti?"
#: client/gui-sdl/diplodlg.c:1335 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:2427
+#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
#: client/gui-xaw/cityrep.c:666 client/gui-xaw/cma_fe.c:327
#: client/gui-xaw/cma_fe.c:511 client/gui-xaw/cma_fe.c:765
#: client/gui-xaw/messagedlg.c:72 client/gui-xaw/optiondlg.c:76
@@ -12413,7 +12648,7 @@ msgstr "Ne"
#: client/gui-sdl/diplodlg.c:1345 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:2427 client/gui-xaw/cityrep.c:666
+#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
#: client/gui-xaw/cma_fe.c:327 client/gui-xaw/cma_fe.c:511
#: client/gui-xaw/cma_fe.c:765 client/gui-xaw/messagedlg.c:72
#: client/gui-xaw/optiondlg.c:76 client/gui-xaw/optiondlg.c:304
@@ -12694,36 +12929,36 @@ msgstr "Patvirtinti vienÄ…kart"
msgid "Release city"
msgstr "Atlaisvinti miestÄ…"
-#: client/gui-sdl/connectdlg.c:238
+#: client/gui-sdl/connectdlg.c:239
msgid "Creating Server List..."
msgstr "Kuriamas serverių sąrašas..."
-#: client/gui-sdl/connectdlg.c:279 client/gui-sdl/connectdlg.c:343
+#: client/gui-sdl/connectdlg.c:280 client/gui-sdl/connectdlg.c:344
msgid "No LAN servers found"
msgstr "Nerasta LAN serverių"
-#: client/gui-sdl/connectdlg.c:281 client/gui-sdl/connectdlg.c:345
+#: client/gui-sdl/connectdlg.c:282 client/gui-sdl/connectdlg.c:346
msgid "No public servers found"
msgstr "Nerasta viešų serverių"
-#: client/gui-sdl/connectdlg.c:555
+#: client/gui-sdl/connectdlg.c:556
msgid "Player Name :"
msgstr "Žaidėjo vardas :"
-#: client/gui-sdl/connectdlg.c:571
+#: client/gui-sdl/connectdlg.c:572
msgid "Freeciv Server :"
msgstr "Freeciv serveris :"
-#: client/gui-sdl/connectdlg.c:588
+#: client/gui-sdl/connectdlg.c:589
msgid "Port :"
msgstr "Prievadas:"
-#: client/gui-sdl/connectdlg.c:608 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr "Sujungti"
-#: client/gui-sdl/connectdlg.c:794 client/gui-sdl/connectdlg.c:977
+#: client/gui-sdl/connectdlg.c:795 client/gui-sdl/connectdlg.c:978
#: client/gui-xaw/connectdlg.c:145
msgid "Next"
msgstr "Kitas"
@@ -13002,8 +13237,8 @@ msgid "Unable to initialize SDL library: %s"
msgstr "Negalima paleisti SDL bibliotekos: %s"
#: client/gui-sdl/graphics.c:1021
-#, c-format
-msgid "Unable to initialize SDL_ttf library: %s"
+#, fuzzy, c-format
+msgid "Unable to initialize SDL_ttf library: %s"
msgstr "Negalima paleisti SDL_ttf bibliotekos: %s"
#: client/gui-sdl/graphics.c:1058
@@ -13088,12 +13323,6 @@ msgstr "Paleidžiamas klientas"
msgid "Waiting for the beginning of the game"
msgstr "Laukiama žaidimo pradžios"
-#: client/gui-sdl/gui_string.c:608
-msgid ""
-"Couldn't find stdfont.ttf file. Please link/copy/move anyunicode ttf font to "
-"data dir as stdfont.ttf"
-msgstr ""
-
#. TRANS: Future Technology
#: client/gui-sdl/gui_tilespec.c:506
msgid "FT"
@@ -13687,12 +13916,12 @@ msgid "Leave Game"
msgstr "Palikti žaidimą"
#: client/gui-sdl/optiondlg.c:2302 client/gui-sdl/pages.c:255
-#: client/gui-win32/connectdlg.c:1098 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1100 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:963
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
msgid "Start New Game"
msgstr "Pradėti naują žaidimą"
@@ -13803,8 +14032,8 @@ msgstr "Pelnas:"
msgid "%s max rate : %d%%"
msgstr ""
-#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1081
-#: client/gui-win32/connectdlg.c:1089 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
+#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
msgid "Update"
msgstr "Atnaujinti"
@@ -14254,10 +14483,6 @@ msgstr "ViskÄ… pakeisti"
msgid "Refresh"
msgstr "Atnaujinti"
-#: client/gui-win32/cityrep.c:882
-msgid "Select"
-msgstr "Pasirinkti"
-
#: client/gui-win32/cityrep.c:883
msgid "Configure"
msgstr "Konfigūruoti"
@@ -14307,55 +14532,55 @@ msgstr "Negaliu įkelti išsaugoto žaidimo"
msgid "Verify Password"
msgstr "Patikrinti slaptažodį"
-#: client/gui-win32/connectdlg.c:912 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr "Freeciv serverio pasirinkimas"
-#: client/gui-win32/connectdlg.c:913
+#: client/gui-win32/connectdlg.c:915
msgid "Local Area Network"
msgstr "Vietinis tinklas"
-#: client/gui-win32/connectdlg.c:947
+#: client/gui-win32/connectdlg.c:949
msgid "Welcome to Freeciv"
msgstr "Sveiki atvykę į Freeciv"
-#: client/gui-win32/connectdlg.c:965
+#: client/gui-win32/connectdlg.c:967
msgid "Load Saved Game"
msgstr "Įkelti išsaugotą žaidimą"
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
msgid "Connect To Network Game"
msgstr "Prisijungti prie tinklo žaidimo"
-#: client/gui-win32/connectdlg.c:977
+#: client/gui-win32/connectdlg.c:979
msgid "Choose a nation to play"
msgstr "Pasirinkite tautą, su kuria žaisite"
-#: client/gui-win32/connectdlg.c:1012
+#: client/gui-win32/connectdlg.c:1014
msgid "Number of players (Including AI):"
msgstr "ŽaidÄ—jų skaiÄius (įskaitant DI)"
-#: client/gui-win32/connectdlg.c:1020
+#: client/gui-win32/connectdlg.c:1022
msgid "AI skill level:"
msgstr "DI meistriškumo lygis:"
-#: client/gui-win32/connectdlg.c:1034 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
msgid "Game Options"
msgstr "Žaidimo nustatymai"
-#: client/gui-win32/connectdlg.c:1038
+#: client/gui-win32/connectdlg.c:1040
msgid "Start Game"
msgstr "Pradėti žaidimą"
-#: client/gui-win32/connectdlg.c:1057
+#: client/gui-win32/connectdlg.c:1059
msgid "Login:"
msgstr "Prisijungimo vardas:"
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
msgid "Host:"
msgstr ""
-#: client/gui-win32/connectdlg.c:1060
+#: client/gui-win32/connectdlg.c:1062
msgid "Port:"
msgstr "Prievadas:"
@@ -14604,10 +14829,6 @@ msgstr[0] "(neveiklus %d Ä—jimÄ…)"
msgstr[1] "(neveiklus %d Ä—jimus)"
msgstr[2] "(neveiklus %d ėjimų)"
-#: client/gui-win32/plrdlg.c:337 data/Freeciv.in:88
-msgid "Host"
-msgstr ""
-
#: client/gui-win32/plrdlg.c:355 data/Freeciv.in:3230
msgid "Intelligence"
msgstr "Žvalgyba"
@@ -16088,12 +16309,12 @@ msgstr ""
#: data/helpdata.txt:781
msgid ""
-" To have a diplomatic relationship with another player, you must fist "
-"establish first contact with that player. To establish first contact, you "
-"have to move one of your units next to a city or unit belonging to that "
-"player, or vice versa. Unless you establish an embassy with that player, you "
-"may again lose contact with them after a set number of turns without direct "
-"physical contact."
+" To have a diplomatic relationship with another player, you must first "
+"establish contact with that player. To establish contact, you have to move "
+"one of your units next to a city or unit belonging to that player, or vice "
+"versa. Unless you establish an embassy with that player, you may again lose "
+"contact with them after a set number of turns without direct physical "
+"contact."
msgstr ""
#: data/helpdata.txt:788
@@ -18291,7 +18512,7 @@ msgid "Communism"
msgstr "Komunizmas"
#: data/default/governments.ruleset:121 data/civ2/governments.ruleset:118
-#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:26
+#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:27
msgid "Comrade"
msgstr "Draugas"
@@ -19194,6 +19415,11 @@ msgid ""
"attacks."
msgstr ""
+#: data/default/units.ruleset:238
+#, fuzzy
+msgid "?unit:Workers"
+msgstr "Darbininkai"
+
#: data/default/units.ruleset:264
msgid ""
"Workers are one of the key units in the game. They can be used to irrigate "
@@ -19790,6 +20016,11 @@ msgstr "TyrinÄ—tojas"
msgid "Explorers are very useful for mapping unknown territory."
msgstr "Tyrinėtojai yra labai naudingi ištirti nežinomoms teritorijoms."
+#: data/default/units.ruleset:1864
+#, fuzzy
+msgid "?unit:Leader"
+msgstr "Vadas"
+
#: data/default/units.ruleset:1892
msgid "This is you. If you lose this unit, you lose the game. So don't."
msgstr ""
@@ -20005,7 +20236,7 @@ msgid "Emir"
msgstr "Emyras"
#: data/nation/afghani.ruleset:25 data/nation/slovakian.ruleset:30
-#: data/nation/soviet.ruleset:27
+#: data/nation/soviet.ruleset:28
msgid "General Secretary"
msgstr "Generalinis sekretorius"
@@ -20121,10 +20352,11 @@ msgid "?plural:Armenians"
msgstr "?plural:ArmÄ—nai"
#: 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 "
-"independence from Soviet in 1991 AD"
+"independence from the Soviet Union in 1991."
msgstr ""
"Pasak legendos, armėnai yra Haiko, Nojaus proproanūkio, palikuonys. Moderni "
"Armėnijos respublika nepriklausomybę nuo Sovietų Sąjungos gavo 1991m."
@@ -21158,12 +21390,11 @@ msgstr "?plural:Ilyrai"
#: data/nation/illyrian.ruleset:6
msgid ""
-"Illyrians were Indo-European tribes who appeared in the western part of the "
-"Balkan Peninsula before 1000 BC, including the Dalmatians to the north, "
-"Corcyra island and Ambracia bay in prehistoric Epirus to the south, mixing "
-"with Thracians in Dardania to the east, and settling Messapia across the "
-"Adriatic Sea. Illyrian kingdoms were independent for centuries, until "
-"conquered by the Roman Republic."
+"Illyrians were Indo-European tribes who appeared in the western part of the "
+"Balkan Peninsula before 1000 BC, including Corcyra island and Ambracia bay "
+"in prehistoric Epirus to the south. They mixed with Thracians in Dardania to "
+"the east, and settled Messapia across the Adriatic Sea. Illyrian kingdoms "
+"were independent for centuries, until conquered by the Roman Republic."
msgstr ""
#: data/nation/inca.ruleset:3
@@ -21478,7 +21709,7 @@ msgid ""
"1953."
msgstr ""
-#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:28
+#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:29
msgid "Great Leader"
msgstr "Didysis vadas"
@@ -21649,9 +21880,9 @@ msgstr "?plural:MalieÄiai"
msgid ""
"Sub-Saharan Africa has been a cultural and ethnical melting pot for "
"millennia. In medieval times, the region was home to a succession of empires "
-"called the Sahelian kingdoms. Of these, the Islamic Mali empire with it's "
+"called the Sahelian kingdoms. Of these, the Islamic Mali empire with its "
"capital in Timbuktu was the most influential. This empire reigned from the "
-"14th to the 17th century and was famed for it's wealth and benevolent kings. "
+"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 ""
@@ -21713,9 +21944,10 @@ msgid "?plural:Mayas"
msgstr "?plural:Majai"
#: data/nation/mayan.ruleset:6
+#, fuzzy
msgid ""
-"The Mayans were a Mesoamerican civilization. Famous for building great "
-"pyramids and palaces in the jungle."
+"The Mayans were a Mesoamerican civilization. They are famous for building "
+"great pyramids and palaces in the jungle."
msgstr ""
"Majai buvo vidurio Amerikos civilizacija. Garsūs dėl didžių piramidžių ir "
"rūmų statymo džiunglėse."
@@ -22251,6 +22483,16 @@ msgstr ""
"Slovakija yra Å¡alis Europos Å¡irdyje. AnksÄiau dalis ÄŒekoslovakijos, kuri iki "
"1918 m. buvo dalis Austrijos-Vengrijos imperijos."
+#: data/nation/slovakian.ruleset:26
+#, fuzzy
+msgid "?male:Leader"
+msgstr "Vadas"
+
+#: data/nation/slovakian.ruleset:26
+#, fuzzy
+msgid "?female:Leader"
+msgstr "DraugÄ—"
+
#: data/nation/slovakian.ruleset:29
msgid "Pope"
msgstr "Popiežius"
@@ -22288,12 +22530,14 @@ msgid "?plural:Soviets"
msgstr "?plural:Sovietai"
#: data/nation/soviet.ruleset:6
+#, fuzzy
msgid ""
-"Soviet Union's history starts in November 1917, when under Lenin's "
+"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 "
-"republics integrated into one country. Soviet Union became one of most "
-"powerful states in the 20th century. But by the end of 1991 due to many "
-"social shocks it disintegrated into fifteen independent countries"
+"republics integrated into one country. The Soviet Union became one of most "
+"powerful states in the 20th century, but by the end of 1991 it had "
+"disintegrated into fifteen independent countries due to social and economic "
+"problems."
msgstr ""
"Tarybų sąjungos istorija prasidėjo 1917 metų lapkritį, kai Rusijoje įvyko "
"Lenino vadovaujama bolševikų revoliucija. 1922 metų gruodžio 31 dieną "
@@ -22724,9 +22968,10 @@ msgid "?plural:Westphalians"
msgstr "?plural:VestfalieÄiai"
#: data/nation/westphalian.ruleset:6
+#, fuzzy
msgid ""
-"Westphalia, before becoming a Prussian province, was the western region the "
-"duchy of Saxony. Present-day it consists of the Northern part of the largest "
+"Westphalia, before becoming a Prussian province, was the western region of "
+"the duchy of Saxony. Today it makes up the northern part of the largest "
"German federal state, North Rhine-Westphalia."
msgstr ""
"Vestfalija, prieš tapdama Prūsijos provinsija, buvo vakarinė Saksonijos "
@@ -22879,7 +23124,7 @@ msgid ""
"The flag and background color indicate what civilization the city\n"
"belongs to (this will be useful when you meet other civilizations).\n"
"The top row of the bar also shows the name and size of the city, and\n"
-"will show one or more starts to indicate if there are units in the\n"
+"will show one or more stars to indicate if there are units in the\n"
"city. The bottom row shows what the city is building, and how long it\n"
"will take; it also shows how long the city will take to grow to the\n"
"next largest size."
@@ -22935,7 +23180,7 @@ msgid ""
"Now your city has grown to size five. As cities get larger unrest\n"
"becomes a problem. A city of this size will usually have one unhappy\n"
"citizen unless pacifying effects are used; meaning one entertainer\n"
-"specialist is required to keep your citzens content. This is basically\n"
+"specialist is required to keep your citizens content. This is basically\n"
"a wasted citizen.\n"
"\n"
"There are several things that can be done about this. One quick fix\n"
@@ -23007,7 +23252,7 @@ msgid ""
"existing cities. Generally when building new cities you want to make\n"
"sure that all tiles are covered by at least one city, but after that\n"
"it is best that your cities overlap as little as possible. Spreading\n"
-"out cities properly gives each city access to more resrouces, allowing\n"
+"out cities properly gives each city access to more resources, allowing\n"
"them to grow to larger sizes."
msgstr ""
@@ -23288,6 +23533,44 @@ msgstr "Komanda 30"
msgid "Team 31"
msgstr "Komanda 31"
+#, fuzzy
+#~ msgid "Auth config filename \"%s\" not allowed!"
+#~ msgstr "Šis vardas neleidžiamas"
+
+#, fuzzy
+#~ msgid "And, became more experienced!"
+#~ msgstr " ir dalinys įgavo patirties!"
+
+#~ msgid "We can't take control of server, attempting to kill it."
+#~ msgstr "Mes negalime kontroliuoti serverio, bandome jį išjungti."
+
+#, fuzzy
+#~ msgid "%s territory"
+#~ msgstr "%s teritorija"
+
+#~ msgid "%s territory (%d turn cease-fire)"
+#~ msgid_plural "%s territory (%d turn cease-fire)"
+#~ msgstr[0] "%s teritorija (%d Ä—jimo paliaubos)"
+#~ msgstr[1] "%s teritorija (%d ėjimų paliaubos)"
+#~ msgstr[2] "%s teritorija (%d ėjimų paliaubos)"
+
+#, fuzzy
+#~ msgid "%s territory (%s)"
+#~ msgstr "%s %s teritorija"
+
+#~ msgid "City: %s (%s)"
+#~ msgstr "Miestas: %s (%s)"
+
+#, fuzzy
+#~ msgid "Unit: %s (%s)"
+#~ msgstr "Dalinys: %s (%s)"
+
+#~ msgid "no maximum, "
+#~ msgstr "nÄ—ra maksimumo,"
+
+#~ msgid "Select same type"
+#~ msgstr "Pažymėti tokio pat tipo"
+
#~ msgid "Units: "
#~ msgstr "Daliniai: "
@@ -23352,9 +23635,6 @@ msgstr "Komanda 31"
#~ msgid ", nation %s"
#~ msgstr ", tauta %s"
-#~ msgid ", team %s"
-#~ msgstr ", komanda %s"
-
#~ msgid "_Map"
#~ msgstr "_Žemėlapis"
diff --git a/po/nb.gmo b/po/nb.gmo
index faf4892..d107fe5 100644
Binary files a/po/nb.gmo and b/po/nb.gmo differ
diff --git a/po/nb.po b/po/nb.po
index e277260..9c53b5b 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -19,7 +19,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2.0.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 07:45+0900\n"
+"POT-Creation-Date: 2009-03-29 21:13+0900\n"
"PO-Revision-Date: 2007-09-01 22:28+0300\n"
"Last-Translator: Per I. Mathisen <per at freeciv.org>\n"
"Language-Team: Norwegian <andrearo at stud.ntnu.no>\n"
@@ -660,7 +660,7 @@ 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
-#: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
+#: 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"
@@ -677,7 +677,7 @@ msgid "Mine"
msgstr "Gruve"
#: common/terrain.c:396 common/unit.c:548 server/report.c:124
-#: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
+#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr "Forurensning"
@@ -723,7 +723,7 @@ msgstr "Befestet"
msgid "Sentry"
msgstr "Hold stand"
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:851 client/gui-sdl/menu.c:648
+#: common/unit.c:566 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"
@@ -740,7 +740,7 @@ msgstr "Utforske"
msgid "Transform"
msgstr "Endre"
-#: common/unit.c:584 client/text.c:106 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:584 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"
@@ -813,11 +813,11 @@ msgstr "Atombombe"
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1406
+#: common/unittype.c:349 client/helpdata.c:1404
msgid " and "
msgstr " og "
-#: common/unittype.c:355 client/helpdata.c:1392
+#: common/unittype.c:355 client/helpdata.c:1390
msgid "?and:, "
msgstr "?og:, "
@@ -1389,30 +1389,25 @@ msgstr ""
#: server/auth.c:281
#, fuzzy, c-format
-msgid "Auth config filename \"%s\" not allowed!"
-msgstr "Det navnet er ikke tillat."
-
-#: server/auth.c:286
-#, fuzzy, c-format
msgid "Cannot load auth config file \"%s\"!"
msgstr "Klarer ikke å finne lydfilen %s"
-#: server/auth.c:397
+#: server/auth.c:392
#, c-format
msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
msgstr "Advarsel: gjestenavnet '%s' har blitt tatt, bytter navn til '%s'."
#
-#: server/auth.c:404
+#: server/auth.c:399
msgid "Guests are not allowed on this server. Sorry."
msgstr "Gjester er ikke tillatt på denne tjeneren. Beklager."
-#: server/auth.c:406
+#: server/auth.c:401
#, fuzzy, c-format
msgid "%s was rejected: Guests not allowed."
msgstr "%s ble vist bort. Manglet egenskaper."
-#: server/auth.c:425
+#: server/auth.c:420
#, c-format
msgid ""
"There was an error reading the user database, logging in as guest connection "
@@ -1421,7 +1416,7 @@ msgstr ""
"Det har oppstått en feil ved lesing av bruker-databasen, oppretter "
"forbindelse som gjest '%s'."
-#: server/auth.c:431
+#: server/auth.c:426
msgid ""
"There was an error reading the user database and guest logins are not "
"allowed. Sorry"
@@ -1429,39 +1424,39 @@ msgstr ""
"Det har oppstått en feil ved lesing av bruker-databasen. Gjeste-forbindelser "
"er ikke lov."
-#: server/auth.c:434
+#: server/auth.c:429
#, c-format
msgid "%s was rejected: Database error and guests not allowed."
msgstr ""
-#: server/auth.c:441
+#: server/auth.c:436
#, c-format
msgid "Enter password for %s:"
msgstr "Skriv inn passord for %s:"
-#: server/auth.c:450
+#: server/auth.c:445
msgid "Enter a new password (and remember it)."
msgstr "Skriv inn et nytt passord (og husk det)."
-#: server/auth.c:456
+#: server/auth.c:451
msgid "This server allows only preregistered users. Sorry."
msgstr "Denne tjeneren krever forhåndsregistrering. Beklager."
-#: server/auth.c:459
+#: server/auth.c:454
#, fuzzy, c-format
msgid "%s was rejected: Only preregister users allowed."
msgstr "Denne tjeneren krever forhåndsregistrering. Beklager."
-#: server/auth.c:488 server/auth.c:547
+#: server/auth.c:483 server/auth.c:542
msgid "Sorry, too many wrong tries..."
msgstr "Beklager, for mange gale forsøk..."
-#: server/auth.c:489
+#: server/auth.c:484
#, c-format
msgid "%s was rejected: Too many wrong password verifies for new user."
msgstr ""
-#: server/auth.c:505
+#: server/auth.c:500
msgid ""
"Warning: There was an error in saving to the database. Continuing, but your "
"stats will not be saved."
@@ -1469,31 +1464,31 @@ msgstr ""
"Advarsel: Det har oppstått en feil ved lagring til brukerdatabasen. "
"Fortsetter uten å lagre resultatene."
-#: server/auth.c:549
+#: server/auth.c:544
#, fuzzy, c-format
msgid "%s was rejected: Too many wrong password tries."
msgstr "%s ble vist bort. Manglet egenskaper."
-#: server/auth.c:558
+#: server/auth.c:553
msgid "Your password is incorrect. Try again."
msgstr "Passordet er feil. Prøv igjen."
-#: server/auth.c:569
+#: server/auth.c:564
#, fuzzy
msgid "Sorry, your connection timed out..."
msgstr "Beklager, luftpatruljering er ikke implementert."
-#: server/auth.c:571
+#: server/auth.c:566
#, c-format
msgid "%s was rejected: Connection timeout waiting for password."
msgstr ""
-#: server/auth.c:636
+#: server/auth.c:631
#, c-format
msgid "Your password is too short, the minimum length is %d. Try again."
msgstr "Passordet er for kort, minimum lengde er %d. Prøv igjen."
-#: server/auth.c:642
+#: server/auth.c:637
#, c-format
msgid ""
"The password must have at least %d capital letters, %d numbers, and be at "
@@ -1993,7 +1988,7 @@ msgstr "Dette er tjeneren for %s"
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:237 manual/civmanual.c:380
+#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
@@ -2025,13 +2020,13 @@ msgstr ""
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:241
+#: server/civserver.c:217 client/civclient.c:242
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:245
+#: server/civserver.c:221 client/civclient.c:246
msgid " -d, --debug NUM\tSet debug log level (0 to 3)\n"
msgstr " -d, --debug NUM\tSett debug-loggnivå (0 til 3)\n"
@@ -2039,7 +2034,7 @@ msgstr " -d, --debug NUM\tSett debug-loggniv
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:248 manual/civmanual.c:382
+#: server/civserver.c:225 client/civclient.c:249 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"
@@ -2091,11 +2086,11 @@ msgstr " -r, --read FILE\tLes oppstartsmanus i FILE\n"
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:267 manual/civmanual.c:383
+#: server/civserver.c:247 client/civclient.c:268 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:279
+#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, fuzzy, c-format
@@ -3356,7 +3351,7 @@ msgstr "%s har for
msgid "Sea moving start units are not yet supported. Nobody gets %s."
msgstr "Startende sjøenheter er ikke støttet. Ingen får %s."
-#: server/gamehand.c:310 client/text.c:632
+#: server/gamehand.c:310 client/text.c:691
#, c-format
msgid "Year: %s"
msgstr "År: %s"
@@ -3637,10 +3632,10 @@ 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
-#, c-format
+#, fuzzy, c-format
msgid ""
-"Your nation is thrust into civil war, %s is declared the leader of the "
-"rebel states."
+"Your nation is thrust into civil war! %s is declared the leader of the rebel "
+"states."
msgstr ""
"Din nasjon er splittet i en borgerkrig.\n"
" %s er proklamert leder for de opprørske fylkene."
@@ -3741,7 +3736,7 @@ msgstr "Forskingstempo"
msgid "Literacy"
msgstr "Utdannelse"
-#: server/report.c:121 client/cityrepdata.c:526 client/cityrepdata.c:527
+#: server/report.c:121 client/cityrepdata.c:524 client/cityrepdata.c:525
#: client/gui-sdl/cityrep.c:174
msgid "Production"
msgstr "Produksjon"
@@ -3893,7 +3888,7 @@ msgstr ""
"Demografi tekststrengen inneholder ugyldige bokstaver. Prøv \"help demography"
"\"."
-#: server/report.c:743 server/report.c:766
+#: server/report.c:743 server/report.c:768
msgid "Demographics Report:"
msgstr "Demografi-rapport:"
@@ -3901,10 +3896,12 @@ msgstr "Demografi-rapport:"
msgid "Sorry, the Demographics report is unavailable."
msgstr "Beklager, demografirapport er ikke tilgjengelig."
-#: server/report.c:748
+#. TRANS: <nation adjective> <government name> (<year>).
+#. * E.g. "Polish Despotism (200 AD)".
+#: server/report.c:750
#, fuzzy, c-format
-msgid "The %s of the %s (%s)"
-msgstr "Styresett: %s Nasjon: %s"
+msgid "%s %s (%s)"
+msgstr "%s i %s (%s)\n"
#. TRANS: message about an installation error.
#: server/ruleset.c:163
@@ -3962,15 +3959,6 @@ msgstr ""
msgid "%s had invalid nation; changing to %s."
msgstr ""
-#. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4073
-#, fuzzy, c-format
-msgid ""
-"Illegal alliance structure detected: %s alliance to %s reduced to peace "
-"treaty."
-msgstr ""
-"Ulovlig allianser oppdaget: %ss allianse med %s redusert til fredsavtale."
-
#: server/settings.c:32
msgid "Geological"
msgstr "Geologisk"
@@ -5185,9 +5173,10 @@ msgid "Auto-save name prefix"
msgstr "Autolagrings prefiks"
#: server/settings.c:1016
+#, fuzzy
msgid ""
-"Automatically saved games will have name \"<prefix><year>.sav\". This "
-"setting sets the <prefix> part."
+"Automatically saved games will have name \"<prefix>-T<turn>-Y<year>.sav\". "
+"This setting sets the <prefix> part."
msgstr ""
"Automatisk lagrede spill vil ha navnet \"<forstavelse><år>.sav\". Denne "
"innstillingen endrer <forstavelse> delen."
@@ -5206,11 +5195,11 @@ msgstr ""
"log\" hver runde. Denne statistikken kan benyttes til å lage grafer over "
"spillerenes styrke etter at spillet er over."
-#: server/sernet.c:147
+#: server/sernet.c:150
msgid "Server cannot read standard input. Ignoring input."
msgstr "Serveren kan ikke lese fra tastaturet. Ignorerer det."
-#: server/sernet.c:922
+#: server/sernet.c:929
#, c-format
msgid "Server: bad address: [%s:%d]."
msgstr "Server: addressefeil: [%s: %d]."
@@ -5332,112 +5321,112 @@ 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:928
+#: server/srv_main.c:961
#, c-format
msgid "Failed saving game as %s"
msgstr "Klarte ikke å lagre spill som %s"
-#: server/srv_main.c:930
+#: server/srv_main.c:963
#, c-format
msgid "Game saved as %s"
msgstr "Spill lagret som %s"
-#: server/srv_main.c:962
+#: server/srv_main.c:994
msgid "The game is already running."
msgstr "Spillet er allerede i gang."
-#: server/srv_main.c:970
+#: server/srv_main.c:1002
#, c-format
msgid "%s lost control cmdlevel on game start. Use voting from now on."
msgstr ""
-#: server/srv_main.c:977
+#: server/srv_main.c:1009
msgid "Starting game."
msgstr "Starter spillet."
-#: server/srv_main.c:1039
+#: server/srv_main.c:1071
#, c-format
msgid "request for unknown report (type %d)"
msgstr "forespørsel etter ukjent rapport (type: %d)"
-#: server/srv_main.c:1104
+#: server/srv_main.c:1136
#, c-format
msgid "Warning: rejecting old client %s"
msgstr "Advarsel: forkastet gammel klient %s"
-#: server/srv_main.c:1206
+#: server/srv_main.c:1238
#, 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:1306
+#: server/srv_main.c:1338
msgid "Please choose a non-blank name."
msgstr "Vennligst velg et ikke-blankt navn."
-#: server/srv_main.c:1322
+#: server/srv_main.c:1354
msgid "That nation is already in use."
msgstr "Den nasjonen er allerede i bruk."
-#: server/srv_main.c:1338
+#: server/srv_main.c:1370
#, 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:1359
+#: server/srv_main.c:1391
msgid "Please choose a name containing only ASCII characters."
msgstr "Vennligst velg et navn som kun inneholder ASCII bokstaver."
-#: server/srv_main.c:1458
+#: server/srv_main.c:1490
#, c-format
msgid "%s nation is not available in this scenario."
msgstr ""
-#: server/srv_main.c:1464
+#: server/srv_main.c:1496
#, fuzzy, c-format
msgid "%s nation is already in use."
msgstr "Den nasjonen er allerede i bruk."
-#: server/srv_main.c:1482
+#: server/srv_main.c:1514
#, c-format
msgid "%s is the %s ruler %s."
msgstr "%s er den %se herskeren %s."
-#: server/srv_main.c:1538
+#: server/srv_main.c:1570
#, 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:1582 server/srv_main.c:1586
+#: server/srv_main.c:1614 server/srv_main.c:1618
#, 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:1728
+#: server/srv_main.c:1760
#, c-format
msgid "Player %d"
msgstr "Spiller %d"
-#: server/srv_main.c:1739 server/srv_main.c:1745
+#: server/srv_main.c:1771 server/srv_main.c:1777
#, c-format
msgid "%s rules the %s."
msgstr "%s styrer %s."
-#: server/srv_main.c:1910
+#: server/srv_main.c:1942
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
msgstr ""
-#: server/srv_main.c:1961
+#: server/srv_main.c:1993
#, c-format
msgid "Sending info to metaserver [%s]"
msgstr "Sender info til metaserver [%s]"
-#: server/srv_main.c:1992
+#: server/srv_main.c:2024
msgid "The game is over..."
msgstr "Spillet er over..."
-#: server/srv_main.c:2205
+#: server/srv_main.c:2237
msgid "Now accepting new client connections."
msgstr "Aksepterer nå nye klientforbindelser."
@@ -6252,24 +6241,24 @@ msgid "Barbarian"
msgstr "barbarsk"
#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2030 client/gui-sdl/plrdlg.c:645
+#: client/gui-gtk-2.0/pages.c:2102 client/gui-sdl/plrdlg.c:645
#: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
msgid "AI"
msgstr "AI"
#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
+#: 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
msgid "Human"
msgstr "Menneske"
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
-#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
+#: 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
msgid "Alive"
msgstr "Levende"
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
#: client/gui-win32/connectdlg.c:200
msgid "Dead"
msgstr "Død"
@@ -6544,9 +6533,9 @@ 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:242
-#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
-#: client/text.c:1201
+#: 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
#, c-format
msgid "?clistmore:, %s"
msgstr ", %s"
@@ -6801,7 +6790,7 @@ msgstr "Kun %s kan angripe fra sj
msgid "Cannot attack from sea."
msgstr "Kan ikke angripe fra sjøen."
-#: server/unithand.c:996 server/unittools.c:2103
+#: server/unithand.c:996 server/unittools.c:2137
msgid "Cannot attack unless you declare war first."
msgstr "Kan ikke angripe hvis du ikke erklærer krig først."
@@ -6902,102 +6891,102 @@ msgid "%s was upgraded for free to %s."
msgstr "%s ble oppgradert gratis til %s."
#: server/unittools.c:297
-#, c-format
-msgid "Not enough gold. %s disbanded"
+#, fuzzy, c-format
+msgid "Not enough gold to pay upkeep for %s. Unit disbanded."
msgstr "Ikke nok gull. %s oppløst"
-#: server/unittools.c:342
+#: server/unittools.c:343
#, c-format
msgid "Your %s has run out of hit points."
msgstr "Din %s har gått tom for treffkapasistet."
-#: server/unittools.c:358
+#: server/unittools.c:359
#, c-format
msgid "Your %s has been lost on the high seas."
msgstr "Din %s har gått tapt på havet."
-#: server/unittools.c:365
+#: server/unittools.c:366
#, c-format
msgid "Your %s survived on the high seas and became more experienced!"
msgstr "Din %s overlevde på havet og ble mer erfaren!"
-#: server/unittools.c:376
+#: server/unittools.c:377
#, c-format
msgid "Your %s has been lost on unsafe terrain."
msgstr "Din %s har gått tapt på usikkert terreng."
-#: server/unittools.c:430
+#: server/unittools.c:431
#, c-format
msgid "Your %s has returned to refuel."
msgstr "Din %s har returnert for drivstoffpåfyll."
-#: server/unittools.c:454
+#: server/unittools.c:455
#, c-format
msgid "Your %s has run out of fuel."
msgstr "Din %s har gått tom for drivstoff."
-#. TRANS: And, <the unit> became ...
-#: server/unittools.c:616
-#, fuzzy
-msgid "And, became more experienced!"
-msgstr " og ble mer erfaren!"
-
#. TRANS: Your <unit> became ...
-#: server/unittools.c:620
+#: server/unittools.c:619
#, c-format
msgid "Your %s became more experienced!"
msgstr "Din %s ble mer erfaren!"
-#: server/unittools.c:1011
+#: server/unittools.c:1009
#, c-format
msgid "Teleported your %s to %s."
msgstr "Teleportet din %s til %s."
-#: server/unittools.c:1041
+#. TRANS: A unit is moved to resolve stack conflicts.
+#: server/unittools.c:1065
+#, fuzzy, c-format
+msgid "Moved your %s."
+msgstr "Oppløste din %s."
+
+#: server/unittools.c:1076
#, c-format
msgid "Disbanded your %s."
msgstr "Oppløste din %s."
-#: server/unittools.c:1363
+#: server/unittools.c:1397
#, c-format
msgid "Unable to defend %s, %s has lost the game."
msgstr "Kan ikke forsvare %s, %s har tapt spillet."
-#: server/unittools.c:1367
+#: server/unittools.c:1401
#, 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:1469
+#: server/unittools.c:1503
#, 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:1478
+#: server/unittools.c:1512
#, c-format
msgid "%s lost when %s was lost."
msgstr "%s gikk tapt da %s gikk tapt."
-#: server/unittools.c:1527
+#: server/unittools.c:1561
#, 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:1545
+#: server/unittools.c:1579
#, 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:1554 server/unittools.c:1612
+#: server/unittools.c:1588 server/unittools.c:1646
#, 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:1588
+#: server/unittools.c:1622
#, fuzzy, c-format
msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
msgid_plural ""
@@ -7008,7 +6997,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:1621
+#: server/unittools.c:1655
#, fuzzy, c-format
msgid "%s lost when the %s %s attacked the %s %s."
msgstr "%s gikk tapt i et angrep fra %ss %s."
@@ -7016,7 +7005,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:1636
+#: server/unittools.c:1670
#, 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."
@@ -7025,7 +7014,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:1646
+#: server/unittools.c:1680
#, 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."
@@ -7036,198 +7025,198 @@ 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:1660
+#: server/unittools.c:1694
#, 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:1928
+#: server/unittools.c:1962
#, c-format
msgid "Your %s was nuked by %s."
msgstr "Din %s ble utsatt for atomangrep fra %s."
-#: server/unittools.c:1931 server/unittools.c:1947
+#: server/unittools.c:1965 server/unittools.c:1981
msgid "yourself"
msgstr "deg selv"
# problem
-#: server/unittools.c:1935
+#: server/unittools.c:1969
#, fuzzy, c-format
msgid "The %s %s was nuked."
msgstr "%ss %s ble utsatt for atomangrep."
-#: server/unittools.c:1944
+#: server/unittools.c:1978
#, c-format
msgid "%s was nuked by %s."
msgstr "%s ble utsatt for atomangrep fra %s."
-#: server/unittools.c:1952
+#: server/unittools.c:1986
#, c-format
msgid "You nuked %s."
msgstr "Du utførte et atomangrep mot %s."
-#: server/unittools.c:1993
+#: server/unittools.c:2027
#, fuzzy, c-format
msgid "The %s detonated a nuke!"
msgstr "%s detonerte en atombombe!"
-#: server/unittools.c:2017
+#: server/unittools.c:2051
#, c-format
msgid "%s transported successfully."
msgstr "%s ble transportert trygt fram."
-#: server/unittools.c:2069
+#: server/unittools.c:2103
msgid "This unit type can not be paradropped."
msgstr "Denne enheten kan ikke gjøre fallskjermhopp."
-#: server/unittools.c:2079
+#: server/unittools.c:2113
#, 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:2085
+#: server/unittools.c:2119
msgid "The destination location is not known."
msgstr "Bestemmelsesstedet er ukjent."
-#: server/unittools.c:2092
+#: server/unittools.c:2126
#, fuzzy, c-format
msgid "This unit cannot paradrop into %s."
msgstr "Denne enheten kan ikke ta fallskjermhopp ut i havet."
-#: server/unittools.c:2112
+#: server/unittools.c:2146
#, 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:2123
+#: server/unittools.c:2157
#, 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:2136
+#: server/unittools.c:2170
#, c-format
msgid "Your %s was killed by enemy units at the paradrop destination."
msgstr "Dine %s ble slaktet på hoppstedet."
-#: server/unittools.c:2158
+#: server/unittools.c:2192
#, c-format
msgid "You found %d gold."
msgstr "Du fant %d gull."
-#: server/unittools.c:2175
+#: server/unittools.c:2209
#, c-format
msgid "You found %s in ancient scrolls of wisdom."
msgstr "Du fant %s i eldgamle skriftruller med kunnskap."
-#: server/unittools.c:2182
+#: server/unittools.c:2216
#, 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:2196
+#: server/unittools.c:2230
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:2214
+#: server/unittools.c:2248
msgid "An abandoned village is here."
msgstr "En forlatt landsby er her."
-#: server/unittools.c:2224
+#: server/unittools.c:2258
msgid "You have unleashed a horde of barbarians!"
msgstr "Du har fremprovosert en fiendtlig barbarhorde!"
-#: server/unittools.c:2227
+#: server/unittools.c:2261
#, 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:2243
+#: server/unittools.c:2277
msgid "You found a friendly city."
msgstr "Du fant en vennlig by."
-#: server/unittools.c:2257
+#: server/unittools.c:2291
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:2282
+#: server/unittools.c:2316
msgid "Your overflight frightens the tribe; they scatter in terror."
msgstr "Din overflyvning skremmer stammen; de sprer seg i frykt."
-#: server/unittools.c:2540
+#: server/unittools.c:2574
#, 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:2989
+#: server/unittools.c:3023
#, 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:3041
+#: server/unittools.c:3075
#, 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:3054
+#: server/unittools.c:3088
#, 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:3068
+#: server/unittools.c:3102
#, 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:3078
+#: server/unittools.c:3112
#, 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:3104
+#: server/unittools.c:3138
#, 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:3145
+#: server/unittools.c:3179
#, fuzzy, c-format
msgid "Attempt to change homecity for %s failed."
msgstr "Forandret hjemby for %s i %s"
-#: server/unittools.c:3156
+#: server/unittools.c:3190
#, c-format
msgid "Attempt to establish trade route for %s failed."
msgstr ""
-#: server/unittools.c:3168
+#: server/unittools.c:3202
#, c-format
msgid "Attempt to build wonder for %s failed."
msgstr ""
-#: server/unittools.c:3177
+#: server/unittools.c:3211
#, c-format
msgid "Your %s has invalid orders."
msgstr "Din %s har ugyldige ordre."
-#: server/generator/mapgen.c:1737
+#: server/generator/mapgen.c:1771
msgid "High landmass - this may take a few seconds."
msgstr "Mye landmasse - dette kan ta noen sekunder."
-#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
+#: server/generator/mapgen.c:1969 server/generator/mapgen.c:2039
#, c-format
msgid "Falling back to generator %d."
msgstr "Faller tilbake på generator %d."
-#: server/generator/mapgen.c:2025
+#: server/generator/mapgen.c:2059
msgid "Generator 3 didn't place all big islands."
msgstr "Generator 3 plasserte ikke alle de store øyene."
-#: server/generator/mapgen.c:2054
+#: server/generator/mapgen.c:2088
#, c-format
msgid "Generator 3 left %li landmass unplaced."
msgstr "Generator 3 forlot %li landmasse uplassert."
@@ -7336,7 +7325,7 @@ msgid_plural "%3d turns"
msgstr[0] "%3d runde"
msgstr[1] "%3d runde"
-#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:631
#: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
@@ -7456,353 +7445,353 @@ msgstr "?city_state:Fred"
msgid "(worklist)"
msgstr "(arbeidsliste)"
-#: client/cityrepdata.c:447
-msgid "Special"
-msgstr "Spesiell"
-
-#: client/cityrepdata.c:448
-msgid "?entertainers/scientists/taxmen:E/S/T"
-msgstr "?entertainers/scientists/taxmen:U/F/S"
+#: client/cityrepdata.c:446
+msgid "?city:Name"
+msgstr "?city:Bynavn"
-#: client/cityrepdata.c:449
-msgid "Entertainers, Scientists, Taxmen"
-msgstr "Underholdere, Forskere, Skattefuter"
+#: client/cityrepdata.c:446 client/gui-sdl/cityrep.c:169
+msgid "City Name"
+msgstr "Bynavn"
-#: client/cityrepdata.c:452
+#: client/cityrepdata.c:448
#, fuzzy
-msgid "Concise + Rapture, - Disorder"
-msgstr "Kort + Feiring, - Uroligheter"
+msgid "?size [short]:Sz"
+msgstr "?size:St"
-#: client/cityrepdata.c:454 client/plrdlg_common.c:261
+#: client/cityrepdata.c:448
+msgid "Size"
+msgstr "Størrelse"
+
+#: client/cityrepdata.c:450 client/plrdlg_common.c:261
#: client/gui-win32/plrdlg.c:337
msgid "State"
msgstr "Status"
-#: client/cityrepdata.c:454
+#: client/cityrepdata.c:450
msgid "Rapture/Peace/Disorder"
msgstr "Feiring/Fred/Uroligheter"
+#: client/cityrepdata.c:452
+#, fuzzy
+msgid "Concise *=Rapture, X=Disorder"
+msgstr "Kort + Feiring, - Uroligheter"
+
+#: client/cityrepdata.c:456
+msgid "Special"
+msgstr "Spesiell"
+
#: client/cityrepdata.c:457
+msgid "?entertainers/scientists/taxmen:E/S/T"
+msgstr "?entertainers/scientists/taxmen:U/F/S"
+
+#: client/cityrepdata.c:458
+msgid "Entertainers, Scientists, Taxmen"
+msgstr "Underholdere, Forskere, Skattefuter"
+
+#: client/cityrepdata.c:461
msgid "?Happy workers:H"
msgstr "?Happy workers:L"
-#: client/cityrepdata.c:457
+#: client/cityrepdata.c:461
msgid "Workers: Happy"
msgstr "Arbeidere: Lykkelige"
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
msgid "?Content workers:C"
msgstr "?Content workers:F"
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
msgid "Workers: Content"
msgstr "Arbeidere: Fornøyde"
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
msgid "?Unhappy workers:U"
msgstr "?Unhappy workers:U"
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
msgid "Workers: Unhappy"
msgstr "Arbeidere: Ulykkelige"
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
msgid "?Angry workers:A"
msgstr "?Angre workers:S"
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
msgid "Workers: Angry"
msgstr "Arbeidere: Sinte"
-#: client/cityrepdata.c:465 client/gui-xaw/citydlg.c:2401
-#: data/default/units.ruleset:238
-msgid "Workers"
+#: client/cityrepdata.c:469 client/gui-xaw/citydlg.c:2402
+#, fuzzy
+msgid "?city:Workers"
msgstr "Arbeidere"
-#: client/cityrepdata.c:466
+#: client/cityrepdata.c:470
msgid "?happy/content/unhappy/angry:H/C/U/A"
msgstr "?happy/content/unhappy/angry:L/F/U/S"
-#: client/cityrepdata.c:467
+#: client/cityrepdata.c:471
msgid "Workers: Happy, Content, Unhappy, Angry"
msgstr "Arbeidere: Lykkelig, Fornøyd, Ulykkelig, Sinte"
-#: client/cityrepdata.c:470 client/cityrepdata.c:472
+#: client/cityrepdata.c:474 client/cityrepdata.c:476
msgid "Best"
msgstr "Best"
-#: client/cityrepdata.c:470
+#: client/cityrepdata.c:474
msgid "attack"
msgstr "angrep"
-#: client/cityrepdata.c:471
+#: client/cityrepdata.c:475
msgid "Best attacking units"
msgstr "Beste angripende enheter"
-#: client/cityrepdata.c:472
+#: client/cityrepdata.c:476
msgid "defense"
msgstr "forsvar"
-#: client/cityrepdata.c:473
+#: client/cityrepdata.c:477
msgid "Best defending units"
msgstr "Beste forsvarende enheter"
-#: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
-#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
-#: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
-#: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
-#: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
-#: client/gui-win32/menu.c:351 client/gui-win32/repodlgs.c:616
-#: client/gui-win32/repodlgs.c:707 client/gui-win32/repodlgs.c:716
-#: client/gui-xaw/menu.c:157 client/gui-xaw/menu.c:219
-#: client/gui-xaw/menu.c:242 client/gui-xaw/repodlgs.c:881
-#: client/gui-xaw/repodlgs.c:1069 data/Freeciv.in:1895 data/helpdata.txt:909
+#: client/cityrepdata.c:478 client/cityrepdata.c:482
+#: client/gui-gtk-2.0/cityrep.c:1437 client/gui-gtk-2.0/cityrep.c:1456
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-gtk-2.0/cityrep.c:1494
+#: client/gui-gtk-2.0/cityrep.c:1514 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/repodlgs.c:960 client/gui-sdl/helpdlg.c:688
+#: client/gui-sdl/mapctrl.c:1605 client/gui-sdl/optiondlg.c:1827
+#: client/gui-sdl/repodlgs.c:356 client/gui-win32/menu.c:351
+#: client/gui-win32/repodlgs.c:616 client/gui-win32/repodlgs.c:707
+#: client/gui-win32/repodlgs.c:716 client/gui-xaw/menu.c:157
+#: client/gui-xaw/menu.c:219 client/gui-xaw/menu.c:242
+#: client/gui-xaw/repodlgs.c:881 client/gui-xaw/repodlgs.c:1069
+#: data/Freeciv.in:1895 data/helpdata.txt:909
msgid "Units"
msgstr "Enheter"
#. TRANS: Header "Number of units inside city"
-#: client/cityrepdata.c:476
+#: client/cityrepdata.c:480
#, fuzzy
msgid "?Present (units):Here"
msgstr "?Present (units):Tils"
-#: client/cityrepdata.c:477
+#: client/cityrepdata.c:481
msgid "Number of units present"
msgstr "Antall enheter tilstede"
#. TRANS: Header "Number of units supported by given city"
-#: client/cityrepdata.c:480
+#: client/cityrepdata.c:484
#, fuzzy
msgid "?Supported (units):Owned"
msgstr "?Supported (units):Stø"
-#: client/cityrepdata.c:481
+#: client/cityrepdata.c:485
msgid "Number of units supported"
msgstr "Antall støttede enheter"
#. TRANS: Header "It will take this many turns before city grows"
-#: client/cityrepdata.c:484
+#: client/cityrepdata.c:488
#, fuzzy
msgid "?food (population):Grow"
msgstr "Vekst"
-#: client/cityrepdata.c:485 client/cityrepdata.c:530
+#: client/cityrepdata.c:489 client/cityrepdata.c:528
#, fuzzy
msgid "?Stock/Target:(Have/Need)"
msgstr "(Oppsamlet/Mål)"
-#: client/cityrepdata.c:486
+#: client/cityrepdata.c:490
msgid "Turns until growth/famine"
msgstr "Runder til vekst/hungersnød"
-#: client/cityrepdata.c:488
-#, fuzzy
-msgid "?size [short]:Sz"
-msgstr "?size:St"
-
-#: client/cityrepdata.c:488
-msgid "Size"
-msgstr "Størrelse"
-
-#: client/cityrepdata.c:492
-msgid "?city:Name"
-msgstr "?city:Bynavn"
-
-#: client/cityrepdata.c:492 client/gui-sdl/cityrep.c:169
-msgid "City Name"
-msgstr "Bynavn"
-
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
msgid "Surplus"
msgstr "Overskudd"
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
msgid "?food/production/trade:F/P/T"
msgstr "?food/production/trade:M/P/H"
-#: client/cityrepdata.c:496
+#: client/cityrepdata.c:494
msgid "Surplus: Food, Production, Trade"
msgstr "Overskudd: Mat, Produksjon, Handel"
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
#, fuzzy
msgid "?Food surplus [short]:+F"
msgstr "?Food surplus [short]:+M"
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
msgid "Surplus: Food"
msgstr "Overskudd: Mat"
-#: client/cityrepdata.c:500
+#: client/cityrepdata.c:498
#, fuzzy
msgid "?Production surplus [short]:+P"
msgstr "?Production surplus [short]:+P"
-#: client/cityrepdata.c:501
+#: client/cityrepdata.c:499
msgid "Surplus: Production"
msgstr "Overskudd: Produksjon"
-#: client/cityrepdata.c:502
+#: client/cityrepdata.c:500
#, fuzzy
msgid "?Production loss (waste) [short]:-P"
msgstr "-P"
-#: client/cityrepdata.c:503
+#: client/cityrepdata.c:501
msgid "Waste"
msgstr "Avfall"
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
#, fuzzy
msgid "?Trade surplus [short]:+T"
msgstr "?Trade surplus [short]:+H"
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
msgid "Surplus: Trade"
msgstr "Overskudd: Handel"
-#: client/cityrepdata.c:506
+#: client/cityrepdata.c:504
#, fuzzy
msgid "?Trade loss (corruption) [short]:-T"
msgstr "-H"
-#: client/cityrepdata.c:507
+#: client/cityrepdata.c:505
msgid "Corruption"
msgstr "Korrupsjon"
-#: client/cityrepdata.c:509 client/gui-gtk-2.0/repodlgs.c:654
+#: client/cityrepdata.c:507 client/gui-gtk-2.0/repodlgs.c:654
#: client/gui-sdl/mapctrl.c:1400 client/gui-win32/repodlgs.c:334
#: client/gui-xaw/menu.c:222 client/gui-xaw/repodlgs.c:644
#: client/gui-xaw/repodlgs.c:773 data/Freeciv.in:1819
msgid "Economy"
msgstr "Økonomi"
-#: client/cityrepdata.c:509
+#: client/cityrepdata.c:507
msgid "?gold/luxury/science:G/L/S"
msgstr "?gold/luxury/science:G/L/F"
-#: client/cityrepdata.c:510
+#: client/cityrepdata.c:508
msgid "Economy: Gold, Luxuries, Science"
msgstr "Økonomi: Gull, Luksus, Forskning"
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
msgid "?Gold:G"
msgstr "?Gold:G"
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
msgid "Economy: Gold"
msgstr "Økonomi: Gull"
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
msgid "?Luxury:L"
msgstr "?Luxury:L"
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
msgid "Economy: Luxury"
msgstr "Økonomi: Luksus"
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
msgid "?Science:S"
msgstr "?Science:F"
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
msgid "Economy: Science"
msgstr "Økonomi: Forskning"
-#: client/cityrepdata.c:518
+#: client/cityrepdata.c:516
#, fuzzy
msgid "?number_trade_routes:n"
msgstr "?number_trade_routes:#"
-#: client/cityrepdata.c:518
+#: client/cityrepdata.c:516
#, fuzzy
msgid "?number_trade_routes:R"
msgstr "?number_trade_routes:H"
-#: client/cityrepdata.c:519
+#: client/cityrepdata.c:517
msgid "Number of Trade Routes"
msgstr "Antall handelsruter"
-#: client/cityrepdata.c:521
+#: client/cityrepdata.c:519
msgid "?pollution [short]:Pol"
msgstr "?pollution [short]:For"
-#: client/cityrepdata.c:523
+#: client/cityrepdata.c:521
#, fuzzy
msgid "?cma:Governor"
msgstr "Sysselmann"
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
-#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
-#: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
-#: data/Freeciv.in:1459 data/helpdata.txt:820
+#: client/cityrepdata.c:521 client/gui-gtk-2.0/cityrep.c:1766
+#: client/gui-sdl/citydlg.c:3809 client/gui-sdl/cma_fe.c:858
+#: client/gui-win32/citydlg.c:726 data/Freeciv.in:1459 data/helpdata.txt:820
#, fuzzy
msgid "Citizen Governor"
msgstr "Sysselmann"
-#: client/cityrepdata.c:526
+#: client/cityrepdata.c:524
#, fuzzy
msgid "Turns/Buy"
msgstr "Runder/Kjøpekostnad"
-#: client/cityrepdata.c:529 client/cityrepdata.c:531
+#: client/cityrepdata.c:527 client/cityrepdata.c:529
msgid "Currently Building"
msgstr "Bygger nå"
-#: client/cityrepdata.c:575
+#: client/cityrepdata.c:573
#, fuzzy
msgid "?specialist:S"
msgstr "?Spesielle:S"
-#: client/cityrepdata.c:578
+#: client/cityrepdata.c:576
#, fuzzy
msgid "Specialists"
msgstr "Spesielle"
-#: client/civclient.c:239
+#: client/civclient.c:240
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr " -a, --autoconnect\tHopper over Koble til dialogen\n"
-#: client/civclient.c:249
+#: client/civclient.c:250
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:251
+#: client/civclient.c:252
msgid " -m, --meta HOST\tConnect to the metaserver at HOST\n"
msgstr " -m, --meta HOST\tKoble til metaserveren på HOST\n"
-#: client/civclient.c:253
+#: client/civclient.c:254
msgid " -n, --name NAME\tUse NAME as name\n"
msgstr " -n, --name NAVN\tBruk NAVN som navn\n"
-#: client/civclient.c:255
+#: client/civclient.c:256
#, 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:257
+#: client/civclient.c:258
#, 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:259
+#: client/civclient.c:260
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:262
+#: client/civclient.c:263
#, 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:264
+#: client/civclient.c:265
msgid " -S, --Sound FILE\tRead sound tags from FILE\n"
msgstr " -s, --sound FIL\tLes lyd-informasjon fra FIL\n"
-#: client/civclient.c:265
+#: client/civclient.c:266
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:268
+#: client/civclient.c:269
#, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -7812,144 +7801,154 @@ msgstr ""
"\t\t\tPrøv \"%s -- --help\" for mer info.\n"
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:273
+#: client/civclient.c:274
#, fuzzy, c-format
msgid "Report bugs at %s\n"
msgstr "Rapporter feil, unoter og/eller 'bugs' til <%s>.\n"
-#: client/civclient.c:297
+#: client/civclient.c:298
#, c-format
msgid "Invalid port \"%s\" specified with --port option.\n"
msgstr "Ugyldig portnummer \"%s\" spesifisert med --port valget.\n"
-#: client/civclient.c:299 client/civclient.c:314
+#: client/civclient.c:300 client/civclient.c:315
msgid "Try using --help.\n"
msgstr "Prøv --help.\n"
-#: client/civclient.c:312
+#: client/civclient.c:313
#, c-format
msgid "Invalid debug level \"%s\" specified with --debug option.\n"
msgstr "Ugyldig debuggingsnivå \"%s\" spesifisert med --debug valget.\n"
-#: client/civclient.c:325
+#: client/civclient.c:326
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr "Ukjent alternativ: \"%s\"\n"
-#: client/civclient.c:539
+#: client/civclient.c:391
+#, fuzzy, c-format
+msgid "Updating old metaserver address \"%s\"."
+msgstr "metaserver <addresse>"
+
+#: client/civclient.c:394
+#, fuzzy, c-format
+msgid "Default metaserver has been set to \"%s\"."
+msgstr "Alternativ: %s har blitt satt til \"%s\"."
+
+#: client/civclient.c:550
msgid "Game started."
msgstr "Spillet har startet."
-#: client/civclient.c:577
+#: client/civclient.c:588
msgid "There was an error while auto connecting; aborting."
msgstr "Det oppstod en feil under automatisk forbindelse, avbryter."
-#: client/climisc.c:176
+#: client/climisc.c:177
#, c-format
msgid "Changing production of every %s into %s."
msgstr "Endrer produksjon for hver %s til %s."
-#: client/climisc.c:214
+#: client/climisc.c:215
msgid "?embassy:Both"
msgstr "?embassy:begge"
-#: client/climisc.c:216
+#: client/climisc.c:217
msgid "?embassy:Yes"
msgstr "?embassy:ja"
-#: client/climisc.c:219
+#: client/climisc.c:220
msgid "?embassy:With Us"
msgstr "?embassy:hos oss"
-#: client/climisc.c:222
+#: client/climisc.c:223
msgid "?embassy:Contact"
msgstr "?embassy:Kontakt"
-#: client/climisc.c:224
+#: client/climisc.c:225
msgid "?embassy:No Contact"
msgstr "Ingen Kontakt"
-#: client/climisc.c:236
+#: client/climisc.c:237
msgid "?vision:Both"
msgstr "?vision:begge"
-#: client/climisc.c:238
+#: client/climisc.c:239
msgid "?vision:To Them"
msgstr "?vision:for dem"
-#: client/climisc.c:241
+#: client/climisc.c:242
msgid "?vision:To Us"
msgstr "?vision:for oss"
-#: client/climisc.c:257 client/climisc.c:264
+#: client/climisc.c:258 client/climisc.c:265
#, c-format
msgid "The %s give %s"
msgstr "%s gir %s"
-#: client/climisc.c:268
+#: client/climisc.c:269
#, c-format
msgid "The %s give unknown city."
msgstr "%s gir bort ukjent by."
-#: client/climisc.c:273
+#: client/climisc.c:274
#, c-format
msgid "The %s give %d gold"
msgstr "%s gir deg %d gull"
-#: client/climisc.c:278
+#: client/climisc.c:279
#, c-format
msgid "The %s give their worldmap"
msgstr "%s gir deg sine verdenskart"
-#: client/climisc.c:282
+#: client/climisc.c:283
#, c-format
msgid "The %s give their seamap"
msgstr "%s gir deg sine sjøkart"
-#: client/climisc.c:286
+#: client/climisc.c:287
msgid "The parties agree on a cease-fire"
msgstr "Partene blir enig om en våpenhvile"
-#: client/climisc.c:289
+#: client/climisc.c:290
msgid "The parties agree on a peace"
msgstr "Partene slutter fred"
-#: client/climisc.c:292
+#: client/climisc.c:293
msgid "The parties create an alliance"
msgstr "Partene allierer seg"
-#: client/climisc.c:295
+#: client/climisc.c:296
#, c-format
msgid "The %s give shared vision"
msgstr "%s gir deg utsyn"
-#: client/climisc.c:299
+#: client/climisc.c:300
#, c-format
msgid "The %s give an embassy"
msgstr "%s gir en ambassade"
-#: client/climisc.c:902
+#: client/climisc.c:906
msgid "Popup Request"
msgstr "Popup spørsmål"
-#: client/climisc.c:932
+#: client/climisc.c:936
msgid "Exporting output window to civgame.log ..."
msgstr "Eksporterer utskriftsvindu til civgame.log ..."
-#: client/climisc.c:936
+#: client/climisc.c:940
msgid "Export complete."
msgstr "Eksport fullført."
-#: client/climisc.c:938
+#: client/climisc.c:942
msgid "Export failed, couldn't write to file."
msgstr "Klarer ikke skrive til fil."
-#: client/climisc.c:1038
+#: client/climisc.c:1042
#, c-format
msgid "You don't buy %s in %s!"
msgstr "Du kjøper ikke %s i %s!"
-#: client/climisc.c:1056
+#: client/climisc.c:1060
#, c-format
msgid "%s costs %d gold and you only have %d gold."
msgstr "%s koster %d gull og du har kun %d gull."
@@ -7998,19 +7997,19 @@ msgstr ""
"Auto-tilkobler server \"%s\" på port %d som \"%s\" hvert %f sekund i %d "
"ganger"
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1289
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
msgid "novice"
msgstr "nybegynner"
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1289
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1358
msgid "easy"
msgstr "lett"
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1290
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
msgid "normal"
msgstr "normal"
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1290
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
msgid "hard"
msgstr "vanskelig"
@@ -8039,39 +8038,43 @@ msgid "We probably couldn't start it from here."
msgstr "Vi kunne sannsynligvis ikke starte herfra."
#: client/connectdlg_common.c:470
-msgid "We have control of the server (command access level hack)"
+#, 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
-msgid "We can't take control of server, attempting to kill it."
-msgstr "Vi kan ikke ta kontroll over tjeneren, forsøker å avslutte den."
+msgid ""
+"Failed to obtain the required access level to take control of the server. "
+"The server will now be shutdown."
+msgstr ""
-#: client/control.c:1104
+#: client/control.c:1123
msgid "Only transporter units can be unloaded."
msgstr "Kun transportenheter kan lastes av."
-#: client/control.c:1353
+#: client/control.c:1425
#, 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:1444
+#: client/control.c:1516
msgid "Only nuclear units can do this."
msgstr "Kun atombombe-enheter kan gjøre dette."
-#: client/control.c:1473
+#: client/control.c:1545
msgid "Only paratrooper units can do this."
msgstr "Kun fallskjermjegere kan gjøre dette."
-#: client/control.c:1921
+#: client/control.c:2020
msgid "Too far for this unit."
msgstr "For langt for denne enheten."
-#: client/control.c:2131 client/control.c:2161 client/control.c:2177
+#: client/control.c:2230 client/control.c:2260 client/control.c:2276
msgid "Didn't find a route to the destination!"
msgstr "Fant ingen rute til målet."
-#: client/control.c:2221
+#: client/control.c:2320
msgid "Oh my! You seem to have no capital!"
msgstr "Herregud! Du har ingen hovedstad!"
@@ -8139,16 +8142,16 @@ msgid "Allows %s (with %s)."
msgstr "Tillater %s (med %s).\n"
#. TRANS: preserve single space at beginning
-#: client/helpdata.c:418
+#: client/helpdata.c:416
msgid " Rivers"
msgstr " Elver"
-#: client/helpdata.c:576
+#: client/helpdata.c:574
#, c-format
msgid "Sorry, no help topic for %s.\n"
msgstr "Beklager, ikke noe hjelpeemne for %s.\n"
-#: client/helpdata.c:580
+#: client/helpdata.c:578
#, c-format
msgid ""
"Sorry, no help topic for %s.\n"
@@ -8159,86 +8162,86 @@ msgstr ""
"Denne siden ble auto-generert.\n"
"\n"
-#: client/helpdata.c:670
+#: client/helpdata.c:668
#, fuzzy
msgid ""
"Requires: Nothing\n"
"\n"
msgstr "Du kan ikke forske på denne teknologien."
-#: client/helpdata.c:675
+#: client/helpdata.c:673
#, c-format
msgid "* The discovery of %s will make %s obsolete.\n"
msgstr "* Oppdagelsen av %s vil forelde %s.\n"
-#: client/helpdata.c:694
+#: client/helpdata.c:692
#, c-format
msgid "* Allows all players with knowledge of %s to build %s units.\n"
msgstr "* Tillater alle spillere med kunnskap om %s å bygge %s enheter.\n"
-#: client/helpdata.c:706
+#: client/helpdata.c:704
#, c-format
msgid "* Allows %s (with %s).\n"
msgstr "* Tillater %s (med %s).\n"
-#: client/helpdata.c:710
+#: client/helpdata.c:708
#, c-format
msgid "* Allows %s.\n"
msgstr "* Tillater %s.\n"
-#: client/helpdata.c:780
+#: client/helpdata.c:778
#, c-format
msgid "* Can only be built if there is %s in the city.\n"
msgstr ""
-#: client/helpdata.c:786
+#: client/helpdata.c:784
#, c-format
msgid "* Can only be built with %s as government.\n"
msgstr ""
-#: client/helpdata.c:791
+#: client/helpdata.c:789
msgid "* May not be built in cities.\n"
msgstr "* Kan ikke bygges i byer.\n"
-#: client/helpdata.c:794
+#: client/helpdata.c:792
msgid "* Never has a home city.\n"
msgstr "* Har aldri en hjemby.\n"
-#: client/helpdata.c:797
+#: client/helpdata.c:795
msgid "* Losing this unit will lose you the game!\n"
msgstr "* Å miste denne enheten gjør at du taper spiller!\n"
-#: client/helpdata.c:801
+#: client/helpdata.c:799
msgid "* Each player may only have one of this type of unit.\n"
msgstr "* Hver spiller kan kun ha en av denne enheten.\n"
-#: client/helpdata.c:805
+#: client/helpdata.c:803
#, c-format
msgid "* Requires %d population to build.\n"
msgstr "* Krever befolkningstall på %d for å kunne bygges.\n"
-#: client/helpdata.c:811
+#: client/helpdata.c:809
#, c-format
msgid "* Can carry and refuel %d air unit.\n"
msgid_plural "* Can carry and refuel %d air units.\n"
msgstr[0] "* Kan frakte og fylle drivstoff på %d flyenhet.\n"
msgstr[1] "* Kan frakte og fylle drivstoff på %d flyenhet.\n"
-#: client/helpdata.c:816
+#: client/helpdata.c:814
#, c-format
msgid "* Can carry and refuel %d missile unit.\n"
msgid_plural "* Can carry and refuel %d missile units.\n"
msgstr[0] "* Kan transportere og fylle drivstoff på %d rakettenhet.\n"
msgstr[1] "* Kan transportere og fylle drivstoff på %d rakettenhet.\n"
-#: client/helpdata.c:821
+#: client/helpdata.c:819
#, c-format
msgid "* Can carry %d ground unit across water.\n"
msgid_plural "* Can carry %d ground units across water.\n"
msgstr[0] "* Kan transportere %d landenhet over vann.\n"
msgstr[1] "* Kan transportere %d landenhet over vann.\n"
-#: client/helpdata.c:830
+#: client/helpdata.c:828
msgid ""
"* Can establish trade routes (must travel to target city and must be at "
"least 9 tiles [in Manhattan distance] from this unit's home city).\n"
@@ -8246,166 +8249,166 @@ msgstr ""
"* Kan etablere handelsruter (må reise til en annen by som er minst 9 ruter "
"[i Manhattan avstand] fra denne enhetens hjemby). \n"
-#: client/helpdata.c:836
+#: client/helpdata.c:834
#, c-format
msgid "* Can help build wonders (adds %d production).\n"
msgstr "* Kan hjelpe til å bygge underverk (legger til %d produksjon).\n"
-#: client/helpdata.c:840
+#: client/helpdata.c:838
msgid "* May not be disbanded.\n"
msgstr "* Kan ikke oppløses.\n"
-#: client/helpdata.c:842
+#: client/helpdata.c:840
#, c-format
msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
msgstr ""
"* Kan oppløses i en by for å få tilbake 50%% av produksjonskonstnadene.\n"
-#: client/helpdata.c:846
+#: client/helpdata.c:844
msgid "* Can build new cities.\n"
msgstr "* Kan bygge nye byer.\n"
-#: client/helpdata.c:849
+#: client/helpdata.c:847
#, c-format
msgid "* Can add on %d population to cities of no more than size %d.\n"
msgstr "* Kan legge til %d innbyggere til byer på størrelse mindre enn %d.\n"
-#: client/helpdata.c:858
+#: client/helpdata.c:856
msgid "* Can build roads and railroads.\n"
msgstr "* Kan bygge veier og jernbaner.\n"
-#: client/helpdata.c:859
+#: client/helpdata.c:857
msgid "* Can build mines on tiles.\n"
msgstr "* Kan bygge gruver.\n"
-#: client/helpdata.c:860
+#: client/helpdata.c:858
msgid "* Can build irrigation on tiles.\n"
msgstr "* Kan bygge irrigasjon.\n"
-#: client/helpdata.c:865
+#: client/helpdata.c:863
msgid "* Can build farmland.\n"
msgstr "- Kan bygge dyrket mark.\n"
-#: client/helpdata.c:869
+#: client/helpdata.c:867
#, c-format
msgid "* Can build farmland (if %s is known).\n"
msgstr "* Kan bygge dyrket mark (dersom %s er kjent).\n"
-#: client/helpdata.c:873
+#: client/helpdata.c:871
#, c-format
msgid "* Can build farmland (if any of the following are known: %s).\n"
msgstr "* Kan bygge dyrket mark (dersom en av %s er kjent).\n"
-#: client/helpdata.c:881
+#: client/helpdata.c:879
msgid "* Can build fortresses.\n"
msgstr "* Tillater å bygge fort.\n"
-#: client/helpdata.c:885
+#: client/helpdata.c:883
#, c-format
msgid "* Can build fortresses (if %s is known).\n"
msgstr "* Tillater å bygge fort (dersom %s er kjent).\n"
-#: client/helpdata.c:889
+#: client/helpdata.c:887
#, c-format
msgid "* Can build fortresses (if any of the following are known: %s).\n"
msgstr "* Tillater å bygge fort (dersom en av følgende er kjent: %s).\n"
-#: client/helpdata.c:895
+#: client/helpdata.c:893
msgid "* Can clean pollution from tiles.\n"
msgstr "* Kan fjerne forurensing. \n"
-#: client/helpdata.c:896
+#: client/helpdata.c:894
msgid "* Can clean nuclear fallout from tiles.\n"
msgstr "* Kan fjerne atomavfall.\n"
-#: client/helpdata.c:899
+#: client/helpdata.c:897
msgid "* Can transform tiles.\n"
msgstr "* Kan transformere kartruter.\n"
-#: client/helpdata.c:902
+#: client/helpdata.c:900
msgid "* Can build airbases.\n"
msgstr "* Kan bygge flyplasser.\n"
-#: client/helpdata.c:906
+#: client/helpdata.c:904
#, c-format
msgid "* May fortify, granting a 50%% defensive bonus.\n"
msgstr "* Kan befeste, som git 50%% forsvarsbonus.\n"
-#: client/helpdata.c:909
+#: client/helpdata.c:907
msgid "* May pillage to destroy infrastructure from tiles.\n"
msgstr "* Kan plyndre for å ødelegge infrastrukturen på kartruter.\n"
-#: client/helpdata.c:913
+#: client/helpdata.c:911
msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
msgstr ""
"* Kan utføre diplomatiske forhandlinger, samt spesielle spion-egenskaper.\n"
-#: client/helpdata.c:916
+#: client/helpdata.c:914
msgid "* Can perform diplomatic actions.\n"
msgstr "* Kan utføre diplomatiske forhandlinger.\n"
-#: client/helpdata.c:920
+#: client/helpdata.c:918
msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
msgstr "* Vil aldri tape en diplomat-mot-diplomat kamp.\n"
-#: client/helpdata.c:923
+#: client/helpdata.c:921
msgid "* May not be bribed.\n"
msgstr "* Denne enheten kan ikke bestikkes.\n"
-#: client/helpdata.c:926
+#: client/helpdata.c:924
msgid "* Can attack enemy air units.\n"
msgstr "* Kan angripe fiendtlige luftenheter.\n"
-#: client/helpdata.c:930
+#: client/helpdata.c:928
msgid "* Is invisible except when next to an enemy unit or city.\n"
msgstr ""
"* Er usynlig unntatt når den er ved siden av en fremmed enhet eller by.\n"
-#: client/helpdata.c:934
+#: client/helpdata.c:932
msgid "* Can only attack units on ocean squares (no land attacks).\n"
msgstr "* Kan kunne angripe enheter på havet (ingen angrep mot land).\n"
# dumbo translation
-#: client/helpdata.c:938
+#: client/helpdata.c:936
msgid ""
"* Can attack from aboard sea units: against enemy cities and onto land "
"squares.\n"
msgstr "* Kan fra sjøenheter angripe fiendens byer og enheter på land.\n"
-#: client/helpdata.c:943
+#: client/helpdata.c:941
#, c-format
msgid "* Can be paradropped from a friendly city (Range: %d).\n"
msgstr "* Kan gjøre fallskjermhopp fra vennligsinnet by (Rekkevidde: %d).\n"
-#: client/helpdata.c:949
+#: client/helpdata.c:947
msgid "* Gets double defense against units specified as 'mounted'.\n"
msgstr "* Får dobbelt forsvar mot enheter som er 'til hest'.\n"
-#: client/helpdata.c:953
+#: client/helpdata.c:951
msgid "* Counts as 'mounted' against certain defenders.\n"
msgstr "* Teller som 'til hest' mot enkelte forsvarere.\n"
-#: client/helpdata.c:957
+#: client/helpdata.c:955
msgid "* A missile unit: gets used up in making an attack.\n"
msgstr "* En rakettenhet: blir brukt opp idet den angriper.\n"
-#: client/helpdata.c:960
+#: client/helpdata.c:958
msgid "* Making an attack ends this unit's turn.\n"
msgstr "* Et angrep avslutter denne enhetens runde.\n"
-#: client/helpdata.c:964
+#: client/helpdata.c:962
msgid "* This unit's attack causes a nuclear explosion!\n"
msgstr "* Denne enhetens angrep skaper en atomeksplosjon!\n"
-#: client/helpdata.c:968
+#: client/helpdata.c:966
msgid "* Gets double firepower when attacking cities.\n"
msgstr "* Får dobbel ildkraft ved angrep på byer.\n"
-#: client/helpdata.c:971
+#: client/helpdata.c:969
msgid "* Ignores the effects of city walls.\n"
msgstr "* Bryr seg ikke om bymurer.\n"
-#: client/helpdata.c:975
+#: client/helpdata.c:973
#, c-format
msgid ""
"* Does bombard attacks (%d per turn). These attacks will only damage (never "
@@ -8415,36 +8418,36 @@ msgstr ""
"(aldri drepe) den forsvarende enheten, men innebærer ingen risiko for "
"angriper.\n"
-#: client/helpdata.c:982
+#: client/helpdata.c:980
msgid "* Gets quintuple defense against missiles and aircraft.\n"
msgstr "* Får femdoblet forsvar mot raketter og fly.\n"
-#: client/helpdata.c:986
+#: client/helpdata.c:984
msgid "* Ignores terrain effects (treats all squares as roads).\n"
msgstr "* Bryr seg ikke om terreng (alle felt tilsvarer veier).\n"
-#: client/helpdata.c:989
+#: client/helpdata.c:987
msgid "* Ignores zones of control.\n"
msgstr "* Bryr seg ikke om kontrollsoner.\n"
-#: client/helpdata.c:993
+#: client/helpdata.c:991
msgid "* A non-military unit (cannot attack; no martial law).\n"
msgstr "* En ikke-militær enhet (kan ikke angripe; ingen unntakstilstand).\n"
-#: client/helpdata.c:997
+#: client/helpdata.c:995
msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
msgstr ""
"* En kampenhet: medfører 1 ulykkelig selv når den er ikke-aggressiv. \n"
-#: client/helpdata.c:1000
+#: client/helpdata.c:998
msgid "* Will never achieve veteran status.\n"
msgstr "* Oppnår aldri status som veteran.\n"
-#: client/helpdata.c:1002
+#: client/helpdata.c:1000
msgid "* May become veteran through training or combat.\n"
msgstr "* Kan bli oppnå veteran status gjennom trening eller kamp.\n"
-#: client/helpdata.c:1008
+#: client/helpdata.c:1006
#, c-format
msgid ""
"* Must end turn in a city or next to land, or has a 50%% risk of being lost "
@@ -8453,12 +8456,12 @@ msgstr ""
"* Må avslutte runden i en by eller ved kysten, ellers har den en 50%% sjanse "
"for å gå tapt på havet.\n"
-#: client/helpdata.c:1012
+#: client/helpdata.c:1010
#, c-format
msgid "* The discovery of %s reduces the risk to 25%%.\n"
msgstr "* Oppdagelsen av %s reduserer risikoen til 25%%.\n"
-#: client/helpdata.c:1017
+#: client/helpdata.c:1015
#, c-format
msgid "* %s reduces the risk to 12%%.\n"
msgstr "* %s reduserer risikoen til 12%%.\n"
@@ -8467,27 +8470,27 @@ msgstr "* %s reduserer risikoen til 12%%.\n"
#. * last two elements
#. TRANS: List of possible output types has this between
#. * last two elements
-#: client/helpdata.c:1068 client/helpdata.c:1402
+#: client/helpdata.c:1066 client/helpdata.c:1400
msgid " or "
msgstr " eller "
-#: client/helpdata.c:1070 client/helpdata.c:1390
+#: client/helpdata.c:1068 client/helpdata.c:1388
msgid "?or:, "
msgstr "?eller:, "
-#: client/helpdata.c:1082
+#: 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"
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:1124
+#: client/helpdata.c:1122
#, 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:1129
+#: client/helpdata.c:1127
#, c-format
msgid ""
"To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8496,91 +8499,91 @@ msgstr ""
"For å nå %s trenger vi å anskaffe %d andre teknologier først. Hele "
"prosjektet krever %d forskningspoeng for å fullføres."
-#: client/helpdata.c:1137
+#: client/helpdata.c:1135
msgid "You cannot research this technology."
msgstr "Du kan ikke forske på denne teknologien."
-#: client/helpdata.c:1141
+#: client/helpdata.c:1139
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:1153
+#: client/helpdata.c:1151
#, 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:1158
+#: client/helpdata.c:1156
#, 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:1161
+#: client/helpdata.c:1159
#, 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:1165
+#: client/helpdata.c:1163
msgid "* Increases the pollution generated by the population.\n"
msgstr "* Øker forurensningen skapt av befolkningen.\n"
-#: client/helpdata.c:1170
+#: client/helpdata.c:1168
#, c-format
msgid "* Allows %s to build roads on river squares.\n"
msgstr "* Tillater %s å bygge veier på elve-felt\n"
-#: client/helpdata.c:1177
+#: client/helpdata.c:1175
#, c-format
msgid "* Allows %s to build fortresses.\n"
msgstr "* Tillater %s å bygge fort.\n"
-#: client/helpdata.c:1185
+#: client/helpdata.c:1183
#, c-format
msgid "* Allows %s to build airbases.\n"
msgstr "* Tillater %s å bygge flybaser.\n"
-#: client/helpdata.c:1194
+#: client/helpdata.c:1192
#, c-format
msgid "* Allows %s to upgrade roads to railroads.\n"
msgstr "* Tillater %s å oppgradere veier til jernbane.\n"
-#: client/helpdata.c:1202
+#: client/helpdata.c:1200
#, c-format
msgid "* Allows %s to upgrade irrigation to farmland.\n"
msgstr "* Tillater %s å oppgradere irrigert land til jordbruksland.\n"
-#: client/helpdata.c:1236
+#: client/helpdata.c:1234
msgid "* Pollution cannot be generated on this terrain."
msgstr "* Dette terrenget kan ikke bli forurenset."
-#: client/helpdata.c:1241
+#: client/helpdata.c:1239
msgid "* You cannot build cities on this terrain."
msgstr "* Kan ikke bygge byer på slikt terreng."
-#: client/helpdata.c:1247
+#: client/helpdata.c:1245
msgid "* The coastline of this terrain is unsafe."
msgstr "* Kystlinja til dette terrenget er utrygg."
-#: client/helpdata.c:1252
+#: client/helpdata.c:1250
msgid "* This terrain is unsafe for units to travel on."
msgstr "* Dette terrenget er utrygt for ferdsel."
-#: client/helpdata.c:1257
+#: client/helpdata.c:1255
msgid "* Land units cannot travel on oceanic terrains."
msgstr "* Landenheter kan ikke ferdes over havterreng."
-#: client/helpdata.c:1307
+#: client/helpdata.c:1305
msgid "Features:\n"
msgstr ""
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1413 client/helpdata.c:1414
+#: client/helpdata.c:1411 client/helpdata.c:1412
msgid "?outputlist: Nothing "
msgstr ""
-#: client/helpdata.c:1421
+#: client/helpdata.c:1419
#, fuzzy, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
@@ -8591,7 +8594,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:1431
+#: client/helpdata.c:1429
#, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8599,48 +8602,48 @@ msgid ""
msgstr ""
#. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1439
+#: client/helpdata.c:1437
#, c-format
msgid "* You pay %d times normal %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1444
+#: client/helpdata.c:1442
#, 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:1449
+#: client/helpdata.c:1447
#, c-format
msgid "* You pay no %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1453
+#: client/helpdata.c:1451
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:1462
+#: client/helpdata.c:1460
#, 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:1470
+#: client/helpdata.c:1468
#, c-format
msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
msgstr ""
-#: client/helpdata.c:1477
+#: client/helpdata.c:1475
#, 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:1484
+#: client/helpdata.c:1482
#, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -8648,23 +8651,23 @@ msgid ""
msgstr ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1491
+#: client/helpdata.c:1489
#, 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:1499
+#: client/helpdata.c:1497
#, c-format
msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
msgstr ""
-#: client/helpdata.c:1504
+#: client/helpdata.c:1502
msgid "Has unlimited science/gold/luxuries rates.\n"
msgstr ""
-#: client/helpdata.c:1509
+#: client/helpdata.c:1507
#, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
@@ -8675,7 +8678,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:1521
+#: client/helpdata.c:1519
#, 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"
@@ -8683,64 +8686,64 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1532
+#: client/helpdata.c:1530
#, 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:1538
+#: client/helpdata.c:1536
#, fuzzy
msgid "* Your units cannot be bribed.\n"
msgstr "Denne enheten kan ikke bestikkes."
-#: client/helpdata.c:1541
+#: client/helpdata.c:1539
#, fuzzy
msgid "* Your cities cannot be incited.\n"
msgstr "Byen kan ikke bli infiltrert!"
-#: client/helpdata.c:1545
+#: client/helpdata.c:1543
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:1551
+#: client/helpdata.c:1549
msgid "* Has a senate that may prevent declaration of war.\n"
msgstr ""
-#: client/helpdata.c:1555
+#: client/helpdata.c:1553
msgid "* Allows partisans when cities are taken by the enemy.\n"
msgstr ""
-#: client/helpdata.c:1559
+#: client/helpdata.c:1557
msgid ""
"* Buildings that normally confer bonuses against unhappiness will instead "
"give gold.\n"
msgstr ""
-#: client/helpdata.c:1563
+#: client/helpdata.c:1561
msgid "* Pays no upkeep for fanatics.\n"
msgstr ""
-#: client/helpdata.c:1566
+#: client/helpdata.c:1564
#, fuzzy
msgid "* Has no unhappy citizens.\n"
msgstr "%d ulykkelige innbyggere."
-#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
+#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
#, c-format
msgid "* Veteran %s units.\n"
msgstr ""
-#: client/helpdata.c:1587
+#: client/helpdata.c:1585
#, fuzzy
msgid "* Veteran units.\n"
msgstr "Sjøenheter"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1593
+#: client/helpdata.c:1591
#, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8748,7 +8751,7 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1602
+#: client/helpdata.c:1600
#, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8756,458 +8759,505 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1610
+#: client/helpdata.c:1608
#, 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:1619
+#: client/helpdata.c:1617
#, c-format
msgid "* %s production is increased %d%%.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1627
+#: client/helpdata.c:1625
#, c-format
msgid "* %s production will suffer massive waste.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1632
+#: client/helpdata.c:1630
#, c-format
msgid "* %s production will suffer some waste.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1637
+#: client/helpdata.c:1635
#, 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:1645
+#: client/helpdata.c:1643
#, 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:1651
+#: client/helpdata.c:1649
#, 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:1657
+#: client/helpdata.c:1655
#, c-format
msgid "* %s waste will increase slowly with distance from capital.\n"
msgstr ""
-#: client/helpdata.c:1674
+#: client/helpdata.c:1672
#, 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:1701
+#: client/helpdata.c:1699
#, fuzzy, c-format
msgid "%s%d %s"
msgstr "%3d/%3d %s"
-#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1700 client/helpdata.c:1708 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:1709
+#: client/helpdata.c:1707
#, c-format
msgid "%s%d unhappy"
msgstr "%s%d ulykkelig"
-#: client/mapctrl_common.c:382
+#: client/mapctrl_common.c:399
#, c-format
msgid "You don't know how to build %s!"
msgstr "Du vet ikke hvordan man bygger %s!"
-#: client/mapctrl_common.c:392
+#: client/mapctrl_common.c:409
#, c-format
msgid "Copy %s to clipboard."
msgstr "Kopierer %s til utklippstavlen."
-#: client/mapctrl_common.c:408
+#: client/mapctrl_common.c:425
msgid "Clipboard is empty."
msgstr "Utklippstavlen er tom."
-#: client/options.c:98
+#: client/options.c:102
#, fuzzy
msgid "Graphics"
msgstr "Demografi"
-#: client/options.c:99
+#: client/options.c:103
#, fuzzy
msgid "Overview"
msgstr "_Byoversikt"
-#: client/options.c:100
+#: client/options.c:104
#, fuzzy
msgid "Sound"
msgstr "Runder"
-#: client/options.c:101
+#: client/options.c:105
#, fuzzy
msgid "Interface"
msgstr "Intern"
-#: client/options.c:102
+#: client/options.c:106
#, fuzzy
msgid "Network"
msgstr "Nettverk"
-#: client/options.c:107
+#: client/options.c:111
#, fuzzy
msgid "Login name"
msgstr "Fortsette et spill"
-#: client/options.c:108
+#: client/options.c:112
msgid ""
"This is the default login username that will be used in the connection "
"dialogs or with the -a command-line parameter."
msgstr ""
-#: client/options.c:113
+#: client/options.c:117
#, fuzzy
msgid "Server"
msgstr "aldri"
-#: client/options.c:114
+#: client/options.c:118
msgid ""
"This is the default server hostname that will be used in the connection "
"dialogs or with the -a command-line parameter."
msgstr ""
-#: client/options.c:119
+#: client/options.c:123
#, fuzzy
msgid "Server port"
msgstr "Vis ser_veralternativ"
-#: client/options.c:120
+#: client/options.c:124
msgid ""
"This is the default server port that will be used in the connection dialogs "
"or with the -a command-line parameter."
msgstr ""
-#: client/options.c:125 client/gui-win32/connectdlg.c:912 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
msgid "Metaserver"
msgstr "Metaserver"
-#: client/options.c:126
+#: client/options.c:130
msgid ""
"The metaserver is a host that the client contacts to find out about games on "
"the internet. Don't change this from its default value unless you know what "
"you're doing."
msgstr ""
-#: client/options.c:132
+#: client/options.c:136
#, fuzzy
msgid "Soundset"
msgstr "Runder"
-#: client/options.c:133
+#: client/options.c:137
msgid ""
"This is the soundset that will be used. Changing this is the same as using "
"the -S command-line parameter."
msgstr ""
-#: client/options.c:138
+#: client/options.c:142
#, fuzzy
msgid "Sound plugin"
msgstr "Standard lydplugin"
-#: client/options.c:139
+#: client/options.c:143
msgid ""
"If you have a problem with sound, try changing the sound plugin. The new "
"plugin won't take effect until you restart Freeciv. Changing this is the "
"same as using the -P command-line option."
msgstr ""
-#: client/options.c:144 client/gui-sdl/gui_main.c:162
+#: client/options.c:148 client/gui-sdl/gui_main.c:162
#, fuzzy
msgid "Theme"
msgstr "Tempel"
-#: client/options.c:145
+#: client/options.c:149
msgid "By changing this option you change the active theme."
msgstr ""
-#: client/options.c:148
+#: client/options.c:152
msgid "Tileset"
msgstr "Grafikkoppsett"
-#: client/options.c:149
+#: client/options.c:153
msgid ""
"By changing this option you change the active tileset. This is the same as "
"using the -t command-line parameter."
msgstr ""
-#: client/options.c:156
+#: client/options.c:160
msgid "Solid unit background color"
msgstr "Helfarget bakgrunn for enheter"
-#: client/options.c:157
+#: client/options.c:161
msgid ""
"Setting this option will cause units on the map view to be drawn with a "
"solid background color instead of the flag backdrop."
msgstr ""
-#: client/options.c:161 client/gui-sdl/optiondlg.c:960
+#: client/options.c:165 client/gui-sdl/optiondlg.c:960
msgid "Sound bell at new turn"
msgstr "Lydsignal ved ny runde "
-#: client/options.c:162
+#: client/options.c:166
msgid ""
"Set this option to have a \"bell\" event be generated at the start of a new "
"turn. You can control the behavior of the \"bell\" event by editing the "
"message options."
msgstr ""
-#: client/options.c:168
+#: client/options.c:172
msgid "Unit movement animation time (milliseconds)"
msgstr "Animasjonstid for enhet (millisekund)"
-#: client/options.c:169
+#: client/options.c:173
msgid ""
"This option controls how long unit \"animation\" takes when a unit moves on "
"the map view. Set it to 0 to disable animation entirely."
msgstr ""
-#: client/options.c:174
+#: client/options.c:178
msgid "Mapview recentering time (milliseconds)"
msgstr "Tid for å sentrere kart (millisekund)"
-#: client/options.c:175
+#: client/options.c:179
msgid ""
"When the map view is recentered, it will slide smoothly over the map to its "
"new position. This option controls how long this slide lasts. Set it to 0 "
"to disable mapview sliding entirely."
msgstr ""
-#: client/options.c:180 client/gui-sdl/optiondlg.c:1014
+#: client/options.c:184 client/gui-sdl/optiondlg.c:1014
msgid "Show combat animation"
msgstr "Vis kampanimasjon"
-#: client/options.c:181
+#: client/options.c:185
msgid ""
"Disabling this option will turn off combat animation between units on the "
"mapview."
msgstr ""
-#: client/options.c:184
+#: client/options.c:188
msgid "Draw the citybar"
msgstr ""
-#: client/options.c:185
+#: client/options.c:189
msgid ""
"Setting this option will display a 'citybar' containing useful information "
"beneath each city. Disabling this option will display only the city's name "
"and optionally, production."
msgstr ""
-#: client/options.c:191
+#: client/options.c:195
msgid "Show icons in the technology tree"
msgstr ""
-#: client/options.c:192
+#: client/options.c:196
msgid ""
"Setting this option will display icons on the technology tree diagram. "
"Turning this option off makes the technology tree more compact."
msgstr ""
-#: client/options.c:197
+#: client/options.c:201
msgid "Draw shield graphics for units"
msgstr ""
-#: client/options.c:198
+#: client/options.c:202
msgid ""
"Setting this option will draw a shield icon as the flags on units. If "
"unset, the full flag will be drawn."
msgstr ""
-#: client/options.c:202
+#: client/options.c:206
msgid "Manual Turn Done in AI Mode"
msgstr "Manuell runde gjort i AI modus"
-#: client/options.c:203
+#: client/options.c:207
msgid ""
"Disable this option if you do not want to press the Turn Done button "
"manually when watching an AI player."
msgstr ""
-#: client/options.c:207 client/gui-sdl/optiondlg.c:1121
+#: client/options.c:211 client/gui-sdl/optiondlg.c:1121
msgid "Auto Center on Units"
msgstr "Autosentrer på enheter"
-#: client/options.c:208
+#: client/options.c:212
msgid ""
"Set this option to have the active unit centered automatically when the unit "
"focus changes."
msgstr ""
-#: client/options.c:211 client/gui-sdl/optiondlg.c:1147
+#: client/options.c:215 client/gui-sdl/optiondlg.c:1147
msgid "Auto Center on Combat"
msgstr "Autosentrer på kamp"
-#: client/options.c:212
+#: client/options.c:216
msgid ""
"Set this option to have any combat be centered automatically. Disabled this "
"will speed up the time between turns but may cause you to miss combat "
"entirely."
msgstr ""
-#: client/options.c:217 client/gui-sdl/optiondlg.c:1174
+#: client/options.c:221 client/gui-sdl/optiondlg.c:1174
msgid "Focus on Awakened Units"
msgstr "Fokus på vekkede enheter"
-#: client/options.c:218
+#: client/options.c:222
msgid "Set this option to have newly awoken units be focused automatically."
msgstr ""
-#: client/options.c:221
+#: client/options.c:225
msgid "Allow goto into the unknown"
msgstr ""
-#: client/options.c:222
+#: client/options.c:226
msgid ""
"Setting this option will make the game consider moving into unknown tiles. "
"If not, then goto routes will detour around or be blocked by unknown tiles."
msgstr ""
-#: client/options.c:226
+#: client/options.c:230
msgid "Center map when Popup city"
msgstr "Sentrer kart ved visning av by"
-#: client/options.c:227
+#: client/options.c:231
msgid ""
"Setting this option makes the mapview center on a city when its city dialog "
"is popped up."
msgstr ""
-#: client/options.c:230
+#: client/options.c:234
msgid "Concise City Production"
msgstr "Sammenfattet byproduksjon"
-#: client/options.c:231
+#: client/options.c:235
msgid ""
"Set this option to make the city production (as shown in the city dialog) to "
"be more compact."
msgstr ""
-#: client/options.c:234 client/gui-sdl/optiondlg.c:1252
+#: client/options.c:238 client/gui-sdl/optiondlg.c:1252
msgid "End Turn when done moving"
msgstr "Avslutt runde etter flytt"
-#: client/options.c:235
+#: client/options.c:239
msgid ""
"Setting this option makes your turn end automatically when all your units "
"are done moving."
msgstr ""
-#: client/options.c:238 client/gui-sdl/optiondlg.c:1226
+#: client/options.c:242 client/gui-sdl/optiondlg.c:1226
msgid "Prompt for city names"
msgstr "Spørre etter bynavn"
-#: client/options.c:239
+#: client/options.c:243
msgid ""
"Disabling this option will make the names of newly founded cities chosen "
"automatically by the server."
msgstr ""
-#: client/options.c:242 client/gui-sdl/optiondlg.c:1200
+#: client/options.c:246 client/gui-sdl/optiondlg.c:1200
msgid "Pop up city dialog for new cities"
msgstr "Vis byvindu etter å ha grunnlagt ny by"
-#: client/options.c:243
+#: client/options.c:247
msgid ""
"Setting this option will pop up a newly-founded city's city dialog "
"automatically."
msgstr ""
-#: client/options.c:248
+#: client/options.c:250
+#, fuzzy
+msgid "Pop up caravan actions"
+msgstr "Karavane"
+
+#: client/options.c:251
+msgid ""
+"If this option is enabled, when caravans arrive at a city where they can "
+"establish a traderoute or help build a wonder, a window will popup asking "
+"which action should be performed. Disabling this option means you will have "
+"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 ""
+
+#: client/options.c:260
+msgid "Enable cursor changing"
+msgstr ""
+
+#: client/options.c:261
+msgid ""
+"This option controls whether the client should try to change the mouse "
+"cursor depending on what is being pointed at, as well as to indicate changes "
+"in the client or server state."
+msgstr ""
+
+#: client/options.c:266
+msgid "Select cities before units"
+msgstr ""
+
+#: 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 ""
+
+#: client/options.c:272
+msgid "Clear unit orders on selection"
+msgstr ""
+
+#: client/options.c:273
+msgid ""
+"Enabling this option will cause unit orders to be cleared whenever one or "
+"more units are selected. If this option is disabled, selecting units will "
+"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 ""
+
+#: client/options.c:282
msgid "Background layer"
msgstr ""
-#: client/options.c:249
+#: client/options.c:283
msgid "The background layer of the overview shows just ocean and land."
msgstr ""
-#: client/options.c:252
+#: client/options.c:286
msgid "Terrain relief map layer"
msgstr ""
-#: client/options.c:253
+#: client/options.c:287
msgid "The relief layer shows all terrains on the map."
msgstr ""
-#: client/options.c:256
+#: client/options.c:290
#, fuzzy
msgid "Borders layer"
msgstr "Grense"
-#: client/options.c:257
+#: client/options.c:291
msgid ""
"The borders layer of the overview shows which tiles are owned by each player."
msgstr ""
-#: client/options.c:261
+#: client/options.c:295
#, fuzzy
msgid "Units layer"
msgstr "Enheter"
-#: client/options.c:262
+#: client/options.c:296
#, fuzzy
msgid "Enabling this will draw units on the overview."
msgstr "Om dette er valgt styrer bynavnene etter landskapet rundt byen."
-#: client/options.c:265
+#: client/options.c:299
#, fuzzy
msgid "Cities layer"
msgstr "Byer"
-#: client/options.c:266
+#: client/options.c:300
#, fuzzy
msgid "Enabling this will draw cities on the overview."
msgstr "Om dette er valgt styrer bynavnene etter landskapet rundt byen."
-#: client/options.c:269
+#: client/options.c:303
#, fuzzy
msgid "Overview fog of war"
msgstr "Byoversikt"
-#: client/options.c:270
+#: client/options.c:304
#, fuzzy
msgid "Enabling this will show fog of war on the overview."
msgstr "Om dette er valgt styrer bynavnene etter landskapet rundt byen."
-#: client/options.c:488
+#: client/options.c:526
msgid "If you add a preset by hand, also update \"number_of_presets\""
msgstr ""
"Dersom man legget til en forhåndsvalgt verdi manuelt, skal man også "
"oppdatere \"number_of_presets\""
-#: client/options.c:516
+#: client/options.c:554
msgid "Cannot find your home directory"
msgstr "Klarer ikke finne din hjemmekatalog"
-#: client/options.c:665 client/options.c:796
+#: client/options.c:703 client/options.c:834
msgid "Save failed, cannot find a filename."
msgstr "Lagring av spillet gikk ikke, kan ikke finne et filnavn"
-#: client/options.c:678 client/options.c:859
+#: client/options.c:716 client/options.c:897
#, c-format
msgid "Save failed, cannot write to file %s"
msgstr "Lagring avbrutt; Klarer ikke skrive til fil %s"
-#: client/options.c:680 client/options.c:862
+#: client/options.c:718 client/options.c:900
#, c-format
msgid "Saved settings to file %s"
msgstr "Lagrer oppsett til filen %s"
@@ -9232,16 +9282,16 @@ msgstr "Server egenskapsstreng: %s"
msgid "Start of turn %d"
msgstr "Runden begynner %d"
-#: client/packhand.c:1590
+#: client/packhand.c:1591
#, c-format
msgid "AI Mode is now %s."
msgstr "AI modus er nå %s."
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "ON"
msgstr "PÅ"
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "OFF"
msgstr "AV"
@@ -9274,14 +9324,15 @@ msgid "Username"
msgstr "Brukernavn"
#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
-#: client/gui-gtk-2.0/pages.c:2085
+#: client/gui-gtk-2.0/pages.c:2157
msgid "Flag"
msgstr "Flagg"
#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
-#: client/gui-gtk-2.0/pages.c:1536 client/gui-gtk-2.0/pages.c:2087
-#: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
-#: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
+#: 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/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr "Nasjon"
@@ -9293,7 +9344,7 @@ msgstr "Grense"
msgid "Score"
msgstr "Poengsum"
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
msgid "Team"
msgstr "Lag"
@@ -9365,286 +9416,309 @@ msgstr "Ingen %s kan oppl
msgid "Could not open temp file."
msgstr "Klarte ikke å åpne \"%s\"."
-#: client/servers.c:407
+#: client/servers.c:410
msgid "Invalid $http_proxy or metaserver value, must start with 'http://'"
msgstr ""
"Ugyldig $http_proxy verdi eller metaserver verdi, må starte med 'http://'"
-#: client/servers.c:413
+#: client/servers.c:416
#, fuzzy
msgid "Failed looking up metaserver's host"
msgstr "Feilet i forsøk på å finne server"
-#: client/text.c:85 client/text.c:86 client/text.c:91
+#. TRANS: "AI <player name>"
+#: client/text.c:94
+#, c-format
+msgid "AI %s"
+msgstr ""
+
+# problem
+#. TRANS: "<nation adjective>, team <team name>"
+#: client/text.c:118
+#, fuzzy, c-format
+msgid "%s, team %s"
+msgstr " nær %s"
+
+#: client/text.c:135 client/text.c:136 client/text.c:141
#: client/gui-sdl/mapview.c:752
msgid "?nation:Neutral"
msgstr "?nasjon:Nøytral"
-#: client/text.c:85 client/gui-sdl/mapview.c:752
+#: client/text.c:135 client/gui-sdl/mapview.c:752
msgid "?nation:Hostile"
msgstr "?nasjon:Fiendtlig"
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Peaceful"
msgstr "?nasjon:Fredlig"
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Friendly"
msgstr "?nasjon:Vennlig"
-#: client/text.c:88 client/gui-sdl/mapview.c:755
+#: client/text.c:138 client/gui-sdl/mapview.c:755
msgid "?nation:Mysterious"
msgstr "?nasjon:Mystisk"
-#: client/text.c:88
+#: client/text.c:138
msgid "?nation:Friendly(team)"
msgstr "Vennlig(lag)"
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
msgid "?city:Neutral"
msgstr "?city:Nøytral"
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
msgid "?city:Hostile"
msgstr "?city:Fiendtlig"
-#: client/text.c:92 client/gui-sdl/mapview.c:786
+#: client/text.c:142 client/gui-sdl/mapview.c:786
msgid "?city:Peaceful"
msgstr "?city:Fredlig"
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Friendly"
msgstr "?city:Vennlig"
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Mysterious"
msgstr "?by:Mystisk"
-#: client/text.c:93
+#: client/text.c:143
msgid "?city:Friendly(team)"
msgstr "Vennlig(lag)"
-#: client/text.c:100
+#: client/text.c:151
#, c-format
msgid "Location: (%d, %d) [%d]"
msgstr "Posisjon: (%d, %d) [%d]"
-#: client/text.c:109
+#: client/text.c:153
+#, c-format
+msgid "Native coordinates: (%d, %d)"
+msgstr ""
+
+#: client/text.c:160
#, c-format
msgid "Terrain: %s"
msgstr "Terreng: %s"
-#: client/text.c:110
+#: client/text.c:161
#, c-format
msgid "Food/Prod/Trade: %s"
msgstr "Mat/Prod/Handel: %s"
-#: client/text.c:113
+#: client/text.c:164
msgid "Minor Tribe Village"
msgstr "Mindre stammelandsbyer"
-#: client/text.c:119
+#: client/text.c:173
#, fuzzy
msgid "Our territory"
msgstr "Vårt territorie"
-#. TRANS: "Polish territory"
-#: client/text.c:122
+#. TRANS: "Territory of <username> (<nation + team>)"
+#: client/text.c:176
#, fuzzy, c-format
-msgid "%s territory"
-msgstr "Territoriet til %s"
+msgid "Territory of %s (%s)"
+msgstr "Territoriet til %s %s"
-#. TRANS: "Polish territory (5 turn cease-fire)"
-#: client/text.c:131
+#: client/text.c:186
#, fuzzy, c-format
-msgid "%s territory (%d turn cease-fire)"
-msgid_plural "%s territory (%d turn cease-fire)"
-msgstr[0] "%s territorie (%d runde våpenhvile)"
-msgstr[1] "%s territorie (%d runde våpenhvile)"
+msgid "Territory of %s (%s) (%d turn cease-fire)"
+msgid_plural "Territory of %s (%s) (%d turn cease-fire)"
+msgstr[0] "By: %s (%s, %d runde våpenhvile)"
+msgstr[1] "By: %s (%s, %d runde våpenhvile)"
-#. TRANS: "Polish territory (friendly)"
-#: client/text.c:140
+#. TRANS: "Territory of <username>
+#. * (<nation + team> | <diplomatic state>)"
+#: client/text.c:195
#, fuzzy, c-format
-msgid "%s territory (%s)"
+msgid "Territory of %s (%s | %s)"
msgstr "Territoriet til %s %s"
-#: client/text.c:145
+#: client/text.c:200
msgid "Unclaimed territory"
msgstr "Uerobret territorie"
-#. TRANS: "City: Warsaw (Polish)"
-#: client/text.c:156
-#, c-format
-msgid "City: %s (%s)"
-msgstr "By: %s (%s)"
+#. TRANS: "City: <city name> | <username> (<nation + team>)"
+#: client/text.c:214
+#, fuzzy, c-format
+msgid "City: %s | %s (%s)"
+msgstr "By: %s(%s,%s)"
-#. TRANS: "City: Warsaw (Polish, 5 turn cease-fire)"
-#: client/text.c:166
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <number> turn cease-fire)"
+#: client/text.c:224
#, fuzzy, c-format
-msgid "City: %s (%s, %d turn cease-fire)"
-msgid_plural "City: %s (%s, %d turn cease-fire)"
+msgid "City: %s | %s (%s, %d turn cease-fire)"
+msgid_plural "City: %s | %s (%s, %d turn cease-fire)"
msgstr[0] "By: %s (%s, %d runde våpenhvile)"
msgstr[1] "By: %s (%s, %d runde våpenhvile)"
-#. TRANS: "City: Warsaw (Polish,friendly)"
-#: client/text.c:174
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <diplomatic state>)"
+#: client/text.c:231
#, fuzzy, c-format
-msgid "City: %s (%s, %s)"
+msgid "City: %s | %s (%s, %s)"
msgstr "By: %s(%s,%s)"
#. TRANS: previous lines gave other information about the city.
-#: client/text.c:189
+#: client/text.c:246
#, fuzzy, c-format
msgid "?clistbegin: with %s"
msgstr " med %s"
#. TRANS: "Trade from Warsaw: 5"
-#: client/text.c:202
+#: client/text.c:259
#, c-format
msgid "Trade from %s: %d"
msgstr "Handel fra %s: %d"
-#: client/text.c:210
+#: client/text.c:267
#, c-format
msgid "Infrastructure: %s"
msgstr "Infrastruktur: %s"
-#: client/text.c:215
+#: client/text.c:272
#, c-format
msgid "Activity: %s"
msgstr "Aktivitet: %s"
-#. TRANS: "Unit: Musketeers (Polish, Warsaw)"
-#. TRANS: "Unit: Musketeers (Polish,friendly)"
-#: client/text.c:226 client/text.c:253
+#. TRANS: "Unit: <unit type> | <username>
+#. * (<nation + team>, <homecity>)"
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <diplomatic state>)"
+#: client/text.c:287 client/text.c:313
#, fuzzy, c-format
-msgid "Unit: %s (%s, %s)"
+msgid "Unit: %s | %s (%s, %s)"
msgstr "Enhet: %s (%s,%s)"
-#. TRANS: "Unit: Musketeers (Polish)"
-#: client/text.c:232
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>)"
+#: client/text.c:292
#, fuzzy, c-format
-msgid "Unit: %s (%s)"
-msgstr "Enhet: %s (%s)"
+msgid "Unit: %s | %s (%s)"
+msgstr "Enhet: %s (%s,%s)"
-#. TRANS: "Unit: Musketeers (Polish, 5 turn cease-fire)"
-#: client/text.c:245
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <number> turn cease-fire)"
+#: client/text.c:305
#, fuzzy, c-format
-msgid "Unit: %s (%s, %d turn cease-fire)"
-msgid_plural "Unit: %s (%s, %d turn cease-fire)"
+msgid "Unit: %s | %s (%s, %d turn cease-fire)"
+msgid_plural "Unit: %s | %s (%s, %d turn cease-fire)"
msgstr[0] "Enhet: %s (%s, %d runde våpenhvile)"
msgstr[1] "Enhet: %s (%s, %d runder våpenhvile)"
#. TRANS: "Chance to win: A:95% D:46%"
-#: client/text.c:279
+#: client/text.c:338
#, c-format
msgid "Chance to win: A:%d%% D:%d%%"
msgstr "Sjanse for seier: A:%d%% F:%d%%"
#. TRANS: A is attack power, D is defense power, FP is firepower,
#. * HP is hitpoints (current and max).
-#: client/text.c:286
+#: client/text.c:345
#, fuzzy, c-format
msgid "A:%d D:%d FP:%d HP:%d/%d (%s)"
msgstr "A:%d F:%d Ik:%d Tp:%d/%d%s"
#. TRANS: "5 more" units on this tile
-#: client/text.c:295
+#: client/text.c:354
#, c-format
msgid " (%d more)"
msgstr " (%d flere)"
# problem
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:364
+#: client/text.c:423
#, c-format
msgid "far from %s"
msgstr "langt fra %s"
# problem
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:367
+#: client/text.c:426
#, c-format
msgid "near %s"
msgstr "nær %s"
# problem
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:370
+#: client/text.c:429
#, c-format
msgid "in %s"
msgstr "i %s"
# problem
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:403
+#: client/text.c:462
#, c-format
msgid "from %s"
msgstr "fra %s"
-#: client/text.c:466
+#: client/text.c:525
msgid "Progress: no research"
msgstr "Fremgang: Ingen forskning"
-#: client/text.c:470
+#: client/text.c:529
#, fuzzy
msgid "Progress: no research target"
msgstr "Fremgang: Ingen forskning"
-#: client/text.c:475
+#: client/text.c:534
#, fuzzy, c-format
msgid "Progress: %d turn/advance"
msgid_plural "Progress: %d turns/advance"
msgstr[0] "Fremgang: %d runde/fremskritt (%d poeng/runde)"
msgstr[1] "Fremgang: %d runder/fremskritt (%d poeng/runde)"
-#: client/text.c:480
+#: client/text.c:539
#, fuzzy, c-format
msgid "%d bulb/turn"
msgid_plural "%d bulbs/turn"
msgstr[0] "%d runder"
msgstr[1] "%d runder"
-#: client/text.c:485
+#: client/text.c:544
#, c-format
msgid ", %d bulb/turn from team"
msgid_plural ", %d bulbs/turn from team"
msgstr[0] ""
msgstr[1] ""
-#: client/text.c:512
+#: client/text.c:571
#, fuzzy, c-format
msgid "%d/- (never)"
msgstr "(Aldri)"
-#: client/text.c:524
+#: client/text.c:583
#, fuzzy, c-format
msgid "%d/%d (%d turn)"
msgid_plural "%d/%d (%d turns)"
msgstr[0] "%d/%d %d runder"
msgstr[1] "%d/%d %d runder"
-#: client/text.c:527
+#: client/text.c:586
#, fuzzy, c-format
msgid "%d/%d (never)"
msgstr "(Aldri)"
# c-format
-#: client/text.c:564
+#: client/text.c:623
#, fuzzy, c-format
msgid "%d step"
msgid_plural "%d steps"
msgstr[0] "(%d steg)"
msgstr[1] "(%d steg)"
-#: client/text.c:566
+#: client/text.c:625
#, c-format
msgid "%d bulb"
msgid_plural "%d bulbs"
msgstr[0] ""
msgstr[1] ""
-#: client/text.c:570 client/agents/cma_fec.c:269 client/agents/cma_fec.c:313
+#: 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
#, c-format
msgid "%d turn"
@@ -9652,91 +9726,91 @@ msgid_plural "%d turns"
msgstr[0] "%d runder"
msgstr[1] "%d runder"
-#: client/text.c:592
+#: client/text.c:651
#, c-format
msgid "Population: %s"
msgstr "Befolkning: %s"
-#: client/text.c:595
+#: client/text.c:654
#, fuzzy, c-format
msgid "Year: %s (T%d)"
msgstr "År: %s"
-#: client/text.c:598
+#: client/text.c:657
#, fuzzy, c-format
msgid "Gold: %d (%+d)"
msgstr "Gull: %d"
-#: client/text.c:600
+#: client/text.c:659
#, c-format
msgid "Tax: %d Lux: %d Sci: %d"
msgstr "Skatt:%d Luksus:%d Fors:%d"
# problem
-#: client/text.c:607
+#: client/text.c:666
#, fuzzy
msgid "Moving: Nobody"
msgstr "i %s"
# problem
-#: client/text.c:609
+#: client/text.c:668
#, fuzzy, c-format
msgid "Moving: %s"
msgstr "i %s"
-#: client/text.c:613
+#: client/text.c:672
msgid "(Click for more info)"
msgstr ""
-#: client/text.c:629
+#: client/text.c:688
#, fuzzy, c-format
msgid "%s People"
msgstr "%s Velkommen"
-#: client/text.c:633
+#: client/text.c:692
#, fuzzy, c-format
msgid "Turn: %d"
msgstr "Terreng: %s"
-#: client/text.c:635 client/gui-win32/inteldlg.c:111
+#: client/text.c:694 client/gui-win32/inteldlg.c:111
#: client/gui-xaw/inteldlg.c:208
#, c-format
msgid "Gold: %d"
msgstr "Gull: %d"
-#: client/text.c:636
+#: client/text.c:695
#, c-format
msgid "Net Income: %d"
msgstr ""
#. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:639
+#: client/text.c:698
#, fuzzy, c-format
msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
msgstr "Skatt:%d Luksus:%d Fors:%d"
-#: client/text.c:643
+#: client/text.c:702
#, fuzzy, c-format
msgid "Researching %s: %s"
msgstr "Forsker på %s: %d/%d"
-#: client/text.c:650
+#: client/text.c:709
#, c-format
msgid "Global warming chance: %d%% (%+d%%/turn)"
msgstr ""
-#: client/text.c:653
+#: client/text.c:712
#, c-format
msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
msgstr ""
-#: client/text.c:658 client/gui-win32/inteldlg.c:104
+#: client/text.c:717 client/gui-win32/inteldlg.c:104
#: client/gui-xaw/inteldlg.c:200
#, c-format
msgid "Government: %s"
msgstr "Styreform: %s"
-#: client/text.c:682
+#: client/text.c:741
#, fuzzy, c-format
msgid "%d unit"
msgid_plural "%d units"
@@ -9744,58 +9818,58 @@ msgstr[0] " enhet"
msgstr[1] " enhet"
#. TRANS: Impossible to reach goto target tile
-#: client/text.c:715 client/gui-sdl/mapview.c:566
+#: client/text.c:774 client/gui-sdl/mapview.c:566
msgid "?goto:Unreachable"
msgstr ""
-#: client/text.c:717 client/gui-sdl/mapview.c:568
+#: client/text.c:776 client/gui-sdl/mapview.c:568
#, c-format
msgid "Turns to target: %d"
msgstr "Runder til mål: %d"
-#: client/text.c:719 client/gui-sdl/mapview.c:570
+#: client/text.c:778 client/gui-sdl/mapview.c:570
#, fuzzy, c-format
msgid "Turns to target: %d to %d"
msgstr "Runder til mål: %d"
-#: client/text.c:725 client/gui-sdl/mapview.c:576
+#: client/text.c:784 client/gui-sdl/mapview.c:576
#, fuzzy, c-format
msgid "%d unit selected"
msgid_plural "%d units selected"
msgstr[0] "Valg av enheter"
msgstr[1] "Valg av enheter"
-#: client/text.c:730 client/gui-sdl/mapview.c:581
+#: client/text.c:789 client/gui-sdl/mapview.c:581
#, fuzzy
msgid "No units selected."
msgstr "Nasjon valgt"
-#: client/text.c:804 client/gui-sdl/mapview.c:654
+#: client/text.c:863 client/gui-sdl/mapview.c:654
#, c-format
msgid "Others: %d civil; %d military"
msgstr ""
-#: client/text.c:806 client/gui-sdl/mapview.c:656
+#: client/text.c:865 client/gui-sdl/mapview.c:656
#, c-format
msgid "Others: %d civilian"
msgstr ""
-#: client/text.c:808 client/gui-sdl/mapview.c:658
+#: client/text.c:867 client/gui-sdl/mapview.c:658
#, c-format
msgid "Others: %d military"
msgstr ""
-#: client/text.c:839
+#: client/text.c:898
#, fuzzy
msgid "No units to upgrade!"
msgstr "Ingen enheter kunne oppgraderes."
-#: client/text.c:864
+#: client/text.c:923
#, fuzzy
msgid "None of these units may be upgraded."
msgstr "Ingen enheter kunne oppgraderes."
-#: client/text.c:870
+#: client/text.c:929
#, fuzzy, c-format
msgid ""
"Upgrade %d unit for %d gold?\n"
@@ -9810,14 +9884,14 @@ msgstr[1] ""
"Oppgrader %s til %s for %d gull?\n"
"Skattkammeret har %d gull."
-#: client/text.c:891
+#: client/text.c:950
#, fuzzy
msgid "Shows your progress in researching the current technology."
msgstr ""
"Viser fremgangen på det nåværende forskningsprosjektet.\n"
"%s: %d/%d."
-#: client/text.c:897
+#: client/text.c:956
#, fuzzy
msgid "no research target."
msgstr ""
@@ -9825,46 +9899,46 @@ msgstr ""
"(ingen forskning)"
#. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:900
+#: client/text.c:959
#, c-format
msgid "%s: %d/%d."
msgstr ""
-#: client/text.c:920
+#: client/text.c:979
#, fuzzy
msgid "Shows the progress of global warming:"
msgstr ""
"Viser endringen i global oppvarming:\n"
"%d."
-#: client/text.c:921
+#: client/text.c:980
#, fuzzy, c-format
msgid "Pollution rate: %d%%"
msgstr "Forurensning: %3d"
-#: client/text.c:923
+#: client/text.c:982
#, c-format
msgid "Chance of catastrophic warming each turn: %d%%"
msgstr ""
-#: client/text.c:939
+#: client/text.c:998
#, fuzzy
msgid "Shows the progress of nuclear winter:"
msgstr ""
"Viser endringen i atomvinter:\n"
"%d."
-#: client/text.c:940
+#: client/text.c:999
#, fuzzy, c-format
msgid "Fallout rate: %d%%"
msgstr "%s maks nivå: %d%%"
-#: client/text.c:942
+#: client/text.c:1001
#, c-format
msgid "Chance of catastrophic winter each turn: %d%%"
msgstr ""
-#: client/text.c:957
+#: client/text.c:1016
#, fuzzy
msgid "Shows your current government:"
msgstr ""
@@ -9872,25 +9946,25 @@ msgstr ""
"%s."
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:981
+#: client/text.c:1040
#, c-format
msgid "Population: %5d"
msgstr "Befolkning: %5d"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:1043
#, c-format
msgid "Support: %5d %%"
msgstr "Støtte: %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:1047
#, c-format
msgid "Energy: %5d %%"
msgstr "Energi: %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:992
+#: client/text.c:1051
#, c-format
msgid "Mass: %5d ton"
msgid_plural "Mass: %5d tons"
@@ -9898,96 +9972,97 @@ msgstr[0] "Masse: %5d tonn"
msgstr[1] "Masse: %5d tonn"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1057
#, c-format
msgid "Travel time: %5.1f years"
msgstr "Reisetid: %5.1f år"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1061
msgid "Travel time: N/A "
msgstr "Reisetid: N/A "
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1065
#, c-format
msgid "Success prob.: %5d %%"
msgstr "Suksess sanns.: %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1010
+#: client/text.c:1069
#, c-format
msgid "Year of arrival: %8s"
msgstr "Ankomstår: %8s"
-#: client/text.c:1030
+#: client/text.c:1089
msgid "?timeout:off"
msgstr "?timeout:av"
-#: client/text.c:1054
+#: client/text.c:1113
#, c-format
msgid "?seconds:%02ds"
msgstr "?seconds:%02ds"
-#: client/text.c:1056
+#: client/text.c:1115
#, c-format
msgid "?mins/secs:%02dm %02ds"
msgstr "?mins/secs:%02dm %02ds"
-#: client/text.c:1058
+#: client/text.c:1117
#, c-format
msgid "?hrs/mns:%02dh %02dm"
msgstr "?hrs/mns:%02dt %02dm"
-#: client/text.c:1060
+#: client/text.c:1119
#, c-format
msgid "?dys/hrs:%02dd %02dh"
msgstr "?dys/hrs:%02dd %02dt"
-#: client/text.c:1063
+#: client/text.c:1122
msgid "?duration:overflow"
msgstr "?duration:overflod"
-#: client/text.c:1084
+#: client/text.c:1143
#, c-format
msgid "%6d.%02d ms"
msgstr "%6d.%02d ms"
-#. TRANS: "Republic of the Poles"
-#: client/text.c:1127
-#, c-format
-msgid "%s of the %s"
-msgstr "Styresett: %s Nasjon: %s"
+#. TRANS: <nation adjective> <government name>.
+#. * E.g. "Polish Republic".
+#: client/text.c:1188
+#, fuzzy, c-format
+msgid "?nationgovernment:%s %s"
+msgstr "Styreform: %s"
#. TRANS: "Observer: 1985"
-#: client/text.c:1137
+#: client/text.c:1198
#, fuzzy, c-format
msgid "Observer: %s"
msgstr "Observatør"
-#: client/text.c:1155
+#: client/text.c:1216
msgid "Buildings: "
msgstr "Bygninger:"
-#: client/text.c:1172 client/text.c:1211
+#: client/text.c:1233 client/text.c:1272
msgid "None. "
msgstr "Ingen. "
-#: client/text.c:1174 client/text.c:1213
+#: client/text.c:1235 client/text.c:1274
msgid "?clistend:."
msgstr "."
-#: client/text.c:1192
+#: client/text.c:1253
msgid "Wonders: "
msgstr "Underverk: "
-#: client/text.c:1247
+#: client/text.c:1308
#, 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:1251
+#: client/text.c:1312
#, fuzzy, c-format
msgid "%d content before penalty."
msgid_plural "%d content before penalty."
@@ -9995,45 +10070,45 @@ msgstr[0] "%d forn
msgstr[1] "%d fornøyd før straff med "
#. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1257
+#: client/text.c:1318
#, fuzzy, c-format
msgid "%d additional unhappy citizen."
msgid_plural "%d additional unhappy citizens."
msgstr[0] "%d ulykkelige innbyggere."
msgstr[1] "%d ulykkelige innbyggere."
-#. TRANS: Martial law opening parenthesis
-#: client/text.c:1279
-msgid "Martial law in effect ("
+#: client/text.c:1339
+#, fuzzy
+msgid "Unlimited martial law in effect."
msgstr "Unntakstilstand ("
-#. TRANS: no [unit] maximum
-#: client/text.c:1284
-msgid "no maximum, "
-msgstr "ingen maksimum, "
-
-#: client/text.c:1287
-#, c-format
-msgid "%d unit maximum, "
-msgid_plural "%d units maximum, "
-msgstr[0] "%d enhet maksimalt, "
-msgstr[1] "%d enhet maksimalt, "
+#: client/text.c:1341
+#, fuzzy, c-format
+msgid "%d military unit may impose martial law."
+msgid_plural "Up to %d military units may impose martial law."
+msgstr[0] ""
+"* En ikke-militær enhet (kan ikke angripe; ingen unntakstilstand).\n"
+msgstr[1] ""
+"* En ikke-militær enhet (kan ikke angripe; ingen unntakstilstand).\n"
-#. TRANS: Martial law closing parenthesis
-#: client/text.c:1294
-#, c-format
-msgid "%d per unit). "
-msgstr "%d per enhet)."
+#: client/text.c:1345
+#, fuzzy, c-format
+msgid "Each military unit makes %d unhappy citizen content."
+msgid_plural "Each military unit makes %d unhappy citizens content."
+msgstr[0] ""
+"Underholder borgerne i en by, ved å gjøre 3 ulykkelige borgere fornøyd."
+msgstr[1] ""
+"Underholder borgerne i en by, ved å gjøre 3 ulykkelige borgere fornøyd."
-#: client/text.c:1298
+#: client/text.c:1352
msgid "Military units in the field may cause unhappiness. "
msgstr "Militære enheter i felten kan føre til ulykkelighet. "
-#: client/text.c:1301
+#: client/text.c:1355
msgid "Military units have no happiness effect. "
msgstr "Militære enheter har ingen innvirkning på lykkeligheten."
-#: client/text.c:1316
+#: client/text.c:1370
#, c-format
msgid "Luxury: %d total."
msgstr "Luksus: %d totalt"
@@ -10057,7 +10132,7 @@ msgstr ""
"Klienten støtter ikke grafikkoppsett sett ovenfra. Benytter standard grafikk "
"i stedet."
-#: client/tilespec.c:3968
+#: client/tilespec.c:3966
#, fuzzy, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
@@ -10082,12 +10157,12 @@ msgid ""
"have a look."
msgstr ""
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
-#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:599
+#: client/gui-gtk-2.0/cityrep.c:624 client/gui-sdl/citydlg.c:2009
msgid "none"
msgstr "ingen"
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:645
msgid "custom"
msgstr "egendefinert"
@@ -10397,7 +10472,7 @@ msgstr "Etabler handelsru_te"
msgid "Enter Marketplace"
msgstr "besøk markedsplass"
-#: client/gui-gtk-2.0/chatline.c:144 client/gui-win32/chatline.c:134
+#: client/gui-gtk-2.0/chatline.c:218 client/gui-win32/chatline.c:134
#: client/gui-xaw/chatline.c:120
msgid "Cleared output window."
msgstr "Renset utskriftsvindu."
@@ -10478,11 +10553,11 @@ msgid "%d/%d %d turns"
msgstr "%d/%d %d runder"
#: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:821
+#: client/gui-gtk-2.0/cityrep.c:1027
msgid "_Buy"
msgstr "_Kjøp"
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:869
#, fuzzy
msgid "_Production"
msgstr "_Produksjon"
@@ -10505,12 +10580,12 @@ msgid "Entertainers"
msgstr "Underholdere"
#: client/gui-gtk-2.0/citydlg.c:1029 client/gui-win32/citydlg.c:1989
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2403
msgid "Scientists"
msgstr "Forskere"
#: client/gui-gtk-2.0/citydlg.c:1030 client/gui-win32/citydlg.c:1991
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2404
msgid "Taxmen"
msgstr "Skattefuter"
@@ -10605,7 +10680,7 @@ msgstr "St
msgid "Present units %d"
msgstr "Enheter tilstede %d"
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:1019
msgid "Cen_ter"
msgstr "Sen_trer"
@@ -10694,32 +10769,62 @@ msgstr "Omd
msgid "What should we rename the city to?"
msgstr "Hva skal vi omdøpe byen til?"
-#: client/gui-gtk-2.0/cityrep.c:699
+#: client/gui-gtk-2.0/cityrep.c:794
+#, fuzzy
+msgid "(no worklists defined)"
+msgstr "(arbeidsliste)"
+
+#: client/gui-gtk-2.0/cityrep.c:876
msgid "Chan_ge"
msgstr "_Endre"
-#: client/gui-gtk-2.0/cityrep.c:703
+#: client/gui-gtk-2.0/cityrep.c:880
msgid "Add _First"
msgstr "_Legg til forhåndsvalg"
-#: client/gui-gtk-2.0/cityrep.c:707
+#: client/gui-gtk-2.0/cityrep.c:884
msgid "Add _Next"
msgstr "_Legg til forhåndsvalg"
-#: client/gui-gtk-2.0/cityrep.c:711
+#: client/gui-gtk-2.0/cityrep.c:888
+#, fuzzy
+msgid "Add _2nd Last"
+msgstr "_Legg til forhåndsvalg"
+
+#: client/gui-gtk-2.0/cityrep.c:892
msgid "Add _Last"
msgstr "_Legg til forhåndsvalg"
-#: client/gui-gtk-2.0/cityrep.c:715
+#: client/gui-gtk-2.0/cityrep.c:899
+#, fuzzy
+msgid "Set Worklist"
+msgstr "Arbeidsliste"
+
+#: client/gui-gtk-2.0/cityrep.c:905
+#, fuzzy
+msgid "Append Worklist"
+msgstr "Omdøp arbeidsliste"
+
+#: client/gui-gtk-2.0/cityrep.c:911
+#, fuzzy
+msgid "Clear _Worklist"
+msgstr "_Mål arbeidsliste:"
+
+#: client/gui-gtk-2.0/cityrep.c:916
+#, fuzzy
+msgid "Gover_nor"
+msgstr "Sysselmann"
+
+#: client/gui-gtk-2.0/cityrep.c:921
msgid "_Select"
msgstr "_Velg"
-#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
+#: client/gui-gtk-2.0/cityrep.c:925 client/gui-gtk-2.0/plrdlg.c:521
#, fuzzy
msgid "_Display"
msgstr "V_is"
-#: client/gui-gtk-2.0/cityrep.c:800 client/gui-gtk-2.0/menu.c:808
+#: 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-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
#: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -10729,101 +10834,101 @@ msgstr "V_is"
msgid "Cities"
msgstr "Byer"
-#: client/gui-gtk-2.0/cityrep.c:817
+#: client/gui-gtk-2.0/cityrep.c:1023
#, fuzzy
msgid "_Inspect"
msgstr "Vis _By"
-#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
-#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-sdl/helpdlg.c:297 client/gui-win32/menu.c:342
-#: client/gui-xaw/menu.c:241
+#: 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
+#: client/gui-gtk-2.0/cityrep.c:1518 client/gui-gtk-2.0/menu.c:823
+#: client/gui-gtk-2.0/menu.c:825 client/gui-gtk-2.0/menu.c:827
+#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:831
+#: client/gui-gtk-2.0/menu.c:833 client/gui-sdl/helpdlg.c:297
+#: client/gui-win32/menu.c:342 client/gui-xaw/menu.c:241
msgid "Improvements"
msgstr "Forbedringer"
-#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
-#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
-#: client/gui-xaw/menu.c:247
+#: client/gui-gtk-2.0/cityrep.c:1441 client/gui-gtk-2.0/cityrep.c:1460
+#: client/gui-gtk-2.0/cityrep.c:1479 client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1522 client/gui-xaw/menu.c:247
msgid "Wonders"
msgstr "Underverk"
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1662 client/gui-win32/cityrep.c:439
#: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
msgid "All Cities"
msgstr "Alle byer"
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1667 client/gui-win32/cityrep.c:440
msgid "No Cities"
msgstr "Ingen byer"
-#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1672 client/gui-win32/cityrep.c:441
msgid "Invert Selection"
msgstr "Snu valg"
-#: client/gui-gtk-2.0/cityrep.c:1420
+#: client/gui-gtk-2.0/cityrep.c:1682
msgid "Building Units"
msgstr "Bygger enheter"
-#: client/gui-gtk-2.0/cityrep.c:1426
+#: client/gui-gtk-2.0/cityrep.c:1688
msgid "Building Improvements"
msgstr "Bygger byforbedringer"
-#: client/gui-gtk-2.0/cityrep.c:1432
+#: client/gui-gtk-2.0/cityrep.c:1694
msgid "Building Wonders"
msgstr "Bygger underverk"
-#: client/gui-gtk-2.0/cityrep.c:1444
+#: client/gui-gtk-2.0/cityrep.c:1706
msgid "Building Unit"
msgstr "Bygger enhet"
-#: client/gui-gtk-2.0/cityrep.c:1448
+#: client/gui-gtk-2.0/cityrep.c:1710
msgid "Building Improvement"
msgstr "Bygger byforbedring"
-#: client/gui-gtk-2.0/cityrep.c:1452
+#: client/gui-gtk-2.0/cityrep.c:1714
msgid "Building Wonder"
msgstr "Bygger underverk"
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1722 client/gui-win32/cityrep.c:443
msgid "Coastal Cities"
msgstr "Byer ved kysten"
-#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1727 client/gui-win32/cityrep.c:444
msgid "Same Island"
msgstr "Samme øy"
-#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1737 client/gui-win32/cityrep.c:447
msgid "Supported Units"
msgstr "Støttede enheter"
-#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1740 client/gui-win32/cityrep.c:454
msgid "Units Present"
msgstr "Enheter tilstede"
-#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1744 client/gui-win32/cityrep.c:469
msgid "Improvements in City"
msgstr "Forbedringer i by"
-#: client/gui-gtk-2.0/cityrep.c:1486
+#: client/gui-gtk-2.0/cityrep.c:1748
msgid "Wonders in City"
msgstr "Underverk i byen"
-#: client/gui-gtk-2.0/cityrep.c:1495
+#: client/gui-gtk-2.0/cityrep.c:1757
msgid "Available Units"
msgstr "Tilgjengelige enheter"
-#: client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1760
msgid "Available Improvements"
msgstr "Tilgjengelige Forbedringer"
-#: client/gui-gtk-2.0/cityrep.c:1501
+#: client/gui-gtk-2.0/cityrep.c:1763
msgid "Available Wonders"
msgstr "Tilgjengelige underverker"
-#: client/gui-gtk-2.0/cityrep.c:1625
+#: client/gui-gtk-2.0/cityrep.c:1882
#, fuzzy, c-format
msgid "Total Buy Cost: %d"
msgstr "Total kostnad:"
@@ -10896,12 +11001,12 @@ 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:186
+#: client/gui-gtk-2.0/dialogs.c:196 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:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
#, fuzzy
msgid "Inspect _City"
msgstr "_Vis by"
@@ -10930,10 +11035,10 @@ msgstr "Velg hva som skal plyndres:"
msgid "Unit"
msgstr "Enhet"
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
-#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
-#: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
-#: manual/civmanual.c:302 data/Freeciv.in:80
+#: 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-win32/plrdlg.c:335 manual/civmanual.c:302 data/Freeciv.in:80
msgid "Name"
msgstr "Navn"
@@ -10959,7 +11064,7 @@ 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:1036 data/Freeciv.in:3371
+#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
#, fuzzy
msgid "Pick Nation"
msgstr "Politistasjon"
@@ -11042,7 +11147,7 @@ msgstr "_Kart"
msgid "_Advances"
msgstr "_Fremskritt"
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:910
+#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr "_Byer"
@@ -11147,108 +11252,178 @@ msgstr "Velg destinasjon"
msgid "Show _All Cities"
msgstr "Vis _alle byer"
-#: client/gui-gtk-2.0/gui_main.c:150
+#: client/gui-gtk-2.0/gui_main.c:162
msgid "Show Map Scrollbars"
msgstr "Vis scrollbar på kart"
-#: client/gui-gtk-2.0/gui_main.c:151
+#: client/gui-gtk-2.0/gui_main.c:163
msgid "Disable this option to hide the scrollbars on the map view."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:155
+#: client/gui-gtk-2.0/gui_main.c:167
msgid "Keyboardless goto"
msgstr "Tastaturløs gå-til"
-#: client/gui-gtk-2.0/gui_main.c:156
+#: client/gui-gtk-2.0/gui_main.c:168
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:161
+#: client/gui-gtk-2.0/gui_main.c:173
msgid "Keep dialogs on top"
msgstr "Hold dialoger øverst"
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:174
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:166
+#: client/gui-gtk-2.0/gui_main.c:178
msgid "Show worklist task icons"
msgstr "Vis arbeidsliste ikoner"
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:179
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:171
+#: client/gui-gtk-2.0/gui_main.c:183
msgid "Enable status report tabs"
msgstr "Gjør statusrapportark tilgjengelig"
-#: client/gui-gtk-2.0/gui_main.c:172
+#: client/gui-gtk-2.0/gui_main.c:184
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:177 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:189 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:178 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:190 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:277 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:195
+msgid "Show time for each chat message"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:196
+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
+msgid "Split bottom notebook area"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:202
+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
+msgid "New message events go to top of list"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:208
+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
+msgid "Show extra message window buttons"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:214
+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 "
+"is disabled, these buttons will not appear (you can still double-click with "
+"the left mouse button or right-click on a row to inspect or goto "
+"respectively). This option will only take effect once the message window is "
+"closed and reopened."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:224
+#, fuzzy
+msgid "Metaserver tab first in network page"
+msgstr "Metaserver emne-streng satt til '%s'."
+
+#: client/gui-gtk-2.0/gui_main.c:225
+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
+msgid "Plain chat messages are sent to allies only"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:231
+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 "
+"messages will be sent as public chat messages. To send a public chat message "
+"with this option enabled, prefix the message with a single colon ':'. This "
+"option can also be set using a toggle button beside the chat entry (only "
+"visible in multiplayer games)."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:340 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:723 client/gui-gtk-2.0/gui_main.c:1345
+#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
msgid "Freeciv"
msgstr "Freeciv"
-#: client/gui-gtk-2.0/gui_main.c:1088 client/gui-gtk-2.0/gui_main.c:1095
+#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
#: 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:1095 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1232 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:1127 client/gui-gtk-2.0/menu.c:770
-#: client/gui-gtk-2.0/menu.c:772 client/gui-gtk-2.0/menu.c:774
-#: client/gui-gtk-2.0/menu.c:776 client/gui-gtk-2.0/menu.c:778
-#: client/gui-gtk-2.0/menu.c:780 client/gui-gtk-2.0/menu.c:782
-#: client/gui-gtk-2.0/menu.c:784 client/gui-gtk-2.0/menu.c:786
-#: client/gui-gtk-2.0/menu.c:788 client/gui-gtk-2.0/menu.c:790
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-gtk-2.0/menu.c:804 client/gui-gtk-2.0/menu.c:806
-#: client/gui-gtk-2.0/menu.c:808 client/gui-gtk-2.0/menu.c:810
-#: client/gui-gtk-2.0/menu.c:812 client/gui-gtk-2.0/menu.c:814
-#: client/gui-gtk-2.0/menu.c:816 client/gui-gtk-2.0/menu.c:818
-#: client/gui-gtk-2.0/menu.c:820 client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/gui_main.c:1266 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
+#: client/gui-gtk-2.0/menu.c:811 client/gui-gtk-2.0/menu.c:813
+#: client/gui-gtk-2.0/menu.c:815 client/gui-gtk-2.0/menu.c:817
+#: client/gui-gtk-2.0/menu.c:819 client/gui-gtk-2.0/menu.c:821
+#: client/gui-gtk-2.0/menu.c:823 client/gui-gtk-2.0/menu.c:825
+#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
+#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
+#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
+#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
+#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
+#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
#: data/Freeciv.in:2028
msgid "View"
msgstr "Kartvindu"
-#: client/gui-gtk-2.0/gui_main.c:1208
+#: client/gui-gtk-2.0/gui_main.c:1359
msgid "Chat"
msgstr "Beskjeder"
-#: client/gui-gtk-2.0/gui_main.c:1224 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1377 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"
@@ -11262,80 +11437,84 @@ 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:1491
+#: client/gui-gtk-2.0/gui_main.c:1392
+msgid "Allies Only"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:1657
msgid "Not _ready"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
+#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
#, fuzzy
msgid "_Ready"
msgstr "_Klargjør alle"
-#: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2132
+#: 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
msgid "_Start"
msgstr "_Start"
-#: client/gui-gtk-2.0/gui_main.c:1520
+#: client/gui-gtk-2.0/gui_main.c:1686
#, fuzzy
msgid "_Take Player"
msgstr "Byer"
-#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
+#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
#, fuzzy
msgid "Pick _Nation"
msgstr "Politistasjon"
-#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
+#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
#, fuzzy
msgid "_Observe"
msgstr "_Observatør"
-#: client/gui-gtk-2.0/gui_main.c:1532
+#: client/gui-gtk-2.0/gui_main.c:1698
#, fuzzy
msgid "Do not _observe"
msgstr "_observerer nå"
-#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
#, fuzzy
msgid "<AI>"
msgstr "AI"
-#: client/gui-gtk-2.0/gui_main.c:1557
+#: client/gui-gtk-2.0/gui_main.c:1723
msgid "<Novice AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1560
+#: client/gui-gtk-2.0/gui_main.c:1726
#, fuzzy
msgid "<Easy AI>"
msgstr "AI"
-#: client/gui-gtk-2.0/gui_main.c:1563
+#: client/gui-gtk-2.0/gui_main.c:1729
msgid "<Normal AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1732
#, fuzzy
msgid "<Hard AI>"
msgstr "AI"
-#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1742 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:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
#, fuzzy
msgid "Observer"
msgstr "Observatør"
-#: client/gui-gtk-2.0/gui_main.c:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
#, fuzzy
msgid "Detached"
msgstr "Død"
-#: client/gui-gtk-2.0/gui_main.c:1899
+#: client/gui-gtk-2.0/gui_main.c:2073
msgid "Are you sure you want to quit?"
msgstr "Er du sikker på at du vil avslutte?"
@@ -11568,56 +11747,56 @@ msgstr "_Teknologier"
msgid "Foreign Intelligence: %s Empire"
msgstr "Etterretningsrapport for %s"
-#: client/gui-gtk-2.0/mapctrl.c:195 client/gui-sdl/mapctrl.c:2565
+#: client/gui-gtk-2.0/mapctrl.c:179 client/gui-sdl/mapctrl.c:2565
#: client/gui-sdl/menu.c:839 client/gui-sdl/menu.c:1021
#: client/gui-win32/mapctrl.c:353
msgid "Build New City"
msgstr "Bygg ny by"
-#: client/gui-gtk-2.0/mapctrl.c:196 client/gui-sdl/mapctrl.c:2594
+#: client/gui-gtk-2.0/mapctrl.c:180 client/gui-sdl/mapctrl.c:2594
#: client/gui-win32/mapctrl.c:354 client/gui-xaw/mapctrl.c:89
msgid "What should we call our new city?"
msgstr "Hva skal vi kalle vår nye by?"
-#: client/gui-gtk-2.0/mapview.c:147
+#: client/gui-gtk-2.0/mapview.c:158
msgid "Shows your current luxury/science/tax rates;click to toggle them."
msgstr "Viser de nåværende luksus/forskning/skatt nivåene; klikk for å ende."
-#: client/gui-gtk-2.0/mapview.c:692 client/gui-win32/canvas.c:275
+#: client/gui-gtk-2.0/mapview.c:702 client/gui-win32/canvas.c:275
msgid "Better fog will only work in truecolor. Disabling it"
msgstr "Forbedret krigståke vil kun fungere med 'True Color'. Deaktiverer det."
-#: client/gui-gtk-2.0/menu.c:250
+#: client/gui-gtk-2.0/menu.c:256
msgid "Leaving a local game will end it!"
msgstr "Spillet vil bli avsluttet dersom man forlater det!"
-#: client/gui-gtk-2.0/menu.c:700 client/gui-win32/menu.c:303
+#: client/gui-gtk-2.0/menu.c:727 client/gui-win32/menu.c:303
msgid "_Game"
msgstr "_Spill"
-#: client/gui-gtk-2.0/menu.c:702 client/gui-gtk-2.0/menu.c:704
-#: client/gui-gtk-2.0/menu.c:706 client/gui-gtk-2.0/menu.c:708
-#: client/gui-gtk-2.0/menu.c:710 client/gui-gtk-2.0/menu.c:712
-#: client/gui-gtk-2.0/menu.c:714 client/gui-gtk-2.0/menu.c:717
-#: client/gui-gtk-2.0/menu.c:720 client/gui-gtk-2.0/menu.c:722
-#: client/gui-gtk-2.0/menu.c:724 client/gui-gtk-2.0/menu.c:726
-#: client/gui-gtk-2.0/menu.c:728 client/gui-gtk-2.0/menu.c:730
-#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:736
-#: client/gui-gtk-2.0/menu.c:738 client/gui-gtk-2.0/menu.c:740
+#: client/gui-gtk-2.0/menu.c:729 client/gui-gtk-2.0/menu.c:731
+#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:735
+#: client/gui-gtk-2.0/menu.c:737 client/gui-gtk-2.0/menu.c:739
+#: client/gui-gtk-2.0/menu.c:741 client/gui-gtk-2.0/menu.c:744
+#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
+#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
+#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
+#: client/gui-gtk-2.0/menu.c:760 client/gui-gtk-2.0/menu.c:763
+#: client/gui-gtk-2.0/menu.c:765 client/gui-gtk-2.0/menu.c:767
#: data/Freeciv.in:2026
msgid "Game"
msgstr "Spill"
-#: client/gui-gtk-2.0/menu.c:704 client/gui-gtk-2.0/menu.c:706
-#: client/gui-gtk-2.0/menu.c:708
+#: client/gui-gtk-2.0/menu.c:731 client/gui-gtk-2.0/menu.c:733
+#: client/gui-gtk-2.0/menu.c:735
msgid "_Chat"
msgstr "_Beskjeder"
-#: client/gui-gtk-2.0/menu.c:706 client/gui-win32/menu.c:314
+#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:314
msgid "_Clear Log"
msgstr "_Rens logg"
-#: client/gui-gtk-2.0/menu.c:708 client/gui-win32/menu.c:313
+#: client/gui-gtk-2.0/menu.c:735 client/gui-win32/menu.c:313
#, fuzzy
msgid "_Write Log"
msgstr "Eksporter _logg"
@@ -11628,425 +11807,461 @@ msgstr "Eksporter _logg"
# in the gtk gui (menu-init) which is also noted in the
# german translation.#
# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-#: client/gui-gtk-2.0/menu.c:710 client/gui-win32/menu.c:304
+#: client/gui-gtk-2.0/menu.c:737 client/gui-win32/menu.c:304
msgid "Local _Options"
msgstr "Lokale _alternativ"
-#: client/gui-gtk-2.0/menu.c:712 client/gui-win32/menu.c:305
+#: client/gui-gtk-2.0/menu.c:739 client/gui-win32/menu.c:305
msgid "_Message Options"
msgstr "_Beskjedinnstillinger"
-#: client/gui-gtk-2.0/menu.c:717
+#: client/gui-gtk-2.0/menu.c:744
#, fuzzy
msgid "_Reload Tileset"
msgstr "Grafikkoppsett"
-#: client/gui-gtk-2.0/menu.c:720
+#: client/gui-gtk-2.0/menu.c:747
#, fuzzy
msgid "Save Options on _Exit"
msgstr "Serveralternativ (pågående)"
-#: client/gui-gtk-2.0/menu.c:722
+#: client/gui-gtk-2.0/menu.c:749
#, fuzzy
msgid "Sa_ve Options"
msgstr "Spill-innstillinger"
-#: client/gui-gtk-2.0/menu.c:726 client/gui-win32/menu.c:308
+#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:308
msgid "Server O_ptions"
msgstr "Vis ser_veralternativ"
-#: client/gui-gtk-2.0/menu.c:730 client/gui-win32/menu.c:310
+#: client/gui-gtk-2.0/menu.c:757 client/gui-win32/menu.c:310
msgid "_Save Game"
msgstr "_Lagre spill"
-#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:311
+#: client/gui-gtk-2.0/menu.c:760 client/gui-win32/menu.c:311
msgid "Save Game _As..."
msgstr "Lagre spill _som..."
-#: client/gui-gtk-2.0/menu.c:738
+#: client/gui-gtk-2.0/menu.c:765
#, fuzzy
msgid "_Leave"
msgstr "Forlat _spillet"
-#: client/gui-gtk-2.0/menu.c:740 client/gui-win32/menu.c:317
+#: client/gui-gtk-2.0/menu.c:767 client/gui-win32/menu.c:317
msgid "_Quit"
msgstr "_Avslutt"
-#: client/gui-gtk-2.0/menu.c:745 client/gui-win32/menu.c:321
+#: client/gui-gtk-2.0/menu.c:772 client/gui-win32/menu.c:321
msgid "Gov_ernment"
msgstr "_Styreform"
-#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
-#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
-#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:774 client/gui-gtk-2.0/menu.c:776
+#: client/gui-gtk-2.0/menu.c:778 client/gui-gtk-2.0/menu.c:780
+#: client/gui-gtk-2.0/menu.c:782 client/gui-gtk-2.0/menu.c:784
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
#: client/gui-xaw/menu.c:248 data/Freeciv.in:2027 data/helpdata.txt:1320
msgid "Government"
msgstr "Styreform"
-#: client/gui-gtk-2.0/menu.c:749 client/gui-win32/menu.c:322
+#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:322
msgid "_Tax Rates"
msgstr "_Skattenivå"
-#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:324
+#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:324
msgid "_Find City"
msgstr "_Finn by"
-#: client/gui-gtk-2.0/menu.c:755 client/gui-win32/menu.c:325
+#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:325
msgid "_Worklists"
msgstr "_Arbeidslister"
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
-#: client/gui-gtk-2.0/menu.c:764 client/gui-win32/menu.c:327
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
+#: client/gui-gtk-2.0/menu.c:791 client/gui-win32/menu.c:327
msgid "_Change Government"
msgstr "_Endre styreform"
-#: client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:788
msgid "_Revolution..."
msgstr "_Revolusjon..."
-#: client/gui-gtk-2.0/menu.c:764 client/gui-gtk-2.0/menu.c:970
+#: client/gui-gtk-2.0/menu.c:791 client/gui-gtk-2.0/menu.c:1013
#: client/gui-win32/menu.c:431
msgid "_Government"
msgstr "St_yreform"
-#: client/gui-gtk-2.0/menu.c:768 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:795 client/gui-gtk-2.0/menu.c:959
#: client/gui-win32/menu.c:334
msgid "_View"
msgstr "Kart_vindu"
-#: client/gui-gtk-2.0/menu.c:772
+#: client/gui-gtk-2.0/menu.c:799
#, fuzzy
msgid "City Outlines"
msgstr "Bytilpassning"
-#: client/gui-gtk-2.0/menu.c:774 client/gui-win32/menu.c:335
+#: client/gui-gtk-2.0/menu.c:801 client/gui-win32/menu.c:335
msgid "Map _Grid"
msgstr "Kartr_uter"
-#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:336
+#: client/gui-gtk-2.0/menu.c:803 client/gui-win32/menu.c:336
msgid "National _Borders"
msgstr "Nasjonale _Grenser"
-#: client/gui-gtk-2.0/menu.c:778 client/gui-win32/menu.c:337
+#: client/gui-gtk-2.0/menu.c:805 client/gui-win32/menu.c:337
msgid "City _Names"
msgstr "By_navn"
-#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:338
+#: client/gui-gtk-2.0/menu.c:807 client/gui-win32/menu.c:338
msgid "City G_rowth"
msgstr "By_vekst"
-#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:339
+#: client/gui-gtk-2.0/menu.c:809 client/gui-win32/menu.c:339
msgid "City _Productions"
msgstr "By_produksjon"
-#: client/gui-gtk-2.0/menu.c:784 client/gui-sdl/optiondlg.c:1719
+#: client/gui-gtk-2.0/menu.c:811
+#, fuzzy
+msgid "City Buy Cost"
+msgstr "Total kostnad:"
+
+#: client/gui-gtk-2.0/menu.c:813
+#, fuzzy
+msgid "City Traderoutes"
+msgstr "Handelsruter"
+
+#: client/gui-gtk-2.0/menu.c:815 client/gui-sdl/optiondlg.c:1719
msgid "Draw city worker map grid"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:788 client/gui-sdl/optiondlg.c:1635
+#: client/gui-gtk-2.0/menu.c:819 client/gui-sdl/optiondlg.c:1635
#: client/gui-win32/menu.c:340 client/gui-xaw/menu.c:148
#: client/gui-xaw/menu.c:246 manual/civmanual.c:220 data/helpdata.txt:1220
msgid "Terrain"
msgstr "Terreng"
-#: client/gui-gtk-2.0/menu.c:790 client/gui-win32/menu.c:341
+#: client/gui-gtk-2.0/menu.c:821 client/gui-win32/menu.c:341
#: client/gui-xaw/menu.c:149
msgid "Coastline"
msgstr "Kystlinje"
-#: client/gui-gtk-2.0/menu.c:796 client/gui-win32/menu.c:343
+#: client/gui-gtk-2.0/menu.c:827 client/gui-win32/menu.c:343
msgid "Roads & Rails"
msgstr "Veier & Togskinner"
-#: client/gui-gtk-2.0/menu.c:800 client/gui-sdl/optiondlg.c:1933
+#: client/gui-gtk-2.0/menu.c:831 client/gui-sdl/optiondlg.c:1933
#: client/gui-win32/menu.c:345 client/gui-xaw/menu.c:152
msgid "Mines"
msgstr "Gruver"
-#: client/gui-gtk-2.0/menu.c:802 client/gui-win32/menu.c:346
+#: client/gui-gtk-2.0/menu.c:833 client/gui-win32/menu.c:346
msgid "Fortress & Airbase"
msgstr "Festning & Flybase"
-#: client/gui-gtk-2.0/menu.c:804 client/gui-win32/menu.c:348
+#: client/gui-gtk-2.0/menu.c:835 client/gui-win32/menu.c:348
#: client/gui-xaw/menu.c:154
msgid "Specials"
msgstr "Spesielle"
-#: client/gui-gtk-2.0/menu.c:806 client/gui-win32/menu.c:349
+#: client/gui-gtk-2.0/menu.c:837 client/gui-win32/menu.c:349
#: client/gui-xaw/menu.c:155
msgid "Pollution & Fallout"
msgstr "Forurensning & Atomavfall"
-#: client/gui-gtk-2.0/menu.c:812 client/gui-win32/menu.c:352
+#: client/gui-gtk-2.0/menu.c:843 client/gui-win32/menu.c:352
#: client/gui-xaw/menu.c:158
msgid "Focus Unit"
msgstr "Fokus på enhet"
-#: client/gui-gtk-2.0/menu.c:814 client/gui-sdl/optiondlg.c:1854
+#: client/gui-gtk-2.0/menu.c:845 client/gui-sdl/optiondlg.c:1854
#: client/gui-win32/menu.c:353 client/gui-xaw/menu.c:159
msgid "Fog of War"
msgstr "Krigståke"
-#: client/gui-gtk-2.0/menu.c:818
+#: client/gui-gtk-2.0/menu.c:849
#, fuzzy
msgid "_Full Screen"
msgstr "Fullskjerm vindu"
-#: client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/menu.c:853
msgid "_Center View"
msgstr "Sentrer _Kartvindu"
-#: client/gui-gtk-2.0/menu.c:825 client/gui-win32/menu.c:358
+#: client/gui-gtk-2.0/menu.c:856 client/gui-win32/menu.c:358
msgid "_Orders"
msgstr "_Ordrer"
-#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
-#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
-#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
-#: client/gui-gtk-2.0/menu.c:855 client/gui-gtk-2.0/menu.c:857
-#: client/gui-gtk-2.0/menu.c:859 client/gui-gtk-2.0/menu.c:861
-#: client/gui-gtk-2.0/menu.c:863 client/gui-gtk-2.0/menu.c:865
-#: client/gui-gtk-2.0/menu.c:867 client/gui-gtk-2.0/menu.c:869
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875 client/gui-gtk-2.0/menu.c:877
-#: client/gui-gtk-2.0/menu.c:879 client/gui-gtk-2.0/menu.c:881
-#: client/gui-gtk-2.0/menu.c:883 client/gui-gtk-2.0/menu.c:885
-#: client/gui-gtk-2.0/menu.c:887 client/gui-gtk-2.0/menu.c:889
-#: client/gui-gtk-2.0/menu.c:891 client/gui-gtk-2.0/menu.c:893
-#: client/gui-gtk-2.0/menu.c:895 client/gui-gtk-2.0/menu.c:897
-#: client/gui-gtk-2.0/menu.c:899 client/gui-gtk-2.0/menu.c:901
-#: client/gui-gtk-2.0/menu.c:903 data/Freeciv.in:2029
+#: client/gui-gtk-2.0/menu.c:858 client/gui-gtk-2.0/menu.c:860
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:864
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:868
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:872
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:876
+#: client/gui-gtk-2.0/menu.c:878 client/gui-gtk-2.0/menu.c:880
+#: client/gui-gtk-2.0/menu.c:882 client/gui-gtk-2.0/menu.c:884
+#: client/gui-gtk-2.0/menu.c:886 client/gui-gtk-2.0/menu.c:888
+#: client/gui-gtk-2.0/menu.c:890 client/gui-gtk-2.0/menu.c:892
+#: client/gui-gtk-2.0/menu.c:894 client/gui-gtk-2.0/menu.c:896
+#: client/gui-gtk-2.0/menu.c:898 client/gui-gtk-2.0/menu.c:900
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906 client/gui-gtk-2.0/menu.c:908
+#: client/gui-gtk-2.0/menu.c:910 client/gui-gtk-2.0/menu.c:912
+#: client/gui-gtk-2.0/menu.c:914 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:918 client/gui-gtk-2.0/menu.c:920
+#: client/gui-gtk-2.0/menu.c:922 client/gui-gtk-2.0/menu.c:924
+#: client/gui-gtk-2.0/menu.c:926 client/gui-gtk-2.0/menu.c:928
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
+#: client/gui-gtk-2.0/menu.c:946 data/Freeciv.in:2029
msgid "Orders"
msgstr "Ordrer"
-#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:1444
+#: client/gui-gtk-2.0/menu.c:860 client/gui-gtk-2.0/menu.c:1489
#: client/gui-win32/menu.c:359
msgid "_Build City"
msgstr "_Bygg by"
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:1466
-#: client/gui-gtk-2.0/menu.c:1472 client/gui-win32/menu.c:360
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:1511
+#: client/gui-gtk-2.0/menu.c:1517 client/gui-win32/menu.c:360
msgid "Build _Road"
msgstr "Bygg _vei"
-#: client/gui-gtk-2.0/menu.c:833 client/gui-gtk-2.0/menu.c:1360
+#: 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 "Lag kunstig vann_ing"
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:1361
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:1406
#: client/gui-win32/menu.c:362
msgid "Build _Mine"
msgstr "Bygg gr_uve"
-#: client/gui-gtk-2.0/menu.c:837 client/gui-gtk-2.0/menu.c:1362
+#: client/gui-gtk-2.0/menu.c:868 client/gui-gtk-2.0/menu.c:1407
msgid "Transf_orm Terrain"
msgstr "Endre terr_eng"
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:1508
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:1553
#: client/gui-win32/menu.c:364
msgid "Build _Fortress"
msgstr "Bygg _festning"
-#: client/gui-gtk-2.0/menu.c:841 client/gui-win32/menu.c:365
+#: client/gui-gtk-2.0/menu.c:872 client/gui-win32/menu.c:365
msgid "Build Airbas_e"
msgstr "Bygg flystrip_e"
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:1514
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:1559
#: client/gui-win32/menu.c:366
msgid "Clean _Pollution"
msgstr "Fjern _forurensning"
-#: client/gui-gtk-2.0/menu.c:845 client/gui-win32/menu.c:367
+#: client/gui-gtk-2.0/menu.c:876 client/gui-win32/menu.c:367
msgid "Clean _Nuclear Fallout"
msgstr "Fjern _atomavfall"
-#: client/gui-gtk-2.0/menu.c:849 client/gui-win32/menu.c:369
+#: client/gui-gtk-2.0/menu.c:880 client/gui-win32/menu.c:369
msgid "_Sentry"
msgstr "Hold _stand"
-#: client/gui-gtk-2.0/menu.c:855 client/gui-win32/menu.c:372
+#: client/gui-gtk-2.0/menu.c:886 client/gui-win32/menu.c:372
msgid "Make _Homecity"
msgstr "Gjør til _hjemby"
-#: client/gui-gtk-2.0/menu.c:857 client/gui-win32/menu.c:373
+#: client/gui-gtk-2.0/menu.c:888 client/gui-win32/menu.c:373
msgid "_Load"
msgstr "_Fortsett lagret spill"
-#: client/gui-gtk-2.0/menu.c:859
+#: client/gui-gtk-2.0/menu.c:890
msgid "_Unload Transporter"
msgstr "Last _ut fra transport"
-#: client/gui-gtk-2.0/menu.c:861 client/gui-win32/menu.c:374
+#: client/gui-gtk-2.0/menu.c:892 client/gui-win32/menu.c:374
msgid "_Unload"
msgstr "Last a_v"
-#: client/gui-gtk-2.0/menu.c:863 client/gui-win32/menu.c:375
+#: client/gui-gtk-2.0/menu.c:894 client/gui-win32/menu.c:375
msgid "Wake up o_thers"
msgstr "Vekk _andre"
-#: client/gui-gtk-2.0/menu.c:867
+#: client/gui-gtk-2.0/menu.c:898
msgid "_Auto Settler"
msgstr "_Autonybygger"
-#: client/gui-gtk-2.0/menu.c:869 client/gui-win32/menu.c:378
+#: client/gui-gtk-2.0/menu.c:900 client/gui-win32/menu.c:378
msgid "Auto E_xplore"
msgstr "Auto utfors_k"
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906
msgid "_Connect"
msgstr "_Koble til"
-#: client/gui-gtk-2.0/menu.c:871 client/gui-win32/menu.c:380
+#: client/gui-gtk-2.0/menu.c:902 client/gui-win32/menu.c:380
msgid "_Road"
msgstr "_Vei"
-#: client/gui-gtk-2.0/menu.c:873 client/gui-win32/menu.c:381
+#: client/gui-gtk-2.0/menu.c:904 client/gui-win32/menu.c:381
msgid "Rai_l"
msgstr "_Jernbane"
# irrigert er tillatt på norsk, men skulle gjerne hatt et bedre ord
-#: client/gui-gtk-2.0/menu.c:875 client/gui-win32/menu.c:382
+#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:382
msgid "_Irrigate"
msgstr "_Irriger"
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
#, fuzzy
msgid "Go _to"
msgstr "Gå til"
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
#, fuzzy
msgid "_Build city"
msgstr "_Bygg by"
-#: client/gui-gtk-2.0/menu.c:879
+#: client/gui-gtk-2.0/menu.c:910
msgid "Patrol (_Q)"
msgstr "Patruljer (_Q)"
-#: client/gui-gtk-2.0/menu.c:881 client/gui-win32/menu.c:385
+#: client/gui-gtk-2.0/menu.c:912 client/gui-win32/menu.c:385
msgid "_Go to"
msgstr "_Gå til"
-#: client/gui-gtk-2.0/menu.c:883
+#: client/gui-gtk-2.0/menu.c:914
msgid "Go\\/Airlift to City"
msgstr "Gå\\/Fly til by"
-#: client/gui-gtk-2.0/menu.c:885 client/gui-sdl/menu.c:450
+#: client/gui-gtk-2.0/menu.c:916 client/gui-sdl/menu.c:450
#: client/gui-win32/menu.c:387 client/gui-xaw/menu.c:203
msgid "Return to nearest city"
msgstr "Returner til nærmeste by."
-#: client/gui-gtk-2.0/menu.c:889 client/gui-win32/menu.c:389
+#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:389
#: client/gui-xaw/menu.c:205
msgid "Disband Unit"
msgstr "Oppløs enhet"
-#: client/gui-gtk-2.0/menu.c:891 client/gui-sdl/citydlg.c:532
+#: client/gui-gtk-2.0/menu.c:922 client/gui-sdl/citydlg.c:532
#: data/Freeciv.in:1186
msgid "Upgrade unit"
msgstr "Oppgrader enhet"
-#: client/gui-gtk-2.0/menu.c:893
+#: client/gui-gtk-2.0/menu.c:924
msgid "Diplomat\\/Spy Actions"
msgstr "Diplomat\\/Spion - Forhandlinger"
-#: client/gui-gtk-2.0/menu.c:895 client/gui-sdl/menu.c:399
+#: client/gui-gtk-2.0/menu.c:926 client/gui-sdl/menu.c:399
#: client/gui-win32/menu.c:391 client/gui-xaw/menu.c:209
msgid "Explode Nuclear"
msgstr "Utløs atombombe"
-#: client/gui-gtk-2.0/menu.c:899
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/cityrep.c:882
+msgid "Select"
+msgstr "Velg"
+
+#: client/gui-gtk-2.0/menu.c:934
#, fuzzy
-msgid "Select same type"
-msgstr "Velg en by"
+msgid "Single"
+msgstr "Jungel"
+
+#: client/gui-gtk-2.0/menu.c:936
+msgid "Same Type On Tile"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:938
+msgid "All On Tile"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:940
+msgid "Same Type On Continent"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:942
+msgid "Same Type Everywhere"
+msgstr ""
-#: client/gui-gtk-2.0/menu.c:901 client/gui-win32/menu.c:393
+#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:393
msgid "_Wait"
msgstr "_Vent"
-#: client/gui-gtk-2.0/menu.c:903 client/gui-win32/menu.c:394
+#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:394
#: client/gui-xaw/menu.c:213
msgid "Done"
msgstr "Fullført"
-#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:398
+#: client/gui-gtk-2.0/menu.c:949 client/gui-win32/menu.c:398
msgid "_Reports"
msgstr "_Rapporter"
-#: client/gui-gtk-2.0/menu.c:908 client/gui-gtk-2.0/menu.c:910
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:914
-#: client/gui-gtk-2.0/menu.c:916 client/gui-gtk-2.0/menu.c:918
-#: client/gui-gtk-2.0/menu.c:920 client/gui-gtk-2.0/menu.c:922
-#: client/gui-gtk-2.0/menu.c:924 client/gui-gtk-2.0/menu.c:926
-#: client/gui-gtk-2.0/menu.c:928 client/gui-gtk-2.0/menu.c:930
-#: client/gui-gtk-2.0/menu.c:932 data/Freeciv.in:2030
+#: client/gui-gtk-2.0/menu.c:951 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:957
+#: client/gui-gtk-2.0/menu.c:959 client/gui-gtk-2.0/menu.c:961
+#: client/gui-gtk-2.0/menu.c:963 client/gui-gtk-2.0/menu.c:965
+#: client/gui-gtk-2.0/menu.c:967 client/gui-gtk-2.0/menu.c:969
+#: client/gui-gtk-2.0/menu.c:971 client/gui-gtk-2.0/menu.c:973
+#: client/gui-gtk-2.0/menu.c:975 data/Freeciv.in:2030
msgid "Reports"
msgstr "Rapporter"
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:958
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:1001
#: client/gui-win32/menu.c:400 client/gui-win32/menu.c:425
msgid "_Units"
msgstr "_Enheter"
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/menu.c:914 client/gui-win32/menu.c:402
+#: client/gui-gtk-2.0/menu.c:957 client/gui-win32/menu.c:402
#, fuzzy
msgid "_Nations"
msgstr "_Nasjoner"
-#: client/gui-gtk-2.0/menu.c:918 client/gui-win32/menu.c:403
+#: client/gui-gtk-2.0/menu.c:961 client/gui-win32/menu.c:403
msgid "_Economy"
msgstr "_Økonomi"
#. TRANS: Research report action
-#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:405
+#: client/gui-gtk-2.0/menu.c:963 client/gui-win32/menu.c:405
#, fuzzy
msgid "_Research"
msgstr "_Forsker på"
-#: client/gui-gtk-2.0/menu.c:924 client/gui-win32/menu.c:407
+#: client/gui-gtk-2.0/menu.c:967 client/gui-win32/menu.c:407
msgid "_Wonders of the World"
msgstr "_Verdens underverk"
-#: client/gui-gtk-2.0/menu.c:926 client/gui-win32/menu.c:408
+#: client/gui-gtk-2.0/menu.c:969 client/gui-win32/menu.c:408
msgid "_Top Five Cities"
msgstr "_Topp fem byer"
-#: client/gui-gtk-2.0/menu.c:928 client/gui-win32/menu.c:409
+#: client/gui-gtk-2.0/menu.c:971 client/gui-win32/menu.c:409
msgid "_Messages"
msgstr "_Beskjeder"
-#: client/gui-gtk-2.0/menu.c:930 client/gui-win32/menu.c:410
+#: client/gui-gtk-2.0/menu.c:973 client/gui-win32/menu.c:410
msgid "_Demographics"
msgstr "_Demografi"
-#: client/gui-gtk-2.0/menu.c:932 client/gui-gtk-2.0/plrdlg.c:471
+#: client/gui-gtk-2.0/menu.c:975 client/gui-gtk-2.0/plrdlg.c:354
#: client/gui-win32/menu.c:411
msgid "_Spaceship"
msgstr "_Romskip"
-#: client/gui-gtk-2.0/menu.c:936 client/gui-win32/menu.c:415
+#: client/gui-gtk-2.0/menu.c:979 client/gui-win32/menu.c:415
msgid "_Help"
msgstr "_Hjelp"
-#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
-#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
-#: client/gui-gtk-2.0/menu.c:946 client/gui-gtk-2.0/menu.c:948
-#: client/gui-gtk-2.0/menu.c:950 client/gui-gtk-2.0/menu.c:952
-#: client/gui-gtk-2.0/menu.c:954 client/gui-gtk-2.0/menu.c:956
-#: client/gui-gtk-2.0/menu.c:958 client/gui-gtk-2.0/menu.c:960
-#: client/gui-gtk-2.0/menu.c:962 client/gui-gtk-2.0/menu.c:964
-#: client/gui-gtk-2.0/menu.c:966 client/gui-gtk-2.0/menu.c:968
-#: client/gui-gtk-2.0/menu.c:970 client/gui-gtk-2.0/menu.c:972
-#: client/gui-gtk-2.0/menu.c:974 client/gui-gtk-2.0/menu.c:976
-#: client/gui-gtk-2.0/menu.c:978 client/gui-gtk-2.0/menu.c:980
+#: client/gui-gtk-2.0/menu.c:981 client/gui-gtk-2.0/menu.c:983
+#: client/gui-gtk-2.0/menu.c:985 client/gui-gtk-2.0/menu.c:987
+#: client/gui-gtk-2.0/menu.c:989 client/gui-gtk-2.0/menu.c:991
+#: client/gui-gtk-2.0/menu.c:993 client/gui-gtk-2.0/menu.c:995
+#: client/gui-gtk-2.0/menu.c:997 client/gui-gtk-2.0/menu.c:999
+#: client/gui-gtk-2.0/menu.c:1001 client/gui-gtk-2.0/menu.c:1003
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-gtk-2.0/menu.c:1007
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-gtk-2.0/menu.c:1011
+#: client/gui-gtk-2.0/menu.c:1013 client/gui-gtk-2.0/menu.c:1015
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-gtk-2.0/menu.c:1019
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-gtk-2.0/menu.c:1023
#: client/gui-gtk-2.0/repodlgs.c:313 client/gui-win32/citydlg.c:1077
#: client/gui-win32/repodlgs.c:289 client/gui-win32/wldlg.c:846
#: data/Freeciv.in:1466 data/Freeciv.in:2031 data/Freeciv.in:2101
@@ -12054,119 +12269,119 @@ msgstr "_Hjelp"
msgid "Help"
msgstr "Hjelp"
-#: client/gui-gtk-2.0/menu.c:940 client/gui-win32/menu.c:416
+#: client/gui-gtk-2.0/menu.c:983 client/gui-win32/menu.c:416
msgid "Language_s"
msgstr "_Språk"
-#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/menu.c:417
+#: client/gui-gtk-2.0/menu.c:985 client/gui-win32/menu.c:417
msgid "Co_nnecting"
msgstr "_Kobler til"
-#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:418
+#: client/gui-gtk-2.0/menu.c:987 client/gui-win32/menu.c:418
msgid "C_ontrols"
msgstr "K_ontroller"
-#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:419
+#: client/gui-gtk-2.0/menu.c:989 client/gui-win32/menu.c:419
msgid "C_hatline"
msgstr "_Snakkekanal"
-#: client/gui-gtk-2.0/menu.c:948 client/gui-win32/menu.c:420
+#: client/gui-gtk-2.0/menu.c:991 client/gui-win32/menu.c:420
msgid "_Worklist Editor"
msgstr "_Arbeidsliste"
-#: client/gui-gtk-2.0/menu.c:950 client/gui-win32/menu.c:421
+#: client/gui-gtk-2.0/menu.c:993 client/gui-win32/menu.c:421
msgid "Citizen _Management"
msgstr "Byforvalt_ning"
-#: client/gui-gtk-2.0/menu.c:952 client/gui-win32/menu.c:422
+#: client/gui-gtk-2.0/menu.c:995 client/gui-win32/menu.c:422
msgid "_Playing"
msgstr "_Strategier"
-#: client/gui-gtk-2.0/menu.c:956 client/gui-win32/menu.c:424
+#: client/gui-gtk-2.0/menu.c:999 client/gui-win32/menu.c:424
msgid "City _Improvements"
msgstr "Byforbedr_inger"
-#: client/gui-gtk-2.0/menu.c:960 client/gui-win32/menu.c:426
+#: client/gui-gtk-2.0/menu.c:1003 client/gui-win32/menu.c:426
msgid "Com_bat"
msgstr "Kam_p"
-#: client/gui-gtk-2.0/menu.c:962 client/gui-win32/menu.c:427
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-win32/menu.c:427
msgid "_ZOC"
msgstr "_Kontrollsone"
-#: client/gui-gtk-2.0/menu.c:964 client/gui-win32/menu.c:428
+#: client/gui-gtk-2.0/menu.c:1007 client/gui-win32/menu.c:428
msgid "Techno_logy"
msgstr "Tekno_logi"
-#: client/gui-gtk-2.0/menu.c:966 client/gui-win32/menu.c:429
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-win32/menu.c:429
msgid "_Terrain"
msgstr "_Terreng"
-#: client/gui-gtk-2.0/menu.c:968 client/gui-win32/menu.c:430
+#: client/gui-gtk-2.0/menu.c:1011 client/gui-win32/menu.c:430
msgid "Won_ders"
msgstr "Un_derverk"
-#: client/gui-gtk-2.0/menu.c:972 client/gui-win32/menu.c:432
+#: client/gui-gtk-2.0/menu.c:1015 client/gui-win32/menu.c:432
msgid "Happin_ess"
msgstr "_Lykkelighet"
-#: client/gui-gtk-2.0/menu.c:974 client/gui-win32/menu.c:433
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-win32/menu.c:433
msgid "Space _Race"
msgstr "_Romkappløp"
-#: client/gui-gtk-2.0/menu.c:978 client/gui-win32/menu.c:435
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-win32/menu.c:435
msgid "_Copying"
msgstr "_Kopiering"
-#: client/gui-gtk-2.0/menu.c:980 client/gui-win32/menu.c:436
+#: client/gui-gtk-2.0/menu.c:1023 client/gui-win32/menu.c:436
msgid "_About"
msgstr "O_m"
-#: client/gui-gtk-2.0/menu.c:1264
+#: client/gui-gtk-2.0/menu.c:1307
#, c-format
msgid "%s..."
msgstr "%s..."
-#: client/gui-gtk-2.0/menu.c:1352
+#: client/gui-gtk-2.0/menu.c:1397
#, c-format
msgid "Change to %s (_I)"
msgstr "Endre til %s (_I)"
-#: client/gui-gtk-2.0/menu.c:1353
+#: client/gui-gtk-2.0/menu.c:1398
#, c-format
msgid "Change to %s (_M)"
msgstr "Forandre til %s (_M)"
-#: client/gui-gtk-2.0/menu.c:1354
+#: client/gui-gtk-2.0/menu.c:1399
#, c-format
msgid "Transf_orm to %s"
msgstr "Transf_ormere til %s"
-#: client/gui-gtk-2.0/menu.c:1427
+#: client/gui-gtk-2.0/menu.c:1472
msgid "Help _Build Wonder"
msgstr "Hjelp _bygging av underverk"
-#: client/gui-gtk-2.0/menu.c:1441
+#: client/gui-gtk-2.0/menu.c:1486
msgid "Add to City (_B)"
msgstr "Legg til by (_B)"
-#: client/gui-gtk-2.0/menu.c:1449
+#: client/gui-gtk-2.0/menu.c:1494
msgid "Make Trade _Route"
msgstr "Lag handels_rute"
-#: client/gui-gtk-2.0/menu.c:1463
+#: client/gui-gtk-2.0/menu.c:1508
msgid "Build _Railroad"
msgstr "Bygg je_rnbane"
-#: client/gui-gtk-2.0/menu.c:1486
+#: client/gui-gtk-2.0/menu.c:1531
msgid "Bu_ild Farmland"
msgstr "D_yrk opp landet"
-#: client/gui-gtk-2.0/menu.c:1506
+#: client/gui-gtk-2.0/menu.c:1551
msgid "_Fortify"
msgstr "Be_fest posisjon"
-#: client/gui-gtk-2.0/menu.c:1512
+#: client/gui-gtk-2.0/menu.c:1557
msgid "_Paradrop"
msgstr "_Fallskjermshopp"
@@ -12203,13 +12418,32 @@ msgstr "B"
msgid "Pop"
msgstr "E"
-#: client/gui-gtk-2.0/messagewin.c:155 client/gui-sdl/messagewin.c:247
+#: client/gui-gtk-2.0/messagewin.c:186 client/gui-sdl/messagewin.c:247
#: client/gui-win32/messagewin.c:132 client/gui-xaw/menu.c:228
#: data/Freeciv.in:3273 data/Freeciv.in:3274 data/Freeciv.in:3283
msgid "Messages"
msgstr "Beskjeder"
-#: client/gui-gtk-2.0/plrdlg.c:330
+#: client/gui-gtk-2.0/plrdlg.c:317
+msgid "_Meet"
+msgstr "_Møte"
+
+#: client/gui-gtk-2.0/plrdlg.c:323
+#, fuzzy
+msgid "Cancel _Treaty"
+msgstr "_Avbryt avtale"
+
+#: client/gui-gtk-2.0/plrdlg.c:329
+#, fuzzy
+msgid "_Withdraw Vision"
+msgstr "Fjern delt _utsyn"
+
+#: client/gui-gtk-2.0/plrdlg.c:348
+#, fuzzy
+msgid "_Report"
+msgstr "_Rapporter"
+
+#: client/gui-gtk-2.0/plrdlg.c:386
msgid "?show:Dead Players"
msgstr ""
@@ -12217,280 +12451,283 @@ msgstr ""
#. TRANS: Nations report action
#. TRANS: Nations report title
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/plrdlg.c:350 client/gui-sdl/mapctrl.c:1580
+#: client/gui-gtk-2.0/plrdlg.c:406 client/gui-sdl/mapctrl.c:1580
#: client/gui-sdl/plrdlg.c:608 client/gui-win32/plrdlg.c:344
#: client/gui-xaw/menu.c:221 data/Freeciv.in:3192 data/Freeciv.in:3193
#, fuzzy
msgid "Nations"
msgstr "Nasjon"
-#: client/gui-gtk-2.0/plrdlg.c:443
-msgid "_Intelligence"
-msgstr "_Etterretning"
-
-#: client/gui-gtk-2.0/plrdlg.c:450
-msgid "_Meet"
-msgstr "_Møte"
-
-#: client/gui-gtk-2.0/plrdlg.c:457
+#: client/gui-gtk-2.0/plrdlg.c:511
#, fuzzy
-msgid "Cancel _Treaty"
-msgstr "_Avbryt avtale"
+msgid "Di_plomacy"
+msgstr "Diplomati"
-#: client/gui-gtk-2.0/plrdlg.c:464
-msgid "_Withdraw vision"
-msgstr "Fjern delt _utsyn"
+#: client/gui-gtk-2.0/plrdlg.c:516
+msgid "_Intelligence"
+msgstr "_Etterretning"
-#: client/gui-gtk-2.0/plrdlg.c:495
+#: client/gui-gtk-2.0/plrdlg.c:526
msgid "_AI"
msgstr "_AI"
-#: client/gui-gtk-2.0/plrdlg.c:501
+#: client/gui-gtk-2.0/plrdlg.c:532
msgid "_Toggle AI Mode"
msgstr "_Endre AI modus"
-#: client/gui-gtk-2.0/pages.c:208
+#: client/gui-gtk-2.0/pages.c:221
msgid "Start _New Game"
msgstr "Start _nytt spill"
-#: client/gui-gtk-2.0/pages.c:214
+#: client/gui-gtk-2.0/pages.c:227
msgid "Start _Scenario Game"
msgstr "_Start med ferdiglagd oppsett"
-#: client/gui-gtk-2.0/pages.c:220
+#: client/gui-gtk-2.0/pages.c:233
msgid "_Load Saved Game"
msgstr "Fortsette et spi_ll"
-#: client/gui-gtk-2.0/pages.c:229
+#: client/gui-gtk-2.0/pages.c:239
msgid "C_onnect to Network Game"
msgstr "K_oble til nettverksspill"
-#: client/gui-gtk-2.0/pages.c:236
+#: client/gui-gtk-2.0/pages.c:247
#, fuzzy
msgid "Connect to Gaming _Zone"
msgstr "Koble til nettverksspill"
-#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:300
#: client/gui-xaw/connectdlg.c:326
msgid "Passwords don't match, enter password."
msgstr "Passordene stemmer ikke, skriv inn passord."
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:779 client/gui-gtk-2.0/pages.c:820
+#: client/gui-win32/connectdlg.c:916
msgid "Server Name"
msgstr "Servernavn"
-#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
+#: 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
+#: data/Freeciv.in:96
msgid "Port"
msgstr "Port"
-#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
+#: client/gui-win32/connectdlg.c:917
msgid "Version"
msgstr "Versjon"
-#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
-#: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
+#: 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
msgid "Status"
msgstr "Status"
-#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
-#: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
+#: 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
msgid "Players"
msgstr "Spillere"
-#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
+#: client/gui-win32/connectdlg.c:918
msgid "Comment"
msgstr "Kommentar"
-#: client/gui-gtk-2.0/pages.c:747
+#: client/gui-gtk-2.0/pages.c:786
msgid "Local _Area Network"
msgstr "Lok_alt Nettverk"
-#: client/gui-gtk-2.0/pages.c:783
+#: client/gui-gtk-2.0/pages.c:827
msgid "Internet _Metaserver"
msgstr "Internett _Metaserver"
-#: client/gui-gtk-2.0/pages.c:817
+#: client/gui-gtk-2.0/pages.c:864
msgid "_Host:"
msgstr "_Tjener"
-#: client/gui-gtk-2.0/pages.c:834
+#: client/gui-gtk-2.0/pages.c:881
msgid "_Port:"
msgstr "_Portnummer"
-#: client/gui-gtk-2.0/pages.c:851
+#: client/gui-gtk-2.0/pages.c:898
msgid "_Login:"
msgstr "_Navn:"
-#: client/gui-gtk-2.0/pages.c:869
+#: client/gui-gtk-2.0/pages.c:916
msgid "Pass_word:"
msgstr "Pass_ord:"
-#: client/gui-gtk-2.0/pages.c:887
+#: client/gui-gtk-2.0/pages.c:934
msgid "Conf_irm Password:"
msgstr "_Gjenta passord:"
-#: client/gui-gtk-2.0/pages.c:912
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: 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/wldlg.c:800 client/gui-win32/wldlg.c:806
+msgid "Type"
+msgstr "Type"
+
+#: client/gui-gtk-2.0/pages.c:952 client/gui-win32/plrdlg.c:337
+#: data/Freeciv.in:88
+msgid "Host"
+msgstr "Server"
+
+#: client/gui-gtk-2.0/pages.c:981
#, fuzzy
msgid "C_onnect"
msgstr "Koble til"
-#: client/gui-gtk-2.0/pages.c:1142
+#: client/gui-gtk-2.0/pages.c:1211
#, fuzzy, c-format
msgid "Connection name: %s"
msgstr "Tilkobling under opprettelse."
-#: client/gui-gtk-2.0/pages.c:1145
+#: client/gui-gtk-2.0/pages.c:1214
#, fuzzy, c-format
msgid "Player name: %s"
msgstr "Navn"
-#: client/gui-gtk-2.0/pages.c:1150
+#: client/gui-gtk-2.0/pages.c:1219
#, fuzzy, c-format
msgid "Host: %s"
msgstr "Tjener:"
-#: client/gui-gtk-2.0/pages.c:1158
+#: client/gui-gtk-2.0/pages.c:1227
msgid "Player/conn info"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1185
+#: client/gui-gtk-2.0/pages.c:1254
#, fuzzy, c-format
msgid "%s info"
msgstr "By info"
-#: client/gui-gtk-2.0/pages.c:1196
+#: client/gui-gtk-2.0/pages.c:1265
#, fuzzy
msgid "Toggle player ready"
msgstr "aitoggle <spillernavn>"
-#: client/gui-gtk-2.0/pages.c:1204
+#: client/gui-gtk-2.0/pages.c:1273
#, fuzzy
msgid "Pick nation"
msgstr "Politistasjon"
-#: client/gui-gtk-2.0/pages.c:1214
+#: client/gui-gtk-2.0/pages.c:1283
msgid "Observe this player"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1221
+#: client/gui-gtk-2.0/pages.c:1290
#, fuzzy
msgid "Take this player"
msgstr "Byer"
-#: client/gui-gtk-2.0/pages.c:1238
+#: client/gui-gtk-2.0/pages.c:1307
#, fuzzy
msgid "Cut connection"
msgstr "Avbryter forbindelse til %s."
-#: client/gui-gtk-2.0/pages.c:1248
+#: client/gui-gtk-2.0/pages.c:1317
#, fuzzy
msgid "Aitoggle player"
msgstr "aitoggle <spillernavn>"
-#: client/gui-gtk-2.0/pages.c:1257
+#: client/gui-gtk-2.0/pages.c:1326
#, fuzzy
msgid "Remove player"
msgstr "Fjernet spiller %s."
-#: client/gui-gtk-2.0/pages.c:1268
+#: client/gui-gtk-2.0/pages.c:1337
msgid "Give info access"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1276
+#: client/gui-gtk-2.0/pages.c:1345
msgid "Give ctrl access"
msgstr ""
#. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1338
+#: client/gui-gtk-2.0/pages.c:1407
#, fuzzy, c-format
msgid "Put on %s"
msgstr "Befolkning: %s"
-#: client/gui-gtk-2.0/pages.c:1442
+#: client/gui-gtk-2.0/pages.c:1511
#, fuzzy
msgid "Number of _Players (including AI):"
msgstr "_Antall spillere (inkludert datastyrte spillere):"
-#: client/gui-gtk-2.0/pages.c:1465
+#: client/gui-gtk-2.0/pages.c:1534
#, fuzzy
msgid "AI Skill _Level:"
msgstr "Datastyrte spilleres _vanskelighetsgrad:"
-#: client/gui-gtk-2.0/pages.c:1481
+#: client/gui-gtk-2.0/pages.c:1550
#, fuzzy
msgid "Ruleset _Version:"
msgstr "Hersker:"
-#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
msgid "_More Game Options..."
msgstr "_Flere valg..."
-#: client/gui-gtk-2.0/pages.c:1514
+#: client/gui-gtk-2.0/pages.c:1583
#, fuzzy
msgid "Record"
msgstr "Handelsrapport"
-#: client/gui-gtk-2.0/pages.c:1519
+#: client/gui-gtk-2.0/pages.c:1588
#, fuzzy
msgid "Rating"
msgstr "Skrivekunst"
-#: client/gui-gtk-2.0/pages.c:1525
+#: client/gui-gtk-2.0/pages.c:1594
#, fuzzy
msgid "Ready"
msgstr "Klargjør alle"
-#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
-#: data/nation/slovakian.ruleset:26
-msgid "Leader"
-msgstr "Leder"
+#: client/gui-gtk-2.0/pages.c:1601
+#, fuzzy
+msgid "?player:Leader"
+msgstr "Navn"
-#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1732 client/gui-sdl/chatline.c:185
msgid "Choose Saved Game to Load"
msgstr "Velg lagrefil å laste"
-#: client/gui-gtk-2.0/pages.c:1752
+#: client/gui-gtk-2.0/pages.c:1824
msgid "Choose Saved Game to _Load:"
msgstr "Velg lagrefil å _laste:"
-#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
-#: client/gui-gtk-2.0/pages.c:2375
+#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
+#: client/gui-gtk-2.0/pages.c:2451
msgid "_Browse..."
msgstr "_Let etter fil..."
-#: client/gui-gtk-2.0/pages.c:1839
+#: client/gui-gtk-2.0/pages.c:1911
msgid "Choose a Scenario"
msgstr "Velg et ferdiglagd oppsett"
-#: client/gui-gtk-2.0/pages.c:1926
+#: client/gui-gtk-2.0/pages.c:1998
msgid "Choose a _Scenario:"
msgstr "Velg et ferdiglagd _oppsett:"
-#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
-#: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
-#: client/gui-win32/wldlg.c:806
-msgid "Type"
-msgstr "Type"
-
-#: client/gui-gtk-2.0/pages.c:2101
+#: client/gui-gtk-2.0/pages.c:2173
msgid "Choose a _nation to play:"
msgstr "Velg en _nasjon å spille:"
-#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2363 client/gui-win32/menu.c:581
msgid "Select Location to Save"
msgstr "Velg plassering for å lagre spillet"
-#: client/gui-gtk-2.0/pages.c:2372 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2448 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr "Lagre spill"
-#: client/gui-gtk-2.0/pages.c:2413
+#: client/gui-gtk-2.0/pages.c:2489
msgid "Saved _Games:"
msgstr "_Lagrede spill:"
-#: client/gui-gtk-2.0/pages.c:2440
+#: client/gui-gtk-2.0/pages.c:2516
msgid "Save _Filename:"
msgstr "Lagre _filnavn:"
@@ -12845,7 +13082,7 @@ msgstr "Lukk dialog"
msgid "Total users logged in : %d"
msgstr ""
-#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1094
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
msgid "Back"
msgstr "Tilbake"
@@ -12855,7 +13092,7 @@ msgid "Start"
msgstr "_Start"
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:775
+#: client/gui-win32/connectdlg.c:777
msgid "Load Game"
msgstr "Fortsette et spill"
@@ -12894,12 +13131,12 @@ msgid "Make new homecity"
msgstr "Lag ny hjemby"
#: client/gui-sdl/citydlg.c:546 client/gui-sdl/citydlg.c:1418
-#: client/gui-sdl/connectdlg.c:307 client/gui-sdl/connectdlg.c:616
-#: client/gui-sdl/connectdlg.c:802 client/gui-sdl/connectdlg.c:984
+#: 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/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1039
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
#: 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
@@ -12947,7 +13184,7 @@ msgstr "Kj
#: client/gui-sdl/diplodlg.c:1335 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:2427
+#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
#: client/gui-xaw/cityrep.c:666 client/gui-xaw/cma_fe.c:327
#: client/gui-xaw/cma_fe.c:511 client/gui-xaw/cma_fe.c:765
#: client/gui-xaw/messagedlg.c:72 client/gui-xaw/optiondlg.c:76
@@ -12963,7 +13200,7 @@ msgstr "Nei"
#: client/gui-sdl/diplodlg.c:1345 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:2427 client/gui-xaw/cityrep.c:666
+#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
#: client/gui-xaw/cma_fe.c:327 client/gui-xaw/cma_fe.c:511
#: client/gui-xaw/cma_fe.c:765 client/gui-xaw/messagedlg.c:72
#: client/gui-xaw/optiondlg.c:76 client/gui-xaw/optiondlg.c:304
@@ -13264,41 +13501,41 @@ msgstr "Benytt en gang"
msgid "Release city"
msgstr "Frigi byen"
-#: client/gui-sdl/connectdlg.c:238
+#: client/gui-sdl/connectdlg.c:239
#, fuzzy
msgid "Creating Server List..."
msgstr "Freeciv Server Liste"
-#: client/gui-sdl/connectdlg.c:279 client/gui-sdl/connectdlg.c:343
+#: client/gui-sdl/connectdlg.c:280 client/gui-sdl/connectdlg.c:344
#, fuzzy
msgid "No LAN servers found"
msgstr "Lokalt Nettverk"
-#: client/gui-sdl/connectdlg.c:281 client/gui-sdl/connectdlg.c:345
+#: client/gui-sdl/connectdlg.c:282 client/gui-sdl/connectdlg.c:346
msgid "No public servers found"
msgstr ""
-#: client/gui-sdl/connectdlg.c:555
+#: client/gui-sdl/connectdlg.c:556
#, fuzzy
msgid "Player Name :"
msgstr "Navn"
-#: client/gui-sdl/connectdlg.c:571
+#: client/gui-sdl/connectdlg.c:572
#, fuzzy
msgid "Freeciv Server :"
msgstr "Freeciv Server Liste"
-#: client/gui-sdl/connectdlg.c:588
+#: client/gui-sdl/connectdlg.c:589
#, fuzzy
msgid "Port :"
msgstr "Port:"
-#: client/gui-sdl/connectdlg.c:608 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr "Koble til"
-#: client/gui-sdl/connectdlg.c:794 client/gui-sdl/connectdlg.c:977
+#: client/gui-sdl/connectdlg.c:795 client/gui-sdl/connectdlg.c:978
#: client/gui-xaw/connectdlg.c:145
msgid "Next"
msgstr "Neste"
@@ -13590,7 +13827,7 @@ msgstr ""
#: client/gui-sdl/graphics.c:1021
#, c-format
-msgid "Unable to initialize SDL_ttf library: %s"
+msgid "Unable to initialize SDL_ttf library: %s"
msgstr ""
#: client/gui-sdl/graphics.c:1058
@@ -13677,12 +13914,6 @@ msgstr ""
msgid "Waiting for the beginning of the game"
msgstr ""
-#: client/gui-sdl/gui_string.c:608
-msgid ""
-"Couldn't find stdfont.ttf file. Please link/copy/move anyunicode ttf font to "
-"data dir as stdfont.ttf"
-msgstr ""
-
#. TRANS: Future Technology
#: client/gui-sdl/gui_tilespec.c:506
msgid "FT"
@@ -14297,12 +14528,12 @@ msgid "Leave Game"
msgstr "Lagre spill"
#: client/gui-sdl/optiondlg.c:2302 client/gui-sdl/pages.c:255
-#: client/gui-win32/connectdlg.c:1098 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1100 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:963
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
msgid "Start New Game"
msgstr "Start nytt spill"
@@ -14432,8 +14663,8 @@ msgstr ""
msgid "%s max rate : %d%%"
msgstr "%s maks nivå: %d%%"
-#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1081
-#: client/gui-win32/connectdlg.c:1089 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
+#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
msgid "Update"
msgstr "Oppdater"
@@ -14864,10 +15095,6 @@ msgstr "Endre alle"
msgid "Refresh"
msgstr "Oppfrisk"
-#: client/gui-win32/cityrep.c:882
-msgid "Select"
-msgstr "Velg"
-
#: client/gui-win32/cityrep.c:883
msgid "Configure"
msgstr "Innstillinger"
@@ -14917,56 +15144,56 @@ msgstr "Klarte ikke laste inn lagret spill."
msgid "Verify Password"
msgstr "Bekreft passord"
-#: client/gui-win32/connectdlg.c:912 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr "Servervalg"
-#: client/gui-win32/connectdlg.c:913
+#: client/gui-win32/connectdlg.c:915
msgid "Local Area Network"
msgstr "Lokalt Nettverk"
-#: client/gui-win32/connectdlg.c:947
+#: client/gui-win32/connectdlg.c:949
msgid "Welcome to Freeciv"
msgstr "Velkommen til Freeciv"
-#: client/gui-win32/connectdlg.c:965
+#: client/gui-win32/connectdlg.c:967
msgid "Load Saved Game"
msgstr "Fortsette et spill"
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
msgid "Connect To Network Game"
msgstr "Koble til nettverksspill"
-#: client/gui-win32/connectdlg.c:977
+#: client/gui-win32/connectdlg.c:979
msgid "Choose a nation to play"
msgstr "Velg en nasjon å spille"
-#: client/gui-win32/connectdlg.c:1012
+#: client/gui-win32/connectdlg.c:1014
msgid "Number of players (Including AI):"
msgstr "Antall spillere (inkludert AI):"
-#: client/gui-win32/connectdlg.c:1020
+#: client/gui-win32/connectdlg.c:1022
msgid "AI skill level:"
msgstr "AI vanskelighetsgrad:"
-#: client/gui-win32/connectdlg.c:1034 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
msgid "Game Options"
msgstr "Spill-innstillinger"
-#: client/gui-win32/connectdlg.c:1038
+#: client/gui-win32/connectdlg.c:1040
#, fuzzy
msgid "Start Game"
msgstr "Start nytt spill"
-#: client/gui-win32/connectdlg.c:1057
+#: client/gui-win32/connectdlg.c:1059
msgid "Login:"
msgstr "Navn:"
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
msgid "Host:"
msgstr "Tjener:"
-#: client/gui-win32/connectdlg.c:1060
+#: client/gui-win32/connectdlg.c:1062
msgid "Port:"
msgstr "Port:"
@@ -15230,10 +15457,6 @@ msgid_plural "(idle %d turns)"
msgstr[0] "(stille %d runde)"
msgstr[1] "(stille %d runde)"
-#: client/gui-win32/plrdlg.c:337 data/Freeciv.in:88
-msgid "Host"
-msgstr "Server"
-
# Endret til etterretning, var før Intelligens
#: client/gui-win32/plrdlg.c:355 data/Freeciv.in:3230
msgid "Intelligence"
@@ -17041,12 +17264,12 @@ msgstr ""
#: data/helpdata.txt:781
msgid ""
-" To have a diplomatic relationship with another player, you must fist "
-"establish first contact with that player. To establish first contact, you "
-"have to move one of your units next to a city or unit belonging to that "
-"player, or vice versa. Unless you establish an embassy with that player, you "
-"may again lose contact with them after a set number of turns without direct "
-"physical contact."
+" To have a diplomatic relationship with another player, you must first "
+"establish contact with that player. To establish contact, you have to move "
+"one of your units next to a city or unit belonging to that player, or vice "
+"versa. Unless you establish an embassy with that player, you may again lose "
+"contact with them after a set number of turns without direct physical "
+"contact."
msgstr ""
#: data/helpdata.txt:788
@@ -19818,7 +20041,7 @@ msgid "Communism"
msgstr "Kommunisme"
#: data/default/governments.ruleset:121 data/civ2/governments.ruleset:118
-#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:26
+#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:27
msgid "Comrade"
msgstr "Kamerat"
@@ -20805,6 +21028,11 @@ msgstr ""
"en oppgave, for da kan innsatsen sløses bort, og en stor gruppe nybyggere/"
"ingeniører er veldig utsatt for angrep."
+#: data/default/units.ruleset:238
+#, fuzzy
+msgid "?unit:Workers"
+msgstr "Arbeidere"
+
#: data/default/units.ruleset:264
msgid ""
"Workers are one of the key units in the game. They can be used to irrigate "
@@ -21460,6 +21688,11 @@ msgstr "Utforsker"
msgid "Explorers are very useful for mapping unknown territory."
msgstr "Utforskere er nyttig til å kartlegge ukjent territorie."
+#: data/default/units.ruleset:1864
+#, fuzzy
+msgid "?unit:Leader"
+msgstr "Leder"
+
#: data/default/units.ruleset:1892
msgid "This is you. If you lose this unit, you lose the game. So don't."
msgstr ""
@@ -21719,7 +21952,7 @@ msgid "Emir"
msgstr ""
#: data/nation/afghani.ruleset:25 data/nation/slovakian.ruleset:30
-#: data/nation/soviet.ruleset:27
+#: data/nation/soviet.ruleset:28
#, fuzzy
msgid "General Secretary"
msgstr "Generalsekretær"
@@ -21846,7 +22079,7 @@ msgstr "?plural:amerikanerne"
msgid ""
"According to legend, the Armenian people are the descendants of Haik - the "
"great-great-grandson of Noah. The modern Republic of Armenia gained "
-"independence from Soviet in 1991 AD"
+"independence from the Soviet Union in 1991."
msgstr ""
#: data/nation/assyrian.ruleset:3
@@ -22891,12 +23124,11 @@ msgstr "?plural:italienere"
#: data/nation/illyrian.ruleset:6
msgid ""
-"Illyrians were Indo-European tribes who appeared in the western part of the "
-"Balkan Peninsula before 1000 BC, including the Dalmatians to the north, "
-"Corcyra island and Ambracia bay in prehistoric Epirus to the south, mixing "
-"with Thracians in Dardania to the east, and settling Messapia across the "
-"Adriatic Sea. Illyrian kingdoms were independent for centuries, until "
-"conquered by the Roman Republic."
+"Illyrians were Indo-European tribes who appeared in the western part of the "
+"Balkan Peninsula before 1000 BC, including Corcyra island and Ambracia bay "
+"in prehistoric Epirus to the south. They mixed with Thracians in Dardania to "
+"the east, and settled Messapia across the Adriatic Sea. Illyrian kingdoms "
+"were independent for centuries, until conquered by the Roman Republic."
msgstr ""
#: data/nation/inca.ruleset:3
@@ -23213,7 +23445,7 @@ msgid ""
"1953."
msgstr ""
-#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:28
+#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:29
#, fuzzy
msgid "Great Leader"
msgstr "Underverk"
@@ -23386,9 +23618,9 @@ msgstr "?plural:malaysianerne"
msgid ""
"Sub-Saharan Africa has been a cultural and ethnical melting pot for "
"millennia. In medieval times, the region was home to a succession of empires "
-"called the Sahelian kingdoms. Of these, the Islamic Mali empire with it's "
+"called the Sahelian kingdoms. Of these, the Islamic Mali empire with its "
"capital in Timbuktu was the most influential. This empire reigned from the "
-"14th to the 17th century and was famed for it's wealth and benevolent kings. "
+"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 ""
@@ -23455,8 +23687,8 @@ msgstr "?plural:malaysianerne"
#: data/nation/mayan.ruleset:6
msgid ""
-"The Mayans were a Mesoamerican civilization. Famous for building great "
-"pyramids and palaces in the jungle."
+"The Mayans were a Mesoamerican civilization. They are famous for building "
+"great pyramids and palaces in the jungle."
msgstr ""
#: data/nation/mayan.ruleset:19
@@ -23997,6 +24229,16 @@ msgstr ""
"Dagens Tsjekkia var en del av Tsjekkiaslovakia før 1993, som var en del av "
"Østerrike-Ungarn før 1918."
+#: data/nation/slovakian.ruleset:26
+#, fuzzy
+msgid "?male:Leader"
+msgstr "Leder"
+
+#: data/nation/slovakian.ruleset:26
+#, fuzzy
+msgid "?female:Leader"
+msgstr "Kamerat"
+
#: data/nation/slovakian.ruleset:29
#, fuzzy
msgid "Pope"
@@ -24041,11 +24283,12 @@ msgstr "?plural:skottene"
#: data/nation/soviet.ruleset:6
msgid ""
-"Soviet Union's history starts in November 1917, when under Lenin's "
+"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 "
-"republics integrated into one country. Soviet Union became one of most "
-"powerful states in the 20th century. But by the end of 1991 due to many "
-"social shocks it disintegrated into fifteen independent countries"
+"republics integrated into one country. The Soviet Union became one of most "
+"powerful states in the 20th century, but by the end of 1991 it had "
+"disintegrated into fifteen independent countries due to social and economic "
+"problems."
msgstr ""
#: data/nation/spanish.ruleset:3
@@ -24453,8 +24696,8 @@ msgstr "?plural:italienere"
#: data/nation/westphalian.ruleset:6
msgid ""
-"Westphalia, before becoming a Prussian province, was the western region the "
-"duchy of Saxony. Present-day it consists of the Northern part of the largest "
+"Westphalia, before becoming a Prussian province, was the western region of "
+"the duchy of Saxony. Today it makes up the northern part of the largest "
"German federal state, North Rhine-Westphalia."
msgstr ""
@@ -24605,7 +24848,7 @@ msgid ""
"The flag and background color indicate what civilization the city\n"
"belongs to (this will be useful when you meet other civilizations).\n"
"The top row of the bar also shows the name and size of the city, and\n"
-"will show one or more starts to indicate if there are units in the\n"
+"will show one or more stars to indicate if there are units in the\n"
"city. The bottom row shows what the city is building, and how long it\n"
"will take; it also shows how long the city will take to grow to the\n"
"next largest size."
@@ -24661,7 +24904,7 @@ msgid ""
"Now your city has grown to size five. As cities get larger unrest\n"
"becomes a problem. A city of this size will usually have one unhappy\n"
"citizen unless pacifying effects are used; meaning one entertainer\n"
-"specialist is required to keep your citzens content. This is basically\n"
+"specialist is required to keep your citizens content. This is basically\n"
"a wasted citizen.\n"
"\n"
"There are several things that can be done about this. One quick fix\n"
@@ -24733,7 +24976,7 @@ msgid ""
"existing cities. Generally when building new cities you want to make\n"
"sure that all tiles are covered by at least one city, but after that\n"
"it is best that your cities overlap as little as possible. Spreading\n"
-"out cities properly gives each city access to more resrouces, allowing\n"
+"out cities properly gives each city access to more resources, allowing\n"
"them to grow to larger sizes."
msgstr ""
@@ -25047,6 +25290,67 @@ msgstr "Lag"
msgid "Team 31"
msgstr "Lag"
+#, fuzzy
+#~ msgid "Auth config filename \"%s\" not allowed!"
+#~ msgstr "Det navnet er ikke tillat."
+
+#, fuzzy
+#~ msgid "The %s of the %s (%s)"
+#~ msgstr "Styresett: %s Nasjon: %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Illegal alliance structure detected: %s alliance to %s reduced to peace "
+#~ "treaty."
+#~ msgstr ""
+#~ "Ulovlig allianser oppdaget: %ss allianse med %s redusert til fredsavtale."
+
+#, fuzzy
+#~ msgid "And, became more experienced!"
+#~ msgstr " og ble mer erfaren!"
+
+#~ msgid "We can't take control of server, attempting to kill it."
+#~ msgstr "Vi kan ikke ta kontroll over tjeneren, forsøker å avslutte den."
+
+#, fuzzy
+#~ msgid "%s territory"
+#~ msgstr "Territoriet til %s"
+
+#, fuzzy
+#~ msgid "%s territory (%d turn cease-fire)"
+#~ msgid_plural "%s territory (%d turn cease-fire)"
+#~ msgstr[0] "%s territorie (%d runde våpenhvile)"
+#~ msgstr[1] "%s territorie (%d runde våpenhvile)"
+
+#, fuzzy
+#~ msgid "%s territory (%s)"
+#~ msgstr "Territoriet til %s %s"
+
+#~ msgid "City: %s (%s)"
+#~ msgstr "By: %s (%s)"
+
+#, fuzzy
+#~ msgid "Unit: %s (%s)"
+#~ msgstr "Enhet: %s (%s)"
+
+#~ msgid "%s of the %s"
+#~ msgstr "Styresett: %s Nasjon: %s"
+
+#~ msgid "no maximum, "
+#~ msgstr "ingen maksimum, "
+
+#~ msgid "%d unit maximum, "
+#~ msgid_plural "%d units maximum, "
+#~ msgstr[0] "%d enhet maksimalt, "
+#~ msgstr[1] "%d enhet maksimalt, "
+
+#~ msgid "%d per unit). "
+#~ msgstr "%d per enhet)."
+
+#, fuzzy
+#~ msgid "Select same type"
+#~ msgstr "Velg en by"
+
#~ msgid "Units: "
#~ msgstr "Enheter: "
@@ -25158,11 +25462,6 @@ msgstr "Lag"
#~ msgid ", nation %s"
#~ msgstr ", nasjon: %s"
-# problem
-#, fuzzy
-#~ msgid ", team %s"
-#~ msgstr " nær %s"
-
#~ msgid "_Map"
#~ msgstr "_Kart"
@@ -27039,9 +27338,6 @@ msgstr "Lag"
#~ msgid "Error creating new AI player: %s\n"
#~ msgstr "Feil ved opprettelse av ny AI spiller: %s.\n"
-#~ msgid "Metaserver topic string set to '%s'."
-#~ msgstr "Metaserver emne-streng satt til '%s'."
-
#~ msgid "Metaserver topic string set to '%s', not reporting to metaserver."
#~ msgstr ""
#~ "Metaserver emne-treng satt til '%s', ikke rapportert til metaserver."
diff --git a/po/nl.gmo b/po/nl.gmo
index 1bc5d0f..6cf4eb9 100644
Binary files a/po/nl.gmo and b/po/nl.gmo differ
diff --git a/po/nl.po b/po/nl.po
index 3686bad..293c962 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Freeciv 2.0.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 07:45+0900\n"
+"POT-Creation-Date: 2009-03-29 21:13+0900\n"
"PO-Revision-Date: 2007-09-01 22:18+0300\n"
"Last-Translator: Jelle Pelfrene <jelle.pelfrene at student.kuleuven.ac.be>\n"
"Language-Team: Nederlands <nl at li.org>\n"
@@ -638,7 +638,7 @@ msgid "Road"
msgstr "Weg"
#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
-#: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
+#: client/gui-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"
@@ -655,7 +655,7 @@ msgid "Mine"
msgstr "Mijn"
#: common/terrain.c:396 common/unit.c:548 server/report.c:124
-#: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
+#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr "Verontreiniging"
@@ -701,7 +701,7 @@ msgstr "Gefortificeerd"
msgid "Sentry"
msgstr "Op Wacht"
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:851 client/gui-sdl/menu.c:648
+#: common/unit.c:566 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"
@@ -718,7 +718,7 @@ msgstr "Verken"
msgid "Transform"
msgstr "Transformeer"
-#: common/unit.c:584 client/text.c:106 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:584 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"
@@ -792,11 +792,11 @@ msgstr "Kernraket"
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1406
+#: common/unittype.c:349 client/helpdata.c:1404
msgid " and "
msgstr " en "
-#: common/unittype.c:355 client/helpdata.c:1392
+#: common/unittype.c:355 client/helpdata.c:1390
msgid "?and:, "
msgstr "?en:, "
@@ -1407,30 +1407,25 @@ msgstr ""
#: server/auth.c:281
#, fuzzy, c-format
-msgid "Auth config filename \"%s\" not allowed!"
-msgstr "Die naam is niet toegelaten"
-
-#: server/auth.c:286
-#, fuzzy, c-format
msgid "Cannot load auth config file \"%s\"!"
msgstr "Kan audiobestand %s niet vinden"
-#: server/auth.c:397
+#: server/auth.c:392
#, c-format
msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
msgstr ""
"Waarchuwing: de gastnaam '%s' is al in gebruik, hernoem tot gebruiker '%s'."
-#: server/auth.c:404
+#: server/auth.c:399
msgid "Guests are not allowed on this server. Sorry."
msgstr "Gasten zijn niet toegestaan op deze server. Sorry."
-#: server/auth.c:406
+#: server/auth.c:401
#, c-format
msgid "%s was rejected: Guests not allowed."
msgstr "%s is geweigerd: Gasten niet toegelaten."
-#: server/auth.c:425
+#: server/auth.c:420
#, c-format
msgid ""
"There was an error reading the user database, logging in as guest connection "
@@ -1439,7 +1434,7 @@ msgstr ""
"Er trad een fout op bij het lezen van de gebruikersdatabase, log in als gast-"
"verbinding '%s'."
-#: server/auth.c:431
+#: server/auth.c:426
msgid ""
"There was an error reading the user database and guest logins are not "
"allowed. Sorry"
@@ -1447,39 +1442,39 @@ msgstr ""
"Er trad een fout op bij het lezen van de gebruikersdatabase en gast-logins "
"zijn niet toegestaan. Sorry"
-#: server/auth.c:434
+#: server/auth.c:429
#, c-format
msgid "%s was rejected: Database error and guests not allowed."
msgstr "%s afgewezen: Database fout en gasten niet toegelaten."
-#: server/auth.c:441
+#: server/auth.c:436
#, c-format
msgid "Enter password for %s:"
msgstr "Geef wachtwoord voor %s:"
-#: server/auth.c:450
+#: server/auth.c:445
msgid "Enter a new password (and remember it)."
msgstr "Geef een nieuw wachtwoord (en onthoud het)."
-#: server/auth.c:456
+#: server/auth.c:451
msgid "This server allows only preregistered users. Sorry."
msgstr "Deze server staat alleen vooraf geregistreerde gebruikers toe. Sorry."
-#: server/auth.c:459
+#: server/auth.c:454
#, c-format
msgid "%s was rejected: Only preregister users allowed."
msgstr "%s afgewezen: Alleen vooraf geregistreerde gebruikers toegelaten.."
-#: server/auth.c:488 server/auth.c:547
+#: server/auth.c:483 server/auth.c:542
msgid "Sorry, too many wrong tries..."
msgstr "Sorry, teveel mislukte pogingen..."
-#: server/auth.c:489
+#: server/auth.c:484
#, c-format
msgid "%s was rejected: Too many wrong password verifies for new user."
msgstr "%s afgewezen: Te veel verkeerde paswoorden voor nieuwe gebruiker."
-#: server/auth.c:505
+#: server/auth.c:500
msgid ""
"Warning: There was an error in saving to the database. Continuing, but your "
"stats will not be saved."
@@ -1487,30 +1482,30 @@ msgstr ""
"Waarschuwing: Er trad een fout op bij het opslaan in de database. Ik ga "
"door, maar uw statistieken zullen niet bewaard worden."
-#: server/auth.c:549
+#: server/auth.c:544
#, c-format
msgid "%s was rejected: Too many wrong password tries."
msgstr "%s afgewezen: Afwijkende mogelijkheden."
-#: server/auth.c:558
+#: server/auth.c:553
msgid "Your password is incorrect. Try again."
msgstr "Uw wachtwoord is onjuist. Probeer opnieuw."
-#: server/auth.c:569
+#: server/auth.c:564
msgid "Sorry, your connection timed out..."
msgstr "Sorry, timeout voor uw verbinding..."
-#: server/auth.c:571
+#: server/auth.c:566
#, c-format
msgid "%s was rejected: Connection timeout waiting for password."
msgstr "%s afgewezen: Verbinding timeout bij wachten op wachtwoord."
-#: server/auth.c:636
+#: server/auth.c:631
#, c-format
msgid "Your password is too short, the minimum length is %d. Try again."
msgstr "Uw wachtwoord is te kort, de minimum lengte is %d. Probeer opnieuw."
-#: server/auth.c:642
+#: server/auth.c:637
#, c-format
msgid ""
"The password must have at least %d capital letters, %d numbers, and be at "
@@ -2017,7 +2012,7 @@ msgstr "Dit is de server voor %s"
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:237 manual/civmanual.c:380
+#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
@@ -2045,14 +2040,14 @@ msgstr " -N --Newusers\tLaat nieuwkomers toe terwijl auth uitstaat.\n"
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:241
+#: server/civserver.c:217 client/civclient.c:242
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:245
+#: server/civserver.c:221 client/civclient.c:246
msgid " -d, --debug NUM\tSet debug log level (0 to 3)\n"
msgstr " -d, --debug GETAL\tZet debug-logniveau (0 tot 3)\n"
@@ -2060,7 +2055,7 @@ msgstr " -d, --debug GETAL\tZet debug-logniveau (0 tot 3)\n"
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:248 manual/civmanual.c:382
+#: server/civserver.c:225 client/civclient.c:249 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"
@@ -2109,11 +2104,11 @@ msgstr " -r, --read BESTAND\tLees startscript BESTAND\n"
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:267 manual/civmanual.c:383
+#: server/civserver.c:247 client/civclient.c:268 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:279
+#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, fuzzy, c-format
@@ -3384,7 +3379,7 @@ msgstr ""
msgid "Sea moving start units are not yet supported. Nobody gets %s."
msgstr "Zeewaardige starteenheden nog niet ondersteund. Niemand krijgt %s."
-#: server/gamehand.c:310 client/text.c:632
+#: server/gamehand.c:310 client/text.c:691
#, c-format
msgid "Year: %s"
msgstr "Jaar: %s"
@@ -3675,10 +3670,10 @@ 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
-#, c-format
+#, fuzzy, c-format
msgid ""
-"Your nation is thrust into civil war, %s is declared the leader of the "
-"rebel states."
+"Your nation is thrust into civil war! %s is declared the leader of the rebel "
+"states."
msgstr ""
"Uw natie is verzonken in burgeroorlog, %s is benoemd als de leider van de "
"rebellerende staten."
@@ -3779,7 +3774,7 @@ msgstr "Onderzoekssnelheid"
msgid "Literacy"
msgstr "Geletterdheid"
-#: server/report.c:121 client/cityrepdata.c:526 client/cityrepdata.c:527
+#: server/report.c:121 client/cityrepdata.c:524 client/cityrepdata.c:525
#: client/gui-sdl/cityrep.c:174
msgid "Production"
msgstr "Productie"
@@ -3930,7 +3925,7 @@ 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:766
+#: server/report.c:743 server/report.c:768
msgid "Demographics Report:"
msgstr "Volkenkundig Rapport:"
@@ -3938,10 +3933,12 @@ msgstr "Volkenkundig Rapport:"
msgid "Sorry, the Demographics report is unavailable."
msgstr "Sorry, het Volkenkundig rapport is niet beschikbaar."
-#: server/report.c:748
-#, c-format
-msgid "The %s of the %s (%s)"
-msgstr "De %s van de %s (%s)"
+#. TRANS: <nation adjective> <government name> (<year>).
+#. * E.g. "Polish Despotism (200 AD)".
+#: server/report.c:750
+#, fuzzy, c-format
+msgid "%s %s (%s)"
+msgstr "%s in %s (%s)\n"
#. TRANS: message about an installation error.
#: server/ruleset.c:163
@@ -3998,16 +3995,6 @@ msgstr ""
msgid "%s had invalid nation; changing to %s."
msgstr ""
-#. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4073
-#, fuzzy, c-format
-msgid ""
-"Illegal alliance structure detected: %s alliance to %s reduced to peace "
-"treaty."
-msgstr ""
-"Illegale alliantie-constructie ontdekt: %s's alliantie met %s omgezet naar "
-"vrede "
-
#: server/settings.c:32
msgid "Geological"
msgstr "Geologisch"
@@ -5245,9 +5232,10 @@ msgid "Auto-save name prefix"
msgstr "Auto-bewaar bestandsnaam prefix"
#: server/settings.c:1016
+#, fuzzy
msgid ""
-"Automatically saved games will have name \"<prefix><year>.sav\". This "
-"setting sets the <prefix> part."
+"Automatically saved games will have name \"<prefix>-T<turn>-Y<year>.sav\". "
+"This setting sets the <prefix> part."
msgstr ""
"Automatisch bewaarde spelen dragen de naam \"<prefix><jaar>.sav\".\n"
"Deze optie stelt het <prefix> gedeelte in."
@@ -5266,11 +5254,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:147
+#: server/sernet.c:150
msgid "Server cannot read standard input. Ignoring input."
msgstr "Server kan standaard invoer niet lezen. Negeer invoer."
-#: server/sernet.c:922
+#: server/sernet.c:929
#, c-format
msgid "Server: bad address: [%s:%d]."
msgstr "Server: verkeerd adres: [%s:%d]."
@@ -5396,113 +5384,113 @@ msgstr ""
"Uw teamgenoot %s verklaarde de oorlog aan %s. U bent gehouden aan het "
"afbreken van uw alliantie met %s."
-#: server/srv_main.c:928
+#: server/srv_main.c:961
#, c-format
msgid "Failed saving game as %s"
msgstr "Kon spel niet als %s bewaren"
-#: server/srv_main.c:930
+#: server/srv_main.c:963
#, c-format
msgid "Game saved as %s"
msgstr "Spel bewaard als %s"
-#: server/srv_main.c:962
+#: server/srv_main.c:994
msgid "The game is already running."
msgstr "Het spel is al begonnen."
-#: server/srv_main.c:970
+#: server/srv_main.c:1002
#, 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:977
+#: server/srv_main.c:1009
msgid "Starting game."
msgstr "Spel begint."
-#: server/srv_main.c:1039
+#: server/srv_main.c:1071
#, c-format
msgid "request for unknown report (type %d)"
msgstr "verzoek om onbekend rapport (type %d)"
-#: server/srv_main.c:1104
+#: server/srv_main.c:1136
#, c-format
msgid "Warning: rejecting old client %s"
msgstr "Waarschuwing: weiger oude client %s"
-#: server/srv_main.c:1206
+#: server/srv_main.c:1238
#, 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:1306
+#: server/srv_main.c:1338
msgid "Please choose a non-blank name."
msgstr "Kies alstublieft een niet-lege naam."
-#: server/srv_main.c:1322
+#: server/srv_main.c:1354
msgid "That nation is already in use."
msgstr "Die natie wordt al gespeeld."
-#: server/srv_main.c:1338
+#: server/srv_main.c:1370
#, 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:1359
+#: server/srv_main.c:1391
msgid "Please choose a name containing only ASCII characters."
msgstr "Kies alstublieft een naam met alleen ASCII tekens."
-#: server/srv_main.c:1458
+#: server/srv_main.c:1490
#, c-format
msgid "%s nation is not available in this scenario."
msgstr "%s natie niet beschikbaar in dit scenarie."
-#: server/srv_main.c:1464
+#: server/srv_main.c:1496
#, c-format
msgid "%s nation is already in use."
msgstr "De %s natie wordt al gespeeld."
-#: server/srv_main.c:1482
+#: server/srv_main.c:1514
#, c-format
msgid "%s is the %s ruler %s."
msgstr "%s is de %s heerser %s."
-#: server/srv_main.c:1538
+#: server/srv_main.c:1570
#, 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:1582 server/srv_main.c:1586
+#: server/srv_main.c:1614 server/srv_main.c:1618
#, 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:1728
+#: server/srv_main.c:1760
#, c-format
msgid "Player %d"
msgstr "Speler %d"
-#: server/srv_main.c:1739 server/srv_main.c:1745
+#: server/srv_main.c:1771 server/srv_main.c:1777
#, c-format
msgid "%s rules the %s."
msgstr "%s regeert de %s."
-#: server/srv_main.c:1910
+#: server/srv_main.c:1942
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
msgstr ""
-#: server/srv_main.c:1961
+#: server/srv_main.c:1993
#, c-format
msgid "Sending info to metaserver [%s]"
msgstr "Zend info naar metaserver [%s]"
-#: server/srv_main.c:1992
+#: server/srv_main.c:2024
msgid "The game is over..."
msgstr "Het spel is voorbij..."
-#: server/srv_main.c:2205
+#: server/srv_main.c:2237
msgid "Now accepting new client connections."
msgstr "Accepteer nu nieuwe client-verbindingen."
@@ -6311,24 +6299,24 @@ msgid "Barbarian"
msgstr "Barbaars"
#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2030 client/gui-sdl/plrdlg.c:645
+#: client/gui-gtk-2.0/pages.c:2102 client/gui-sdl/plrdlg.c:645
#: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
msgid "AI"
msgstr "KI"
#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
+#: 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
msgid "Human"
msgstr "Menselijk"
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
-#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
+#: 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
msgid "Alive"
msgstr "Actief"
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
#: client/gui-win32/connectdlg.c:200
msgid "Dead"
msgstr "Dood"
@@ -6600,9 +6588,9 @@ 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:242
-#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
-#: client/text.c:1201
+#: 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
#, c-format
msgid "?clistmore:, %s"
msgstr ", %s"
@@ -6855,7 +6843,7 @@ msgstr "Alleen %s kunnen aanvallen vanuit zee."
msgid "Cannot attack from sea."
msgstr "Kan niet aanvallen vanuit zee."
-#: server/unithand.c:996 server/unittools.c:2103
+#: server/unithand.c:996 server/unittools.c:2137
msgid "Cannot attack unless you declare war first."
msgstr "U kunt niet aanvallen voordat u de oorlog verklaard heeft."
@@ -6954,103 +6942,103 @@ msgid "%s was upgraded for free to %s."
msgstr "%s is gratis opgewaardeerd naar %s."
#: server/unittools.c:297
-#, c-format
-msgid "Not enough gold. %s disbanded"
+#, fuzzy, c-format
+msgid "Not enough gold to pay upkeep for %s. Unit disbanded."
msgstr "Niet genoeg goud. %s ontbonden."
-#: server/unittools.c:342
+#: server/unittools.c:343
#, c-format
msgid "Your %s has run out of hit points."
msgstr "Uw %s heeft geen slagpunten meer."
-#: server/unittools.c:358
+#: server/unittools.c:359
#, c-format
msgid "Your %s has been lost on the high seas."
msgstr "Uw %s is verloren gegaan op de diepzee."
-#: server/unittools.c:365
+#: server/unittools.c:366
#, c-format
msgid "Your %s survived on the high seas and became more experienced!"
msgstr "Uw %s overleefde de diepzee en werd meer ervaren!"
-#: server/unittools.c:376
+#: server/unittools.c:377
#, c-format
msgid "Your %s has been lost on unsafe terrain."
msgstr "Uw %s is verloren gegaan op onveilig terrein."
-#: server/unittools.c:430
+#: server/unittools.c:431
#, c-format
msgid "Your %s has returned to refuel."
msgstr "Uw %s is teruggekeerd om te tanken."
-#: server/unittools.c:454
+#: server/unittools.c:455
#, c-format
msgid "Your %s has run out of fuel."
msgstr "Uw %s heeft geen brandstof meer."
-#. TRANS: And, <the unit> became ...
-#: server/unittools.c:616
-#, fuzzy
-msgid "And, became more experienced!"
-msgstr " en werden meer ervaren!"
-
#. TRANS: Your <unit> became ...
-#: server/unittools.c:620
+#: server/unittools.c:619
#, c-format
msgid "Your %s became more experienced!"
msgstr "Uw %s werd meer ervaren!"
-#: server/unittools.c:1011
+#: server/unittools.c:1009
#, c-format
msgid "Teleported your %s to %s."
msgstr "Teleporteerde uw %s naar %s."
-#: server/unittools.c:1041
+#. TRANS: A unit is moved to resolve stack conflicts.
+#: server/unittools.c:1065
+#, fuzzy, c-format
+msgid "Moved your %s."
+msgstr "Ontbond uw %s."
+
+#: server/unittools.c:1076
#, c-format
msgid "Disbanded your %s."
msgstr "Ontbond uw %s."
-#: server/unittools.c:1363
+#: server/unittools.c:1397
#, 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:1367
+#: server/unittools.c:1401
#, 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:1469
+#: server/unittools.c:1503
#, 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:1478
+#: server/unittools.c:1512
#, c-format
msgid "%s lost when %s was lost."
msgstr "%s verloren toen %s verloren ging."
-#: server/unittools.c:1527
+#: server/unittools.c:1561
#, 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:1545
+#: server/unittools.c:1579
#, 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:1554 server/unittools.c:1612
+#: server/unittools.c:1588 server/unittools.c:1646
#, 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:1588
+#: server/unittools.c:1622
#, fuzzy, c-format
msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
msgid_plural ""
@@ -7062,14 +7050,14 @@ msgstr[1] ""
#. TRANS: "Cannon lost when the Polish Destroyer
#. * attacked the German Musketeers."
-#: server/unittools.c:1621
+#: server/unittools.c:1655
#, 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:1636
+#: server/unittools.c:1670
#, 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."
@@ -7077,7 +7065,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:1646
+#: server/unittools.c:1680
#, 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."
@@ -7087,198 +7075,198 @@ 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:1660
+#: server/unittools.c:1694
#, 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:1928
+#: server/unittools.c:1962
#, c-format
msgid "Your %s was nuked by %s."
msgstr "Uw %s is geatomiseerd door %s."
-#: server/unittools.c:1931 server/unittools.c:1947
+#: server/unittools.c:1965 server/unittools.c:1981
msgid "yourself"
msgstr "uzelf"
-#: server/unittools.c:1935
+#: server/unittools.c:1969
#, fuzzy, c-format
msgid "The %s %s was nuked."
msgstr "%s's %s is geatomiseerd."
-#: server/unittools.c:1944
+#: server/unittools.c:1978
#, c-format
msgid "%s was nuked by %s."
msgstr "%s is geatomiseerd door %s."
-#: server/unittools.c:1952
+#: server/unittools.c:1986
#, c-format
msgid "You nuked %s."
msgstr "U atomiseerde %s."
-#: server/unittools.c:1993
+#: server/unittools.c:2027
#, fuzzy, c-format
msgid "The %s detonated a nuke!"
msgstr "%s heeft een kernraket tot ontploffing gebracht."
-#: server/unittools.c:2017
+#: server/unittools.c:2051
#, c-format
msgid "%s transported successfully."
msgstr "%s succesvol overgeplaatst."
-#: server/unittools.c:2069
+#: server/unittools.c:2103
msgid "This unit type can not be paradropped."
msgstr "Deze eenheid kan niet worden geparadropt."
-#: server/unittools.c:2079
+#: server/unittools.c:2113
#, fuzzy
msgid "You cannot paradrop a unit that is transporting other units."
msgstr "Deze eenheid kan niet paradroppen op een transporteenheid."
-#: server/unittools.c:2085
+#: server/unittools.c:2119
msgid "The destination location is not known."
msgstr "De plaats van bestemming is onbekend."
-#: server/unittools.c:2092
+#: server/unittools.c:2126
#, c-format
msgid "This unit cannot paradrop into %s."
msgstr "Deze eenheid kan niet paradroppen in %s."
-#: server/unittools.c:2112
+#: server/unittools.c:2146
#, 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:2123
+#: server/unittools.c:2157
#, 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:2136
+#: server/unittools.c:2170
#, 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:2158
+#: server/unittools.c:2192
#, c-format
msgid "You found %d gold."
msgstr "U vond %d goud."
-#: server/unittools.c:2175
+#: server/unittools.c:2209
#, c-format
msgid "You found %s in ancient scrolls of wisdom."
msgstr "U hebt %s ontdekt in oude boekrollen met wijsheid."
-#: server/unittools.c:2182
+#: server/unittools.c:2216
#, 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:2196
+#: server/unittools.c:2230
msgid "A band of friendly mercenaries joins your cause."
msgstr "Een troep vriendelijke huurlingen sluit zich bij u aan."
-#: server/unittools.c:2214
+#: server/unittools.c:2248
msgid "An abandoned village is here."
msgstr "Hier is een verlaten dorp."
-#: server/unittools.c:2224
+#: server/unittools.c:2258
msgid "You have unleashed a horde of barbarians!"
msgstr "U hebt een horde barbaren ontketend!"
-#: server/unittools.c:2227
+#: server/unittools.c:2261
#, c-format
msgid "Your %s has been killed by barbarians!"
msgstr "Uw %s is vermoord door barbaren!"
-#: server/unittools.c:2243
+#: server/unittools.c:2277
msgid "You found a friendly city."
msgstr "U heeft een bevriende stad gevonden."
-#: server/unittools.c:2257
+#: server/unittools.c:2291
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:2282
+#: server/unittools.c:2316
msgid "Your overflight frightens the tribe; they scatter in terror."
msgstr ""
"Uw verkenningsvlucht beangstigt de stam; zij verspreiden zich in terreur."
-#: server/unittools.c:2540
+#: server/unittools.c:2574
#, 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:2989
+#: server/unittools.c:3023
#, 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:3041
+#: server/unittools.c:3075
#, 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:3054
+#: server/unittools.c:3088
#, 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:3068
+#: server/unittools.c:3102
#, 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:3078
+#: server/unittools.c:3112
#, 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:3104
+#: server/unittools.c:3138
#, c-format
msgid "Orders for %s aborted because of failed move."
msgstr "Orders voor %s afgebroken door een gefaalde verplaatsing."
-#: server/unittools.c:3145
+#: server/unittools.c:3179
#, c-format
msgid "Attempt to change homecity for %s failed."
msgstr "Hoofdstad verplaatsen voor %s is mislukt."
-#: server/unittools.c:3156
+#: server/unittools.c:3190
#, c-format
msgid "Attempt to establish trade route for %s failed."
msgstr "Poging om handelsroute noor %s te vestigen mislukt."
-#: server/unittools.c:3168
+#: server/unittools.c:3202
#, c-format
msgid "Attempt to build wonder for %s failed."
msgstr "Poging om wonder te bouwen voor %s mislukt."
-#: server/unittools.c:3177
+#: server/unittools.c:3211
#, c-format
msgid "Your %s has invalid orders."
msgstr "Uw %s heeft ongeldige orders."
-#: server/generator/mapgen.c:1737
+#: server/generator/mapgen.c:1771
msgid "High landmass - this may take a few seconds."
msgstr "Grote landmassa - dit kan een paar seconden duren."
-#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
+#: server/generator/mapgen.c:1969 server/generator/mapgen.c:2039
#, c-format
msgid "Falling back to generator %d."
msgstr "Val terug op generator %d."
-#: server/generator/mapgen.c:2025
+#: server/generator/mapgen.c:2059
msgid "Generator 3 didn't place all big islands."
msgstr "Generator 3 kon niet alle grote eilanden plaatsen."
-#: server/generator/mapgen.c:2054
+#: server/generator/mapgen.c:2088
#, c-format
msgid "Generator 3 left %li landmass unplaced."
msgstr "Generator 3 liet %li landmassa ongeplaatst."
@@ -7387,7 +7375,7 @@ msgid_plural "%3d turns"
msgstr[0] "%3d beurt"
msgstr[1] "%3d beurten"
-#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:631
#: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
@@ -7505,352 +7493,352 @@ msgstr "?city_state:Vrede"
msgid "(worklist)"
msgstr "(werklijst)"
-#: client/cityrepdata.c:447
-msgid "Special"
-msgstr "Speciaal"
-
-#: client/cityrepdata.c:448
-msgid "?entertainers/scientists/taxmen:E/S/T"
-msgstr "?showbiz/wetenschappers/belastingsambtenaren:S/W/B"
+#: client/cityrepdata.c:446
+msgid "?city:Name"
+msgstr "?stad:Naam"
-#: client/cityrepdata.c:449
-msgid "Entertainers, Scientists, Taxmen"
-msgstr "Showbiz, Wetenschappers, Belastingsambtenaren"
+#: client/cityrepdata.c:446 client/gui-sdl/cityrep.c:169
+msgid "City Name"
+msgstr "Stadsnaam"
-#: client/cityrepdata.c:452
+#: client/cityrepdata.c:448
#, fuzzy
-msgid "Concise + Rapture, - Disorder"
-msgstr "Beknopt + Extase, - Onlusten"
+msgid "?size [short]:Sz"
+msgstr "?grootte:Gr"
-#: client/cityrepdata.c:454 client/plrdlg_common.c:261
+#: client/cityrepdata.c:448
+msgid "Size"
+msgstr "Grootte"
+
+#: client/cityrepdata.c:450 client/plrdlg_common.c:261
#: client/gui-win32/plrdlg.c:337
msgid "State"
msgstr "Toestand"
-#: client/cityrepdata.c:454
+#: client/cityrepdata.c:450
msgid "Rapture/Peace/Disorder"
msgstr "Extase/Vrede/Onlusten"
+#: client/cityrepdata.c:452
+#, fuzzy
+msgid "Concise *=Rapture, X=Disorder"
+msgstr "Beknopt + Extase, - Onlusten"
+
+#: client/cityrepdata.c:456
+msgid "Special"
+msgstr "Speciaal"
+
#: client/cityrepdata.c:457
+msgid "?entertainers/scientists/taxmen:E/S/T"
+msgstr "?showbiz/wetenschappers/belastingsambtenaren:S/W/B"
+
+#: client/cityrepdata.c:458
+msgid "Entertainers, Scientists, Taxmen"
+msgstr "Showbiz, Wetenschappers, Belastingsambtenaren"
+
+#: client/cityrepdata.c:461
msgid "?Happy workers:H"
msgstr "?Gelukkige arbeiders:G"
-#: client/cityrepdata.c:457
+#: client/cityrepdata.c:461
msgid "Workers: Happy"
msgstr "Arbeiders: Gelukkig"
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
msgid "?Content workers:C"
msgstr "?Tevreden arbeiders:T"
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
msgid "Workers: Content"
msgstr "Arbeiders: Tevreden"
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
msgid "?Unhappy workers:U"
msgstr "?Ontevreden arbeiders:O"
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
msgid "Workers: Unhappy"
msgstr "Arbeiders: Ontevreden"
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
msgid "?Angry workers:A"
msgstr "?Kwade arbeiders:K"
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
msgid "Workers: Angry"
msgstr "Arbeiders: Kwaad"
-#: client/cityrepdata.c:465 client/gui-xaw/citydlg.c:2401
-#: data/default/units.ruleset:238
-msgid "Workers"
+#: client/cityrepdata.c:469 client/gui-xaw/citydlg.c:2402
+#, fuzzy
+msgid "?city:Workers"
msgstr "Arbeiders"
-#: client/cityrepdata.c:466
+#: client/cityrepdata.c:470
msgid "?happy/content/unhappy/angry:H/C/U/A"
msgstr "?gelukkig/tevreden/ontevreden/kwaad:G/T/O/K"
-#: client/cityrepdata.c:467
+#: client/cityrepdata.c:471
msgid "Workers: Happy, Content, Unhappy, Angry"
msgstr "Arbeiders: Gelukkig, Tevreden, Ontevreden, Kwaad"
-#: client/cityrepdata.c:470 client/cityrepdata.c:472
+#: client/cityrepdata.c:474 client/cityrepdata.c:476
msgid "Best"
msgstr "Beste"
-#: client/cityrepdata.c:470
+#: client/cityrepdata.c:474
msgid "attack"
msgstr "aanval"
-#: client/cityrepdata.c:471
+#: client/cityrepdata.c:475
msgid "Best attacking units"
msgstr "Beste aanvallende eenheden"
-#: client/cityrepdata.c:472
+#: client/cityrepdata.c:476
msgid "defense"
msgstr "verdediging"
-#: client/cityrepdata.c:473
+#: client/cityrepdata.c:477
msgid "Best defending units"
msgstr "Beste verdedigende eenheden"
-#: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
-#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
-#: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
-#: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
-#: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
-#: client/gui-win32/menu.c:351 client/gui-win32/repodlgs.c:616
-#: client/gui-win32/repodlgs.c:707 client/gui-win32/repodlgs.c:716
-#: client/gui-xaw/menu.c:157 client/gui-xaw/menu.c:219
-#: client/gui-xaw/menu.c:242 client/gui-xaw/repodlgs.c:881
-#: client/gui-xaw/repodlgs.c:1069 data/Freeciv.in:1895 data/helpdata.txt:909
+#: client/cityrepdata.c:478 client/cityrepdata.c:482
+#: client/gui-gtk-2.0/cityrep.c:1437 client/gui-gtk-2.0/cityrep.c:1456
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-gtk-2.0/cityrep.c:1494
+#: client/gui-gtk-2.0/cityrep.c:1514 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/repodlgs.c:960 client/gui-sdl/helpdlg.c:688
+#: client/gui-sdl/mapctrl.c:1605 client/gui-sdl/optiondlg.c:1827
+#: client/gui-sdl/repodlgs.c:356 client/gui-win32/menu.c:351
+#: client/gui-win32/repodlgs.c:616 client/gui-win32/repodlgs.c:707
+#: client/gui-win32/repodlgs.c:716 client/gui-xaw/menu.c:157
+#: client/gui-xaw/menu.c:219 client/gui-xaw/menu.c:242
+#: client/gui-xaw/repodlgs.c:881 client/gui-xaw/repodlgs.c:1069
+#: data/Freeciv.in:1895 data/helpdata.txt:909
msgid "Units"
msgstr "Eenheden"
#. TRANS: Header "Number of units inside city"
-#: client/cityrepdata.c:476
+#: client/cityrepdata.c:480
#, fuzzy
msgid "?Present (units):Here"
msgstr "?Aanwezig(e eenheden):Anw"
-#: client/cityrepdata.c:477
+#: client/cityrepdata.c:481
msgid "Number of units present"
msgstr "Aantal aanwezige eenheden"
#. TRANS: Header "Number of units supported by given city"
-#: client/cityrepdata.c:480
+#: client/cityrepdata.c:484
#, fuzzy
msgid "?Supported (units):Owned"
msgstr "?Ondersteund(e eenheden):Ond"
-#: client/cityrepdata.c:481
+#: client/cityrepdata.c:485
msgid "Number of units supported"
msgstr "Aantal ondersteunde eenheden"
#. TRANS: Header "It will take this many turns before city grows"
-#: client/cityrepdata.c:484
+#: client/cityrepdata.c:488
#, fuzzy
msgid "?food (population):Grow"
msgstr "Groei"
-#: client/cityrepdata.c:485 client/cityrepdata.c:530
+#: client/cityrepdata.c:489 client/cityrepdata.c:528
#, fuzzy
msgid "?Stock/Target:(Have/Need)"
msgstr "(Voorraad/Doel)"
-#: client/cityrepdata.c:486
+#: client/cityrepdata.c:490
msgid "Turns until growth/famine"
msgstr "Beurten tot groei/hongersnood"
-#: client/cityrepdata.c:488
-#, fuzzy
-msgid "?size [short]:Sz"
-msgstr "?grootte:Gr"
-
-#: client/cityrepdata.c:488
-msgid "Size"
-msgstr "Grootte"
-
-#: client/cityrepdata.c:492
-msgid "?city:Name"
-msgstr "?stad:Naam"
-
-#: client/cityrepdata.c:492 client/gui-sdl/cityrep.c:169
-msgid "City Name"
-msgstr "Stadsnaam"
-
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
msgid "Surplus"
msgstr "Overcapaciteit"
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
msgid "?food/production/trade:F/P/T"
msgstr "?voeding/prod./handel:V/P/H"
-#: client/cityrepdata.c:496
+#: client/cityrepdata.c:494
msgid "Surplus: Food, Production, Trade"
msgstr "Overcapaciteit: Voeding, Productie, Handel"
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
#, fuzzy
msgid "?Food surplus [short]:+F"
msgstr "?Voedingsoverschot:+V"
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
msgid "Surplus: Food"
msgstr "Overcapaciteit: Voeding"
-#: client/cityrepdata.c:500
+#: client/cityrepdata.c:498
#, fuzzy
msgid "?Production surplus [short]:+P"
msgstr "?Productie-overschot:+P"
-#: client/cityrepdata.c:501
+#: client/cityrepdata.c:499
msgid "Surplus: Production"
msgstr "Overcapaciteit: Productie"
-#: client/cityrepdata.c:502
+#: client/cityrepdata.c:500
#, fuzzy
msgid "?Production loss (waste) [short]:-P"
msgstr "-P"
-#: client/cityrepdata.c:503
+#: client/cityrepdata.c:501
msgid "Waste"
msgstr "Afval"
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
#, fuzzy
msgid "?Trade surplus [short]:+T"
msgstr "?Handelsoverschot:+H"
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
msgid "Surplus: Trade"
msgstr "Overcapaciteit: Handel"
-#: client/cityrepdata.c:506
+#: client/cityrepdata.c:504
#, fuzzy
msgid "?Trade loss (corruption) [short]:-T"
msgstr "-H"
-#: client/cityrepdata.c:507
+#: client/cityrepdata.c:505
msgid "Corruption"
msgstr "Corruptie"
-#: client/cityrepdata.c:509 client/gui-gtk-2.0/repodlgs.c:654
+#: client/cityrepdata.c:507 client/gui-gtk-2.0/repodlgs.c:654
#: client/gui-sdl/mapctrl.c:1400 client/gui-win32/repodlgs.c:334
#: client/gui-xaw/menu.c:222 client/gui-xaw/repodlgs.c:644
#: client/gui-xaw/repodlgs.c:773 data/Freeciv.in:1819
msgid "Economy"
msgstr "Economie"
-#: client/cityrepdata.c:509
+#: client/cityrepdata.c:507
msgid "?gold/luxury/science:G/L/S"
msgstr "?goud/luxe/wet.:G/L/W"
-#: client/cityrepdata.c:510
+#: client/cityrepdata.c:508
msgid "Economy: Gold, Luxuries, Science"
msgstr "Economie: Goud, Luxe, Wetenschap"
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
msgid "?Gold:G"
msgstr "?Goud:G"
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
msgid "Economy: Gold"
msgstr "Economie: Goud"
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
msgid "?Luxury:L"
msgstr "?Luxe:L"
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
msgid "Economy: Luxury"
msgstr "Economie: Luxe"
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
msgid "?Science:S"
msgstr "?Wetenschap:W"
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
msgid "Economy: Science"
msgstr "Economie: Wetenschap"
-#: client/cityrepdata.c:518
+#: client/cityrepdata.c:516
#, fuzzy
msgid "?number_trade_routes:n"
msgstr "?handelsroutes:a"
-#: client/cityrepdata.c:518
+#: client/cityrepdata.c:516
#, fuzzy
msgid "?number_trade_routes:R"
msgstr "?handelsroutes:H"
-#: client/cityrepdata.c:519
+#: client/cityrepdata.c:517
msgid "Number of Trade Routes"
msgstr "Aantal Handelsroutes"
-#: client/cityrepdata.c:521
+#: client/cityrepdata.c:519
msgid "?pollution [short]:Pol"
msgstr "?verontreiniging:Ver"
-#: client/cityrepdata.c:523
+#: client/cityrepdata.c:521
msgid "?cma:Governor"
msgstr "?cma:Gouverneur"
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
-#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
-#: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
-#: data/Freeciv.in:1459 data/helpdata.txt:820
+#: client/cityrepdata.c:521 client/gui-gtk-2.0/cityrep.c:1766
+#: client/gui-sdl/citydlg.c:3809 client/gui-sdl/cma_fe.c:858
+#: client/gui-win32/citydlg.c:726 data/Freeciv.in:1459 data/helpdata.txt:820
msgid "Citizen Governor"
msgstr "Stedeling Gouverneur"
-#: client/cityrepdata.c:526
+#: client/cityrepdata.c:524
#, fuzzy
msgid "Turns/Buy"
msgstr "Zetten/Koop"
-#: client/cityrepdata.c:529 client/cityrepdata.c:531
+#: client/cityrepdata.c:527 client/cityrepdata.c:529
msgid "Currently Building"
msgstr "In Aanbouw"
-#: client/cityrepdata.c:575
+#: client/cityrepdata.c:573
msgid "?specialist:S"
msgstr "?specialist:S"
-#: client/cityrepdata.c:578
+#: client/cityrepdata.c:576
#, fuzzy
msgid "Specialists"
msgstr "Specialisten"
-#: client/civclient.c:239
+#: client/civclient.c:240
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr " -a, --autoconnect\tSla verbindingsdialoog over\n"
-#: client/civclient.c:249
+#: client/civclient.c:250
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:251
+#: client/civclient.c:252
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:253
+#: client/civclient.c:254
msgid " -n, --name NAME\tUse NAME as name\n"
msgstr " -n, --name NAAM\tGebruik NAAM als naam\n"
-#: client/civclient.c:255
+#: client/civclient.c:256
#, 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:257
+#: client/civclient.c:258
#, 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:259
+#: client/civclient.c:260
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:262
+#: client/civclient.c:263
#, 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:264
+#: client/civclient.c:265
msgid " -S, --Sound FILE\tRead sound tags from FILE\n"
msgstr " -S, --Sound BESTAND\tLees geluids info van BESTAND\n"
-#: client/civclient.c:265
+#: client/civclient.c:266
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:268
+#: client/civclient.c:269
#, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -7860,145 +7848,155 @@ msgstr ""
"\t\t\tProbeer \"%s -- --help\" voor details.\n"
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:273
+#: client/civclient.c:274
#, fuzzy, c-format
msgid "Report bugs at %s\n"
msgstr "Rapporteer fouten aan <%s>.\n"
-#: client/civclient.c:297
+#: client/civclient.c:298
#, c-format
msgid "Invalid port \"%s\" specified with --port option.\n"
msgstr "Ongeldige poort \"%s\" opgegeven met de --port optie.\n"
-#: client/civclient.c:299 client/civclient.c:314
+#: client/civclient.c:300 client/civclient.c:315
msgid "Try using --help.\n"
msgstr "Probeer met --help.\n"
-#: client/civclient.c:312
+#: client/civclient.c:313
#, 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:325
+#: client/civclient.c:326
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr "Niet-herkende optie: \"%s\"\n"
-#: client/civclient.c:539
+#: client/civclient.c:391
+#, fuzzy, c-format
+msgid "Updating old metaserver address \"%s\"."
+msgstr "metaserver <adres>"
+
+#: client/civclient.c:394
+#, fuzzy, c-format
+msgid "Default metaserver has been set to \"%s\"."
+msgstr "Optie: %s is ingesteld op \"%s\"."
+
+#: client/civclient.c:550
msgid "Game started."
msgstr "Spel begonnen."
-#: client/civclient.c:577
+#: client/civclient.c:588
msgid "There was an error while auto connecting; aborting."
msgstr ""
"Er trad een fout op bij het automatisch maken van een verbinding; afbreken."
-#: client/climisc.c:176
+#: client/climisc.c:177
#, c-format
msgid "Changing production of every %s into %s."
msgstr "Verander productie van elke %s in %s."
-#: client/climisc.c:214
+#: client/climisc.c:215
msgid "?embassy:Both"
msgstr "?ambassade:Beide"
-#: client/climisc.c:216
+#: client/climisc.c:217
msgid "?embassy:Yes"
msgstr "?ambassade:Ja"
-#: client/climisc.c:219
+#: client/climisc.c:220
msgid "?embassy:With Us"
msgstr "?ambassade:Met Ons"
-#: client/climisc.c:222
+#: client/climisc.c:223
msgid "?embassy:Contact"
msgstr "?ambassade:Contact"
-#: client/climisc.c:224
+#: client/climisc.c:225
msgid "?embassy:No Contact"
msgstr "?ambassade:Geen Contact"
-#: client/climisc.c:236
+#: client/climisc.c:237
msgid "?vision:Both"
msgstr "?zicht:Beide"
-#: client/climisc.c:238
+#: client/climisc.c:239
msgid "?vision:To Them"
msgstr "?zicht:Aan Hen"
-#: client/climisc.c:241
+#: client/climisc.c:242
msgid "?vision:To Us"
msgstr "?zicht:Aan Ons"
-#: client/climisc.c:257 client/climisc.c:264
+#: client/climisc.c:258 client/climisc.c:265
#, c-format
msgid "The %s give %s"
msgstr "De %s geven %s"
-#: client/climisc.c:268
+#: client/climisc.c:269
#, c-format
msgid "The %s give unknown city."
msgstr "De %s geven onbekende stad."
-#: client/climisc.c:273
+#: client/climisc.c:274
#, c-format
msgid "The %s give %d gold"
msgstr "De %s geven %d goud"
-#: client/climisc.c:278
+#: client/climisc.c:279
#, c-format
msgid "The %s give their worldmap"
msgstr "De %s geven hun wereldkaart"
-#: client/climisc.c:282
+#: client/climisc.c:283
#, c-format
msgid "The %s give their seamap"
msgstr "De %s geven hun zeekaart"
-#: client/climisc.c:286
+#: client/climisc.c:287
msgid "The parties agree on a cease-fire"
msgstr "De partijen gaan akkoord met een wapenstilstand"
-#: client/climisc.c:289
+#: client/climisc.c:290
msgid "The parties agree on a peace"
msgstr "De partijen gaan akkoord met vrede"
-#: client/climisc.c:292
+#: client/climisc.c:293
msgid "The parties create an alliance"
msgstr "De partijen sluiten een alliantie"
-#: client/climisc.c:295
+#: client/climisc.c:296
#, c-format
msgid "The %s give shared vision"
msgstr "De %s geven gedeelde waarneming"
-#: client/climisc.c:299
+#: client/climisc.c:300
#, c-format
msgid "The %s give an embassy"
msgstr "De %s geven een amassade"
-#: client/climisc.c:902
+#: client/climisc.c:906
msgid "Popup Request"
msgstr "Popup Verzoek"
-#: client/climisc.c:932
+#: client/climisc.c:936
msgid "Exporting output window to civgame.log ..."
msgstr "Exporteer uitvoorvenster naar civgame.log ..."
-#: client/climisc.c:936
+#: client/climisc.c:940
msgid "Export complete."
msgstr "Export volledig."
-#: client/climisc.c:938
+#: client/climisc.c:942
msgid "Export failed, couldn't write to file."
msgstr "Exporteren mislukt, kan niet schrijven naar bestand."
-#: client/climisc.c:1038
+#: client/climisc.c:1042
#, c-format
msgid "You don't buy %s in %s!"
msgstr "U koopt geen %s in %s!"
-#: client/climisc.c:1056
+#: client/climisc.c:1060
#, c-format
msgid "%s costs %d gold and you only have %d gold."
msgstr "%s kost %d goud en u hebt slechts %d goud."
@@ -8048,19 +8046,19 @@ msgstr ""
"Maak automatisch verbinding met server \"%s\" op poort %d als \"%s\" elke %f "
"seconden voor %d keren"
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1289
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
msgid "novice"
msgstr "beginner"
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1289
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1358
msgid "easy"
msgstr "gemakkelijk"
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1290
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
msgid "normal"
msgstr "normaal"
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1290
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
msgid "hard"
msgstr "moeilijk"
@@ -8089,38 +8087,42 @@ msgid "We probably couldn't start it from here."
msgstr "We zouden het waarschijnlijk niet van hieruit kunnen starten."
#: client/connectdlg_common.c:470
-msgid "We have control of the server (command access level hack)"
+#, fuzzy
+msgid ""
+"Established control over the server. You have command access level 'hack'."
msgstr "We hebben serverbeheer (toegangsniveau hack)"
#: client/connectdlg_common.c:475
-msgid "We can't take control of server, attempting to kill it."
-msgstr "We kunnen de server niet beheren, proberen hem nu af te sluiten."
+msgid ""
+"Failed to obtain the required access level to take control of the server. "
+"The server will now be shutdown."
+msgstr ""
-#: client/control.c:1104
+#: client/control.c:1123
msgid "Only transporter units can be unloaded."
msgstr "Alleen vrachtschepen kunnen uitladen."
-#: client/control.c:1353
+#: client/control.c:1425
msgid "Only settler units can be put into auto mode."
msgstr "Alleen kolonisten kunnen in auto-modus worden gezet."
-#: client/control.c:1444
+#: client/control.c:1516
msgid "Only nuclear units can do this."
msgstr "Alleen nucleaire eenheden kunnen dit."
-#: client/control.c:1473
+#: client/control.c:1545
msgid "Only paratrooper units can do this."
msgstr "Alleen paratroepen eenheden kunnen dit."
-#: client/control.c:1921
+#: client/control.c:2020
msgid "Too far for this unit."
msgstr "Te ver voor deze eenheid."
-#: client/control.c:2131 client/control.c:2161 client/control.c:2177
+#: client/control.c:2230 client/control.c:2260 client/control.c:2276
msgid "Didn't find a route to the destination!"
msgstr "Kon geen route naar de bestemming vinden!"
-#: client/control.c:2221
+#: client/control.c:2320
msgid "Oh my! You seem to have no capital!"
msgstr "Nee maar! U lijkt geen hoofdstad te hebben!"
@@ -8206,16 +8208,16 @@ msgid "Allows %s (with %s)."
msgstr "Staat %s toe (met %s)."
#. TRANS: preserve single space at beginning
-#: client/helpdata.c:418
+#: client/helpdata.c:416
msgid " Rivers"
msgstr " Rivieren"
-#: client/helpdata.c:576
+#: client/helpdata.c:574
#, c-format
msgid "Sorry, no help topic for %s.\n"
msgstr "Sorry, geen help onderwerp voor %s.\n"
-#: client/helpdata.c:580
+#: client/helpdata.c:578
#, c-format
msgid ""
"Sorry, no help topic for %s.\n"
@@ -8226,7 +8228,7 @@ msgstr ""
"Deze pagina is auto-gegenereerd.\n"
"\n"
-#: client/helpdata.c:670
+#: client/helpdata.c:668
#, fuzzy
msgid ""
"Requires: Nothing\n"
@@ -8235,79 +8237,79 @@ msgstr ""
"Dit heeft het %s gebouw nodig.\n"
"\n"
-#: client/helpdata.c:675
+#: client/helpdata.c:673
#, c-format
msgid "* The discovery of %s will make %s obsolete.\n"
msgstr "* De ontdekking van %s zal %s overbodig maken.\n"
-#: client/helpdata.c:694
+#: client/helpdata.c:692
#, c-format
msgid "* Allows all players with knowledge of %s to build %s units.\n"
msgstr "* Staat alle spelers met kennis van %s toe om %s eenheden te bouwen.\n"
-#: client/helpdata.c:706
+#: client/helpdata.c:704
#, c-format
msgid "* Allows %s (with %s).\n"
msgstr "* Staat %s toe (met %s).\n"
-#: client/helpdata.c:710
+#: client/helpdata.c:708
#, c-format
msgid "* Allows %s.\n"
msgstr "* Staat %s toe.\n"
-#: client/helpdata.c:780
+#: client/helpdata.c:778
#, fuzzy, c-format
msgid "* Can only be built if there is %s in the city.\n"
msgstr "* Kan alleen gebouwd worden met %s als overheid.\n"
-#: client/helpdata.c:786
+#: client/helpdata.c:784
#, c-format
msgid "* Can only be built with %s as government.\n"
msgstr "* Kan alleen gebouwd worden met %s als overheid.\n"
-#: client/helpdata.c:791
+#: client/helpdata.c:789
msgid "* May not be built in cities.\n"
msgstr "* Kan niet in steden gebouwd worden.\n"
-#: client/helpdata.c:794
+#: client/helpdata.c:792
msgid "* Never has a home city.\n"
msgstr "* Heeft nooit een thuisstad.\n"
-#: client/helpdata.c:797
+#: client/helpdata.c:795
msgid "* Losing this unit will lose you the game!\n"
msgstr "* Deze eenheid verliezen is het spel verliezen!\n"
-#: client/helpdata.c:801
+#: client/helpdata.c:799
msgid "* Each player may only have one of this type of unit.\n"
msgstr "* Elke speler mag maar een eenheid van dit type hebben.\n"
-#: client/helpdata.c:805
+#: client/helpdata.c:803
#, c-format
msgid "* Requires %d population to build.\n"
msgstr "* Vereist %d bevolking om te bouwen.\n"
-#: client/helpdata.c:811
+#: client/helpdata.c:809
#, c-format
msgid "* Can carry and refuel %d air unit.\n"
msgid_plural "* Can carry and refuel %d air units.\n"
msgstr[0] "* Kan %d luchteenheid vervoeren en van brandstof voorzien.\n"
msgstr[1] "* Kan %d luchteenheden vervoeren en van brandstof voorzien.\n"
-#: client/helpdata.c:816
+#: client/helpdata.c:814
#, c-format
msgid "* Can carry and refuel %d missile unit.\n"
msgid_plural "* Can carry and refuel %d missile units.\n"
msgstr[0] "* Kan %d raketeenheid vervoeren en van brandstof voorzien.\n"
msgstr[1] "* Kan %d raketeenheden vervoeren en van brandstof voorzien.\n"
-#: client/helpdata.c:821
+#: client/helpdata.c:819
#, c-format
msgid "* Can carry %d ground unit across water.\n"
msgid_plural "* Can carry %d ground units across water.\n"
msgstr[0] "* Kan %d landeenheid over water vervoeren.\n"
msgstr[1] "* Kan %d landeenheden over water vervoeren.\n"
-#: client/helpdata.c:830
+#: client/helpdata.c:828
msgid ""
"* Can establish trade routes (must travel to target city and must be at "
"least 9 tiles [in Manhattan distance] from this unit's home city).\n"
@@ -8315,125 +8317,125 @@ msgstr ""
"* Kan handelsroutes maken (moet naar doelstad gaan, minstens 9 vakjes [in "
"Manhattan afstand] van de thuisstad].\n"
-#: client/helpdata.c:836
+#: client/helpdata.c:834
#, c-format
msgid "* Can help build wonders (adds %d production).\n"
msgstr "* Kan wonderen helpen bouwen (levert %d productie).\n"
-#: client/helpdata.c:840
+#: client/helpdata.c:838
msgid "* May not be disbanded.\n"
msgstr "* Kan niet ontbonden worden.\n"
-#: client/helpdata.c:842
+#: client/helpdata.c:840
#, c-format
msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
msgstr "* Kan ontbonden worden in een stad, recupereert de halve kostprijs.\n"
-#: client/helpdata.c:846
+#: client/helpdata.c:844
msgid "* Can build new cities.\n"
msgstr "* Kan nieuwe steden bouwen.\n"
-#: client/helpdata.c:849
+#: client/helpdata.c:847
#, c-format
msgid "* Can add on %d population to cities of no more than size %d.\n"
msgstr "* Kan %d bevolking bij een stad niet groter dan %d toevoegen.\n"
-#: client/helpdata.c:858
+#: client/helpdata.c:856
msgid "* Can build roads and railroads.\n"
msgstr "* Kan wegen en spoorwegen helpen bouwen.\n"
-#: client/helpdata.c:859
+#: client/helpdata.c:857
msgid "* Can build mines on tiles.\n"
msgstr "* Kan mijnen bouwen.\n"
-#: client/helpdata.c:860
+#: client/helpdata.c:858
msgid "* Can build irrigation on tiles.\n"
msgstr "* Kan irrigatie aanleggen.\n"
-#: client/helpdata.c:865
+#: client/helpdata.c:863
msgid "* Can build farmland.\n"
msgstr "Kan landbouwgrond maken.\n"
-#: client/helpdata.c:869
+#: client/helpdata.c:867
#, c-format
msgid "* Can build farmland (if %s is known).\n"
msgstr "* Kan landbouwgrond maken (als %s bekend is).\n"
-#: client/helpdata.c:873
+#: client/helpdata.c:871
#, c-format
msgid "* Can build farmland (if any of the following are known: %s).\n"
msgstr "* Kan landbouwgrond maken (als een van %s bekend is).\n"
-#: client/helpdata.c:881
+#: client/helpdata.c:879
msgid "* Can build fortresses.\n"
msgstr "* Kan forten bouwen.\n"
-#: client/helpdata.c:885
+#: client/helpdata.c:883
#, c-format
msgid "* Can build fortresses (if %s is known).\n"
msgstr "* Kan forten bouwen (als %s bekend is).\n"
-#: client/helpdata.c:889
+#: client/helpdata.c:887
#, c-format
msgid "* Can build fortresses (if any of the following are known: %s).\n"
msgstr "Kan forten bouwen (als een van %s bekend is).\n"
-#: client/helpdata.c:895
+#: client/helpdata.c:893
msgid "* Can clean pollution from tiles.\n"
msgstr "* Kan vervuiling opruimen.\n"
-#: client/helpdata.c:896
+#: client/helpdata.c:894
msgid "* Can clean nuclear fallout from tiles.\n"
msgstr "* Kan radioactieve besmetting opruimen.\n"
-#: client/helpdata.c:899
+#: client/helpdata.c:897
msgid "* Can transform tiles.\n"
msgstr "* Kan terreintransformaties uitvoeren.\n"
-#: client/helpdata.c:902
+#: client/helpdata.c:900
msgid "* Can build airbases.\n"
msgstr "* Kan vliegvelden bouwen.\n"
-#: client/helpdata.c:906
+#: client/helpdata.c:904
#, c-format
msgid "* May fortify, granting a 50%% defensive bonus.\n"
msgstr "* Kan zich ingraven, geeft 50%% defensiebonus.\n"
-#: client/helpdata.c:909
+#: client/helpdata.c:907
msgid "* May pillage to destroy infrastructure from tiles.\n"
msgstr "* Kan infrastructuur afbreken.\n"
-#: client/helpdata.c:913
+#: client/helpdata.c:911
msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
msgstr ""
"* Kan diplomatieke diensten verrichten, en speciale spionage mogelijkheden.\n"
-#: client/helpdata.c:916
+#: client/helpdata.c:914
msgid "* Can perform diplomatic actions.\n"
msgstr "* Kan diplomatieke diensten verrichten.\n"
-#: client/helpdata.c:920
+#: client/helpdata.c:918
msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
msgstr "*Zal nooit een diplomaat vs diplomaat gevecht verliezen.\n"
-#: client/helpdata.c:923
+#: client/helpdata.c:921
msgid "* May not be bribed.\n"
msgstr "* Kan niet worden omgekocht.\n"
-#: client/helpdata.c:926
+#: client/helpdata.c:924
msgid "* Can attack enemy air units.\n"
msgstr "* Kan vijandelijke luchteenheden aanvallen.\n"
-#: client/helpdata.c:930
+#: client/helpdata.c:928
msgid "* Is invisible except when next to an enemy unit or city.\n"
msgstr ""
"* Is onzichtbaar tenzij direct naast een vijandelijke eenheid of stad.\n"
-#: client/helpdata.c:934
+#: client/helpdata.c:932
msgid "* Can only attack units on ocean squares (no land attacks).\n"
msgstr "* Kan alleen eenheden op zeevlakken aanvallen (geen landaanvallen).\n"
-#: client/helpdata.c:938
+#: client/helpdata.c:936
msgid ""
"* Can attack from aboard sea units: against enemy cities and onto land "
"squares.\n"
@@ -8441,41 +8443,41 @@ msgstr ""
"* Kan aanvallen vanaf zee-eenheden: tegen vijandelijke steden en op "
"landvlakken.\n"
-#: client/helpdata.c:943
+#: client/helpdata.c:941
#, c-format
msgid "* Can be paradropped from a friendly city (Range: %d).\n"
msgstr "* Kan geparadropt worden vanaf een bevriende stad (Bereik: %d).\n"
-#: client/helpdata.c:949
+#: client/helpdata.c:947
msgid "* Gets double defense against units specified as 'mounted'.\n"
msgstr ""
"* Levert dubbele verdediging tegen eenheden aangegeven als 'bereden'.\n"
-#: client/helpdata.c:953
+#: client/helpdata.c:951
msgid "* Counts as 'mounted' against certain defenders.\n"
msgstr "* Telt als 'bereden' tegen bepaalde verdedigers.\n"
-#: client/helpdata.c:957
+#: client/helpdata.c:955
msgid "* A missile unit: gets used up in making an attack.\n"
msgstr "* Een raketeenheid: wordt verbruikt in de aanval.\n"
-#: client/helpdata.c:960
+#: client/helpdata.c:958
msgid "* Making an attack ends this unit's turn.\n"
msgstr "* Een aanval beëindigt de beurt voor deze eenheid.\n"
-#: client/helpdata.c:964
+#: client/helpdata.c:962
msgid "* This unit's attack causes a nuclear explosion!\n"
msgstr "* De aanval van deze eenheid veroorzaakt een nucleaire explosie!\n"
-#: client/helpdata.c:968
+#: client/helpdata.c:966
msgid "* Gets double firepower when attacking cities.\n"
msgstr "* Krijgt dubbele vuurkracht tegen steden.\n"
-#: client/helpdata.c:971
+#: client/helpdata.c:969
msgid "* Ignores the effects of city walls.\n"
msgstr "* Negeert de effecten van stadswallen.\n"
-#: client/helpdata.c:975
+#: client/helpdata.c:973
#, c-format
msgid ""
"* Does bombard attacks (%d per turn). These attacks will only damage (never "
@@ -8484,37 +8486,37 @@ msgstr ""
"* Kan bombarderen (%d per beurt). Deze aanvallen kunnen wel beschadigenmaar "
"de verdediger nooit doden en zijn geen enkel risico voor de aanvaller.\n"
-#: client/helpdata.c:982
+#: client/helpdata.c:980
msgid "* Gets quintuple defense against missiles and aircraft.\n"
msgstr "* Levert vijfvoudige verdediging tegen raketten en vliegtuigen.\n"
-#: client/helpdata.c:986
+#: client/helpdata.c:984
msgid "* Ignores terrain effects (treats all squares as roads).\n"
msgstr "* Negeert terreineffecten (ziet alle vlakken als wegen).\n"
-#: client/helpdata.c:989
+#: client/helpdata.c:987
msgid "* Ignores zones of control.\n"
msgstr "* Negeert invloedssferen.\n"
-#: client/helpdata.c:993
+#: client/helpdata.c:991
msgid "* A non-military unit (cannot attack; no martial law).\n"
msgstr "* Een niet-militaire eenheid (kan niet aanvallen, geen krijgstucht).\n"
-#: client/helpdata.c:997
+#: client/helpdata.c:995
msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
msgstr ""
"* Een veldeenheid: één ontevredenheid is van toepassing zelfs wanneer niet "
"agressief.\n"
-#: client/helpdata.c:1000
+#: client/helpdata.c:998
msgid "* Will never achieve veteran status.\n"
msgstr "* Kan nooit een veteraan worden.\n"
-#: client/helpdata.c:1002
+#: client/helpdata.c:1000
msgid "* May become veteran through training or combat.\n"
msgstr "* Kan door oefening of gevechtservaring een veteraan worden.\n"
-#: client/helpdata.c:1008
+#: client/helpdata.c:1006
#, c-format
msgid ""
"* Must end turn in a city or next to land, or has a 50%% risk of being lost "
@@ -8523,12 +8525,12 @@ msgstr ""
"* Moet beurt in een stad of naast land eindigen, of heeft 50%% kans op "
"vergaan.\n"
-#: client/helpdata.c:1012
+#: client/helpdata.c:1010
#, c-format
msgid "* The discovery of %s reduces the risk to 25%%.\n"
msgstr "* De ontdekking van %s vermindert het risico tot 25%%.\n"
-#: client/helpdata.c:1017
+#: client/helpdata.c:1015
#, c-format
msgid "* %s reduces the risk to 12%%.\n"
msgstr "* %s vermindert het risico tot 12%%.\n"
@@ -8537,27 +8539,27 @@ msgstr "* %s vermindert het risico tot 12%%.\n"
#. * last two elements
#. TRANS: List of possible output types has this between
#. * last two elements
-#: client/helpdata.c:1068 client/helpdata.c:1402
+#: client/helpdata.c:1066 client/helpdata.c:1400
msgid " or "
msgstr " of "
-#: client/helpdata.c:1070 client/helpdata.c:1390
+#: client/helpdata.c:1068 client/helpdata.c:1388
msgid "?or:, "
msgstr "?of:, "
-#: client/helpdata.c:1082
+#: 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"
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:1124
+#: client/helpdata.c:1122
#, 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:1129
+#: client/helpdata.c:1127
#, c-format
msgid ""
"To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8566,91 +8568,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:1137
+#: client/helpdata.c:1135
msgid "You cannot research this technology."
msgstr "U kunt deze technologie niet onderzoeken."
-#: client/helpdata.c:1141
+#: client/helpdata.c:1139
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:1153
+#: client/helpdata.c:1151
#, 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:1158
+#: client/helpdata.c:1156
#, 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:1161
+#: client/helpdata.c:1159
#, 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:1165
+#: client/helpdata.c:1163
msgid "* Increases the pollution generated by the population.\n"
msgstr "* Verhoogt de vervuiling die de bevolking maakt.\n"
-#: client/helpdata.c:1170
+#: client/helpdata.c:1168
#, 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:1177
+#: client/helpdata.c:1175
#, c-format
msgid "* Allows %s to build fortresses.\n"
msgstr "* Staat %s om forten te bouwen.\n"
-#: client/helpdata.c:1185
+#: client/helpdata.c:1183
#, c-format
msgid "* Allows %s to build airbases.\n"
msgstr "* Staat %s toe om luchtbases te bouwen.\n"
-#: client/helpdata.c:1194
+#: client/helpdata.c:1192
#, 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:1202
+#: client/helpdata.c:1200
#, 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:1236
+#: client/helpdata.c:1234
msgid "* Pollution cannot be generated on this terrain."
msgstr "* Op dit terrein kan geen vervuiling optreden."
-#: client/helpdata.c:1241
+#: client/helpdata.c:1239
msgid "* You cannot build cities on this terrain."
msgstr "* U kan op dit terrein geen steden stichten."
-#: client/helpdata.c:1247
+#: client/helpdata.c:1245
msgid "* The coastline of this terrain is unsafe."
msgstr "* De kustlijn van dit terrein is niet veilig."
-#: client/helpdata.c:1252
+#: client/helpdata.c:1250
msgid "* This terrain is unsafe for units to travel on."
msgstr "* Op dit terrein kunnen eenheden zich niet veilig verplaatsen."
-#: client/helpdata.c:1257
+#: client/helpdata.c:1255
msgid "* Land units cannot travel on oceanic terrains."
msgstr "* Land eenheden kunnen niet over zee reizen."
-#: client/helpdata.c:1307
+#: client/helpdata.c:1305
msgid "Features:\n"
msgstr "Mogelijkheden:\n"
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1413 client/helpdata.c:1414
+#: client/helpdata.c:1411 client/helpdata.c:1412
msgid "?outputlist: Nothing "
msgstr ""
-#: client/helpdata.c:1421
+#: client/helpdata.c:1419
#, fuzzy, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
@@ -8663,7 +8665,7 @@ msgstr[0] ""
msgstr[1] ""
"* Militaire eenheden in het veld zullen %d ontevreden bewoners veroorzaken.\n"
-#: client/helpdata.c:1431
+#: client/helpdata.c:1429
#, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8673,23 +8675,23 @@ msgstr ""
"zou veroorzaakt worden.\n"
#. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1439
+#: client/helpdata.c:1437
#, 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:1444
+#: client/helpdata.c:1442
#, 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:1449
+#: client/helpdata.c:1447
#, 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:1453
+#: client/helpdata.c:1451
#, fuzzy
msgid "* You pay no upkeep for your units.\n"
msgstr "* U betaalt %d keer normale onderhoudskost voor uw eenheden.\n"
@@ -8697,25 +8699,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:1462
+#: client/helpdata.c:1460
#, 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:1470
+#: client/helpdata.c:1468
#, 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:1477
+#: client/helpdata.c:1475
#, 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:1484
+#: client/helpdata.c:1482
#, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -8725,7 +8727,7 @@ msgstr ""
"land zal verschijnen als u %d steden heeft.\n"
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1491
+#: client/helpdata.c:1489
#, c-format
msgid ""
"* After the first unhappy citizen due to city size, for each %d additional "
@@ -8734,18 +8736,18 @@ msgstr ""
"* Na de eerste ongelukkige burger door stadsgrootte, komt er nog 1 bij per %"
"d extra steden.\n"
-#: client/helpdata.c:1499
+#: client/helpdata.c:1497
#, 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:1504
+#: client/helpdata.c:1502
msgid "Has unlimited science/gold/luxuries rates.\n"
msgstr "Heeft onbeperkte wetenschap/goud/luxegoederen normen.\n"
-#: client/helpdata.c:1509
+#: client/helpdata.c:1507
#, fuzzy, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
@@ -8760,7 +8762,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:1521
+#: client/helpdata.c:1519
#, 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"
@@ -8768,7 +8770,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:1532
+#: client/helpdata.c:1530
#, c-format
msgid ""
"* You may grow your cities by means of celebrations. Your cities must be at "
@@ -8777,15 +8779,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:1538
+#: client/helpdata.c:1536
msgid "* Your units cannot be bribed.\n"
msgstr "* Uw eenheden kunnen niet worden omgekocht.\n"
-#: client/helpdata.c:1541
+#: client/helpdata.c:1539
msgid "* Your cities cannot be incited.\n"
msgstr "* Uw eenheden en steden kunnen niet in oproer gebracht worden.\n"
-#: client/helpdata.c:1545
+#: client/helpdata.c:1543
msgid ""
"* Government will fall into anarchy if any city is in disorder for more than "
"two turns in a row.\n"
@@ -8793,16 +8795,16 @@ msgstr ""
"* De overheid vervalt tot anarchie wanneer eender welke stad meer dan twee "
"beurten op rij burgerlijke onrust kent.\n"
-#: client/helpdata.c:1551
+#: client/helpdata.c:1549
msgid "* Has a senate that may prevent declaration of war.\n"
msgstr "* Heeft een senaat die oorlogsverklaringen kan tegenhouden.\n"
-#: client/helpdata.c:1555
+#: client/helpdata.c:1553
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:1559
+#: client/helpdata.c:1557
msgid ""
"* Buildings that normally confer bonuses against unhappiness will instead "
"give gold.\n"
@@ -8810,25 +8812,25 @@ msgstr ""
"* Gebouwen die normaal bonussen tegen ontevredenheid geven , geven nu extra "
"goud.\n"
-#: client/helpdata.c:1563
+#: client/helpdata.c:1561
msgid "* Pays no upkeep for fanatics.\n"
msgstr "* Betaalt geen onderhoudskost voor fanatici.\n"
-#: client/helpdata.c:1566
+#: client/helpdata.c:1564
msgid "* Has no unhappy citizens.\n"
msgstr "* Heeft geen ontevreden burgers.\n"
-#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
+#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
#, fuzzy, c-format
msgid "* Veteran %s units.\n"
msgstr "*·Veteraan·%s·eenheden.\n"
-#: client/helpdata.c:1587
+#: client/helpdata.c:1585
msgid "* Veteran units.\n"
msgstr "* Veteranen.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1593
+#: client/helpdata.c:1591
#, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8838,7 +8840,7 @@ msgstr ""
"wanneer er niet gevierd wordt.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1602
+#: client/helpdata.c:1600
#, fuzzy, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8848,114 +8850,114 @@ msgstr ""
"gevierd wordt.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1610
+#: client/helpdata.c:1608
#, 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:1619
+#: client/helpdata.c:1617
#, 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:1627
+#: client/helpdata.c:1625
#, 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:1632
+#: client/helpdata.c:1630
#, 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:1637
+#: client/helpdata.c:1635
#, 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:1645
+#: client/helpdata.c:1643
#, 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:1651
+#: client/helpdata.c:1649
#, 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:1657
+#: client/helpdata.c:1655
#, 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:1674
+#: client/helpdata.c:1672
#, 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:1701
+#: client/helpdata.c:1699
#, c-format
msgid "%s%d %s"
msgstr "%s%d %s"
-#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1700 client/helpdata.c:1708 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:1709
+#: client/helpdata.c:1707
#, c-format
msgid "%s%d unhappy"
msgstr "%s%d ontevreden"
-#: client/mapctrl_common.c:382
+#: client/mapctrl_common.c:399
#, c-format
msgid "You don't know how to build %s!"
msgstr "U weet niet hoe u een %s moet maken!"
-#: client/mapctrl_common.c:392
+#: client/mapctrl_common.c:409
#, c-format
msgid "Copy %s to clipboard."
msgstr "Kopieer %s naar klembord."
-#: client/mapctrl_common.c:408
+#: client/mapctrl_common.c:425
msgid "Clipboard is empty."
msgstr "Klembord is leeg."
-#: client/options.c:98
+#: client/options.c:102
msgid "Graphics"
msgstr "Afbeeldingen"
-#: client/options.c:99
+#: client/options.c:103
msgid "Overview"
msgstr "Overzicht"
-#: client/options.c:100
+#: client/options.c:104
msgid "Sound"
msgstr "Geluid"
-#: client/options.c:101
+#: client/options.c:105
msgid "Interface"
msgstr "Interface"
-#: client/options.c:102
+#: client/options.c:106
msgid "Network"
msgstr "Netwerk"
-#: client/options.c:107
+#: client/options.c:111
msgid "Login name"
msgstr "Login naam"
-#: client/options.c:108
+#: client/options.c:112
msgid ""
"This is the default login username that will be used in the connection "
"dialogs or with the -a command-line parameter."
@@ -8963,11 +8965,11 @@ msgstr ""
"Dit is de standaard login gebruikersnaam die gebruikt wordt in de "
"verbindingsvenster of met de -a parameter."
-#: client/options.c:113
+#: client/options.c:117
msgid "Server"
msgstr "Server"
-#: client/options.c:114
+#: client/options.c:118
msgid ""
"This is the default server hostname that will be used in the connection "
"dialogs or with the -a command-line parameter."
@@ -8975,11 +8977,11 @@ msgstr ""
"Dit is de standaard server hostnaam die gebruikt wordt in de "
"verbindingsvensters of met da -a parameter."
-#: client/options.c:119
+#: client/options.c:123
msgid "Server port"
msgstr "Server poort"
-#: client/options.c:120
+#: client/options.c:124
#, fuzzy
msgid ""
"This is the default server port that will be used in the connection dialogs "
@@ -8988,11 +8990,11 @@ msgstr ""
"Dit·is·de·standaard·server·poort·die·gebruikt·wordt·in·de·verbindingsvensters·of·met·de·-"
"a·parameter."
-#: client/options.c:125 client/gui-win32/connectdlg.c:912 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
msgid "Metaserver"
msgstr "Metaserver"
-#: client/options.c:126
+#: client/options.c:130
msgid ""
"The metaserver is a host that the client contacts to find out about games on "
"the internet. Don't change this from its default value unless you know what "
@@ -9002,11 +9004,11 @@ msgstr ""
"zijn op internet. Verander dit niet tenzij je zeker bent dat je weet wat je "
"doet."
-#: client/options.c:132
+#: client/options.c:136
msgid "Soundset"
msgstr "Geluidenset"
-#: client/options.c:133
+#: client/options.c:137
msgid ""
"This is the soundset that will be used. Changing this is the same as using "
"the -S command-line parameter."
@@ -9014,11 +9016,11 @@ msgstr ""
"Dit is het geluidspakket dat gebruikt zal worden. Dit veranderen is "
"hetzelfde als de -S opdrachtlijn parameter gebruiken."
-#: client/options.c:138
+#: client/options.c:142
msgid "Sound plugin"
msgstr "Geluidsplugin"
-#: client/options.c:139
+#: client/options.c:143
msgid ""
"If you have a problem with sound, try changing the sound plugin. The new "
"plugin won't take effect until you restart Freeciv. Changing this is the "
@@ -9028,23 +9030,23 @@ msgstr ""
"veranderen. De nieuwe plugin is pas geactiveerd vanaf u Freeciv herstart. "
"Dit veranderen is hetzelfde als de -P opdrachtlijn parameter gebruiken."
-#: client/options.c:144 client/gui-sdl/gui_main.c:162
+#: client/options.c:148 client/gui-sdl/gui_main.c:162
#, fuzzy
msgid "Theme"
msgstr "Tempel"
-#: client/options.c:145
+#: client/options.c:149
#, fuzzy
msgid "By changing this option you change the active theme."
msgstr ""
"Door deze optie te wijzigen verandert de actieve vlakkenset. Dit is "
"hetzelfde als de -t opdractlijn parameter gebruiken."
-#: client/options.c:148
+#: client/options.c:152
msgid "Tileset"
msgstr "Vlakkenset"
-#: client/options.c:149
+#: client/options.c:153
msgid ""
"By changing this option you change the active tileset. This is the same as "
"using the -t command-line parameter."
@@ -9052,11 +9054,11 @@ msgstr ""
"Door deze optie te wijzigen verandert de actieve vlakkenset. Dit is "
"hetzelfde als de -t opdractlijn parameter gebruiken."
-#: client/options.c:156
+#: client/options.c:160
msgid "Solid unit background color"
msgstr "Vaste achtergrondkleur voor eenheid"
-#: client/options.c:157
+#: client/options.c:161
msgid ""
"Setting this option will cause units on the map view to be drawn with a "
"solid background color instead of the flag backdrop."
@@ -9064,11 +9066,11 @@ msgstr ""
"Als deze optie aan staat worden eenheden op de kaart met volle "
"achtergrondkleur in plaats van met een vlag getekend."
-#: client/options.c:161 client/gui-sdl/optiondlg.c:960
+#: client/options.c:165 client/gui-sdl/optiondlg.c:960
msgid "Sound bell at new turn"
msgstr "Luid bel bij nieuwe beurt"
-#: client/options.c:162
+#: client/options.c:166
msgid ""
"Set this option to have a \"bell\" event be generated at the start of a new "
"turn. You can control the behavior of the \"bell\" event by editing the "
@@ -9077,11 +9079,11 @@ msgstr ""
"Zet deze optie aan om een 'bel' te krijgen bij het begin van een nieuwe "
"beurt. Het gedrag van de 'bel' kan ingesteld worden bij de boodschap opties."
-#: client/options.c:168
+#: client/options.c:172
msgid "Unit movement animation time (milliseconds)"
msgstr "Eenheids bewegingsanimatietijd (milliseconden)"
-#: client/options.c:169
+#: client/options.c:173
msgid ""
"This option controls how long unit \"animation\" takes when a unit moves on "
"the map view. Set it to 0 to disable animation entirely."
@@ -9090,11 +9092,11 @@ msgstr ""
"op de kaart verplaatst. Zet dit op 0 om het bewegingseffect volledig uit te "
"schakelen."
-#: client/options.c:174
+#: client/options.c:178
msgid "Mapview recentering time (milliseconds)"
msgstr "Tijd om de kaart te centreren (milliseconden)"
-#: client/options.c:175
+#: client/options.c:179
msgid ""
"When the map view is recentered, it will slide smoothly over the map to its "
"new position. This option controls how long this slide lasts. Set it to 0 "
@@ -9104,11 +9106,11 @@ msgstr ""
"positie. Deze optie geeft de duur van deze beweging. Zet dit op 0 om het "
"glij-effect volledig uit te schakelen."
-#: client/options.c:180 client/gui-sdl/optiondlg.c:1014
+#: client/options.c:184 client/gui-sdl/optiondlg.c:1014
msgid "Show combat animation"
msgstr "Toon gevechts animatie"
-#: client/options.c:181
+#: client/options.c:185
msgid ""
"Disabling this option will turn off combat animation between units on the "
"mapview."
@@ -9116,11 +9118,11 @@ msgstr ""
"Als deze optie uit staat, worden er geen gevechtsbewegingen tussen eenheden "
"getoond."
-#: client/options.c:184
+#: client/options.c:188
msgid "Draw the citybar"
msgstr "Teken de stadsbalk"
-#: client/options.c:185
+#: client/options.c:189
msgid ""
"Setting this option will display a 'citybar' containing useful information "
"beneath each city. Disabling this option will display only the city's name "
@@ -9130,11 +9132,11 @@ msgstr ""
"elke stad. Bij afzetten wordt enkel de naam van de stad en eventueel de "
"productie getoond."
-#: client/options.c:191
+#: client/options.c:195
msgid "Show icons in the technology tree"
msgstr "Toon iconen in de technologieboom."
-#: client/options.c:192
+#: client/options.c:196
msgid ""
"Setting this option will display icons on the technology tree diagram. "
"Turning this option off makes the technology tree more compact."
@@ -9142,11 +9144,11 @@ msgstr ""
"Als deze optie aanstaat zullen er iconen getoond worden in de "
"technologieboom. Afzetten maakt de boom kleiner."
-#: client/options.c:197
+#: client/options.c:201
msgid "Draw shield graphics for units"
msgstr "Teken het schild icoontje voor eenheden"
-#: client/options.c:198
+#: client/options.c:202
msgid ""
"Setting this option will draw a shield icon as the flags on units. If "
"unset, the full flag will be drawn."
@@ -9154,11 +9156,11 @@ msgstr ""
"Als deze optie aan staat wordt een speciaal schild icoontje getekend als "
"vlag bij eenheden. Als uit wordt de volle vlag getekend."
-#: client/options.c:202
+#: client/options.c:206
msgid "Manual Turn Done in AI Mode"
msgstr "Handmatig Beurt Klaar in KI modus"
-#: client/options.c:203
+#: client/options.c:207
msgid ""
"Disable this option if you do not want to press the Turn Done button "
"manually when watching an AI player."
@@ -9166,11 +9168,11 @@ msgstr ""
"Als deze optie uitgeschakeld staat moet je niet zelf de 'beurt klaar' knop "
"induwen wanneer je een KI speler bekijkt."
-#: client/options.c:207 client/gui-sdl/optiondlg.c:1121
+#: client/options.c:211 client/gui-sdl/optiondlg.c:1121
msgid "Auto Center on Units"
msgstr "Auto Centreer Eenheden"
-#: client/options.c:208
+#: client/options.c:212
msgid ""
"Set this option to have the active unit centered automatically when the unit "
"focus changes."
@@ -9178,11 +9180,11 @@ msgstr ""
"Zet deze optie aan om het zicht automatisch op de actieve eenheid te "
"centreren wanneer een nieuwe eenheid actief wordt."
-#: client/options.c:211 client/gui-sdl/optiondlg.c:1147
+#: client/options.c:215 client/gui-sdl/optiondlg.c:1147
msgid "Auto Center on Combat"
msgstr "Auto Centreer op Gevecht"
-#: client/options.c:212
+#: client/options.c:216
msgid ""
"Set this option to have any combat be centered automatically. Disabled this "
"will speed up the time between turns but may cause you to miss combat "
@@ -9192,21 +9194,21 @@ msgstr ""
"uitgeschakeld is duren overgangen tussen beurten minder lang, maar kan u "
"misschien een gevecht volledig missen."
-#: client/options.c:217 client/gui-sdl/optiondlg.c:1174
+#: client/options.c:221 client/gui-sdl/optiondlg.c:1174
msgid "Focus on Awakened Units"
msgstr "Focus op Ontwaakte Eenheden"
-#: client/options.c:218
+#: client/options.c:222
msgid "Set this option to have newly awoken units be focused automatically."
msgstr ""
"Zet deze optie aan om pas wakker geworden eenheden automatisch de focus te "
"geven."
-#: client/options.c:221
+#: client/options.c:225
msgid "Allow goto into the unknown"
msgstr "Laat 'ga-naar' in onbekend gebied toe"
-#: client/options.c:222
+#: client/options.c:226
msgid ""
"Setting this option will make the game consider moving into unknown tiles. "
"If not, then goto routes will detour around or be blocked by unknown tiles."
@@ -9215,11 +9217,11 @@ msgstr ""
"overwegen. Als uit zullen routes enkel langs bekend gebied gaan of "
"geblokkeerd worden."
-#: client/options.c:226
+#: client/options.c:230
msgid "Center map when Popup city"
msgstr "Centeer kaart bij Popup stad"
-#: client/options.c:227
+#: client/options.c:231
msgid ""
"Setting this option makes the mapview center on a city when its city dialog "
"is popped up."
@@ -9227,11 +9229,11 @@ msgstr ""
"Als deze optie aan staat dan zal bij het open van een stadsvenster de kaart "
"op die stad centreren."
-#: client/options.c:230
+#: client/options.c:234
msgid "Concise City Production"
msgstr "Beknopte Stads Productie"
-#: client/options.c:231
+#: client/options.c:235
msgid ""
"Set this option to make the city production (as shown in the city dialog) to "
"be more compact."
@@ -9239,11 +9241,11 @@ msgstr ""
"Zet deze optie aan om de stadsproductie in het stadsvenster compacter weer "
"te geven."
-#: client/options.c:234 client/gui-sdl/optiondlg.c:1252
+#: client/options.c:238 client/gui-sdl/optiondlg.c:1252
msgid "End Turn when done moving"
msgstr "Einde Beurt als klaar met verplaatsen"
-#: client/options.c:235
+#: client/options.c:239
msgid ""
"Setting this option makes your turn end automatically when all your units "
"are done moving."
@@ -9251,11 +9253,11 @@ msgstr ""
"Zet deze optie aan om de beurt automatisch te laten eindingen als al uw "
"eenheden klaar zijn met bewegen."
-#: client/options.c:238 client/gui-sdl/optiondlg.c:1226
+#: client/options.c:242 client/gui-sdl/optiondlg.c:1226
msgid "Prompt for city names"
msgstr "Vraag stadsnamen"
-#: client/options.c:239
+#: client/options.c:243
msgid ""
"Disabling this option will make the names of newly founded cities chosen "
"automatically by the server."
@@ -9263,11 +9265,11 @@ msgstr ""
"Als deze optie uit staat worden stadsnamen automatisch voor u gekozen door "
"de server."
-#: client/options.c:242 client/gui-sdl/optiondlg.c:1200
+#: client/options.c:246 client/gui-sdl/optiondlg.c:1200
msgid "Pop up city dialog for new cities"
msgstr "Toon nieuwe stadsdialoog voor nieuwe steden"
-#: client/options.c:243
+#: client/options.c:247
msgid ""
"Setting this option will pop up a newly-founded city's city dialog "
"automatically."
@@ -9275,78 +9277,126 @@ msgstr ""
"Als deze optie aan staat dan zal bij het stichten van een nieuwe stad, "
"automatisch het stadsvenster verschijnen."
-#: client/options.c:248
+#: client/options.c:250
+#, fuzzy
+msgid "Pop up caravan actions"
+msgstr "Karavaan acties"
+
+#: client/options.c:251
+msgid ""
+"If this option is enabled, when caravans arrive at a city where they can "
+"establish a traderoute or help build a wonder, a window will popup asking "
+"which action should be performed. Disabling this option means you will have "
+"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 ""
+
+#: client/options.c:260
+#, fuzzy
+msgid "Enable cursor changing"
+msgstr "Zet transparantie aan"
+
+#: client/options.c:261
+msgid ""
+"This option controls whether the client should try to change the mouse "
+"cursor depending on what is being pointed at, as well as to indicate changes "
+"in the client or server state."
+msgstr ""
+
+#: client/options.c:266
+msgid "Select cities before units"
+msgstr ""
+
+#: 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 ""
+
+#: client/options.c:272
+msgid "Clear unit orders on selection"
+msgstr ""
+
+#: client/options.c:273
+msgid ""
+"Enabling this option will cause unit orders to be cleared whenever one or "
+"more units are selected. If this option is disabled, selecting units will "
+"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 ""
+
+#: client/options.c:282
msgid "Background layer"
msgstr "Achtergrond laag"
-#: client/options.c:249
+#: client/options.c:283
msgid "The background layer of the overview shows just ocean and land."
msgstr "De achtergrond laag van het overzicht toont enkel oceaan en land"
-#: client/options.c:252
+#: client/options.c:286
msgid "Terrain relief map layer"
msgstr "Terrein reliëf kaart laag"
-#: client/options.c:253
+#: client/options.c:287
#, fuzzy
msgid "The relief layer shows all terrains on the map."
msgstr "Terrein·reliëf·kaart·laag toont alle terrein op de kaart"
-#: client/options.c:256
+#: client/options.c:290
msgid "Borders layer"
msgstr "Grenslaag"
-#: client/options.c:257
+#: client/options.c:291
msgid ""
"The borders layer of the overview shows which tiles are owned by each player."
msgstr ""
"De grens laag van het overzicht toont welke vakjes onder welke speler vallen."
-#: client/options.c:261
+#: client/options.c:295
msgid "Units layer"
msgstr "Eenheden laag"
-#: client/options.c:262
+#: client/options.c:296
msgid "Enabling this will draw units on the overview."
msgstr "Als deze optie aanstaat worden eenheden getekend op het overzicht."
-#: client/options.c:265
+#: client/options.c:299
msgid "Cities layer"
msgstr "Steden laag"
-#: client/options.c:266
+#: client/options.c:300
msgid "Enabling this will draw cities on the overview."
msgstr "Als deze optie aan staat worden steden getekend op het overzicht."
-#: client/options.c:269
+#: client/options.c:303
msgid "Overview fog of war"
msgstr "Overzicht fog of war"
-#: client/options.c:270
+#: client/options.c:304
msgid "Enabling this will show fog of war on the overview."
msgstr ""
"Als deze optie aan staat wordt fog of war/verduistering op de kaart gebruikt."
-#: client/options.c:488
+#: client/options.c:526
msgid "If you add a preset by hand, also update \"number_of_presets\""
msgstr ""
"Als u een snelkeuze met de hand toevoegt, wijzig dan ook \"number_of_presets"
"\""
-#: client/options.c:516
+#: client/options.c:554
msgid "Cannot find your home directory"
msgstr "Kan uw home directory niet vinden"
-#: client/options.c:665 client/options.c:796
+#: client/options.c:703 client/options.c:834
msgid "Save failed, cannot find a filename."
msgstr "Opslaan mislukt, kan geen bestandsnaam vinden."
-#: client/options.c:678 client/options.c:859
+#: client/options.c:716 client/options.c:897
#, c-format
msgid "Save failed, cannot write to file %s"
msgstr "Opslaan mislukt, kan niet schrijven naar bestand %s"
-#: client/options.c:680 client/options.c:862
+#: client/options.c:718 client/options.c:900
#, c-format
msgid "Saved settings to file %s"
msgstr "Instellingen opgeslagen in bestand %s"
@@ -9371,16 +9421,16 @@ msgstr "Server capaciteits string: %s"
msgid "Start of turn %d"
msgstr "Begin van beurt %d"
-#: client/packhand.c:1590
+#: client/packhand.c:1591
#, c-format
msgid "AI Mode is now %s."
msgstr "KI-modus is nu %s."
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "ON"
msgstr "AAN"
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "OFF"
msgstr "UIT"
@@ -9412,14 +9462,15 @@ msgid "Username"
msgstr "Gebruikersnaam"
#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
-#: client/gui-gtk-2.0/pages.c:2085
+#: client/gui-gtk-2.0/pages.c:2157
msgid "Flag"
msgstr "Vlag"
#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
-#: client/gui-gtk-2.0/pages.c:1536 client/gui-gtk-2.0/pages.c:2087
-#: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
-#: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
+#: 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/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr "Natie"
@@ -9431,7 +9482,7 @@ msgstr "Grens"
msgid "Score"
msgstr "Score"
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
msgid "Team"
msgstr "Team"
@@ -9502,278 +9553,304 @@ msgstr "Kon geen %s ontbinden."
msgid "Could not open temp file."
msgstr "Kon tijdelijk bestand niet openen."
-#: client/servers.c:407
+#: client/servers.c:410
msgid "Invalid $http_proxy or metaserver value, must start with 'http://'"
msgstr "Ongeldige $http_proxy waarde, moet met 'http://' beginnen"
-#: client/servers.c:413
+#: client/servers.c:416
msgid "Failed looking up metaserver's host"
msgstr "Kon metaserver host niet vinden"
-#: client/text.c:85 client/text.c:86 client/text.c:91
+#. TRANS: "AI <player name>"
+#: client/text.c:94
+#, c-format
+msgid "AI %s"
+msgstr ""
+
+#. TRANS: "<nation adjective>, team <team name>"
+#: client/text.c:118
+#, fuzzy, c-format
+msgid "%s, team %s"
+msgstr ", team %s"
+
+#: client/text.c:135 client/text.c:136 client/text.c:141
#: client/gui-sdl/mapview.c:752
msgid "?nation:Neutral"
msgstr "?nation:Neutrale"
-#: client/text.c:85 client/gui-sdl/mapview.c:752
+#: client/text.c:135 client/gui-sdl/mapview.c:752
msgid "?nation:Hostile"
msgstr "?nation:Vijandige"
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Peaceful"
msgstr "?nation:Vredelievende"
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Friendly"
msgstr "?nation:Vriendelijke"
-#: client/text.c:88 client/gui-sdl/mapview.c:755
+#: client/text.c:138 client/gui-sdl/mapview.c:755
msgid "?nation:Mysterious"
msgstr "?nation:Mysterieuze"
-#: client/text.c:88
+#: client/text.c:138
msgid "?nation:Friendly(team)"
msgstr "?nation:Vriendelijk(team)"
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
msgid "?city:Neutral"
msgstr "?stad:Neutrale"
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
msgid "?city:Hostile"
msgstr "?stad:Vijandige"
-#: client/text.c:92 client/gui-sdl/mapview.c:786
+#: client/text.c:142 client/gui-sdl/mapview.c:786
msgid "?city:Peaceful"
msgstr "?city:Vredelievende"
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Friendly"
msgstr "?city:Vriendelijke"
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Mysterious"
msgstr "?city:Mysterieuze"
-#: client/text.c:93
+#: client/text.c:143
msgid "?city:Friendly(team)"
msgstr "?city:Vriendelijk(team)"
-#: client/text.c:100
+#: client/text.c:151
#, c-format
msgid "Location: (%d, %d) [%d]"
msgstr "Locatie: (%d, %d) [%d]"
-#: client/text.c:109
+#: client/text.c:153
+#, c-format
+msgid "Native coordinates: (%d, %d)"
+msgstr ""
+
+#: client/text.c:160
#, c-format
msgid "Terrain: %s"
msgstr "Terrein: %s"
-#: client/text.c:110
+#: client/text.c:161
#, c-format
msgid "Food/Prod/Trade: %s"
msgstr "Voeding/Hulp/Handel: %s"
-#: client/text.c:113
+#: client/text.c:164
msgid "Minor Tribe Village"
msgstr "Klein Inboorlingendorp"
-#: client/text.c:119
+#: client/text.c:173
#, fuzzy
msgid "Our territory"
msgstr "Ons territorium"
-#. TRANS: "Polish territory"
-#: client/text.c:122
+#. TRANS: "Territory of <username> (<nation + team>)"
+#: client/text.c:176
#, fuzzy, c-format
-msgid "%s territory"
-msgstr "Territorium van de %s"
+msgid "Territory of %s (%s)"
+msgstr ""
+"\n"
+"Gebied van de %s %s"
-#. TRANS: "Polish territory (5 turn cease-fire)"
-#: client/text.c:131
-#, c-format
-msgid "%s territory (%d turn cease-fire)"
-msgid_plural "%s territory (%d turn cease-fire)"
-msgstr[0] "%s territorium (%d beurt staakt-het-vuren)"
-msgstr[1] "%s territorium (%d beurten staakt-het-vuren)"
+#: client/text.c:186
+#, fuzzy, c-format
+msgid "Territory of %s (%s) (%d turn cease-fire)"
+msgid_plural "Territory of %s (%s) (%d turn cease-fire)"
+msgstr[0] "Stad: %s (%s, %d beurt staakt-het-vuren)"
+msgstr[1] "Stad: %s (%s, %d beurten staakt-het-vuren)"
-#. TRANS: "Polish territory (friendly)"
-#: client/text.c:140
+#. TRANS: "Territory of <username>
+#. * (<nation + team> | <diplomatic state>)"
+#: client/text.c:195
#, fuzzy, c-format
-msgid "%s territory (%s)"
-msgstr "Territorium van de %s %s"
+msgid "Territory of %s (%s | %s)"
+msgstr ""
+"\n"
+"Gebied van de %s %s"
-#: client/text.c:145
+#: client/text.c:200
msgid "Unclaimed territory"
msgstr "Vrij gebied"
-#. TRANS: "City: Warsaw (Polish)"
-#: client/text.c:156
-#, c-format
-msgid "City: %s (%s)"
-msgstr "Stad: %s (%s)"
+#. TRANS: "City: <city name> | <username> (<nation + team>)"
+#: client/text.c:214
+#, fuzzy, c-format
+msgid "City: %s | %s (%s)"
+msgstr "Stad: %s (%s, %s)"
-#. TRANS: "City: Warsaw (Polish, 5 turn cease-fire)"
-#: client/text.c:166
-#, c-format
-msgid "City: %s (%s, %d turn cease-fire)"
-msgid_plural "City: %s (%s, %d turn cease-fire)"
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <number> turn cease-fire)"
+#: client/text.c:224
+#, fuzzy, c-format
+msgid "City: %s | %s (%s, %d turn cease-fire)"
+msgid_plural "City: %s | %s (%s, %d turn cease-fire)"
msgstr[0] "Stad: %s (%s, %d beurt staakt-het-vuren)"
msgstr[1] "Stad: %s (%s, %d beurten staakt-het-vuren)"
-#. TRANS: "City: Warsaw (Polish,friendly)"
-#: client/text.c:174
-#, c-format
-msgid "City: %s (%s, %s)"
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <diplomatic state>)"
+#: client/text.c:231
+#, fuzzy, c-format
+msgid "City: %s | %s (%s, %s)"
msgstr "Stad: %s (%s, %s)"
#. TRANS: previous lines gave other information about the city.
-#: client/text.c:189
+#: client/text.c:246
#, fuzzy, c-format
msgid "?clistbegin: with %s"
msgstr " met %s"
#. TRANS: "Trade from Warsaw: 5"
-#: client/text.c:202
+#: client/text.c:259
#, c-format
msgid "Trade from %s: %d"
msgstr "Handel met %s: %d"
-#: client/text.c:210
+#: client/text.c:267
#, c-format
msgid "Infrastructure: %s"
msgstr "Infrastructuur: %s"
-#: client/text.c:215
+#: client/text.c:272
#, c-format
msgid "Activity: %s"
msgstr "Activiteit: %s"
-#. TRANS: "Unit: Musketeers (Polish, Warsaw)"
-#. TRANS: "Unit: Musketeers (Polish,friendly)"
-#: client/text.c:226 client/text.c:253
-#, c-format
-msgid "Unit: %s (%s, %s)"
+#. TRANS: "Unit: <unit type> | <username>
+#. * (<nation + team>, <homecity>)"
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <diplomatic state>)"
+#: client/text.c:287 client/text.c:313
+#, fuzzy, c-format
+msgid "Unit: %s | %s (%s, %s)"
msgstr "Eenheid: %s (%s, %s)"
-#. TRANS: "Unit: Musketeers (Polish)"
-#: client/text.c:232
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>)"
+#: client/text.c:292
#, fuzzy, c-format
-msgid "Unit: %s (%s)"
-msgstr "Eenheid: %s (%s)"
+msgid "Unit: %s | %s (%s)"
+msgstr "Eenheid: %s (%s, %s)"
-#. TRANS: "Unit: Musketeers (Polish, 5 turn cease-fire)"
-#: client/text.c:245
-#, c-format
-msgid "Unit: %s (%s, %d turn cease-fire)"
-msgid_plural "Unit: %s (%s, %d turn cease-fire)"
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <number> turn cease-fire)"
+#: client/text.c:305
+#, fuzzy, c-format
+msgid "Unit: %s | %s (%s, %d turn cease-fire)"
+msgid_plural "Unit: %s | %s (%s, %d turn cease-fire)"
msgstr[0] "Stad: %s (%s, %d beurt staakt-het-vuren)"
msgstr[1] "Stad: %s (%s, %d beurten staakt-het-vuren)"
#. TRANS: "Chance to win: A:95% D:46%"
-#: client/text.c:279
+#: client/text.c:338
#, c-format
msgid "Chance to win: A:%d%% D:%d%%"
msgstr "Kans om te winnen: A:%d%% V:%d%%"
#. TRANS: A is attack power, D is defense power, FP is firepower,
#. * HP is hitpoints (current and max).
-#: client/text.c:286
+#: client/text.c:345
#, c-format
msgid "A:%d D:%d FP:%d HP:%d/%d (%s)"
msgstr "A:%d V:%d VK:%d LP:%d/%d%s"
#. TRANS: "5 more" units on this tile
-#: client/text.c:295
+#: client/text.c:354
#, c-format
msgid " (%d more)"
msgstr " (%d meer)"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:364
+#: client/text.c:423
#, c-format
msgid "far from %s"
msgstr "ver van %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:367
+#: client/text.c:426
#, c-format
msgid "near %s"
msgstr "bij %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:370
+#: client/text.c:429
#, c-format
msgid "in %s"
msgstr "in %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:403
+#: client/text.c:462
#, c-format
msgid "from %s"
msgstr "van %s"
-#: client/text.c:466
+#: client/text.c:525
msgid "Progress: no research"
msgstr "Voortgang: geen onderzoek"
-#: client/text.c:470
+#: client/text.c:529
msgid "Progress: no research target"
msgstr "Voortgang: geen onderzoeksdoel"
-#: client/text.c:475
+#: client/text.c:534
#, c-format
msgid "Progress: %d turn/advance"
msgid_plural "Progress: %d turns/advance"
msgstr[0] "Voortgang: %d beurt/vooruitgang"
msgstr[1] "Voortgang: %d beurten/vooruitgang"
-#: client/text.c:480
+#: client/text.c:539
#, c-format
msgid "%d bulb/turn"
msgid_plural "%d bulbs/turn"
msgstr[0] "%d beurt"
msgstr[1] "%d lampen/beurt"
-#: client/text.c:485
+#: client/text.c:544
#, c-format
msgid ", %d bulb/turn from team"
msgid_plural ", %d bulbs/turn from team"
msgstr[0] ", %d lamp/beurt van team"
msgstr[1] ", %d lampen/beurt van team"
-#: client/text.c:512
+#: client/text.c:571
#, c-format
msgid "%d/- (never)"
msgstr "%d/-(Nooit)"
-#: client/text.c:524
+#: client/text.c:583
#, c-format
msgid "%d/%d (%d turn)"
msgid_plural "%d/%d (%d turns)"
msgstr[0] "%d/%d %d beurten"
msgstr[1] "%d/%d (%d beurten)"
-#: client/text.c:527
+#: client/text.c:586
#, c-format
msgid "%d/%d (never)"
msgstr "%d%d (Nooit)"
-#: client/text.c:564
+#: client/text.c:623
#, c-format
msgid "%d step"
msgid_plural "%d steps"
msgstr[0] "(%d stap)"
msgstr[1] "%d stappen"
-#: client/text.c:566
+#: client/text.c:625
#, c-format
msgid "%d bulb"
msgid_plural "%d bulbs"
msgstr[0] "%d lamp"
msgstr[1] "%d lampen"
-#: client/text.c:570 client/agents/cma_fec.c:269 client/agents/cma_fec.c:313
+#: 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
#, c-format
msgid "%d turn"
@@ -9781,89 +9858,89 @@ msgid_plural "%d turns"
msgstr[0] "%d beurt"
msgstr[1] "%d beurten"
-#: client/text.c:592
+#: client/text.c:651
#, c-format
msgid "Population: %s"
msgstr "Bevolking: %s"
-#: client/text.c:595
+#: client/text.c:654
#, c-format
msgid "Year: %s (T%d)"
msgstr "Jaar: %s (T%d)"
-#: client/text.c:598
+#: client/text.c:657
#, c-format
msgid "Gold: %d (%+d)"
msgstr "Goud: %d (%+d)"
-#: client/text.c:600
+#: client/text.c:659
#, c-format
msgid "Tax: %d Lux: %d Sci: %d"
msgstr "Bel: %d Lux: %d Wet: %d"
-#: client/text.c:607
+#: client/text.c:666
#, fuzzy
msgid "Moving: Nobody"
msgstr "Beweging: %s"
-#: client/text.c:609
+#: client/text.c:668
#, c-format
msgid "Moving: %s"
msgstr "Beweging: %s"
-#: client/text.c:613
+#: client/text.c:672
msgid "(Click for more info)"
msgstr "(Klik voor meer info}"
-#: client/text.c:629
+#: client/text.c:688
#, c-format
msgid "%s People"
msgstr "%s Mensen"
-#: client/text.c:633
+#: client/text.c:692
#, c-format
msgid "Turn: %d"
msgstr "Beurt : %d"
-#: client/text.c:635 client/gui-win32/inteldlg.c:111
+#: client/text.c:694 client/gui-win32/inteldlg.c:111
#: client/gui-xaw/inteldlg.c:208
#, c-format
msgid "Gold: %d"
msgstr "Goud: %d"
-#: client/text.c:636
+#: client/text.c:695
#, c-format
msgid "Net Income: %d"
msgstr "Netto inkomen: %d"
#. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:639
+#: client/text.c:698
#, c-format
msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
msgstr "Belastingen: %d; Luxe: %d; Wetenschap: %d"
-#: client/text.c:643
+#: client/text.c:702
#, c-format
msgid "Researching %s: %s"
msgstr "Onderzoek: %s: %s"
-#: client/text.c:650
+#: client/text.c:709
#, c-format
msgid "Global warming chance: %d%% (%+d%%/turn)"
msgstr "Broeikas effect kans: %d%% (% +d %%/beurt)"
-#: client/text.c:653
+#: client/text.c:712
#, c-format
msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
msgstr "Nucleaire winter kans: %d%% (%+d%%/beurt)"
-#: client/text.c:658 client/gui-win32/inteldlg.c:104
+#: client/text.c:717 client/gui-win32/inteldlg.c:104
#: client/gui-xaw/inteldlg.c:200
#, c-format
msgid "Government: %s"
msgstr "Regering: %s"
-#: client/text.c:682
+#: client/text.c:741
#, c-format
msgid "%d unit"
msgid_plural "%d units"
@@ -9871,55 +9948,55 @@ msgstr[0] " eenheid"
msgstr[1] " %d eenheden"
#. TRANS: Impossible to reach goto target tile
-#: client/text.c:715 client/gui-sdl/mapview.c:566
+#: client/text.c:774 client/gui-sdl/mapview.c:566
msgid "?goto:Unreachable"
msgstr ""
-#: client/text.c:717 client/gui-sdl/mapview.c:568
+#: client/text.c:776 client/gui-sdl/mapview.c:568
#, c-format
msgid "Turns to target: %d"
msgstr "Beurten tot doel bereikt: %d"
-#: client/text.c:719 client/gui-sdl/mapview.c:570
+#: client/text.c:778 client/gui-sdl/mapview.c:570
#, c-format
msgid "Turns to target: %d to %d"
msgstr "Beurten tot doel bereikt: %d tot %d"
-#: client/text.c:725 client/gui-sdl/mapview.c:576
+#: client/text.c:784 client/gui-sdl/mapview.c:576
#, c-format
msgid "%d unit selected"
msgid_plural "%d units selected"
msgstr[0] "Eenheid keuze"
msgstr[1] "%d eenheden gekozen"
-#: client/text.c:730 client/gui-sdl/mapview.c:581
+#: client/text.c:789 client/gui-sdl/mapview.c:581
msgid "No units selected."
msgstr "Geen eenheden gekozen."
-#: client/text.c:804 client/gui-sdl/mapview.c:654
+#: client/text.c:863 client/gui-sdl/mapview.c:654
#, c-format
msgid "Others: %d civil; %d military"
msgstr "Andere: %d burgerlijk, %d militair"
-#: client/text.c:806 client/gui-sdl/mapview.c:656
+#: client/text.c:865 client/gui-sdl/mapview.c:656
#, c-format
msgid "Others: %d civilian"
msgstr "Andere: %d burger"
-#: client/text.c:808 client/gui-sdl/mapview.c:658
+#: client/text.c:867 client/gui-sdl/mapview.c:658
#, c-format
msgid "Others: %d military"
msgstr "Andere: %d militair"
-#: client/text.c:839
+#: client/text.c:898
msgid "No units to upgrade!"
msgstr "Geen op te waarderen eenheden!"
-#: client/text.c:864
+#: client/text.c:923
msgid "None of these units may be upgraded."
msgstr "Geen van deze eenheden kan opgewaardeerd worden."
-#: client/text.c:870
+#: client/text.c:929
#, c-format
msgid ""
"Upgrade %d unit for %d gold?\n"
@@ -9934,72 +10011,72 @@ msgstr[1] ""
"Waardeer %d eenheden op voor %d goud?\n"
"Schatkist bevat %d goud."
-#: client/text.c:891
+#: client/text.c:950
msgid "Shows your progress in researching the current technology."
msgstr "Toont uw vooruitgang in het onderzoek van de huidige technologie."
-#: client/text.c:897
+#: client/text.c:956
msgid "no research target."
msgstr "geen onderzoeksdoel."
#. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:900
+#: client/text.c:959
#, c-format
msgid "%s: %d/%d."
msgstr "%s: %d%d."
-#: client/text.c:920
+#: client/text.c:979
msgid "Shows the progress of global warming:"
msgstr "Toont de vordering van wereldwijde opwarming:"
-#: client/text.c:921
+#: client/text.c:980
#, c-format
msgid "Pollution rate: %d%%"
msgstr "Vervuiling : %d%%"
-#: client/text.c:923
+#: client/text.c:982
#, c-format
msgid "Chance of catastrophic warming each turn: %d%%"
msgstr "Kans op rampzalige opwarming per beurt: %d%%"
-#: client/text.c:939
+#: client/text.c:998
msgid "Shows the progress of nuclear winter:"
msgstr "Toont de vorderingen van de nucleaire winter:"
-#: client/text.c:940
+#: client/text.c:999
#, c-format
msgid "Fallout rate: %d%%"
msgstr "Nucleaire Fallout waarde: %d%%"
-#: client/text.c:942
+#: client/text.c:1001
#, c-format
msgid "Chance of catastrophic winter each turn: %d%%"
msgstr "Kans op rampzalige winter per beurt: %d%%"
-#: client/text.c:957
+#: client/text.c:1016
msgid "Shows your current government:"
msgstr "Toont uw huidige staatsvorm:"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:981
+#: client/text.c:1040
#, c-format
msgid "Population: %5d"
msgstr "Bevolking: %5d"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:1043
#, c-format
msgid "Support: %5d %%"
msgstr "Ondersteuning: %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:1047
#, c-format
msgid "Energy: %5d %%"
msgstr "Massa: %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:992
+#: client/text.c:1051
#, c-format
msgid "Mass: %5d ton"
msgid_plural "Mass: %5d tons"
@@ -10007,96 +10084,97 @@ msgstr[0] "Massa: %5d ton"
msgstr[1] "Massa: %5d ton"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1057
#, c-format
msgid "Travel time: %5.1f years"
msgstr "Reistijd: %5.1f jaar"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1061
msgid "Travel time: N/A "
msgstr "Reistijd: N/B "
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1065
#, c-format
msgid "Success prob.: %5d %%"
msgstr "Kans op succes: %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1010
+#: client/text.c:1069
#, c-format
msgid "Year of arrival: %8s"
msgstr "Aankomstjaar: %8s"
-#: client/text.c:1030
+#: client/text.c:1089
msgid "?timeout:off"
msgstr "?timeout:uit"
-#: client/text.c:1054
+#: client/text.c:1113
#, c-format
msgid "?seconds:%02ds"
msgstr "?seconden:%02ds"
-#: client/text.c:1056
+#: client/text.c:1115
#, c-format
msgid "?mins/secs:%02dm %02ds"
msgstr "?min/sec:%02dm %02ds"
-#: client/text.c:1058
+#: client/text.c:1117
#, c-format
msgid "?hrs/mns:%02dh %02dm"
msgstr "?uur/min:%02du %02dm"
-#: client/text.c:1060
+#: client/text.c:1119
#, c-format
msgid "?dys/hrs:%02dd %02dh"
msgstr "?dagen/uren:%02dd %02du"
-#: client/text.c:1063
+#: client/text.c:1122
msgid "?duration:overflow"
msgstr "?duur:overschrijding"
-#: client/text.c:1084
+#: client/text.c:1143
#, c-format
msgid "%6d.%02d ms"
msgstr "%6d.%02d ms"
-#. TRANS: "Republic of the Poles"
-#: client/text.c:1127
-#, c-format
-msgid "%s of the %s"
-msgstr "De %s van de %s"
+#. TRANS: <nation adjective> <government name>.
+#. * E.g. "Polish Republic".
+#: client/text.c:1188
+#, fuzzy, c-format
+msgid "?nationgovernment:%s %s"
+msgstr "Regering: %s"
#. TRANS: "Observer: 1985"
-#: client/text.c:1137
+#: client/text.c:1198
#, c-format
msgid "Observer: %s"
msgstr "Waarnemer: %s"
-#: client/text.c:1155
+#: client/text.c:1216
msgid "Buildings: "
msgstr "Gebouwen: "
-#: client/text.c:1172 client/text.c:1211
+#: client/text.c:1233 client/text.c:1272
msgid "None. "
msgstr "Geen."
-#: client/text.c:1174 client/text.c:1213
+#: client/text.c:1235 client/text.c:1274
msgid "?clistend:."
msgstr "."
-#: client/text.c:1192
+#: client/text.c:1253
msgid "Wonders: "
msgstr "Wereldwonderen: "
-#: client/text.c:1247
+#: client/text.c:1308
#, 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:1251
+#: client/text.c:1312
#, fuzzy, c-format
msgid "%d content before penalty."
msgid_plural "%d content before penalty."
@@ -10104,45 +10182,47 @@ msgstr[0] "%d tevreden voor bezwaring met "
msgstr[1] "%d tevreden voor bezwaring met "
#. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1257
+#: client/text.c:1318
#, 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."
-#. TRANS: Martial law opening parenthesis
-#: client/text.c:1279
-msgid "Martial law in effect ("
+#: client/text.c:1339
+#, fuzzy
+msgid "Unlimited martial law in effect."
msgstr "Krijgswet van toepassing ("
-#. TRANS: no [unit] maximum
-#: client/text.c:1284
-msgid "no maximum, "
-msgstr "geen maximum, "
-
-#: client/text.c:1287
-#, c-format
-msgid "%d unit maximum, "
-msgid_plural "%d units maximum, "
-msgstr[0] "%d eenheid maximaal, "
-msgstr[1] "%d eenheden maximaal, "
+#: client/text.c:1341
+#, fuzzy, c-format
+msgid "%d military unit may impose martial law."
+msgid_plural "Up to %d military units may impose martial law."
+msgstr[0] ""
+"* Een niet-militaire eenheid (kan niet aanvallen, geen krijgstucht).\n"
+msgstr[1] ""
+"* Een niet-militaire eenheid (kan niet aanvallen, geen krijgstucht).\n"
-#. TRANS: Martial law closing parenthesis
-#: client/text.c:1294
-#, c-format
-msgid "%d per unit). "
-msgstr "%d per eenheid). "
+#: client/text.c:1345
+#, fuzzy, c-format
+msgid "Each military unit makes %d unhappy citizen content."
+msgid_plural "Each military unit makes %d unhappy citizens content."
+msgstr[0] ""
+"Vermaakt de inwoners van een stad en maakt daarbij drie ontevreden "
+"stedelingen tevreden."
+msgstr[1] ""
+"Vermaakt de inwoners van een stad en maakt daarbij drie ontevreden "
+"stedelingen tevreden."
-#: client/text.c:1298
+#: client/text.c:1352
msgid "Military units in the field may cause unhappiness. "
msgstr "Militaire eenheden in het veld kunnen ontevredenheid veroorzaken. "
-#: client/text.c:1301
+#: client/text.c:1355
msgid "Military units have no happiness effect. "
msgstr "Militaire eenheden kunnen geen ontevredenheid veroorzaken. "
-#: client/text.c:1316
+#: client/text.c:1370
#, c-format
msgid "Luxury: %d total."
msgstr "Luxe: %d totaal."
@@ -10166,7 +10246,7 @@ msgstr ""
"Client ondersteunt geen bovenaanzicht-vlakkensets. Val terug op standaard "
"vlakkenset."
-#: client/tilespec.c:3968
+#: client/tilespec.c:3966
#, fuzzy, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
@@ -10193,12 +10273,12 @@ msgstr ""
"De burgemeester is in de war geraakt ivm %s. U wil er waarschijnlijk zelf "
"eens naar kijken."
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
-#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:599
+#: client/gui-gtk-2.0/cityrep.c:624 client/gui-sdl/citydlg.c:2009
msgid "none"
msgstr "geen"
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:645
msgid "custom"
msgstr "anders"
@@ -10507,7 +10587,7 @@ msgstr "Vestig _Handelsroute"
msgid "Enter Marketplace"
msgstr "Ga marktplein op"
-#: client/gui-gtk-2.0/chatline.c:144 client/gui-win32/chatline.c:134
+#: client/gui-gtk-2.0/chatline.c:218 client/gui-win32/chatline.c:134
#: client/gui-xaw/chatline.c:120
msgid "Cleared output window."
msgstr "Outputvenster geschoond."
@@ -10588,11 +10668,11 @@ msgid "%d/%d %d turns"
msgstr "%d/%d %d beurten"
#: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:821
+#: client/gui-gtk-2.0/cityrep.c:1027
msgid "_Buy"
msgstr "_Koop"
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:869
#, fuzzy
msgid "_Production"
msgstr "Pro_ductie"
@@ -10614,12 +10694,12 @@ msgid "Entertainers"
msgstr "Showbizz"
#: client/gui-gtk-2.0/citydlg.c:1029 client/gui-win32/citydlg.c:1989
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2403
msgid "Scientists"
msgstr "Wetenschappers"
#: client/gui-gtk-2.0/citydlg.c:1030 client/gui-win32/citydlg.c:1991
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2404
msgid "Taxmen"
msgstr "Belastingsbeambten"
@@ -10712,7 +10792,7 @@ msgstr "Ondersteunde eenheden %d"
msgid "Present units %d"
msgstr "Aanwezige eenheden %d"
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:1019
msgid "Cen_ter"
msgstr "Cen_treer"
@@ -10801,32 +10881,62 @@ msgstr "Hernoem Stad"
msgid "What should we rename the city to?"
msgstr "Waarin zullen we de stadsnaam veranderen?"
-#: client/gui-gtk-2.0/cityrep.c:699
+#: client/gui-gtk-2.0/cityrep.c:794
+#, fuzzy
+msgid "(no worklists defined)"
+msgstr "(werklijst)"
+
+#: client/gui-gtk-2.0/cityrep.c:876
msgid "Chan_ge"
msgstr "_Wijzig"
-#: client/gui-gtk-2.0/cityrep.c:703
+#: client/gui-gtk-2.0/cityrep.c:880
msgid "Add _First"
msgstr "Toevoegen _Eerst"
-#: client/gui-gtk-2.0/cityrep.c:707
+#: client/gui-gtk-2.0/cityrep.c:884
msgid "Add _Next"
msgstr "Toevoegen Volge_nd"
-#: client/gui-gtk-2.0/cityrep.c:711
+#: client/gui-gtk-2.0/cityrep.c:888
+#, fuzzy
+msgid "Add _2nd Last"
+msgstr "Toevoegen _Laatst"
+
+#: client/gui-gtk-2.0/cityrep.c:892
msgid "Add _Last"
msgstr "Toevoegen _Laatst"
-#: client/gui-gtk-2.0/cityrep.c:715
+#: client/gui-gtk-2.0/cityrep.c:899
+#, fuzzy
+msgid "Set Worklist"
+msgstr "Werklijst"
+
+#: client/gui-gtk-2.0/cityrep.c:905
+#, fuzzy
+msgid "Append Worklist"
+msgstr "Hernoem werklijst"
+
+#: client/gui-gtk-2.0/cityrep.c:911
+#, fuzzy
+msgid "Clear _Worklist"
+msgstr "Doel_werklijst:"
+
+#: client/gui-gtk-2.0/cityrep.c:916
+#, fuzzy
+msgid "Gover_nor"
+msgstr "Gouverneur"
+
+#: client/gui-gtk-2.0/cityrep.c:921
msgid "_Select"
msgstr "Kie_s"
-#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
+#: client/gui-gtk-2.0/cityrep.c:925 client/gui-gtk-2.0/plrdlg.c:521
#, fuzzy
msgid "_Display"
msgstr "_Toon..."
-#: client/gui-gtk-2.0/cityrep.c:800 client/gui-gtk-2.0/menu.c:808
+#: 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-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
#: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -10836,101 +10946,101 @@ msgstr "_Toon..."
msgid "Cities"
msgstr "Steden"
-#: client/gui-gtk-2.0/cityrep.c:817
+#: client/gui-gtk-2.0/cityrep.c:1023
#, fuzzy
msgid "_Inspect"
msgstr "Pop_up"
-#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
-#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-sdl/helpdlg.c:297 client/gui-win32/menu.c:342
-#: client/gui-xaw/menu.c:241
+#: 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
+#: client/gui-gtk-2.0/cityrep.c:1518 client/gui-gtk-2.0/menu.c:823
+#: client/gui-gtk-2.0/menu.c:825 client/gui-gtk-2.0/menu.c:827
+#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:831
+#: client/gui-gtk-2.0/menu.c:833 client/gui-sdl/helpdlg.c:297
+#: client/gui-win32/menu.c:342 client/gui-xaw/menu.c:241
msgid "Improvements"
msgstr "Verbeteringen"
-#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
-#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
-#: client/gui-xaw/menu.c:247
+#: client/gui-gtk-2.0/cityrep.c:1441 client/gui-gtk-2.0/cityrep.c:1460
+#: client/gui-gtk-2.0/cityrep.c:1479 client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1522 client/gui-xaw/menu.c:247
msgid "Wonders"
msgstr "Wereldwonder"
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1662 client/gui-win32/cityrep.c:439
#: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
msgid "All Cities"
msgstr "Alle Steden"
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1667 client/gui-win32/cityrep.c:440
msgid "No Cities"
msgstr "Geen Steden"
-#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1672 client/gui-win32/cityrep.c:441
msgid "Invert Selection"
msgstr "Draai Keuze Om"
-#: client/gui-gtk-2.0/cityrep.c:1420
+#: client/gui-gtk-2.0/cityrep.c:1682
msgid "Building Units"
msgstr "Bouw Eenheden"
-#: client/gui-gtk-2.0/cityrep.c:1426
+#: client/gui-gtk-2.0/cityrep.c:1688
msgid "Building Improvements"
msgstr "Bouw Stadsverbeteringen"
-#: client/gui-gtk-2.0/cityrep.c:1432
+#: client/gui-gtk-2.0/cityrep.c:1694
msgid "Building Wonders"
msgstr "Bouw Wonderen"
-#: client/gui-gtk-2.0/cityrep.c:1444
+#: client/gui-gtk-2.0/cityrep.c:1706
msgid "Building Unit"
msgstr "Bouw Eenheid"
-#: client/gui-gtk-2.0/cityrep.c:1448
+#: client/gui-gtk-2.0/cityrep.c:1710
msgid "Building Improvement"
msgstr "Bouw Stadsverbetering"
-#: client/gui-gtk-2.0/cityrep.c:1452
+#: client/gui-gtk-2.0/cityrep.c:1714
msgid "Building Wonder"
msgstr "Bouw Wonder"
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1722 client/gui-win32/cityrep.c:443
msgid "Coastal Cities"
msgstr "Kuststeden"
-#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1727 client/gui-win32/cityrep.c:444
msgid "Same Island"
msgstr "Zelfde Eiland"
-#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1737 client/gui-win32/cityrep.c:447
msgid "Supported Units"
msgstr "Ondersteunde Eenheden"
-#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1740 client/gui-win32/cityrep.c:454
msgid "Units Present"
msgstr "Aanwezige Eenheden"
-#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1744 client/gui-win32/cityrep.c:469
msgid "Improvements in City"
msgstr "Verbeteringen in Stad"
-#: client/gui-gtk-2.0/cityrep.c:1486
+#: client/gui-gtk-2.0/cityrep.c:1748
msgid "Wonders in City"
msgstr "Wonderen in Stad"
-#: client/gui-gtk-2.0/cityrep.c:1495
+#: client/gui-gtk-2.0/cityrep.c:1757
msgid "Available Units"
msgstr "Beschikbare Eenheden"
-#: client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1760
msgid "Available Improvements"
msgstr "Beschikbare Verbeteringen"
-#: client/gui-gtk-2.0/cityrep.c:1501
+#: client/gui-gtk-2.0/cityrep.c:1763
msgid "Available Wonders"
msgstr "Beschikbare Wonderen"
-#: client/gui-gtk-2.0/cityrep.c:1625
+#: client/gui-gtk-2.0/cityrep.c:1882
#, fuzzy, c-format
msgid "Total Buy Cost: %d"
msgstr "Totale Kosten: "
@@ -11000,12 +11110,12 @@ 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:186
+#: client/gui-gtk-2.0/dialogs.c:196 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:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
#, fuzzy
msgid "Inspect _City"
msgstr "Pop_up Stad"
@@ -11034,10 +11144,10 @@ msgstr "Kies wat te plunderen:"
msgid "Unit"
msgstr "Eenheid"
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
-#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
-#: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
-#: manual/civmanual.c:302 data/Freeciv.in:80
+#: 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-win32/plrdlg.c:335 manual/civmanual.c:302 data/Freeciv.in:80
msgid "Name"
msgstr "Naam"
@@ -11063,7 +11173,7 @@ 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:1036 data/Freeciv.in:3371
+#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
msgid "Pick Nation"
msgstr "Kies Natie"
@@ -11145,7 +11255,7 @@ msgstr "Kaarten"
msgid "_Advances"
msgstr "Vooruitg_angen"
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:910
+#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr "Steden (_C)"
@@ -11251,19 +11361,19 @@ msgstr "Kies bestemming"
msgid "Show _All Cities"
msgstr "Toon _alle steden"
-#: client/gui-gtk-2.0/gui_main.c:150
+#: client/gui-gtk-2.0/gui_main.c:162
msgid "Show Map Scrollbars"
msgstr "Toon kaartscrollbars"
-#: client/gui-gtk-2.0/gui_main.c:151
+#: client/gui-gtk-2.0/gui_main.c:163
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:155
+#: client/gui-gtk-2.0/gui_main.c:167
msgid "Keyboardless goto"
msgstr "Toetsenbordloos ga-naar"
-#: client/gui-gtk-2.0/gui_main.c:156
+#: client/gui-gtk-2.0/gui_main.c:168
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."
@@ -11272,11 +11382,11 @@ msgstr ""
"klikken en dan met de muisknop ingedrukt de cursor naar een doelvak te "
"bewegen."
-#: client/gui-gtk-2.0/gui_main.c:161
+#: client/gui-gtk-2.0/gui_main.c:173
msgid "Keep dialogs on top"
msgstr "Houd dialogen bovenop"
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:174
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."
@@ -11285,11 +11395,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:166
+#: client/gui-gtk-2.0/gui_main.c:178
msgid "Show worklist task icons"
msgstr "Toon werklijst iconen"
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:179
msgid ""
"Disabling this will turn off the unit and building icons in the worklist "
"dialog and the production tab of the city dialog."
@@ -11297,11 +11407,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:171
+#: client/gui-gtk-2.0/gui_main.c:183
msgid "Enable status report tabs"
msgstr "Status-rapport-tabs aan"
-#: client/gui-gtk-2.0/gui_main.c:172
+#: client/gui-gtk-2.0/gui_main.c:184
msgid ""
"If this option is enabled then report dialogs will be shown as separate tabs "
"rather than in popup dialogs."
@@ -11309,11 +11419,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:177 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:189 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:178 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:190 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."
@@ -11322,50 +11432,119 @@ msgstr ""
"schaduw te tekenen. Dit is niet trager maar verbruikt wel twee keer zoveel "
"geheugen."
-#: client/gui-gtk-2.0/gui_main.c:277 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:195
+msgid "Show time for each chat message"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:196
+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
+msgid "Split bottom notebook area"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:202
+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
+msgid "New message events go to top of list"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:208
+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
+msgid "Show extra message window buttons"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:214
+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 "
+"is disabled, these buttons will not appear (you can still double-click with "
+"the left mouse button or right-click on a row to inspect or goto "
+"respectively). This option will only take effect once the message window is "
+"closed and reopened."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:224
+msgid "Metaserver tab first in network page"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:225
+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
+msgid "Plain chat messages are sent to allies only"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:231
+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 "
+"messages will be sent as public chat messages. To send a public chat message "
+"with this option enabled, prefix the message with a single colon ':'. This "
+"option can also be set using a toggle button beside the chat entry (only "
+"visible in multiplayer games)."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:340 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:723 client/gui-gtk-2.0/gui_main.c:1345
+#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
msgid "Freeciv"
msgstr "Freeciv"
-#: client/gui-gtk-2.0/gui_main.c:1088 client/gui-gtk-2.0/gui_main.c:1095
+#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
#: 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:1095 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1232 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:1127 client/gui-gtk-2.0/menu.c:770
-#: client/gui-gtk-2.0/menu.c:772 client/gui-gtk-2.0/menu.c:774
-#: client/gui-gtk-2.0/menu.c:776 client/gui-gtk-2.0/menu.c:778
-#: client/gui-gtk-2.0/menu.c:780 client/gui-gtk-2.0/menu.c:782
-#: client/gui-gtk-2.0/menu.c:784 client/gui-gtk-2.0/menu.c:786
-#: client/gui-gtk-2.0/menu.c:788 client/gui-gtk-2.0/menu.c:790
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-gtk-2.0/menu.c:804 client/gui-gtk-2.0/menu.c:806
-#: client/gui-gtk-2.0/menu.c:808 client/gui-gtk-2.0/menu.c:810
-#: client/gui-gtk-2.0/menu.c:812 client/gui-gtk-2.0/menu.c:814
-#: client/gui-gtk-2.0/menu.c:816 client/gui-gtk-2.0/menu.c:818
-#: client/gui-gtk-2.0/menu.c:820 client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/gui_main.c:1266 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
+#: client/gui-gtk-2.0/menu.c:811 client/gui-gtk-2.0/menu.c:813
+#: client/gui-gtk-2.0/menu.c:815 client/gui-gtk-2.0/menu.c:817
+#: client/gui-gtk-2.0/menu.c:819 client/gui-gtk-2.0/menu.c:821
+#: client/gui-gtk-2.0/menu.c:823 client/gui-gtk-2.0/menu.c:825
+#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
+#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
+#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
+#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
+#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
+#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
#: data/Freeciv.in:2028
msgid "View"
msgstr "Bekijk"
-#: client/gui-gtk-2.0/gui_main.c:1208
+#: client/gui-gtk-2.0/gui_main.c:1359
msgid "Chat"
msgstr "Praat"
-#: client/gui-gtk-2.0/gui_main.c:1224 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1377 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"
@@ -11377,72 +11556,76 @@ msgstr ""
"menu.\n"
"Nu.. Geef ze van katoen!"
-#: client/gui-gtk-2.0/gui_main.c:1491
+#: client/gui-gtk-2.0/gui_main.c:1392
+msgid "Allies Only"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:1657
msgid "Not _ready"
msgstr "Niet klaa_r"
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
+#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
msgid "_Ready"
msgstr "Klaa_r "
-#: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2132
+#: 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
msgid "_Start"
msgstr "Begin (_S)"
-#: client/gui-gtk-2.0/gui_main.c:1520
+#: client/gui-gtk-2.0/gui_main.c:1686
#, fuzzy
msgid "_Take Player"
msgstr "Neem de controle over deze speler over"
-#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
+#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
msgid "Pick _Nation"
msgstr "Kies _Natie"
-#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
+#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
msgid "_Observe"
msgstr "_Observeer"
-#: client/gui-gtk-2.0/gui_main.c:1532
+#: client/gui-gtk-2.0/gui_main.c:1698
#, fuzzy
msgid "Do not _observe"
msgstr "_Niet Waarnemen"
-#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
msgid "<AI>"
msgstr "<KI>"
-#: client/gui-gtk-2.0/gui_main.c:1557
+#: client/gui-gtk-2.0/gui_main.c:1723
msgid "<Novice AI>"
msgstr "<Beginneling KI>"
-#: client/gui-gtk-2.0/gui_main.c:1560
+#: client/gui-gtk-2.0/gui_main.c:1726
msgid "<Easy AI>"
msgstr "<Makkelijke KI>"
-#: client/gui-gtk-2.0/gui_main.c:1563
+#: client/gui-gtk-2.0/gui_main.c:1729
msgid "<Normal AI>"
msgstr "<Normale KI>"
-#: client/gui-gtk-2.0/gui_main.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1732
msgid "<Hard AI>"
msgstr "<Moeilijke KI>"
-#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1742 client/gui-win32/dialogs.c:594
#: client/gui-xaw/pages.c:217
msgid "Random"
msgstr "Willekeurig"
-#: client/gui-gtk-2.0/gui_main.c:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
#, fuzzy
msgid "Observer"
msgstr " (waarnemer)"
-#: client/gui-gtk-2.0/gui_main.c:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
msgid "Detached"
msgstr "Losgekoppeld"
-#: client/gui-gtk-2.0/gui_main.c:1899
+#: client/gui-gtk-2.0/gui_main.c:2073
msgid "Are you sure you want to quit?"
msgstr "Ben je zeker dat je het spel wil verlaten?"
@@ -11674,470 +11857,507 @@ msgstr "_Technici"
msgid "Foreign Intelligence: %s Empire"
msgstr "Buitenlands Spionage: %s imperium"
-#: client/gui-gtk-2.0/mapctrl.c:195 client/gui-sdl/mapctrl.c:2565
+#: client/gui-gtk-2.0/mapctrl.c:179 client/gui-sdl/mapctrl.c:2565
#: client/gui-sdl/menu.c:839 client/gui-sdl/menu.c:1021
#: client/gui-win32/mapctrl.c:353
msgid "Build New City"
msgstr "Bouw Nieuwe Stad"
-#: client/gui-gtk-2.0/mapctrl.c:196 client/gui-sdl/mapctrl.c:2594
+#: client/gui-gtk-2.0/mapctrl.c:180 client/gui-sdl/mapctrl.c:2594
#: client/gui-win32/mapctrl.c:354 client/gui-xaw/mapctrl.c:89
msgid "What should we call our new city?"
msgstr "Hoe zullen we onze nieuwe stad noemen?"
-#: client/gui-gtk-2.0/mapview.c:147
+#: client/gui-gtk-2.0/mapview.c:158
msgid "Shows your current luxury/science/tax rates;click to toggle them."
msgstr ""
"Toont uw huidige luxe/wetenschap/belastings-waarden; klik voor wijzigen."
-#: client/gui-gtk-2.0/mapview.c:692 client/gui-win32/canvas.c:275
+#: client/gui-gtk-2.0/mapview.c:702 client/gui-win32/canvas.c:275
msgid "Better fog will only work in truecolor. Disabling it"
msgstr "Betere schaduw werkt alleen in 'truecolor'. Ik schakel dit nu uit."
-#: client/gui-gtk-2.0/menu.c:250
+#: client/gui-gtk-2.0/menu.c:256
msgid "Leaving a local game will end it!"
msgstr "Een lokaal spel verlaten zal het spel stoppen!"
-#: client/gui-gtk-2.0/menu.c:700 client/gui-win32/menu.c:303
+#: client/gui-gtk-2.0/menu.c:727 client/gui-win32/menu.c:303
msgid "_Game"
msgstr "_Spel"
-#: client/gui-gtk-2.0/menu.c:702 client/gui-gtk-2.0/menu.c:704
-#: client/gui-gtk-2.0/menu.c:706 client/gui-gtk-2.0/menu.c:708
-#: client/gui-gtk-2.0/menu.c:710 client/gui-gtk-2.0/menu.c:712
-#: client/gui-gtk-2.0/menu.c:714 client/gui-gtk-2.0/menu.c:717
-#: client/gui-gtk-2.0/menu.c:720 client/gui-gtk-2.0/menu.c:722
-#: client/gui-gtk-2.0/menu.c:724 client/gui-gtk-2.0/menu.c:726
-#: client/gui-gtk-2.0/menu.c:728 client/gui-gtk-2.0/menu.c:730
-#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:736
-#: client/gui-gtk-2.0/menu.c:738 client/gui-gtk-2.0/menu.c:740
+#: client/gui-gtk-2.0/menu.c:729 client/gui-gtk-2.0/menu.c:731
+#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:735
+#: client/gui-gtk-2.0/menu.c:737 client/gui-gtk-2.0/menu.c:739
+#: client/gui-gtk-2.0/menu.c:741 client/gui-gtk-2.0/menu.c:744
+#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
+#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
+#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
+#: client/gui-gtk-2.0/menu.c:760 client/gui-gtk-2.0/menu.c:763
+#: client/gui-gtk-2.0/menu.c:765 client/gui-gtk-2.0/menu.c:767
#: data/Freeciv.in:2026
msgid "Game"
msgstr "Spel"
-#: client/gui-gtk-2.0/menu.c:704 client/gui-gtk-2.0/menu.c:706
-#: client/gui-gtk-2.0/menu.c:708
+#: client/gui-gtk-2.0/menu.c:731 client/gui-gtk-2.0/menu.c:733
+#: client/gui-gtk-2.0/menu.c:735
msgid "_Chat"
msgstr "_Praat"
-#: client/gui-gtk-2.0/menu.c:706 client/gui-win32/menu.c:314
+#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:314
msgid "_Clear Log"
msgstr "S_choon Log"
-#: client/gui-gtk-2.0/menu.c:708 client/gui-win32/menu.c:313
+#: client/gui-gtk-2.0/menu.c:735 client/gui-win32/menu.c:313
#, fuzzy
msgid "_Write Log"
msgstr "E_xporteer Log"
-#: client/gui-gtk-2.0/menu.c:710 client/gui-win32/menu.c:304
+#: client/gui-gtk-2.0/menu.c:737 client/gui-win32/menu.c:304
msgid "Local _Options"
msgstr "Lokale _Opties"
-#: client/gui-gtk-2.0/menu.c:712 client/gui-win32/menu.c:305
+#: client/gui-gtk-2.0/menu.c:739 client/gui-win32/menu.c:305
msgid "_Message Options"
msgstr "_Mededeling Opties"
-#: client/gui-gtk-2.0/menu.c:717
+#: client/gui-gtk-2.0/menu.c:744
msgid "_Reload Tileset"
msgstr "Vlakkenset Herladen"
-#: client/gui-gtk-2.0/menu.c:720
+#: client/gui-gtk-2.0/menu.c:747
msgid "Save Options on _Exit"
msgstr "Bewaar Opties bij Einde"
-#: client/gui-gtk-2.0/menu.c:722
+#: client/gui-gtk-2.0/menu.c:749
msgid "Sa_ve Options"
msgstr "Bewaar Opties"
-#: client/gui-gtk-2.0/menu.c:726 client/gui-win32/menu.c:308
+#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:308
msgid "Server O_ptions"
msgstr "Server O_pties"
-#: client/gui-gtk-2.0/menu.c:730 client/gui-win32/menu.c:310
+#: client/gui-gtk-2.0/menu.c:757 client/gui-win32/menu.c:310
msgid "_Save Game"
msgstr "Bewaar _Spel"
-#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:311
+#: client/gui-gtk-2.0/menu.c:760 client/gui-win32/menu.c:311
msgid "Save Game _As..."
msgstr "Bewaar Spel _Als"
-#: client/gui-gtk-2.0/menu.c:738
+#: client/gui-gtk-2.0/menu.c:765
msgid "_Leave"
msgstr "Verlaat"
-#: client/gui-gtk-2.0/menu.c:740 client/gui-win32/menu.c:317
+#: client/gui-gtk-2.0/menu.c:767 client/gui-win32/menu.c:317
msgid "_Quit"
msgstr "_Einde"
-#: client/gui-gtk-2.0/menu.c:745 client/gui-win32/menu.c:321
+#: client/gui-gtk-2.0/menu.c:772 client/gui-win32/menu.c:321
msgid "Gov_ernment"
msgstr "Ov_erheid"
-#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
-#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
-#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:774 client/gui-gtk-2.0/menu.c:776
+#: client/gui-gtk-2.0/menu.c:778 client/gui-gtk-2.0/menu.c:780
+#: client/gui-gtk-2.0/menu.c:782 client/gui-gtk-2.0/menu.c:784
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
#: client/gui-xaw/menu.c:248 data/Freeciv.in:2027 data/helpdata.txt:1320
msgid "Government"
msgstr "Regering"
-#: client/gui-gtk-2.0/menu.c:749 client/gui-win32/menu.c:322
+#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:322
msgid "_Tax Rates"
msgstr "Belas_ting Niveau"
-#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:324
+#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:324
msgid "_Find City"
msgstr "_Zoek Stad"
-#: client/gui-gtk-2.0/menu.c:755 client/gui-win32/menu.c:325
+#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:325
msgid "_Worklists"
msgstr "_Werklijsten"
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
-#: client/gui-gtk-2.0/menu.c:764 client/gui-win32/menu.c:327
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
+#: client/gui-gtk-2.0/menu.c:791 client/gui-win32/menu.c:327
msgid "_Change Government"
msgstr "Re_geringswissel (_C)"
-#: client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:788
msgid "_Revolution..."
msgstr "_Revolutie..."
-#: client/gui-gtk-2.0/menu.c:764 client/gui-gtk-2.0/menu.c:970
+#: client/gui-gtk-2.0/menu.c:791 client/gui-gtk-2.0/menu.c:1013
#: client/gui-win32/menu.c:431
msgid "_Government"
msgstr "Re_gering"
-#: client/gui-gtk-2.0/menu.c:768 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:795 client/gui-gtk-2.0/menu.c:959
#: client/gui-win32/menu.c:334
msgid "_View"
msgstr "_Bekijk"
-#: client/gui-gtk-2.0/menu.c:772
+#: client/gui-gtk-2.0/menu.c:799
msgid "City Outlines"
msgstr "Stadsgrenzen"
-#: client/gui-gtk-2.0/menu.c:774 client/gui-win32/menu.c:335
+#: client/gui-gtk-2.0/menu.c:801 client/gui-win32/menu.c:335
msgid "Map _Grid"
msgstr "Kaart _Raster"
-#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:336
+#: client/gui-gtk-2.0/menu.c:803 client/gui-win32/menu.c:336
msgid "National _Borders"
msgstr "Nationale _Grenzen"
-#: client/gui-gtk-2.0/menu.c:778 client/gui-win32/menu.c:337
+#: client/gui-gtk-2.0/menu.c:805 client/gui-win32/menu.c:337
msgid "City _Names"
msgstr "Stads_namen"
-#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:338
+#: client/gui-gtk-2.0/menu.c:807 client/gui-win32/menu.c:338
msgid "City G_rowth"
msgstr "Stadsg_roei"
-#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:339
+#: client/gui-gtk-2.0/menu.c:809 client/gui-win32/menu.c:339
msgid "City _Productions"
msgstr "Stads _Producties"
-#: client/gui-gtk-2.0/menu.c:784 client/gui-sdl/optiondlg.c:1719
+#: client/gui-gtk-2.0/menu.c:811
+#, fuzzy
+msgid "City Buy Cost"
+msgstr "Totale Kosten: "
+
+#: client/gui-gtk-2.0/menu.c:813
+#, fuzzy
+msgid "City Traderoutes"
+msgstr "Handelsroutes : "
+
+#: client/gui-gtk-2.0/menu.c:815 client/gui-sdl/optiondlg.c:1719
msgid "Draw city worker map grid"
msgstr "Teken stadswerkerskaartraster"
-#: client/gui-gtk-2.0/menu.c:788 client/gui-sdl/optiondlg.c:1635
+#: client/gui-gtk-2.0/menu.c:819 client/gui-sdl/optiondlg.c:1635
#: client/gui-win32/menu.c:340 client/gui-xaw/menu.c:148
#: client/gui-xaw/menu.c:246 manual/civmanual.c:220 data/helpdata.txt:1220
msgid "Terrain"
msgstr "Terrein"
-#: client/gui-gtk-2.0/menu.c:790 client/gui-win32/menu.c:341
+#: client/gui-gtk-2.0/menu.c:821 client/gui-win32/menu.c:341
#: client/gui-xaw/menu.c:149
msgid "Coastline"
msgstr "Kustlijn"
-#: client/gui-gtk-2.0/menu.c:796 client/gui-win32/menu.c:343
+#: client/gui-gtk-2.0/menu.c:827 client/gui-win32/menu.c:343
msgid "Roads & Rails"
msgstr "Wegen & Spoorwegen"
-#: client/gui-gtk-2.0/menu.c:800 client/gui-sdl/optiondlg.c:1933
+#: client/gui-gtk-2.0/menu.c:831 client/gui-sdl/optiondlg.c:1933
#: client/gui-win32/menu.c:345 client/gui-xaw/menu.c:152
msgid "Mines"
msgstr "Mijnen"
-#: client/gui-gtk-2.0/menu.c:802 client/gui-win32/menu.c:346
+#: client/gui-gtk-2.0/menu.c:833 client/gui-win32/menu.c:346
msgid "Fortress & Airbase"
msgstr "Fort & Vliegbasis"
-#: client/gui-gtk-2.0/menu.c:804 client/gui-win32/menu.c:348
+#: client/gui-gtk-2.0/menu.c:835 client/gui-win32/menu.c:348
#: client/gui-xaw/menu.c:154
msgid "Specials"
msgstr "Extraas"
-#: client/gui-gtk-2.0/menu.c:806 client/gui-win32/menu.c:349
+#: client/gui-gtk-2.0/menu.c:837 client/gui-win32/menu.c:349
#: client/gui-xaw/menu.c:155
msgid "Pollution & Fallout"
msgstr "Verontreiniging & Radioactiviteit"
-#: client/gui-gtk-2.0/menu.c:812 client/gui-win32/menu.c:352
+#: client/gui-gtk-2.0/menu.c:843 client/gui-win32/menu.c:352
#: client/gui-xaw/menu.c:158
msgid "Focus Unit"
msgstr "Focus Eenheid"
-#: client/gui-gtk-2.0/menu.c:814 client/gui-sdl/optiondlg.c:1854
+#: client/gui-gtk-2.0/menu.c:845 client/gui-sdl/optiondlg.c:1854
#: client/gui-win32/menu.c:353 client/gui-xaw/menu.c:159
msgid "Fog of War"
msgstr "Oorlogsmist"
-#: client/gui-gtk-2.0/menu.c:818
+#: client/gui-gtk-2.0/menu.c:849
msgid "_Full Screen"
msgstr "Volledig scherm"
-#: client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/menu.c:853
msgid "_Center View"
msgstr "_Centreer Venster"
-#: client/gui-gtk-2.0/menu.c:825 client/gui-win32/menu.c:358
+#: client/gui-gtk-2.0/menu.c:856 client/gui-win32/menu.c:358
msgid "_Orders"
msgstr "_Opdrachten"
-#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
-#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
-#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
-#: client/gui-gtk-2.0/menu.c:855 client/gui-gtk-2.0/menu.c:857
-#: client/gui-gtk-2.0/menu.c:859 client/gui-gtk-2.0/menu.c:861
-#: client/gui-gtk-2.0/menu.c:863 client/gui-gtk-2.0/menu.c:865
-#: client/gui-gtk-2.0/menu.c:867 client/gui-gtk-2.0/menu.c:869
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875 client/gui-gtk-2.0/menu.c:877
-#: client/gui-gtk-2.0/menu.c:879 client/gui-gtk-2.0/menu.c:881
-#: client/gui-gtk-2.0/menu.c:883 client/gui-gtk-2.0/menu.c:885
-#: client/gui-gtk-2.0/menu.c:887 client/gui-gtk-2.0/menu.c:889
-#: client/gui-gtk-2.0/menu.c:891 client/gui-gtk-2.0/menu.c:893
-#: client/gui-gtk-2.0/menu.c:895 client/gui-gtk-2.0/menu.c:897
-#: client/gui-gtk-2.0/menu.c:899 client/gui-gtk-2.0/menu.c:901
-#: client/gui-gtk-2.0/menu.c:903 data/Freeciv.in:2029
+#: client/gui-gtk-2.0/menu.c:858 client/gui-gtk-2.0/menu.c:860
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:864
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:868
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:872
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:876
+#: client/gui-gtk-2.0/menu.c:878 client/gui-gtk-2.0/menu.c:880
+#: client/gui-gtk-2.0/menu.c:882 client/gui-gtk-2.0/menu.c:884
+#: client/gui-gtk-2.0/menu.c:886 client/gui-gtk-2.0/menu.c:888
+#: client/gui-gtk-2.0/menu.c:890 client/gui-gtk-2.0/menu.c:892
+#: client/gui-gtk-2.0/menu.c:894 client/gui-gtk-2.0/menu.c:896
+#: client/gui-gtk-2.0/menu.c:898 client/gui-gtk-2.0/menu.c:900
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906 client/gui-gtk-2.0/menu.c:908
+#: client/gui-gtk-2.0/menu.c:910 client/gui-gtk-2.0/menu.c:912
+#: client/gui-gtk-2.0/menu.c:914 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:918 client/gui-gtk-2.0/menu.c:920
+#: client/gui-gtk-2.0/menu.c:922 client/gui-gtk-2.0/menu.c:924
+#: client/gui-gtk-2.0/menu.c:926 client/gui-gtk-2.0/menu.c:928
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
+#: client/gui-gtk-2.0/menu.c:946 data/Freeciv.in:2029
msgid "Orders"
msgstr "Opdrachten"
-#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:1444
+#: client/gui-gtk-2.0/menu.c:860 client/gui-gtk-2.0/menu.c:1489
#: client/gui-win32/menu.c:359
msgid "_Build City"
msgstr "_Bouw Stad"
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:1466
-#: client/gui-gtk-2.0/menu.c:1472 client/gui-win32/menu.c:360
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:1511
+#: client/gui-gtk-2.0/menu.c:1517 client/gui-win32/menu.c:360
msgid "Build _Road"
msgstr "Bouw Weg (_R)"
-#: client/gui-gtk-2.0/menu.c:833 client/gui-gtk-2.0/menu.c:1360
+#: 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 "Bouw _Irrigatie"
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:1361
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:1406
#: client/gui-win32/menu.c:362
msgid "Build _Mine"
msgstr "Bouw _Mijn"
-#: client/gui-gtk-2.0/menu.c:837 client/gui-gtk-2.0/menu.c:1362
+#: client/gui-gtk-2.0/menu.c:868 client/gui-gtk-2.0/menu.c:1407
msgid "Transf_orm Terrain"
msgstr "Transf_ormeer Terrein"
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:1508
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:1553
#: client/gui-win32/menu.c:364
msgid "Build _Fortress"
msgstr "Bouw _Fort"
-#: client/gui-gtk-2.0/menu.c:841 client/gui-win32/menu.c:365
+#: client/gui-gtk-2.0/menu.c:872 client/gui-win32/menu.c:365
msgid "Build Airbas_e"
msgstr "Bouw Vliegbasis"
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:1514
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:1559
#: client/gui-win32/menu.c:366
msgid "Clean _Pollution"
msgstr "Verwijder Verontreiniging (_P)"
-#: client/gui-gtk-2.0/menu.c:845 client/gui-win32/menu.c:367
+#: client/gui-gtk-2.0/menu.c:876 client/gui-win32/menu.c:367
msgid "Clean _Nuclear Fallout"
msgstr "Verwijder Radioactieve Besmetting (_N)"
-#: client/gui-gtk-2.0/menu.c:849 client/gui-win32/menu.c:369
+#: client/gui-gtk-2.0/menu.c:880 client/gui-win32/menu.c:369
msgid "_Sentry"
msgstr "Op Wacht (_S)"
-#: client/gui-gtk-2.0/menu.c:855 client/gui-win32/menu.c:372
+#: client/gui-gtk-2.0/menu.c:886 client/gui-win32/menu.c:372
msgid "Make _Homecity"
msgstr "Maak _Hoofdstad"
-#: client/gui-gtk-2.0/menu.c:857 client/gui-win32/menu.c:373
+#: client/gui-gtk-2.0/menu.c:888 client/gui-win32/menu.c:373
msgid "_Load"
msgstr "_Laad"
-#: client/gui-gtk-2.0/menu.c:859
+#: client/gui-gtk-2.0/menu.c:890
msgid "_Unload Transporter"
msgstr "Los Vrachtschip (_U)"
-#: client/gui-gtk-2.0/menu.c:861 client/gui-win32/menu.c:374
+#: client/gui-gtk-2.0/menu.c:892 client/gui-win32/menu.c:374
msgid "_Unload"
msgstr "Los (_U)"
-#: client/gui-gtk-2.0/menu.c:863 client/gui-win32/menu.c:375
+#: client/gui-gtk-2.0/menu.c:894 client/gui-win32/menu.c:375
msgid "Wake up o_thers"
msgstr "Wek anderen (_t)"
-#: client/gui-gtk-2.0/menu.c:867
+#: client/gui-gtk-2.0/menu.c:898
msgid "_Auto Settler"
msgstr "_Auto Kolonist"
-#: client/gui-gtk-2.0/menu.c:869 client/gui-win32/menu.c:378
+#: client/gui-gtk-2.0/menu.c:900 client/gui-win32/menu.c:378
msgid "Auto E_xplore"
msgstr "Auto Onderzoek (_x)"
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906
msgid "_Connect"
msgstr "Maak _verbinding"
-#: client/gui-gtk-2.0/menu.c:871 client/gui-win32/menu.c:380
+#: client/gui-gtk-2.0/menu.c:902 client/gui-win32/menu.c:380
msgid "_Road"
msgstr "Weg (_R)"
-#: client/gui-gtk-2.0/menu.c:873 client/gui-win32/menu.c:381
+#: client/gui-gtk-2.0/menu.c:904 client/gui-win32/menu.c:381
msgid "Rai_l"
msgstr "Spoorweg (_l)"
-#: client/gui-gtk-2.0/menu.c:875 client/gui-win32/menu.c:382
+#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:382
msgid "_Irrigate"
msgstr "_Irrigeer"
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
msgid "Go _to"
msgstr "Ga naar"
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
msgid "_Build city"
msgstr "_Bouw Stad"
-#: client/gui-gtk-2.0/menu.c:879
+#: client/gui-gtk-2.0/menu.c:910
msgid "Patrol (_Q)"
msgstr "Patrouilleer"
-#: client/gui-gtk-2.0/menu.c:881 client/gui-win32/menu.c:385
+#: client/gui-gtk-2.0/menu.c:912 client/gui-win32/menu.c:385
msgid "_Go to"
msgstr "_Ga naar"
-#: client/gui-gtk-2.0/menu.c:883
+#: client/gui-gtk-2.0/menu.c:914
msgid "Go\\/Airlift to City"
msgstr "Ga\\/Vlieg naar Stad"
-#: client/gui-gtk-2.0/menu.c:885 client/gui-sdl/menu.c:450
+#: client/gui-gtk-2.0/menu.c:916 client/gui-sdl/menu.c:450
#: client/gui-win32/menu.c:387 client/gui-xaw/menu.c:203
msgid "Return to nearest city"
msgstr "Ga terug naar dichtsbijzijnde stad"
-#: client/gui-gtk-2.0/menu.c:889 client/gui-win32/menu.c:389
+#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:389
#: client/gui-xaw/menu.c:205
msgid "Disband Unit"
msgstr "Ontbind Eenheid"
-#: client/gui-gtk-2.0/menu.c:891 client/gui-sdl/citydlg.c:532
+#: client/gui-gtk-2.0/menu.c:922 client/gui-sdl/citydlg.c:532
#: data/Freeciv.in:1186
msgid "Upgrade unit"
msgstr "Waardeer eenheid op"
-#: client/gui-gtk-2.0/menu.c:893
+#: client/gui-gtk-2.0/menu.c:924
msgid "Diplomat\\/Spy Actions"
msgstr "Diplomaat\\/Spion Acties"
-#: client/gui-gtk-2.0/menu.c:895 client/gui-sdl/menu.c:399
+#: client/gui-gtk-2.0/menu.c:926 client/gui-sdl/menu.c:399
#: client/gui-win32/menu.c:391 client/gui-xaw/menu.c:209
msgid "Explode Nuclear"
msgstr "Explodeer Kernraket"
-#: client/gui-gtk-2.0/menu.c:899
-msgid "Select same type"
-msgstr "Selectoor zelfde type"
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/cityrep.c:882
+msgid "Select"
+msgstr "Kies"
+
+#: client/gui-gtk-2.0/menu.c:934
+#, fuzzy
+msgid "Single"
+msgstr "Oerwoud"
+
+#: client/gui-gtk-2.0/menu.c:936
+msgid "Same Type On Tile"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:938
+msgid "All On Tile"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:940
+msgid "Same Type On Continent"
+msgstr ""
-#: client/gui-gtk-2.0/menu.c:901 client/gui-win32/menu.c:393
+#: client/gui-gtk-2.0/menu.c:942
+msgid "Same Type Everywhere"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:393
msgid "_Wait"
msgstr "_Wacht"
-#: client/gui-gtk-2.0/menu.c:903 client/gui-win32/menu.c:394
+#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:394
#: client/gui-xaw/menu.c:213
msgid "Done"
msgstr "Klaar"
-#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:398
+#: client/gui-gtk-2.0/menu.c:949 client/gui-win32/menu.c:398
msgid "_Reports"
msgstr "_Rapporten"
-#: client/gui-gtk-2.0/menu.c:908 client/gui-gtk-2.0/menu.c:910
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:914
-#: client/gui-gtk-2.0/menu.c:916 client/gui-gtk-2.0/menu.c:918
-#: client/gui-gtk-2.0/menu.c:920 client/gui-gtk-2.0/menu.c:922
-#: client/gui-gtk-2.0/menu.c:924 client/gui-gtk-2.0/menu.c:926
-#: client/gui-gtk-2.0/menu.c:928 client/gui-gtk-2.0/menu.c:930
-#: client/gui-gtk-2.0/menu.c:932 data/Freeciv.in:2030
+#: client/gui-gtk-2.0/menu.c:951 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:957
+#: client/gui-gtk-2.0/menu.c:959 client/gui-gtk-2.0/menu.c:961
+#: client/gui-gtk-2.0/menu.c:963 client/gui-gtk-2.0/menu.c:965
+#: client/gui-gtk-2.0/menu.c:967 client/gui-gtk-2.0/menu.c:969
+#: client/gui-gtk-2.0/menu.c:971 client/gui-gtk-2.0/menu.c:973
+#: client/gui-gtk-2.0/menu.c:975 data/Freeciv.in:2030
msgid "Reports"
msgstr "Rapporten"
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:958
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:1001
#: client/gui-win32/menu.c:400 client/gui-win32/menu.c:425
msgid "_Units"
msgstr "_Eenheden"
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/menu.c:914 client/gui-win32/menu.c:402
+#: client/gui-gtk-2.0/menu.c:957 client/gui-win32/menu.c:402
#, fuzzy
msgid "_Nations"
msgstr "_Naties"
-#: client/gui-gtk-2.0/menu.c:918 client/gui-win32/menu.c:403
+#: client/gui-gtk-2.0/menu.c:961 client/gui-win32/menu.c:403
msgid "_Economy"
msgstr "_Economie"
#. TRANS: Research report action
-#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:405
+#: client/gui-gtk-2.0/menu.c:963 client/gui-win32/menu.c:405
#, fuzzy
msgid "_Research"
msgstr "_Onderzoek"
-#: client/gui-gtk-2.0/menu.c:924 client/gui-win32/menu.c:407
+#: client/gui-gtk-2.0/menu.c:967 client/gui-win32/menu.c:407
msgid "_Wonders of the World"
msgstr "_Wereldwonderen"
-#: client/gui-gtk-2.0/menu.c:926 client/gui-win32/menu.c:408
+#: client/gui-gtk-2.0/menu.c:969 client/gui-win32/menu.c:408
msgid "_Top Five Cities"
msgstr "_Top Vijf Steden"
-#: client/gui-gtk-2.0/menu.c:928 client/gui-win32/menu.c:409
+#: client/gui-gtk-2.0/menu.c:971 client/gui-win32/menu.c:409
msgid "_Messages"
msgstr "_Berichten"
-#: client/gui-gtk-2.0/menu.c:930 client/gui-win32/menu.c:410
+#: client/gui-gtk-2.0/menu.c:973 client/gui-win32/menu.c:410
msgid "_Demographics"
msgstr "Volkenkun_de"
-#: client/gui-gtk-2.0/menu.c:932 client/gui-gtk-2.0/plrdlg.c:471
+#: client/gui-gtk-2.0/menu.c:975 client/gui-gtk-2.0/plrdlg.c:354
#: client/gui-win32/menu.c:411
msgid "_Spaceship"
msgstr "Ruimte_schip"
-#: client/gui-gtk-2.0/menu.c:936 client/gui-win32/menu.c:415
+#: client/gui-gtk-2.0/menu.c:979 client/gui-win32/menu.c:415
msgid "_Help"
msgstr "_Help"
-#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
-#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
-#: client/gui-gtk-2.0/menu.c:946 client/gui-gtk-2.0/menu.c:948
-#: client/gui-gtk-2.0/menu.c:950 client/gui-gtk-2.0/menu.c:952
-#: client/gui-gtk-2.0/menu.c:954 client/gui-gtk-2.0/menu.c:956
-#: client/gui-gtk-2.0/menu.c:958 client/gui-gtk-2.0/menu.c:960
-#: client/gui-gtk-2.0/menu.c:962 client/gui-gtk-2.0/menu.c:964
-#: client/gui-gtk-2.0/menu.c:966 client/gui-gtk-2.0/menu.c:968
-#: client/gui-gtk-2.0/menu.c:970 client/gui-gtk-2.0/menu.c:972
-#: client/gui-gtk-2.0/menu.c:974 client/gui-gtk-2.0/menu.c:976
-#: client/gui-gtk-2.0/menu.c:978 client/gui-gtk-2.0/menu.c:980
+#: client/gui-gtk-2.0/menu.c:981 client/gui-gtk-2.0/menu.c:983
+#: client/gui-gtk-2.0/menu.c:985 client/gui-gtk-2.0/menu.c:987
+#: client/gui-gtk-2.0/menu.c:989 client/gui-gtk-2.0/menu.c:991
+#: client/gui-gtk-2.0/menu.c:993 client/gui-gtk-2.0/menu.c:995
+#: client/gui-gtk-2.0/menu.c:997 client/gui-gtk-2.0/menu.c:999
+#: client/gui-gtk-2.0/menu.c:1001 client/gui-gtk-2.0/menu.c:1003
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-gtk-2.0/menu.c:1007
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-gtk-2.0/menu.c:1011
+#: client/gui-gtk-2.0/menu.c:1013 client/gui-gtk-2.0/menu.c:1015
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-gtk-2.0/menu.c:1019
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-gtk-2.0/menu.c:1023
#: client/gui-gtk-2.0/repodlgs.c:313 client/gui-win32/citydlg.c:1077
#: client/gui-win32/repodlgs.c:289 client/gui-win32/wldlg.c:846
#: data/Freeciv.in:1466 data/Freeciv.in:2031 data/Freeciv.in:2101
@@ -12145,119 +12365,119 @@ msgstr "_Help"
msgid "Help"
msgstr "Help"
-#: client/gui-gtk-2.0/menu.c:940 client/gui-win32/menu.c:416
+#: client/gui-gtk-2.0/menu.c:983 client/gui-win32/menu.c:416
msgid "Language_s"
msgstr "Talen (_S)"
-#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/menu.c:417
+#: client/gui-gtk-2.0/menu.c:985 client/gui-win32/menu.c:417
msgid "Co_nnecting"
msgstr "Maak verbi_nding"
-#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:418
+#: client/gui-gtk-2.0/menu.c:987 client/gui-win32/menu.c:418
msgid "C_ontrols"
msgstr "Bediening (_O)"
-#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:419
+#: client/gui-gtk-2.0/menu.c:989 client/gui-win32/menu.c:419
msgid "C_hatline"
msgstr "C_hatregel"
-#: client/gui-gtk-2.0/menu.c:948 client/gui-win32/menu.c:420
+#: client/gui-gtk-2.0/menu.c:991 client/gui-win32/menu.c:420
msgid "_Worklist Editor"
msgstr "_Werklijst Editor"
-#: client/gui-gtk-2.0/menu.c:950 client/gui-win32/menu.c:421
+#: client/gui-gtk-2.0/menu.c:993 client/gui-win32/menu.c:421
msgid "Citizen _Management"
msgstr "Burge_meester"
-#: client/gui-gtk-2.0/menu.c:952 client/gui-win32/menu.c:422
+#: client/gui-gtk-2.0/menu.c:995 client/gui-win32/menu.c:422
msgid "_Playing"
msgstr "S_pelen"
-#: client/gui-gtk-2.0/menu.c:956 client/gui-win32/menu.c:424
+#: client/gui-gtk-2.0/menu.c:999 client/gui-win32/menu.c:424
msgid "City _Improvements"
msgstr "Stadsverbeter_ingen"
-#: client/gui-gtk-2.0/menu.c:960 client/gui-win32/menu.c:426
+#: client/gui-gtk-2.0/menu.c:1003 client/gui-win32/menu.c:426
msgid "Com_bat"
msgstr "Gevecht (_B)"
-#: client/gui-gtk-2.0/menu.c:962 client/gui-win32/menu.c:427
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-win32/menu.c:427
msgid "_ZOC"
msgstr "IS (_Z)"
-#: client/gui-gtk-2.0/menu.c:964 client/gui-win32/menu.c:428
+#: client/gui-gtk-2.0/menu.c:1007 client/gui-win32/menu.c:428
msgid "Techno_logy"
msgstr "Techno_logie"
-#: client/gui-gtk-2.0/menu.c:966 client/gui-win32/menu.c:429
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-win32/menu.c:429
msgid "_Terrain"
msgstr "_Terrein"
-#: client/gui-gtk-2.0/menu.c:968 client/gui-win32/menu.c:430
+#: client/gui-gtk-2.0/menu.c:1011 client/gui-win32/menu.c:430
msgid "Won_ders"
msgstr "Werel_dwonder"
-#: client/gui-gtk-2.0/menu.c:972 client/gui-win32/menu.c:432
+#: client/gui-gtk-2.0/menu.c:1015 client/gui-win32/menu.c:432
msgid "Happin_ess"
msgstr "Geluk (_E)"
-#: client/gui-gtk-2.0/menu.c:974 client/gui-win32/menu.c:433
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-win32/menu.c:433
msgid "Space _Race"
msgstr "_Ruimte Race"
-#: client/gui-gtk-2.0/menu.c:978 client/gui-win32/menu.c:435
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-win32/menu.c:435
msgid "_Copying"
msgstr "Kopiëren (_C)"
-#: client/gui-gtk-2.0/menu.c:980 client/gui-win32/menu.c:436
+#: client/gui-gtk-2.0/menu.c:1023 client/gui-win32/menu.c:436
msgid "_About"
msgstr "Over (_A)"
-#: client/gui-gtk-2.0/menu.c:1264
+#: client/gui-gtk-2.0/menu.c:1307
#, c-format
msgid "%s..."
msgstr "%s..."
-#: client/gui-gtk-2.0/menu.c:1352
+#: client/gui-gtk-2.0/menu.c:1397
#, c-format
msgid "Change to %s (_I)"
msgstr "Verander in %s (_I)"
-#: client/gui-gtk-2.0/menu.c:1353
+#: client/gui-gtk-2.0/menu.c:1398
#, c-format
msgid "Change to %s (_M)"
msgstr "Verander in %s (_M)"
-#: client/gui-gtk-2.0/menu.c:1354
+#: client/gui-gtk-2.0/menu.c:1399
#, c-format
msgid "Transf_orm to %s"
msgstr "Transf_ormeer naar %s"
-#: client/gui-gtk-2.0/menu.c:1427
+#: client/gui-gtk-2.0/menu.c:1472
msgid "Help _Build Wonder"
msgstr "Help Wonder _Bouwen"
-#: client/gui-gtk-2.0/menu.c:1441
+#: client/gui-gtk-2.0/menu.c:1486
msgid "Add to City (_B)"
msgstr "Voeg toe aan Stad (_B)"
-#: client/gui-gtk-2.0/menu.c:1449
+#: client/gui-gtk-2.0/menu.c:1494
msgid "Make Trade _Route"
msgstr "Maak Handels _Route"
-#: client/gui-gtk-2.0/menu.c:1463
+#: client/gui-gtk-2.0/menu.c:1508
msgid "Build _Railroad"
msgstr "Bouw Spoo_rweg"
-#: client/gui-gtk-2.0/menu.c:1486
+#: client/gui-gtk-2.0/menu.c:1531
msgid "Bu_ild Farmland"
msgstr "Bouw Landbouwgrond (_I)"
-#: client/gui-gtk-2.0/menu.c:1506
+#: client/gui-gtk-2.0/menu.c:1551
msgid "_Fortify"
msgstr "_Fortificeer"
-#: client/gui-gtk-2.0/menu.c:1512
+#: client/gui-gtk-2.0/menu.c:1557
msgid "_Paradrop"
msgstr "Drop _Para's"
@@ -12293,13 +12513,32 @@ msgstr "Ber"
msgid "Pop"
msgstr "Pop"
-#: client/gui-gtk-2.0/messagewin.c:155 client/gui-sdl/messagewin.c:247
+#: client/gui-gtk-2.0/messagewin.c:186 client/gui-sdl/messagewin.c:247
#: client/gui-win32/messagewin.c:132 client/gui-xaw/menu.c:228
#: data/Freeciv.in:3273 data/Freeciv.in:3274 data/Freeciv.in:3283
msgid "Messages"
msgstr "Berichten"
-#: client/gui-gtk-2.0/plrdlg.c:330
+#: client/gui-gtk-2.0/plrdlg.c:317
+msgid "_Meet"
+msgstr "Ont_moet"
+
+#: client/gui-gtk-2.0/plrdlg.c:323
+#, fuzzy
+msgid "Cancel _Treaty"
+msgstr "_Verbreek Verdrag"
+
+#: client/gui-gtk-2.0/plrdlg.c:329
+#, fuzzy
+msgid "_Withdraw Vision"
+msgstr "Ontneem _waarneming"
+
+#: client/gui-gtk-2.0/plrdlg.c:348
+#, fuzzy
+msgid "_Report"
+msgstr "_Rapporten"
+
+#: client/gui-gtk-2.0/plrdlg.c:386
msgid "?show:Dead Players"
msgstr "?show: Dode Spelers"
@@ -12307,268 +12546,271 @@ msgstr "?show: Dode Spelers"
#. TRANS: Nations report action
#. TRANS: Nations report title
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/plrdlg.c:350 client/gui-sdl/mapctrl.c:1580
+#: client/gui-gtk-2.0/plrdlg.c:406 client/gui-sdl/mapctrl.c:1580
#: client/gui-sdl/plrdlg.c:608 client/gui-win32/plrdlg.c:344
#: client/gui-xaw/menu.c:221 data/Freeciv.in:3192 data/Freeciv.in:3193
msgid "Nations"
msgstr "Naties"
-#: client/gui-gtk-2.0/plrdlg.c:443
-msgid "_Intelligence"
-msgstr "_Inlichtingen"
-
-#: client/gui-gtk-2.0/plrdlg.c:450
-msgid "_Meet"
-msgstr "Ont_moet"
-
-#: client/gui-gtk-2.0/plrdlg.c:457
+#: client/gui-gtk-2.0/plrdlg.c:511
#, fuzzy
-msgid "Cancel _Treaty"
-msgstr "_Verbreek Verdrag"
+msgid "Di_plomacy"
+msgstr "Diplomatie"
-#: client/gui-gtk-2.0/plrdlg.c:464
-msgid "_Withdraw vision"
-msgstr "Ontneem _waarneming"
+#: client/gui-gtk-2.0/plrdlg.c:516
+msgid "_Intelligence"
+msgstr "_Inlichtingen"
-#: client/gui-gtk-2.0/plrdlg.c:495
+#: client/gui-gtk-2.0/plrdlg.c:526
msgid "_AI"
msgstr "KI (_A)"
-#: client/gui-gtk-2.0/plrdlg.c:501
+#: client/gui-gtk-2.0/plrdlg.c:532
msgid "_Toggle AI Mode"
msgstr "KI Modus Wijzigen (_T)"
-#: client/gui-gtk-2.0/pages.c:208
+#: client/gui-gtk-2.0/pages.c:221
msgid "Start _New Game"
msgstr "Begin _nieuw spel"
-#: client/gui-gtk-2.0/pages.c:214
+#: client/gui-gtk-2.0/pages.c:227
msgid "Start _Scenario Game"
msgstr "Begin _Scenario Spel"
-#: client/gui-gtk-2.0/pages.c:220
+#: client/gui-gtk-2.0/pages.c:233
msgid "_Load Saved Game"
msgstr "_Laad Bewaard Spel"
-#: client/gui-gtk-2.0/pages.c:229
+#: client/gui-gtk-2.0/pages.c:239
msgid "C_onnect to Network Game"
msgstr "Verbind met netwerkspel (_O)"
-#: client/gui-gtk-2.0/pages.c:236
+#: client/gui-gtk-2.0/pages.c:247
msgid "Connect to Gaming _Zone"
msgstr "Verbind met Gaming _Zone"
-#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:300
#: client/gui-xaw/connectdlg.c:326
msgid "Passwords don't match, enter password."
msgstr "Wachtwoorden komen niet overeen, geef wachtwoord."
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:779 client/gui-gtk-2.0/pages.c:820
+#: client/gui-win32/connectdlg.c:916
msgid "Server Name"
msgstr "Servernaam"
-#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
+#: 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
+#: data/Freeciv.in:96
msgid "Port"
msgstr "Poort"
-#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
+#: client/gui-win32/connectdlg.c:917
msgid "Version"
msgstr "Versie"
-#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
-#: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
+#: 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
msgid "Status"
msgstr "Status"
-#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
-#: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
+#: 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
msgid "Players"
msgstr "Spelers"
-#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
+#: client/gui-win32/connectdlg.c:918
msgid "Comment"
msgstr "Commentaar"
-#: client/gui-gtk-2.0/pages.c:747
+#: client/gui-gtk-2.0/pages.c:786
msgid "Local _Area Network"
msgstr "Lok_aal netwerk"
-#: client/gui-gtk-2.0/pages.c:783
+#: client/gui-gtk-2.0/pages.c:827
msgid "Internet _Metaserver"
msgstr "Internet _Metaserver"
-#: client/gui-gtk-2.0/pages.c:817
+#: client/gui-gtk-2.0/pages.c:864
msgid "_Host:"
msgstr "_Host:"
-#: client/gui-gtk-2.0/pages.c:834
+#: client/gui-gtk-2.0/pages.c:881
msgid "_Port:"
msgstr "_Poort:"
-#: client/gui-gtk-2.0/pages.c:851
+#: client/gui-gtk-2.0/pages.c:898
msgid "_Login:"
msgstr "_Login:"
-#: client/gui-gtk-2.0/pages.c:869
+#: client/gui-gtk-2.0/pages.c:916
msgid "Pass_word:"
msgstr "Wacht_woord:"
-#: client/gui-gtk-2.0/pages.c:887
+#: client/gui-gtk-2.0/pages.c:934
msgid "Conf_irm Password:"
msgstr "Bevest_ig Wachtwoord:"
-#: client/gui-gtk-2.0/pages.c:912
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: 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/wldlg.c:800 client/gui-win32/wldlg.c:806
+msgid "Type"
+msgstr "Type"
+
+#: client/gui-gtk-2.0/pages.c:952 client/gui-win32/plrdlg.c:337
+#: data/Freeciv.in:88
+msgid "Host"
+msgstr "Host"
+
+#: client/gui-gtk-2.0/pages.c:981
msgid "C_onnect"
msgstr "Maak verbinding (o)"
-#: client/gui-gtk-2.0/pages.c:1142
+#: client/gui-gtk-2.0/pages.c:1211
#, c-format
msgid "Connection name: %s"
msgstr "Verbindingsnaam: %s"
-#: client/gui-gtk-2.0/pages.c:1145
+#: client/gui-gtk-2.0/pages.c:1214
#, c-format
msgid "Player name: %s"
msgstr "Spelersnaam :%s"
-#: client/gui-gtk-2.0/pages.c:1150
+#: client/gui-gtk-2.0/pages.c:1219
#, c-format
msgid "Host: %s"
msgstr "Server: %s"
-#: client/gui-gtk-2.0/pages.c:1158
+#: client/gui-gtk-2.0/pages.c:1227
msgid "Player/conn info"
msgstr "Speler/verbinding info"
-#: client/gui-gtk-2.0/pages.c:1185
+#: client/gui-gtk-2.0/pages.c:1254
#, c-format
msgid "%s info"
msgstr "%s info"
-#: client/gui-gtk-2.0/pages.c:1196
+#: client/gui-gtk-2.0/pages.c:1265
msgid "Toggle player ready"
msgstr "Schakel speler wel/niet klaar"
-#: client/gui-gtk-2.0/pages.c:1204
+#: client/gui-gtk-2.0/pages.c:1273
msgid "Pick nation"
msgstr "Kies natie"
-#: client/gui-gtk-2.0/pages.c:1214
+#: client/gui-gtk-2.0/pages.c:1283
msgid "Observe this player"
msgstr "Observeer deze speler"
-#: client/gui-gtk-2.0/pages.c:1221
+#: client/gui-gtk-2.0/pages.c:1290
msgid "Take this player"
msgstr "Neem de controle over deze speler over"
-#: client/gui-gtk-2.0/pages.c:1238
+#: client/gui-gtk-2.0/pages.c:1307
msgid "Cut connection"
msgstr "Verbreek verbinding"
-#: client/gui-gtk-2.0/pages.c:1248
+#: client/gui-gtk-2.0/pages.c:1317
msgid "Aitoggle player"
msgstr "Kitoggle speler"
-#: client/gui-gtk-2.0/pages.c:1257
+#: client/gui-gtk-2.0/pages.c:1326
msgid "Remove player"
msgstr "Verwijder speler"
-#: client/gui-gtk-2.0/pages.c:1268
+#: client/gui-gtk-2.0/pages.c:1337
msgid "Give info access"
msgstr "Geef info toegang"
-#: client/gui-gtk-2.0/pages.c:1276
+#: client/gui-gtk-2.0/pages.c:1345
msgid "Give ctrl access"
msgstr "Geef bestuur toegang"
#. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1338
+#: client/gui-gtk-2.0/pages.c:1407
#, c-format
msgid "Put on %s"
msgstr "Zet op %s"
-#: client/gui-gtk-2.0/pages.c:1442
+#: client/gui-gtk-2.0/pages.c:1511
#, fuzzy
msgid "Number of _Players (including AI):"
msgstr "Aantal spelers (KI inbegrepen): (_P)"
-#: client/gui-gtk-2.0/pages.c:1465
+#: client/gui-gtk-2.0/pages.c:1534
#, fuzzy
msgid "AI Skill _Level:"
msgstr "KI sterkte: (_L)"
-#: client/gui-gtk-2.0/pages.c:1481
+#: client/gui-gtk-2.0/pages.c:1550
#, fuzzy
msgid "Ruleset _Version:"
msgstr "Regelset: (_V)"
-#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
msgid "_More Game Options..."
msgstr "_Meer Spel Opties"
-#: client/gui-gtk-2.0/pages.c:1514
+#: client/gui-gtk-2.0/pages.c:1583
msgid "Record"
msgstr "Record"
-#: client/gui-gtk-2.0/pages.c:1519
+#: client/gui-gtk-2.0/pages.c:1588
msgid "Rating"
msgstr "Score"
-#: client/gui-gtk-2.0/pages.c:1525
+#: client/gui-gtk-2.0/pages.c:1594
msgid "Ready"
msgstr "Klaar"
-#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
-#: data/nation/slovakian.ruleset:26
-msgid "Leader"
-msgstr "Leider"
+#: client/gui-gtk-2.0/pages.c:1601
+#, fuzzy
+msgid "?player:Leader"
+msgstr "?Player:Naam"
-#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1732 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:1752
+#: client/gui-gtk-2.0/pages.c:1824
msgid "Choose Saved Game to _Load:"
msgstr "Kies opgeslagen spel om te _Laden"
-#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
-#: client/gui-gtk-2.0/pages.c:2375
+#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
+#: client/gui-gtk-2.0/pages.c:2451
msgid "_Browse..."
msgstr "_Bladeren..."
-#: client/gui-gtk-2.0/pages.c:1839
+#: client/gui-gtk-2.0/pages.c:1911
msgid "Choose a Scenario"
msgstr "Kies een Scenario"
-#: client/gui-gtk-2.0/pages.c:1926
+#: client/gui-gtk-2.0/pages.c:1998
msgid "Choose a _Scenario:"
msgstr "Kies een _Scenario:"
-#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
-#: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
-#: client/gui-win32/wldlg.c:806
-msgid "Type"
-msgstr "Type"
-
-#: client/gui-gtk-2.0/pages.c:2101
+#: client/gui-gtk-2.0/pages.c:2173
msgid "Choose a _nation to play:"
msgstr "Kies een natie om te spelen:"
-#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2363 client/gui-win32/menu.c:581
msgid "Select Location to Save"
msgstr "Kies opslag locatie"
-#: client/gui-gtk-2.0/pages.c:2372 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2448 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr "Bewaar Spel"
-#: client/gui-gtk-2.0/pages.c:2413
+#: client/gui-gtk-2.0/pages.c:2489
msgid "Saved _Games:"
msgstr "Bewaarde Spelen: (_g)"
-#: client/gui-gtk-2.0/pages.c:2440
+#: client/gui-gtk-2.0/pages.c:2516
msgid "Save _Filename:"
msgstr "Bewaar Spel in Bestand: (_f)"
@@ -12917,7 +13159,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:1094
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
msgid "Back"
msgstr "Terug"
@@ -12926,7 +13168,7 @@ msgid "Start"
msgstr "Begin"
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:775
+#: client/gui-win32/connectdlg.c:777
msgid "Load Game"
msgstr "Laad Spel"
@@ -12967,12 +13209,12 @@ msgid "Make new homecity"
msgstr "Verhuis naar deze stad"
#: client/gui-sdl/citydlg.c:546 client/gui-sdl/citydlg.c:1418
-#: client/gui-sdl/connectdlg.c:307 client/gui-sdl/connectdlg.c:616
-#: client/gui-sdl/connectdlg.c:802 client/gui-sdl/connectdlg.c:984
+#: 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/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1039
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
#: 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
@@ -13022,7 +13264,7 @@ msgstr "Kopen?"
#: client/gui-sdl/diplodlg.c:1335 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:2427
+#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
#: client/gui-xaw/cityrep.c:666 client/gui-xaw/cma_fe.c:327
#: client/gui-xaw/cma_fe.c:511 client/gui-xaw/cma_fe.c:765
#: client/gui-xaw/messagedlg.c:72 client/gui-xaw/optiondlg.c:76
@@ -13038,7 +13280,7 @@ msgstr "Nee"
#: client/gui-sdl/diplodlg.c:1345 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:2427 client/gui-xaw/cityrep.c:666
+#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
#: client/gui-xaw/cma_fe.c:327 client/gui-xaw/cma_fe.c:511
#: client/gui-xaw/cma_fe.c:765 client/gui-xaw/messagedlg.c:72
#: client/gui-xaw/optiondlg.c:76 client/gui-xaw/optiondlg.c:304
@@ -13325,37 +13567,37 @@ msgstr "Pas eenmaal toe"
msgid "Release city"
msgstr "Verlos stad"
-#: client/gui-sdl/connectdlg.c:238
+#: client/gui-sdl/connectdlg.c:239
msgid "Creating Server List..."
msgstr "Maak serverlijst"
-#: client/gui-sdl/connectdlg.c:279 client/gui-sdl/connectdlg.c:343
+#: client/gui-sdl/connectdlg.c:280 client/gui-sdl/connectdlg.c:344
#, fuzzy
msgid "No LAN servers found"
msgstr "Lokale Servers"
-#: client/gui-sdl/connectdlg.c:281 client/gui-sdl/connectdlg.c:345
+#: client/gui-sdl/connectdlg.c:282 client/gui-sdl/connectdlg.c:346
msgid "No public servers found"
msgstr ""
-#: client/gui-sdl/connectdlg.c:555
+#: client/gui-sdl/connectdlg.c:556
msgid "Player Name :"
msgstr "Spelersnaam :"
-#: client/gui-sdl/connectdlg.c:571
+#: client/gui-sdl/connectdlg.c:572
msgid "Freeciv Server :"
msgstr "Freeciv Server :"
-#: client/gui-sdl/connectdlg.c:588
+#: client/gui-sdl/connectdlg.c:589
msgid "Port :"
msgstr "Poort :"
-#: client/gui-sdl/connectdlg.c:608 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr "Maak verbinding"
-#: client/gui-sdl/connectdlg.c:794 client/gui-sdl/connectdlg.c:977
+#: client/gui-sdl/connectdlg.c:795 client/gui-sdl/connectdlg.c:978
#: client/gui-xaw/connectdlg.c:145
msgid "Next"
msgstr "Volgende"
@@ -13636,8 +13878,8 @@ msgid "Unable to initialize SDL library: %s"
msgstr "Niet in staat SDL-bibliotheek te initialiseren: %s"
#: client/gui-sdl/graphics.c:1021
-#, c-format
-msgid "Unable to initialize SDL_ttf library: %s"
+#, fuzzy, c-format
+msgid "Unable to initialize SDL_ttf library: %s"
msgstr "Niet in staat SDL_ttf-bibliotheek te initialiseren: %s"
#: client/gui-sdl/graphics.c:1058
@@ -13730,14 +13972,6 @@ msgstr "Initialiseer client"
msgid "Waiting for the beginning of the game"
msgstr "Wacht op het begin van het spel"
-#: client/gui-sdl/gui_string.c:608
-msgid ""
-"Couldn't find stdfont.ttf file. Please link/copy/move anyunicode ttf font to "
-"data dir as stdfont.ttf"
-msgstr ""
-"Kon stdfont.ttf bestand niet vinden. link/kopieer/verplaats enig unicode ttf-"
-"font naar data map als stdfont.ttf"
-
#. TRANS: Future Technology
#: client/gui-sdl/gui_tilespec.c:506
msgid "FT"
@@ -14344,12 +14578,12 @@ msgid "Leave Game"
msgstr "Bewaar Spel"
#: client/gui-sdl/optiondlg.c:2302 client/gui-sdl/pages.c:255
-#: client/gui-win32/connectdlg.c:1098 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1100 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:963
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
msgid "Start New Game"
msgstr "Begin nieuw spel"
@@ -14473,8 +14707,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:1081
-#: client/gui-win32/connectdlg.c:1089 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
+#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
msgid "Update"
msgstr "Bijwerken"
@@ -14931,10 +15165,6 @@ msgstr "Verander Alles"
msgid "Refresh"
msgstr "Ververs"
-#: client/gui-win32/cityrep.c:882
-msgid "Select"
-msgstr "Kies"
-
#: client/gui-win32/cityrep.c:883
msgid "Configure"
msgstr "Instellingen"
@@ -14984,55 +15214,55 @@ msgstr "Kon opgeslagen spel niet laden"
msgid "Verify Password"
msgstr "Controleer wachtwoord"
-#: client/gui-win32/connectdlg.c:912 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr "Freeciv Server Keuze"
-#: client/gui-win32/connectdlg.c:913
+#: client/gui-win32/connectdlg.c:915
msgid "Local Area Network"
msgstr "Lokaal netwerk"
-#: client/gui-win32/connectdlg.c:947
+#: client/gui-win32/connectdlg.c:949
msgid "Welcome to Freeciv"
msgstr "Welkom in Freeciv"
-#: client/gui-win32/connectdlg.c:965
+#: client/gui-win32/connectdlg.c:967
msgid "Load Saved Game"
msgstr "Laad Bewaard Spel"
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
msgid "Connect To Network Game"
msgstr "Verbind met netwerkspel"
-#: client/gui-win32/connectdlg.c:977
+#: client/gui-win32/connectdlg.c:979
msgid "Choose a nation to play"
msgstr "Kies een natie om te spelen"
-#: client/gui-win32/connectdlg.c:1012
+#: client/gui-win32/connectdlg.c:1014
msgid "Number of players (Including AI):"
msgstr "Aantal spelers (KI inbegrepen):"
-#: client/gui-win32/connectdlg.c:1020
+#: client/gui-win32/connectdlg.c:1022
msgid "AI skill level:"
msgstr "KI sterkte:"
-#: client/gui-win32/connectdlg.c:1034 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
msgid "Game Options"
msgstr "Spelopties"
-#: client/gui-win32/connectdlg.c:1038
+#: client/gui-win32/connectdlg.c:1040
msgid "Start Game"
msgstr "Begin Spel"
-#: client/gui-win32/connectdlg.c:1057
+#: client/gui-win32/connectdlg.c:1059
msgid "Login:"
msgstr "Login:"
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
msgid "Host:"
msgstr "Server:"
-#: client/gui-win32/connectdlg.c:1060
+#: client/gui-win32/connectdlg.c:1062
msgid "Port:"
msgstr "Poort:"
@@ -15296,10 +15526,6 @@ msgid_plural "(idle %d turns)"
msgstr[0] "(non-actief %d beurt)"
msgstr[1] "(non-actief %d beurten)"
-#: client/gui-win32/plrdlg.c:337 data/Freeciv.in:88
-msgid "Host"
-msgstr "Host"
-
#: client/gui-win32/plrdlg.c:355 data/Freeciv.in:3230
msgid "Intelligence"
msgstr "Inlichtingen"
@@ -17096,12 +17322,12 @@ msgstr ""
#: data/helpdata.txt:781
msgid ""
-" To have a diplomatic relationship with another player, you must fist "
-"establish first contact with that player. To establish first contact, you "
-"have to move one of your units next to a city or unit belonging to that "
-"player, or vice versa. Unless you establish an embassy with that player, you "
-"may again lose contact with them after a set number of turns without direct "
-"physical contact."
+" To have a diplomatic relationship with another player, you must first "
+"establish contact with that player. To establish contact, you have to move "
+"one of your units next to a city or unit belonging to that player, or vice "
+"versa. Unless you establish an embassy with that player, you may again lose "
+"contact with them after a set number of turns without direct physical "
+"contact."
msgstr ""
#: data/helpdata.txt:788
@@ -19950,7 +20176,7 @@ msgid "Communism"
msgstr "Communisme"
#: data/default/governments.ruleset:121 data/civ2/governments.ruleset:118
-#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:26
+#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:27
msgid "Comrade"
msgstr "Kameraad"
@@ -20931,6 +21157,11 @@ msgstr ""
"taak te zetten; overtollige inspanning kan verloren gaan en een groep "
"Kolonisten en/of Ingenieurs is zeer kwetsbaar voor vijandelijke aanvallen."
+#: data/default/units.ruleset:238
+#, fuzzy
+msgid "?unit:Workers"
+msgstr "Arbeiders"
+
#: data/default/units.ruleset:264
msgid ""
"Workers are one of the key units in the game. They can be used to irrigate "
@@ -21603,6 +21834,11 @@ msgid "Explorers are very useful for mapping unknown territory."
msgstr ""
"Verkenners zijn zeer bruikbaar voor het in kaart brengen van onbekend gebied."
+#: data/default/units.ruleset:1864
+#, fuzzy
+msgid "?unit:Leader"
+msgstr "Leider"
+
#: data/default/units.ruleset:1892
msgid "This is you. If you lose this unit, you lose the game. So don't."
msgstr ""
@@ -21875,7 +22111,7 @@ msgid "Emir"
msgstr "Emir"
#: data/nation/afghani.ruleset:25 data/nation/slovakian.ruleset:30
-#: data/nation/soviet.ruleset:27
+#: data/nation/soviet.ruleset:28
msgid "General Secretary"
msgstr "Algemeen Secretaris"
@@ -21993,10 +22229,11 @@ msgid "?plural:Armenians"
msgstr "?plural:Armeners"
#: 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 "
-"independence from Soviet in 1991 AD"
+"independence from the Soviet Union in 1991."
msgstr ""
"Volgens de legende zijn de Armeniërs de afstammelingen van Haik, de achter-"
"achter-kleinzoon van Noah. De moderne republiek werd onafhankelijk van de "
@@ -23080,13 +23317,13 @@ msgid "?plural:Illyrians"
msgstr "?plural:Illyriërs"
#: 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 the Dalmatians to the north, "
-"Corcyra island and Ambracia bay in prehistoric Epirus to the south, mixing "
-"with Thracians in Dardania to the east, and settling Messapia across the "
-"Adriatic Sea. Illyrian kingdoms were independent for centuries, until "
-"conquered by the Roman Republic."
+"Illyrians were Indo-European tribes who appeared in the western part of the "
+"Balkan Peninsula before 1000 BC, including Corcyra island and Ambracia bay "
+"in prehistoric Epirus to the south. They mixed with Thracians in Dardania to "
+"the east, and settled Messapia across the Adriatic Sea. Illyrian kingdoms "
+"were independent for centuries, until conquered by the Roman Republic."
msgstr ""
"De Illyriërs waren Indo-Europese stammen. Ze doken op in het westelijk "
"gedeelte van de Balkan voor 1000BC. Ze omvatten de Dalmatiërs in het "
@@ -23424,7 +23661,7 @@ msgstr ""
"twee landen: Noord- en Zuid-Korea. Dit als geval van de patstelling na de "
"Koreaanse oorlog in 1953."
-#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:28
+#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:29
msgid "Great Leader"
msgstr "Grote Leider"
@@ -23595,12 +23832,13 @@ msgid "?plural:Malians"
msgstr "?plural:Malinezen"
#: 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 "
-"called the Sahelian kingdoms. Of these, the Islamic Mali empire with it's "
+"called the Sahelian kingdoms. Of these, the Islamic Mali empire with its "
"capital in Timbuktu was the most influential. This empire reigned from the "
-"14th to the 17th century and was famed for it's wealth and benevolent kings. "
+"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 ""
"Sub-Sahara Afrika is al millenia lang een culturele en etnische smeltpot. In "
@@ -23671,9 +23909,10 @@ msgid "?plural:Mayas"
msgstr "?plural:Mayas"
#: data/nation/mayan.ruleset:6
+#, fuzzy
msgid ""
-"The Mayans were a Mesoamerican civilization. Famous for building great "
-"pyramids and palaces in the jungle."
+"The Mayans were a Mesoamerican civilization. They are famous for building "
+"great pyramids and palaces in the jungle."
msgstr ""
"De Mayas waren een mesoamerikaanse bovelking, beroemd voor het bouwen van "
"grootse piramiden en paleizen in de jungle."
@@ -24233,6 +24472,16 @@ msgstr ""
"Slovakije in een land in het hard van Europa.Voormalig onderdeel van Tsjecho-"
"Slowakije, en daarvoor tot1918 deel van het Oostenrijks-Hongaarse Keizerrijk."
+#: data/nation/slovakian.ruleset:26
+#, fuzzy
+msgid "?male:Leader"
+msgstr "Leider"
+
+#: data/nation/slovakian.ruleset:26
+#, fuzzy
+msgid "?female:Leader"
+msgstr "?female: Kameraad"
+
#: data/nation/slovakian.ruleset:29
msgid "Pope"
msgstr "Paus"
@@ -24278,12 +24527,14 @@ msgid "?plural:Soviets"
msgstr "?plural:Soviets"
#: data/nation/soviet.ruleset:6
+#, fuzzy
msgid ""
-"Soviet Union's history starts in November 1917, when under Lenin's "
+"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 "
-"republics integrated into one country. Soviet Union became one of most "
-"powerful states in the 20th century. But by the end of 1991 due to many "
-"social shocks it disintegrated into fifteen independent countries"
+"republics integrated into one country. The Soviet Union became one of most "
+"powerful states in the 20th century, but by the end of 1991 it had "
+"disintegrated into fifteen independent countries due to social and economic "
+"problems."
msgstr ""
"De geschiedenis van de Soviet Unie bogin in november 1917 toen onder Lenin "
"een Bolsjevistische revolutie ontketend werd. Op 31 december 1922 vormden "
@@ -24724,9 +24975,10 @@ msgid "?plural:Westphalians"
msgstr "?plural:Westphaliërs"
#: data/nation/westphalian.ruleset:6
+#, fuzzy
msgid ""
-"Westphalia, before becoming a Prussian province, was the western region the "
-"duchy of Saxony. Present-day it consists of the Northern part of the largest "
+"Westphalia, before becoming a Prussian province, was the western region of "
+"the duchy of Saxony. Today it makes up the northern part of the largest "
"German federal state, North Rhine-Westphalia."
msgstr ""
"Westphalen, was het westelijk deel van Saksen voor het een provincie van "
@@ -24879,7 +25131,7 @@ msgid ""
"The flag and background color indicate what civilization the city\n"
"belongs to (this will be useful when you meet other civilizations).\n"
"The top row of the bar also shows the name and size of the city, and\n"
-"will show one or more starts to indicate if there are units in the\n"
+"will show one or more stars to indicate if there are units in the\n"
"city. The bottom row shows what the city is building, and how long it\n"
"will take; it also shows how long the city will take to grow to the\n"
"next largest size."
@@ -24935,7 +25187,7 @@ msgid ""
"Now your city has grown to size five. As cities get larger unrest\n"
"becomes a problem. A city of this size will usually have one unhappy\n"
"citizen unless pacifying effects are used; meaning one entertainer\n"
-"specialist is required to keep your citzens content. This is basically\n"
+"specialist is required to keep your citizens content. This is basically\n"
"a wasted citizen.\n"
"\n"
"There are several things that can be done about this. One quick fix\n"
@@ -25007,7 +25259,7 @@ msgid ""
"existing cities. Generally when building new cities you want to make\n"
"sure that all tiles are covered by at least one city, but after that\n"
"it is best that your cities overlap as little as possible. Spreading\n"
-"out cities properly gives each city access to more resrouces, allowing\n"
+"out cities properly gives each city access to more resources, allowing\n"
"them to grow to larger sizes."
msgstr ""
@@ -25290,6 +25542,72 @@ msgstr "Team 30"
msgid "Team 31"
msgstr "Team 31"
+#, fuzzy
+#~ msgid "Auth config filename \"%s\" not allowed!"
+#~ msgstr "Die naam is niet toegelaten"
+
+#~ msgid "The %s of the %s (%s)"
+#~ msgstr "De %s van de %s (%s)"
+
+#, fuzzy
+#~ msgid ""
+#~ "Illegal alliance structure detected: %s alliance to %s reduced to peace "
+#~ "treaty."
+#~ msgstr ""
+#~ "Illegale alliantie-constructie ontdekt: %s's alliantie met %s omgezet "
+#~ "naar vrede "
+
+#, fuzzy
+#~ msgid "And, became more experienced!"
+#~ msgstr " en werden meer ervaren!"
+
+#~ msgid "We can't take control of server, attempting to kill it."
+#~ msgstr "We kunnen de server niet beheren, proberen hem nu af te sluiten."
+
+#, fuzzy
+#~ msgid "%s territory"
+#~ msgstr "Territorium van de %s"
+
+#~ msgid "%s territory (%d turn cease-fire)"
+#~ msgid_plural "%s territory (%d turn cease-fire)"
+#~ msgstr[0] "%s territorium (%d beurt staakt-het-vuren)"
+#~ msgstr[1] "%s territorium (%d beurten staakt-het-vuren)"
+
+#, fuzzy
+#~ msgid "%s territory (%s)"
+#~ msgstr "Territorium van de %s %s"
+
+#~ msgid "City: %s (%s)"
+#~ msgstr "Stad: %s (%s)"
+
+#, fuzzy
+#~ msgid "Unit: %s (%s)"
+#~ msgstr "Eenheid: %s (%s)"
+
+#~ msgid "%s of the %s"
+#~ msgstr "De %s van de %s"
+
+#~ msgid "no maximum, "
+#~ msgstr "geen maximum, "
+
+#~ msgid "%d unit maximum, "
+#~ msgid_plural "%d units maximum, "
+#~ msgstr[0] "%d eenheid maximaal, "
+#~ msgstr[1] "%d eenheden maximaal, "
+
+#~ msgid "%d per unit). "
+#~ msgstr "%d per eenheid). "
+
+#~ msgid "Select same type"
+#~ msgstr "Selectoor zelfde type"
+
+#~ msgid ""
+#~ "Couldn't find stdfont.ttf file. Please link/copy/move anyunicode ttf font "
+#~ "to data dir as stdfont.ttf"
+#~ msgstr ""
+#~ "Kon stdfont.ttf bestand niet vinden. link/kopieer/verplaats enig unicode "
+#~ "ttf-font naar data map als stdfont.ttf"
+
#~ msgid "Units: "
#~ msgstr "Eenheden: "
@@ -25408,9 +25726,6 @@ msgstr "Team 31"
#~ msgid ", nation %s"
#~ msgstr ", natie %s"
-#~ msgid ", team %s"
-#~ msgstr ", team %s"
-
#~ msgid "_Map"
#~ msgstr "Kaart (_M)"
diff --git a/po/no.gmo b/po/no.gmo
index faf4892..d107fe5 100644
Binary files a/po/no.gmo and b/po/no.gmo differ
diff --git a/po/no.po b/po/no.po
index e277260..9c53b5b 100644
--- a/po/no.po
+++ b/po/no.po
@@ -19,7 +19,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2.0.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 07:45+0900\n"
+"POT-Creation-Date: 2009-03-29 21:13+0900\n"
"PO-Revision-Date: 2007-09-01 22:28+0300\n"
"Last-Translator: Per I. Mathisen <per at freeciv.org>\n"
"Language-Team: Norwegian <andrearo at stud.ntnu.no>\n"
@@ -660,7 +660,7 @@ 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
-#: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
+#: 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"
@@ -677,7 +677,7 @@ msgid "Mine"
msgstr "Gruve"
#: common/terrain.c:396 common/unit.c:548 server/report.c:124
-#: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
+#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr "Forurensning"
@@ -723,7 +723,7 @@ msgstr "Befestet"
msgid "Sentry"
msgstr "Hold stand"
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:851 client/gui-sdl/menu.c:648
+#: common/unit.c:566 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"
@@ -740,7 +740,7 @@ msgstr "Utforske"
msgid "Transform"
msgstr "Endre"
-#: common/unit.c:584 client/text.c:106 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:584 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"
@@ -813,11 +813,11 @@ msgstr "Atombombe"
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1406
+#: common/unittype.c:349 client/helpdata.c:1404
msgid " and "
msgstr " og "
-#: common/unittype.c:355 client/helpdata.c:1392
+#: common/unittype.c:355 client/helpdata.c:1390
msgid "?and:, "
msgstr "?og:, "
@@ -1389,30 +1389,25 @@ msgstr ""
#: server/auth.c:281
#, fuzzy, c-format
-msgid "Auth config filename \"%s\" not allowed!"
-msgstr "Det navnet er ikke tillat."
-
-#: server/auth.c:286
-#, fuzzy, c-format
msgid "Cannot load auth config file \"%s\"!"
msgstr "Klarer ikke å finne lydfilen %s"
-#: server/auth.c:397
+#: server/auth.c:392
#, c-format
msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
msgstr "Advarsel: gjestenavnet '%s' har blitt tatt, bytter navn til '%s'."
#
-#: server/auth.c:404
+#: server/auth.c:399
msgid "Guests are not allowed on this server. Sorry."
msgstr "Gjester er ikke tillatt på denne tjeneren. Beklager."
-#: server/auth.c:406
+#: server/auth.c:401
#, fuzzy, c-format
msgid "%s was rejected: Guests not allowed."
msgstr "%s ble vist bort. Manglet egenskaper."
-#: server/auth.c:425
+#: server/auth.c:420
#, c-format
msgid ""
"There was an error reading the user database, logging in as guest connection "
@@ -1421,7 +1416,7 @@ msgstr ""
"Det har oppstått en feil ved lesing av bruker-databasen, oppretter "
"forbindelse som gjest '%s'."
-#: server/auth.c:431
+#: server/auth.c:426
msgid ""
"There was an error reading the user database and guest logins are not "
"allowed. Sorry"
@@ -1429,39 +1424,39 @@ msgstr ""
"Det har oppstått en feil ved lesing av bruker-databasen. Gjeste-forbindelser "
"er ikke lov."
-#: server/auth.c:434
+#: server/auth.c:429
#, c-format
msgid "%s was rejected: Database error and guests not allowed."
msgstr ""
-#: server/auth.c:441
+#: server/auth.c:436
#, c-format
msgid "Enter password for %s:"
msgstr "Skriv inn passord for %s:"
-#: server/auth.c:450
+#: server/auth.c:445
msgid "Enter a new password (and remember it)."
msgstr "Skriv inn et nytt passord (og husk det)."
-#: server/auth.c:456
+#: server/auth.c:451
msgid "This server allows only preregistered users. Sorry."
msgstr "Denne tjeneren krever forhåndsregistrering. Beklager."
-#: server/auth.c:459
+#: server/auth.c:454
#, fuzzy, c-format
msgid "%s was rejected: Only preregister users allowed."
msgstr "Denne tjeneren krever forhåndsregistrering. Beklager."
-#: server/auth.c:488 server/auth.c:547
+#: server/auth.c:483 server/auth.c:542
msgid "Sorry, too many wrong tries..."
msgstr "Beklager, for mange gale forsøk..."
-#: server/auth.c:489
+#: server/auth.c:484
#, c-format
msgid "%s was rejected: Too many wrong password verifies for new user."
msgstr ""
-#: server/auth.c:505
+#: server/auth.c:500
msgid ""
"Warning: There was an error in saving to the database. Continuing, but your "
"stats will not be saved."
@@ -1469,31 +1464,31 @@ msgstr ""
"Advarsel: Det har oppstått en feil ved lagring til brukerdatabasen. "
"Fortsetter uten å lagre resultatene."
-#: server/auth.c:549
+#: server/auth.c:544
#, fuzzy, c-format
msgid "%s was rejected: Too many wrong password tries."
msgstr "%s ble vist bort. Manglet egenskaper."
-#: server/auth.c:558
+#: server/auth.c:553
msgid "Your password is incorrect. Try again."
msgstr "Passordet er feil. Prøv igjen."
-#: server/auth.c:569
+#: server/auth.c:564
#, fuzzy
msgid "Sorry, your connection timed out..."
msgstr "Beklager, luftpatruljering er ikke implementert."
-#: server/auth.c:571
+#: server/auth.c:566
#, c-format
msgid "%s was rejected: Connection timeout waiting for password."
msgstr ""
-#: server/auth.c:636
+#: server/auth.c:631
#, c-format
msgid "Your password is too short, the minimum length is %d. Try again."
msgstr "Passordet er for kort, minimum lengde er %d. Prøv igjen."
-#: server/auth.c:642
+#: server/auth.c:637
#, c-format
msgid ""
"The password must have at least %d capital letters, %d numbers, and be at "
@@ -1993,7 +1988,7 @@ msgstr "Dette er tjeneren for %s"
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:237 manual/civmanual.c:380
+#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
@@ -2025,13 +2020,13 @@ msgstr ""
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:241
+#: server/civserver.c:217 client/civclient.c:242
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:245
+#: server/civserver.c:221 client/civclient.c:246
msgid " -d, --debug NUM\tSet debug log level (0 to 3)\n"
msgstr " -d, --debug NUM\tSett debug-loggnivå (0 til 3)\n"
@@ -2039,7 +2034,7 @@ msgstr " -d, --debug NUM\tSett debug-loggniv
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:248 manual/civmanual.c:382
+#: server/civserver.c:225 client/civclient.c:249 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"
@@ -2091,11 +2086,11 @@ msgstr " -r, --read FILE\tLes oppstartsmanus i FILE\n"
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:267 manual/civmanual.c:383
+#: server/civserver.c:247 client/civclient.c:268 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:279
+#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, fuzzy, c-format
@@ -3356,7 +3351,7 @@ msgstr "%s har for
msgid "Sea moving start units are not yet supported. Nobody gets %s."
msgstr "Startende sjøenheter er ikke støttet. Ingen får %s."
-#: server/gamehand.c:310 client/text.c:632
+#: server/gamehand.c:310 client/text.c:691
#, c-format
msgid "Year: %s"
msgstr "År: %s"
@@ -3637,10 +3632,10 @@ 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
-#, c-format
+#, fuzzy, c-format
msgid ""
-"Your nation is thrust into civil war, %s is declared the leader of the "
-"rebel states."
+"Your nation is thrust into civil war! %s is declared the leader of the rebel "
+"states."
msgstr ""
"Din nasjon er splittet i en borgerkrig.\n"
" %s er proklamert leder for de opprørske fylkene."
@@ -3741,7 +3736,7 @@ msgstr "Forskingstempo"
msgid "Literacy"
msgstr "Utdannelse"
-#: server/report.c:121 client/cityrepdata.c:526 client/cityrepdata.c:527
+#: server/report.c:121 client/cityrepdata.c:524 client/cityrepdata.c:525
#: client/gui-sdl/cityrep.c:174
msgid "Production"
msgstr "Produksjon"
@@ -3893,7 +3888,7 @@ msgstr ""
"Demografi tekststrengen inneholder ugyldige bokstaver. Prøv \"help demography"
"\"."
-#: server/report.c:743 server/report.c:766
+#: server/report.c:743 server/report.c:768
msgid "Demographics Report:"
msgstr "Demografi-rapport:"
@@ -3901,10 +3896,12 @@ msgstr "Demografi-rapport:"
msgid "Sorry, the Demographics report is unavailable."
msgstr "Beklager, demografirapport er ikke tilgjengelig."
-#: server/report.c:748
+#. TRANS: <nation adjective> <government name> (<year>).
+#. * E.g. "Polish Despotism (200 AD)".
+#: server/report.c:750
#, fuzzy, c-format
-msgid "The %s of the %s (%s)"
-msgstr "Styresett: %s Nasjon: %s"
+msgid "%s %s (%s)"
+msgstr "%s i %s (%s)\n"
#. TRANS: message about an installation error.
#: server/ruleset.c:163
@@ -3962,15 +3959,6 @@ msgstr ""
msgid "%s had invalid nation; changing to %s."
msgstr ""
-#. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4073
-#, fuzzy, c-format
-msgid ""
-"Illegal alliance structure detected: %s alliance to %s reduced to peace "
-"treaty."
-msgstr ""
-"Ulovlig allianser oppdaget: %ss allianse med %s redusert til fredsavtale."
-
#: server/settings.c:32
msgid "Geological"
msgstr "Geologisk"
@@ -5185,9 +5173,10 @@ msgid "Auto-save name prefix"
msgstr "Autolagrings prefiks"
#: server/settings.c:1016
+#, fuzzy
msgid ""
-"Automatically saved games will have name \"<prefix><year>.sav\". This "
-"setting sets the <prefix> part."
+"Automatically saved games will have name \"<prefix>-T<turn>-Y<year>.sav\". "
+"This setting sets the <prefix> part."
msgstr ""
"Automatisk lagrede spill vil ha navnet \"<forstavelse><år>.sav\". Denne "
"innstillingen endrer <forstavelse> delen."
@@ -5206,11 +5195,11 @@ msgstr ""
"log\" hver runde. Denne statistikken kan benyttes til å lage grafer over "
"spillerenes styrke etter at spillet er over."
-#: server/sernet.c:147
+#: server/sernet.c:150
msgid "Server cannot read standard input. Ignoring input."
msgstr "Serveren kan ikke lese fra tastaturet. Ignorerer det."
-#: server/sernet.c:922
+#: server/sernet.c:929
#, c-format
msgid "Server: bad address: [%s:%d]."
msgstr "Server: addressefeil: [%s: %d]."
@@ -5332,112 +5321,112 @@ 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:928
+#: server/srv_main.c:961
#, c-format
msgid "Failed saving game as %s"
msgstr "Klarte ikke å lagre spill som %s"
-#: server/srv_main.c:930
+#: server/srv_main.c:963
#, c-format
msgid "Game saved as %s"
msgstr "Spill lagret som %s"
-#: server/srv_main.c:962
+#: server/srv_main.c:994
msgid "The game is already running."
msgstr "Spillet er allerede i gang."
-#: server/srv_main.c:970
+#: server/srv_main.c:1002
#, c-format
msgid "%s lost control cmdlevel on game start. Use voting from now on."
msgstr ""
-#: server/srv_main.c:977
+#: server/srv_main.c:1009
msgid "Starting game."
msgstr "Starter spillet."
-#: server/srv_main.c:1039
+#: server/srv_main.c:1071
#, c-format
msgid "request for unknown report (type %d)"
msgstr "forespørsel etter ukjent rapport (type: %d)"
-#: server/srv_main.c:1104
+#: server/srv_main.c:1136
#, c-format
msgid "Warning: rejecting old client %s"
msgstr "Advarsel: forkastet gammel klient %s"
-#: server/srv_main.c:1206
+#: server/srv_main.c:1238
#, 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:1306
+#: server/srv_main.c:1338
msgid "Please choose a non-blank name."
msgstr "Vennligst velg et ikke-blankt navn."
-#: server/srv_main.c:1322
+#: server/srv_main.c:1354
msgid "That nation is already in use."
msgstr "Den nasjonen er allerede i bruk."
-#: server/srv_main.c:1338
+#: server/srv_main.c:1370
#, 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:1359
+#: server/srv_main.c:1391
msgid "Please choose a name containing only ASCII characters."
msgstr "Vennligst velg et navn som kun inneholder ASCII bokstaver."
-#: server/srv_main.c:1458
+#: server/srv_main.c:1490
#, c-format
msgid "%s nation is not available in this scenario."
msgstr ""
-#: server/srv_main.c:1464
+#: server/srv_main.c:1496
#, fuzzy, c-format
msgid "%s nation is already in use."
msgstr "Den nasjonen er allerede i bruk."
-#: server/srv_main.c:1482
+#: server/srv_main.c:1514
#, c-format
msgid "%s is the %s ruler %s."
msgstr "%s er den %se herskeren %s."
-#: server/srv_main.c:1538
+#: server/srv_main.c:1570
#, 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:1582 server/srv_main.c:1586
+#: server/srv_main.c:1614 server/srv_main.c:1618
#, 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:1728
+#: server/srv_main.c:1760
#, c-format
msgid "Player %d"
msgstr "Spiller %d"
-#: server/srv_main.c:1739 server/srv_main.c:1745
+#: server/srv_main.c:1771 server/srv_main.c:1777
#, c-format
msgid "%s rules the %s."
msgstr "%s styrer %s."
-#: server/srv_main.c:1910
+#: server/srv_main.c:1942
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
msgstr ""
-#: server/srv_main.c:1961
+#: server/srv_main.c:1993
#, c-format
msgid "Sending info to metaserver [%s]"
msgstr "Sender info til metaserver [%s]"
-#: server/srv_main.c:1992
+#: server/srv_main.c:2024
msgid "The game is over..."
msgstr "Spillet er over..."
-#: server/srv_main.c:2205
+#: server/srv_main.c:2237
msgid "Now accepting new client connections."
msgstr "Aksepterer nå nye klientforbindelser."
@@ -6252,24 +6241,24 @@ msgid "Barbarian"
msgstr "barbarsk"
#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2030 client/gui-sdl/plrdlg.c:645
+#: client/gui-gtk-2.0/pages.c:2102 client/gui-sdl/plrdlg.c:645
#: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
msgid "AI"
msgstr "AI"
#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
+#: 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
msgid "Human"
msgstr "Menneske"
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
-#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
+#: 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
msgid "Alive"
msgstr "Levende"
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
#: client/gui-win32/connectdlg.c:200
msgid "Dead"
msgstr "Død"
@@ -6544,9 +6533,9 @@ 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:242
-#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
-#: client/text.c:1201
+#: 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
#, c-format
msgid "?clistmore:, %s"
msgstr ", %s"
@@ -6801,7 +6790,7 @@ msgstr "Kun %s kan angripe fra sj
msgid "Cannot attack from sea."
msgstr "Kan ikke angripe fra sjøen."
-#: server/unithand.c:996 server/unittools.c:2103
+#: server/unithand.c:996 server/unittools.c:2137
msgid "Cannot attack unless you declare war first."
msgstr "Kan ikke angripe hvis du ikke erklærer krig først."
@@ -6902,102 +6891,102 @@ msgid "%s was upgraded for free to %s."
msgstr "%s ble oppgradert gratis til %s."
#: server/unittools.c:297
-#, c-format
-msgid "Not enough gold. %s disbanded"
+#, fuzzy, c-format
+msgid "Not enough gold to pay upkeep for %s. Unit disbanded."
msgstr "Ikke nok gull. %s oppløst"
-#: server/unittools.c:342
+#: server/unittools.c:343
#, c-format
msgid "Your %s has run out of hit points."
msgstr "Din %s har gått tom for treffkapasistet."
-#: server/unittools.c:358
+#: server/unittools.c:359
#, c-format
msgid "Your %s has been lost on the high seas."
msgstr "Din %s har gått tapt på havet."
-#: server/unittools.c:365
+#: server/unittools.c:366
#, c-format
msgid "Your %s survived on the high seas and became more experienced!"
msgstr "Din %s overlevde på havet og ble mer erfaren!"
-#: server/unittools.c:376
+#: server/unittools.c:377
#, c-format
msgid "Your %s has been lost on unsafe terrain."
msgstr "Din %s har gått tapt på usikkert terreng."
-#: server/unittools.c:430
+#: server/unittools.c:431
#, c-format
msgid "Your %s has returned to refuel."
msgstr "Din %s har returnert for drivstoffpåfyll."
-#: server/unittools.c:454
+#: server/unittools.c:455
#, c-format
msgid "Your %s has run out of fuel."
msgstr "Din %s har gått tom for drivstoff."
-#. TRANS: And, <the unit> became ...
-#: server/unittools.c:616
-#, fuzzy
-msgid "And, became more experienced!"
-msgstr " og ble mer erfaren!"
-
#. TRANS: Your <unit> became ...
-#: server/unittools.c:620
+#: server/unittools.c:619
#, c-format
msgid "Your %s became more experienced!"
msgstr "Din %s ble mer erfaren!"
-#: server/unittools.c:1011
+#: server/unittools.c:1009
#, c-format
msgid "Teleported your %s to %s."
msgstr "Teleportet din %s til %s."
-#: server/unittools.c:1041
+#. TRANS: A unit is moved to resolve stack conflicts.
+#: server/unittools.c:1065
+#, fuzzy, c-format
+msgid "Moved your %s."
+msgstr "Oppløste din %s."
+
+#: server/unittools.c:1076
#, c-format
msgid "Disbanded your %s."
msgstr "Oppløste din %s."
-#: server/unittools.c:1363
+#: server/unittools.c:1397
#, c-format
msgid "Unable to defend %s, %s has lost the game."
msgstr "Kan ikke forsvare %s, %s har tapt spillet."
-#: server/unittools.c:1367
+#: server/unittools.c:1401
#, 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:1469
+#: server/unittools.c:1503
#, 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:1478
+#: server/unittools.c:1512
#, c-format
msgid "%s lost when %s was lost."
msgstr "%s gikk tapt da %s gikk tapt."
-#: server/unittools.c:1527
+#: server/unittools.c:1561
#, 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:1545
+#: server/unittools.c:1579
#, 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:1554 server/unittools.c:1612
+#: server/unittools.c:1588 server/unittools.c:1646
#, 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:1588
+#: server/unittools.c:1622
#, fuzzy, c-format
msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
msgid_plural ""
@@ -7008,7 +6997,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:1621
+#: server/unittools.c:1655
#, fuzzy, c-format
msgid "%s lost when the %s %s attacked the %s %s."
msgstr "%s gikk tapt i et angrep fra %ss %s."
@@ -7016,7 +7005,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:1636
+#: server/unittools.c:1670
#, 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."
@@ -7025,7 +7014,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:1646
+#: server/unittools.c:1680
#, 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."
@@ -7036,198 +7025,198 @@ 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:1660
+#: server/unittools.c:1694
#, 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:1928
+#: server/unittools.c:1962
#, c-format
msgid "Your %s was nuked by %s."
msgstr "Din %s ble utsatt for atomangrep fra %s."
-#: server/unittools.c:1931 server/unittools.c:1947
+#: server/unittools.c:1965 server/unittools.c:1981
msgid "yourself"
msgstr "deg selv"
# problem
-#: server/unittools.c:1935
+#: server/unittools.c:1969
#, fuzzy, c-format
msgid "The %s %s was nuked."
msgstr "%ss %s ble utsatt for atomangrep."
-#: server/unittools.c:1944
+#: server/unittools.c:1978
#, c-format
msgid "%s was nuked by %s."
msgstr "%s ble utsatt for atomangrep fra %s."
-#: server/unittools.c:1952
+#: server/unittools.c:1986
#, c-format
msgid "You nuked %s."
msgstr "Du utførte et atomangrep mot %s."
-#: server/unittools.c:1993
+#: server/unittools.c:2027
#, fuzzy, c-format
msgid "The %s detonated a nuke!"
msgstr "%s detonerte en atombombe!"
-#: server/unittools.c:2017
+#: server/unittools.c:2051
#, c-format
msgid "%s transported successfully."
msgstr "%s ble transportert trygt fram."
-#: server/unittools.c:2069
+#: server/unittools.c:2103
msgid "This unit type can not be paradropped."
msgstr "Denne enheten kan ikke gjøre fallskjermhopp."
-#: server/unittools.c:2079
+#: server/unittools.c:2113
#, 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:2085
+#: server/unittools.c:2119
msgid "The destination location is not known."
msgstr "Bestemmelsesstedet er ukjent."
-#: server/unittools.c:2092
+#: server/unittools.c:2126
#, fuzzy, c-format
msgid "This unit cannot paradrop into %s."
msgstr "Denne enheten kan ikke ta fallskjermhopp ut i havet."
-#: server/unittools.c:2112
+#: server/unittools.c:2146
#, 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:2123
+#: server/unittools.c:2157
#, 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:2136
+#: server/unittools.c:2170
#, c-format
msgid "Your %s was killed by enemy units at the paradrop destination."
msgstr "Dine %s ble slaktet på hoppstedet."
-#: server/unittools.c:2158
+#: server/unittools.c:2192
#, c-format
msgid "You found %d gold."
msgstr "Du fant %d gull."
-#: server/unittools.c:2175
+#: server/unittools.c:2209
#, c-format
msgid "You found %s in ancient scrolls of wisdom."
msgstr "Du fant %s i eldgamle skriftruller med kunnskap."
-#: server/unittools.c:2182
+#: server/unittools.c:2216
#, 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:2196
+#: server/unittools.c:2230
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:2214
+#: server/unittools.c:2248
msgid "An abandoned village is here."
msgstr "En forlatt landsby er her."
-#: server/unittools.c:2224
+#: server/unittools.c:2258
msgid "You have unleashed a horde of barbarians!"
msgstr "Du har fremprovosert en fiendtlig barbarhorde!"
-#: server/unittools.c:2227
+#: server/unittools.c:2261
#, 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:2243
+#: server/unittools.c:2277
msgid "You found a friendly city."
msgstr "Du fant en vennlig by."
-#: server/unittools.c:2257
+#: server/unittools.c:2291
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:2282
+#: server/unittools.c:2316
msgid "Your overflight frightens the tribe; they scatter in terror."
msgstr "Din overflyvning skremmer stammen; de sprer seg i frykt."
-#: server/unittools.c:2540
+#: server/unittools.c:2574
#, 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:2989
+#: server/unittools.c:3023
#, 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:3041
+#: server/unittools.c:3075
#, 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:3054
+#: server/unittools.c:3088
#, 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:3068
+#: server/unittools.c:3102
#, 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:3078
+#: server/unittools.c:3112
#, 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:3104
+#: server/unittools.c:3138
#, 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:3145
+#: server/unittools.c:3179
#, fuzzy, c-format
msgid "Attempt to change homecity for %s failed."
msgstr "Forandret hjemby for %s i %s"
-#: server/unittools.c:3156
+#: server/unittools.c:3190
#, c-format
msgid "Attempt to establish trade route for %s failed."
msgstr ""
-#: server/unittools.c:3168
+#: server/unittools.c:3202
#, c-format
msgid "Attempt to build wonder for %s failed."
msgstr ""
-#: server/unittools.c:3177
+#: server/unittools.c:3211
#, c-format
msgid "Your %s has invalid orders."
msgstr "Din %s har ugyldige ordre."
-#: server/generator/mapgen.c:1737
+#: server/generator/mapgen.c:1771
msgid "High landmass - this may take a few seconds."
msgstr "Mye landmasse - dette kan ta noen sekunder."
-#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
+#: server/generator/mapgen.c:1969 server/generator/mapgen.c:2039
#, c-format
msgid "Falling back to generator %d."
msgstr "Faller tilbake på generator %d."
-#: server/generator/mapgen.c:2025
+#: server/generator/mapgen.c:2059
msgid "Generator 3 didn't place all big islands."
msgstr "Generator 3 plasserte ikke alle de store øyene."
-#: server/generator/mapgen.c:2054
+#: server/generator/mapgen.c:2088
#, c-format
msgid "Generator 3 left %li landmass unplaced."
msgstr "Generator 3 forlot %li landmasse uplassert."
@@ -7336,7 +7325,7 @@ msgid_plural "%3d turns"
msgstr[0] "%3d runde"
msgstr[1] "%3d runde"
-#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:631
#: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
@@ -7456,353 +7445,353 @@ msgstr "?city_state:Fred"
msgid "(worklist)"
msgstr "(arbeidsliste)"
-#: client/cityrepdata.c:447
-msgid "Special"
-msgstr "Spesiell"
-
-#: client/cityrepdata.c:448
-msgid "?entertainers/scientists/taxmen:E/S/T"
-msgstr "?entertainers/scientists/taxmen:U/F/S"
+#: client/cityrepdata.c:446
+msgid "?city:Name"
+msgstr "?city:Bynavn"
-#: client/cityrepdata.c:449
-msgid "Entertainers, Scientists, Taxmen"
-msgstr "Underholdere, Forskere, Skattefuter"
+#: client/cityrepdata.c:446 client/gui-sdl/cityrep.c:169
+msgid "City Name"
+msgstr "Bynavn"
-#: client/cityrepdata.c:452
+#: client/cityrepdata.c:448
#, fuzzy
-msgid "Concise + Rapture, - Disorder"
-msgstr "Kort + Feiring, - Uroligheter"
+msgid "?size [short]:Sz"
+msgstr "?size:St"
-#: client/cityrepdata.c:454 client/plrdlg_common.c:261
+#: client/cityrepdata.c:448
+msgid "Size"
+msgstr "Størrelse"
+
+#: client/cityrepdata.c:450 client/plrdlg_common.c:261
#: client/gui-win32/plrdlg.c:337
msgid "State"
msgstr "Status"
-#: client/cityrepdata.c:454
+#: client/cityrepdata.c:450
msgid "Rapture/Peace/Disorder"
msgstr "Feiring/Fred/Uroligheter"
+#: client/cityrepdata.c:452
+#, fuzzy
+msgid "Concise *=Rapture, X=Disorder"
+msgstr "Kort + Feiring, - Uroligheter"
+
+#: client/cityrepdata.c:456
+msgid "Special"
+msgstr "Spesiell"
+
#: client/cityrepdata.c:457
+msgid "?entertainers/scientists/taxmen:E/S/T"
+msgstr "?entertainers/scientists/taxmen:U/F/S"
+
+#: client/cityrepdata.c:458
+msgid "Entertainers, Scientists, Taxmen"
+msgstr "Underholdere, Forskere, Skattefuter"
+
+#: client/cityrepdata.c:461
msgid "?Happy workers:H"
msgstr "?Happy workers:L"
-#: client/cityrepdata.c:457
+#: client/cityrepdata.c:461
msgid "Workers: Happy"
msgstr "Arbeidere: Lykkelige"
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
msgid "?Content workers:C"
msgstr "?Content workers:F"
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
msgid "Workers: Content"
msgstr "Arbeidere: Fornøyde"
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
msgid "?Unhappy workers:U"
msgstr "?Unhappy workers:U"
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
msgid "Workers: Unhappy"
msgstr "Arbeidere: Ulykkelige"
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
msgid "?Angry workers:A"
msgstr "?Angre workers:S"
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
msgid "Workers: Angry"
msgstr "Arbeidere: Sinte"
-#: client/cityrepdata.c:465 client/gui-xaw/citydlg.c:2401
-#: data/default/units.ruleset:238
-msgid "Workers"
+#: client/cityrepdata.c:469 client/gui-xaw/citydlg.c:2402
+#, fuzzy
+msgid "?city:Workers"
msgstr "Arbeidere"
-#: client/cityrepdata.c:466
+#: client/cityrepdata.c:470
msgid "?happy/content/unhappy/angry:H/C/U/A"
msgstr "?happy/content/unhappy/angry:L/F/U/S"
-#: client/cityrepdata.c:467
+#: client/cityrepdata.c:471
msgid "Workers: Happy, Content, Unhappy, Angry"
msgstr "Arbeidere: Lykkelig, Fornøyd, Ulykkelig, Sinte"
-#: client/cityrepdata.c:470 client/cityrepdata.c:472
+#: client/cityrepdata.c:474 client/cityrepdata.c:476
msgid "Best"
msgstr "Best"
-#: client/cityrepdata.c:470
+#: client/cityrepdata.c:474
msgid "attack"
msgstr "angrep"
-#: client/cityrepdata.c:471
+#: client/cityrepdata.c:475
msgid "Best attacking units"
msgstr "Beste angripende enheter"
-#: client/cityrepdata.c:472
+#: client/cityrepdata.c:476
msgid "defense"
msgstr "forsvar"
-#: client/cityrepdata.c:473
+#: client/cityrepdata.c:477
msgid "Best defending units"
msgstr "Beste forsvarende enheter"
-#: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
-#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
-#: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
-#: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
-#: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
-#: client/gui-win32/menu.c:351 client/gui-win32/repodlgs.c:616
-#: client/gui-win32/repodlgs.c:707 client/gui-win32/repodlgs.c:716
-#: client/gui-xaw/menu.c:157 client/gui-xaw/menu.c:219
-#: client/gui-xaw/menu.c:242 client/gui-xaw/repodlgs.c:881
-#: client/gui-xaw/repodlgs.c:1069 data/Freeciv.in:1895 data/helpdata.txt:909
+#: client/cityrepdata.c:478 client/cityrepdata.c:482
+#: client/gui-gtk-2.0/cityrep.c:1437 client/gui-gtk-2.0/cityrep.c:1456
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-gtk-2.0/cityrep.c:1494
+#: client/gui-gtk-2.0/cityrep.c:1514 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/repodlgs.c:960 client/gui-sdl/helpdlg.c:688
+#: client/gui-sdl/mapctrl.c:1605 client/gui-sdl/optiondlg.c:1827
+#: client/gui-sdl/repodlgs.c:356 client/gui-win32/menu.c:351
+#: client/gui-win32/repodlgs.c:616 client/gui-win32/repodlgs.c:707
+#: client/gui-win32/repodlgs.c:716 client/gui-xaw/menu.c:157
+#: client/gui-xaw/menu.c:219 client/gui-xaw/menu.c:242
+#: client/gui-xaw/repodlgs.c:881 client/gui-xaw/repodlgs.c:1069
+#: data/Freeciv.in:1895 data/helpdata.txt:909
msgid "Units"
msgstr "Enheter"
#. TRANS: Header "Number of units inside city"
-#: client/cityrepdata.c:476
+#: client/cityrepdata.c:480
#, fuzzy
msgid "?Present (units):Here"
msgstr "?Present (units):Tils"
-#: client/cityrepdata.c:477
+#: client/cityrepdata.c:481
msgid "Number of units present"
msgstr "Antall enheter tilstede"
#. TRANS: Header "Number of units supported by given city"
-#: client/cityrepdata.c:480
+#: client/cityrepdata.c:484
#, fuzzy
msgid "?Supported (units):Owned"
msgstr "?Supported (units):Stø"
-#: client/cityrepdata.c:481
+#: client/cityrepdata.c:485
msgid "Number of units supported"
msgstr "Antall støttede enheter"
#. TRANS: Header "It will take this many turns before city grows"
-#: client/cityrepdata.c:484
+#: client/cityrepdata.c:488
#, fuzzy
msgid "?food (population):Grow"
msgstr "Vekst"
-#: client/cityrepdata.c:485 client/cityrepdata.c:530
+#: client/cityrepdata.c:489 client/cityrepdata.c:528
#, fuzzy
msgid "?Stock/Target:(Have/Need)"
msgstr "(Oppsamlet/Mål)"
-#: client/cityrepdata.c:486
+#: client/cityrepdata.c:490
msgid "Turns until growth/famine"
msgstr "Runder til vekst/hungersnød"
-#: client/cityrepdata.c:488
-#, fuzzy
-msgid "?size [short]:Sz"
-msgstr "?size:St"
-
-#: client/cityrepdata.c:488
-msgid "Size"
-msgstr "Størrelse"
-
-#: client/cityrepdata.c:492
-msgid "?city:Name"
-msgstr "?city:Bynavn"
-
-#: client/cityrepdata.c:492 client/gui-sdl/cityrep.c:169
-msgid "City Name"
-msgstr "Bynavn"
-
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
msgid "Surplus"
msgstr "Overskudd"
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
msgid "?food/production/trade:F/P/T"
msgstr "?food/production/trade:M/P/H"
-#: client/cityrepdata.c:496
+#: client/cityrepdata.c:494
msgid "Surplus: Food, Production, Trade"
msgstr "Overskudd: Mat, Produksjon, Handel"
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
#, fuzzy
msgid "?Food surplus [short]:+F"
msgstr "?Food surplus [short]:+M"
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
msgid "Surplus: Food"
msgstr "Overskudd: Mat"
-#: client/cityrepdata.c:500
+#: client/cityrepdata.c:498
#, fuzzy
msgid "?Production surplus [short]:+P"
msgstr "?Production surplus [short]:+P"
-#: client/cityrepdata.c:501
+#: client/cityrepdata.c:499
msgid "Surplus: Production"
msgstr "Overskudd: Produksjon"
-#: client/cityrepdata.c:502
+#: client/cityrepdata.c:500
#, fuzzy
msgid "?Production loss (waste) [short]:-P"
msgstr "-P"
-#: client/cityrepdata.c:503
+#: client/cityrepdata.c:501
msgid "Waste"
msgstr "Avfall"
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
#, fuzzy
msgid "?Trade surplus [short]:+T"
msgstr "?Trade surplus [short]:+H"
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
msgid "Surplus: Trade"
msgstr "Overskudd: Handel"
-#: client/cityrepdata.c:506
+#: client/cityrepdata.c:504
#, fuzzy
msgid "?Trade loss (corruption) [short]:-T"
msgstr "-H"
-#: client/cityrepdata.c:507
+#: client/cityrepdata.c:505
msgid "Corruption"
msgstr "Korrupsjon"
-#: client/cityrepdata.c:509 client/gui-gtk-2.0/repodlgs.c:654
+#: client/cityrepdata.c:507 client/gui-gtk-2.0/repodlgs.c:654
#: client/gui-sdl/mapctrl.c:1400 client/gui-win32/repodlgs.c:334
#: client/gui-xaw/menu.c:222 client/gui-xaw/repodlgs.c:644
#: client/gui-xaw/repodlgs.c:773 data/Freeciv.in:1819
msgid "Economy"
msgstr "Økonomi"
-#: client/cityrepdata.c:509
+#: client/cityrepdata.c:507
msgid "?gold/luxury/science:G/L/S"
msgstr "?gold/luxury/science:G/L/F"
-#: client/cityrepdata.c:510
+#: client/cityrepdata.c:508
msgid "Economy: Gold, Luxuries, Science"
msgstr "Økonomi: Gull, Luksus, Forskning"
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
msgid "?Gold:G"
msgstr "?Gold:G"
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
msgid "Economy: Gold"
msgstr "Økonomi: Gull"
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
msgid "?Luxury:L"
msgstr "?Luxury:L"
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
msgid "Economy: Luxury"
msgstr "Økonomi: Luksus"
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
msgid "?Science:S"
msgstr "?Science:F"
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
msgid "Economy: Science"
msgstr "Økonomi: Forskning"
-#: client/cityrepdata.c:518
+#: client/cityrepdata.c:516
#, fuzzy
msgid "?number_trade_routes:n"
msgstr "?number_trade_routes:#"
-#: client/cityrepdata.c:518
+#: client/cityrepdata.c:516
#, fuzzy
msgid "?number_trade_routes:R"
msgstr "?number_trade_routes:H"
-#: client/cityrepdata.c:519
+#: client/cityrepdata.c:517
msgid "Number of Trade Routes"
msgstr "Antall handelsruter"
-#: client/cityrepdata.c:521
+#: client/cityrepdata.c:519
msgid "?pollution [short]:Pol"
msgstr "?pollution [short]:For"
-#: client/cityrepdata.c:523
+#: client/cityrepdata.c:521
#, fuzzy
msgid "?cma:Governor"
msgstr "Sysselmann"
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
-#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
-#: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
-#: data/Freeciv.in:1459 data/helpdata.txt:820
+#: client/cityrepdata.c:521 client/gui-gtk-2.0/cityrep.c:1766
+#: client/gui-sdl/citydlg.c:3809 client/gui-sdl/cma_fe.c:858
+#: client/gui-win32/citydlg.c:726 data/Freeciv.in:1459 data/helpdata.txt:820
#, fuzzy
msgid "Citizen Governor"
msgstr "Sysselmann"
-#: client/cityrepdata.c:526
+#: client/cityrepdata.c:524
#, fuzzy
msgid "Turns/Buy"
msgstr "Runder/Kjøpekostnad"
-#: client/cityrepdata.c:529 client/cityrepdata.c:531
+#: client/cityrepdata.c:527 client/cityrepdata.c:529
msgid "Currently Building"
msgstr "Bygger nå"
-#: client/cityrepdata.c:575
+#: client/cityrepdata.c:573
#, fuzzy
msgid "?specialist:S"
msgstr "?Spesielle:S"
-#: client/cityrepdata.c:578
+#: client/cityrepdata.c:576
#, fuzzy
msgid "Specialists"
msgstr "Spesielle"
-#: client/civclient.c:239
+#: client/civclient.c:240
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr " -a, --autoconnect\tHopper over Koble til dialogen\n"
-#: client/civclient.c:249
+#: client/civclient.c:250
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:251
+#: client/civclient.c:252
msgid " -m, --meta HOST\tConnect to the metaserver at HOST\n"
msgstr " -m, --meta HOST\tKoble til metaserveren på HOST\n"
-#: client/civclient.c:253
+#: client/civclient.c:254
msgid " -n, --name NAME\tUse NAME as name\n"
msgstr " -n, --name NAVN\tBruk NAVN som navn\n"
-#: client/civclient.c:255
+#: client/civclient.c:256
#, 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:257
+#: client/civclient.c:258
#, 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:259
+#: client/civclient.c:260
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:262
+#: client/civclient.c:263
#, 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:264
+#: client/civclient.c:265
msgid " -S, --Sound FILE\tRead sound tags from FILE\n"
msgstr " -s, --sound FIL\tLes lyd-informasjon fra FIL\n"
-#: client/civclient.c:265
+#: client/civclient.c:266
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:268
+#: client/civclient.c:269
#, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -7812,144 +7801,154 @@ msgstr ""
"\t\t\tPrøv \"%s -- --help\" for mer info.\n"
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:273
+#: client/civclient.c:274
#, fuzzy, c-format
msgid "Report bugs at %s\n"
msgstr "Rapporter feil, unoter og/eller 'bugs' til <%s>.\n"
-#: client/civclient.c:297
+#: client/civclient.c:298
#, c-format
msgid "Invalid port \"%s\" specified with --port option.\n"
msgstr "Ugyldig portnummer \"%s\" spesifisert med --port valget.\n"
-#: client/civclient.c:299 client/civclient.c:314
+#: client/civclient.c:300 client/civclient.c:315
msgid "Try using --help.\n"
msgstr "Prøv --help.\n"
-#: client/civclient.c:312
+#: client/civclient.c:313
#, c-format
msgid "Invalid debug level \"%s\" specified with --debug option.\n"
msgstr "Ugyldig debuggingsnivå \"%s\" spesifisert med --debug valget.\n"
-#: client/civclient.c:325
+#: client/civclient.c:326
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr "Ukjent alternativ: \"%s\"\n"
-#: client/civclient.c:539
+#: client/civclient.c:391
+#, fuzzy, c-format
+msgid "Updating old metaserver address \"%s\"."
+msgstr "metaserver <addresse>"
+
+#: client/civclient.c:394
+#, fuzzy, c-format
+msgid "Default metaserver has been set to \"%s\"."
+msgstr "Alternativ: %s har blitt satt til \"%s\"."
+
+#: client/civclient.c:550
msgid "Game started."
msgstr "Spillet har startet."
-#: client/civclient.c:577
+#: client/civclient.c:588
msgid "There was an error while auto connecting; aborting."
msgstr "Det oppstod en feil under automatisk forbindelse, avbryter."
-#: client/climisc.c:176
+#: client/climisc.c:177
#, c-format
msgid "Changing production of every %s into %s."
msgstr "Endrer produksjon for hver %s til %s."
-#: client/climisc.c:214
+#: client/climisc.c:215
msgid "?embassy:Both"
msgstr "?embassy:begge"
-#: client/climisc.c:216
+#: client/climisc.c:217
msgid "?embassy:Yes"
msgstr "?embassy:ja"
-#: client/climisc.c:219
+#: client/climisc.c:220
msgid "?embassy:With Us"
msgstr "?embassy:hos oss"
-#: client/climisc.c:222
+#: client/climisc.c:223
msgid "?embassy:Contact"
msgstr "?embassy:Kontakt"
-#: client/climisc.c:224
+#: client/climisc.c:225
msgid "?embassy:No Contact"
msgstr "Ingen Kontakt"
-#: client/climisc.c:236
+#: client/climisc.c:237
msgid "?vision:Both"
msgstr "?vision:begge"
-#: client/climisc.c:238
+#: client/climisc.c:239
msgid "?vision:To Them"
msgstr "?vision:for dem"
-#: client/climisc.c:241
+#: client/climisc.c:242
msgid "?vision:To Us"
msgstr "?vision:for oss"
-#: client/climisc.c:257 client/climisc.c:264
+#: client/climisc.c:258 client/climisc.c:265
#, c-format
msgid "The %s give %s"
msgstr "%s gir %s"
-#: client/climisc.c:268
+#: client/climisc.c:269
#, c-format
msgid "The %s give unknown city."
msgstr "%s gir bort ukjent by."
-#: client/climisc.c:273
+#: client/climisc.c:274
#, c-format
msgid "The %s give %d gold"
msgstr "%s gir deg %d gull"
-#: client/climisc.c:278
+#: client/climisc.c:279
#, c-format
msgid "The %s give their worldmap"
msgstr "%s gir deg sine verdenskart"
-#: client/climisc.c:282
+#: client/climisc.c:283
#, c-format
msgid "The %s give their seamap"
msgstr "%s gir deg sine sjøkart"
-#: client/climisc.c:286
+#: client/climisc.c:287
msgid "The parties agree on a cease-fire"
msgstr "Partene blir enig om en våpenhvile"
-#: client/climisc.c:289
+#: client/climisc.c:290
msgid "The parties agree on a peace"
msgstr "Partene slutter fred"
-#: client/climisc.c:292
+#: client/climisc.c:293
msgid "The parties create an alliance"
msgstr "Partene allierer seg"
-#: client/climisc.c:295
+#: client/climisc.c:296
#, c-format
msgid "The %s give shared vision"
msgstr "%s gir deg utsyn"
-#: client/climisc.c:299
+#: client/climisc.c:300
#, c-format
msgid "The %s give an embassy"
msgstr "%s gir en ambassade"
-#: client/climisc.c:902
+#: client/climisc.c:906
msgid "Popup Request"
msgstr "Popup spørsmål"
-#: client/climisc.c:932
+#: client/climisc.c:936
msgid "Exporting output window to civgame.log ..."
msgstr "Eksporterer utskriftsvindu til civgame.log ..."
-#: client/climisc.c:936
+#: client/climisc.c:940
msgid "Export complete."
msgstr "Eksport fullført."
-#: client/climisc.c:938
+#: client/climisc.c:942
msgid "Export failed, couldn't write to file."
msgstr "Klarer ikke skrive til fil."
-#: client/climisc.c:1038
+#: client/climisc.c:1042
#, c-format
msgid "You don't buy %s in %s!"
msgstr "Du kjøper ikke %s i %s!"
-#: client/climisc.c:1056
+#: client/climisc.c:1060
#, c-format
msgid "%s costs %d gold and you only have %d gold."
msgstr "%s koster %d gull og du har kun %d gull."
@@ -7998,19 +7997,19 @@ msgstr ""
"Auto-tilkobler server \"%s\" på port %d som \"%s\" hvert %f sekund i %d "
"ganger"
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1289
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
msgid "novice"
msgstr "nybegynner"
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1289
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1358
msgid "easy"
msgstr "lett"
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1290
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
msgid "normal"
msgstr "normal"
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1290
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
msgid "hard"
msgstr "vanskelig"
@@ -8039,39 +8038,43 @@ msgid "We probably couldn't start it from here."
msgstr "Vi kunne sannsynligvis ikke starte herfra."
#: client/connectdlg_common.c:470
-msgid "We have control of the server (command access level hack)"
+#, 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
-msgid "We can't take control of server, attempting to kill it."
-msgstr "Vi kan ikke ta kontroll over tjeneren, forsøker å avslutte den."
+msgid ""
+"Failed to obtain the required access level to take control of the server. "
+"The server will now be shutdown."
+msgstr ""
-#: client/control.c:1104
+#: client/control.c:1123
msgid "Only transporter units can be unloaded."
msgstr "Kun transportenheter kan lastes av."
-#: client/control.c:1353
+#: client/control.c:1425
#, 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:1444
+#: client/control.c:1516
msgid "Only nuclear units can do this."
msgstr "Kun atombombe-enheter kan gjøre dette."
-#: client/control.c:1473
+#: client/control.c:1545
msgid "Only paratrooper units can do this."
msgstr "Kun fallskjermjegere kan gjøre dette."
-#: client/control.c:1921
+#: client/control.c:2020
msgid "Too far for this unit."
msgstr "For langt for denne enheten."
-#: client/control.c:2131 client/control.c:2161 client/control.c:2177
+#: client/control.c:2230 client/control.c:2260 client/control.c:2276
msgid "Didn't find a route to the destination!"
msgstr "Fant ingen rute til målet."
-#: client/control.c:2221
+#: client/control.c:2320
msgid "Oh my! You seem to have no capital!"
msgstr "Herregud! Du har ingen hovedstad!"
@@ -8139,16 +8142,16 @@ msgid "Allows %s (with %s)."
msgstr "Tillater %s (med %s).\n"
#. TRANS: preserve single space at beginning
-#: client/helpdata.c:418
+#: client/helpdata.c:416
msgid " Rivers"
msgstr " Elver"
-#: client/helpdata.c:576
+#: client/helpdata.c:574
#, c-format
msgid "Sorry, no help topic for %s.\n"
msgstr "Beklager, ikke noe hjelpeemne for %s.\n"
-#: client/helpdata.c:580
+#: client/helpdata.c:578
#, c-format
msgid ""
"Sorry, no help topic for %s.\n"
@@ -8159,86 +8162,86 @@ msgstr ""
"Denne siden ble auto-generert.\n"
"\n"
-#: client/helpdata.c:670
+#: client/helpdata.c:668
#, fuzzy
msgid ""
"Requires: Nothing\n"
"\n"
msgstr "Du kan ikke forske på denne teknologien."
-#: client/helpdata.c:675
+#: client/helpdata.c:673
#, c-format
msgid "* The discovery of %s will make %s obsolete.\n"
msgstr "* Oppdagelsen av %s vil forelde %s.\n"
-#: client/helpdata.c:694
+#: client/helpdata.c:692
#, c-format
msgid "* Allows all players with knowledge of %s to build %s units.\n"
msgstr "* Tillater alle spillere med kunnskap om %s å bygge %s enheter.\n"
-#: client/helpdata.c:706
+#: client/helpdata.c:704
#, c-format
msgid "* Allows %s (with %s).\n"
msgstr "* Tillater %s (med %s).\n"
-#: client/helpdata.c:710
+#: client/helpdata.c:708
#, c-format
msgid "* Allows %s.\n"
msgstr "* Tillater %s.\n"
-#: client/helpdata.c:780
+#: client/helpdata.c:778
#, c-format
msgid "* Can only be built if there is %s in the city.\n"
msgstr ""
-#: client/helpdata.c:786
+#: client/helpdata.c:784
#, c-format
msgid "* Can only be built with %s as government.\n"
msgstr ""
-#: client/helpdata.c:791
+#: client/helpdata.c:789
msgid "* May not be built in cities.\n"
msgstr "* Kan ikke bygges i byer.\n"
-#: client/helpdata.c:794
+#: client/helpdata.c:792
msgid "* Never has a home city.\n"
msgstr "* Har aldri en hjemby.\n"
-#: client/helpdata.c:797
+#: client/helpdata.c:795
msgid "* Losing this unit will lose you the game!\n"
msgstr "* Å miste denne enheten gjør at du taper spiller!\n"
-#: client/helpdata.c:801
+#: client/helpdata.c:799
msgid "* Each player may only have one of this type of unit.\n"
msgstr "* Hver spiller kan kun ha en av denne enheten.\n"
-#: client/helpdata.c:805
+#: client/helpdata.c:803
#, c-format
msgid "* Requires %d population to build.\n"
msgstr "* Krever befolkningstall på %d for å kunne bygges.\n"
-#: client/helpdata.c:811
+#: client/helpdata.c:809
#, c-format
msgid "* Can carry and refuel %d air unit.\n"
msgid_plural "* Can carry and refuel %d air units.\n"
msgstr[0] "* Kan frakte og fylle drivstoff på %d flyenhet.\n"
msgstr[1] "* Kan frakte og fylle drivstoff på %d flyenhet.\n"
-#: client/helpdata.c:816
+#: client/helpdata.c:814
#, c-format
msgid "* Can carry and refuel %d missile unit.\n"
msgid_plural "* Can carry and refuel %d missile units.\n"
msgstr[0] "* Kan transportere og fylle drivstoff på %d rakettenhet.\n"
msgstr[1] "* Kan transportere og fylle drivstoff på %d rakettenhet.\n"
-#: client/helpdata.c:821
+#: client/helpdata.c:819
#, c-format
msgid "* Can carry %d ground unit across water.\n"
msgid_plural "* Can carry %d ground units across water.\n"
msgstr[0] "* Kan transportere %d landenhet over vann.\n"
msgstr[1] "* Kan transportere %d landenhet over vann.\n"
-#: client/helpdata.c:830
+#: client/helpdata.c:828
msgid ""
"* Can establish trade routes (must travel to target city and must be at "
"least 9 tiles [in Manhattan distance] from this unit's home city).\n"
@@ -8246,166 +8249,166 @@ msgstr ""
"* Kan etablere handelsruter (må reise til en annen by som er minst 9 ruter "
"[i Manhattan avstand] fra denne enhetens hjemby). \n"
-#: client/helpdata.c:836
+#: client/helpdata.c:834
#, c-format
msgid "* Can help build wonders (adds %d production).\n"
msgstr "* Kan hjelpe til å bygge underverk (legger til %d produksjon).\n"
-#: client/helpdata.c:840
+#: client/helpdata.c:838
msgid "* May not be disbanded.\n"
msgstr "* Kan ikke oppløses.\n"
-#: client/helpdata.c:842
+#: client/helpdata.c:840
#, c-format
msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
msgstr ""
"* Kan oppløses i en by for å få tilbake 50%% av produksjonskonstnadene.\n"
-#: client/helpdata.c:846
+#: client/helpdata.c:844
msgid "* Can build new cities.\n"
msgstr "* Kan bygge nye byer.\n"
-#: client/helpdata.c:849
+#: client/helpdata.c:847
#, c-format
msgid "* Can add on %d population to cities of no more than size %d.\n"
msgstr "* Kan legge til %d innbyggere til byer på størrelse mindre enn %d.\n"
-#: client/helpdata.c:858
+#: client/helpdata.c:856
msgid "* Can build roads and railroads.\n"
msgstr "* Kan bygge veier og jernbaner.\n"
-#: client/helpdata.c:859
+#: client/helpdata.c:857
msgid "* Can build mines on tiles.\n"
msgstr "* Kan bygge gruver.\n"
-#: client/helpdata.c:860
+#: client/helpdata.c:858
msgid "* Can build irrigation on tiles.\n"
msgstr "* Kan bygge irrigasjon.\n"
-#: client/helpdata.c:865
+#: client/helpdata.c:863
msgid "* Can build farmland.\n"
msgstr "- Kan bygge dyrket mark.\n"
-#: client/helpdata.c:869
+#: client/helpdata.c:867
#, c-format
msgid "* Can build farmland (if %s is known).\n"
msgstr "* Kan bygge dyrket mark (dersom %s er kjent).\n"
-#: client/helpdata.c:873
+#: client/helpdata.c:871
#, c-format
msgid "* Can build farmland (if any of the following are known: %s).\n"
msgstr "* Kan bygge dyrket mark (dersom en av %s er kjent).\n"
-#: client/helpdata.c:881
+#: client/helpdata.c:879
msgid "* Can build fortresses.\n"
msgstr "* Tillater å bygge fort.\n"
-#: client/helpdata.c:885
+#: client/helpdata.c:883
#, c-format
msgid "* Can build fortresses (if %s is known).\n"
msgstr "* Tillater å bygge fort (dersom %s er kjent).\n"
-#: client/helpdata.c:889
+#: client/helpdata.c:887
#, c-format
msgid "* Can build fortresses (if any of the following are known: %s).\n"
msgstr "* Tillater å bygge fort (dersom en av følgende er kjent: %s).\n"
-#: client/helpdata.c:895
+#: client/helpdata.c:893
msgid "* Can clean pollution from tiles.\n"
msgstr "* Kan fjerne forurensing. \n"
-#: client/helpdata.c:896
+#: client/helpdata.c:894
msgid "* Can clean nuclear fallout from tiles.\n"
msgstr "* Kan fjerne atomavfall.\n"
-#: client/helpdata.c:899
+#: client/helpdata.c:897
msgid "* Can transform tiles.\n"
msgstr "* Kan transformere kartruter.\n"
-#: client/helpdata.c:902
+#: client/helpdata.c:900
msgid "* Can build airbases.\n"
msgstr "* Kan bygge flyplasser.\n"
-#: client/helpdata.c:906
+#: client/helpdata.c:904
#, c-format
msgid "* May fortify, granting a 50%% defensive bonus.\n"
msgstr "* Kan befeste, som git 50%% forsvarsbonus.\n"
-#: client/helpdata.c:909
+#: client/helpdata.c:907
msgid "* May pillage to destroy infrastructure from tiles.\n"
msgstr "* Kan plyndre for å ødelegge infrastrukturen på kartruter.\n"
-#: client/helpdata.c:913
+#: client/helpdata.c:911
msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
msgstr ""
"* Kan utføre diplomatiske forhandlinger, samt spesielle spion-egenskaper.\n"
-#: client/helpdata.c:916
+#: client/helpdata.c:914
msgid "* Can perform diplomatic actions.\n"
msgstr "* Kan utføre diplomatiske forhandlinger.\n"
-#: client/helpdata.c:920
+#: client/helpdata.c:918
msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
msgstr "* Vil aldri tape en diplomat-mot-diplomat kamp.\n"
-#: client/helpdata.c:923
+#: client/helpdata.c:921
msgid "* May not be bribed.\n"
msgstr "* Denne enheten kan ikke bestikkes.\n"
-#: client/helpdata.c:926
+#: client/helpdata.c:924
msgid "* Can attack enemy air units.\n"
msgstr "* Kan angripe fiendtlige luftenheter.\n"
-#: client/helpdata.c:930
+#: client/helpdata.c:928
msgid "* Is invisible except when next to an enemy unit or city.\n"
msgstr ""
"* Er usynlig unntatt når den er ved siden av en fremmed enhet eller by.\n"
-#: client/helpdata.c:934
+#: client/helpdata.c:932
msgid "* Can only attack units on ocean squares (no land attacks).\n"
msgstr "* Kan kunne angripe enheter på havet (ingen angrep mot land).\n"
# dumbo translation
-#: client/helpdata.c:938
+#: client/helpdata.c:936
msgid ""
"* Can attack from aboard sea units: against enemy cities and onto land "
"squares.\n"
msgstr "* Kan fra sjøenheter angripe fiendens byer og enheter på land.\n"
-#: client/helpdata.c:943
+#: client/helpdata.c:941
#, c-format
msgid "* Can be paradropped from a friendly city (Range: %d).\n"
msgstr "* Kan gjøre fallskjermhopp fra vennligsinnet by (Rekkevidde: %d).\n"
-#: client/helpdata.c:949
+#: client/helpdata.c:947
msgid "* Gets double defense against units specified as 'mounted'.\n"
msgstr "* Får dobbelt forsvar mot enheter som er 'til hest'.\n"
-#: client/helpdata.c:953
+#: client/helpdata.c:951
msgid "* Counts as 'mounted' against certain defenders.\n"
msgstr "* Teller som 'til hest' mot enkelte forsvarere.\n"
-#: client/helpdata.c:957
+#: client/helpdata.c:955
msgid "* A missile unit: gets used up in making an attack.\n"
msgstr "* En rakettenhet: blir brukt opp idet den angriper.\n"
-#: client/helpdata.c:960
+#: client/helpdata.c:958
msgid "* Making an attack ends this unit's turn.\n"
msgstr "* Et angrep avslutter denne enhetens runde.\n"
-#: client/helpdata.c:964
+#: client/helpdata.c:962
msgid "* This unit's attack causes a nuclear explosion!\n"
msgstr "* Denne enhetens angrep skaper en atomeksplosjon!\n"
-#: client/helpdata.c:968
+#: client/helpdata.c:966
msgid "* Gets double firepower when attacking cities.\n"
msgstr "* Får dobbel ildkraft ved angrep på byer.\n"
-#: client/helpdata.c:971
+#: client/helpdata.c:969
msgid "* Ignores the effects of city walls.\n"
msgstr "* Bryr seg ikke om bymurer.\n"
-#: client/helpdata.c:975
+#: client/helpdata.c:973
#, c-format
msgid ""
"* Does bombard attacks (%d per turn). These attacks will only damage (never "
@@ -8415,36 +8418,36 @@ msgstr ""
"(aldri drepe) den forsvarende enheten, men innebærer ingen risiko for "
"angriper.\n"
-#: client/helpdata.c:982
+#: client/helpdata.c:980
msgid "* Gets quintuple defense against missiles and aircraft.\n"
msgstr "* Får femdoblet forsvar mot raketter og fly.\n"
-#: client/helpdata.c:986
+#: client/helpdata.c:984
msgid "* Ignores terrain effects (treats all squares as roads).\n"
msgstr "* Bryr seg ikke om terreng (alle felt tilsvarer veier).\n"
-#: client/helpdata.c:989
+#: client/helpdata.c:987
msgid "* Ignores zones of control.\n"
msgstr "* Bryr seg ikke om kontrollsoner.\n"
-#: client/helpdata.c:993
+#: client/helpdata.c:991
msgid "* A non-military unit (cannot attack; no martial law).\n"
msgstr "* En ikke-militær enhet (kan ikke angripe; ingen unntakstilstand).\n"
-#: client/helpdata.c:997
+#: client/helpdata.c:995
msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
msgstr ""
"* En kampenhet: medfører 1 ulykkelig selv når den er ikke-aggressiv. \n"
-#: client/helpdata.c:1000
+#: client/helpdata.c:998
msgid "* Will never achieve veteran status.\n"
msgstr "* Oppnår aldri status som veteran.\n"
-#: client/helpdata.c:1002
+#: client/helpdata.c:1000
msgid "* May become veteran through training or combat.\n"
msgstr "* Kan bli oppnå veteran status gjennom trening eller kamp.\n"
-#: client/helpdata.c:1008
+#: client/helpdata.c:1006
#, c-format
msgid ""
"* Must end turn in a city or next to land, or has a 50%% risk of being lost "
@@ -8453,12 +8456,12 @@ msgstr ""
"* Må avslutte runden i en by eller ved kysten, ellers har den en 50%% sjanse "
"for å gå tapt på havet.\n"
-#: client/helpdata.c:1012
+#: client/helpdata.c:1010
#, c-format
msgid "* The discovery of %s reduces the risk to 25%%.\n"
msgstr "* Oppdagelsen av %s reduserer risikoen til 25%%.\n"
-#: client/helpdata.c:1017
+#: client/helpdata.c:1015
#, c-format
msgid "* %s reduces the risk to 12%%.\n"
msgstr "* %s reduserer risikoen til 12%%.\n"
@@ -8467,27 +8470,27 @@ msgstr "* %s reduserer risikoen til 12%%.\n"
#. * last two elements
#. TRANS: List of possible output types has this between
#. * last two elements
-#: client/helpdata.c:1068 client/helpdata.c:1402
+#: client/helpdata.c:1066 client/helpdata.c:1400
msgid " or "
msgstr " eller "
-#: client/helpdata.c:1070 client/helpdata.c:1390
+#: client/helpdata.c:1068 client/helpdata.c:1388
msgid "?or:, "
msgstr "?eller:, "
-#: client/helpdata.c:1082
+#: 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"
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:1124
+#: client/helpdata.c:1122
#, 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:1129
+#: client/helpdata.c:1127
#, c-format
msgid ""
"To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8496,91 +8499,91 @@ msgstr ""
"For å nå %s trenger vi å anskaffe %d andre teknologier først. Hele "
"prosjektet krever %d forskningspoeng for å fullføres."
-#: client/helpdata.c:1137
+#: client/helpdata.c:1135
msgid "You cannot research this technology."
msgstr "Du kan ikke forske på denne teknologien."
-#: client/helpdata.c:1141
+#: client/helpdata.c:1139
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:1153
+#: client/helpdata.c:1151
#, 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:1158
+#: client/helpdata.c:1156
#, 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:1161
+#: client/helpdata.c:1159
#, 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:1165
+#: client/helpdata.c:1163
msgid "* Increases the pollution generated by the population.\n"
msgstr "* Øker forurensningen skapt av befolkningen.\n"
-#: client/helpdata.c:1170
+#: client/helpdata.c:1168
#, c-format
msgid "* Allows %s to build roads on river squares.\n"
msgstr "* Tillater %s å bygge veier på elve-felt\n"
-#: client/helpdata.c:1177
+#: client/helpdata.c:1175
#, c-format
msgid "* Allows %s to build fortresses.\n"
msgstr "* Tillater %s å bygge fort.\n"
-#: client/helpdata.c:1185
+#: client/helpdata.c:1183
#, c-format
msgid "* Allows %s to build airbases.\n"
msgstr "* Tillater %s å bygge flybaser.\n"
-#: client/helpdata.c:1194
+#: client/helpdata.c:1192
#, c-format
msgid "* Allows %s to upgrade roads to railroads.\n"
msgstr "* Tillater %s å oppgradere veier til jernbane.\n"
-#: client/helpdata.c:1202
+#: client/helpdata.c:1200
#, c-format
msgid "* Allows %s to upgrade irrigation to farmland.\n"
msgstr "* Tillater %s å oppgradere irrigert land til jordbruksland.\n"
-#: client/helpdata.c:1236
+#: client/helpdata.c:1234
msgid "* Pollution cannot be generated on this terrain."
msgstr "* Dette terrenget kan ikke bli forurenset."
-#: client/helpdata.c:1241
+#: client/helpdata.c:1239
msgid "* You cannot build cities on this terrain."
msgstr "* Kan ikke bygge byer på slikt terreng."
-#: client/helpdata.c:1247
+#: client/helpdata.c:1245
msgid "* The coastline of this terrain is unsafe."
msgstr "* Kystlinja til dette terrenget er utrygg."
-#: client/helpdata.c:1252
+#: client/helpdata.c:1250
msgid "* This terrain is unsafe for units to travel on."
msgstr "* Dette terrenget er utrygt for ferdsel."
-#: client/helpdata.c:1257
+#: client/helpdata.c:1255
msgid "* Land units cannot travel on oceanic terrains."
msgstr "* Landenheter kan ikke ferdes over havterreng."
-#: client/helpdata.c:1307
+#: client/helpdata.c:1305
msgid "Features:\n"
msgstr ""
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1413 client/helpdata.c:1414
+#: client/helpdata.c:1411 client/helpdata.c:1412
msgid "?outputlist: Nothing "
msgstr ""
-#: client/helpdata.c:1421
+#: client/helpdata.c:1419
#, fuzzy, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
@@ -8591,7 +8594,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:1431
+#: client/helpdata.c:1429
#, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8599,48 +8602,48 @@ msgid ""
msgstr ""
#. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1439
+#: client/helpdata.c:1437
#, c-format
msgid "* You pay %d times normal %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1444
+#: client/helpdata.c:1442
#, 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:1449
+#: client/helpdata.c:1447
#, c-format
msgid "* You pay no %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1453
+#: client/helpdata.c:1451
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:1462
+#: client/helpdata.c:1460
#, 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:1470
+#: client/helpdata.c:1468
#, c-format
msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
msgstr ""
-#: client/helpdata.c:1477
+#: client/helpdata.c:1475
#, 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:1484
+#: client/helpdata.c:1482
#, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -8648,23 +8651,23 @@ msgid ""
msgstr ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1491
+#: client/helpdata.c:1489
#, 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:1499
+#: client/helpdata.c:1497
#, c-format
msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
msgstr ""
-#: client/helpdata.c:1504
+#: client/helpdata.c:1502
msgid "Has unlimited science/gold/luxuries rates.\n"
msgstr ""
-#: client/helpdata.c:1509
+#: client/helpdata.c:1507
#, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
@@ -8675,7 +8678,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:1521
+#: client/helpdata.c:1519
#, 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"
@@ -8683,64 +8686,64 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1532
+#: client/helpdata.c:1530
#, 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:1538
+#: client/helpdata.c:1536
#, fuzzy
msgid "* Your units cannot be bribed.\n"
msgstr "Denne enheten kan ikke bestikkes."
-#: client/helpdata.c:1541
+#: client/helpdata.c:1539
#, fuzzy
msgid "* Your cities cannot be incited.\n"
msgstr "Byen kan ikke bli infiltrert!"
-#: client/helpdata.c:1545
+#: client/helpdata.c:1543
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:1551
+#: client/helpdata.c:1549
msgid "* Has a senate that may prevent declaration of war.\n"
msgstr ""
-#: client/helpdata.c:1555
+#: client/helpdata.c:1553
msgid "* Allows partisans when cities are taken by the enemy.\n"
msgstr ""
-#: client/helpdata.c:1559
+#: client/helpdata.c:1557
msgid ""
"* Buildings that normally confer bonuses against unhappiness will instead "
"give gold.\n"
msgstr ""
-#: client/helpdata.c:1563
+#: client/helpdata.c:1561
msgid "* Pays no upkeep for fanatics.\n"
msgstr ""
-#: client/helpdata.c:1566
+#: client/helpdata.c:1564
#, fuzzy
msgid "* Has no unhappy citizens.\n"
msgstr "%d ulykkelige innbyggere."
-#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
+#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
#, c-format
msgid "* Veteran %s units.\n"
msgstr ""
-#: client/helpdata.c:1587
+#: client/helpdata.c:1585
#, fuzzy
msgid "* Veteran units.\n"
msgstr "Sjøenheter"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1593
+#: client/helpdata.c:1591
#, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8748,7 +8751,7 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1602
+#: client/helpdata.c:1600
#, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8756,458 +8759,505 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1610
+#: client/helpdata.c:1608
#, 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:1619
+#: client/helpdata.c:1617
#, c-format
msgid "* %s production is increased %d%%.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1627
+#: client/helpdata.c:1625
#, c-format
msgid "* %s production will suffer massive waste.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1632
+#: client/helpdata.c:1630
#, c-format
msgid "* %s production will suffer some waste.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1637
+#: client/helpdata.c:1635
#, 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:1645
+#: client/helpdata.c:1643
#, 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:1651
+#: client/helpdata.c:1649
#, 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:1657
+#: client/helpdata.c:1655
#, c-format
msgid "* %s waste will increase slowly with distance from capital.\n"
msgstr ""
-#: client/helpdata.c:1674
+#: client/helpdata.c:1672
#, 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:1701
+#: client/helpdata.c:1699
#, fuzzy, c-format
msgid "%s%d %s"
msgstr "%3d/%3d %s"
-#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1700 client/helpdata.c:1708 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:1709
+#: client/helpdata.c:1707
#, c-format
msgid "%s%d unhappy"
msgstr "%s%d ulykkelig"
-#: client/mapctrl_common.c:382
+#: client/mapctrl_common.c:399
#, c-format
msgid "You don't know how to build %s!"
msgstr "Du vet ikke hvordan man bygger %s!"
-#: client/mapctrl_common.c:392
+#: client/mapctrl_common.c:409
#, c-format
msgid "Copy %s to clipboard."
msgstr "Kopierer %s til utklippstavlen."
-#: client/mapctrl_common.c:408
+#: client/mapctrl_common.c:425
msgid "Clipboard is empty."
msgstr "Utklippstavlen er tom."
-#: client/options.c:98
+#: client/options.c:102
#, fuzzy
msgid "Graphics"
msgstr "Demografi"
-#: client/options.c:99
+#: client/options.c:103
#, fuzzy
msgid "Overview"
msgstr "_Byoversikt"
-#: client/options.c:100
+#: client/options.c:104
#, fuzzy
msgid "Sound"
msgstr "Runder"
-#: client/options.c:101
+#: client/options.c:105
#, fuzzy
msgid "Interface"
msgstr "Intern"
-#: client/options.c:102
+#: client/options.c:106
#, fuzzy
msgid "Network"
msgstr "Nettverk"
-#: client/options.c:107
+#: client/options.c:111
#, fuzzy
msgid "Login name"
msgstr "Fortsette et spill"
-#: client/options.c:108
+#: client/options.c:112
msgid ""
"This is the default login username that will be used in the connection "
"dialogs or with the -a command-line parameter."
msgstr ""
-#: client/options.c:113
+#: client/options.c:117
#, fuzzy
msgid "Server"
msgstr "aldri"
-#: client/options.c:114
+#: client/options.c:118
msgid ""
"This is the default server hostname that will be used in the connection "
"dialogs or with the -a command-line parameter."
msgstr ""
-#: client/options.c:119
+#: client/options.c:123
#, fuzzy
msgid "Server port"
msgstr "Vis ser_veralternativ"
-#: client/options.c:120
+#: client/options.c:124
msgid ""
"This is the default server port that will be used in the connection dialogs "
"or with the -a command-line parameter."
msgstr ""
-#: client/options.c:125 client/gui-win32/connectdlg.c:912 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
msgid "Metaserver"
msgstr "Metaserver"
-#: client/options.c:126
+#: client/options.c:130
msgid ""
"The metaserver is a host that the client contacts to find out about games on "
"the internet. Don't change this from its default value unless you know what "
"you're doing."
msgstr ""
-#: client/options.c:132
+#: client/options.c:136
#, fuzzy
msgid "Soundset"
msgstr "Runder"
-#: client/options.c:133
+#: client/options.c:137
msgid ""
"This is the soundset that will be used. Changing this is the same as using "
"the -S command-line parameter."
msgstr ""
-#: client/options.c:138
+#: client/options.c:142
#, fuzzy
msgid "Sound plugin"
msgstr "Standard lydplugin"
-#: client/options.c:139
+#: client/options.c:143
msgid ""
"If you have a problem with sound, try changing the sound plugin. The new "
"plugin won't take effect until you restart Freeciv. Changing this is the "
"same as using the -P command-line option."
msgstr ""
-#: client/options.c:144 client/gui-sdl/gui_main.c:162
+#: client/options.c:148 client/gui-sdl/gui_main.c:162
#, fuzzy
msgid "Theme"
msgstr "Tempel"
-#: client/options.c:145
+#: client/options.c:149
msgid "By changing this option you change the active theme."
msgstr ""
-#: client/options.c:148
+#: client/options.c:152
msgid "Tileset"
msgstr "Grafikkoppsett"
-#: client/options.c:149
+#: client/options.c:153
msgid ""
"By changing this option you change the active tileset. This is the same as "
"using the -t command-line parameter."
msgstr ""
-#: client/options.c:156
+#: client/options.c:160
msgid "Solid unit background color"
msgstr "Helfarget bakgrunn for enheter"
-#: client/options.c:157
+#: client/options.c:161
msgid ""
"Setting this option will cause units on the map view to be drawn with a "
"solid background color instead of the flag backdrop."
msgstr ""
-#: client/options.c:161 client/gui-sdl/optiondlg.c:960
+#: client/options.c:165 client/gui-sdl/optiondlg.c:960
msgid "Sound bell at new turn"
msgstr "Lydsignal ved ny runde "
-#: client/options.c:162
+#: client/options.c:166
msgid ""
"Set this option to have a \"bell\" event be generated at the start of a new "
"turn. You can control the behavior of the \"bell\" event by editing the "
"message options."
msgstr ""
-#: client/options.c:168
+#: client/options.c:172
msgid "Unit movement animation time (milliseconds)"
msgstr "Animasjonstid for enhet (millisekund)"
-#: client/options.c:169
+#: client/options.c:173
msgid ""
"This option controls how long unit \"animation\" takes when a unit moves on "
"the map view. Set it to 0 to disable animation entirely."
msgstr ""
-#: client/options.c:174
+#: client/options.c:178
msgid "Mapview recentering time (milliseconds)"
msgstr "Tid for å sentrere kart (millisekund)"
-#: client/options.c:175
+#: client/options.c:179
msgid ""
"When the map view is recentered, it will slide smoothly over the map to its "
"new position. This option controls how long this slide lasts. Set it to 0 "
"to disable mapview sliding entirely."
msgstr ""
-#: client/options.c:180 client/gui-sdl/optiondlg.c:1014
+#: client/options.c:184 client/gui-sdl/optiondlg.c:1014
msgid "Show combat animation"
msgstr "Vis kampanimasjon"
-#: client/options.c:181
+#: client/options.c:185
msgid ""
"Disabling this option will turn off combat animation between units on the "
"mapview."
msgstr ""
-#: client/options.c:184
+#: client/options.c:188
msgid "Draw the citybar"
msgstr ""
-#: client/options.c:185
+#: client/options.c:189
msgid ""
"Setting this option will display a 'citybar' containing useful information "
"beneath each city. Disabling this option will display only the city's name "
"and optionally, production."
msgstr ""
-#: client/options.c:191
+#: client/options.c:195
msgid "Show icons in the technology tree"
msgstr ""
-#: client/options.c:192
+#: client/options.c:196
msgid ""
"Setting this option will display icons on the technology tree diagram. "
"Turning this option off makes the technology tree more compact."
msgstr ""
-#: client/options.c:197
+#: client/options.c:201
msgid "Draw shield graphics for units"
msgstr ""
-#: client/options.c:198
+#: client/options.c:202
msgid ""
"Setting this option will draw a shield icon as the flags on units. If "
"unset, the full flag will be drawn."
msgstr ""
-#: client/options.c:202
+#: client/options.c:206
msgid "Manual Turn Done in AI Mode"
msgstr "Manuell runde gjort i AI modus"
-#: client/options.c:203
+#: client/options.c:207
msgid ""
"Disable this option if you do not want to press the Turn Done button "
"manually when watching an AI player."
msgstr ""
-#: client/options.c:207 client/gui-sdl/optiondlg.c:1121
+#: client/options.c:211 client/gui-sdl/optiondlg.c:1121
msgid "Auto Center on Units"
msgstr "Autosentrer på enheter"
-#: client/options.c:208
+#: client/options.c:212
msgid ""
"Set this option to have the active unit centered automatically when the unit "
"focus changes."
msgstr ""
-#: client/options.c:211 client/gui-sdl/optiondlg.c:1147
+#: client/options.c:215 client/gui-sdl/optiondlg.c:1147
msgid "Auto Center on Combat"
msgstr "Autosentrer på kamp"
-#: client/options.c:212
+#: client/options.c:216
msgid ""
"Set this option to have any combat be centered automatically. Disabled this "
"will speed up the time between turns but may cause you to miss combat "
"entirely."
msgstr ""
-#: client/options.c:217 client/gui-sdl/optiondlg.c:1174
+#: client/options.c:221 client/gui-sdl/optiondlg.c:1174
msgid "Focus on Awakened Units"
msgstr "Fokus på vekkede enheter"
-#: client/options.c:218
+#: client/options.c:222
msgid "Set this option to have newly awoken units be focused automatically."
msgstr ""
-#: client/options.c:221
+#: client/options.c:225
msgid "Allow goto into the unknown"
msgstr ""
-#: client/options.c:222
+#: client/options.c:226
msgid ""
"Setting this option will make the game consider moving into unknown tiles. "
"If not, then goto routes will detour around or be blocked by unknown tiles."
msgstr ""
-#: client/options.c:226
+#: client/options.c:230
msgid "Center map when Popup city"
msgstr "Sentrer kart ved visning av by"
-#: client/options.c:227
+#: client/options.c:231
msgid ""
"Setting this option makes the mapview center on a city when its city dialog "
"is popped up."
msgstr ""
-#: client/options.c:230
+#: client/options.c:234
msgid "Concise City Production"
msgstr "Sammenfattet byproduksjon"
-#: client/options.c:231
+#: client/options.c:235
msgid ""
"Set this option to make the city production (as shown in the city dialog) to "
"be more compact."
msgstr ""
-#: client/options.c:234 client/gui-sdl/optiondlg.c:1252
+#: client/options.c:238 client/gui-sdl/optiondlg.c:1252
msgid "End Turn when done moving"
msgstr "Avslutt runde etter flytt"
-#: client/options.c:235
+#: client/options.c:239
msgid ""
"Setting this option makes your turn end automatically when all your units "
"are done moving."
msgstr ""
-#: client/options.c:238 client/gui-sdl/optiondlg.c:1226
+#: client/options.c:242 client/gui-sdl/optiondlg.c:1226
msgid "Prompt for city names"
msgstr "Spørre etter bynavn"
-#: client/options.c:239
+#: client/options.c:243
msgid ""
"Disabling this option will make the names of newly founded cities chosen "
"automatically by the server."
msgstr ""
-#: client/options.c:242 client/gui-sdl/optiondlg.c:1200
+#: client/options.c:246 client/gui-sdl/optiondlg.c:1200
msgid "Pop up city dialog for new cities"
msgstr "Vis byvindu etter å ha grunnlagt ny by"
-#: client/options.c:243
+#: client/options.c:247
msgid ""
"Setting this option will pop up a newly-founded city's city dialog "
"automatically."
msgstr ""
-#: client/options.c:248
+#: client/options.c:250
+#, fuzzy
+msgid "Pop up caravan actions"
+msgstr "Karavane"
+
+#: client/options.c:251
+msgid ""
+"If this option is enabled, when caravans arrive at a city where they can "
+"establish a traderoute or help build a wonder, a window will popup asking "
+"which action should be performed. Disabling this option means you will have "
+"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 ""
+
+#: client/options.c:260
+msgid "Enable cursor changing"
+msgstr ""
+
+#: client/options.c:261
+msgid ""
+"This option controls whether the client should try to change the mouse "
+"cursor depending on what is being pointed at, as well as to indicate changes "
+"in the client or server state."
+msgstr ""
+
+#: client/options.c:266
+msgid "Select cities before units"
+msgstr ""
+
+#: 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 ""
+
+#: client/options.c:272
+msgid "Clear unit orders on selection"
+msgstr ""
+
+#: client/options.c:273
+msgid ""
+"Enabling this option will cause unit orders to be cleared whenever one or "
+"more units are selected. If this option is disabled, selecting units will "
+"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 ""
+
+#: client/options.c:282
msgid "Background layer"
msgstr ""
-#: client/options.c:249
+#: client/options.c:283
msgid "The background layer of the overview shows just ocean and land."
msgstr ""
-#: client/options.c:252
+#: client/options.c:286
msgid "Terrain relief map layer"
msgstr ""
-#: client/options.c:253
+#: client/options.c:287
msgid "The relief layer shows all terrains on the map."
msgstr ""
-#: client/options.c:256
+#: client/options.c:290
#, fuzzy
msgid "Borders layer"
msgstr "Grense"
-#: client/options.c:257
+#: client/options.c:291
msgid ""
"The borders layer of the overview shows which tiles are owned by each player."
msgstr ""
-#: client/options.c:261
+#: client/options.c:295
#, fuzzy
msgid "Units layer"
msgstr "Enheter"
-#: client/options.c:262
+#: client/options.c:296
#, fuzzy
msgid "Enabling this will draw units on the overview."
msgstr "Om dette er valgt styrer bynavnene etter landskapet rundt byen."
-#: client/options.c:265
+#: client/options.c:299
#, fuzzy
msgid "Cities layer"
msgstr "Byer"
-#: client/options.c:266
+#: client/options.c:300
#, fuzzy
msgid "Enabling this will draw cities on the overview."
msgstr "Om dette er valgt styrer bynavnene etter landskapet rundt byen."
-#: client/options.c:269
+#: client/options.c:303
#, fuzzy
msgid "Overview fog of war"
msgstr "Byoversikt"
-#: client/options.c:270
+#: client/options.c:304
#, fuzzy
msgid "Enabling this will show fog of war on the overview."
msgstr "Om dette er valgt styrer bynavnene etter landskapet rundt byen."
-#: client/options.c:488
+#: client/options.c:526
msgid "If you add a preset by hand, also update \"number_of_presets\""
msgstr ""
"Dersom man legget til en forhåndsvalgt verdi manuelt, skal man også "
"oppdatere \"number_of_presets\""
-#: client/options.c:516
+#: client/options.c:554
msgid "Cannot find your home directory"
msgstr "Klarer ikke finne din hjemmekatalog"
-#: client/options.c:665 client/options.c:796
+#: client/options.c:703 client/options.c:834
msgid "Save failed, cannot find a filename."
msgstr "Lagring av spillet gikk ikke, kan ikke finne et filnavn"
-#: client/options.c:678 client/options.c:859
+#: client/options.c:716 client/options.c:897
#, c-format
msgid "Save failed, cannot write to file %s"
msgstr "Lagring avbrutt; Klarer ikke skrive til fil %s"
-#: client/options.c:680 client/options.c:862
+#: client/options.c:718 client/options.c:900
#, c-format
msgid "Saved settings to file %s"
msgstr "Lagrer oppsett til filen %s"
@@ -9232,16 +9282,16 @@ msgstr "Server egenskapsstreng: %s"
msgid "Start of turn %d"
msgstr "Runden begynner %d"
-#: client/packhand.c:1590
+#: client/packhand.c:1591
#, c-format
msgid "AI Mode is now %s."
msgstr "AI modus er nå %s."
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "ON"
msgstr "PÅ"
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "OFF"
msgstr "AV"
@@ -9274,14 +9324,15 @@ msgid "Username"
msgstr "Brukernavn"
#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
-#: client/gui-gtk-2.0/pages.c:2085
+#: client/gui-gtk-2.0/pages.c:2157
msgid "Flag"
msgstr "Flagg"
#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
-#: client/gui-gtk-2.0/pages.c:1536 client/gui-gtk-2.0/pages.c:2087
-#: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
-#: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
+#: 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/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr "Nasjon"
@@ -9293,7 +9344,7 @@ msgstr "Grense"
msgid "Score"
msgstr "Poengsum"
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
msgid "Team"
msgstr "Lag"
@@ -9365,286 +9416,309 @@ msgstr "Ingen %s kan oppl
msgid "Could not open temp file."
msgstr "Klarte ikke å åpne \"%s\"."
-#: client/servers.c:407
+#: client/servers.c:410
msgid "Invalid $http_proxy or metaserver value, must start with 'http://'"
msgstr ""
"Ugyldig $http_proxy verdi eller metaserver verdi, må starte med 'http://'"
-#: client/servers.c:413
+#: client/servers.c:416
#, fuzzy
msgid "Failed looking up metaserver's host"
msgstr "Feilet i forsøk på å finne server"
-#: client/text.c:85 client/text.c:86 client/text.c:91
+#. TRANS: "AI <player name>"
+#: client/text.c:94
+#, c-format
+msgid "AI %s"
+msgstr ""
+
+# problem
+#. TRANS: "<nation adjective>, team <team name>"
+#: client/text.c:118
+#, fuzzy, c-format
+msgid "%s, team %s"
+msgstr " nær %s"
+
+#: client/text.c:135 client/text.c:136 client/text.c:141
#: client/gui-sdl/mapview.c:752
msgid "?nation:Neutral"
msgstr "?nasjon:Nøytral"
-#: client/text.c:85 client/gui-sdl/mapview.c:752
+#: client/text.c:135 client/gui-sdl/mapview.c:752
msgid "?nation:Hostile"
msgstr "?nasjon:Fiendtlig"
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Peaceful"
msgstr "?nasjon:Fredlig"
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Friendly"
msgstr "?nasjon:Vennlig"
-#: client/text.c:88 client/gui-sdl/mapview.c:755
+#: client/text.c:138 client/gui-sdl/mapview.c:755
msgid "?nation:Mysterious"
msgstr "?nasjon:Mystisk"
-#: client/text.c:88
+#: client/text.c:138
msgid "?nation:Friendly(team)"
msgstr "Vennlig(lag)"
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
msgid "?city:Neutral"
msgstr "?city:Nøytral"
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
msgid "?city:Hostile"
msgstr "?city:Fiendtlig"
-#: client/text.c:92 client/gui-sdl/mapview.c:786
+#: client/text.c:142 client/gui-sdl/mapview.c:786
msgid "?city:Peaceful"
msgstr "?city:Fredlig"
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Friendly"
msgstr "?city:Vennlig"
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Mysterious"
msgstr "?by:Mystisk"
-#: client/text.c:93
+#: client/text.c:143
msgid "?city:Friendly(team)"
msgstr "Vennlig(lag)"
-#: client/text.c:100
+#: client/text.c:151
#, c-format
msgid "Location: (%d, %d) [%d]"
msgstr "Posisjon: (%d, %d) [%d]"
-#: client/text.c:109
+#: client/text.c:153
+#, c-format
+msgid "Native coordinates: (%d, %d)"
+msgstr ""
+
+#: client/text.c:160
#, c-format
msgid "Terrain: %s"
msgstr "Terreng: %s"
-#: client/text.c:110
+#: client/text.c:161
#, c-format
msgid "Food/Prod/Trade: %s"
msgstr "Mat/Prod/Handel: %s"
-#: client/text.c:113
+#: client/text.c:164
msgid "Minor Tribe Village"
msgstr "Mindre stammelandsbyer"
-#: client/text.c:119
+#: client/text.c:173
#, fuzzy
msgid "Our territory"
msgstr "Vårt territorie"
-#. TRANS: "Polish territory"
-#: client/text.c:122
+#. TRANS: "Territory of <username> (<nation + team>)"
+#: client/text.c:176
#, fuzzy, c-format
-msgid "%s territory"
-msgstr "Territoriet til %s"
+msgid "Territory of %s (%s)"
+msgstr "Territoriet til %s %s"
-#. TRANS: "Polish territory (5 turn cease-fire)"
-#: client/text.c:131
+#: client/text.c:186
#, fuzzy, c-format
-msgid "%s territory (%d turn cease-fire)"
-msgid_plural "%s territory (%d turn cease-fire)"
-msgstr[0] "%s territorie (%d runde våpenhvile)"
-msgstr[1] "%s territorie (%d runde våpenhvile)"
+msgid "Territory of %s (%s) (%d turn cease-fire)"
+msgid_plural "Territory of %s (%s) (%d turn cease-fire)"
+msgstr[0] "By: %s (%s, %d runde våpenhvile)"
+msgstr[1] "By: %s (%s, %d runde våpenhvile)"
-#. TRANS: "Polish territory (friendly)"
-#: client/text.c:140
+#. TRANS: "Territory of <username>
+#. * (<nation + team> | <diplomatic state>)"
+#: client/text.c:195
#, fuzzy, c-format
-msgid "%s territory (%s)"
+msgid "Territory of %s (%s | %s)"
msgstr "Territoriet til %s %s"
-#: client/text.c:145
+#: client/text.c:200
msgid "Unclaimed territory"
msgstr "Uerobret territorie"
-#. TRANS: "City: Warsaw (Polish)"
-#: client/text.c:156
-#, c-format
-msgid "City: %s (%s)"
-msgstr "By: %s (%s)"
+#. TRANS: "City: <city name> | <username> (<nation + team>)"
+#: client/text.c:214
+#, fuzzy, c-format
+msgid "City: %s | %s (%s)"
+msgstr "By: %s(%s,%s)"
-#. TRANS: "City: Warsaw (Polish, 5 turn cease-fire)"
-#: client/text.c:166
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <number> turn cease-fire)"
+#: client/text.c:224
#, fuzzy, c-format
-msgid "City: %s (%s, %d turn cease-fire)"
-msgid_plural "City: %s (%s, %d turn cease-fire)"
+msgid "City: %s | %s (%s, %d turn cease-fire)"
+msgid_plural "City: %s | %s (%s, %d turn cease-fire)"
msgstr[0] "By: %s (%s, %d runde våpenhvile)"
msgstr[1] "By: %s (%s, %d runde våpenhvile)"
-#. TRANS: "City: Warsaw (Polish,friendly)"
-#: client/text.c:174
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <diplomatic state>)"
+#: client/text.c:231
#, fuzzy, c-format
-msgid "City: %s (%s, %s)"
+msgid "City: %s | %s (%s, %s)"
msgstr "By: %s(%s,%s)"
#. TRANS: previous lines gave other information about the city.
-#: client/text.c:189
+#: client/text.c:246
#, fuzzy, c-format
msgid "?clistbegin: with %s"
msgstr " med %s"
#. TRANS: "Trade from Warsaw: 5"
-#: client/text.c:202
+#: client/text.c:259
#, c-format
msgid "Trade from %s: %d"
msgstr "Handel fra %s: %d"
-#: client/text.c:210
+#: client/text.c:267
#, c-format
msgid "Infrastructure: %s"
msgstr "Infrastruktur: %s"
-#: client/text.c:215
+#: client/text.c:272
#, c-format
msgid "Activity: %s"
msgstr "Aktivitet: %s"
-#. TRANS: "Unit: Musketeers (Polish, Warsaw)"
-#. TRANS: "Unit: Musketeers (Polish,friendly)"
-#: client/text.c:226 client/text.c:253
+#. TRANS: "Unit: <unit type> | <username>
+#. * (<nation + team>, <homecity>)"
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <diplomatic state>)"
+#: client/text.c:287 client/text.c:313
#, fuzzy, c-format
-msgid "Unit: %s (%s, %s)"
+msgid "Unit: %s | %s (%s, %s)"
msgstr "Enhet: %s (%s,%s)"
-#. TRANS: "Unit: Musketeers (Polish)"
-#: client/text.c:232
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>)"
+#: client/text.c:292
#, fuzzy, c-format
-msgid "Unit: %s (%s)"
-msgstr "Enhet: %s (%s)"
+msgid "Unit: %s | %s (%s)"
+msgstr "Enhet: %s (%s,%s)"
-#. TRANS: "Unit: Musketeers (Polish, 5 turn cease-fire)"
-#: client/text.c:245
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <number> turn cease-fire)"
+#: client/text.c:305
#, fuzzy, c-format
-msgid "Unit: %s (%s, %d turn cease-fire)"
-msgid_plural "Unit: %s (%s, %d turn cease-fire)"
+msgid "Unit: %s | %s (%s, %d turn cease-fire)"
+msgid_plural "Unit: %s | %s (%s, %d turn cease-fire)"
msgstr[0] "Enhet: %s (%s, %d runde våpenhvile)"
msgstr[1] "Enhet: %s (%s, %d runder våpenhvile)"
#. TRANS: "Chance to win: A:95% D:46%"
-#: client/text.c:279
+#: client/text.c:338
#, c-format
msgid "Chance to win: A:%d%% D:%d%%"
msgstr "Sjanse for seier: A:%d%% F:%d%%"
#. TRANS: A is attack power, D is defense power, FP is firepower,
#. * HP is hitpoints (current and max).
-#: client/text.c:286
+#: client/text.c:345
#, fuzzy, c-format
msgid "A:%d D:%d FP:%d HP:%d/%d (%s)"
msgstr "A:%d F:%d Ik:%d Tp:%d/%d%s"
#. TRANS: "5 more" units on this tile
-#: client/text.c:295
+#: client/text.c:354
#, c-format
msgid " (%d more)"
msgstr " (%d flere)"
# problem
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:364
+#: client/text.c:423
#, c-format
msgid "far from %s"
msgstr "langt fra %s"
# problem
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:367
+#: client/text.c:426
#, c-format
msgid "near %s"
msgstr "nær %s"
# problem
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:370
+#: client/text.c:429
#, c-format
msgid "in %s"
msgstr "i %s"
# problem
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:403
+#: client/text.c:462
#, c-format
msgid "from %s"
msgstr "fra %s"
-#: client/text.c:466
+#: client/text.c:525
msgid "Progress: no research"
msgstr "Fremgang: Ingen forskning"
-#: client/text.c:470
+#: client/text.c:529
#, fuzzy
msgid "Progress: no research target"
msgstr "Fremgang: Ingen forskning"
-#: client/text.c:475
+#: client/text.c:534
#, fuzzy, c-format
msgid "Progress: %d turn/advance"
msgid_plural "Progress: %d turns/advance"
msgstr[0] "Fremgang: %d runde/fremskritt (%d poeng/runde)"
msgstr[1] "Fremgang: %d runder/fremskritt (%d poeng/runde)"
-#: client/text.c:480
+#: client/text.c:539
#, fuzzy, c-format
msgid "%d bulb/turn"
msgid_plural "%d bulbs/turn"
msgstr[0] "%d runder"
msgstr[1] "%d runder"
-#: client/text.c:485
+#: client/text.c:544
#, c-format
msgid ", %d bulb/turn from team"
msgid_plural ", %d bulbs/turn from team"
msgstr[0] ""
msgstr[1] ""
-#: client/text.c:512
+#: client/text.c:571
#, fuzzy, c-format
msgid "%d/- (never)"
msgstr "(Aldri)"
-#: client/text.c:524
+#: client/text.c:583
#, fuzzy, c-format
msgid "%d/%d (%d turn)"
msgid_plural "%d/%d (%d turns)"
msgstr[0] "%d/%d %d runder"
msgstr[1] "%d/%d %d runder"
-#: client/text.c:527
+#: client/text.c:586
#, fuzzy, c-format
msgid "%d/%d (never)"
msgstr "(Aldri)"
# c-format
-#: client/text.c:564
+#: client/text.c:623
#, fuzzy, c-format
msgid "%d step"
msgid_plural "%d steps"
msgstr[0] "(%d steg)"
msgstr[1] "(%d steg)"
-#: client/text.c:566
+#: client/text.c:625
#, c-format
msgid "%d bulb"
msgid_plural "%d bulbs"
msgstr[0] ""
msgstr[1] ""
-#: client/text.c:570 client/agents/cma_fec.c:269 client/agents/cma_fec.c:313
+#: 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
#, c-format
msgid "%d turn"
@@ -9652,91 +9726,91 @@ msgid_plural "%d turns"
msgstr[0] "%d runder"
msgstr[1] "%d runder"
-#: client/text.c:592
+#: client/text.c:651
#, c-format
msgid "Population: %s"
msgstr "Befolkning: %s"
-#: client/text.c:595
+#: client/text.c:654
#, fuzzy, c-format
msgid "Year: %s (T%d)"
msgstr "År: %s"
-#: client/text.c:598
+#: client/text.c:657
#, fuzzy, c-format
msgid "Gold: %d (%+d)"
msgstr "Gull: %d"
-#: client/text.c:600
+#: client/text.c:659
#, c-format
msgid "Tax: %d Lux: %d Sci: %d"
msgstr "Skatt:%d Luksus:%d Fors:%d"
# problem
-#: client/text.c:607
+#: client/text.c:666
#, fuzzy
msgid "Moving: Nobody"
msgstr "i %s"
# problem
-#: client/text.c:609
+#: client/text.c:668
#, fuzzy, c-format
msgid "Moving: %s"
msgstr "i %s"
-#: client/text.c:613
+#: client/text.c:672
msgid "(Click for more info)"
msgstr ""
-#: client/text.c:629
+#: client/text.c:688
#, fuzzy, c-format
msgid "%s People"
msgstr "%s Velkommen"
-#: client/text.c:633
+#: client/text.c:692
#, fuzzy, c-format
msgid "Turn: %d"
msgstr "Terreng: %s"
-#: client/text.c:635 client/gui-win32/inteldlg.c:111
+#: client/text.c:694 client/gui-win32/inteldlg.c:111
#: client/gui-xaw/inteldlg.c:208
#, c-format
msgid "Gold: %d"
msgstr "Gull: %d"
-#: client/text.c:636
+#: client/text.c:695
#, c-format
msgid "Net Income: %d"
msgstr ""
#. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:639
+#: client/text.c:698
#, fuzzy, c-format
msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
msgstr "Skatt:%d Luksus:%d Fors:%d"
-#: client/text.c:643
+#: client/text.c:702
#, fuzzy, c-format
msgid "Researching %s: %s"
msgstr "Forsker på %s: %d/%d"
-#: client/text.c:650
+#: client/text.c:709
#, c-format
msgid "Global warming chance: %d%% (%+d%%/turn)"
msgstr ""
-#: client/text.c:653
+#: client/text.c:712
#, c-format
msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
msgstr ""
-#: client/text.c:658 client/gui-win32/inteldlg.c:104
+#: client/text.c:717 client/gui-win32/inteldlg.c:104
#: client/gui-xaw/inteldlg.c:200
#, c-format
msgid "Government: %s"
msgstr "Styreform: %s"
-#: client/text.c:682
+#: client/text.c:741
#, fuzzy, c-format
msgid "%d unit"
msgid_plural "%d units"
@@ -9744,58 +9818,58 @@ msgstr[0] " enhet"
msgstr[1] " enhet"
#. TRANS: Impossible to reach goto target tile
-#: client/text.c:715 client/gui-sdl/mapview.c:566
+#: client/text.c:774 client/gui-sdl/mapview.c:566
msgid "?goto:Unreachable"
msgstr ""
-#: client/text.c:717 client/gui-sdl/mapview.c:568
+#: client/text.c:776 client/gui-sdl/mapview.c:568
#, c-format
msgid "Turns to target: %d"
msgstr "Runder til mål: %d"
-#: client/text.c:719 client/gui-sdl/mapview.c:570
+#: client/text.c:778 client/gui-sdl/mapview.c:570
#, fuzzy, c-format
msgid "Turns to target: %d to %d"
msgstr "Runder til mål: %d"
-#: client/text.c:725 client/gui-sdl/mapview.c:576
+#: client/text.c:784 client/gui-sdl/mapview.c:576
#, fuzzy, c-format
msgid "%d unit selected"
msgid_plural "%d units selected"
msgstr[0] "Valg av enheter"
msgstr[1] "Valg av enheter"
-#: client/text.c:730 client/gui-sdl/mapview.c:581
+#: client/text.c:789 client/gui-sdl/mapview.c:581
#, fuzzy
msgid "No units selected."
msgstr "Nasjon valgt"
-#: client/text.c:804 client/gui-sdl/mapview.c:654
+#: client/text.c:863 client/gui-sdl/mapview.c:654
#, c-format
msgid "Others: %d civil; %d military"
msgstr ""
-#: client/text.c:806 client/gui-sdl/mapview.c:656
+#: client/text.c:865 client/gui-sdl/mapview.c:656
#, c-format
msgid "Others: %d civilian"
msgstr ""
-#: client/text.c:808 client/gui-sdl/mapview.c:658
+#: client/text.c:867 client/gui-sdl/mapview.c:658
#, c-format
msgid "Others: %d military"
msgstr ""
-#: client/text.c:839
+#: client/text.c:898
#, fuzzy
msgid "No units to upgrade!"
msgstr "Ingen enheter kunne oppgraderes."
-#: client/text.c:864
+#: client/text.c:923
#, fuzzy
msgid "None of these units may be upgraded."
msgstr "Ingen enheter kunne oppgraderes."
-#: client/text.c:870
+#: client/text.c:929
#, fuzzy, c-format
msgid ""
"Upgrade %d unit for %d gold?\n"
@@ -9810,14 +9884,14 @@ msgstr[1] ""
"Oppgrader %s til %s for %d gull?\n"
"Skattkammeret har %d gull."
-#: client/text.c:891
+#: client/text.c:950
#, fuzzy
msgid "Shows your progress in researching the current technology."
msgstr ""
"Viser fremgangen på det nåværende forskningsprosjektet.\n"
"%s: %d/%d."
-#: client/text.c:897
+#: client/text.c:956
#, fuzzy
msgid "no research target."
msgstr ""
@@ -9825,46 +9899,46 @@ msgstr ""
"(ingen forskning)"
#. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:900
+#: client/text.c:959
#, c-format
msgid "%s: %d/%d."
msgstr ""
-#: client/text.c:920
+#: client/text.c:979
#, fuzzy
msgid "Shows the progress of global warming:"
msgstr ""
"Viser endringen i global oppvarming:\n"
"%d."
-#: client/text.c:921
+#: client/text.c:980
#, fuzzy, c-format
msgid "Pollution rate: %d%%"
msgstr "Forurensning: %3d"
-#: client/text.c:923
+#: client/text.c:982
#, c-format
msgid "Chance of catastrophic warming each turn: %d%%"
msgstr ""
-#: client/text.c:939
+#: client/text.c:998
#, fuzzy
msgid "Shows the progress of nuclear winter:"
msgstr ""
"Viser endringen i atomvinter:\n"
"%d."
-#: client/text.c:940
+#: client/text.c:999
#, fuzzy, c-format
msgid "Fallout rate: %d%%"
msgstr "%s maks nivå: %d%%"
-#: client/text.c:942
+#: client/text.c:1001
#, c-format
msgid "Chance of catastrophic winter each turn: %d%%"
msgstr ""
-#: client/text.c:957
+#: client/text.c:1016
#, fuzzy
msgid "Shows your current government:"
msgstr ""
@@ -9872,25 +9946,25 @@ msgstr ""
"%s."
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:981
+#: client/text.c:1040
#, c-format
msgid "Population: %5d"
msgstr "Befolkning: %5d"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:1043
#, c-format
msgid "Support: %5d %%"
msgstr "Støtte: %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:1047
#, c-format
msgid "Energy: %5d %%"
msgstr "Energi: %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:992
+#: client/text.c:1051
#, c-format
msgid "Mass: %5d ton"
msgid_plural "Mass: %5d tons"
@@ -9898,96 +9972,97 @@ msgstr[0] "Masse: %5d tonn"
msgstr[1] "Masse: %5d tonn"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1057
#, c-format
msgid "Travel time: %5.1f years"
msgstr "Reisetid: %5.1f år"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1061
msgid "Travel time: N/A "
msgstr "Reisetid: N/A "
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1065
#, c-format
msgid "Success prob.: %5d %%"
msgstr "Suksess sanns.: %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1010
+#: client/text.c:1069
#, c-format
msgid "Year of arrival: %8s"
msgstr "Ankomstår: %8s"
-#: client/text.c:1030
+#: client/text.c:1089
msgid "?timeout:off"
msgstr "?timeout:av"
-#: client/text.c:1054
+#: client/text.c:1113
#, c-format
msgid "?seconds:%02ds"
msgstr "?seconds:%02ds"
-#: client/text.c:1056
+#: client/text.c:1115
#, c-format
msgid "?mins/secs:%02dm %02ds"
msgstr "?mins/secs:%02dm %02ds"
-#: client/text.c:1058
+#: client/text.c:1117
#, c-format
msgid "?hrs/mns:%02dh %02dm"
msgstr "?hrs/mns:%02dt %02dm"
-#: client/text.c:1060
+#: client/text.c:1119
#, c-format
msgid "?dys/hrs:%02dd %02dh"
msgstr "?dys/hrs:%02dd %02dt"
-#: client/text.c:1063
+#: client/text.c:1122
msgid "?duration:overflow"
msgstr "?duration:overflod"
-#: client/text.c:1084
+#: client/text.c:1143
#, c-format
msgid "%6d.%02d ms"
msgstr "%6d.%02d ms"
-#. TRANS: "Republic of the Poles"
-#: client/text.c:1127
-#, c-format
-msgid "%s of the %s"
-msgstr "Styresett: %s Nasjon: %s"
+#. TRANS: <nation adjective> <government name>.
+#. * E.g. "Polish Republic".
+#: client/text.c:1188
+#, fuzzy, c-format
+msgid "?nationgovernment:%s %s"
+msgstr "Styreform: %s"
#. TRANS: "Observer: 1985"
-#: client/text.c:1137
+#: client/text.c:1198
#, fuzzy, c-format
msgid "Observer: %s"
msgstr "Observatør"
-#: client/text.c:1155
+#: client/text.c:1216
msgid "Buildings: "
msgstr "Bygninger:"
-#: client/text.c:1172 client/text.c:1211
+#: client/text.c:1233 client/text.c:1272
msgid "None. "
msgstr "Ingen. "
-#: client/text.c:1174 client/text.c:1213
+#: client/text.c:1235 client/text.c:1274
msgid "?clistend:."
msgstr "."
-#: client/text.c:1192
+#: client/text.c:1253
msgid "Wonders: "
msgstr "Underverk: "
-#: client/text.c:1247
+#: client/text.c:1308
#, 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:1251
+#: client/text.c:1312
#, fuzzy, c-format
msgid "%d content before penalty."
msgid_plural "%d content before penalty."
@@ -9995,45 +10070,45 @@ msgstr[0] "%d forn
msgstr[1] "%d fornøyd før straff med "
#. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1257
+#: client/text.c:1318
#, fuzzy, c-format
msgid "%d additional unhappy citizen."
msgid_plural "%d additional unhappy citizens."
msgstr[0] "%d ulykkelige innbyggere."
msgstr[1] "%d ulykkelige innbyggere."
-#. TRANS: Martial law opening parenthesis
-#: client/text.c:1279
-msgid "Martial law in effect ("
+#: client/text.c:1339
+#, fuzzy
+msgid "Unlimited martial law in effect."
msgstr "Unntakstilstand ("
-#. TRANS: no [unit] maximum
-#: client/text.c:1284
-msgid "no maximum, "
-msgstr "ingen maksimum, "
-
-#: client/text.c:1287
-#, c-format
-msgid "%d unit maximum, "
-msgid_plural "%d units maximum, "
-msgstr[0] "%d enhet maksimalt, "
-msgstr[1] "%d enhet maksimalt, "
+#: client/text.c:1341
+#, fuzzy, c-format
+msgid "%d military unit may impose martial law."
+msgid_plural "Up to %d military units may impose martial law."
+msgstr[0] ""
+"* En ikke-militær enhet (kan ikke angripe; ingen unntakstilstand).\n"
+msgstr[1] ""
+"* En ikke-militær enhet (kan ikke angripe; ingen unntakstilstand).\n"
-#. TRANS: Martial law closing parenthesis
-#: client/text.c:1294
-#, c-format
-msgid "%d per unit). "
-msgstr "%d per enhet)."
+#: client/text.c:1345
+#, fuzzy, c-format
+msgid "Each military unit makes %d unhappy citizen content."
+msgid_plural "Each military unit makes %d unhappy citizens content."
+msgstr[0] ""
+"Underholder borgerne i en by, ved å gjøre 3 ulykkelige borgere fornøyd."
+msgstr[1] ""
+"Underholder borgerne i en by, ved å gjøre 3 ulykkelige borgere fornøyd."
-#: client/text.c:1298
+#: client/text.c:1352
msgid "Military units in the field may cause unhappiness. "
msgstr "Militære enheter i felten kan føre til ulykkelighet. "
-#: client/text.c:1301
+#: client/text.c:1355
msgid "Military units have no happiness effect. "
msgstr "Militære enheter har ingen innvirkning på lykkeligheten."
-#: client/text.c:1316
+#: client/text.c:1370
#, c-format
msgid "Luxury: %d total."
msgstr "Luksus: %d totalt"
@@ -10057,7 +10132,7 @@ msgstr ""
"Klienten støtter ikke grafikkoppsett sett ovenfra. Benytter standard grafikk "
"i stedet."
-#: client/tilespec.c:3968
+#: client/tilespec.c:3966
#, fuzzy, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
@@ -10082,12 +10157,12 @@ msgid ""
"have a look."
msgstr ""
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
-#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:599
+#: client/gui-gtk-2.0/cityrep.c:624 client/gui-sdl/citydlg.c:2009
msgid "none"
msgstr "ingen"
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:645
msgid "custom"
msgstr "egendefinert"
@@ -10397,7 +10472,7 @@ msgstr "Etabler handelsru_te"
msgid "Enter Marketplace"
msgstr "besøk markedsplass"
-#: client/gui-gtk-2.0/chatline.c:144 client/gui-win32/chatline.c:134
+#: client/gui-gtk-2.0/chatline.c:218 client/gui-win32/chatline.c:134
#: client/gui-xaw/chatline.c:120
msgid "Cleared output window."
msgstr "Renset utskriftsvindu."
@@ -10478,11 +10553,11 @@ msgid "%d/%d %d turns"
msgstr "%d/%d %d runder"
#: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:821
+#: client/gui-gtk-2.0/cityrep.c:1027
msgid "_Buy"
msgstr "_Kjøp"
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:869
#, fuzzy
msgid "_Production"
msgstr "_Produksjon"
@@ -10505,12 +10580,12 @@ msgid "Entertainers"
msgstr "Underholdere"
#: client/gui-gtk-2.0/citydlg.c:1029 client/gui-win32/citydlg.c:1989
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2403
msgid "Scientists"
msgstr "Forskere"
#: client/gui-gtk-2.0/citydlg.c:1030 client/gui-win32/citydlg.c:1991
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2404
msgid "Taxmen"
msgstr "Skattefuter"
@@ -10605,7 +10680,7 @@ msgstr "St
msgid "Present units %d"
msgstr "Enheter tilstede %d"
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:1019
msgid "Cen_ter"
msgstr "Sen_trer"
@@ -10694,32 +10769,62 @@ msgstr "Omd
msgid "What should we rename the city to?"
msgstr "Hva skal vi omdøpe byen til?"
-#: client/gui-gtk-2.0/cityrep.c:699
+#: client/gui-gtk-2.0/cityrep.c:794
+#, fuzzy
+msgid "(no worklists defined)"
+msgstr "(arbeidsliste)"
+
+#: client/gui-gtk-2.0/cityrep.c:876
msgid "Chan_ge"
msgstr "_Endre"
-#: client/gui-gtk-2.0/cityrep.c:703
+#: client/gui-gtk-2.0/cityrep.c:880
msgid "Add _First"
msgstr "_Legg til forhåndsvalg"
-#: client/gui-gtk-2.0/cityrep.c:707
+#: client/gui-gtk-2.0/cityrep.c:884
msgid "Add _Next"
msgstr "_Legg til forhåndsvalg"
-#: client/gui-gtk-2.0/cityrep.c:711
+#: client/gui-gtk-2.0/cityrep.c:888
+#, fuzzy
+msgid "Add _2nd Last"
+msgstr "_Legg til forhåndsvalg"
+
+#: client/gui-gtk-2.0/cityrep.c:892
msgid "Add _Last"
msgstr "_Legg til forhåndsvalg"
-#: client/gui-gtk-2.0/cityrep.c:715
+#: client/gui-gtk-2.0/cityrep.c:899
+#, fuzzy
+msgid "Set Worklist"
+msgstr "Arbeidsliste"
+
+#: client/gui-gtk-2.0/cityrep.c:905
+#, fuzzy
+msgid "Append Worklist"
+msgstr "Omdøp arbeidsliste"
+
+#: client/gui-gtk-2.0/cityrep.c:911
+#, fuzzy
+msgid "Clear _Worklist"
+msgstr "_Mål arbeidsliste:"
+
+#: client/gui-gtk-2.0/cityrep.c:916
+#, fuzzy
+msgid "Gover_nor"
+msgstr "Sysselmann"
+
+#: client/gui-gtk-2.0/cityrep.c:921
msgid "_Select"
msgstr "_Velg"
-#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
+#: client/gui-gtk-2.0/cityrep.c:925 client/gui-gtk-2.0/plrdlg.c:521
#, fuzzy
msgid "_Display"
msgstr "V_is"
-#: client/gui-gtk-2.0/cityrep.c:800 client/gui-gtk-2.0/menu.c:808
+#: 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-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
#: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -10729,101 +10834,101 @@ msgstr "V_is"
msgid "Cities"
msgstr "Byer"
-#: client/gui-gtk-2.0/cityrep.c:817
+#: client/gui-gtk-2.0/cityrep.c:1023
#, fuzzy
msgid "_Inspect"
msgstr "Vis _By"
-#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
-#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-sdl/helpdlg.c:297 client/gui-win32/menu.c:342
-#: client/gui-xaw/menu.c:241
+#: 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
+#: client/gui-gtk-2.0/cityrep.c:1518 client/gui-gtk-2.0/menu.c:823
+#: client/gui-gtk-2.0/menu.c:825 client/gui-gtk-2.0/menu.c:827
+#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:831
+#: client/gui-gtk-2.0/menu.c:833 client/gui-sdl/helpdlg.c:297
+#: client/gui-win32/menu.c:342 client/gui-xaw/menu.c:241
msgid "Improvements"
msgstr "Forbedringer"
-#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
-#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
-#: client/gui-xaw/menu.c:247
+#: client/gui-gtk-2.0/cityrep.c:1441 client/gui-gtk-2.0/cityrep.c:1460
+#: client/gui-gtk-2.0/cityrep.c:1479 client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1522 client/gui-xaw/menu.c:247
msgid "Wonders"
msgstr "Underverk"
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1662 client/gui-win32/cityrep.c:439
#: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
msgid "All Cities"
msgstr "Alle byer"
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1667 client/gui-win32/cityrep.c:440
msgid "No Cities"
msgstr "Ingen byer"
-#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1672 client/gui-win32/cityrep.c:441
msgid "Invert Selection"
msgstr "Snu valg"
-#: client/gui-gtk-2.0/cityrep.c:1420
+#: client/gui-gtk-2.0/cityrep.c:1682
msgid "Building Units"
msgstr "Bygger enheter"
-#: client/gui-gtk-2.0/cityrep.c:1426
+#: client/gui-gtk-2.0/cityrep.c:1688
msgid "Building Improvements"
msgstr "Bygger byforbedringer"
-#: client/gui-gtk-2.0/cityrep.c:1432
+#: client/gui-gtk-2.0/cityrep.c:1694
msgid "Building Wonders"
msgstr "Bygger underverk"
-#: client/gui-gtk-2.0/cityrep.c:1444
+#: client/gui-gtk-2.0/cityrep.c:1706
msgid "Building Unit"
msgstr "Bygger enhet"
-#: client/gui-gtk-2.0/cityrep.c:1448
+#: client/gui-gtk-2.0/cityrep.c:1710
msgid "Building Improvement"
msgstr "Bygger byforbedring"
-#: client/gui-gtk-2.0/cityrep.c:1452
+#: client/gui-gtk-2.0/cityrep.c:1714
msgid "Building Wonder"
msgstr "Bygger underverk"
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1722 client/gui-win32/cityrep.c:443
msgid "Coastal Cities"
msgstr "Byer ved kysten"
-#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1727 client/gui-win32/cityrep.c:444
msgid "Same Island"
msgstr "Samme øy"
-#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1737 client/gui-win32/cityrep.c:447
msgid "Supported Units"
msgstr "Støttede enheter"
-#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1740 client/gui-win32/cityrep.c:454
msgid "Units Present"
msgstr "Enheter tilstede"
-#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1744 client/gui-win32/cityrep.c:469
msgid "Improvements in City"
msgstr "Forbedringer i by"
-#: client/gui-gtk-2.0/cityrep.c:1486
+#: client/gui-gtk-2.0/cityrep.c:1748
msgid "Wonders in City"
msgstr "Underverk i byen"
-#: client/gui-gtk-2.0/cityrep.c:1495
+#: client/gui-gtk-2.0/cityrep.c:1757
msgid "Available Units"
msgstr "Tilgjengelige enheter"
-#: client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1760
msgid "Available Improvements"
msgstr "Tilgjengelige Forbedringer"
-#: client/gui-gtk-2.0/cityrep.c:1501
+#: client/gui-gtk-2.0/cityrep.c:1763
msgid "Available Wonders"
msgstr "Tilgjengelige underverker"
-#: client/gui-gtk-2.0/cityrep.c:1625
+#: client/gui-gtk-2.0/cityrep.c:1882
#, fuzzy, c-format
msgid "Total Buy Cost: %d"
msgstr "Total kostnad:"
@@ -10896,12 +11001,12 @@ 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:186
+#: client/gui-gtk-2.0/dialogs.c:196 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:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
#, fuzzy
msgid "Inspect _City"
msgstr "_Vis by"
@@ -10930,10 +11035,10 @@ msgstr "Velg hva som skal plyndres:"
msgid "Unit"
msgstr "Enhet"
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
-#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
-#: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
-#: manual/civmanual.c:302 data/Freeciv.in:80
+#: 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-win32/plrdlg.c:335 manual/civmanual.c:302 data/Freeciv.in:80
msgid "Name"
msgstr "Navn"
@@ -10959,7 +11064,7 @@ 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:1036 data/Freeciv.in:3371
+#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
#, fuzzy
msgid "Pick Nation"
msgstr "Politistasjon"
@@ -11042,7 +11147,7 @@ msgstr "_Kart"
msgid "_Advances"
msgstr "_Fremskritt"
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:910
+#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr "_Byer"
@@ -11147,108 +11252,178 @@ msgstr "Velg destinasjon"
msgid "Show _All Cities"
msgstr "Vis _alle byer"
-#: client/gui-gtk-2.0/gui_main.c:150
+#: client/gui-gtk-2.0/gui_main.c:162
msgid "Show Map Scrollbars"
msgstr "Vis scrollbar på kart"
-#: client/gui-gtk-2.0/gui_main.c:151
+#: client/gui-gtk-2.0/gui_main.c:163
msgid "Disable this option to hide the scrollbars on the map view."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:155
+#: client/gui-gtk-2.0/gui_main.c:167
msgid "Keyboardless goto"
msgstr "Tastaturløs gå-til"
-#: client/gui-gtk-2.0/gui_main.c:156
+#: client/gui-gtk-2.0/gui_main.c:168
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:161
+#: client/gui-gtk-2.0/gui_main.c:173
msgid "Keep dialogs on top"
msgstr "Hold dialoger øverst"
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:174
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:166
+#: client/gui-gtk-2.0/gui_main.c:178
msgid "Show worklist task icons"
msgstr "Vis arbeidsliste ikoner"
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:179
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:171
+#: client/gui-gtk-2.0/gui_main.c:183
msgid "Enable status report tabs"
msgstr "Gjør statusrapportark tilgjengelig"
-#: client/gui-gtk-2.0/gui_main.c:172
+#: client/gui-gtk-2.0/gui_main.c:184
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:177 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:189 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:178 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:190 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:277 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:195
+msgid "Show time for each chat message"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:196
+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
+msgid "Split bottom notebook area"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:202
+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
+msgid "New message events go to top of list"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:208
+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
+msgid "Show extra message window buttons"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:214
+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 "
+"is disabled, these buttons will not appear (you can still double-click with "
+"the left mouse button or right-click on a row to inspect or goto "
+"respectively). This option will only take effect once the message window is "
+"closed and reopened."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:224
+#, fuzzy
+msgid "Metaserver tab first in network page"
+msgstr "Metaserver emne-streng satt til '%s'."
+
+#: client/gui-gtk-2.0/gui_main.c:225
+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
+msgid "Plain chat messages are sent to allies only"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:231
+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 "
+"messages will be sent as public chat messages. To send a public chat message "
+"with this option enabled, prefix the message with a single colon ':'. This "
+"option can also be set using a toggle button beside the chat entry (only "
+"visible in multiplayer games)."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:340 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:723 client/gui-gtk-2.0/gui_main.c:1345
+#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
msgid "Freeciv"
msgstr "Freeciv"
-#: client/gui-gtk-2.0/gui_main.c:1088 client/gui-gtk-2.0/gui_main.c:1095
+#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
#: 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:1095 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1232 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:1127 client/gui-gtk-2.0/menu.c:770
-#: client/gui-gtk-2.0/menu.c:772 client/gui-gtk-2.0/menu.c:774
-#: client/gui-gtk-2.0/menu.c:776 client/gui-gtk-2.0/menu.c:778
-#: client/gui-gtk-2.0/menu.c:780 client/gui-gtk-2.0/menu.c:782
-#: client/gui-gtk-2.0/menu.c:784 client/gui-gtk-2.0/menu.c:786
-#: client/gui-gtk-2.0/menu.c:788 client/gui-gtk-2.0/menu.c:790
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-gtk-2.0/menu.c:804 client/gui-gtk-2.0/menu.c:806
-#: client/gui-gtk-2.0/menu.c:808 client/gui-gtk-2.0/menu.c:810
-#: client/gui-gtk-2.0/menu.c:812 client/gui-gtk-2.0/menu.c:814
-#: client/gui-gtk-2.0/menu.c:816 client/gui-gtk-2.0/menu.c:818
-#: client/gui-gtk-2.0/menu.c:820 client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/gui_main.c:1266 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
+#: client/gui-gtk-2.0/menu.c:811 client/gui-gtk-2.0/menu.c:813
+#: client/gui-gtk-2.0/menu.c:815 client/gui-gtk-2.0/menu.c:817
+#: client/gui-gtk-2.0/menu.c:819 client/gui-gtk-2.0/menu.c:821
+#: client/gui-gtk-2.0/menu.c:823 client/gui-gtk-2.0/menu.c:825
+#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
+#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
+#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
+#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
+#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
+#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
#: data/Freeciv.in:2028
msgid "View"
msgstr "Kartvindu"
-#: client/gui-gtk-2.0/gui_main.c:1208
+#: client/gui-gtk-2.0/gui_main.c:1359
msgid "Chat"
msgstr "Beskjeder"
-#: client/gui-gtk-2.0/gui_main.c:1224 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1377 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"
@@ -11262,80 +11437,84 @@ 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:1491
+#: client/gui-gtk-2.0/gui_main.c:1392
+msgid "Allies Only"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:1657
msgid "Not _ready"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
+#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
#, fuzzy
msgid "_Ready"
msgstr "_Klargjør alle"
-#: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2132
+#: 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
msgid "_Start"
msgstr "_Start"
-#: client/gui-gtk-2.0/gui_main.c:1520
+#: client/gui-gtk-2.0/gui_main.c:1686
#, fuzzy
msgid "_Take Player"
msgstr "Byer"
-#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
+#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
#, fuzzy
msgid "Pick _Nation"
msgstr "Politistasjon"
-#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
+#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
#, fuzzy
msgid "_Observe"
msgstr "_Observatør"
-#: client/gui-gtk-2.0/gui_main.c:1532
+#: client/gui-gtk-2.0/gui_main.c:1698
#, fuzzy
msgid "Do not _observe"
msgstr "_observerer nå"
-#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
#, fuzzy
msgid "<AI>"
msgstr "AI"
-#: client/gui-gtk-2.0/gui_main.c:1557
+#: client/gui-gtk-2.0/gui_main.c:1723
msgid "<Novice AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1560
+#: client/gui-gtk-2.0/gui_main.c:1726
#, fuzzy
msgid "<Easy AI>"
msgstr "AI"
-#: client/gui-gtk-2.0/gui_main.c:1563
+#: client/gui-gtk-2.0/gui_main.c:1729
msgid "<Normal AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1732
#, fuzzy
msgid "<Hard AI>"
msgstr "AI"
-#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1742 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:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
#, fuzzy
msgid "Observer"
msgstr "Observatør"
-#: client/gui-gtk-2.0/gui_main.c:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
#, fuzzy
msgid "Detached"
msgstr "Død"
-#: client/gui-gtk-2.0/gui_main.c:1899
+#: client/gui-gtk-2.0/gui_main.c:2073
msgid "Are you sure you want to quit?"
msgstr "Er du sikker på at du vil avslutte?"
@@ -11568,56 +11747,56 @@ msgstr "_Teknologier"
msgid "Foreign Intelligence: %s Empire"
msgstr "Etterretningsrapport for %s"
-#: client/gui-gtk-2.0/mapctrl.c:195 client/gui-sdl/mapctrl.c:2565
+#: client/gui-gtk-2.0/mapctrl.c:179 client/gui-sdl/mapctrl.c:2565
#: client/gui-sdl/menu.c:839 client/gui-sdl/menu.c:1021
#: client/gui-win32/mapctrl.c:353
msgid "Build New City"
msgstr "Bygg ny by"
-#: client/gui-gtk-2.0/mapctrl.c:196 client/gui-sdl/mapctrl.c:2594
+#: client/gui-gtk-2.0/mapctrl.c:180 client/gui-sdl/mapctrl.c:2594
#: client/gui-win32/mapctrl.c:354 client/gui-xaw/mapctrl.c:89
msgid "What should we call our new city?"
msgstr "Hva skal vi kalle vår nye by?"
-#: client/gui-gtk-2.0/mapview.c:147
+#: client/gui-gtk-2.0/mapview.c:158
msgid "Shows your current luxury/science/tax rates;click to toggle them."
msgstr "Viser de nåværende luksus/forskning/skatt nivåene; klikk for å ende."
-#: client/gui-gtk-2.0/mapview.c:692 client/gui-win32/canvas.c:275
+#: client/gui-gtk-2.0/mapview.c:702 client/gui-win32/canvas.c:275
msgid "Better fog will only work in truecolor. Disabling it"
msgstr "Forbedret krigståke vil kun fungere med 'True Color'. Deaktiverer det."
-#: client/gui-gtk-2.0/menu.c:250
+#: client/gui-gtk-2.0/menu.c:256
msgid "Leaving a local game will end it!"
msgstr "Spillet vil bli avsluttet dersom man forlater det!"
-#: client/gui-gtk-2.0/menu.c:700 client/gui-win32/menu.c:303
+#: client/gui-gtk-2.0/menu.c:727 client/gui-win32/menu.c:303
msgid "_Game"
msgstr "_Spill"
-#: client/gui-gtk-2.0/menu.c:702 client/gui-gtk-2.0/menu.c:704
-#: client/gui-gtk-2.0/menu.c:706 client/gui-gtk-2.0/menu.c:708
-#: client/gui-gtk-2.0/menu.c:710 client/gui-gtk-2.0/menu.c:712
-#: client/gui-gtk-2.0/menu.c:714 client/gui-gtk-2.0/menu.c:717
-#: client/gui-gtk-2.0/menu.c:720 client/gui-gtk-2.0/menu.c:722
-#: client/gui-gtk-2.0/menu.c:724 client/gui-gtk-2.0/menu.c:726
-#: client/gui-gtk-2.0/menu.c:728 client/gui-gtk-2.0/menu.c:730
-#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:736
-#: client/gui-gtk-2.0/menu.c:738 client/gui-gtk-2.0/menu.c:740
+#: client/gui-gtk-2.0/menu.c:729 client/gui-gtk-2.0/menu.c:731
+#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:735
+#: client/gui-gtk-2.0/menu.c:737 client/gui-gtk-2.0/menu.c:739
+#: client/gui-gtk-2.0/menu.c:741 client/gui-gtk-2.0/menu.c:744
+#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
+#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
+#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
+#: client/gui-gtk-2.0/menu.c:760 client/gui-gtk-2.0/menu.c:763
+#: client/gui-gtk-2.0/menu.c:765 client/gui-gtk-2.0/menu.c:767
#: data/Freeciv.in:2026
msgid "Game"
msgstr "Spill"
-#: client/gui-gtk-2.0/menu.c:704 client/gui-gtk-2.0/menu.c:706
-#: client/gui-gtk-2.0/menu.c:708
+#: client/gui-gtk-2.0/menu.c:731 client/gui-gtk-2.0/menu.c:733
+#: client/gui-gtk-2.0/menu.c:735
msgid "_Chat"
msgstr "_Beskjeder"
-#: client/gui-gtk-2.0/menu.c:706 client/gui-win32/menu.c:314
+#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:314
msgid "_Clear Log"
msgstr "_Rens logg"
-#: client/gui-gtk-2.0/menu.c:708 client/gui-win32/menu.c:313
+#: client/gui-gtk-2.0/menu.c:735 client/gui-win32/menu.c:313
#, fuzzy
msgid "_Write Log"
msgstr "Eksporter _logg"
@@ -11628,425 +11807,461 @@ msgstr "Eksporter _logg"
# in the gtk gui (menu-init) which is also noted in the
# german translation.#
# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-#: client/gui-gtk-2.0/menu.c:710 client/gui-win32/menu.c:304
+#: client/gui-gtk-2.0/menu.c:737 client/gui-win32/menu.c:304
msgid "Local _Options"
msgstr "Lokale _alternativ"
-#: client/gui-gtk-2.0/menu.c:712 client/gui-win32/menu.c:305
+#: client/gui-gtk-2.0/menu.c:739 client/gui-win32/menu.c:305
msgid "_Message Options"
msgstr "_Beskjedinnstillinger"
-#: client/gui-gtk-2.0/menu.c:717
+#: client/gui-gtk-2.0/menu.c:744
#, fuzzy
msgid "_Reload Tileset"
msgstr "Grafikkoppsett"
-#: client/gui-gtk-2.0/menu.c:720
+#: client/gui-gtk-2.0/menu.c:747
#, fuzzy
msgid "Save Options on _Exit"
msgstr "Serveralternativ (pågående)"
-#: client/gui-gtk-2.0/menu.c:722
+#: client/gui-gtk-2.0/menu.c:749
#, fuzzy
msgid "Sa_ve Options"
msgstr "Spill-innstillinger"
-#: client/gui-gtk-2.0/menu.c:726 client/gui-win32/menu.c:308
+#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:308
msgid "Server O_ptions"
msgstr "Vis ser_veralternativ"
-#: client/gui-gtk-2.0/menu.c:730 client/gui-win32/menu.c:310
+#: client/gui-gtk-2.0/menu.c:757 client/gui-win32/menu.c:310
msgid "_Save Game"
msgstr "_Lagre spill"
-#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:311
+#: client/gui-gtk-2.0/menu.c:760 client/gui-win32/menu.c:311
msgid "Save Game _As..."
msgstr "Lagre spill _som..."
-#: client/gui-gtk-2.0/menu.c:738
+#: client/gui-gtk-2.0/menu.c:765
#, fuzzy
msgid "_Leave"
msgstr "Forlat _spillet"
-#: client/gui-gtk-2.0/menu.c:740 client/gui-win32/menu.c:317
+#: client/gui-gtk-2.0/menu.c:767 client/gui-win32/menu.c:317
msgid "_Quit"
msgstr "_Avslutt"
-#: client/gui-gtk-2.0/menu.c:745 client/gui-win32/menu.c:321
+#: client/gui-gtk-2.0/menu.c:772 client/gui-win32/menu.c:321
msgid "Gov_ernment"
msgstr "_Styreform"
-#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
-#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
-#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:774 client/gui-gtk-2.0/menu.c:776
+#: client/gui-gtk-2.0/menu.c:778 client/gui-gtk-2.0/menu.c:780
+#: client/gui-gtk-2.0/menu.c:782 client/gui-gtk-2.0/menu.c:784
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
#: client/gui-xaw/menu.c:248 data/Freeciv.in:2027 data/helpdata.txt:1320
msgid "Government"
msgstr "Styreform"
-#: client/gui-gtk-2.0/menu.c:749 client/gui-win32/menu.c:322
+#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:322
msgid "_Tax Rates"
msgstr "_Skattenivå"
-#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:324
+#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:324
msgid "_Find City"
msgstr "_Finn by"
-#: client/gui-gtk-2.0/menu.c:755 client/gui-win32/menu.c:325
+#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:325
msgid "_Worklists"
msgstr "_Arbeidslister"
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
-#: client/gui-gtk-2.0/menu.c:764 client/gui-win32/menu.c:327
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
+#: client/gui-gtk-2.0/menu.c:791 client/gui-win32/menu.c:327
msgid "_Change Government"
msgstr "_Endre styreform"
-#: client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:788
msgid "_Revolution..."
msgstr "_Revolusjon..."
-#: client/gui-gtk-2.0/menu.c:764 client/gui-gtk-2.0/menu.c:970
+#: client/gui-gtk-2.0/menu.c:791 client/gui-gtk-2.0/menu.c:1013
#: client/gui-win32/menu.c:431
msgid "_Government"
msgstr "St_yreform"
-#: client/gui-gtk-2.0/menu.c:768 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:795 client/gui-gtk-2.0/menu.c:959
#: client/gui-win32/menu.c:334
msgid "_View"
msgstr "Kart_vindu"
-#: client/gui-gtk-2.0/menu.c:772
+#: client/gui-gtk-2.0/menu.c:799
#, fuzzy
msgid "City Outlines"
msgstr "Bytilpassning"
-#: client/gui-gtk-2.0/menu.c:774 client/gui-win32/menu.c:335
+#: client/gui-gtk-2.0/menu.c:801 client/gui-win32/menu.c:335
msgid "Map _Grid"
msgstr "Kartr_uter"
-#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:336
+#: client/gui-gtk-2.0/menu.c:803 client/gui-win32/menu.c:336
msgid "National _Borders"
msgstr "Nasjonale _Grenser"
-#: client/gui-gtk-2.0/menu.c:778 client/gui-win32/menu.c:337
+#: client/gui-gtk-2.0/menu.c:805 client/gui-win32/menu.c:337
msgid "City _Names"
msgstr "By_navn"
-#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:338
+#: client/gui-gtk-2.0/menu.c:807 client/gui-win32/menu.c:338
msgid "City G_rowth"
msgstr "By_vekst"
-#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:339
+#: client/gui-gtk-2.0/menu.c:809 client/gui-win32/menu.c:339
msgid "City _Productions"
msgstr "By_produksjon"
-#: client/gui-gtk-2.0/menu.c:784 client/gui-sdl/optiondlg.c:1719
+#: client/gui-gtk-2.0/menu.c:811
+#, fuzzy
+msgid "City Buy Cost"
+msgstr "Total kostnad:"
+
+#: client/gui-gtk-2.0/menu.c:813
+#, fuzzy
+msgid "City Traderoutes"
+msgstr "Handelsruter"
+
+#: client/gui-gtk-2.0/menu.c:815 client/gui-sdl/optiondlg.c:1719
msgid "Draw city worker map grid"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:788 client/gui-sdl/optiondlg.c:1635
+#: client/gui-gtk-2.0/menu.c:819 client/gui-sdl/optiondlg.c:1635
#: client/gui-win32/menu.c:340 client/gui-xaw/menu.c:148
#: client/gui-xaw/menu.c:246 manual/civmanual.c:220 data/helpdata.txt:1220
msgid "Terrain"
msgstr "Terreng"
-#: client/gui-gtk-2.0/menu.c:790 client/gui-win32/menu.c:341
+#: client/gui-gtk-2.0/menu.c:821 client/gui-win32/menu.c:341
#: client/gui-xaw/menu.c:149
msgid "Coastline"
msgstr "Kystlinje"
-#: client/gui-gtk-2.0/menu.c:796 client/gui-win32/menu.c:343
+#: client/gui-gtk-2.0/menu.c:827 client/gui-win32/menu.c:343
msgid "Roads & Rails"
msgstr "Veier & Togskinner"
-#: client/gui-gtk-2.0/menu.c:800 client/gui-sdl/optiondlg.c:1933
+#: client/gui-gtk-2.0/menu.c:831 client/gui-sdl/optiondlg.c:1933
#: client/gui-win32/menu.c:345 client/gui-xaw/menu.c:152
msgid "Mines"
msgstr "Gruver"
-#: client/gui-gtk-2.0/menu.c:802 client/gui-win32/menu.c:346
+#: client/gui-gtk-2.0/menu.c:833 client/gui-win32/menu.c:346
msgid "Fortress & Airbase"
msgstr "Festning & Flybase"
-#: client/gui-gtk-2.0/menu.c:804 client/gui-win32/menu.c:348
+#: client/gui-gtk-2.0/menu.c:835 client/gui-win32/menu.c:348
#: client/gui-xaw/menu.c:154
msgid "Specials"
msgstr "Spesielle"
-#: client/gui-gtk-2.0/menu.c:806 client/gui-win32/menu.c:349
+#: client/gui-gtk-2.0/menu.c:837 client/gui-win32/menu.c:349
#: client/gui-xaw/menu.c:155
msgid "Pollution & Fallout"
msgstr "Forurensning & Atomavfall"
-#: client/gui-gtk-2.0/menu.c:812 client/gui-win32/menu.c:352
+#: client/gui-gtk-2.0/menu.c:843 client/gui-win32/menu.c:352
#: client/gui-xaw/menu.c:158
msgid "Focus Unit"
msgstr "Fokus på enhet"
-#: client/gui-gtk-2.0/menu.c:814 client/gui-sdl/optiondlg.c:1854
+#: client/gui-gtk-2.0/menu.c:845 client/gui-sdl/optiondlg.c:1854
#: client/gui-win32/menu.c:353 client/gui-xaw/menu.c:159
msgid "Fog of War"
msgstr "Krigståke"
-#: client/gui-gtk-2.0/menu.c:818
+#: client/gui-gtk-2.0/menu.c:849
#, fuzzy
msgid "_Full Screen"
msgstr "Fullskjerm vindu"
-#: client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/menu.c:853
msgid "_Center View"
msgstr "Sentrer _Kartvindu"
-#: client/gui-gtk-2.0/menu.c:825 client/gui-win32/menu.c:358
+#: client/gui-gtk-2.0/menu.c:856 client/gui-win32/menu.c:358
msgid "_Orders"
msgstr "_Ordrer"
-#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
-#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
-#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
-#: client/gui-gtk-2.0/menu.c:855 client/gui-gtk-2.0/menu.c:857
-#: client/gui-gtk-2.0/menu.c:859 client/gui-gtk-2.0/menu.c:861
-#: client/gui-gtk-2.0/menu.c:863 client/gui-gtk-2.0/menu.c:865
-#: client/gui-gtk-2.0/menu.c:867 client/gui-gtk-2.0/menu.c:869
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875 client/gui-gtk-2.0/menu.c:877
-#: client/gui-gtk-2.0/menu.c:879 client/gui-gtk-2.0/menu.c:881
-#: client/gui-gtk-2.0/menu.c:883 client/gui-gtk-2.0/menu.c:885
-#: client/gui-gtk-2.0/menu.c:887 client/gui-gtk-2.0/menu.c:889
-#: client/gui-gtk-2.0/menu.c:891 client/gui-gtk-2.0/menu.c:893
-#: client/gui-gtk-2.0/menu.c:895 client/gui-gtk-2.0/menu.c:897
-#: client/gui-gtk-2.0/menu.c:899 client/gui-gtk-2.0/menu.c:901
-#: client/gui-gtk-2.0/menu.c:903 data/Freeciv.in:2029
+#: client/gui-gtk-2.0/menu.c:858 client/gui-gtk-2.0/menu.c:860
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:864
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:868
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:872
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:876
+#: client/gui-gtk-2.0/menu.c:878 client/gui-gtk-2.0/menu.c:880
+#: client/gui-gtk-2.0/menu.c:882 client/gui-gtk-2.0/menu.c:884
+#: client/gui-gtk-2.0/menu.c:886 client/gui-gtk-2.0/menu.c:888
+#: client/gui-gtk-2.0/menu.c:890 client/gui-gtk-2.0/menu.c:892
+#: client/gui-gtk-2.0/menu.c:894 client/gui-gtk-2.0/menu.c:896
+#: client/gui-gtk-2.0/menu.c:898 client/gui-gtk-2.0/menu.c:900
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906 client/gui-gtk-2.0/menu.c:908
+#: client/gui-gtk-2.0/menu.c:910 client/gui-gtk-2.0/menu.c:912
+#: client/gui-gtk-2.0/menu.c:914 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:918 client/gui-gtk-2.0/menu.c:920
+#: client/gui-gtk-2.0/menu.c:922 client/gui-gtk-2.0/menu.c:924
+#: client/gui-gtk-2.0/menu.c:926 client/gui-gtk-2.0/menu.c:928
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
+#: client/gui-gtk-2.0/menu.c:946 data/Freeciv.in:2029
msgid "Orders"
msgstr "Ordrer"
-#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:1444
+#: client/gui-gtk-2.0/menu.c:860 client/gui-gtk-2.0/menu.c:1489
#: client/gui-win32/menu.c:359
msgid "_Build City"
msgstr "_Bygg by"
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:1466
-#: client/gui-gtk-2.0/menu.c:1472 client/gui-win32/menu.c:360
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:1511
+#: client/gui-gtk-2.0/menu.c:1517 client/gui-win32/menu.c:360
msgid "Build _Road"
msgstr "Bygg _vei"
-#: client/gui-gtk-2.0/menu.c:833 client/gui-gtk-2.0/menu.c:1360
+#: 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 "Lag kunstig vann_ing"
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:1361
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:1406
#: client/gui-win32/menu.c:362
msgid "Build _Mine"
msgstr "Bygg gr_uve"
-#: client/gui-gtk-2.0/menu.c:837 client/gui-gtk-2.0/menu.c:1362
+#: client/gui-gtk-2.0/menu.c:868 client/gui-gtk-2.0/menu.c:1407
msgid "Transf_orm Terrain"
msgstr "Endre terr_eng"
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:1508
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:1553
#: client/gui-win32/menu.c:364
msgid "Build _Fortress"
msgstr "Bygg _festning"
-#: client/gui-gtk-2.0/menu.c:841 client/gui-win32/menu.c:365
+#: client/gui-gtk-2.0/menu.c:872 client/gui-win32/menu.c:365
msgid "Build Airbas_e"
msgstr "Bygg flystrip_e"
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:1514
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:1559
#: client/gui-win32/menu.c:366
msgid "Clean _Pollution"
msgstr "Fjern _forurensning"
-#: client/gui-gtk-2.0/menu.c:845 client/gui-win32/menu.c:367
+#: client/gui-gtk-2.0/menu.c:876 client/gui-win32/menu.c:367
msgid "Clean _Nuclear Fallout"
msgstr "Fjern _atomavfall"
-#: client/gui-gtk-2.0/menu.c:849 client/gui-win32/menu.c:369
+#: client/gui-gtk-2.0/menu.c:880 client/gui-win32/menu.c:369
msgid "_Sentry"
msgstr "Hold _stand"
-#: client/gui-gtk-2.0/menu.c:855 client/gui-win32/menu.c:372
+#: client/gui-gtk-2.0/menu.c:886 client/gui-win32/menu.c:372
msgid "Make _Homecity"
msgstr "Gjør til _hjemby"
-#: client/gui-gtk-2.0/menu.c:857 client/gui-win32/menu.c:373
+#: client/gui-gtk-2.0/menu.c:888 client/gui-win32/menu.c:373
msgid "_Load"
msgstr "_Fortsett lagret spill"
-#: client/gui-gtk-2.0/menu.c:859
+#: client/gui-gtk-2.0/menu.c:890
msgid "_Unload Transporter"
msgstr "Last _ut fra transport"
-#: client/gui-gtk-2.0/menu.c:861 client/gui-win32/menu.c:374
+#: client/gui-gtk-2.0/menu.c:892 client/gui-win32/menu.c:374
msgid "_Unload"
msgstr "Last a_v"
-#: client/gui-gtk-2.0/menu.c:863 client/gui-win32/menu.c:375
+#: client/gui-gtk-2.0/menu.c:894 client/gui-win32/menu.c:375
msgid "Wake up o_thers"
msgstr "Vekk _andre"
-#: client/gui-gtk-2.0/menu.c:867
+#: client/gui-gtk-2.0/menu.c:898
msgid "_Auto Settler"
msgstr "_Autonybygger"
-#: client/gui-gtk-2.0/menu.c:869 client/gui-win32/menu.c:378
+#: client/gui-gtk-2.0/menu.c:900 client/gui-win32/menu.c:378
msgid "Auto E_xplore"
msgstr "Auto utfors_k"
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906
msgid "_Connect"
msgstr "_Koble til"
-#: client/gui-gtk-2.0/menu.c:871 client/gui-win32/menu.c:380
+#: client/gui-gtk-2.0/menu.c:902 client/gui-win32/menu.c:380
msgid "_Road"
msgstr "_Vei"
-#: client/gui-gtk-2.0/menu.c:873 client/gui-win32/menu.c:381
+#: client/gui-gtk-2.0/menu.c:904 client/gui-win32/menu.c:381
msgid "Rai_l"
msgstr "_Jernbane"
# irrigert er tillatt på norsk, men skulle gjerne hatt et bedre ord
-#: client/gui-gtk-2.0/menu.c:875 client/gui-win32/menu.c:382
+#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:382
msgid "_Irrigate"
msgstr "_Irriger"
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
#, fuzzy
msgid "Go _to"
msgstr "Gå til"
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
#, fuzzy
msgid "_Build city"
msgstr "_Bygg by"
-#: client/gui-gtk-2.0/menu.c:879
+#: client/gui-gtk-2.0/menu.c:910
msgid "Patrol (_Q)"
msgstr "Patruljer (_Q)"
-#: client/gui-gtk-2.0/menu.c:881 client/gui-win32/menu.c:385
+#: client/gui-gtk-2.0/menu.c:912 client/gui-win32/menu.c:385
msgid "_Go to"
msgstr "_Gå til"
-#: client/gui-gtk-2.0/menu.c:883
+#: client/gui-gtk-2.0/menu.c:914
msgid "Go\\/Airlift to City"
msgstr "Gå\\/Fly til by"
-#: client/gui-gtk-2.0/menu.c:885 client/gui-sdl/menu.c:450
+#: client/gui-gtk-2.0/menu.c:916 client/gui-sdl/menu.c:450
#: client/gui-win32/menu.c:387 client/gui-xaw/menu.c:203
msgid "Return to nearest city"
msgstr "Returner til nærmeste by."
-#: client/gui-gtk-2.0/menu.c:889 client/gui-win32/menu.c:389
+#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:389
#: client/gui-xaw/menu.c:205
msgid "Disband Unit"
msgstr "Oppløs enhet"
-#: client/gui-gtk-2.0/menu.c:891 client/gui-sdl/citydlg.c:532
+#: client/gui-gtk-2.0/menu.c:922 client/gui-sdl/citydlg.c:532
#: data/Freeciv.in:1186
msgid "Upgrade unit"
msgstr "Oppgrader enhet"
-#: client/gui-gtk-2.0/menu.c:893
+#: client/gui-gtk-2.0/menu.c:924
msgid "Diplomat\\/Spy Actions"
msgstr "Diplomat\\/Spion - Forhandlinger"
-#: client/gui-gtk-2.0/menu.c:895 client/gui-sdl/menu.c:399
+#: client/gui-gtk-2.0/menu.c:926 client/gui-sdl/menu.c:399
#: client/gui-win32/menu.c:391 client/gui-xaw/menu.c:209
msgid "Explode Nuclear"
msgstr "Utløs atombombe"
-#: client/gui-gtk-2.0/menu.c:899
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/cityrep.c:882
+msgid "Select"
+msgstr "Velg"
+
+#: client/gui-gtk-2.0/menu.c:934
#, fuzzy
-msgid "Select same type"
-msgstr "Velg en by"
+msgid "Single"
+msgstr "Jungel"
+
+#: client/gui-gtk-2.0/menu.c:936
+msgid "Same Type On Tile"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:938
+msgid "All On Tile"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:940
+msgid "Same Type On Continent"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:942
+msgid "Same Type Everywhere"
+msgstr ""
-#: client/gui-gtk-2.0/menu.c:901 client/gui-win32/menu.c:393
+#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:393
msgid "_Wait"
msgstr "_Vent"
-#: client/gui-gtk-2.0/menu.c:903 client/gui-win32/menu.c:394
+#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:394
#: client/gui-xaw/menu.c:213
msgid "Done"
msgstr "Fullført"
-#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:398
+#: client/gui-gtk-2.0/menu.c:949 client/gui-win32/menu.c:398
msgid "_Reports"
msgstr "_Rapporter"
-#: client/gui-gtk-2.0/menu.c:908 client/gui-gtk-2.0/menu.c:910
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:914
-#: client/gui-gtk-2.0/menu.c:916 client/gui-gtk-2.0/menu.c:918
-#: client/gui-gtk-2.0/menu.c:920 client/gui-gtk-2.0/menu.c:922
-#: client/gui-gtk-2.0/menu.c:924 client/gui-gtk-2.0/menu.c:926
-#: client/gui-gtk-2.0/menu.c:928 client/gui-gtk-2.0/menu.c:930
-#: client/gui-gtk-2.0/menu.c:932 data/Freeciv.in:2030
+#: client/gui-gtk-2.0/menu.c:951 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:957
+#: client/gui-gtk-2.0/menu.c:959 client/gui-gtk-2.0/menu.c:961
+#: client/gui-gtk-2.0/menu.c:963 client/gui-gtk-2.0/menu.c:965
+#: client/gui-gtk-2.0/menu.c:967 client/gui-gtk-2.0/menu.c:969
+#: client/gui-gtk-2.0/menu.c:971 client/gui-gtk-2.0/menu.c:973
+#: client/gui-gtk-2.0/menu.c:975 data/Freeciv.in:2030
msgid "Reports"
msgstr "Rapporter"
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:958
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:1001
#: client/gui-win32/menu.c:400 client/gui-win32/menu.c:425
msgid "_Units"
msgstr "_Enheter"
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/menu.c:914 client/gui-win32/menu.c:402
+#: client/gui-gtk-2.0/menu.c:957 client/gui-win32/menu.c:402
#, fuzzy
msgid "_Nations"
msgstr "_Nasjoner"
-#: client/gui-gtk-2.0/menu.c:918 client/gui-win32/menu.c:403
+#: client/gui-gtk-2.0/menu.c:961 client/gui-win32/menu.c:403
msgid "_Economy"
msgstr "_Økonomi"
#. TRANS: Research report action
-#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:405
+#: client/gui-gtk-2.0/menu.c:963 client/gui-win32/menu.c:405
#, fuzzy
msgid "_Research"
msgstr "_Forsker på"
-#: client/gui-gtk-2.0/menu.c:924 client/gui-win32/menu.c:407
+#: client/gui-gtk-2.0/menu.c:967 client/gui-win32/menu.c:407
msgid "_Wonders of the World"
msgstr "_Verdens underverk"
-#: client/gui-gtk-2.0/menu.c:926 client/gui-win32/menu.c:408
+#: client/gui-gtk-2.0/menu.c:969 client/gui-win32/menu.c:408
msgid "_Top Five Cities"
msgstr "_Topp fem byer"
-#: client/gui-gtk-2.0/menu.c:928 client/gui-win32/menu.c:409
+#: client/gui-gtk-2.0/menu.c:971 client/gui-win32/menu.c:409
msgid "_Messages"
msgstr "_Beskjeder"
-#: client/gui-gtk-2.0/menu.c:930 client/gui-win32/menu.c:410
+#: client/gui-gtk-2.0/menu.c:973 client/gui-win32/menu.c:410
msgid "_Demographics"
msgstr "_Demografi"
-#: client/gui-gtk-2.0/menu.c:932 client/gui-gtk-2.0/plrdlg.c:471
+#: client/gui-gtk-2.0/menu.c:975 client/gui-gtk-2.0/plrdlg.c:354
#: client/gui-win32/menu.c:411
msgid "_Spaceship"
msgstr "_Romskip"
-#: client/gui-gtk-2.0/menu.c:936 client/gui-win32/menu.c:415
+#: client/gui-gtk-2.0/menu.c:979 client/gui-win32/menu.c:415
msgid "_Help"
msgstr "_Hjelp"
-#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
-#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
-#: client/gui-gtk-2.0/menu.c:946 client/gui-gtk-2.0/menu.c:948
-#: client/gui-gtk-2.0/menu.c:950 client/gui-gtk-2.0/menu.c:952
-#: client/gui-gtk-2.0/menu.c:954 client/gui-gtk-2.0/menu.c:956
-#: client/gui-gtk-2.0/menu.c:958 client/gui-gtk-2.0/menu.c:960
-#: client/gui-gtk-2.0/menu.c:962 client/gui-gtk-2.0/menu.c:964
-#: client/gui-gtk-2.0/menu.c:966 client/gui-gtk-2.0/menu.c:968
-#: client/gui-gtk-2.0/menu.c:970 client/gui-gtk-2.0/menu.c:972
-#: client/gui-gtk-2.0/menu.c:974 client/gui-gtk-2.0/menu.c:976
-#: client/gui-gtk-2.0/menu.c:978 client/gui-gtk-2.0/menu.c:980
+#: client/gui-gtk-2.0/menu.c:981 client/gui-gtk-2.0/menu.c:983
+#: client/gui-gtk-2.0/menu.c:985 client/gui-gtk-2.0/menu.c:987
+#: client/gui-gtk-2.0/menu.c:989 client/gui-gtk-2.0/menu.c:991
+#: client/gui-gtk-2.0/menu.c:993 client/gui-gtk-2.0/menu.c:995
+#: client/gui-gtk-2.0/menu.c:997 client/gui-gtk-2.0/menu.c:999
+#: client/gui-gtk-2.0/menu.c:1001 client/gui-gtk-2.0/menu.c:1003
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-gtk-2.0/menu.c:1007
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-gtk-2.0/menu.c:1011
+#: client/gui-gtk-2.0/menu.c:1013 client/gui-gtk-2.0/menu.c:1015
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-gtk-2.0/menu.c:1019
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-gtk-2.0/menu.c:1023
#: client/gui-gtk-2.0/repodlgs.c:313 client/gui-win32/citydlg.c:1077
#: client/gui-win32/repodlgs.c:289 client/gui-win32/wldlg.c:846
#: data/Freeciv.in:1466 data/Freeciv.in:2031 data/Freeciv.in:2101
@@ -12054,119 +12269,119 @@ msgstr "_Hjelp"
msgid "Help"
msgstr "Hjelp"
-#: client/gui-gtk-2.0/menu.c:940 client/gui-win32/menu.c:416
+#: client/gui-gtk-2.0/menu.c:983 client/gui-win32/menu.c:416
msgid "Language_s"
msgstr "_Språk"
-#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/menu.c:417
+#: client/gui-gtk-2.0/menu.c:985 client/gui-win32/menu.c:417
msgid "Co_nnecting"
msgstr "_Kobler til"
-#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:418
+#: client/gui-gtk-2.0/menu.c:987 client/gui-win32/menu.c:418
msgid "C_ontrols"
msgstr "K_ontroller"
-#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:419
+#: client/gui-gtk-2.0/menu.c:989 client/gui-win32/menu.c:419
msgid "C_hatline"
msgstr "_Snakkekanal"
-#: client/gui-gtk-2.0/menu.c:948 client/gui-win32/menu.c:420
+#: client/gui-gtk-2.0/menu.c:991 client/gui-win32/menu.c:420
msgid "_Worklist Editor"
msgstr "_Arbeidsliste"
-#: client/gui-gtk-2.0/menu.c:950 client/gui-win32/menu.c:421
+#: client/gui-gtk-2.0/menu.c:993 client/gui-win32/menu.c:421
msgid "Citizen _Management"
msgstr "Byforvalt_ning"
-#: client/gui-gtk-2.0/menu.c:952 client/gui-win32/menu.c:422
+#: client/gui-gtk-2.0/menu.c:995 client/gui-win32/menu.c:422
msgid "_Playing"
msgstr "_Strategier"
-#: client/gui-gtk-2.0/menu.c:956 client/gui-win32/menu.c:424
+#: client/gui-gtk-2.0/menu.c:999 client/gui-win32/menu.c:424
msgid "City _Improvements"
msgstr "Byforbedr_inger"
-#: client/gui-gtk-2.0/menu.c:960 client/gui-win32/menu.c:426
+#: client/gui-gtk-2.0/menu.c:1003 client/gui-win32/menu.c:426
msgid "Com_bat"
msgstr "Kam_p"
-#: client/gui-gtk-2.0/menu.c:962 client/gui-win32/menu.c:427
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-win32/menu.c:427
msgid "_ZOC"
msgstr "_Kontrollsone"
-#: client/gui-gtk-2.0/menu.c:964 client/gui-win32/menu.c:428
+#: client/gui-gtk-2.0/menu.c:1007 client/gui-win32/menu.c:428
msgid "Techno_logy"
msgstr "Tekno_logi"
-#: client/gui-gtk-2.0/menu.c:966 client/gui-win32/menu.c:429
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-win32/menu.c:429
msgid "_Terrain"
msgstr "_Terreng"
-#: client/gui-gtk-2.0/menu.c:968 client/gui-win32/menu.c:430
+#: client/gui-gtk-2.0/menu.c:1011 client/gui-win32/menu.c:430
msgid "Won_ders"
msgstr "Un_derverk"
-#: client/gui-gtk-2.0/menu.c:972 client/gui-win32/menu.c:432
+#: client/gui-gtk-2.0/menu.c:1015 client/gui-win32/menu.c:432
msgid "Happin_ess"
msgstr "_Lykkelighet"
-#: client/gui-gtk-2.0/menu.c:974 client/gui-win32/menu.c:433
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-win32/menu.c:433
msgid "Space _Race"
msgstr "_Romkappløp"
-#: client/gui-gtk-2.0/menu.c:978 client/gui-win32/menu.c:435
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-win32/menu.c:435
msgid "_Copying"
msgstr "_Kopiering"
-#: client/gui-gtk-2.0/menu.c:980 client/gui-win32/menu.c:436
+#: client/gui-gtk-2.0/menu.c:1023 client/gui-win32/menu.c:436
msgid "_About"
msgstr "O_m"
-#: client/gui-gtk-2.0/menu.c:1264
+#: client/gui-gtk-2.0/menu.c:1307
#, c-format
msgid "%s..."
msgstr "%s..."
-#: client/gui-gtk-2.0/menu.c:1352
+#: client/gui-gtk-2.0/menu.c:1397
#, c-format
msgid "Change to %s (_I)"
msgstr "Endre til %s (_I)"
-#: client/gui-gtk-2.0/menu.c:1353
+#: client/gui-gtk-2.0/menu.c:1398
#, c-format
msgid "Change to %s (_M)"
msgstr "Forandre til %s (_M)"
-#: client/gui-gtk-2.0/menu.c:1354
+#: client/gui-gtk-2.0/menu.c:1399
#, c-format
msgid "Transf_orm to %s"
msgstr "Transf_ormere til %s"
-#: client/gui-gtk-2.0/menu.c:1427
+#: client/gui-gtk-2.0/menu.c:1472
msgid "Help _Build Wonder"
msgstr "Hjelp _bygging av underverk"
-#: client/gui-gtk-2.0/menu.c:1441
+#: client/gui-gtk-2.0/menu.c:1486
msgid "Add to City (_B)"
msgstr "Legg til by (_B)"
-#: client/gui-gtk-2.0/menu.c:1449
+#: client/gui-gtk-2.0/menu.c:1494
msgid "Make Trade _Route"
msgstr "Lag handels_rute"
-#: client/gui-gtk-2.0/menu.c:1463
+#: client/gui-gtk-2.0/menu.c:1508
msgid "Build _Railroad"
msgstr "Bygg je_rnbane"
-#: client/gui-gtk-2.0/menu.c:1486
+#: client/gui-gtk-2.0/menu.c:1531
msgid "Bu_ild Farmland"
msgstr "D_yrk opp landet"
-#: client/gui-gtk-2.0/menu.c:1506
+#: client/gui-gtk-2.0/menu.c:1551
msgid "_Fortify"
msgstr "Be_fest posisjon"
-#: client/gui-gtk-2.0/menu.c:1512
+#: client/gui-gtk-2.0/menu.c:1557
msgid "_Paradrop"
msgstr "_Fallskjermshopp"
@@ -12203,13 +12418,32 @@ msgstr "B"
msgid "Pop"
msgstr "E"
-#: client/gui-gtk-2.0/messagewin.c:155 client/gui-sdl/messagewin.c:247
+#: client/gui-gtk-2.0/messagewin.c:186 client/gui-sdl/messagewin.c:247
#: client/gui-win32/messagewin.c:132 client/gui-xaw/menu.c:228
#: data/Freeciv.in:3273 data/Freeciv.in:3274 data/Freeciv.in:3283
msgid "Messages"
msgstr "Beskjeder"
-#: client/gui-gtk-2.0/plrdlg.c:330
+#: client/gui-gtk-2.0/plrdlg.c:317
+msgid "_Meet"
+msgstr "_Møte"
+
+#: client/gui-gtk-2.0/plrdlg.c:323
+#, fuzzy
+msgid "Cancel _Treaty"
+msgstr "_Avbryt avtale"
+
+#: client/gui-gtk-2.0/plrdlg.c:329
+#, fuzzy
+msgid "_Withdraw Vision"
+msgstr "Fjern delt _utsyn"
+
+#: client/gui-gtk-2.0/plrdlg.c:348
+#, fuzzy
+msgid "_Report"
+msgstr "_Rapporter"
+
+#: client/gui-gtk-2.0/plrdlg.c:386
msgid "?show:Dead Players"
msgstr ""
@@ -12217,280 +12451,283 @@ msgstr ""
#. TRANS: Nations report action
#. TRANS: Nations report title
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/plrdlg.c:350 client/gui-sdl/mapctrl.c:1580
+#: client/gui-gtk-2.0/plrdlg.c:406 client/gui-sdl/mapctrl.c:1580
#: client/gui-sdl/plrdlg.c:608 client/gui-win32/plrdlg.c:344
#: client/gui-xaw/menu.c:221 data/Freeciv.in:3192 data/Freeciv.in:3193
#, fuzzy
msgid "Nations"
msgstr "Nasjon"
-#: client/gui-gtk-2.0/plrdlg.c:443
-msgid "_Intelligence"
-msgstr "_Etterretning"
-
-#: client/gui-gtk-2.0/plrdlg.c:450
-msgid "_Meet"
-msgstr "_Møte"
-
-#: client/gui-gtk-2.0/plrdlg.c:457
+#: client/gui-gtk-2.0/plrdlg.c:511
#, fuzzy
-msgid "Cancel _Treaty"
-msgstr "_Avbryt avtale"
+msgid "Di_plomacy"
+msgstr "Diplomati"
-#: client/gui-gtk-2.0/plrdlg.c:464
-msgid "_Withdraw vision"
-msgstr "Fjern delt _utsyn"
+#: client/gui-gtk-2.0/plrdlg.c:516
+msgid "_Intelligence"
+msgstr "_Etterretning"
-#: client/gui-gtk-2.0/plrdlg.c:495
+#: client/gui-gtk-2.0/plrdlg.c:526
msgid "_AI"
msgstr "_AI"
-#: client/gui-gtk-2.0/plrdlg.c:501
+#: client/gui-gtk-2.0/plrdlg.c:532
msgid "_Toggle AI Mode"
msgstr "_Endre AI modus"
-#: client/gui-gtk-2.0/pages.c:208
+#: client/gui-gtk-2.0/pages.c:221
msgid "Start _New Game"
msgstr "Start _nytt spill"
-#: client/gui-gtk-2.0/pages.c:214
+#: client/gui-gtk-2.0/pages.c:227
msgid "Start _Scenario Game"
msgstr "_Start med ferdiglagd oppsett"
-#: client/gui-gtk-2.0/pages.c:220
+#: client/gui-gtk-2.0/pages.c:233
msgid "_Load Saved Game"
msgstr "Fortsette et spi_ll"
-#: client/gui-gtk-2.0/pages.c:229
+#: client/gui-gtk-2.0/pages.c:239
msgid "C_onnect to Network Game"
msgstr "K_oble til nettverksspill"
-#: client/gui-gtk-2.0/pages.c:236
+#: client/gui-gtk-2.0/pages.c:247
#, fuzzy
msgid "Connect to Gaming _Zone"
msgstr "Koble til nettverksspill"
-#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:300
#: client/gui-xaw/connectdlg.c:326
msgid "Passwords don't match, enter password."
msgstr "Passordene stemmer ikke, skriv inn passord."
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:779 client/gui-gtk-2.0/pages.c:820
+#: client/gui-win32/connectdlg.c:916
msgid "Server Name"
msgstr "Servernavn"
-#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
+#: 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
+#: data/Freeciv.in:96
msgid "Port"
msgstr "Port"
-#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
+#: client/gui-win32/connectdlg.c:917
msgid "Version"
msgstr "Versjon"
-#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
-#: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
+#: 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
msgid "Status"
msgstr "Status"
-#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
-#: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
+#: 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
msgid "Players"
msgstr "Spillere"
-#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
+#: client/gui-win32/connectdlg.c:918
msgid "Comment"
msgstr "Kommentar"
-#: client/gui-gtk-2.0/pages.c:747
+#: client/gui-gtk-2.0/pages.c:786
msgid "Local _Area Network"
msgstr "Lok_alt Nettverk"
-#: client/gui-gtk-2.0/pages.c:783
+#: client/gui-gtk-2.0/pages.c:827
msgid "Internet _Metaserver"
msgstr "Internett _Metaserver"
-#: client/gui-gtk-2.0/pages.c:817
+#: client/gui-gtk-2.0/pages.c:864
msgid "_Host:"
msgstr "_Tjener"
-#: client/gui-gtk-2.0/pages.c:834
+#: client/gui-gtk-2.0/pages.c:881
msgid "_Port:"
msgstr "_Portnummer"
-#: client/gui-gtk-2.0/pages.c:851
+#: client/gui-gtk-2.0/pages.c:898
msgid "_Login:"
msgstr "_Navn:"
-#: client/gui-gtk-2.0/pages.c:869
+#: client/gui-gtk-2.0/pages.c:916
msgid "Pass_word:"
msgstr "Pass_ord:"
-#: client/gui-gtk-2.0/pages.c:887
+#: client/gui-gtk-2.0/pages.c:934
msgid "Conf_irm Password:"
msgstr "_Gjenta passord:"
-#: client/gui-gtk-2.0/pages.c:912
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: 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/wldlg.c:800 client/gui-win32/wldlg.c:806
+msgid "Type"
+msgstr "Type"
+
+#: client/gui-gtk-2.0/pages.c:952 client/gui-win32/plrdlg.c:337
+#: data/Freeciv.in:88
+msgid "Host"
+msgstr "Server"
+
+#: client/gui-gtk-2.0/pages.c:981
#, fuzzy
msgid "C_onnect"
msgstr "Koble til"
-#: client/gui-gtk-2.0/pages.c:1142
+#: client/gui-gtk-2.0/pages.c:1211
#, fuzzy, c-format
msgid "Connection name: %s"
msgstr "Tilkobling under opprettelse."
-#: client/gui-gtk-2.0/pages.c:1145
+#: client/gui-gtk-2.0/pages.c:1214
#, fuzzy, c-format
msgid "Player name: %s"
msgstr "Navn"
-#: client/gui-gtk-2.0/pages.c:1150
+#: client/gui-gtk-2.0/pages.c:1219
#, fuzzy, c-format
msgid "Host: %s"
msgstr "Tjener:"
-#: client/gui-gtk-2.0/pages.c:1158
+#: client/gui-gtk-2.0/pages.c:1227
msgid "Player/conn info"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1185
+#: client/gui-gtk-2.0/pages.c:1254
#, fuzzy, c-format
msgid "%s info"
msgstr "By info"
-#: client/gui-gtk-2.0/pages.c:1196
+#: client/gui-gtk-2.0/pages.c:1265
#, fuzzy
msgid "Toggle player ready"
msgstr "aitoggle <spillernavn>"
-#: client/gui-gtk-2.0/pages.c:1204
+#: client/gui-gtk-2.0/pages.c:1273
#, fuzzy
msgid "Pick nation"
msgstr "Politistasjon"
-#: client/gui-gtk-2.0/pages.c:1214
+#: client/gui-gtk-2.0/pages.c:1283
msgid "Observe this player"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1221
+#: client/gui-gtk-2.0/pages.c:1290
#, fuzzy
msgid "Take this player"
msgstr "Byer"
-#: client/gui-gtk-2.0/pages.c:1238
+#: client/gui-gtk-2.0/pages.c:1307
#, fuzzy
msgid "Cut connection"
msgstr "Avbryter forbindelse til %s."
-#: client/gui-gtk-2.0/pages.c:1248
+#: client/gui-gtk-2.0/pages.c:1317
#, fuzzy
msgid "Aitoggle player"
msgstr "aitoggle <spillernavn>"
-#: client/gui-gtk-2.0/pages.c:1257
+#: client/gui-gtk-2.0/pages.c:1326
#, fuzzy
msgid "Remove player"
msgstr "Fjernet spiller %s."
-#: client/gui-gtk-2.0/pages.c:1268
+#: client/gui-gtk-2.0/pages.c:1337
msgid "Give info access"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1276
+#: client/gui-gtk-2.0/pages.c:1345
msgid "Give ctrl access"
msgstr ""
#. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1338
+#: client/gui-gtk-2.0/pages.c:1407
#, fuzzy, c-format
msgid "Put on %s"
msgstr "Befolkning: %s"
-#: client/gui-gtk-2.0/pages.c:1442
+#: client/gui-gtk-2.0/pages.c:1511
#, fuzzy
msgid "Number of _Players (including AI):"
msgstr "_Antall spillere (inkludert datastyrte spillere):"
-#: client/gui-gtk-2.0/pages.c:1465
+#: client/gui-gtk-2.0/pages.c:1534
#, fuzzy
msgid "AI Skill _Level:"
msgstr "Datastyrte spilleres _vanskelighetsgrad:"
-#: client/gui-gtk-2.0/pages.c:1481
+#: client/gui-gtk-2.0/pages.c:1550
#, fuzzy
msgid "Ruleset _Version:"
msgstr "Hersker:"
-#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
msgid "_More Game Options..."
msgstr "_Flere valg..."
-#: client/gui-gtk-2.0/pages.c:1514
+#: client/gui-gtk-2.0/pages.c:1583
#, fuzzy
msgid "Record"
msgstr "Handelsrapport"
-#: client/gui-gtk-2.0/pages.c:1519
+#: client/gui-gtk-2.0/pages.c:1588
#, fuzzy
msgid "Rating"
msgstr "Skrivekunst"
-#: client/gui-gtk-2.0/pages.c:1525
+#: client/gui-gtk-2.0/pages.c:1594
#, fuzzy
msgid "Ready"
msgstr "Klargjør alle"
-#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
-#: data/nation/slovakian.ruleset:26
-msgid "Leader"
-msgstr "Leder"
+#: client/gui-gtk-2.0/pages.c:1601
+#, fuzzy
+msgid "?player:Leader"
+msgstr "Navn"
-#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1732 client/gui-sdl/chatline.c:185
msgid "Choose Saved Game to Load"
msgstr "Velg lagrefil å laste"
-#: client/gui-gtk-2.0/pages.c:1752
+#: client/gui-gtk-2.0/pages.c:1824
msgid "Choose Saved Game to _Load:"
msgstr "Velg lagrefil å _laste:"
-#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
-#: client/gui-gtk-2.0/pages.c:2375
+#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
+#: client/gui-gtk-2.0/pages.c:2451
msgid "_Browse..."
msgstr "_Let etter fil..."
-#: client/gui-gtk-2.0/pages.c:1839
+#: client/gui-gtk-2.0/pages.c:1911
msgid "Choose a Scenario"
msgstr "Velg et ferdiglagd oppsett"
-#: client/gui-gtk-2.0/pages.c:1926
+#: client/gui-gtk-2.0/pages.c:1998
msgid "Choose a _Scenario:"
msgstr "Velg et ferdiglagd _oppsett:"
-#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
-#: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
-#: client/gui-win32/wldlg.c:806
-msgid "Type"
-msgstr "Type"
-
-#: client/gui-gtk-2.0/pages.c:2101
+#: client/gui-gtk-2.0/pages.c:2173
msgid "Choose a _nation to play:"
msgstr "Velg en _nasjon å spille:"
-#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2363 client/gui-win32/menu.c:581
msgid "Select Location to Save"
msgstr "Velg plassering for å lagre spillet"
-#: client/gui-gtk-2.0/pages.c:2372 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2448 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr "Lagre spill"
-#: client/gui-gtk-2.0/pages.c:2413
+#: client/gui-gtk-2.0/pages.c:2489
msgid "Saved _Games:"
msgstr "_Lagrede spill:"
-#: client/gui-gtk-2.0/pages.c:2440
+#: client/gui-gtk-2.0/pages.c:2516
msgid "Save _Filename:"
msgstr "Lagre _filnavn:"
@@ -12845,7 +13082,7 @@ msgstr "Lukk dialog"
msgid "Total users logged in : %d"
msgstr ""
-#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1094
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
msgid "Back"
msgstr "Tilbake"
@@ -12855,7 +13092,7 @@ msgid "Start"
msgstr "_Start"
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:775
+#: client/gui-win32/connectdlg.c:777
msgid "Load Game"
msgstr "Fortsette et spill"
@@ -12894,12 +13131,12 @@ msgid "Make new homecity"
msgstr "Lag ny hjemby"
#: client/gui-sdl/citydlg.c:546 client/gui-sdl/citydlg.c:1418
-#: client/gui-sdl/connectdlg.c:307 client/gui-sdl/connectdlg.c:616
-#: client/gui-sdl/connectdlg.c:802 client/gui-sdl/connectdlg.c:984
+#: 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/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1039
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
#: 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
@@ -12947,7 +13184,7 @@ msgstr "Kj
#: client/gui-sdl/diplodlg.c:1335 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:2427
+#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
#: client/gui-xaw/cityrep.c:666 client/gui-xaw/cma_fe.c:327
#: client/gui-xaw/cma_fe.c:511 client/gui-xaw/cma_fe.c:765
#: client/gui-xaw/messagedlg.c:72 client/gui-xaw/optiondlg.c:76
@@ -12963,7 +13200,7 @@ msgstr "Nei"
#: client/gui-sdl/diplodlg.c:1345 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:2427 client/gui-xaw/cityrep.c:666
+#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
#: client/gui-xaw/cma_fe.c:327 client/gui-xaw/cma_fe.c:511
#: client/gui-xaw/cma_fe.c:765 client/gui-xaw/messagedlg.c:72
#: client/gui-xaw/optiondlg.c:76 client/gui-xaw/optiondlg.c:304
@@ -13264,41 +13501,41 @@ msgstr "Benytt en gang"
msgid "Release city"
msgstr "Frigi byen"
-#: client/gui-sdl/connectdlg.c:238
+#: client/gui-sdl/connectdlg.c:239
#, fuzzy
msgid "Creating Server List..."
msgstr "Freeciv Server Liste"
-#: client/gui-sdl/connectdlg.c:279 client/gui-sdl/connectdlg.c:343
+#: client/gui-sdl/connectdlg.c:280 client/gui-sdl/connectdlg.c:344
#, fuzzy
msgid "No LAN servers found"
msgstr "Lokalt Nettverk"
-#: client/gui-sdl/connectdlg.c:281 client/gui-sdl/connectdlg.c:345
+#: client/gui-sdl/connectdlg.c:282 client/gui-sdl/connectdlg.c:346
msgid "No public servers found"
msgstr ""
-#: client/gui-sdl/connectdlg.c:555
+#: client/gui-sdl/connectdlg.c:556
#, fuzzy
msgid "Player Name :"
msgstr "Navn"
-#: client/gui-sdl/connectdlg.c:571
+#: client/gui-sdl/connectdlg.c:572
#, fuzzy
msgid "Freeciv Server :"
msgstr "Freeciv Server Liste"
-#: client/gui-sdl/connectdlg.c:588
+#: client/gui-sdl/connectdlg.c:589
#, fuzzy
msgid "Port :"
msgstr "Port:"
-#: client/gui-sdl/connectdlg.c:608 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr "Koble til"
-#: client/gui-sdl/connectdlg.c:794 client/gui-sdl/connectdlg.c:977
+#: client/gui-sdl/connectdlg.c:795 client/gui-sdl/connectdlg.c:978
#: client/gui-xaw/connectdlg.c:145
msgid "Next"
msgstr "Neste"
@@ -13590,7 +13827,7 @@ msgstr ""
#: client/gui-sdl/graphics.c:1021
#, c-format
-msgid "Unable to initialize SDL_ttf library: %s"
+msgid "Unable to initialize SDL_ttf library: %s"
msgstr ""
#: client/gui-sdl/graphics.c:1058
@@ -13677,12 +13914,6 @@ msgstr ""
msgid "Waiting for the beginning of the game"
msgstr ""
-#: client/gui-sdl/gui_string.c:608
-msgid ""
-"Couldn't find stdfont.ttf file. Please link/copy/move anyunicode ttf font to "
-"data dir as stdfont.ttf"
-msgstr ""
-
#. TRANS: Future Technology
#: client/gui-sdl/gui_tilespec.c:506
msgid "FT"
@@ -14297,12 +14528,12 @@ msgid "Leave Game"
msgstr "Lagre spill"
#: client/gui-sdl/optiondlg.c:2302 client/gui-sdl/pages.c:255
-#: client/gui-win32/connectdlg.c:1098 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1100 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:963
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
msgid "Start New Game"
msgstr "Start nytt spill"
@@ -14432,8 +14663,8 @@ msgstr ""
msgid "%s max rate : %d%%"
msgstr "%s maks nivå: %d%%"
-#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1081
-#: client/gui-win32/connectdlg.c:1089 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
+#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
msgid "Update"
msgstr "Oppdater"
@@ -14864,10 +15095,6 @@ msgstr "Endre alle"
msgid "Refresh"
msgstr "Oppfrisk"
-#: client/gui-win32/cityrep.c:882
-msgid "Select"
-msgstr "Velg"
-
#: client/gui-win32/cityrep.c:883
msgid "Configure"
msgstr "Innstillinger"
@@ -14917,56 +15144,56 @@ msgstr "Klarte ikke laste inn lagret spill."
msgid "Verify Password"
msgstr "Bekreft passord"
-#: client/gui-win32/connectdlg.c:912 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr "Servervalg"
-#: client/gui-win32/connectdlg.c:913
+#: client/gui-win32/connectdlg.c:915
msgid "Local Area Network"
msgstr "Lokalt Nettverk"
-#: client/gui-win32/connectdlg.c:947
+#: client/gui-win32/connectdlg.c:949
msgid "Welcome to Freeciv"
msgstr "Velkommen til Freeciv"
-#: client/gui-win32/connectdlg.c:965
+#: client/gui-win32/connectdlg.c:967
msgid "Load Saved Game"
msgstr "Fortsette et spill"
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
msgid "Connect To Network Game"
msgstr "Koble til nettverksspill"
-#: client/gui-win32/connectdlg.c:977
+#: client/gui-win32/connectdlg.c:979
msgid "Choose a nation to play"
msgstr "Velg en nasjon å spille"
-#: client/gui-win32/connectdlg.c:1012
+#: client/gui-win32/connectdlg.c:1014
msgid "Number of players (Including AI):"
msgstr "Antall spillere (inkludert AI):"
-#: client/gui-win32/connectdlg.c:1020
+#: client/gui-win32/connectdlg.c:1022
msgid "AI skill level:"
msgstr "AI vanskelighetsgrad:"
-#: client/gui-win32/connectdlg.c:1034 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
msgid "Game Options"
msgstr "Spill-innstillinger"
-#: client/gui-win32/connectdlg.c:1038
+#: client/gui-win32/connectdlg.c:1040
#, fuzzy
msgid "Start Game"
msgstr "Start nytt spill"
-#: client/gui-win32/connectdlg.c:1057
+#: client/gui-win32/connectdlg.c:1059
msgid "Login:"
msgstr "Navn:"
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
msgid "Host:"
msgstr "Tjener:"
-#: client/gui-win32/connectdlg.c:1060
+#: client/gui-win32/connectdlg.c:1062
msgid "Port:"
msgstr "Port:"
@@ -15230,10 +15457,6 @@ msgid_plural "(idle %d turns)"
msgstr[0] "(stille %d runde)"
msgstr[1] "(stille %d runde)"
-#: client/gui-win32/plrdlg.c:337 data/Freeciv.in:88
-msgid "Host"
-msgstr "Server"
-
# Endret til etterretning, var før Intelligens
#: client/gui-win32/plrdlg.c:355 data/Freeciv.in:3230
msgid "Intelligence"
@@ -17041,12 +17264,12 @@ msgstr ""
#: data/helpdata.txt:781
msgid ""
-" To have a diplomatic relationship with another player, you must fist "
-"establish first contact with that player. To establish first contact, you "
-"have to move one of your units next to a city or unit belonging to that "
-"player, or vice versa. Unless you establish an embassy with that player, you "
-"may again lose contact with them after a set number of turns without direct "
-"physical contact."
+" To have a diplomatic relationship with another player, you must first "
+"establish contact with that player. To establish contact, you have to move "
+"one of your units next to a city or unit belonging to that player, or vice "
+"versa. Unless you establish an embassy with that player, you may again lose "
+"contact with them after a set number of turns without direct physical "
+"contact."
msgstr ""
#: data/helpdata.txt:788
@@ -19818,7 +20041,7 @@ msgid "Communism"
msgstr "Kommunisme"
#: data/default/governments.ruleset:121 data/civ2/governments.ruleset:118
-#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:26
+#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:27
msgid "Comrade"
msgstr "Kamerat"
@@ -20805,6 +21028,11 @@ msgstr ""
"en oppgave, for da kan innsatsen sløses bort, og en stor gruppe nybyggere/"
"ingeniører er veldig utsatt for angrep."
+#: data/default/units.ruleset:238
+#, fuzzy
+msgid "?unit:Workers"
+msgstr "Arbeidere"
+
#: data/default/units.ruleset:264
msgid ""
"Workers are one of the key units in the game. They can be used to irrigate "
@@ -21460,6 +21688,11 @@ msgstr "Utforsker"
msgid "Explorers are very useful for mapping unknown territory."
msgstr "Utforskere er nyttig til å kartlegge ukjent territorie."
+#: data/default/units.ruleset:1864
+#, fuzzy
+msgid "?unit:Leader"
+msgstr "Leder"
+
#: data/default/units.ruleset:1892
msgid "This is you. If you lose this unit, you lose the game. So don't."
msgstr ""
@@ -21719,7 +21952,7 @@ msgid "Emir"
msgstr ""
#: data/nation/afghani.ruleset:25 data/nation/slovakian.ruleset:30
-#: data/nation/soviet.ruleset:27
+#: data/nation/soviet.ruleset:28
#, fuzzy
msgid "General Secretary"
msgstr "Generalsekretær"
@@ -21846,7 +22079,7 @@ msgstr "?plural:amerikanerne"
msgid ""
"According to legend, the Armenian people are the descendants of Haik - the "
"great-great-grandson of Noah. The modern Republic of Armenia gained "
-"independence from Soviet in 1991 AD"
+"independence from the Soviet Union in 1991."
msgstr ""
#: data/nation/assyrian.ruleset:3
@@ -22891,12 +23124,11 @@ msgstr "?plural:italienere"
#: data/nation/illyrian.ruleset:6
msgid ""
-"Illyrians were Indo-European tribes who appeared in the western part of the "
-"Balkan Peninsula before 1000 BC, including the Dalmatians to the north, "
-"Corcyra island and Ambracia bay in prehistoric Epirus to the south, mixing "
-"with Thracians in Dardania to the east, and settling Messapia across the "
-"Adriatic Sea. Illyrian kingdoms were independent for centuries, until "
-"conquered by the Roman Republic."
+"Illyrians were Indo-European tribes who appeared in the western part of the "
+"Balkan Peninsula before 1000 BC, including Corcyra island and Ambracia bay "
+"in prehistoric Epirus to the south. They mixed with Thracians in Dardania to "
+"the east, and settled Messapia across the Adriatic Sea. Illyrian kingdoms "
+"were independent for centuries, until conquered by the Roman Republic."
msgstr ""
#: data/nation/inca.ruleset:3
@@ -23213,7 +23445,7 @@ msgid ""
"1953."
msgstr ""
-#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:28
+#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:29
#, fuzzy
msgid "Great Leader"
msgstr "Underverk"
@@ -23386,9 +23618,9 @@ msgstr "?plural:malaysianerne"
msgid ""
"Sub-Saharan Africa has been a cultural and ethnical melting pot for "
"millennia. In medieval times, the region was home to a succession of empires "
-"called the Sahelian kingdoms. Of these, the Islamic Mali empire with it's "
+"called the Sahelian kingdoms. Of these, the Islamic Mali empire with its "
"capital in Timbuktu was the most influential. This empire reigned from the "
-"14th to the 17th century and was famed for it's wealth and benevolent kings. "
+"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 ""
@@ -23455,8 +23687,8 @@ msgstr "?plural:malaysianerne"
#: data/nation/mayan.ruleset:6
msgid ""
-"The Mayans were a Mesoamerican civilization. Famous for building great "
-"pyramids and palaces in the jungle."
+"The Mayans were a Mesoamerican civilization. They are famous for building "
+"great pyramids and palaces in the jungle."
msgstr ""
#: data/nation/mayan.ruleset:19
@@ -23997,6 +24229,16 @@ msgstr ""
"Dagens Tsjekkia var en del av Tsjekkiaslovakia før 1993, som var en del av "
"Østerrike-Ungarn før 1918."
+#: data/nation/slovakian.ruleset:26
+#, fuzzy
+msgid "?male:Leader"
+msgstr "Leder"
+
+#: data/nation/slovakian.ruleset:26
+#, fuzzy
+msgid "?female:Leader"
+msgstr "Kamerat"
+
#: data/nation/slovakian.ruleset:29
#, fuzzy
msgid "Pope"
@@ -24041,11 +24283,12 @@ msgstr "?plural:skottene"
#: data/nation/soviet.ruleset:6
msgid ""
-"Soviet Union's history starts in November 1917, when under Lenin's "
+"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 "
-"republics integrated into one country. Soviet Union became one of most "
-"powerful states in the 20th century. But by the end of 1991 due to many "
-"social shocks it disintegrated into fifteen independent countries"
+"republics integrated into one country. The Soviet Union became one of most "
+"powerful states in the 20th century, but by the end of 1991 it had "
+"disintegrated into fifteen independent countries due to social and economic "
+"problems."
msgstr ""
#: data/nation/spanish.ruleset:3
@@ -24453,8 +24696,8 @@ msgstr "?plural:italienere"
#: data/nation/westphalian.ruleset:6
msgid ""
-"Westphalia, before becoming a Prussian province, was the western region the "
-"duchy of Saxony. Present-day it consists of the Northern part of the largest "
+"Westphalia, before becoming a Prussian province, was the western region of "
+"the duchy of Saxony. Today it makes up the northern part of the largest "
"German federal state, North Rhine-Westphalia."
msgstr ""
@@ -24605,7 +24848,7 @@ msgid ""
"The flag and background color indicate what civilization the city\n"
"belongs to (this will be useful when you meet other civilizations).\n"
"The top row of the bar also shows the name and size of the city, and\n"
-"will show one or more starts to indicate if there are units in the\n"
+"will show one or more stars to indicate if there are units in the\n"
"city. The bottom row shows what the city is building, and how long it\n"
"will take; it also shows how long the city will take to grow to the\n"
"next largest size."
@@ -24661,7 +24904,7 @@ msgid ""
"Now your city has grown to size five. As cities get larger unrest\n"
"becomes a problem. A city of this size will usually have one unhappy\n"
"citizen unless pacifying effects are used; meaning one entertainer\n"
-"specialist is required to keep your citzens content. This is basically\n"
+"specialist is required to keep your citizens content. This is basically\n"
"a wasted citizen.\n"
"\n"
"There are several things that can be done about this. One quick fix\n"
@@ -24733,7 +24976,7 @@ msgid ""
"existing cities. Generally when building new cities you want to make\n"
"sure that all tiles are covered by at least one city, but after that\n"
"it is best that your cities overlap as little as possible. Spreading\n"
-"out cities properly gives each city access to more resrouces, allowing\n"
+"out cities properly gives each city access to more resources, allowing\n"
"them to grow to larger sizes."
msgstr ""
@@ -25047,6 +25290,67 @@ msgstr "Lag"
msgid "Team 31"
msgstr "Lag"
+#, fuzzy
+#~ msgid "Auth config filename \"%s\" not allowed!"
+#~ msgstr "Det navnet er ikke tillat."
+
+#, fuzzy
+#~ msgid "The %s of the %s (%s)"
+#~ msgstr "Styresett: %s Nasjon: %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Illegal alliance structure detected: %s alliance to %s reduced to peace "
+#~ "treaty."
+#~ msgstr ""
+#~ "Ulovlig allianser oppdaget: %ss allianse med %s redusert til fredsavtale."
+
+#, fuzzy
+#~ msgid "And, became more experienced!"
+#~ msgstr " og ble mer erfaren!"
+
+#~ msgid "We can't take control of server, attempting to kill it."
+#~ msgstr "Vi kan ikke ta kontroll over tjeneren, forsøker å avslutte den."
+
+#, fuzzy
+#~ msgid "%s territory"
+#~ msgstr "Territoriet til %s"
+
+#, fuzzy
+#~ msgid "%s territory (%d turn cease-fire)"
+#~ msgid_plural "%s territory (%d turn cease-fire)"
+#~ msgstr[0] "%s territorie (%d runde våpenhvile)"
+#~ msgstr[1] "%s territorie (%d runde våpenhvile)"
+
+#, fuzzy
+#~ msgid "%s territory (%s)"
+#~ msgstr "Territoriet til %s %s"
+
+#~ msgid "City: %s (%s)"
+#~ msgstr "By: %s (%s)"
+
+#, fuzzy
+#~ msgid "Unit: %s (%s)"
+#~ msgstr "Enhet: %s (%s)"
+
+#~ msgid "%s of the %s"
+#~ msgstr "Styresett: %s Nasjon: %s"
+
+#~ msgid "no maximum, "
+#~ msgstr "ingen maksimum, "
+
+#~ msgid "%d unit maximum, "
+#~ msgid_plural "%d units maximum, "
+#~ msgstr[0] "%d enhet maksimalt, "
+#~ msgstr[1] "%d enhet maksimalt, "
+
+#~ msgid "%d per unit). "
+#~ msgstr "%d per enhet)."
+
+#, fuzzy
+#~ msgid "Select same type"
+#~ msgstr "Velg en by"
+
#~ msgid "Units: "
#~ msgstr "Enheter: "
@@ -25158,11 +25462,6 @@ msgstr "Lag"
#~ msgid ", nation %s"
#~ msgstr ", nasjon: %s"
-# problem
-#, fuzzy
-#~ msgid ", team %s"
-#~ msgstr " nær %s"
-
#~ msgid "_Map"
#~ msgstr "_Kart"
@@ -27039,9 +27338,6 @@ msgstr "Lag"
#~ msgid "Error creating new AI player: %s\n"
#~ msgstr "Feil ved opprettelse av ny AI spiller: %s.\n"
-#~ msgid "Metaserver topic string set to '%s'."
-#~ msgstr "Metaserver emne-streng satt til '%s'."
-
#~ msgid "Metaserver topic string set to '%s', not reporting to metaserver."
#~ msgstr ""
#~ "Metaserver emne-treng satt til '%s', ikke rapportert til metaserver."
diff --git a/po/pl.gmo b/po/pl.gmo
index d4e5ba9..1d40239 100644
Binary files a/po/pl.gmo and b/po/pl.gmo differ
diff --git a/po/pl.po b/po/pl.po
index daece11..a7f9afc 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -17,7 +17,7 @@ msgid ""
msgstr ""
"Project-Id-Version: freeciv\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 07:45+0900\n"
+"POT-Creation-Date: 2009-03-29 21:13+0900\n"
"PO-Revision-Date: 2007-09-01 22:37+0300\n"
"Last-Translator: Mateusz Stefek <matusik_s at o2.pl>\n"
"Language-Team: none\n"
@@ -703,7 +703,7 @@ msgid "Road"
msgstr "Droga"
#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
-#: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
+#: client/gui-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"
@@ -720,7 +720,7 @@ msgid "Mine"
msgstr "Kopalnia"
#: common/terrain.c:396 common/unit.c:548 server/report.c:124
-#: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
+#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr "Zanieczyszczenie"
@@ -769,7 +769,7 @@ msgstr "Umocniony"
msgid "Sentry"
msgstr "Wartuj"
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:851 client/gui-sdl/menu.c:648
+#: common/unit.c:566 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"
@@ -786,7 +786,7 @@ msgstr "Zbadaj"
msgid "Transform"
msgstr "Zmień"
-#: common/unit.c:584 client/text.c:106 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:584 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"
@@ -860,11 +860,11 @@ msgstr "Bomba Atomowa"
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1406
+#: common/unittype.c:349 client/helpdata.c:1404
msgid " and "
msgstr " oraz "
-#: common/unittype.c:355 client/helpdata.c:1392
+#: common/unittype.c:355 client/helpdata.c:1390
msgid "?and:, "
msgstr "?and: oraz "
@@ -1496,104 +1496,99 @@ msgstr ""
#: server/auth.c:281
#, fuzzy, c-format
-msgid "Auth config filename \"%s\" not allowed!"
-msgstr "To imiÄ™ nie jest dozwolone."
-
-#: server/auth.c:286
-#, fuzzy, c-format
msgid "Cannot load auth config file \"%s\"!"
msgstr "Nie mogę znaleźć pliku audio %s"
-#: server/auth.c:397
+#: server/auth.c:392
#, c-format
msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
msgstr ""
-#: server/auth.c:404
+#: server/auth.c:399
#, fuzzy
msgid "Guests are not allowed on this server. Sorry."
msgstr "Nie masz uprawnień do sterowania pracą serwera."
-#: server/auth.c:406
+#: server/auth.c:401
#, fuzzy, c-format
msgid "%s was rejected: Guests not allowed."
msgstr "%s został odrzucony: Zduplikowany login [%s]."
-#: server/auth.c:425
+#: server/auth.c:420
#, c-format
msgid ""
"There was an error reading the user database, logging in as guest connection "
"'%s'."
msgstr ""
-#: server/auth.c:431
+#: server/auth.c:426
msgid ""
"There was an error reading the user database and guest logins are not "
"allowed. Sorry"
msgstr ""
-#: server/auth.c:434
+#: server/auth.c:429
#, c-format
msgid "%s was rejected: Database error and guests not allowed."
msgstr ""
-#: server/auth.c:441
+#: server/auth.c:436
#, c-format
msgid "Enter password for %s:"
msgstr ""
-#: server/auth.c:450
+#: server/auth.c:445
msgid "Enter a new password (and remember it)."
msgstr ""
-#: server/auth.c:456
+#: server/auth.c:451
msgid "This server allows only preregistered users. Sorry."
msgstr ""
-#: server/auth.c:459
+#: server/auth.c:454
#, c-format
msgid "%s was rejected: Only preregister users allowed."
msgstr ""
-#: server/auth.c:488 server/auth.c:547
+#: server/auth.c:483 server/auth.c:542
msgid "Sorry, too many wrong tries..."
msgstr ""
-#: server/auth.c:489
+#: server/auth.c:484
#, c-format
msgid "%s was rejected: Too many wrong password verifies for new user."
msgstr ""
-#: server/auth.c:505
+#: server/auth.c:500
msgid ""
"Warning: There was an error in saving to the database. Continuing, but your "
"stats will not be saved."
msgstr ""
-#: server/auth.c:549
+#: server/auth.c:544
#, fuzzy, c-format
msgid "%s was rejected: Too many wrong password tries."
msgstr "%s został odrzucony: Niezgodność protokołu."
-#: server/auth.c:558
+#: server/auth.c:553
msgid "Your password is incorrect. Try again."
msgstr ""
-#: server/auth.c:569
+#: server/auth.c:564
msgid "Sorry, your connection timed out..."
msgstr ""
-#: server/auth.c:571
+#: server/auth.c:566
#, c-format
msgid "%s was rejected: Connection timeout waiting for password."
msgstr ""
-#: server/auth.c:636
+#: server/auth.c:631
#, c-format
msgid "Your password is too short, the minimum length is %d. Try again."
msgstr ""
-#: server/auth.c:642
+#: server/auth.c:637
#, c-format
msgid ""
"The password must have at least %d capital letters, %d numbers, and be at "
@@ -2109,7 +2104,7 @@ msgstr "To jest serwer dla %s"
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:237 manual/civmanual.c:380
+#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
@@ -2139,14 +2134,14 @@ msgstr ""
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:241
+#: server/civserver.c:217 client/civclient.c:242
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:245
+#: server/civserver.c:221 client/civclient.c:246
msgid " -d, --debug NUM\tSet debug log level (0 to 3)\n"
msgstr " -d, --debug N\t\tUstaw poziom śledzenia (0,1,2)\n"
@@ -2154,7 +2149,7 @@ msgstr " -d, --debug N\t\tUstaw poziom śledzenia (0,1,2)\n"
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:248 manual/civmanual.c:382
+#: server/civserver.c:225 client/civclient.c:249 manual/civmanual.c:382
msgid " -h, --help\t\tPrint a summary of the options\n"
msgstr " -h, --help\t\tWypisz listÄ™ opcji.\n"
@@ -2205,11 +2200,11 @@ msgstr " -r, --read PLIK\tUruchom skrypt startowy PLIK\n"
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:267 manual/civmanual.c:383
+#: server/civserver.c:247 client/civclient.c:268 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:279
+#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, fuzzy, c-format
@@ -3465,7 +3460,7 @@ msgstr ""
"Morskie jednostki startowe nie sÄ… jeszcze zaimplementowane, sorry, nikt nie "
"otrzymał %s."
-#: server/gamehand.c:310 client/text.c:632
+#: server/gamehand.c:310 client/text.c:691
#, c-format
msgid "Year: %s"
msgstr "Rok: %s"
@@ -3749,10 +3744,10 @@ 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
-#, c-format
+#, fuzzy, c-format
msgid ""
-"Your nation is thrust into civil war, %s is declared the leader of the "
-"rebel states."
+"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
@@ -3851,7 +3846,7 @@ msgstr "Prędkość badań"
msgid "Literacy"
msgstr "Potrafiących czytać"
-#: server/report.c:121 client/cityrepdata.c:526 client/cityrepdata.c:527
+#: server/report.c:121 client/cityrepdata.c:524 client/cityrepdata.c:525
#: client/gui-sdl/cityrep.c:174
msgid "Production"
msgstr "Produkcja"
@@ -4006,7 +4001,7 @@ msgstr ""
"Napis określający raport demograficzny zawiera niedozwolone znaki. Spróbuj "
"\"help demography\"."
-#: server/report.c:743 server/report.c:766
+#: server/report.c:743 server/report.c:768
msgid "Demographics Report:"
msgstr "Raport Demograficzny:"
@@ -4014,10 +4009,12 @@ msgstr "Raport Demograficzny:"
msgid "Sorry, the Demographics report is unavailable."
msgstr "Sorry, Raport Demograficzny nie jest dostępny."
-#: server/report.c:748
-#, c-format
-msgid "The %s of the %s (%s)"
-msgstr "%s %s (%s)"
+#. TRANS: <nation adjective> <government name> (<year>).
+#. * E.g. "Polish Despotism (200 AD)".
+#: server/report.c:750
+#, fuzzy, c-format
+msgid "%s %s (%s)"
+msgstr "%s w %s (%s)\n"
#. TRANS: message about an installation error.
#: server/ruleset.c:163
@@ -4074,16 +4071,6 @@ msgstr ""
msgid "%s had invalid nation; changing to %s."
msgstr ""
-#. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4073
-#, fuzzy, c-format
-msgid ""
-"Illegal alliance structure detected: %s alliance to %s reduced to peace "
-"treaty."
-msgstr ""
-"Wykryto nieprawidłowy układ sojuszów: Sojusz pomiędzy %s i %s został "
-"zamieniony na pokój."
-
#: server/settings.c:32
msgid "Geological"
msgstr "Geologiczne"
@@ -5308,9 +5295,10 @@ msgid "Auto-save name prefix"
msgstr "Przedrostek autosave'a"
#: server/settings.c:1016
+#, fuzzy
msgid ""
-"Automatically saved games will have name \"<prefix><year>.sav\". This "
-"setting sets the <prefix> part."
+"Automatically saved games will have name \"<prefix>-T<turn>-Y<year>.sav\". "
+"This setting sets the <prefix> part."
msgstr ""
"Autosave'y będą miały nazwę \"<prefix><rok>.sav\". Gdzie <prefix> jest "
"podanym przedrostkiem."
@@ -5330,11 +5318,11 @@ msgstr ""
"\"civscore.log\". Po zakończeniu gry te statystyki mogą być użyte do "
"stworzenia wykresów."
-#: server/sernet.c:147
+#: server/sernet.c:150
msgid "Server cannot read standard input. Ignoring input."
msgstr "Serwer nie może czytać ze standardowego wejścia. Wejście ignorowane."
-#: server/sernet.c:922
+#: server/sernet.c:929
#, c-format
msgid "Server: bad address: [%s:%d]."
msgstr "Serwer: zły adres: [%s:%d]."
@@ -5460,114 +5448,114 @@ msgstr ""
"Gracz z twojego zespołu %s wypowiedział wojnę %s. Jesteś zmuszony zerwać "
"sojusz z %s."
-#: server/srv_main.c:928
+#: server/srv_main.c:961
#, c-format
msgid "Failed saving game as %s"
msgstr "Nie mogę zachować gry jako %s"
-#: server/srv_main.c:930
+#: server/srv_main.c:963
#, c-format
msgid "Game saved as %s"
msgstr "Gra zachowana jako %s"
-#: server/srv_main.c:962
+#: server/srv_main.c:994
msgid "The game is already running."
msgstr "Gra jest już uruchomiona."
-#: server/srv_main.c:970
+#: server/srv_main.c:1002
#, 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:977
+#: server/srv_main.c:1009
msgid "Starting game."
msgstr "StartujÄ™ grÄ™."
-#: server/srv_main.c:1039
+#: server/srv_main.c:1071
#, c-format
msgid "request for unknown report (type %d)"
msgstr "Żądanie nieprawidłowego raportu (typ %d)"
-#: server/srv_main.c:1104
+#: server/srv_main.c:1136
#, c-format
msgid "Warning: rejecting old client %s"
msgstr "Ostrzeżenie: Odrzucam przestarzałego klienta %s"
-#: server/srv_main.c:1206
+#: server/srv_main.c:1238
#, 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:1306
+#: server/srv_main.c:1338
msgid "Please choose a non-blank name."
msgstr "Proszę wybrać niepustą nazwę."
-#: server/srv_main.c:1322
+#: server/srv_main.c:1354
msgid "That nation is already in use."
msgstr "Naród jest już używany."
-#: server/srv_main.c:1338
+#: server/srv_main.c:1370
#, 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:1359
+#: server/srv_main.c:1391
msgid "Please choose a name containing only ASCII characters."
msgstr "Proszę wybrać nazwę zawierającą jedynie znaki ASCII."
-#: server/srv_main.c:1458
+#: server/srv_main.c:1490
#, 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:1464
+#: server/srv_main.c:1496
#, c-format
msgid "%s nation is already in use."
msgstr "Naród %s jest już używany."
-#: server/srv_main.c:1482
+#: server/srv_main.c:1514
#, c-format
msgid "%s is the %s ruler %s."
msgstr "%s to %s przywódca %s."
-#: server/srv_main.c:1538
+#: server/srv_main.c:1570
#, 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:1582 server/srv_main.c:1586
+#: server/srv_main.c:1614 server/srv_main.c:1618
#, 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:1728
+#: server/srv_main.c:1760
#, c-format
msgid "Player %d"
msgstr "Gracz %d"
-#: server/srv_main.c:1739 server/srv_main.c:1745
+#: server/srv_main.c:1771 server/srv_main.c:1777
#, c-format
msgid "%s rules the %s."
msgstr "%s rzÄ…dzi %s."
-#: server/srv_main.c:1910
+#: server/srv_main.c:1942
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
msgstr ""
-#: server/srv_main.c:1961
+#: server/srv_main.c:1993
#, c-format
msgid "Sending info to metaserver [%s]"
msgstr "Wysyłam informację do metaserwera [%s]"
-#: server/srv_main.c:1992
+#: server/srv_main.c:2024
msgid "The game is over..."
msgstr "Gra skończona..."
-#: server/srv_main.c:2205
+#: server/srv_main.c:2237
msgid "Now accepting new client connections."
msgstr "Teraz oczekuję nowych połączeń."
@@ -6389,24 +6377,24 @@ 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:2030 client/gui-sdl/plrdlg.c:645
+#: 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
msgid "AI"
msgstr "AI"
#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
+#: client/gui-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
msgid "Human"
msgstr "Człowiek"
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
-#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
+#: 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
msgid "Alive"
msgstr "Żywy"
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
#: client/gui-win32/connectdlg.c:200
msgid "Dead"
msgstr "Martwy"
@@ -6676,9 +6664,9 @@ 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:242
-#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
-#: client/text.c:1201
+#: 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
#, c-format
msgid "?clistmore:, %s"
msgstr ", %s"
@@ -6931,7 +6919,7 @@ msgstr "Tylko %s mogą atakować z morza."
msgid "Cannot attack from sea."
msgstr "Nie możesz atakować z morza."
-#: server/unithand.c:996 server/unittools.c:2103
+#: server/unithand.c:996 server/unittools.c:2137
msgid "Cannot attack unless you declare war first."
msgstr "Nie możesz atakować zanim nie wypowiesz wojny."
@@ -7036,106 +7024,106 @@ msgid "%s was upgraded for free to %s."
msgstr "Jednostka %s została za darmo ulepszona do %s."
#: server/unittools.c:297
-#, c-format
-msgid "Not enough gold. %s disbanded"
+#, fuzzy, c-format
+msgid "Not enough gold to pay upkeep for %s. Unit disbanded."
msgstr "Brak złota. Rozwiązano jednostkę %s"
-#: server/unittools.c:342
+#: server/unittools.c:343
#, c-format
msgid "Your %s has run out of hit points."
msgstr "Twój %s utracił wszystkie hitpointy."
-#: server/unittools.c:358
+#: server/unittools.c:359
#, c-format
msgid "Your %s has been lost on the high seas."
msgstr "Twoja %s zatonęła na szerokich morzach."
-#: server/unittools.c:365
+#: server/unittools.c:366
#, c-format
msgid "Your %s survived on the high seas and became more experienced!"
msgstr ""
"Twoja %s nie zatonęła na szerokich morzach. Załoga zyskała nowe "
"doświadczenie."
-#: server/unittools.c:376
+#: server/unittools.c:377
#, c-format
msgid "Your %s has been lost on unsafe terrain."
msgstr "Twoja jednostka %s zaginęła w niebezpiecznym terenie."
-#: server/unittools.c:430
+#: server/unittools.c:431
#, c-format
msgid "Your %s has returned to refuel."
msgstr "Twój %s powrócił, by zatankować."
-#: server/unittools.c:454
+#: server/unittools.c:455
#, c-format
msgid "Your %s has run out of fuel."
msgstr "Skończyło się paliwo jednostce %s."
-#. TRANS: And, <the unit> became ...
-#: server/unittools.c:616
-#, fuzzy
-msgid "And, became more experienced!"
-msgstr "Jednostka zyskała doświadczenie."
-
#. TRANS: Your <unit> became ...
-#: server/unittools.c:620
+#: server/unittools.c:619
#, c-format
msgid "Your %s became more experienced!"
msgstr "Twoi %s są teraz bardziej doświadczeni."
-#: server/unittools.c:1011
+#: server/unittools.c:1009
#, c-format
msgid "Teleported your %s to %s."
msgstr "Przeniesiono jednostkÄ™ %s do miasta %s."
-#: server/unittools.c:1041
+#. TRANS: A unit is moved to resolve stack conflicts.
+#: server/unittools.c:1065
+#, fuzzy, c-format
+msgid "Moved your %s."
+msgstr "RozwiÄ…zano twojÄ… jednostkÄ™ %s."
+
+#: server/unittools.c:1076
#, c-format
msgid "Disbanded your %s."
msgstr "RozwiÄ…zano twojÄ… jednostkÄ™ %s."
-#: server/unittools.c:1363
+#: server/unittools.c:1397
#, 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:1367
+#: server/unittools.c:1401
#, 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:1469
+#: server/unittools.c:1503
#, 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:1478
+#: server/unittools.c:1512
#, c-format
msgid "%s lost when %s was lost."
msgstr "Jednostka %s utracona razem z %s."
-#: server/unittools.c:1527
+#: server/unittools.c:1561
#, 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:1545
+#: server/unittools.c:1579
#, 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:1554 server/unittools.c:1612
+#: server/unittools.c:1588 server/unittools.c:1646
#, 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:1588
+#: server/unittools.c:1622
#, fuzzy, c-format
msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
msgid_plural ""
@@ -7152,14 +7140,14 @@ msgstr[2] ""
#. TRANS: "Cannon lost when the Polish Destroyer
#. * attacked the German Musketeers."
-#: server/unittools.c:1621
+#: server/unittools.c:1655
#, 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:1636
+#: server/unittools.c:1670
#, 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."
@@ -7167,7 +7155,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:1646
+#: server/unittools.c:1680
#, 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."
@@ -7181,7 +7169,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:1660
+#: server/unittools.c:1694
#, 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."
@@ -7189,196 +7177,196 @@ 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:1928
+#: server/unittools.c:1962
#, c-format
msgid "Your %s was nuked by %s."
msgstr "Twoja jednostka %s została zbombardowana przez %s."
-#: server/unittools.c:1931 server/unittools.c:1947
+#: server/unittools.c:1965 server/unittools.c:1981
msgid "yourself"
msgstr "ciebie"
-#: server/unittools.c:1935
+#: server/unittools.c:1969
#, fuzzy, c-format
msgid "The %s %s was nuked."
msgstr "Jednostka %s %s zniszczona."
-#: server/unittools.c:1944
+#: server/unittools.c:1978
#, c-format
msgid "%s was nuked by %s."
msgstr "Miasto %s zostało zniszczone przez %s."
-#: server/unittools.c:1952
+#: server/unittools.c:1986
#, c-format
msgid "You nuked %s."
msgstr "Zniszczyłeś miasto %s."
-#: server/unittools.c:1993
+#: server/unittools.c:2027
#, fuzzy, c-format
msgid "The %s detonated a nuke!"
msgstr "%s użył(a) broni jądrowej!"
-#: server/unittools.c:2017
+#: server/unittools.c:2051
#, c-format
msgid "%s transported successfully."
msgstr "Jednostka %s bezpiecznie przetransportowana."
-#: server/unittools.c:2069
+#: server/unittools.c:2103
msgid "This unit type can not be paradropped."
msgstr "Ta jednostka nie może być przerzucona."
#
-#: server/unittools.c:2079
+#: server/unittools.c:2113
#, fuzzy
msgid "You cannot paradrop a unit that is transporting other units."
msgstr "Nie możesz przerzucać jednostki transportującej."
-#: server/unittools.c:2085
+#: server/unittools.c:2119
msgid "The destination location is not known."
msgstr "Cel jest nieznany."
#
-#: server/unittools.c:2092
+#: server/unittools.c:2126
#, c-format
msgid "This unit cannot paradrop into %s."
msgstr "Jednostki nie można przerzucić do %s."
-#: server/unittools.c:2112
+#: server/unittools.c:2146
#, 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:2123
+#: server/unittools.c:2157
#, 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:2136
+#: server/unittools.c:2170
#, 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:2158
+#: server/unittools.c:2192
#, c-format
msgid "You found %d gold."
msgstr "Znalazłeś %d złota."
-#: server/unittools.c:2175
+#: server/unittools.c:2209
#, c-format
msgid "You found %s in ancient scrolls of wisdom."
msgstr "Odkryłeś technologię %s w pradawnych zbiorach wiedzy."
-#: server/unittools.c:2182
+#: server/unittools.c:2216
#, 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:2196
+#: server/unittools.c:2230
msgid "A band of friendly mercenaries joins your cause."
msgstr "Przyjaźnie nastawieni najemnicy przyłączyli się do ciebie."
-#: server/unittools.c:2214
+#: server/unittools.c:2248
msgid "An abandoned village is here."
msgstr "Ta wioska jest opuszczona."
-#: server/unittools.c:2224
+#: server/unittools.c:2258
msgid "You have unleashed a horde of barbarians!"
msgstr "Sprowokowałeś barbarzyńców do ataku!"
-#: server/unittools.c:2227
+#: server/unittools.c:2261
#, c-format
msgid "Your %s has been killed by barbarians!"
msgstr "%s został(a) zabity przez barbarzyńców!"
-#: server/unittools.c:2243
+#: server/unittools.c:2277
msgid "You found a friendly city."
msgstr "Znalazłeś przyjazne miasto."
-#: server/unittools.c:2257
+#: server/unittools.c:2291
msgid "Friendly nomads are impressed by you, and join you."
msgstr "Przyjaźni koczownicy są zachwyceni tobą i przyłączają się."
-#: server/unittools.c:2282
+#: server/unittools.c:2316
msgid "Your overflight frightens the tribe; they scatter in terror."
msgstr "Twój przelot wystraszył tubylców; uciekli wystraszeni."
-#: server/unittools.c:2540
+#: server/unittools.c:2574
#, 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:2989
+#: server/unittools.c:3023
#, 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:3041
+#: server/unittools.c:3075
#, 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:3054
+#: server/unittools.c:3088
#, 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:3068
+#: server/unittools.c:3102
#, 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:3078
+#: server/unittools.c:3112
#, 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:3104
+#: server/unittools.c:3138
#, c-format
msgid "Orders for %s aborted because of failed move."
msgstr "Jednostka %s nie wykonała rozkazu - ruch niemożliwy."
-#: server/unittools.c:3145
+#: server/unittools.c:3179
#, c-format
msgid "Attempt to change homecity for %s failed."
msgstr "Nie udało się zmienić miasta macierzystego jednostce %s."
-#: server/unittools.c:3156
+#: server/unittools.c:3190
#, 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:3168
+#: server/unittools.c:3202
#, 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:3177
+#: server/unittools.c:3211
#, c-format
msgid "Your %s has invalid orders."
msgstr "Twoja jednostka %s ma nieprawidłowe rozkazy."
-#: server/generator/mapgen.c:1737
+#: 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."
-#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
+#: server/generator/mapgen.c:1969 server/generator/mapgen.c:2039
#, c-format
msgid "Falling back to generator %d."
msgstr "Powrót do generatora %d."
-#: server/generator/mapgen.c:2025
+#: server/generator/mapgen.c:2059
msgid "Generator 3 didn't place all big islands."
msgstr "Generator 3 nie umiejscowił wszystkich dużych wysp."
-#: server/generator/mapgen.c:2054
+#: server/generator/mapgen.c:2088
#, c-format
msgid "Generator 3 left %li landmass unplaced."
msgstr "Generator 3 pozostawił %li masywów lądowych bez umiejscowienia."
@@ -7490,7 +7478,7 @@ msgstr[0] "%d tura"
msgstr[1] "%d tury"
msgstr[2] "%d tur"
-#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:631
#: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
@@ -7609,362 +7597,362 @@ msgstr "?city_state:Spokój"
msgid "(worklist)"
msgstr "(schemat)"
-#: client/cityrepdata.c:447
-msgid "Special"
-msgstr "Specjalne"
+#: client/cityrepdata.c:446
+msgid "?city:Name"
+msgstr "?city:Nazwa"
+
+#: client/cityrepdata.c:446 client/gui-sdl/cityrep.c:169
+msgid "City Name"
+msgstr "Nazwa miasta"
#: client/cityrepdata.c:448
#, fuzzy
-msgid "?entertainers/scientists/taxmen:E/S/T"
-msgstr "K/N/P"
-
-#: client/cityrepdata.c:449
-msgid "Entertainers, Scientists, Taxmen"
-msgstr "Komicy, Naukowcy, Podatnicy"
+msgid "?size [short]:Sz"
+msgstr "?size:Rz"
-#: client/cityrepdata.c:452
-#, fuzzy
-msgid "Concise + Rapture, - Disorder"
-msgstr "Zwięźle + Entuzjazm, - Zamieszki"
+#: client/cityrepdata.c:448
+msgid "Size"
+msgstr "Rozmiar"
-#: client/cityrepdata.c:454 client/plrdlg_common.c:261
+#: client/cityrepdata.c:450 client/plrdlg_common.c:261
#: client/gui-win32/plrdlg.c:337
msgid "State"
msgstr "Stan"
-#: client/cityrepdata.c:454
+#: client/cityrepdata.c:450
msgid "Rapture/Peace/Disorder"
msgstr "Entuzjazm/Pokój/Zamieszki"
+#: client/cityrepdata.c:452
+#, fuzzy
+msgid "Concise *=Rapture, X=Disorder"
+msgstr "Zwięźle + Entuzjazm, - Zamieszki"
+
+#: client/cityrepdata.c:456
+msgid "Special"
+msgstr "Specjalne"
+
#: client/cityrepdata.c:457
#, fuzzy
+msgid "?entertainers/scientists/taxmen:E/S/T"
+msgstr "K/N/P"
+
+#: client/cityrepdata.c:458
+msgid "Entertainers, Scientists, Taxmen"
+msgstr "Komicy, Naukowcy, Podatnicy"
+
+#: client/cityrepdata.c:461
+#, fuzzy
msgid "?Happy workers:H"
msgstr "?Happy workers:S"
-#: client/cityrepdata.c:457
+#: client/cityrepdata.c:461
msgid "Workers: Happy"
msgstr "Robotnicy: Szczęśliwi"
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
#, fuzzy
msgid "?Content workers:C"
msgstr "?Content workers:Z"
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
msgid "Workers: Content"
msgstr "Robotnicy: Zadowoleni"
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
#, fuzzy
msgid "?Unhappy workers:U"
msgstr "?Unhappy workers:N"
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
msgid "Workers: Unhappy"
msgstr "Robotnicy: Nieszczęśliwi"
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
msgid "?Angry workers:A"
msgstr "?Angry workers:Ź"
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
msgid "Workers: Angry"
msgstr "Robotnicy: Źli"
-#: client/cityrepdata.c:465 client/gui-xaw/citydlg.c:2401
-#: data/default/units.ruleset:238
-msgid "Workers"
+#: client/cityrepdata.c:469 client/gui-xaw/citydlg.c:2402
+#, fuzzy
+msgid "?city:Workers"
msgstr "Robotnicy"
-#: client/cityrepdata.c:466
+#: client/cityrepdata.c:470
msgid "?happy/content/unhappy/angry:H/C/U/A"
msgstr "?happy/content/unhappy/angry:S/Z/N/Ź"
-#: client/cityrepdata.c:467
+#: client/cityrepdata.c:471
msgid "Workers: Happy, Content, Unhappy, Angry"
msgstr "Robotnicy: Szczęśliwi, Zadowoleni, Niezadowoleni, Źli"
# To jest niebezbieczne!
-#: client/cityrepdata.c:470 client/cityrepdata.c:472
+#: client/cityrepdata.c:474 client/cityrepdata.c:476
msgid "Best"
msgstr "Max"
-#: client/cityrepdata.c:470
+#: client/cityrepdata.c:474
msgid "attack"
msgstr "atak"
-#: client/cityrepdata.c:471
+#: client/cityrepdata.c:475
msgid "Best attacking units"
msgstr "Najlepsze siły ataku"
-#: client/cityrepdata.c:472
+#: client/cityrepdata.c:476
msgid "defense"
msgstr "obrona"
-#: client/cityrepdata.c:473
+#: client/cityrepdata.c:477
msgid "Best defending units"
msgstr "Najlepsze siły obrony"
-#: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
-#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
-#: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
-#: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
-#: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
-#: client/gui-win32/menu.c:351 client/gui-win32/repodlgs.c:616
-#: client/gui-win32/repodlgs.c:707 client/gui-win32/repodlgs.c:716
-#: client/gui-xaw/menu.c:157 client/gui-xaw/menu.c:219
-#: client/gui-xaw/menu.c:242 client/gui-xaw/repodlgs.c:881
-#: client/gui-xaw/repodlgs.c:1069 data/Freeciv.in:1895 data/helpdata.txt:909
+#: client/cityrepdata.c:478 client/cityrepdata.c:482
+#: client/gui-gtk-2.0/cityrep.c:1437 client/gui-gtk-2.0/cityrep.c:1456
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-gtk-2.0/cityrep.c:1494
+#: client/gui-gtk-2.0/cityrep.c:1514 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/repodlgs.c:960 client/gui-sdl/helpdlg.c:688
+#: client/gui-sdl/mapctrl.c:1605 client/gui-sdl/optiondlg.c:1827
+#: client/gui-sdl/repodlgs.c:356 client/gui-win32/menu.c:351
+#: client/gui-win32/repodlgs.c:616 client/gui-win32/repodlgs.c:707
+#: client/gui-win32/repodlgs.c:716 client/gui-xaw/menu.c:157
+#: client/gui-xaw/menu.c:219 client/gui-xaw/menu.c:242
+#: client/gui-xaw/repodlgs.c:881 client/gui-xaw/repodlgs.c:1069
+#: data/Freeciv.in:1895 data/helpdata.txt:909
msgid "Units"
msgstr "Oddziały"
#. TRANS: Header "Number of units inside city"
-#: client/cityrepdata.c:476
+#: client/cityrepdata.c:480
#, fuzzy
msgid "?Present (units):Here"
msgstr "?Present (units):#Jedn"
-#: client/cityrepdata.c:477
+#: client/cityrepdata.c:481
msgid "Number of units present"
msgstr "Liczba jednostek w mieście"
#. TRANS: Header "Number of units supported by given city"
-#: client/cityrepdata.c:480
+#: client/cityrepdata.c:484
#, fuzzy
msgid "?Supported (units):Owned"
msgstr "?Supported (units):Utrz"
-#: client/cityrepdata.c:481
+#: client/cityrepdata.c:485
msgid "Number of units supported"
msgstr "Liczba jednostek na utrzymaniu"
#. TRANS: Header "It will take this many turns before city grows"
-#: client/cityrepdata.c:484
+#: client/cityrepdata.c:488
#, fuzzy
msgid "?food (population):Grow"
msgstr "Wzrost"
-#: client/cityrepdata.c:485 client/cityrepdata.c:530
+#: client/cityrepdata.c:489 client/cityrepdata.c:528
#, fuzzy
msgid "?Stock/Target:(Have/Need)"
msgstr "(Stan/Cel)"
-#: client/cityrepdata.c:486
+#: client/cityrepdata.c:490
msgid "Turns until growth/famine"
msgstr "Czas do wzrostu/głodu"
-#: client/cityrepdata.c:488
-#, fuzzy
-msgid "?size [short]:Sz"
-msgstr "?size:Rz"
-
-#: client/cityrepdata.c:488
-msgid "Size"
-msgstr "Rozmiar"
-
-#: client/cityrepdata.c:492
-msgid "?city:Name"
-msgstr "?city:Nazwa"
-
-#: client/cityrepdata.c:492 client/gui-sdl/cityrep.c:169
-msgid "City Name"
-msgstr "Nazwa miasta"
-
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
msgid "Surplus"
msgstr "Nadwyżka"
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
#, fuzzy
msgid "?food/production/trade:F/P/T"
msgstr "?food/production/trade:Å»/P/H"
-#: client/cityrepdata.c:496
+#: client/cityrepdata.c:494
msgid "Surplus: Food, Production, Trade"
msgstr "Nadwyżka: Żywność, Produkcja, Handel"
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
#, fuzzy
msgid "?Food surplus [short]:+F"
msgstr "?Food surplus [short]:+Å»"
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
msgid "Surplus: Food"
msgstr "Nadwyżka: Żywność"
-#: client/cityrepdata.c:500
+#: client/cityrepdata.c:498
#, fuzzy
msgid "?Production surplus [short]:+P"
msgstr "?Production surplus [short]:+P"
-#: client/cityrepdata.c:501
+#: client/cityrepdata.c:499
msgid "Surplus: Production"
msgstr "Nadwyżka: Produkcja"
-#: client/cityrepdata.c:502
+#: client/cityrepdata.c:500
#, fuzzy
msgid "?Production loss (waste) [short]:-P"
msgstr "-P"
-#: client/cityrepdata.c:503
+#: client/cityrepdata.c:501
msgid "Waste"
msgstr "Straty"
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
#, fuzzy
msgid "?Trade surplus [short]:+T"
msgstr "?Trade surplus [short]:+H"
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
msgid "Surplus: Trade"
msgstr "Nadwyżka: Handel"
-#: client/cityrepdata.c:506
+#: client/cityrepdata.c:504
#, fuzzy
msgid "?Trade loss (corruption) [short]:-T"
msgstr "-H"
-#: client/cityrepdata.c:507
+#: client/cityrepdata.c:505
msgid "Corruption"
msgstr "Korupcja"
-#: client/cityrepdata.c:509 client/gui-gtk-2.0/repodlgs.c:654
+#: client/cityrepdata.c:507 client/gui-gtk-2.0/repodlgs.c:654
#: client/gui-sdl/mapctrl.c:1400 client/gui-win32/repodlgs.c:334
#: client/gui-xaw/menu.c:222 client/gui-xaw/repodlgs.c:644
#: client/gui-xaw/repodlgs.c:773 data/Freeciv.in:1819
msgid "Economy"
msgstr "Ekonomia"
-#: client/cityrepdata.c:509
+#: client/cityrepdata.c:507
msgid "?gold/luxury/science:G/L/S"
msgstr "?gold/luxury/science:Z/L/N"
-#: client/cityrepdata.c:510
+#: client/cityrepdata.c:508
msgid "Economy: Gold, Luxuries, Science"
msgstr "Ekonomia: ZÅ‚oto, Luksusy, Nauka"
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
msgid "?Gold:G"
msgstr "?Gold:Z"
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
msgid "Economy: Gold"
msgstr "Ekonomia: ZÅ‚oto"
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
msgid "?Luxury:L"
msgstr "?Luxury:L"
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
msgid "Economy: Luxury"
msgstr "Ekonomia: Luksus"
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
#, fuzzy
msgid "?Science:S"
msgstr "?Science:N"
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
msgid "Economy: Science"
msgstr "Ekonomia: Nauka"
-#: client/cityrepdata.c:518
+#: client/cityrepdata.c:516
#, fuzzy
msgid "?number_trade_routes:n"
msgstr "?number_trade_routes:n"
-#: client/cityrepdata.c:518
+#: client/cityrepdata.c:516
#, fuzzy
msgid "?number_trade_routes:R"
msgstr "?number_trade_routes:t.h."
-#: client/cityrepdata.c:519
+#: client/cityrepdata.c:517
msgid "Number of Trade Routes"
msgstr "Liczba szlaków handlowych"
-#: client/cityrepdata.c:521
+#: client/cityrepdata.c:519
msgid "?pollution [short]:Pol"
msgstr "?pollution [short]:Zan"
-#: client/cityrepdata.c:523
+#: client/cityrepdata.c:521
msgid "?cma:Governor"
msgstr "?cma:ZarzÄ…dca"
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
-#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
-#: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
-#: data/Freeciv.in:1459 data/helpdata.txt:820
+#: client/cityrepdata.c:521 client/gui-gtk-2.0/cityrep.c:1766
+#: client/gui-sdl/citydlg.c:3809 client/gui-sdl/cma_fe.c:858
+#: client/gui-win32/citydlg.c:726 data/Freeciv.in:1459 data/helpdata.txt:820
msgid "Citizen Governor"
msgstr "ZarzÄ…dca"
-#: client/cityrepdata.c:526
+#: client/cityrepdata.c:524
#, fuzzy
msgid "Turns/Buy"
msgstr "Tury/Cena"
-#: client/cityrepdata.c:529 client/cityrepdata.c:531
+#: client/cityrepdata.c:527 client/cityrepdata.c:529
msgid "Currently Building"
msgstr "W budowie"
-#: client/cityrepdata.c:575
+#: client/cityrepdata.c:573
msgid "?specialist:S"
msgstr "?specialist:S"
-#: client/cityrepdata.c:578
+#: client/cityrepdata.c:576
#, fuzzy
msgid "Specialists"
msgstr "Specjaliści"
-#: client/civclient.c:239
+#: client/civclient.c:240
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr " -a, --autoconnect\tPomiń okno połączenia\n"
-#: client/civclient.c:249
+#: client/civclient.c:250
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:251
+#: client/civclient.c:252
msgid " -m, --meta HOST\tConnect to the metaserver at HOST\n"
msgstr " -m, --meta HOST\tPołącz z metaserwerem HOST\n"
-#: client/civclient.c:253
+#: client/civclient.c:254
msgid " -n, --name NAME\tUse NAME as name\n"
msgstr " -n, --name NAME\tUżyj NAME jako imienia\n"
-#: client/civclient.c:255
+#: client/civclient.c:256
#, 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:257
+#: client/civclient.c:258
#, 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:259
+#: client/civclient.c:260
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:262
+#: client/civclient.c:263
#, 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:264
+#: client/civclient.c:265
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:265
+#: client/civclient.c:266
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:268
+#: client/civclient.c:269
#, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -7974,144 +7962,154 @@ 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:273
+#: client/civclient.c:274
#, fuzzy, c-format
msgid "Report bugs at %s\n"
msgstr "Zgłaszanie błędów na adres <%s>.\n"
-#: client/civclient.c:297
+#: client/civclient.c:298
#, c-format
msgid "Invalid port \"%s\" specified with --port option.\n"
msgstr "Nieprawidłowy port \"%s\" podany w opcji --port.\n"
-#: client/civclient.c:299 client/civclient.c:314
+#: client/civclient.c:300 client/civclient.c:315
msgid "Try using --help.\n"
msgstr "Spróbuj --help.\n"
-#: client/civclient.c:312
+#: client/civclient.c:313
#, 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:325
+#: client/civclient.c:326
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr "Nierozpoznana opcja: \"%s\"\n"
-#: client/civclient.c:539
+#: client/civclient.c:391
+#, fuzzy, c-format
+msgid "Updating old metaserver address \"%s\"."
+msgstr "metaserver <adres>"
+
+#: client/civclient.c:394
+#, fuzzy, c-format
+msgid "Default metaserver has been set to \"%s\"."
+msgstr "Opcje: %s zostało ustawione na \"%s\"."
+
+#: client/civclient.c:550
msgid "Game started."
msgstr "Gra rozpoczęta."
-#: client/civclient.c:577
+#: client/civclient.c:588
msgid "There was an error while auto connecting; aborting."
msgstr "Wystąpił błąd podczas automatycznego łączenia; kończę pracę."
-#: client/climisc.c:176
+#: client/climisc.c:177
#, c-format
msgid "Changing production of every %s into %s."
msgstr "Zmiana produkcji każdego %s na %s."
-#: client/climisc.c:214
+#: client/climisc.c:215
msgid "?embassy:Both"
msgstr "?embassy:Nawzajem"
-#: client/climisc.c:216
+#: client/climisc.c:217
msgid "?embassy:Yes"
msgstr "?embassy:Tak"
-#: client/climisc.c:219
+#: client/climisc.c:220
msgid "?embassy:With Us"
msgstr "?embassy:Z Nami"
-#: client/climisc.c:222
+#: client/climisc.c:223
msgid "?embassy:Contact"
msgstr "?embassy:Kontakt"
-#: client/climisc.c:224
+#: client/climisc.c:225
msgid "?embassy:No Contact"
msgstr "?embassy:Brak Kontaktu"
-#: client/climisc.c:236
+#: client/climisc.c:237
msgid "?vision:Both"
msgstr "?vision:Nawzajem"
-#: client/climisc.c:238
+#: client/climisc.c:239
msgid "?vision:To Them"
msgstr "?vision:Dla Nich"
-#: client/climisc.c:241
+#: client/climisc.c:242
msgid "?vision:To Us"
msgstr "?vision:Dla Nas"
-#: client/climisc.c:257 client/climisc.c:264
+#: client/climisc.c:258 client/climisc.c:265
#, c-format
msgid "The %s give %s"
msgstr "%s dajÄ… %s"
-#: client/climisc.c:268
+#: client/climisc.c:269
#, c-format
msgid "The %s give unknown city."
msgstr "%s dajÄ… nieznane miasto."
-#: client/climisc.c:273
+#: client/climisc.c:274
#, c-format
msgid "The %s give %d gold"
msgstr "%s dają %d złota"
-#: client/climisc.c:278
+#: client/climisc.c:279
#, c-format
msgid "The %s give their worldmap"
msgstr "%s dają swoją mapę świata"
-#: client/climisc.c:282
+#: client/climisc.c:283
#, c-format
msgid "The %s give their seamap"
msgstr "%s dajÄ… swojÄ… mapÄ™ morskÄ…"
-#: client/climisc.c:286
+#: client/climisc.c:287
msgid "The parties agree on a cease-fire"
msgstr "Strony zgodziły się na zawieszenie broni"
-#: client/climisc.c:289
+#: client/climisc.c:290
msgid "The parties agree on a peace"
msgstr "Strony zgodziły się na pokój"
-#: client/climisc.c:292
+#: client/climisc.c:293
msgid "The parties create an alliance"
msgstr "Strony przyjęły sojusz"
-#: client/climisc.c:295
+#: client/climisc.c:296
#, c-format
msgid "The %s give shared vision"
msgstr "%s dajÄ… widok dzielony"
-#: client/climisc.c:299
+#: client/climisc.c:300
#, c-format
msgid "The %s give an embassy"
msgstr "%s dajÄ… ambasadÄ™"
-#: client/climisc.c:902
+#: client/climisc.c:906
msgid "Popup Request"
msgstr "Informacja w oknie"
-#: client/climisc.c:932
+#: client/climisc.c:936
msgid "Exporting output window to civgame.log ..."
msgstr "Eksportowanie zawartości okna komunikatów do civgame.log ..."
-#: client/climisc.c:936
+#: client/climisc.c:940
msgid "Export complete."
msgstr "Eksport został zakończony."
-#: client/climisc.c:938
+#: client/climisc.c:942
msgid "Export failed, couldn't write to file."
msgstr "Zapis nieudany, nie można zapisać do pliku."
-#: client/climisc.c:1038
+#: client/climisc.c:1042
#, c-format
msgid "You don't buy %s in %s!"
msgstr "Nie kupujesz %s w mieście %s!"
-#: client/climisc.c:1056
+#: client/climisc.c:1060
#, c-format
msgid "%s costs %d gold and you only have %d gold."
msgstr "%s kosztuje %d złota a masz jedynie %d złota."
@@ -8160,19 +8158,19 @@ msgstr ""
"ÅÄ…czÄ™ siÄ™ automatycznie z serwerem \"%s\" przez port %d jako \"%s\" co %f "
"sekund. Maksymalna liczba prób: %d"
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1289
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
msgid "novice"
msgstr "nowicjusz"
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1289
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1358
msgid "easy"
msgstr "Å‚atwy"
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1290
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
msgid "normal"
msgstr "normalny"
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1290
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
msgid "hard"
msgstr "trudny"
@@ -8201,38 +8199,42 @@ 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
-msgid "We have control of the server (command access level hack)"
+#, 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
-msgid "We can't take control of server, attempting to kill it."
-msgstr "Nie można przejąć kontroli nad serwerem, próbuję go zabić."
+msgid ""
+"Failed to obtain the required access level to take control of the server. "
+"The server will now be shutdown."
+msgstr ""
-#: client/control.c:1104
+#: client/control.c:1123
msgid "Only transporter units can be unloaded."
msgstr "Jedynie jednostki transportowe można rozładowywać."
-#: client/control.c:1353
+#: client/control.c:1425
msgid "Only settler units can be put into auto mode."
msgstr "Jedynie jednostki osadnicze mogą być przełączone w tryb auto."
-#: client/control.c:1444
+#: client/control.c:1516
msgid "Only nuclear units can do this."
msgstr "Mogą to zrobić tylko jednostki nuklearne."
-#: client/control.c:1473
+#: client/control.c:1545
msgid "Only paratrooper units can do this."
msgstr "Mogą to zrobić tylko jednostki spadochronowe."
-#: client/control.c:1921
+#: client/control.c:2020
msgid "Too far for this unit."
msgstr "Zbyt daleko dla tej jednostki."
-#: client/control.c:2131 client/control.c:2161 client/control.c:2177
+#: client/control.c:2230 client/control.c:2260 client/control.c:2276
msgid "Didn't find a route to the destination!"
msgstr "Nie znalazłem trasy do celu!"
-#: client/control.c:2221
+#: client/control.c:2320
msgid "Oh my! You seem to have no capital!"
msgstr "Co? Nie masz stolicy!??????"
@@ -8316,16 +8318,16 @@ msgid "Allows %s (with %s)."
msgstr "Pozwala na %s (z %s)."
#. TRANS: preserve single space at beginning
-#: client/helpdata.c:418
+#: client/helpdata.c:416
msgid " Rivers"
msgstr " Rzeki"
-#: client/helpdata.c:576
+#: client/helpdata.c:574
#, c-format
msgid "Sorry, no help topic for %s.\n"
msgstr "Niestety, pomoc na temat %s nie istnieje.\n"
-#: client/helpdata.c:580
+#: client/helpdata.c:578
#, c-format
msgid ""
"Sorry, no help topic for %s.\n"
@@ -8336,7 +8338,7 @@ msgstr ""
"Ta strona została wygenerowana automatycznie.\n"
"\n"
-#: client/helpdata.c:670
+#: client/helpdata.c:668
#, fuzzy
msgid ""
"Requires: Nothing\n"
@@ -8345,60 +8347,60 @@ msgstr ""
"Wymagany jest budynek %s.\n"
"\n"
-#: client/helpdata.c:675
+#: client/helpdata.c:673
#, c-format
msgid "* The discovery of %s will make %s obsolete.\n"
msgstr "* Odkrycie %s sprawi, że %s będzie przestarzałe.\n"
-#: client/helpdata.c:694
+#: client/helpdata.c:692
#, c-format
msgid "* Allows all players with knowledge of %s to build %s units.\n"
msgstr ""
"* Pozwala wszystkim graczom ze znajomością technologii %s budować jednostki %"
"s.\n"
-#: client/helpdata.c:706
+#: client/helpdata.c:704
#, c-format
msgid "* Allows %s (with %s).\n"
msgstr "* Pozwala na %s (razem z %s).\n"
-#: client/helpdata.c:710
+#: client/helpdata.c:708
#, c-format
msgid "* Allows %s.\n"
msgstr "* Umożliwia %s.\n"
-#: client/helpdata.c:780
+#: client/helpdata.c:778
#, fuzzy, c-format
msgid "* Can only be built if there is %s in the city.\n"
msgstr "* Jednostka Może być jedynie budowana przy ustroju %s.\n"
-#: client/helpdata.c:786
+#: client/helpdata.c:784
#, c-format
msgid "* Can only be built with %s as government.\n"
msgstr "* Jednostka Może być jedynie budowana przy ustroju %s.\n"
-#: client/helpdata.c:791
+#: client/helpdata.c:789
msgid "* May not be built in cities.\n"
msgstr "* Nie może być budowana przez miasta.\n"
-#: client/helpdata.c:794
+#: client/helpdata.c:792
msgid "* Never has a home city.\n"
msgstr "* Jednostka nie jest utrzymywana przez żadne miasto.\n"
-#: client/helpdata.c:797
+#: client/helpdata.c:795
msgid "* Losing this unit will lose you the game!\n"
msgstr "* Utrata tej jednostki powoduje przegranie gry!\n"
-#: client/helpdata.c:801
+#: client/helpdata.c:799
msgid "* Each player may only have one of this type of unit.\n"
msgstr "* Każdy gracz może posiadać tylko jeden egzemplarz tej jednostki.\n"
-#: client/helpdata.c:805
+#: client/helpdata.c:803
#, c-format
msgid "* Requires %d population to build.\n"
msgstr "* Jednostka wymaga %d populacji w mieście, które ją buduje.\n"
-#: client/helpdata.c:811
+#: client/helpdata.c:809
#, c-format
msgid "* Can carry and refuel %d air unit.\n"
msgid_plural "* Can carry and refuel %d air units.\n"
@@ -8406,7 +8408,7 @@ msgstr[0] "* Może przenosić i uzupełniać paliwo %d jednostki powietrznej.\n"
msgstr[1] "* Może przenosić i uzupełniać paliwo %d jednostek powietrznych.\n"
msgstr[2] "* Może przenosić i uzupełniać paliwo %d jednostek powietrznych.\n"
-#: client/helpdata.c:816
+#: client/helpdata.c:814
#, c-format
msgid "* Can carry and refuel %d missile unit.\n"
msgid_plural "* Can carry and refuel %d missile units.\n"
@@ -8414,7 +8416,7 @@ msgstr[0] "* Może przenosić i uzupełniać paliwo %d jednostki pocisków.\n"
msgstr[1] "* Może przenosić i uzupełniać paliwo %d jednostek pocisków.\n"
msgstr[2] "* Może przenosić i uzupełniać paliwo %d jednostek pocisków.\n"
-#: client/helpdata.c:821
+#: client/helpdata.c:819
#, c-format
msgid "* Can carry %d ground unit across water.\n"
msgid_plural "* Can carry %d ground units across water.\n"
@@ -8422,7 +8424,7 @@ msgstr[0] "* Może transportować %d jednostkę lądową.\n"
msgstr[1] "* Może transportować %d jednostki lądowe.\n"
msgstr[2] "* Może transportować %d jednostek lądowych.\n"
-#: client/helpdata.c:830
+#: client/helpdata.c:828
msgid ""
"* Can establish trade routes (must travel to target city and must be at "
"least 9 tiles [in Manhattan distance] from this unit's home city).\n"
@@ -8430,128 +8432,128 @@ msgstr ""
"* Może ustanawiać trasy handlowe (musi dojść do miasta docelowego odległego "
"o co najmniej 9 pól (w metryce miejskiej)).\n"
-#: client/helpdata.c:836
+#: client/helpdata.c:834
#, c-format
msgid "* Can help build wonders (adds %d production).\n"
msgstr "* Pomaga w budowie cudów świata (Dodaje %d do produkcji).\n"
-#: client/helpdata.c:840
+#: client/helpdata.c:838
msgid "* May not be disbanded.\n"
msgstr "* Nie można rozproszyć.\n"
-#: client/helpdata.c:842
+#: client/helpdata.c:840
#, c-format
msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
msgstr ""
"* Jednostka może zostać rozwiązana w mieście, aby odzyskać 50%% wartości w "
"postaci tarczek.\n"
-#: client/helpdata.c:846
+#: client/helpdata.c:844
msgid "* Can build new cities.\n"
msgstr "* Potrafi zakładać nowe miasta.\n"
-#: client/helpdata.c:849
+#: client/helpdata.c:847
#, c-format
msgid "* Can add on %d population to cities of no more than size %d.\n"
msgstr "* Potrafi powiększać miasta nie większe niż %2$d o %1$d populacji.\n"
-#: client/helpdata.c:858
+#: client/helpdata.c:856
msgid "* Can build roads and railroads.\n"
msgstr "* Potrafi budować drogi i koleje.\n"
-#: client/helpdata.c:859
+#: client/helpdata.c:857
msgid "* Can build mines on tiles.\n"
msgstr "* Potrafi budować kopalnie.\n"
-#: client/helpdata.c:860
+#: client/helpdata.c:858
msgid "* Can build irrigation on tiles.\n"
msgstr "* Potrafi budować nawodnienie.\n"
-#: client/helpdata.c:865
+#: client/helpdata.c:863
msgid "* Can build farmland.\n"
msgstr "* Potrafi budować farmy.\n"
-#: client/helpdata.c:869
+#: client/helpdata.c:867
#, c-format
msgid "* Can build farmland (if %s is known).\n"
msgstr "* Potrafi budować farmy (Jeśli znana jest technologia %s).\n"
-#: client/helpdata.c:873
+#: client/helpdata.c:871
#, c-format
msgid "* Can build farmland (if any of the following are known: %s).\n"
msgstr "* Potrafi budować farmy (Jeśli znane są: %s).\n"
-#: client/helpdata.c:881
+#: client/helpdata.c:879
msgid "* Can build fortresses.\n"
msgstr "* Potrafi budować fortece.\n"
-#: client/helpdata.c:885
+#: client/helpdata.c:883
#, c-format
msgid "* Can build fortresses (if %s is known).\n"
msgstr "* Potrafi budować fortece (Jeśli odkryto %s).\n"
-#: client/helpdata.c:889
+#: client/helpdata.c:887
#, c-format
msgid "* Can build fortresses (if any of the following are known: %s).\n"
msgstr "* Potrafi budować fortece (Jeśli odkryto %s).\n"
-#: client/helpdata.c:895
+#: client/helpdata.c:893
msgid "* Can clean pollution from tiles.\n"
msgstr "* Potrafi usuwać zanieczyszczenia.\n"
-#: client/helpdata.c:896
+#: client/helpdata.c:894
msgid "* Can clean nuclear fallout from tiles.\n"
msgstr "* Potrafi usuwać skażenia radioaktywne.\n"
-#: client/helpdata.c:899
+#: client/helpdata.c:897
msgid "* Can transform tiles.\n"
msgstr "* Potrafi przekształcać teren.\n"
-#: client/helpdata.c:902
+#: client/helpdata.c:900
msgid "* Can build airbases.\n"
msgstr "* Potrafi budować bazy lotnicze.\n"
-#: client/helpdata.c:906
+#: client/helpdata.c:904
#, c-format
msgid "* May fortify, granting a 50%% defensive bonus.\n"
msgstr ""
"* Potrafi się fortyfikować, przez co otrzymuje 50%% dodatkowej siły obrony.\n"
-#: client/helpdata.c:909
+#: client/helpdata.c:907
msgid "* May pillage to destroy infrastructure from tiles.\n"
msgstr "* Potrafi niszczyć infrastrukturę terenów.\n"
-#: client/helpdata.c:913
+#: client/helpdata.c:911
msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
msgstr "* Może wykonywać czynności dyplomatyczne oraz szpiegowskie.\n"
-#: client/helpdata.c:916
+#: client/helpdata.c:914
msgid "* Can perform diplomatic actions.\n"
msgstr "* Może wykonywać czynności dyplomatyczne.\n"
-#: client/helpdata.c:920
+#: client/helpdata.c:918
msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
msgstr "* Nigdy nie przegra konfrontacji z innym dyplomatÄ….\n"
-#: client/helpdata.c:923
+#: client/helpdata.c:921
msgid "* May not be bribed.\n"
msgstr "* Jednostka nie może być przekupiona.\n"
-#: client/helpdata.c:926
+#: client/helpdata.c:924
msgid "* Can attack enemy air units.\n"
msgstr "* Potrafi atakować jednostki powietrzne przeciwnika.\n"
-#: client/helpdata.c:930
+#: client/helpdata.c:928
msgid "* Is invisible except when next to an enemy unit or city.\n"
msgstr ""
"* Jest niewidoczna dla innych graczy, chyba że znajduje się w sąsiedztwie "
"wrogiej jednostki lub miasta.\n"
-#: client/helpdata.c:934
+#: client/helpdata.c:932
msgid "* Can only attack units on ocean squares (no land attacks).\n"
msgstr "* Może atakować tylko jednostki na morzu (nie atakuje lądu).\n"
-#: client/helpdata.c:938
+#: client/helpdata.c:936
msgid ""
"* Can attack from aboard sea units: against enemy cities and onto land "
"squares.\n"
@@ -8559,40 +8561,40 @@ msgstr ""
"* Może atakować przy zaokrętowaniu na jednostkach morskich - przeciwko "
"wrogim miastom i polom na lÄ…dzie.\n"
-#: client/helpdata.c:943
+#: client/helpdata.c:941
#, c-format
msgid "* Can be paradropped from a friendly city (Range: %d).\n"
msgstr "* Może być przerzucona z miasta na odległość %d.\n"
-#: client/helpdata.c:949
+#: client/helpdata.c:947
msgid "* Gets double defense against units specified as 'mounted'.\n"
msgstr "* Otrzymuje podwójną obronę w starciu z jednostkami 'konnymi'.\n"
-#: client/helpdata.c:953
+#: client/helpdata.c:951
msgid "* Counts as 'mounted' against certain defenders.\n"
msgstr "* Jest liczona jako jednostka 'konna'.\n"
-#: client/helpdata.c:957
+#: client/helpdata.c:955
msgid "* A missile unit: gets used up in making an attack.\n"
msgstr "* Jednostka pocisku: jest tracona podczas ataku.\n"
-#: client/helpdata.c:960
+#: client/helpdata.c:958
msgid "* Making an attack ends this unit's turn.\n"
msgstr "* Przeprowadzenie ataku kończy turę tej jednostki.\n"
-#: client/helpdata.c:964
+#: client/helpdata.c:962
msgid "* This unit's attack causes a nuclear explosion!\n"
msgstr "* Atak tej jednostki prowadzi do eksplozji nuklearnej!\n"
-#: client/helpdata.c:968
+#: client/helpdata.c:966
msgid "* Gets double firepower when attacking cities.\n"
msgstr "* Otrzymuje dodatkową siłę ognia podczas ataku na miasto.\n"
-#: client/helpdata.c:971
+#: client/helpdata.c:969
msgid "* Ignores the effects of city walls.\n"
msgstr "* Ignoruje efekt wywoływany przez mury miasta.\n"
-#: client/helpdata.c:975
+#: client/helpdata.c:973
#, c-format
msgid ""
"* Does bombard attacks (%d per turn). These attacks will only damage (never "
@@ -8601,36 +8603,36 @@ msgstr ""
"* Potrafi bombardować miasto (%d razy na turę). Te ataki mogą jedynie "
"uszkodzić (nie zabić) obrońcę. Atakujący nie ponosi żadnych strat.\n"
-#: client/helpdata.c:982
+#: client/helpdata.c:980
msgid "* Gets quintuple defense against missiles and aircraft.\n"
msgstr "* Osiąga pięciokrotną siłę obrony przed pociskami i samolotami.\n"
-#: client/helpdata.c:986
+#: client/helpdata.c:984
msgid "* Ignores terrain effects (treats all squares as roads).\n"
msgstr "* Ignoruje wpływ terenu (traktuje wszystko jak drogę).\n"
-#: client/helpdata.c:989
+#: client/helpdata.c:987
msgid "* Ignores zones of control.\n"
msgstr "* Ignoruje strefy kontroli\n"
-#: client/helpdata.c:993
+#: client/helpdata.c:991
msgid "* A non-military unit (cannot attack; no martial law).\n"
msgstr ""
"* Jednostka niezmilitaryzowana (bez możliwości przeprowadzania ataku).\n"
-#: client/helpdata.c:997
+#: client/helpdata.c:995
msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
msgstr "* Jednostka powoduje 1 niezadowolenie nawet gdy nie jest agresywna.\n"
-#: client/helpdata.c:1000
+#: client/helpdata.c:998
msgid "* Will never achieve veteran status.\n"
msgstr "* Nie potrafi osiągnąć statusu weterana.\n"
-#: client/helpdata.c:1002
+#: client/helpdata.c:1000
msgid "* May become veteran through training or combat.\n"
msgstr "* Może zostać weteranem w czasie szkolenia lub podczas bitwy.\n"
-#: client/helpdata.c:1008
+#: client/helpdata.c:1006
#, c-format
msgid ""
"* Must end turn in a city or next to land, or has a 50%% risk of being lost "
@@ -8639,12 +8641,12 @@ msgstr ""
"* Musi kończyć turę w mieście lub przy lądzie, albo z prawdopodobieństwem 50%"
"% zaginie w morzu.\n"
-#: client/helpdata.c:1012
+#: client/helpdata.c:1010
#, c-format
msgid "* The discovery of %s reduces the risk to 25%%.\n"
msgstr "* Technologia '%s' zmniejsza ryzyko do 25%%.\n"
-#: client/helpdata.c:1017
+#: client/helpdata.c:1015
#, c-format
msgid "* %s reduces the risk to 12%%.\n"
msgstr "* Technologia '%s' zmniejsza ryzyko do 12%%.\n"
@@ -8653,15 +8655,15 @@ msgstr "* Technologia '%s' zmniejsza ryzyko do 12%%.\n"
#. * last two elements
#. TRANS: List of possible output types has this between
#. * last two elements
-#: client/helpdata.c:1068 client/helpdata.c:1402
+#: client/helpdata.c:1066 client/helpdata.c:1400
msgid " or "
msgstr " lub "
-#: client/helpdata.c:1070 client/helpdata.c:1390
+#: client/helpdata.c:1068 client/helpdata.c:1388
msgid "?or:, "
msgstr "?or:, "
-#: client/helpdata.c:1082
+#: 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"
@@ -8669,14 +8671,14 @@ msgstr[0] "* Musi kończyć turę w mieście lub na %s co %d turę.\n"
msgstr[1] "* Musi kończyć turę w mieście lub na %s co %d tury.\n"
msgstr[2] "* Musi kończyć turę w mieście lub na %s co %d tur.\n"
-#: client/helpdata.c:1124
+#: client/helpdata.c:1122
#, 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:1129
+#: client/helpdata.c:1127
#, c-format
msgid ""
"To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8685,88 +8687,88 @@ msgstr ""
"Aby osiągnąć %s potrzebujemy %d dodatkowych technologii. Cały projekt "
"wymagał będzie %d punktów odkryć."
-#: client/helpdata.c:1137
+#: client/helpdata.c:1135
msgid "You cannot research this technology."
msgstr "Nie możesz odkryć tej technologii."
-#: client/helpdata.c:1141
+#: client/helpdata.c:1139
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:1153
+#: client/helpdata.c:1151
#, 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:1158
+#: client/helpdata.c:1156
#, 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:1161
+#: client/helpdata.c:1159
#, 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:1165
+#: client/helpdata.c:1163
msgid "* Increases the pollution generated by the population.\n"
msgstr "* Zwiększa zanieczyszczenie powodowane przez populację.\n"
-#: client/helpdata.c:1170
+#: client/helpdata.c:1168
#, c-format
msgid "* Allows %s to build roads on river squares.\n"
msgstr "* Pozwala %s budować drogi na rzekach.\n"
-#: client/helpdata.c:1177
+#: client/helpdata.c:1175
#, c-format
msgid "* Allows %s to build fortresses.\n"
msgstr "* Pozwala %s budować fortece.\n"
-#: client/helpdata.c:1185
+#: client/helpdata.c:1183
#, c-format
msgid "* Allows %s to build airbases.\n"
msgstr "* Pozwala %s budować bazy lotnicze.\n"
-#: client/helpdata.c:1194
+#: client/helpdata.c:1192
#, c-format
msgid "* Allows %s to upgrade roads to railroads.\n"
msgstr "* Pozwala %s ulepszać drogi do kolei.\n"
-#: client/helpdata.c:1202
+#: client/helpdata.c:1200
#, 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:1236
+#: client/helpdata.c:1234
msgid "* Pollution cannot be generated on this terrain."
msgstr "* Na tym terenie nie występują skażenia."
-#: client/helpdata.c:1241
+#: client/helpdata.c:1239
msgid "* You cannot build cities on this terrain."
msgstr "* Nie można budować miast na tym terenie."
-#: client/helpdata.c:1247
+#: client/helpdata.c:1245
msgid "* The coastline of this terrain is unsafe."
msgstr "* Linia brzegowa tego terenu nie jest bezpieczna."
-#: client/helpdata.c:1252
+#: client/helpdata.c:1250
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:1257
+#: client/helpdata.c:1255
msgid "* Land units cannot travel on oceanic terrains."
msgstr "* Jednostki lądowe nie mogą podróżować po polach morskich."
-#: client/helpdata.c:1307
+#: client/helpdata.c:1305
msgid "Features:\n"
msgstr "Właściwości:\n"
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1413 client/helpdata.c:1414
+#: client/helpdata.c:1411 client/helpdata.c:1412
msgid "?outputlist: Nothing "
msgstr ""
-#: client/helpdata.c:1421
+#: client/helpdata.c:1419
#, fuzzy, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
@@ -8784,7 +8786,7 @@ msgstr[2] ""
"* Jednostki militarne poza miastem i granicami będą powodować %d "
"niezadowolenia.\n"
-#: client/helpdata.c:1431
+#: client/helpdata.c:1429
#, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8794,23 +8796,23 @@ msgstr ""
"o %d.\n"
#. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1439
+#: client/helpdata.c:1437
#, 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:1444
+#: client/helpdata.c:1442
#, 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:1449
+#: client/helpdata.c:1447
#, 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:1453
+#: client/helpdata.c:1451
#, fuzzy
msgid "* You pay no upkeep for your units.\n"
msgstr "* PÅ‚acisz %d-krotnie stawki za swoje jednostki.\n"
@@ -8818,25 +8820,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:1462
+#: client/helpdata.c:1460
#, 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:1470
+#: client/helpdata.c:1468
#, 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:1477
+#: client/helpdata.c:1475
#, 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:1484
+#: client/helpdata.c:1482
#, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -8846,7 +8848,7 @@ msgstr ""
"pojawić się gdy masz %d miast.\n"
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1491
+#: client/helpdata.c:1489
#, c-format
msgid ""
"* After the first unhappy citizen due to city size, for each %d additional "
@@ -8855,18 +8857,18 @@ msgstr ""
"* Za każde dodatkowe %d miast jeden niezadowolony mieszkaniec będzie się "
"pojawiał w miastach.\n"
-#: client/helpdata.c:1499
+#: client/helpdata.c:1497
#, 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:1504
+#: client/helpdata.c:1502
msgid "Has unlimited science/gold/luxuries rates.\n"
msgstr "Nie posiada ograniczeń podatków na naukę/złoto/luksusy.\n"
-#: client/helpdata.c:1509
+#: client/helpdata.c:1507
#, fuzzy, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
@@ -8884,7 +8886,7 @@ msgstr[2] ""
"* Możesz wprowadzać stan wojenny. Jednostki militarne będą zadowalać po %d "
"mieszkańców.\n"
-#: client/helpdata.c:1521
+#: client/helpdata.c:1519
#, 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"
@@ -8893,7 +8895,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:1532
+#: client/helpdata.c:1530
#, c-format
msgid ""
"* You may grow your cities by means of celebrations. Your cities must be at "
@@ -8902,15 +8904,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:1538
+#: client/helpdata.c:1536
msgid "* Your units cannot be bribed.\n"
msgstr "* Twoje jednostki nie mogą zostać przekupione.\n"
-#: client/helpdata.c:1541
+#: client/helpdata.c:1539
msgid "* Your cities cannot be incited.\n"
msgstr "* Twoje miasta nie mogą zostać przekupione.\n"
-#: client/helpdata.c:1545
+#: client/helpdata.c:1543
msgid ""
"* Government will fall into anarchy if any city is in disorder for more than "
"two turns in a row.\n"
@@ -8918,16 +8920,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:1551
+#: client/helpdata.c:1549
msgid "* Has a senate that may prevent declaration of war.\n"
msgstr "* Senatu może blokować wypowiadanie wojen.\n"
-#: client/helpdata.c:1555
+#: client/helpdata.c:1553
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:1559
+#: client/helpdata.c:1557
msgid ""
"* Buildings that normally confer bonuses against unhappiness will instead "
"give gold.\n"
@@ -8935,25 +8937,25 @@ msgstr ""
"* Budynki, które normalnie zmniejszają niezadowolenie będą produkować "
"złoto.\n"
-#: client/helpdata.c:1563
+#: client/helpdata.c:1561
msgid "* Pays no upkeep for fanatics.\n"
msgstr "* Nie płacisz utrzymania za fanatyków.\n"
-#: client/helpdata.c:1566
+#: client/helpdata.c:1564
msgid "* Has no unhappy citizens.\n"
msgstr "* Nie ma niezadowolonych mieszkańców.\n"
-#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
+#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
#, c-format
msgid "* Veteran %s units.\n"
msgstr "* Czyni %s bardziej doświadoczonymi.\n"
-#: client/helpdata.c:1587
+#: client/helpdata.c:1585
msgid "* Veteran units.\n"
msgstr "* Czyni jednostki weteranami.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1593
+#: client/helpdata.c:1591
#, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8963,7 +8965,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:1602
+#: client/helpdata.c:1600
#, fuzzy, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8973,7 +8975,7 @@ msgstr ""
"%d dodatkowy %s podczas świętowania.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1610
+#: client/helpdata.c:1608
#, fuzzy, c-format
msgid "* Each worked tile with at least 1 %s will yield %d more of it.\n"
msgstr ""
@@ -8981,109 +8983,109 @@ msgstr ""
"%d dodatkowy %s.\n"
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1619
+#: client/helpdata.c:1617
#, 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:1627
+#: client/helpdata.c:1625
#, 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:1632
+#: client/helpdata.c:1630
#, 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:1637
+#: client/helpdata.c:1635
#, 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:1645
+#: client/helpdata.c:1643
#, 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:1651
+#: client/helpdata.c:1649
#, 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:1657
+#: client/helpdata.c:1655
#, 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:1674
+#: client/helpdata.c:1672
#, c-format
msgid "* Allows you to build %s.\n"
msgstr "* Pozwala budować %s.\n"
#. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1701
+#: client/helpdata.c:1699
#, c-format
msgid "%s%d %s"
msgstr "%s%d %s"
-#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1700 client/helpdata.c:1708 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:1709
+#: client/helpdata.c:1707
#, c-format
msgid "%s%d unhappy"
msgstr "%s%d wzburzony"
-#: client/mapctrl_common.c:382
+#: client/mapctrl_common.c:399
#, c-format
msgid "You don't know how to build %s!"
msgstr "Nie potrafisz konstruować jednostki %s!"
-#: client/mapctrl_common.c:392
+#: client/mapctrl_common.c:409
#, c-format
msgid "Copy %s to clipboard."
msgstr "Skopiowano '%s' do schowka."
-#: client/mapctrl_common.c:408
+#: client/mapctrl_common.c:425
msgid "Clipboard is empty."
msgstr "Schowek jest pusty."
-#: client/options.c:98
+#: client/options.c:102
msgid "Graphics"
msgstr "Grafika"
-#: client/options.c:99
+#: client/options.c:103
msgid "Overview"
msgstr "Minimapa"
-#: client/options.c:100
+#: client/options.c:104
msgid "Sound"
msgstr "Dźwięk"
-#: client/options.c:101
+#: client/options.c:105
msgid "Interface"
msgstr "Interfejs"
-#: client/options.c:102
+#: client/options.c:106
msgid "Network"
msgstr "Sieć"
-#: client/options.c:107
+#: client/options.c:111
msgid "Login name"
msgstr "Login"
-#: client/options.c:108
+#: client/options.c:112
msgid ""
"This is the default login username that will be used in the connection "
"dialogs or with the -a command-line parameter."
@@ -9091,11 +9093,11 @@ msgstr ""
"To jest domyślny login używany w oknie połączenia lub przy użyciu opcji -a z "
"lini poleceń."
-#: client/options.c:113
+#: client/options.c:117
msgid "Server"
msgstr "Serwer"
-#: client/options.c:114
+#: client/options.c:118
msgid ""
"This is the default server hostname that will be used in the connection "
"dialogs or with the -a command-line parameter."
@@ -9103,11 +9105,11 @@ msgstr ""
"To jest domyślny serwer używany w oknie połączenia lub przy użyciu opcji -a "
"z lini poleceń."
-#: client/options.c:119
+#: client/options.c:123
msgid "Server port"
msgstr "Port serwera"
-#: client/options.c:120
+#: client/options.c:124
msgid ""
"This is the default server port that will be used in the connection dialogs "
"or with the -a command-line parameter."
@@ -9115,11 +9117,11 @@ 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:125 client/gui-win32/connectdlg.c:912 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
msgid "Metaserver"
msgstr "Metaserwer"
-#: client/options.c:126
+#: client/options.c:130
msgid ""
"The metaserver is a host that the client contacts to find out about games on "
"the internet. Don't change this from its default value unless you know what "
@@ -9129,21 +9131,21 @@ msgstr ""
"w Internecie. Tej opcji nie powinieneś zmieniać, chyba że na prawdę wiesz "
"co robisz."
-#: client/options.c:132
+#: client/options.c:136
msgid "Soundset"
msgstr "Zestaw dźwiękowy"
-#: client/options.c:133
+#: client/options.c:137
msgid ""
"This is the soundset that will be used. Changing this is the same as using "
"the -S command-line parameter."
msgstr "To jest zestaw dźwięków. Działa tak samo jak opcja -S z lini poleceń."
-#: client/options.c:138
+#: client/options.c:142
msgid "Sound plugin"
msgstr "Wtyczka dźwiękowa"
-#: client/options.c:139
+#: client/options.c:143
msgid ""
"If you have a problem with sound, try changing the sound plugin. The new "
"plugin won't take effect until you restart Freeciv. Changing this is the "
@@ -9153,23 +9155,23 @@ msgstr ""
"Niestety efekt będzie widoczny dopiero po ponownym włączeniu Freeciv. Tak "
"samo działa opcja -P z lini poleceń."
-#: client/options.c:144 client/gui-sdl/gui_main.c:162
+#: client/options.c:148 client/gui-sdl/gui_main.c:162
#, fuzzy
msgid "Theme"
msgstr "ÅšwiÄ…tynia"
-#: client/options.c:145
+#: client/options.c:149
#, fuzzy
msgid "By changing this option you change the active theme."
msgstr ""
"Możesz tutaj zmienić zestaw graficzny. Działa tak samo jak opcja -t z lini "
"poleceń."
-#: client/options.c:148
+#: client/options.c:152
msgid "Tileset"
msgstr "Zestaw graficzny"
-#: client/options.c:149
+#: client/options.c:153
msgid ""
"By changing this option you change the active tileset. This is the same as "
"using the -t command-line parameter."
@@ -9177,11 +9179,11 @@ msgstr ""
"Możesz tutaj zmienić zestaw graficzny. Działa tak samo jak opcja -t z lini "
"poleceń."
-#: client/options.c:156
+#: client/options.c:160
msgid "Solid unit background color"
msgstr "Jednolity kolor tła jednostki"
-#: client/options.c:157
+#: client/options.c:161
msgid ""
"Setting this option will cause units on the map view to be drawn with a "
"solid background color instead of the flag backdrop."
@@ -9189,11 +9191,11 @@ msgstr ""
"Ta opcja sprawia, że pod jednostkami będzie widoczne jednokolorowe tło "
"zamiast flagi."
-#: client/options.c:161 client/gui-sdl/optiondlg.c:960
+#: client/options.c:165 client/gui-sdl/optiondlg.c:960
msgid "Sound bell at new turn"
msgstr "Dźwięk przed nową turą"
-#: client/options.c:162
+#: client/options.c:166
msgid ""
"Set this option to have a \"bell\" event be generated at the start of a new "
"turn. You can control the behavior of the \"bell\" event by editing the "
@@ -9202,11 +9204,11 @@ msgstr ""
"Gdy ta opcja jest włączona, będziesz słyszał \"dzwonek\" na początku każdej "
"tury. Możesz zmienić zachowanie dzwonka w opcjach komunikatów."
-#: client/options.c:168
+#: client/options.c:172
msgid "Unit movement animation time (milliseconds)"
msgstr "Czas animacji ruchu jednostki (milisekundy)"
-#: client/options.c:169
+#: client/options.c:173
msgid ""
"This option controls how long unit \"animation\" takes when a unit moves on "
"the map view. Set it to 0 to disable animation entirely."
@@ -9214,11 +9216,11 @@ msgstr ""
"Wyznacza długość trwania animacji podczas ruchu jednostki po mapie. 0 "
"oznacza brak animacji."
-#: client/options.c:174
+#: client/options.c:178
msgid "Mapview recentering time (milliseconds)"
msgstr "Czas recentrowania mapy (w milisekundach)"
-#: client/options.c:175
+#: client/options.c:179
msgid ""
"When the map view is recentered, it will slide smoothly over the map to its "
"new position. This option controls how long this slide lasts. Set it to 0 "
@@ -9228,34 +9230,34 @@ msgstr ""
"Możesz tu ustawić czas trwania przesuwania. 0 oznacza brak płynnego "
"przejścia."
-#: client/options.c:180 client/gui-sdl/optiondlg.c:1014
+#: client/options.c:184 client/gui-sdl/optiondlg.c:1014
msgid "Show combat animation"
msgstr "Animacja walki"
-#: client/options.c:181
+#: client/options.c:185
#, fuzzy
msgid ""
"Disabling this option will turn off combat animation between units on the "
"mapview."
msgstr "Możesz tu włączyć i wyłączyć animację bitew."
-#: client/options.c:184
+#: client/options.c:188
#, fuzzy
msgid "Draw the citybar"
msgstr "Rysuj większy opis miasta"
-#: client/options.c:185
+#: client/options.c:189
msgid ""
"Setting this option will display a 'citybar' containing useful information "
"beneath each city. Disabling this option will display only the city's name "
"and optionally, production."
msgstr ""
-#: client/options.c:191
+#: client/options.c:195
msgid "Show icons in the technology tree"
msgstr "Pokaż ikony na diagramie technologi"
-#: client/options.c:192
+#: client/options.c:196
#, fuzzy
msgid ""
"Setting this option will display icons on the technology tree diagram. "
@@ -9264,11 +9266,11 @@ msgstr ""
"Ta opcja sprawia, że na diagramie technologii wyświetlane są różne ikony. "
"Wyłączenie tej opcji powoduje, że diagram staje się mniejszy."
-#: client/options.c:197
+#: client/options.c:201
msgid "Draw shield graphics for units"
msgstr "Wyświetlaj tarczki dla jednostek"
-#: client/options.c:198
+#: client/options.c:202
#, fuzzy
msgid ""
"Setting this option will draw a shield icon as the flags on units. If "
@@ -9277,11 +9279,11 @@ msgstr ""
"Jeśli ta opcja jest włączona, to przy każdej jednostce będzie rysowana "
"'tarcza' zamiast normalnej dużej flagi w tle."
-#: client/options.c:202
+#: client/options.c:206
msgid "Manual Turn Done in AI Mode"
msgstr "Ręczne zakończenie tury w trybie AI"
-#: client/options.c:203
+#: client/options.c:207
#, fuzzy
msgid ""
"Disable this option if you do not want to press the Turn Done button "
@@ -9290,21 +9292,21 @@ msgstr ""
"Jeśli ta opcja jest włączona, nie musisz naciskać [Koniec tury] podczas "
"kontrolowania gracza komputerowego."
-#: client/options.c:207 client/gui-sdl/optiondlg.c:1121
+#: client/options.c:211 client/gui-sdl/optiondlg.c:1121
msgid "Auto Center on Units"
msgstr "Automatyczne wyśrodkowanie"
-#: client/options.c:208
+#: client/options.c:212
msgid ""
"Set this option to have the active unit centered automatically when the unit "
"focus changes."
msgstr "Włącza automatyczne wyśrodkowanie widoku na aktywną jednostkę."
-#: client/options.c:211 client/gui-sdl/optiondlg.c:1147
+#: client/options.c:215 client/gui-sdl/optiondlg.c:1147
msgid "Auto Center on Combat"
msgstr "Automatyczne wyśrodkowanie na bitwę"
-#: client/options.c:212
+#: client/options.c:216
msgid ""
"Set this option to have any combat be centered automatically. Disabled this "
"will speed up the time between turns but may cause you to miss combat "
@@ -9314,19 +9316,19 @@ msgstr ""
"może przyspieszyć czas pomiędzy turami, ale może sprawić, że nie zobaczysz "
"niektórych bitew."
-#: client/options.c:217 client/gui-sdl/optiondlg.c:1174
+#: client/options.c:221 client/gui-sdl/optiondlg.c:1174
msgid "Focus on Awakened Units"
msgstr "Przejście do oddziałów uaktywnionych"
-#: client/options.c:218
+#: client/options.c:222
msgid "Set this option to have newly awoken units be focused automatically."
msgstr "Włącza automatyczne wyśrodkowanie na nowoobudzone jednostki."
-#: client/options.c:221
+#: client/options.c:225
msgid "Allow goto into the unknown"
msgstr "Pozwól na GOTO w nieznany teren"
-#: client/options.c:222
+#: client/options.c:226
#, fuzzy
msgid ""
"Setting this option will make the game consider moving into unknown tiles. "
@@ -9335,11 +9337,11 @@ msgstr ""
"Gdy ta opcja jest ustawiona, to komenda GOTO będzie brała pod uwagę "
"przechodzenie przez nieznany teren."
-#: client/options.c:226
+#: client/options.c:230
msgid "Center map when Popup city"
msgstr "Centrowanie mapy przy wyświetlaniu miasta"
-#: client/options.c:227
+#: client/options.c:231
#, fuzzy
msgid ""
"Setting this option makes the mapview center on a city when its city dialog "
@@ -9348,11 +9350,11 @@ msgstr ""
"Jeśli ta opcja jest włączona, to okna nowoutworzonych miasta będą "
"automatycznie otwierane."
-#: client/options.c:230
+#: client/options.c:234
msgid "Concise City Production"
msgstr "Zwięzłe wyświetlanie produkcji w mieście"
-#: client/options.c:231
+#: client/options.c:235
msgid ""
"Set this option to make the city production (as shown in the city dialog) to "
"be more compact."
@@ -9360,22 +9362,22 @@ msgstr ""
"Ta opcja sprawia, że produkcja miasta wyświetlana w oknie miasta ma "
"ciaśniejszy układ."
-#: client/options.c:234 client/gui-sdl/optiondlg.c:1252
+#: client/options.c:238 client/gui-sdl/optiondlg.c:1252
msgid "End Turn when done moving"
msgstr "Zakończ turę gdy wykonane są wszystkie ruchy"
-#: client/options.c:235
+#: client/options.c:239
#, fuzzy
msgid ""
"Setting this option makes your turn end automatically when all your units "
"are done moving."
msgstr "Włącza automatyczne wyśrodkowanie widoku na aktywną jednostkę."
-#: client/options.c:238 client/gui-sdl/optiondlg.c:1226
+#: client/options.c:242 client/gui-sdl/optiondlg.c:1226
msgid "Prompt for city names"
msgstr "Zatwierdzanie nazw miast"
-#: client/options.c:239
+#: client/options.c:243
#, fuzzy
msgid ""
"Disabling this option will make the names of newly founded cities chosen "
@@ -9384,11 +9386,11 @@ msgstr ""
"Włącza automatyczne zatwierdzanie nazw miast. Nie musisz wpisywać nazw dla "
"nowooutworzonych miast."
-#: client/options.c:242 client/gui-sdl/optiondlg.c:1200
+#: client/options.c:246 client/gui-sdl/optiondlg.c:1200
msgid "Pop up city dialog for new cities"
msgstr "Wyświetlaj okna nowych miast"
-#: client/options.c:243
+#: client/options.c:247
#, fuzzy
msgid ""
"Setting this option will pop up a newly-founded city's city dialog "
@@ -9397,76 +9399,124 @@ msgstr ""
"Jeśli ta opcja jest włączona, to okna nowoutworzonych miasta będą "
"automatycznie otwierane."
-#: client/options.c:248
+#: client/options.c:250
+#, fuzzy
+msgid "Pop up caravan actions"
+msgstr "Karawana"
+
+#: client/options.c:251
+msgid ""
+"If this option is enabled, when caravans arrive at a city where they can "
+"establish a traderoute or help build a wonder, a window will popup asking "
+"which action should be performed. Disabling this option means you will have "
+"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 ""
+
+#: client/options.c:260
+#, fuzzy
+msgid "Enable cursor changing"
+msgstr "WÅ‚Ä…cz alpha blending"
+
+#: client/options.c:261
+msgid ""
+"This option controls whether the client should try to change the mouse "
+"cursor depending on what is being pointed at, as well as to indicate changes "
+"in the client or server state."
+msgstr ""
+
+#: client/options.c:266
+msgid "Select cities before units"
+msgstr ""
+
+#: 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 ""
+
+#: client/options.c:272
+msgid "Clear unit orders on selection"
+msgstr ""
+
+#: client/options.c:273
+msgid ""
+"Enabling this option will cause unit orders to be cleared whenever one or "
+"more units are selected. If this option is disabled, selecting units will "
+"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 ""
+
+#: client/options.c:282
msgid "Background layer"
msgstr "Warstwa tła"
-#: client/options.c:249
+#: client/options.c:283
msgid "The background layer of the overview shows just ocean and land."
msgstr "Warstwa tła zawiera jedynie rozróżnienie między lądem i oceanem."
-#: client/options.c:252
+#: client/options.c:286
msgid "Terrain relief map layer"
msgstr "Warstwa terenu"
-#: client/options.c:253
+#: client/options.c:287
msgid "The relief layer shows all terrains on the map."
msgstr "Wartwa terenu zawiera rózne kolory dla różnych terenów."
-#: client/options.c:256
+#: client/options.c:290
msgid "Borders layer"
msgstr "Warstwa granic"
-#: client/options.c:257
+#: client/options.c:291
msgid ""
"The borders layer of the overview shows which tiles are owned by each player."
msgstr "Warstwa granic pokazuje, kto kontroluje różne części mapy."
-#: client/options.c:261
+#: client/options.c:295
msgid "Units layer"
msgstr "Warstwa jednostek"
-#: client/options.c:262
+#: client/options.c:296
#, fuzzy
msgid "Enabling this will draw units on the overview."
msgstr "Warstwa jednostek pokazuje jednostki na minimapie."
-#: client/options.c:265
+#: client/options.c:299
msgid "Cities layer"
msgstr "Warstwa miast"
-#: client/options.c:266
+#: client/options.c:300
#, fuzzy
msgid "Enabling this will draw cities on the overview."
msgstr "Warstwa jednostek pokazuje jednostki na minimapie."
-#: client/options.c:269
+#: client/options.c:303
msgid "Overview fog of war"
msgstr "Mgła wojny na minimapie"
-#: client/options.c:270
+#: client/options.c:304
#, fuzzy
msgid "Enabling this will show fog of war on the overview."
msgstr "Warstwa jednostek pokazuje jednostki na minimapie."
-#: client/options.c:488
+#: client/options.c:526
msgid "If you add a preset by hand, also update \"number_of_presets\""
msgstr "Jeżeli dodasz ustawienie ręcznie, zmień także \"number_of_presets\""
-#: client/options.c:516
+#: client/options.c:554
msgid "Cannot find your home directory"
msgstr "Nie można odnaleźć katalogu domowego"
-#: client/options.c:665 client/options.c:796
+#: client/options.c:703 client/options.c:834
msgid "Save failed, cannot find a filename."
msgstr "Zapis nieudany, nie ma nazwy pliku."
-#: client/options.c:678 client/options.c:859
+#: client/options.c:716 client/options.c:897
#, c-format
msgid "Save failed, cannot write to file %s"
msgstr "Zapis nieudany, nie można zapisać do pliku %s"
-#: client/options.c:680 client/options.c:862
+#: client/options.c:718 client/options.c:900
#, c-format
msgid "Saved settings to file %s"
msgstr "Zapisano ustawienia w pliku %s"
@@ -9491,16 +9541,16 @@ msgstr "Napis określający funkcjonalność serwera: %s"
msgid "Start of turn %d"
msgstr "PoczÄ…tek %d tury"
-#: client/packhand.c:1590
+#: client/packhand.c:1591
#, c-format
msgid "AI Mode is now %s."
msgstr "Tryb AI jest teraz %s."
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "ON"
msgstr "Aktywny"
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "OFF"
msgstr "Nieaktywny"
@@ -9532,14 +9582,15 @@ 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:2085
+#: client/gui-gtk-2.0/pages.c:2157
msgid "Flag"
msgstr "Flaga"
#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
-#: client/gui-gtk-2.0/pages.c:1536 client/gui-gtk-2.0/pages.c:2087
-#: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
-#: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
+#: 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/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr "Naród"
@@ -9551,7 +9602,7 @@ msgstr "Granica"
msgid "Score"
msgstr "Punktacja"
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
msgid "Team"
msgstr "Zespół"
@@ -9622,230 +9673,252 @@ msgstr "Nie udało się rozproszyć żadnej jednostki %s."
msgid "Could not open temp file."
msgstr "Nie mogę otworzyć pliku tymczasowego."
-#: client/servers.c:407
+#: client/servers.c:410
msgid "Invalid $http_proxy or metaserver value, must start with 'http://'"
msgstr ""
"Błędna wartość $http_proxy lub metaserwer, powinna się zaczynać od 'http://'"
-#: client/servers.c:413
+#: client/servers.c:416
msgid "Failed looking up metaserver's host"
msgstr "Odnalezienie metaserwera nie powiodło się"
-#: client/text.c:85 client/text.c:86 client/text.c:91
+#. TRANS: "AI <player name>"
+#: client/text.c:94
+#, c-format
+msgid "AI %s"
+msgstr ""
+
+#. TRANS: "<nation adjective>, team <team name>"
+#: client/text.c:118
+#, fuzzy, c-format
+msgid "%s, team %s"
+msgstr ", zespół %s"
+
+#: client/text.c:135 client/text.c:136 client/text.c:141
#: client/gui-sdl/mapview.c:752
msgid "?nation:Neutral"
msgstr "?nation:Neutralni"
-#: client/text.c:85 client/gui-sdl/mapview.c:752
+#: client/text.c:135 client/gui-sdl/mapview.c:752
msgid "?nation:Hostile"
msgstr "?nation:Wrodzy"
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Peaceful"
msgstr "?nation:Pokojowi"
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Friendly"
msgstr "?nation:Przyjaźni"
-#: client/text.c:88 client/gui-sdl/mapview.c:755
+#: client/text.c:138 client/gui-sdl/mapview.c:755
msgid "?nation:Mysterious"
msgstr "?nation:Nieznani"
-#: client/text.c:88
+#: client/text.c:138
msgid "?nation:Friendly(team)"
msgstr "?nation:Przyjaźni(zespół)"
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
msgid "?city:Neutral"
msgstr "?city:Neutralne"
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
msgid "?city:Hostile"
msgstr "?city:Wrogie"
-#: client/text.c:92 client/gui-sdl/mapview.c:786
+#: client/text.c:142 client/gui-sdl/mapview.c:786
msgid "?city:Peaceful"
msgstr "?city:Pokojowe"
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Friendly"
msgstr "?city:Przyjazne"
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Mysterious"
msgstr "?city:Tajemnicze"
-#: client/text.c:93
+#: client/text.c:143
msgid "?city:Friendly(team)"
msgstr "?city:Przyjazne(zespół)"
-#: client/text.c:100
+#: client/text.c:151
#, c-format
msgid "Location: (%d, %d) [%d]"
msgstr "Współrzędne: (%d, %d) [%d]"
-#: client/text.c:109
+#: client/text.c:153
+#, c-format
+msgid "Native coordinates: (%d, %d)"
+msgstr ""
+
+#: client/text.c:160
#, c-format
msgid "Terrain: %s"
msgstr "Teren: %s"
-#: client/text.c:110
+#: client/text.c:161
#, c-format
msgid "Food/Prod/Trade: %s"
msgstr "Żywn/Prod/Hand: %s"
-#: client/text.c:113
+#: client/text.c:164
msgid "Minor Tribe Village"
msgstr "Podrzędna osada plemienna"
-#: client/text.c:119
+#: client/text.c:173
#, fuzzy
msgid "Our territory"
msgstr "Nasze Terytorium"
-#. TRANS: "Polish territory"
-#: client/text.c:122
+#. TRANS: "Territory of <username> (<nation + team>)"
+#: client/text.c:176
#, fuzzy, c-format
-msgid "%s territory"
-msgstr "%s"
+msgid "Territory of %s (%s)"
+msgstr "%s %s"
-#. TRANS: "Polish territory (5 turn cease-fire)"
-#: client/text.c:131
-#, c-format
-msgid "%s territory (%d turn cease-fire)"
-msgid_plural "%s territory (%d turn cease-fire)"
-msgstr[0] "%s (%d tura zawieszenia broni)"
-msgstr[1] "%s (%d tury zawieszenia broni)"
-msgstr[2] "%s (%d tur zawieszenia broni)"
+#: client/text.c:186
+#, fuzzy, c-format
+msgid "Territory of %s (%s) (%d turn cease-fire)"
+msgid_plural "Territory of %s (%s) (%d turn cease-fire)"
+msgstr[0] "Miasto %s (%se, %d tura zawieszenia broni)"
+msgstr[1] "Miasto %s (%se, %d tury zawieszenia broni)"
+msgstr[2] "Miasto %s (%se, %d tur zawieszenia broni)"
-#. TRANS: "Polish territory (friendly)"
-#: client/text.c:140
+#. TRANS: "Territory of <username>
+#. * (<nation + team> | <diplomatic state>)"
+#: client/text.c:195
#, fuzzy, c-format
-msgid "%s territory (%s)"
+msgid "Territory of %s (%s | %s)"
msgstr "%s %s"
-#: client/text.c:145
+#: client/text.c:200
msgid "Unclaimed territory"
msgstr "Teren neutralny"
-#. TRANS: "City: Warsaw (Polish)"
-#: client/text.c:156
-#, c-format
-msgid "City: %s (%s)"
-msgstr "Miasto: %s(%se)"
+#. TRANS: "City: <city name> | <username> (<nation + team>)"
+#: client/text.c:214
+#, fuzzy, c-format
+msgid "City: %s | %s (%s)"
+msgstr "Miasto: %s(%se, %s)"
-#. TRANS: "City: Warsaw (Polish, 5 turn cease-fire)"
-#: client/text.c:166
-#, c-format
-msgid "City: %s (%s, %d turn cease-fire)"
-msgid_plural "City: %s (%s, %d turn cease-fire)"
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <number> turn cease-fire)"
+#: client/text.c:224
+#, fuzzy, c-format
+msgid "City: %s | %s (%s, %d turn cease-fire)"
+msgid_plural "City: %s | %s (%s, %d turn cease-fire)"
msgstr[0] "Miasto %s (%se, %d tura zawieszenia broni)"
msgstr[1] "Miasto %s (%se, %d tury zawieszenia broni)"
msgstr[2] "Miasto %s (%se, %d tur zawieszenia broni)"
-#. TRANS: "City: Warsaw (Polish,friendly)"
-#: client/text.c:174
-#, c-format
-msgid "City: %s (%s, %s)"
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <diplomatic state>)"
+#: client/text.c:231
+#, fuzzy, c-format
+msgid "City: %s | %s (%s, %s)"
msgstr "Miasto: %s(%se, %s)"
#. TRANS: previous lines gave other information about the city.
-#: client/text.c:189
+#: client/text.c:246
#, fuzzy, c-format
msgid "?clistbegin: with %s"
msgstr " z %s"
#. TRANS: "Trade from Warsaw: 5"
-#: client/text.c:202
+#: client/text.c:259
#, c-format
msgid "Trade from %s: %d"
msgstr "Handel z miasta %s: %d"
-#: client/text.c:210
+#: client/text.c:267
#, c-format
msgid "Infrastructure: %s"
msgstr "Infrastruktura: %s"
-#: client/text.c:215
+#: client/text.c:272
#, c-format
msgid "Activity: %s"
msgstr "Czynność: %s"
-#. TRANS: "Unit: Musketeers (Polish, Warsaw)"
-#. TRANS: "Unit: Musketeers (Polish,friendly)"
-#: client/text.c:226 client/text.c:253
-#, c-format
-msgid "Unit: %s (%s, %s)"
+#. TRANS: "Unit: <unit type> | <username>
+#. * (<nation + team>, <homecity>)"
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <diplomatic state>)"
+#: client/text.c:287 client/text.c:313
+#, fuzzy, c-format
+msgid "Unit: %s | %s (%s, %s)"
msgstr "Jednostka: %s(%s,%s)"
-#. TRANS: "Unit: Musketeers (Polish)"
-#: client/text.c:232
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>)"
+#: client/text.c:292
#, fuzzy, c-format
-msgid "Unit: %s (%s)"
-msgstr "Jednostka: %s(%s)"
+msgid "Unit: %s | %s (%s)"
+msgstr "Jednostka: %s(%s,%s)"
-#. TRANS: "Unit: Musketeers (Polish, 5 turn cease-fire)"
-#: client/text.c:245
-#, c-format
-msgid "Unit: %s (%s, %d turn cease-fire)"
-msgid_plural "Unit: %s (%s, %d turn cease-fire)"
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <number> turn cease-fire)"
+#: client/text.c:305
+#, fuzzy, c-format
+msgid "Unit: %s | %s (%s, %d turn cease-fire)"
+msgid_plural "Unit: %s | %s (%s, %d turn cease-fire)"
msgstr[0] "Jednostka: %s (%s, %d tura zawieszenia broni)"
msgstr[1] "Jednostka %s (%s, %d tury zawieszenia broni)"
msgstr[2] "Jednostka %s (%s, %d tur zawieszenia broni)"
#. TRANS: "Chance to win: A:95% D:46%"
-#: client/text.c:279
+#: client/text.c:338
#, c-format
msgid "Chance to win: A:%d%% D:%d%%"
msgstr "Szansa zwycięstwa: A%d%% O:%d%%"
#. TRANS: A is attack power, D is defense power, FP is firepower,
#. * HP is hitpoints (current and max).
-#: client/text.c:286
+#: client/text.c:345
#, c-format
msgid "A:%d D:%d FP:%d HP:%d/%d (%s)"
msgstr "A:%d O:%d SO:%d HP:%d/%d (%s)"
#. TRANS: "5 more" units on this tile
-#: client/text.c:295
+#: client/text.c:354
#, c-format
msgid " (%d more)"
msgstr " (%d dodatkowych)"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:364
+#: client/text.c:423
#, c-format
msgid "far from %s"
msgstr "w okolicy miasta %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:367
+#: client/text.c:426
#, c-format
msgid "near %s"
msgstr "koło miasta %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:370
+#: client/text.c:429
#, c-format
msgid "in %s"
msgstr "w mieście %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:403
+#: client/text.c:462
#, c-format
msgid "from %s"
msgstr "z miasta %s"
-#: client/text.c:466
+#: client/text.c:525
msgid "Progress: no research"
msgstr "Postęp: brak"
-#: client/text.c:470
+#: client/text.c:529
msgid "Progress: no research target"
msgstr "Postęp: brak"
-#: client/text.c:475
+#: client/text.c:534
#, c-format
msgid "Progress: %d turn/advance"
msgid_plural "Progress: %d turns/advance"
@@ -9853,7 +9926,7 @@ msgstr[0] "Postęp: %d tura na wynalazek"
msgstr[1] "Postęp: %d tury na wynalazek"
msgstr[2] "Postęp: %d tur na wynalazek"
-#: client/text.c:480
+#: client/text.c:539
#, c-format
msgid "%d bulb/turn"
msgid_plural "%d bulbs/turn"
@@ -9861,7 +9934,7 @@ msgstr[0] "%d punkt na turÄ™"
msgstr[1] "%d punkty na turÄ™"
msgstr[2] "%d punktów na turę"
-#: client/text.c:485
+#: client/text.c:544
#, c-format
msgid ", %d bulb/turn from team"
msgid_plural ", %d bulbs/turn from team"
@@ -9869,12 +9942,12 @@ msgstr[0] ", %d punkt na turę od zespołu"
msgstr[1] ", %d punkty na turę od zespołu"
msgstr[2] ", %d punktów na turę od zespołu"
-#: client/text.c:512
+#: client/text.c:571
#, c-format
msgid "%d/- (never)"
msgstr "%d/- (Nigdy)"
-#: client/text.c:524
+#: client/text.c:583
#, c-format
msgid "%d/%d (%d turn)"
msgid_plural "%d/%d (%d turns)"
@@ -9882,12 +9955,12 @@ msgstr[0] "%d/%d (%d tura)"
msgstr[1] "%d/%d (%d tury)"
msgstr[2] "%d/%d (%d tur)"
-#: client/text.c:527
+#: client/text.c:586
#, c-format
msgid "%d/%d (never)"
msgstr "%d/%d (Nigdy)"
-#: client/text.c:564
+#: client/text.c:623
#, c-format
msgid "%d step"
msgid_plural "%d steps"
@@ -9895,7 +9968,7 @@ msgstr[0] "%d krok"
msgstr[1] "%d kroki"
msgstr[2] "%d kroków"
-#: client/text.c:566
+#: client/text.c:625
#, c-format
msgid "%d bulb"
msgid_plural "%d bulbs"
@@ -9903,7 +9976,7 @@ msgstr[0] "%d żarówka"
msgstr[1] "%d żarówki"
msgstr[2] "%d żarówek"
-#: client/text.c:570 client/agents/cma_fec.c:269 client/agents/cma_fec.c:313
+#: 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
#, c-format
msgid "%d turn"
@@ -9912,89 +9985,89 @@ msgstr[0] "%d tura"
msgstr[1] "%d tury"
msgstr[2] "%d tur"
-#: client/text.c:592
+#: client/text.c:651
#, c-format
msgid "Population: %s"
msgstr "Populacja: %s"
-#: client/text.c:595
+#: client/text.c:654
#, c-format
msgid "Year: %s (T%d)"
msgstr "Rok: %s (T%d)"
-#: client/text.c:598
+#: client/text.c:657
#, c-format
msgid "Gold: %d (%+d)"
msgstr "ZÅ‚oto: %d (%+d)"
-#: client/text.c:600
+#: client/text.c:659
#, c-format
msgid "Tax: %d Lux: %d Sci: %d"
msgstr "Pod:%d Lux:%d Nau:%d"
-#: client/text.c:607
+#: client/text.c:666
#, fuzzy
msgid "Moving: Nobody"
msgstr "Faza: %s"
-#: client/text.c:609
+#: client/text.c:668
#, c-format
msgid "Moving: %s"
msgstr "Faza: %s"
-#: client/text.c:613
+#: client/text.c:672
msgid "(Click for more info)"
msgstr "(Kliknij - więcej danych)"
-#: client/text.c:629
+#: client/text.c:688
#, c-format
msgid "%s People"
msgstr "%s populacji"
-#: client/text.c:633
+#: client/text.c:692
#, c-format
msgid "Turn: %d"
msgstr "Tura: %d"
-#: client/text.c:635 client/gui-win32/inteldlg.c:111
+#: client/text.c:694 client/gui-win32/inteldlg.c:111
#: client/gui-xaw/inteldlg.c:208
#, c-format
msgid "Gold: %d"
msgstr "ZÅ‚oto: %d"
-#: client/text.c:636
+#: client/text.c:695
#, c-format
msgid "Net Income: %d"
msgstr "Zysk: %d"
#. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:639
+#: client/text.c:698
#, c-format
msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
msgstr "Pod:%d%% Lux:%d%% Nau:%d%%"
-#: client/text.c:643
+#: client/text.c:702
#, c-format
msgid "Researching %s: %s"
msgstr "Badania: %s: %s"
-#: client/text.c:650
+#: client/text.c:709
#, c-format
msgid "Global warming chance: %d%% (%+d%%/turn)"
msgstr "Szansa globalnego ocieplenia: %d%% (%+d%% na turÄ™)"
-#: client/text.c:653
+#: client/text.c:712
#, c-format
msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
msgstr "Szansa zimy nuklearnej: %d%% (%+d%% na turÄ™)"
-#: client/text.c:658 client/gui-win32/inteldlg.c:104
+#: client/text.c:717 client/gui-win32/inteldlg.c:104
#: client/gui-xaw/inteldlg.c:200
#, c-format
msgid "Government: %s"
msgstr "Ustrój: %s"
-#: client/text.c:682
+#: client/text.c:741
#, c-format
msgid "%d unit"
msgid_plural "%d units"
@@ -10003,21 +10076,21 @@ msgstr[1] "%d jednostki"
msgstr[2] "%d jednostek"
#. TRANS: Impossible to reach goto target tile
-#: client/text.c:715 client/gui-sdl/mapview.c:566
+#: client/text.c:774 client/gui-sdl/mapview.c:566
msgid "?goto:Unreachable"
msgstr ""
-#: client/text.c:717 client/gui-sdl/mapview.c:568
+#: client/text.c:776 client/gui-sdl/mapview.c:568
#, c-format
msgid "Turns to target: %d"
msgstr "Tur do celu: %d"
-#: client/text.c:719 client/gui-sdl/mapview.c:570
+#: client/text.c:778 client/gui-sdl/mapview.c:570
#, c-format
msgid "Turns to target: %d to %d"
msgstr "Tur do celu: %d do %d"
-#: client/text.c:725 client/gui-sdl/mapview.c:576
+#: client/text.c:784 client/gui-sdl/mapview.c:576
#, c-format
msgid "%d unit selected"
msgid_plural "%d units selected"
@@ -10025,36 +10098,36 @@ msgstr[0] "%d jednostka zaznaczona"
msgstr[1] "%d jednostki zaznaczone"
msgstr[2] "%d jednostek zaznaczonych"
-#: client/text.c:730 client/gui-sdl/mapview.c:581
+#: client/text.c:789 client/gui-sdl/mapview.c:581
msgid "No units selected."
msgstr "Brak zaznaczonych jednostek"
-#: client/text.c:804 client/gui-sdl/mapview.c:654
+#: client/text.c:863 client/gui-sdl/mapview.c:654
#, c-format
msgid "Others: %d civil; %d military"
msgstr "Inne: %d cywilnych; %d militarnych"
-#: client/text.c:806 client/gui-sdl/mapview.c:656
+#: client/text.c:865 client/gui-sdl/mapview.c:656
#, c-format
msgid "Others: %d civilian"
msgstr "Inne: %d cywilne"
-#: client/text.c:808 client/gui-sdl/mapview.c:658
+#: client/text.c:867 client/gui-sdl/mapview.c:658
#, c-format
msgid "Others: %d military"
msgstr "Inne: %d militarnych"
-#: client/text.c:839
+#: client/text.c:898
#, fuzzy
msgid "No units to upgrade!"
msgstr "Nie można ulepszyć żadnej jednostki."
-#: client/text.c:864
+#: client/text.c:923
#, fuzzy
msgid "None of these units may be upgraded."
msgstr "Nie można ulepszyć żadnej jednostki."
-#: client/text.c:870
+#: client/text.c:929
#, fuzzy, c-format
msgid ""
"Upgrade %d unit for %d gold?\n"
@@ -10072,72 +10145,72 @@ msgstr[2] ""
"Ulepszyć %s do %s za %d złota?\n"
"Skarbiec zawiera %d złota."
-#: client/text.c:891
+#: client/text.c:950
msgid "Shows your progress in researching the current technology."
msgstr "Wyświetla stan prac nad nową technologią."
-#: client/text.c:897
+#: client/text.c:956
msgid "no research target."
msgstr "brak celu badań"
#. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:900
+#: client/text.c:959
#, c-format
msgid "%s: %d/%d."
msgstr "%s: %d/%d"
-#: client/text.c:920
+#: client/text.c:979
msgid "Shows the progress of global warming:"
msgstr "Wyświetla poziom globalnego ocieplenia:"
-#: client/text.c:921
+#: client/text.c:980
#, c-format
msgid "Pollution rate: %d%%"
msgstr "Poziom zanieczyszczenia: %d%%"
-#: client/text.c:923
+#: client/text.c:982
#, c-format
msgid "Chance of catastrophic warming each turn: %d%%"
msgstr "Szansa katastrofalnego ocieplenia na turÄ™: %d%%"
-#: client/text.c:939
+#: client/text.c:998
msgid "Shows the progress of nuclear winter:"
msgstr "Wyświetla poziom zimy nuklearnej:"
-#: client/text.c:940
+#: client/text.c:999
#, c-format
msgid "Fallout rate: %d%%"
msgstr "Poziom skażenia: %d%%"
-#: client/text.c:942
+#: client/text.c:1001
#, c-format
msgid "Chance of catastrophic winter each turn: %d%%"
msgstr "Szansa katastrofalnego oziębienia na turę: %d%%"
-#: client/text.c:957
+#: client/text.c:1016
msgid "Shows your current government:"
msgstr "Wyświetla twój aktualny ustrój:"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:981
+#: client/text.c:1040
#, c-format
msgid "Population: %5d"
msgstr "Populacja: %5d"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:1043
#, c-format
msgid "Support: %5d %%"
msgstr "Obsługa: %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:1047
#, c-format
msgid "Energy: %5d %%"
msgstr "Energia: %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:992
+#: client/text.c:1051
#, c-format
msgid "Mass: %5d ton"
msgid_plural "Mass: %5d tons"
@@ -10146,96 +10219,97 @@ msgstr[1] "Masa: %5d tony"
msgstr[2] "Masa: %5d ton"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1057
#, c-format
msgid "Travel time: %5.1f years"
msgstr "Czas podróży: %5.1f lat"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1061
msgid "Travel time: N/A "
msgstr "Czas podróży: N/A "
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1065
#, c-format
msgid "Success prob.: %5d %%"
msgstr "Prawd. Sukcesu: %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1010
+#: client/text.c:1069
#, c-format
msgid "Year of arrival: %8s"
msgstr "Rok przybycia: %8s"
-#: client/text.c:1030
+#: client/text.c:1089
msgid "?timeout:off"
msgstr "?timeout:wył"
-#: client/text.c:1054
+#: client/text.c:1113
#, c-format
msgid "?seconds:%02ds"
msgstr "?seconds:%d sek"
-#: client/text.c:1056
+#: client/text.c:1115
#, c-format
msgid "?mins/secs:%02dm %02ds"
msgstr "?min/secs:%dmin %ds"
-#: client/text.c:1058
+#: client/text.c:1117
#, c-format
msgid "?hrs/mns:%02dh %02dm"
msgstr "?hrs/mns:%dh %dmin"
-#: client/text.c:1060
+#: client/text.c:1119
#, c-format
msgid "?dys/hrs:%02dd %02dh"
msgstr "?dys/hrs:%ddni %d godz"
-#: client/text.c:1063
+#: client/text.c:1122
msgid "?duration:overflow"
msgstr "?duration:błąd"
-#: client/text.c:1084
+#: client/text.c:1143
#, c-format
msgid "%6d.%02d ms"
msgstr "%6d.%02d ms"
-#. TRANS: "Republic of the Poles"
-#: client/text.c:1127
-#, c-format
-msgid "%s of the %s"
-msgstr "%2$s %1$s"
+#. TRANS: <nation adjective> <government name>.
+#. * E.g. "Polish Republic".
+#: client/text.c:1188
+#, fuzzy, c-format
+msgid "?nationgovernment:%s %s"
+msgstr "Ustrój: %s"
#. TRANS: "Observer: 1985"
-#: client/text.c:1137
+#: client/text.c:1198
#, c-format
msgid "Observer: %s"
msgstr "Obserwator: %s"
-#: client/text.c:1155
+#: client/text.c:1216
msgid "Buildings: "
msgstr "Budynki: "
-#: client/text.c:1172 client/text.c:1211
+#: client/text.c:1233 client/text.c:1272
msgid "None. "
msgstr "Brak. "
-#: client/text.c:1174 client/text.c:1213
+#: client/text.c:1235 client/text.c:1274
msgid "?clistend:."
msgstr "."
-#: client/text.c:1192
+#: client/text.c:1253
msgid "Wonders: "
msgstr "Cuda: "
-#: client/text.c:1247
+#: client/text.c:1308
#, 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:1251
+#: client/text.c:1312
#, fuzzy, c-format
msgid "%d content before penalty."
msgid_plural "%d content before penalty."
@@ -10244,7 +10318,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:1257
+#: client/text.c:1318
#, fuzzy, c-format
msgid "%d additional unhappy citizen."
msgid_plural "%d additional unhappy citizens."
@@ -10252,39 +10326,45 @@ msgstr[0] "%d dodatkowi(y) nieszczęśliwy(i)."
msgstr[1] "%d dodatkowi(y) nieszczęśliwy(i)."
msgstr[2] "%d dodatkowi(y) nieszczęśliwy(i)."
-#. TRANS: Martial law opening parenthesis
-#: client/text.c:1279
-msgid "Martial law in effect ("
+#: client/text.c:1339
+#, fuzzy
+msgid "Unlimited martial law in effect."
msgstr "Stan wojenny ("
-#. TRANS: no [unit] maximum
-#: client/text.c:1284
-msgid "no maximum, "
-msgstr "bez maksimum, "
-
-#: client/text.c:1287
-#, c-format
-msgid "%d unit maximum, "
-msgid_plural "%d units maximum, "
-msgstr[0] "maksymalnie %d jednostka, "
-msgstr[1] "maksymalnie %d jednostki, "
-msgstr[2] "maksymalnie %d jednostek, "
+#: client/text.c:1341
+#, fuzzy, c-format
+msgid "%d military unit may impose martial law."
+msgid_plural "Up to %d military units may impose martial law."
+msgstr[0] ""
+"* Jednostka niezmilitaryzowana (bez możliwości przeprowadzania ataku).\n"
+msgstr[1] ""
+"* Jednostka niezmilitaryzowana (bez możliwości przeprowadzania ataku).\n"
+msgstr[2] ""
+"* Jednostka niezmilitaryzowana (bez możliwości przeprowadzania ataku).\n"
-#. TRANS: Martial law closing parenthesis
-#: client/text.c:1294
-#, c-format
-msgid "%d per unit). "
-msgstr "%d na jednostkÄ™). "
+#: client/text.c:1345
+#, fuzzy, c-format
+msgid "Each military unit makes %d unhappy citizen content."
+msgid_plural "Each military unit makes %d unhappy citizens content."
+msgstr[0] ""
+"Dostarcza rozrywki mieszkańcom, czyniąc 3 nieszczęśliwych obywateli "
+"zadowolonymi."
+msgstr[1] ""
+"Dostarcza rozrywki mieszkańcom, czyniąc 3 nieszczęśliwych obywateli "
+"zadowolonymi."
+msgstr[2] ""
+"Dostarcza rozrywki mieszkańcom, czyniąc 3 nieszczęśliwych obywateli "
+"zadowolonymi."
-#: client/text.c:1298
+#: client/text.c:1352
msgid "Military units in the field may cause unhappiness. "
msgstr "Jednostki militarne w mieście mogą powodować niezadowolenie. "
-#: client/text.c:1301
+#: client/text.c:1355
msgid "Military units have no happiness effect. "
msgstr "Jednostki militarne nie mają wpływu na zadowolenie. "
-#: client/text.c:1316
+#: client/text.c:1370
#, c-format
msgid "Luxury: %d total."
msgstr "Luksus: ogółem %d."
@@ -10304,7 +10384,7 @@ msgid ""
"instead."
msgstr "Klient nie obsługuje 'wystającej' grafiki. Używam domyślnego zestawu."
-#: client/tilespec.c:3968
+#: client/tilespec.c:3966
#, fuzzy, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
@@ -10331,12 +10411,12 @@ msgstr ""
"Zarządca miejski nie mógł sobie poradzić z miastem %s. Powinieneś sam "
"rozwiązać problem."
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
-#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:599
+#: client/gui-gtk-2.0/cityrep.c:624 client/gui-sdl/citydlg.c:2009
msgid "none"
msgstr "brak"
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:645
msgid "custom"
msgstr "własny"
@@ -10646,7 +10726,7 @@ msgstr "Ustanów _trasę handlową"
msgid "Enter Marketplace"
msgstr "Rozpocznij handlowanie"
-#: client/gui-gtk-2.0/chatline.c:144 client/gui-win32/chatline.c:134
+#: client/gui-gtk-2.0/chatline.c:218 client/gui-win32/chatline.c:134
#: client/gui-xaw/chatline.c:120
msgid "Cleared output window."
msgstr "Okno komunikatów zostało wyczyszczone."
@@ -10727,11 +10807,11 @@ msgid "%d/%d %d turns"
msgstr "%d/%d %d tur"
#: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:821
+#: client/gui-gtk-2.0/cityrep.c:1027
msgid "_Buy"
msgstr "_Kup"
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:869
#, fuzzy
msgid "_Production"
msgstr "Pro_dukcja"
@@ -10753,12 +10833,12 @@ msgid "Entertainers"
msgstr "Komicy"
#: client/gui-gtk-2.0/citydlg.c:1029 client/gui-win32/citydlg.c:1989
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2403
msgid "Scientists"
msgstr "Naukowcy"
#: client/gui-gtk-2.0/citydlg.c:1030 client/gui-win32/citydlg.c:1991
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2404
msgid "Taxmen"
msgstr "Poborcy podatkowi"
@@ -10851,7 +10931,7 @@ msgstr "Jednostki na utrzymaniu %d"
msgid "Present units %d"
msgstr "Obecne jednostki %d"
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:1019
msgid "Cen_ter"
msgstr "_Centruj"
@@ -10940,32 +11020,62 @@ msgstr "Zmień nazwę miasta"
msgid "What should we rename the city to?"
msgstr "Jaka powinna być nowa nazwa miasta?"
-#: client/gui-gtk-2.0/cityrep.c:699
+#: client/gui-gtk-2.0/cityrep.c:794
+#, fuzzy
+msgid "(no worklists defined)"
+msgstr "(schemat)"
+
+#: client/gui-gtk-2.0/cityrep.c:876
msgid "Chan_ge"
msgstr "Zmień"
-#: client/gui-gtk-2.0/cityrep.c:703
+#: client/gui-gtk-2.0/cityrep.c:880
msgid "Add _First"
msgstr "Wstaw na _poczÄ…tek"
-#: client/gui-gtk-2.0/cityrep.c:707
+#: client/gui-gtk-2.0/cityrep.c:884
msgid "Add _Next"
msgstr "Ustaw _następny"
-#: client/gui-gtk-2.0/cityrep.c:711
+#: client/gui-gtk-2.0/cityrep.c:888
+#, fuzzy
+msgid "Add _2nd Last"
+msgstr "Wstaw na _koniec"
+
+#: client/gui-gtk-2.0/cityrep.c:892
msgid "Add _Last"
msgstr "Wstaw na _koniec"
-#: client/gui-gtk-2.0/cityrep.c:715
+#: client/gui-gtk-2.0/cityrep.c:899
+#, fuzzy
+msgid "Set Worklist"
+msgstr "Schemat prac"
+
+#: client/gui-gtk-2.0/cityrep.c:905
+#, fuzzy
+msgid "Append Worklist"
+msgstr "Zmień nazwę schematu"
+
+#: client/gui-gtk-2.0/cityrep.c:911
+#, fuzzy
+msgid "Clear _Worklist"
+msgstr "_Wykonywane zadania"
+
+#: client/gui-gtk-2.0/cityrep.c:916
+#, fuzzy
+msgid "Gover_nor"
+msgstr "Gubernator"
+
+#: client/gui-gtk-2.0/cityrep.c:921
msgid "_Select"
msgstr "_Wybierz"
-#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
+#: client/gui-gtk-2.0/cityrep.c:925 client/gui-gtk-2.0/plrdlg.c:521
#, fuzzy
msgid "_Display"
msgstr "Po_każ"
-#: client/gui-gtk-2.0/cityrep.c:800 client/gui-gtk-2.0/menu.c:808
+#: 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-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
#: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -10975,101 +11085,101 @@ msgstr "Po_każ"
msgid "Cities"
msgstr "Miasta"
-#: client/gui-gtk-2.0/cityrep.c:817
+#: client/gui-gtk-2.0/cityrep.c:1023
#, fuzzy
msgid "_Inspect"
msgstr "Wyświetl"
-#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
-#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-sdl/helpdlg.c:297 client/gui-win32/menu.c:342
-#: client/gui-xaw/menu.c:241
+#: 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
+#: client/gui-gtk-2.0/cityrep.c:1518 client/gui-gtk-2.0/menu.c:823
+#: client/gui-gtk-2.0/menu.c:825 client/gui-gtk-2.0/menu.c:827
+#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:831
+#: client/gui-gtk-2.0/menu.c:833 client/gui-sdl/helpdlg.c:297
+#: client/gui-win32/menu.c:342 client/gui-xaw/menu.c:241
msgid "Improvements"
msgstr "Budynki"
-#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
-#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
-#: client/gui-xaw/menu.c:247
+#: client/gui-gtk-2.0/cityrep.c:1441 client/gui-gtk-2.0/cityrep.c:1460
+#: client/gui-gtk-2.0/cityrep.c:1479 client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1522 client/gui-xaw/menu.c:247
msgid "Wonders"
msgstr "Cuda świata"
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1662 client/gui-win32/cityrep.c:439
#: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
msgid "All Cities"
msgstr "Wszystkie Miasta"
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1667 client/gui-win32/cityrep.c:440
msgid "No Cities"
msgstr "Brak Miast"
-#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1672 client/gui-win32/cityrep.c:441
msgid "Invert Selection"
msgstr "Odwróć wybór"
-#: client/gui-gtk-2.0/cityrep.c:1420
+#: client/gui-gtk-2.0/cityrep.c:1682
msgid "Building Units"
msgstr "Jednostki w Budowie"
-#: client/gui-gtk-2.0/cityrep.c:1426
+#: client/gui-gtk-2.0/cityrep.c:1688
msgid "Building Improvements"
msgstr "Budynki w Budowie"
-#: client/gui-gtk-2.0/cityrep.c:1432
+#: client/gui-gtk-2.0/cityrep.c:1694
msgid "Building Wonders"
msgstr "Cuda w Budowie"
-#: client/gui-gtk-2.0/cityrep.c:1444
+#: client/gui-gtk-2.0/cityrep.c:1706
msgid "Building Unit"
msgstr "Budowana jednostka"
-#: client/gui-gtk-2.0/cityrep.c:1448
+#: client/gui-gtk-2.0/cityrep.c:1710
msgid "Building Improvement"
msgstr "Budowany obiekt"
-#: client/gui-gtk-2.0/cityrep.c:1452
+#: client/gui-gtk-2.0/cityrep.c:1714
msgid "Building Wonder"
msgstr "Budowany cud"
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1722 client/gui-win32/cityrep.c:443
msgid "Coastal Cities"
msgstr "Miasta Przybrzeżne"
-#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1727 client/gui-win32/cityrep.c:444
msgid "Same Island"
msgstr "Ta Sama Wyspa"
-#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1737 client/gui-win32/cityrep.c:447
msgid "Supported Units"
msgstr "Utrzymywane Jednostki"
-#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1740 client/gui-win32/cityrep.c:454
msgid "Units Present"
msgstr "Obecne Jednostki"
-#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1744 client/gui-win32/cityrep.c:469
msgid "Improvements in City"
msgstr "Budynki w Mieście"
-#: client/gui-gtk-2.0/cityrep.c:1486
+#: client/gui-gtk-2.0/cityrep.c:1748
msgid "Wonders in City"
msgstr "Cuda w Mieście"
-#: client/gui-gtk-2.0/cityrep.c:1495
+#: client/gui-gtk-2.0/cityrep.c:1757
msgid "Available Units"
msgstr "Dostępne Jednostki"
-#: client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1760
msgid "Available Improvements"
msgstr "Dostępne Budynki"
-#: client/gui-gtk-2.0/cityrep.c:1501
+#: client/gui-gtk-2.0/cityrep.c:1763
msgid "Available Wonders"
msgstr "Dostępne Cuda Świata"
-#: client/gui-gtk-2.0/cityrep.c:1625
+#: client/gui-gtk-2.0/cityrep.c:1882
#, fuzzy, c-format
msgid "Total Buy Cost: %d"
msgstr "Całkowity koszt:"
@@ -11139,11 +11249,11 @@ 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:186
+#: client/gui-gtk-2.0/dialogs.c:196 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:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
#, fuzzy
msgid "Inspect _City"
msgstr "_Wyświetl miasto"
@@ -11172,10 +11282,10 @@ msgstr "Wybierz cel plÄ…drowania:"
msgid "Unit"
msgstr "Jednostka"
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
-#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
-#: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
-#: manual/civmanual.c:302 data/Freeciv.in:80
+#: 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-win32/plrdlg.c:335 manual/civmanual.c:302 data/Freeciv.in:80
msgid "Name"
msgstr "ImiÄ™"
@@ -11201,7 +11311,7 @@ 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:1036 data/Freeciv.in:3371
+#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
msgid "Pick Nation"
msgstr "Wybierz naród"
@@ -11283,7 +11393,7 @@ msgstr "_Mapy"
msgid "_Advances"
msgstr "_Wynalazki"
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:910
+#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr "_Miasta"
@@ -11389,19 +11499,19 @@ msgstr "Wybierz cel"
msgid "Show _All Cities"
msgstr "Pokaż _wszystkie miasta"
-#: client/gui-gtk-2.0/gui_main.c:150
+#: client/gui-gtk-2.0/gui_main.c:162
msgid "Show Map Scrollbars"
msgstr "Pokazuj paski przewijania"
-#: client/gui-gtk-2.0/gui_main.c:151
+#: client/gui-gtk-2.0/gui_main.c:163
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:155
+#: client/gui-gtk-2.0/gui_main.c:167
msgid "Keyboardless goto"
msgstr "Bezklawiaturowe GOTO"
-#: client/gui-gtk-2.0/gui_main.c:156
+#: client/gui-gtk-2.0/gui_main.c:168
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."
@@ -11409,11 +11519,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:161
+#: client/gui-gtk-2.0/gui_main.c:173
msgid "Keep dialogs on top"
msgstr "Okna dialogowe na wierzchu"
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:174
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."
@@ -11422,22 +11532,22 @@ msgstr ""
"na wierzchu okna głównego. W przypadku trybu pełnoekranowego nie ma ona "
"znaczenia."
-#: client/gui-gtk-2.0/gui_main.c:166
+#: client/gui-gtk-2.0/gui_main.c:178
msgid "Show worklist task icons"
msgstr "Pokazuj ikony na liście prac"
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:179
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:171
+#: client/gui-gtk-2.0/gui_main.c:183
msgid "Enable status report tabs"
msgstr "Włącz zakładki statusu"
-#: client/gui-gtk-2.0/gui_main.c:172
+#: client/gui-gtk-2.0/gui_main.c:184
msgid ""
"If this option is enabled then report dialogs will be shown as separate tabs "
"rather than in popup dialogs."
@@ -11445,11 +11555,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:177 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:189 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:178 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:190 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."
@@ -11458,50 +11568,119 @@ msgstr ""
"wojny(FOW). Metoda ta nie jest wolniejsza, ale zużywa dwukrotnie więcej "
"pamięci."
-#: client/gui-gtk-2.0/gui_main.c:277 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:195
+msgid "Show time for each chat message"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:196
+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
+msgid "Split bottom notebook area"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:202
+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
+msgid "New message events go to top of list"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:208
+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
+msgid "Show extra message window buttons"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:214
+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 "
+"is disabled, these buttons will not appear (you can still double-click with "
+"the left mouse button or right-click on a row to inspect or goto "
+"respectively). This option will only take effect once the message window is "
+"closed and reopened."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:224
+msgid "Metaserver tab first in network page"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:225
+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
+msgid "Plain chat messages are sent to allies only"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:231
+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 "
+"messages will be sent as public chat messages. To send a public chat message "
+"with this option enabled, prefix the message with a single colon ':'. This "
+"option can also be set using a toggle button beside the chat entry (only "
+"visible in multiplayer games)."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:340 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:723 client/gui-gtk-2.0/gui_main.c:1345
+#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
msgid "Freeciv"
msgstr "Freeciv"
-#: client/gui-gtk-2.0/gui_main.c:1088 client/gui-gtk-2.0/gui_main.c:1095
+#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
#: 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:1095 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1232 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:1127 client/gui-gtk-2.0/menu.c:770
-#: client/gui-gtk-2.0/menu.c:772 client/gui-gtk-2.0/menu.c:774
-#: client/gui-gtk-2.0/menu.c:776 client/gui-gtk-2.0/menu.c:778
-#: client/gui-gtk-2.0/menu.c:780 client/gui-gtk-2.0/menu.c:782
-#: client/gui-gtk-2.0/menu.c:784 client/gui-gtk-2.0/menu.c:786
-#: client/gui-gtk-2.0/menu.c:788 client/gui-gtk-2.0/menu.c:790
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-gtk-2.0/menu.c:804 client/gui-gtk-2.0/menu.c:806
-#: client/gui-gtk-2.0/menu.c:808 client/gui-gtk-2.0/menu.c:810
-#: client/gui-gtk-2.0/menu.c:812 client/gui-gtk-2.0/menu.c:814
-#: client/gui-gtk-2.0/menu.c:816 client/gui-gtk-2.0/menu.c:818
-#: client/gui-gtk-2.0/menu.c:820 client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/gui_main.c:1266 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
+#: client/gui-gtk-2.0/menu.c:811 client/gui-gtk-2.0/menu.c:813
+#: client/gui-gtk-2.0/menu.c:815 client/gui-gtk-2.0/menu.c:817
+#: client/gui-gtk-2.0/menu.c:819 client/gui-gtk-2.0/menu.c:821
+#: client/gui-gtk-2.0/menu.c:823 client/gui-gtk-2.0/menu.c:825
+#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
+#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
+#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
+#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
+#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
+#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
#: data/Freeciv.in:2028
msgid "View"
msgstr "Widok"
-#: client/gui-gtk-2.0/gui_main.c:1208
+#: client/gui-gtk-2.0/gui_main.c:1359
msgid "Chat"
msgstr "Chat"
-#: client/gui-gtk-2.0/gui_main.c:1224 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1377 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"
@@ -11512,74 +11691,78 @@ msgstr ""
"określonymi warunkami; Zobacz \"Kopiowanie\" w menu Pomoc.\n"
"A teraz im dokop!!!"
-#: client/gui-gtk-2.0/gui_main.c:1491
+#: client/gui-gtk-2.0/gui_main.c:1392
+msgid "Allies Only"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:1657
msgid "Not _ready"
msgstr "Nie _przygotowany"
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
+#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
msgid "_Ready"
msgstr "_Gotowy"
-#: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2132
+#: 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
msgid "_Start"
msgstr "_Start"
-#: client/gui-gtk-2.0/gui_main.c:1520
+#: client/gui-gtk-2.0/gui_main.c:1686
#, fuzzy
msgid "_Take Player"
msgstr "Warstwa miast"
-#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
+#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
msgid "Pick _Nation"
msgstr "Wybierz _naród"
-#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
+#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
#, fuzzy
msgid "_Observe"
msgstr "_Obserwator"
-#: client/gui-gtk-2.0/gui_main.c:1532
+#: client/gui-gtk-2.0/gui_main.c:1698
#, fuzzy
msgid "Do not _observe"
msgstr "teraz _obserwuje"
-#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
msgid "<AI>"
msgstr "<AI>"
-#: client/gui-gtk-2.0/gui_main.c:1557
+#: client/gui-gtk-2.0/gui_main.c:1723
msgid "<Novice AI>"
msgstr "<AI - Nowicjusz>"
-#: client/gui-gtk-2.0/gui_main.c:1560
+#: client/gui-gtk-2.0/gui_main.c:1726
msgid "<Easy AI>"
msgstr "<AI - Åatwy>"
-#: client/gui-gtk-2.0/gui_main.c:1563
+#: client/gui-gtk-2.0/gui_main.c:1729
msgid "<Normal AI>"
msgstr "<AI - Normalny>"
-#: client/gui-gtk-2.0/gui_main.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1732
msgid "<Hard AI>"
msgstr "<AI - Trudny>"
-#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1742 client/gui-win32/dialogs.c:594
#: client/gui-xaw/pages.c:217
msgid "Random"
msgstr "Losowy"
-#: client/gui-gtk-2.0/gui_main.c:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
#, fuzzy
msgid "Observer"
msgstr "Obserwator: %s"
-#: client/gui-gtk-2.0/gui_main.c:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
#, fuzzy
msgid "Detached"
msgstr "Martwy"
-#: client/gui-gtk-2.0/gui_main.c:1899
+#: client/gui-gtk-2.0/gui_main.c:2073
msgid "Are you sure you want to quit?"
msgstr "Na pewno chcesz zakończyć?"
@@ -11812,472 +11995,509 @@ msgstr "_Technologie"
msgid "Foreign Intelligence: %s Empire"
msgstr "Raport wywiadu o państwie %sim"
-#: client/gui-gtk-2.0/mapctrl.c:195 client/gui-sdl/mapctrl.c:2565
+#: client/gui-gtk-2.0/mapctrl.c:179 client/gui-sdl/mapctrl.c:2565
#: client/gui-sdl/menu.c:839 client/gui-sdl/menu.c:1021
#: client/gui-win32/mapctrl.c:353
msgid "Build New City"
msgstr "Budowa nowego miasta"
-#: client/gui-gtk-2.0/mapctrl.c:196 client/gui-sdl/mapctrl.c:2594
+#: client/gui-gtk-2.0/mapctrl.c:180 client/gui-sdl/mapctrl.c:2594
#: client/gui-win32/mapctrl.c:354 client/gui-xaw/mapctrl.c:89
msgid "What should we call our new city?"
msgstr "Jak powinno zostać nazwane nowe miasto?"
-#: client/gui-gtk-2.0/mapview.c:147
+#: client/gui-gtk-2.0/mapview.c:158
msgid "Shows your current luxury/science/tax rates;click to toggle them."
msgstr ""
"Wyświetla twoje aktualne stawki dla luksusu/nauki/podatków. Kliknij aby je "
"zmienić."
-#: client/gui-gtk-2.0/mapview.c:692 client/gui-win32/canvas.c:275
+#: client/gui-gtk-2.0/mapview.c:702 client/gui-win32/canvas.c:275
msgid "Better fog will only work in truecolor. Disabling it"
msgstr "Lepsza mgła wojny działa jedynie w truecolorze. Wyłączam"
-#: client/gui-gtk-2.0/menu.c:250
+#: client/gui-gtk-2.0/menu.c:256
msgid "Leaving a local game will end it!"
msgstr "Opuszczenie lokalnej gry oznacza jej przerwanie!"
-#: client/gui-gtk-2.0/menu.c:700 client/gui-win32/menu.c:303
+#: client/gui-gtk-2.0/menu.c:727 client/gui-win32/menu.c:303
msgid "_Game"
msgstr "_Gra"
-#: client/gui-gtk-2.0/menu.c:702 client/gui-gtk-2.0/menu.c:704
-#: client/gui-gtk-2.0/menu.c:706 client/gui-gtk-2.0/menu.c:708
-#: client/gui-gtk-2.0/menu.c:710 client/gui-gtk-2.0/menu.c:712
-#: client/gui-gtk-2.0/menu.c:714 client/gui-gtk-2.0/menu.c:717
-#: client/gui-gtk-2.0/menu.c:720 client/gui-gtk-2.0/menu.c:722
-#: client/gui-gtk-2.0/menu.c:724 client/gui-gtk-2.0/menu.c:726
-#: client/gui-gtk-2.0/menu.c:728 client/gui-gtk-2.0/menu.c:730
-#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:736
-#: client/gui-gtk-2.0/menu.c:738 client/gui-gtk-2.0/menu.c:740
+#: client/gui-gtk-2.0/menu.c:729 client/gui-gtk-2.0/menu.c:731
+#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:735
+#: client/gui-gtk-2.0/menu.c:737 client/gui-gtk-2.0/menu.c:739
+#: client/gui-gtk-2.0/menu.c:741 client/gui-gtk-2.0/menu.c:744
+#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
+#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
+#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
+#: client/gui-gtk-2.0/menu.c:760 client/gui-gtk-2.0/menu.c:763
+#: client/gui-gtk-2.0/menu.c:765 client/gui-gtk-2.0/menu.c:767
#: data/Freeciv.in:2026
msgid "Game"
msgstr "Gra"
-#: client/gui-gtk-2.0/menu.c:704 client/gui-gtk-2.0/menu.c:706
-#: client/gui-gtk-2.0/menu.c:708
+#: client/gui-gtk-2.0/menu.c:731 client/gui-gtk-2.0/menu.c:733
+#: client/gui-gtk-2.0/menu.c:735
msgid "_Chat"
msgstr "_Chat"
-#: client/gui-gtk-2.0/menu.c:706 client/gui-win32/menu.c:314
+#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:314
msgid "_Clear Log"
msgstr "Wyczyść dziennik"
# Jak tłumaczyć log ?
-#: client/gui-gtk-2.0/menu.c:708 client/gui-win32/menu.c:313
+#: client/gui-gtk-2.0/menu.c:735 client/gui-win32/menu.c:313
#, fuzzy
msgid "_Write Log"
msgstr "Zapisz dziennik"
-#: client/gui-gtk-2.0/menu.c:710 client/gui-win32/menu.c:304
+#: client/gui-gtk-2.0/menu.c:737 client/gui-win32/menu.c:304
msgid "Local _Options"
msgstr "Lokalne opcje"
-#: client/gui-gtk-2.0/menu.c:712 client/gui-win32/menu.c:305
+#: client/gui-gtk-2.0/menu.c:739 client/gui-win32/menu.c:305
msgid "_Message Options"
msgstr "Opcje komunikatów"
-#: client/gui-gtk-2.0/menu.c:717
+#: client/gui-gtk-2.0/menu.c:744
msgid "_Reload Tileset"
msgstr "Przeładuj zestaw graficzny"
-#: client/gui-gtk-2.0/menu.c:720
+#: client/gui-gtk-2.0/menu.c:747
msgid "Save Options on _Exit"
msgstr "Zapisz opcje przy wyjściu"
-#: client/gui-gtk-2.0/menu.c:722
+#: client/gui-gtk-2.0/menu.c:749
msgid "Sa_ve Options"
msgstr "Za_pisz opcje"
-#: client/gui-gtk-2.0/menu.c:726 client/gui-win32/menu.c:308
+#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:308
msgid "Server O_ptions"
msgstr "Opcje serwera"
-#: client/gui-gtk-2.0/menu.c:730 client/gui-win32/menu.c:310
+#: client/gui-gtk-2.0/menu.c:757 client/gui-win32/menu.c:310
msgid "_Save Game"
msgstr "Zapisz _grÄ™"
-#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:311
+#: client/gui-gtk-2.0/menu.c:760 client/gui-win32/menu.c:311
msgid "Save Game _As..."
msgstr "Zapisz grÄ™ _jako..."
-#: client/gui-gtk-2.0/menu.c:738
+#: client/gui-gtk-2.0/menu.c:765
msgid "_Leave"
msgstr "O_puść grę"
-#: client/gui-gtk-2.0/menu.c:740 client/gui-win32/menu.c:317
+#: client/gui-gtk-2.0/menu.c:767 client/gui-win32/menu.c:317
msgid "_Quit"
msgstr "Zakończ"
-#: client/gui-gtk-2.0/menu.c:745 client/gui-win32/menu.c:321
+#: client/gui-gtk-2.0/menu.c:772 client/gui-win32/menu.c:321
msgid "Gov_ernment"
msgstr "Ustrój"
-#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
-#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
-#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:774 client/gui-gtk-2.0/menu.c:776
+#: client/gui-gtk-2.0/menu.c:778 client/gui-gtk-2.0/menu.c:780
+#: client/gui-gtk-2.0/menu.c:782 client/gui-gtk-2.0/menu.c:784
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
#: client/gui-xaw/menu.c:248 data/Freeciv.in:2027 data/helpdata.txt:1320
msgid "Government"
msgstr "Ustrój"
-#: client/gui-gtk-2.0/menu.c:749 client/gui-win32/menu.c:322
+#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:322
msgid "_Tax Rates"
msgstr "_Podatki"
-#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:324
+#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:324
msgid "_Find City"
msgstr "_Znajdź miasto"
-#: client/gui-gtk-2.0/menu.c:755 client/gui-win32/menu.c:325
+#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:325
msgid "_Worklists"
msgstr "_Schematy prac"
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
-#: client/gui-gtk-2.0/menu.c:764 client/gui-win32/menu.c:327
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
+#: client/gui-gtk-2.0/menu.c:791 client/gui-win32/menu.c:327
msgid "_Change Government"
msgstr "_Zmień Ustrój"
-#: client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:788
msgid "_Revolution..."
msgstr "_Rewolucja..."
-#: client/gui-gtk-2.0/menu.c:764 client/gui-gtk-2.0/menu.c:970
+#: client/gui-gtk-2.0/menu.c:791 client/gui-gtk-2.0/menu.c:1013
#: client/gui-win32/menu.c:431
msgid "_Government"
msgstr "_Ustrój"
-#: client/gui-gtk-2.0/menu.c:768 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:795 client/gui-gtk-2.0/menu.c:959
#: client/gui-win32/menu.c:334
msgid "_View"
msgstr "_Widok"
-#: client/gui-gtk-2.0/menu.c:772
+#: client/gui-gtk-2.0/menu.c:799
msgid "City Outlines"
msgstr "Zasięg miast"
-#: client/gui-gtk-2.0/menu.c:774 client/gui-win32/menu.c:335
+#: client/gui-gtk-2.0/menu.c:801 client/gui-win32/menu.c:335
msgid "Map _Grid"
msgstr "Siatka mapy"
-#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:336
+#: client/gui-gtk-2.0/menu.c:803 client/gui-win32/menu.c:336
msgid "National _Borders"
msgstr "Granice Państw"
-#: client/gui-gtk-2.0/menu.c:778 client/gui-win32/menu.c:337
+#: client/gui-gtk-2.0/menu.c:805 client/gui-win32/menu.c:337
msgid "City _Names"
msgstr "_Nazwy miast"
-#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:338
+#: client/gui-gtk-2.0/menu.c:807 client/gui-win32/menu.c:338
msgid "City G_rowth"
msgstr "Miasto: _Wzrost"
-#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:339
+#: client/gui-gtk-2.0/menu.c:809 client/gui-win32/menu.c:339
msgid "City _Productions"
msgstr "_Produkcja miast"
-#: client/gui-gtk-2.0/menu.c:784 client/gui-sdl/optiondlg.c:1719
+#: client/gui-gtk-2.0/menu.c:811
+#, fuzzy
+msgid "City Buy Cost"
+msgstr "Całkowity koszt:"
+
+#: client/gui-gtk-2.0/menu.c:813
+#, fuzzy
+msgid "City Traderoutes"
+msgstr "Szlaki handlowe"
+
+#: client/gui-gtk-2.0/menu.c:815 client/gui-sdl/optiondlg.c:1719
msgid "Draw city worker map grid"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:788 client/gui-sdl/optiondlg.c:1635
+#: client/gui-gtk-2.0/menu.c:819 client/gui-sdl/optiondlg.c:1635
#: client/gui-win32/menu.c:340 client/gui-xaw/menu.c:148
#: client/gui-xaw/menu.c:246 manual/civmanual.c:220 data/helpdata.txt:1220
msgid "Terrain"
msgstr "Teren"
-#: client/gui-gtk-2.0/menu.c:790 client/gui-win32/menu.c:341
+#: client/gui-gtk-2.0/menu.c:821 client/gui-win32/menu.c:341
#: client/gui-xaw/menu.c:149
msgid "Coastline"
msgstr "Linia brzegu"
-#: client/gui-gtk-2.0/menu.c:796 client/gui-win32/menu.c:343
+#: client/gui-gtk-2.0/menu.c:827 client/gui-win32/menu.c:343
msgid "Roads & Rails"
msgstr "Drogi i koleje"
-#: client/gui-gtk-2.0/menu.c:800 client/gui-sdl/optiondlg.c:1933
+#: client/gui-gtk-2.0/menu.c:831 client/gui-sdl/optiondlg.c:1933
#: client/gui-win32/menu.c:345 client/gui-xaw/menu.c:152
msgid "Mines"
msgstr "Kopalnie"
-#: client/gui-gtk-2.0/menu.c:802 client/gui-win32/menu.c:346
+#: client/gui-gtk-2.0/menu.c:833 client/gui-win32/menu.c:346
msgid "Fortress & Airbase"
msgstr "Forty i bazy lotnicze"
-#: client/gui-gtk-2.0/menu.c:804 client/gui-win32/menu.c:348
+#: client/gui-gtk-2.0/menu.c:835 client/gui-win32/menu.c:348
#: client/gui-xaw/menu.c:154
msgid "Specials"
msgstr "Specjalne"
-#: client/gui-gtk-2.0/menu.c:806 client/gui-win32/menu.c:349
+#: client/gui-gtk-2.0/menu.c:837 client/gui-win32/menu.c:349
#: client/gui-xaw/menu.c:155
msgid "Pollution & Fallout"
msgstr "Zanieczyszczenia i skażenia"
-#: client/gui-gtk-2.0/menu.c:812 client/gui-win32/menu.c:352
+#: client/gui-gtk-2.0/menu.c:843 client/gui-win32/menu.c:352
#: client/gui-xaw/menu.c:158
msgid "Focus Unit"
msgstr "Zaznacz jednostkÄ™"
-#: client/gui-gtk-2.0/menu.c:814 client/gui-sdl/optiondlg.c:1854
+#: client/gui-gtk-2.0/menu.c:845 client/gui-sdl/optiondlg.c:1854
#: client/gui-win32/menu.c:353 client/gui-xaw/menu.c:159
msgid "Fog of War"
msgstr "`Mgła wojny'"
-#: client/gui-gtk-2.0/menu.c:818
+#: client/gui-gtk-2.0/menu.c:849
msgid "_Full Screen"
msgstr "_Tryb pełnoekranowy"
-#: client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/menu.c:853
msgid "_Center View"
msgstr "Wyśrodkuj widok"
-#: client/gui-gtk-2.0/menu.c:825 client/gui-win32/menu.c:358
+#: client/gui-gtk-2.0/menu.c:856 client/gui-win32/menu.c:358
msgid "_Orders"
msgstr "_Rozkazy"
-#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
-#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
-#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
-#: client/gui-gtk-2.0/menu.c:855 client/gui-gtk-2.0/menu.c:857
-#: client/gui-gtk-2.0/menu.c:859 client/gui-gtk-2.0/menu.c:861
-#: client/gui-gtk-2.0/menu.c:863 client/gui-gtk-2.0/menu.c:865
-#: client/gui-gtk-2.0/menu.c:867 client/gui-gtk-2.0/menu.c:869
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875 client/gui-gtk-2.0/menu.c:877
-#: client/gui-gtk-2.0/menu.c:879 client/gui-gtk-2.0/menu.c:881
-#: client/gui-gtk-2.0/menu.c:883 client/gui-gtk-2.0/menu.c:885
-#: client/gui-gtk-2.0/menu.c:887 client/gui-gtk-2.0/menu.c:889
-#: client/gui-gtk-2.0/menu.c:891 client/gui-gtk-2.0/menu.c:893
-#: client/gui-gtk-2.0/menu.c:895 client/gui-gtk-2.0/menu.c:897
-#: client/gui-gtk-2.0/menu.c:899 client/gui-gtk-2.0/menu.c:901
-#: client/gui-gtk-2.0/menu.c:903 data/Freeciv.in:2029
+#: client/gui-gtk-2.0/menu.c:858 client/gui-gtk-2.0/menu.c:860
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:864
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:868
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:872
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:876
+#: client/gui-gtk-2.0/menu.c:878 client/gui-gtk-2.0/menu.c:880
+#: client/gui-gtk-2.0/menu.c:882 client/gui-gtk-2.0/menu.c:884
+#: client/gui-gtk-2.0/menu.c:886 client/gui-gtk-2.0/menu.c:888
+#: client/gui-gtk-2.0/menu.c:890 client/gui-gtk-2.0/menu.c:892
+#: client/gui-gtk-2.0/menu.c:894 client/gui-gtk-2.0/menu.c:896
+#: client/gui-gtk-2.0/menu.c:898 client/gui-gtk-2.0/menu.c:900
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906 client/gui-gtk-2.0/menu.c:908
+#: client/gui-gtk-2.0/menu.c:910 client/gui-gtk-2.0/menu.c:912
+#: client/gui-gtk-2.0/menu.c:914 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:918 client/gui-gtk-2.0/menu.c:920
+#: client/gui-gtk-2.0/menu.c:922 client/gui-gtk-2.0/menu.c:924
+#: client/gui-gtk-2.0/menu.c:926 client/gui-gtk-2.0/menu.c:928
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
+#: client/gui-gtk-2.0/menu.c:946 data/Freeciv.in:2029
msgid "Orders"
msgstr "Rozkazy"
-#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:1444
+#: client/gui-gtk-2.0/menu.c:860 client/gui-gtk-2.0/menu.c:1489
#: client/gui-win32/menu.c:359
msgid "_Build City"
msgstr "Z_buduj miasto"
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:1466
-#: client/gui-gtk-2.0/menu.c:1472 client/gui-win32/menu.c:360
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:1511
+#: client/gui-gtk-2.0/menu.c:1517 client/gui-win32/menu.c:360
msgid "Build _Road"
msgstr "Zbuduj d_rogÄ™"
-#: client/gui-gtk-2.0/menu.c:833 client/gui-gtk-2.0/menu.c:1360
+#: 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 "Stwórz _nawodnienie"
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:1361
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:1406
#: client/gui-win32/menu.c:362
msgid "Build _Mine"
msgstr "Zbuduj _kopalniÄ™"
-#: client/gui-gtk-2.0/menu.c:837 client/gui-gtk-2.0/menu.c:1362
+#: client/gui-gtk-2.0/menu.c:868 client/gui-gtk-2.0/menu.c:1407
msgid "Transf_orm Terrain"
msgstr "Przekształć _teren"
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:1508
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:1553
#: client/gui-win32/menu.c:364
msgid "Build _Fortress"
msgstr "Zbuduj _fortecÄ™"
-#: client/gui-gtk-2.0/menu.c:841 client/gui-win32/menu.c:365
+#: client/gui-gtk-2.0/menu.c:872 client/gui-win32/menu.c:365
msgid "Build Airbas_e"
msgstr "Zbuduj bazÄ™ _lotniczÄ…"
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:1514
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:1559
#: client/gui-win32/menu.c:366
msgid "Clean _Pollution"
msgstr "Usuń _zanieczyszczenie"
-#: client/gui-gtk-2.0/menu.c:845 client/gui-win32/menu.c:367
+#: client/gui-gtk-2.0/menu.c:876 client/gui-win32/menu.c:367
msgid "Clean _Nuclear Fallout"
msgstr "Usuń _skażenie nuklearne"
-#: client/gui-gtk-2.0/menu.c:849 client/gui-win32/menu.c:369
+#: client/gui-gtk-2.0/menu.c:880 client/gui-win32/menu.c:369
msgid "_Sentry"
msgstr "Czuwaj"
-#: client/gui-gtk-2.0/menu.c:855 client/gui-win32/menu.c:372
+#: client/gui-gtk-2.0/menu.c:886 client/gui-win32/menu.c:372
msgid "Make _Homecity"
msgstr "Zmień _pochodzenie"
-#: client/gui-gtk-2.0/menu.c:857 client/gui-win32/menu.c:373
+#: client/gui-gtk-2.0/menu.c:888 client/gui-win32/menu.c:373
msgid "_Load"
msgstr "_Załaduj"
-#: client/gui-gtk-2.0/menu.c:859
+#: client/gui-gtk-2.0/menu.c:890
msgid "_Unload Transporter"
msgstr "Wyładuj _Transportowiec"
-#: client/gui-gtk-2.0/menu.c:861 client/gui-win32/menu.c:374
+#: client/gui-gtk-2.0/menu.c:892 client/gui-win32/menu.c:374
msgid "_Unload"
msgstr "_Wyładuj"
-#: client/gui-gtk-2.0/menu.c:863 client/gui-win32/menu.c:375
+#: client/gui-gtk-2.0/menu.c:894 client/gui-win32/menu.c:375
msgid "Wake up o_thers"
msgstr "Obudź innych"
-#: client/gui-gtk-2.0/menu.c:867
+#: client/gui-gtk-2.0/menu.c:898
msgid "_Auto Settler"
msgstr "_Automatyczny osadnik"
-#: client/gui-gtk-2.0/menu.c:869 client/gui-win32/menu.c:378
+#: client/gui-gtk-2.0/menu.c:900 client/gui-win32/menu.c:378
msgid "Auto E_xplore"
msgstr "A_utomatyczny badacz"
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906
msgid "_Connect"
msgstr "Połącz"
-#: client/gui-gtk-2.0/menu.c:871 client/gui-win32/menu.c:380
+#: client/gui-gtk-2.0/menu.c:902 client/gui-win32/menu.c:380
msgid "_Road"
msgstr "_Droga"
-#: client/gui-gtk-2.0/menu.c:873 client/gui-win32/menu.c:381
+#: client/gui-gtk-2.0/menu.c:904 client/gui-win32/menu.c:381
msgid "Rai_l"
msgstr "Kole_j"
-#: client/gui-gtk-2.0/menu.c:875 client/gui-win32/menu.c:382
+#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:382
msgid "_Irrigate"
msgstr "Nawodnij do"
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
msgid "Go _to"
msgstr "Idź do"
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
msgid "_Build city"
msgstr "Z_buduj miasto"
-#: client/gui-gtk-2.0/menu.c:879
+#: client/gui-gtk-2.0/menu.c:910
msgid "Patrol (_Q)"
msgstr "Patroluj (_Q)"
-#: client/gui-gtk-2.0/menu.c:881 client/gui-win32/menu.c:385
+#: client/gui-gtk-2.0/menu.c:912 client/gui-win32/menu.c:385
msgid "_Go to"
msgstr "Idź do"
-#: client/gui-gtk-2.0/menu.c:883
+#: client/gui-gtk-2.0/menu.c:914
msgid "Go\\/Airlift to City"
msgstr "Idź\\/Leć do miasta"
-#: client/gui-gtk-2.0/menu.c:885 client/gui-sdl/menu.c:450
+#: client/gui-gtk-2.0/menu.c:916 client/gui-sdl/menu.c:450
#: client/gui-win32/menu.c:387 client/gui-xaw/menu.c:203
msgid "Return to nearest city"
msgstr "Wróć do najbliższego miasta"
-#: client/gui-gtk-2.0/menu.c:889 client/gui-win32/menu.c:389
+#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:389
#: client/gui-xaw/menu.c:205
msgid "Disband Unit"
msgstr "Rozprosz jednostkÄ™"
-#: client/gui-gtk-2.0/menu.c:891 client/gui-sdl/citydlg.c:532
+#: client/gui-gtk-2.0/menu.c:922 client/gui-sdl/citydlg.c:532
#: data/Freeciv.in:1186
msgid "Upgrade unit"
msgstr "Ulepsz jednostkÄ™"
-#: client/gui-gtk-2.0/menu.c:893
+#: client/gui-gtk-2.0/menu.c:924
msgid "Diplomat\\/Spy Actions"
msgstr "Działania dyplomatyczne\\/szpiegowskie"
-#: client/gui-gtk-2.0/menu.c:895 client/gui-sdl/menu.c:399
+#: client/gui-gtk-2.0/menu.c:926 client/gui-sdl/menu.c:399
#: client/gui-win32/menu.c:391 client/gui-xaw/menu.c:209
msgid "Explode Nuclear"
msgstr "Eksplozja nuklearna"
-#: client/gui-gtk-2.0/menu.c:899
-msgid "Select same type"
-msgstr "Wybierz ten sam typ"
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/cityrep.c:882
+msgid "Select"
+msgstr "Wybierz"
+
+#: client/gui-gtk-2.0/menu.c:934
+#, fuzzy
+msgid "Single"
+msgstr "Dżungla"
+
+#: client/gui-gtk-2.0/menu.c:936
+msgid "Same Type On Tile"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:938
+msgid "All On Tile"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:940
+msgid "Same Type On Continent"
+msgstr ""
-#: client/gui-gtk-2.0/menu.c:901 client/gui-win32/menu.c:393
+#: client/gui-gtk-2.0/menu.c:942
+msgid "Same Type Everywhere"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:393
msgid "_Wait"
msgstr "Czekaj"
-#: client/gui-gtk-2.0/menu.c:903 client/gui-win32/menu.c:394
+#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:394
#: client/gui-xaw/menu.c:213
msgid "Done"
msgstr "Gotowe"
-#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:398
+#: client/gui-gtk-2.0/menu.c:949 client/gui-win32/menu.c:398
msgid "_Reports"
msgstr "R_aporty"
-#: client/gui-gtk-2.0/menu.c:908 client/gui-gtk-2.0/menu.c:910
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:914
-#: client/gui-gtk-2.0/menu.c:916 client/gui-gtk-2.0/menu.c:918
-#: client/gui-gtk-2.0/menu.c:920 client/gui-gtk-2.0/menu.c:922
-#: client/gui-gtk-2.0/menu.c:924 client/gui-gtk-2.0/menu.c:926
-#: client/gui-gtk-2.0/menu.c:928 client/gui-gtk-2.0/menu.c:930
-#: client/gui-gtk-2.0/menu.c:932 data/Freeciv.in:2030
+#: client/gui-gtk-2.0/menu.c:951 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:957
+#: client/gui-gtk-2.0/menu.c:959 client/gui-gtk-2.0/menu.c:961
+#: client/gui-gtk-2.0/menu.c:963 client/gui-gtk-2.0/menu.c:965
+#: client/gui-gtk-2.0/menu.c:967 client/gui-gtk-2.0/menu.c:969
+#: client/gui-gtk-2.0/menu.c:971 client/gui-gtk-2.0/menu.c:973
+#: client/gui-gtk-2.0/menu.c:975 data/Freeciv.in:2030
msgid "Reports"
msgstr "Raporty"
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:958
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:1001
#: client/gui-win32/menu.c:400 client/gui-win32/menu.c:425
msgid "_Units"
msgstr "_Jednostki"
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/menu.c:914 client/gui-win32/menu.c:402
+#: client/gui-gtk-2.0/menu.c:957 client/gui-win32/menu.c:402
#, fuzzy
msgid "_Nations"
msgstr "_Narody"
-#: client/gui-gtk-2.0/menu.c:918 client/gui-win32/menu.c:403
+#: client/gui-gtk-2.0/menu.c:961 client/gui-win32/menu.c:403
msgid "_Economy"
msgstr "_Ekonomia"
#. TRANS: Research report action
-#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:405
+#: client/gui-gtk-2.0/menu.c:963 client/gui-win32/menu.c:405
#, fuzzy
msgid "_Research"
msgstr "_Badania"
-#: client/gui-gtk-2.0/menu.c:924 client/gui-win32/menu.c:407
+#: client/gui-gtk-2.0/menu.c:967 client/gui-win32/menu.c:407
msgid "_Wonders of the World"
msgstr "_Cuda świata"
-#: client/gui-gtk-2.0/menu.c:926 client/gui-win32/menu.c:408
+#: client/gui-gtk-2.0/menu.c:969 client/gui-win32/menu.c:408
msgid "_Top Five Cities"
msgstr "_Pięć najwspanialszych miast"
-#: client/gui-gtk-2.0/menu.c:928 client/gui-win32/menu.c:409
+#: client/gui-gtk-2.0/menu.c:971 client/gui-win32/menu.c:409
msgid "_Messages"
msgstr "Komunikaty"
-#: client/gui-gtk-2.0/menu.c:930 client/gui-win32/menu.c:410
+#: client/gui-gtk-2.0/menu.c:973 client/gui-win32/menu.c:410
msgid "_Demographics"
msgstr "_Demograficzny"
-#: client/gui-gtk-2.0/menu.c:932 client/gui-gtk-2.0/plrdlg.c:471
+#: client/gui-gtk-2.0/menu.c:975 client/gui-gtk-2.0/plrdlg.c:354
#: client/gui-win32/menu.c:411
msgid "_Spaceship"
msgstr "Statek _kosmiczny"
-#: client/gui-gtk-2.0/menu.c:936 client/gui-win32/menu.c:415
+#: client/gui-gtk-2.0/menu.c:979 client/gui-win32/menu.c:415
msgid "_Help"
msgstr "Pomo_c"
-#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
-#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
-#: client/gui-gtk-2.0/menu.c:946 client/gui-gtk-2.0/menu.c:948
-#: client/gui-gtk-2.0/menu.c:950 client/gui-gtk-2.0/menu.c:952
-#: client/gui-gtk-2.0/menu.c:954 client/gui-gtk-2.0/menu.c:956
-#: client/gui-gtk-2.0/menu.c:958 client/gui-gtk-2.0/menu.c:960
-#: client/gui-gtk-2.0/menu.c:962 client/gui-gtk-2.0/menu.c:964
-#: client/gui-gtk-2.0/menu.c:966 client/gui-gtk-2.0/menu.c:968
-#: client/gui-gtk-2.0/menu.c:970 client/gui-gtk-2.0/menu.c:972
-#: client/gui-gtk-2.0/menu.c:974 client/gui-gtk-2.0/menu.c:976
-#: client/gui-gtk-2.0/menu.c:978 client/gui-gtk-2.0/menu.c:980
+#: client/gui-gtk-2.0/menu.c:981 client/gui-gtk-2.0/menu.c:983
+#: client/gui-gtk-2.0/menu.c:985 client/gui-gtk-2.0/menu.c:987
+#: client/gui-gtk-2.0/menu.c:989 client/gui-gtk-2.0/menu.c:991
+#: client/gui-gtk-2.0/menu.c:993 client/gui-gtk-2.0/menu.c:995
+#: client/gui-gtk-2.0/menu.c:997 client/gui-gtk-2.0/menu.c:999
+#: client/gui-gtk-2.0/menu.c:1001 client/gui-gtk-2.0/menu.c:1003
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-gtk-2.0/menu.c:1007
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-gtk-2.0/menu.c:1011
+#: client/gui-gtk-2.0/menu.c:1013 client/gui-gtk-2.0/menu.c:1015
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-gtk-2.0/menu.c:1019
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-gtk-2.0/menu.c:1023
#: client/gui-gtk-2.0/repodlgs.c:313 client/gui-win32/citydlg.c:1077
#: client/gui-win32/repodlgs.c:289 client/gui-win32/wldlg.c:846
#: data/Freeciv.in:1466 data/Freeciv.in:2031 data/Freeciv.in:2101
@@ -12285,119 +12505,119 @@ msgstr "Pomo_c"
msgid "Help"
msgstr "Pomoc"
-#: client/gui-gtk-2.0/menu.c:940 client/gui-win32/menu.c:416
+#: client/gui-gtk-2.0/menu.c:983 client/gui-win32/menu.c:416
msgid "Language_s"
msgstr "Języki"
-#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/menu.c:417
+#: client/gui-gtk-2.0/menu.c:985 client/gui-win32/menu.c:417
msgid "Co_nnecting"
msgstr "ÅÄ…czenie siÄ™"
-#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:418
+#: client/gui-gtk-2.0/menu.c:987 client/gui-win32/menu.c:418
msgid "C_ontrols"
msgstr "Sterowanie"
-#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:419
+#: client/gui-gtk-2.0/menu.c:989 client/gui-win32/menu.c:419
msgid "C_hatline"
msgstr "Pogawędki"
-#: client/gui-gtk-2.0/menu.c:948 client/gui-win32/menu.c:420
+#: client/gui-gtk-2.0/menu.c:991 client/gui-win32/menu.c:420
msgid "_Worklist Editor"
msgstr "_Edytor _schematu prac"
-#: client/gui-gtk-2.0/menu.c:950 client/gui-win32/menu.c:421
+#: client/gui-gtk-2.0/menu.c:993 client/gui-win32/menu.c:421
msgid "Citizen _Management"
msgstr "Kontroler zatrud_nienia"
-#: client/gui-gtk-2.0/menu.c:952 client/gui-win32/menu.c:422
+#: client/gui-gtk-2.0/menu.c:995 client/gui-win32/menu.c:422
msgid "_Playing"
msgstr "Granie"
-#: client/gui-gtk-2.0/menu.c:956 client/gui-win32/menu.c:424
+#: client/gui-gtk-2.0/menu.c:999 client/gui-win32/menu.c:424
msgid "City _Improvements"
msgstr "B_udynki"
-#: client/gui-gtk-2.0/menu.c:960 client/gui-win32/menu.c:426
+#: client/gui-gtk-2.0/menu.c:1003 client/gui-win32/menu.c:426
msgid "Com_bat"
msgstr "_Bitwa"
-#: client/gui-gtk-2.0/menu.c:962 client/gui-win32/menu.c:427
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-win32/menu.c:427
msgid "_ZOC"
msgstr "_ZOC"
-#: client/gui-gtk-2.0/menu.c:964 client/gui-win32/menu.c:428
+#: client/gui-gtk-2.0/menu.c:1007 client/gui-win32/menu.c:428
msgid "Techno_logy"
msgstr "Techno_logia"
-#: client/gui-gtk-2.0/menu.c:966 client/gui-win32/menu.c:429
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-win32/menu.c:429
msgid "_Terrain"
msgstr "_Teren"
-#: client/gui-gtk-2.0/menu.c:968 client/gui-win32/menu.c:430
+#: client/gui-gtk-2.0/menu.c:1011 client/gui-win32/menu.c:430
msgid "Won_ders"
msgstr "_Cuda świata"
-#: client/gui-gtk-2.0/menu.c:972 client/gui-win32/menu.c:432
+#: client/gui-gtk-2.0/menu.c:1015 client/gui-win32/menu.c:432
msgid "Happin_ess"
msgstr "Szczęście"
-#: client/gui-gtk-2.0/menu.c:974 client/gui-win32/menu.c:433
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-win32/menu.c:433
msgid "Space _Race"
msgstr "Wyścig _kosmiczny"
-#: client/gui-gtk-2.0/menu.c:978 client/gui-win32/menu.c:435
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-win32/menu.c:435
msgid "_Copying"
msgstr "K_opiowanie"
-#: client/gui-gtk-2.0/menu.c:980 client/gui-win32/menu.c:436
+#: client/gui-gtk-2.0/menu.c:1023 client/gui-win32/menu.c:436
msgid "_About"
msgstr "O progr_amie"
-#: client/gui-gtk-2.0/menu.c:1264
+#: client/gui-gtk-2.0/menu.c:1307
#, c-format
msgid "%s..."
msgstr "%s..."
-#: client/gui-gtk-2.0/menu.c:1352
+#: client/gui-gtk-2.0/menu.c:1397
#, c-format
msgid "Change to %s (_I)"
msgstr "Zm_ień na %s"
-#: client/gui-gtk-2.0/menu.c:1353
+#: client/gui-gtk-2.0/menu.c:1398
#, c-format
msgid "Change to %s (_M)"
msgstr "Z_mień na %s"
-#: client/gui-gtk-2.0/menu.c:1354
+#: client/gui-gtk-2.0/menu.c:1399
#, c-format
msgid "Transf_orm to %s"
msgstr "Przekształć na %s"
-#: client/gui-gtk-2.0/menu.c:1427
+#: client/gui-gtk-2.0/menu.c:1472
msgid "Help _Build Wonder"
msgstr "Pomóż _budować cud świata"
-#: client/gui-gtk-2.0/menu.c:1441
+#: client/gui-gtk-2.0/menu.c:1486
msgid "Add to City (_B)"
msgstr "Dodaj do miasta (_B)"
-#: client/gui-gtk-2.0/menu.c:1449
+#: client/gui-gtk-2.0/menu.c:1494
msgid "Make Trade _Route"
msgstr "Ustanów t_rasę handlową"
-#: client/gui-gtk-2.0/menu.c:1463
+#: client/gui-gtk-2.0/menu.c:1508
msgid "Build _Railroad"
msgstr "Zbuduj kolej (_R)"
-#: client/gui-gtk-2.0/menu.c:1486
+#: client/gui-gtk-2.0/menu.c:1531
msgid "Bu_ild Farmland"
msgstr "Zbuduj farmÄ™ (_I)"
-#: client/gui-gtk-2.0/menu.c:1506
+#: client/gui-gtk-2.0/menu.c:1551
msgid "_Fortify"
msgstr "_Fortyfikuj"
-#: client/gui-gtk-2.0/menu.c:1512
+#: client/gui-gtk-2.0/menu.c:1557
msgid "_Paradrop"
msgstr "_Przerzuć"
@@ -12431,13 +12651,32 @@ msgstr "Kom"
msgid "Pop"
msgstr "Okn"
-#: client/gui-gtk-2.0/messagewin.c:155 client/gui-sdl/messagewin.c:247
+#: client/gui-gtk-2.0/messagewin.c:186 client/gui-sdl/messagewin.c:247
#: client/gui-win32/messagewin.c:132 client/gui-xaw/menu.c:228
#: data/Freeciv.in:3273 data/Freeciv.in:3274 data/Freeciv.in:3283
msgid "Messages"
msgstr "Komunikaty"
-#: client/gui-gtk-2.0/plrdlg.c:330
+#: client/gui-gtk-2.0/plrdlg.c:317
+msgid "_Meet"
+msgstr "_Spotkanie"
+
+#: client/gui-gtk-2.0/plrdlg.c:323
+#, fuzzy
+msgid "Cancel _Treaty"
+msgstr "_Anuluj Pakt"
+
+#: client/gui-gtk-2.0/plrdlg.c:329
+#, fuzzy
+msgid "_Withdraw Vision"
+msgstr "Widok _dzielony"
+
+#: client/gui-gtk-2.0/plrdlg.c:348
+#, fuzzy
+msgid "_Report"
+msgstr "R_aporty"
+
+#: client/gui-gtk-2.0/plrdlg.c:386
msgid "?show:Dead Players"
msgstr "?show:Martwi gracze"
@@ -12445,277 +12684,280 @@ msgstr "?show:Martwi gracze"
#. TRANS: Nations report action
#. TRANS: Nations report title
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/plrdlg.c:350 client/gui-sdl/mapctrl.c:1580
+#: client/gui-gtk-2.0/plrdlg.c:406 client/gui-sdl/mapctrl.c:1580
#: client/gui-sdl/plrdlg.c:608 client/gui-win32/plrdlg.c:344
#: client/gui-xaw/menu.c:221 data/Freeciv.in:3192 data/Freeciv.in:3193
#, fuzzy
msgid "Nations"
msgstr "Naród"
-#: client/gui-gtk-2.0/plrdlg.c:443
-msgid "_Intelligence"
-msgstr "_Wywiad"
-
-#: client/gui-gtk-2.0/plrdlg.c:450
-msgid "_Meet"
-msgstr "_Spotkanie"
-
-#: client/gui-gtk-2.0/plrdlg.c:457
+#: client/gui-gtk-2.0/plrdlg.c:511
#, fuzzy
-msgid "Cancel _Treaty"
-msgstr "_Anuluj Pakt"
+msgid "Di_plomacy"
+msgstr "Dyplomacja"
-#: client/gui-gtk-2.0/plrdlg.c:464
-msgid "_Withdraw vision"
-msgstr "Widok _dzielony"
+#: client/gui-gtk-2.0/plrdlg.c:516
+msgid "_Intelligence"
+msgstr "_Wywiad"
-#: client/gui-gtk-2.0/plrdlg.c:495
+#: client/gui-gtk-2.0/plrdlg.c:526
msgid "_AI"
msgstr "_AI"
-#: client/gui-gtk-2.0/plrdlg.c:501
+#: client/gui-gtk-2.0/plrdlg.c:532
msgid "_Toggle AI Mode"
msgstr "Przełącz tryb AI"
-#: client/gui-gtk-2.0/pages.c:208
+#: client/gui-gtk-2.0/pages.c:221
msgid "Start _New Game"
msgstr "Rozpocznij _nowÄ… grÄ™"
-#: client/gui-gtk-2.0/pages.c:214
+#: client/gui-gtk-2.0/pages.c:227
msgid "Start _Scenario Game"
msgstr "Rozpocznij nowy _scenariusz"
-#: client/gui-gtk-2.0/pages.c:220
+#: client/gui-gtk-2.0/pages.c:233
msgid "_Load Saved Game"
msgstr "_Wczytaj zachowanÄ… grÄ™"
-#: client/gui-gtk-2.0/pages.c:229
+#: client/gui-gtk-2.0/pages.c:239
msgid "C_onnect to Network Game"
msgstr "Przyłącz się do gry sie_ciowej"
-#: client/gui-gtk-2.0/pages.c:236
+#: client/gui-gtk-2.0/pages.c:247
msgid "Connect to Gaming _Zone"
msgstr "Przyłącz się do Gaming _Zone"
-#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:300
#: client/gui-xaw/connectdlg.c:326
msgid "Passwords don't match, enter password."
msgstr "Hasło nieprawidłowe, wprowadź hasło."
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:779 client/gui-gtk-2.0/pages.c:820
+#: client/gui-win32/connectdlg.c:916
msgid "Server Name"
msgstr "Nazwa serwera"
-#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
+#: 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
+#: data/Freeciv.in:96
msgid "Port"
msgstr "Port"
-#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
+#: client/gui-win32/connectdlg.c:917
msgid "Version"
msgstr "Wersja"
-#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
-#: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
+#: 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
msgid "Status"
msgstr "Stan"
-#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
-#: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
+#: 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
msgid "Players"
msgstr "Gracze"
-#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
+#: client/gui-win32/connectdlg.c:918
msgid "Comment"
msgstr "Komentarz"
-#: client/gui-gtk-2.0/pages.c:747
+#: client/gui-gtk-2.0/pages.c:786
msgid "Local _Area Network"
msgstr "Sieć _Lokalna"
-#: client/gui-gtk-2.0/pages.c:783
+#: client/gui-gtk-2.0/pages.c:827
msgid "Internet _Metaserver"
msgstr "Metaserwer Internetowy"
-#: client/gui-gtk-2.0/pages.c:817
+#: client/gui-gtk-2.0/pages.c:864
msgid "_Host:"
msgstr "_Host:"
-#: client/gui-gtk-2.0/pages.c:834
+#: client/gui-gtk-2.0/pages.c:881
msgid "_Port:"
msgstr "_Port:"
-#: client/gui-gtk-2.0/pages.c:851
+#: client/gui-gtk-2.0/pages.c:898
msgid "_Login:"
msgstr "_Użytkownik:"
-#: client/gui-gtk-2.0/pages.c:869
+#: client/gui-gtk-2.0/pages.c:916
msgid "Pass_word:"
msgstr "Hasło:"
-#: client/gui-gtk-2.0/pages.c:887
+#: client/gui-gtk-2.0/pages.c:934
msgid "Conf_irm Password:"
msgstr "Potwierdź hasło:"
-#: client/gui-gtk-2.0/pages.c:912
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: 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/wldlg.c:800 client/gui-win32/wldlg.c:806
+msgid "Type"
+msgstr "Typ"
+
+#: client/gui-gtk-2.0/pages.c:952 client/gui-win32/plrdlg.c:337
+#: data/Freeciv.in:88
+msgid "Host"
+msgstr "Komputer"
+
+#: client/gui-gtk-2.0/pages.c:981
msgid "C_onnect"
msgstr "Połą_cz"
-#: client/gui-gtk-2.0/pages.c:1142
+#: client/gui-gtk-2.0/pages.c:1211
#, fuzzy, c-format
msgid "Connection name: %s"
msgstr "Połączenie jest nawiązywane."
-#: client/gui-gtk-2.0/pages.c:1145
+#: client/gui-gtk-2.0/pages.c:1214
#, fuzzy, c-format
msgid "Player name: %s"
msgstr "?Player:ImiÄ™"
-#: client/gui-gtk-2.0/pages.c:1150
+#: client/gui-gtk-2.0/pages.c:1219
#, fuzzy, c-format
msgid "Host: %s"
msgstr "Serwer:"
-#: client/gui-gtk-2.0/pages.c:1158
+#: client/gui-gtk-2.0/pages.c:1227
msgid "Player/conn info"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1185
+#: client/gui-gtk-2.0/pages.c:1254
#, fuzzy, c-format
msgid "%s info"
msgstr "Statystyki"
-#: client/gui-gtk-2.0/pages.c:1196
+#: client/gui-gtk-2.0/pages.c:1265
#, fuzzy
msgid "Toggle player ready"
msgstr "aitoggle <gracz>"
-#: client/gui-gtk-2.0/pages.c:1204
+#: client/gui-gtk-2.0/pages.c:1273
#, fuzzy
msgid "Pick nation"
msgstr "Wybierz naród"
-#: client/gui-gtk-2.0/pages.c:1214
+#: client/gui-gtk-2.0/pages.c:1283
msgid "Observe this player"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1221
+#: client/gui-gtk-2.0/pages.c:1290
#, fuzzy
msgid "Take this player"
msgstr "Warstwa miast"
-#: client/gui-gtk-2.0/pages.c:1238
+#: client/gui-gtk-2.0/pages.c:1307
#, fuzzy
msgid "Cut connection"
msgstr "Przerywam połączenie %s."
-#: client/gui-gtk-2.0/pages.c:1248
+#: client/gui-gtk-2.0/pages.c:1317
#, fuzzy
msgid "Aitoggle player"
msgstr "aitoggle <gracz>"
-#: client/gui-gtk-2.0/pages.c:1257
+#: client/gui-gtk-2.0/pages.c:1326
#, fuzzy
msgid "Remove player"
msgstr "Usuwam gracza %s."
-#: client/gui-gtk-2.0/pages.c:1268
+#: client/gui-gtk-2.0/pages.c:1337
msgid "Give info access"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1276
+#: client/gui-gtk-2.0/pages.c:1345
msgid "Give ctrl access"
msgstr ""
#. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1338
+#: client/gui-gtk-2.0/pages.c:1407
#, fuzzy, c-format
msgid "Put on %s"
msgstr "Populacja: %s"
-#: client/gui-gtk-2.0/pages.c:1442
+#: client/gui-gtk-2.0/pages.c:1511
#, fuzzy
msgid "Number of _Players (including AI):"
msgstr "Liczba _graczy (ÅÄ…cznie z botami):"
-#: client/gui-gtk-2.0/pages.c:1465
+#: client/gui-gtk-2.0/pages.c:1534
#, fuzzy
msgid "AI Skill _Level:"
msgstr "Poziom trudności _AI:"
-#: client/gui-gtk-2.0/pages.c:1481
+#: client/gui-gtk-2.0/pages.c:1550
#, fuzzy
msgid "Ruleset _Version:"
msgstr "_Zestaw zasad:"
-#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
msgid "_More Game Options..."
msgstr "Więcej _opcji..."
-#: client/gui-gtk-2.0/pages.c:1514
+#: client/gui-gtk-2.0/pages.c:1583
#, fuzzy
msgid "Record"
msgstr "Raporty"
-#: client/gui-gtk-2.0/pages.c:1519
+#: client/gui-gtk-2.0/pages.c:1588
#, fuzzy
msgid "Rating"
msgstr "czeka"
-#: client/gui-gtk-2.0/pages.c:1525
+#: client/gui-gtk-2.0/pages.c:1594
msgid "Ready"
msgstr "Gotowy"
-#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
-#: data/nation/slovakian.ruleset:26
-msgid "Leader"
-msgstr "Przywódca"
+#: client/gui-gtk-2.0/pages.c:1601
+#, fuzzy
+msgid "?player:Leader"
+msgstr "?Player:ImiÄ™"
-#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1732 client/gui-sdl/chatline.c:185
msgid "Choose Saved Game to Load"
msgstr "Wybierz ZapisanÄ… GrÄ™"
-#: client/gui-gtk-2.0/pages.c:1752
+#: client/gui-gtk-2.0/pages.c:1824
msgid "Choose Saved Game to _Load:"
msgstr "Wybierz ZapisanÄ… GrÄ™:"
-#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
-#: client/gui-gtk-2.0/pages.c:2375
+#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
+#: client/gui-gtk-2.0/pages.c:2451
msgid "_Browse..."
msgstr "_PrzeglÄ…daj..."
-#: client/gui-gtk-2.0/pages.c:1839
+#: client/gui-gtk-2.0/pages.c:1911
msgid "Choose a Scenario"
msgstr "Wybierz scenariusz"
-#: client/gui-gtk-2.0/pages.c:1926
+#: client/gui-gtk-2.0/pages.c:1998
msgid "Choose a _Scenario:"
msgstr "Wybierz _scenariusz:"
-#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
-#: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
-#: client/gui-win32/wldlg.c:806
-msgid "Type"
-msgstr "Typ"
-
-#: client/gui-gtk-2.0/pages.c:2101
+#: client/gui-gtk-2.0/pages.c:2173
msgid "Choose a _nation to play:"
msgstr "Wybierz _naród:"
-#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2363 client/gui-win32/menu.c:581
msgid "Select Location to Save"
msgstr "Wybierz miejsce zapisu"
-#: client/gui-gtk-2.0/pages.c:2372 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2448 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr "Zapisz _grÄ™"
-#: client/gui-gtk-2.0/pages.c:2413
+#: client/gui-gtk-2.0/pages.c:2489
msgid "Saved _Games:"
msgstr "Zapisane _gry:"
-#: client/gui-gtk-2.0/pages.c:2440
+#: client/gui-gtk-2.0/pages.c:2516
msgid "Save _Filename:"
msgstr "Zapisz w pliku:"
@@ -13066,7 +13308,7 @@ msgstr ""
msgid "Total users logged in : %d"
msgstr ""
-#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1094
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
msgid "Back"
msgstr "Cofnij"
@@ -13075,7 +13317,7 @@ msgid "Start"
msgstr "Start"
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:775
+#: client/gui-win32/connectdlg.c:777
msgid "Load Game"
msgstr "Wczytać grę"
@@ -13114,12 +13356,12 @@ msgid "Make new homecity"
msgstr "Zmień pochodzenie"
#: client/gui-sdl/citydlg.c:546 client/gui-sdl/citydlg.c:1418
-#: client/gui-sdl/connectdlg.c:307 client/gui-sdl/connectdlg.c:616
-#: client/gui-sdl/connectdlg.c:802 client/gui-sdl/connectdlg.c:984
+#: 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/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1039
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
#: 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
@@ -13167,7 +13409,7 @@ msgstr "Kup To!"
#: client/gui-sdl/diplodlg.c:1335 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:2427
+#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
#: client/gui-xaw/cityrep.c:666 client/gui-xaw/cma_fe.c:327
#: client/gui-xaw/cma_fe.c:511 client/gui-xaw/cma_fe.c:765
#: client/gui-xaw/messagedlg.c:72 client/gui-xaw/optiondlg.c:76
@@ -13183,7 +13425,7 @@ msgstr "Nie"
#: client/gui-sdl/diplodlg.c:1345 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:2427 client/gui-xaw/cityrep.c:666
+#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
#: client/gui-xaw/cma_fe.c:327 client/gui-xaw/cma_fe.c:511
#: client/gui-xaw/cma_fe.c:765 client/gui-xaw/messagedlg.c:72
#: client/gui-xaw/optiondlg.c:76 client/gui-xaw/optiondlg.c:304
@@ -13485,41 +13727,41 @@ msgstr "Zastosuj raz"
msgid "Release city"
msgstr "Zwolnij miasto"
-#: client/gui-sdl/connectdlg.c:238
+#: client/gui-sdl/connectdlg.c:239
#, fuzzy
msgid "Creating Server List..."
msgstr "Lista Serwerów Freeciv"
-#: client/gui-sdl/connectdlg.c:279 client/gui-sdl/connectdlg.c:343
+#: client/gui-sdl/connectdlg.c:280 client/gui-sdl/connectdlg.c:344
#, fuzzy
msgid "No LAN servers found"
msgstr "Serwery LAN"
-#: client/gui-sdl/connectdlg.c:281 client/gui-sdl/connectdlg.c:345
+#: client/gui-sdl/connectdlg.c:282 client/gui-sdl/connectdlg.c:346
msgid "No public servers found"
msgstr ""
-#: client/gui-sdl/connectdlg.c:555
+#: client/gui-sdl/connectdlg.c:556
#, fuzzy
msgid "Player Name :"
msgstr "?Player:ImiÄ™"
-#: client/gui-sdl/connectdlg.c:571
+#: client/gui-sdl/connectdlg.c:572
#, fuzzy
msgid "Freeciv Server :"
msgstr "Lista Serwerów Freeciv"
-#: client/gui-sdl/connectdlg.c:588
+#: client/gui-sdl/connectdlg.c:589
#, fuzzy
msgid "Port :"
msgstr "Port:"
-#: client/gui-sdl/connectdlg.c:608 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr "Połącz"
-#: client/gui-sdl/connectdlg.c:794 client/gui-sdl/connectdlg.c:977
+#: client/gui-sdl/connectdlg.c:795 client/gui-sdl/connectdlg.c:978
#: client/gui-xaw/connectdlg.c:145
msgid "Next"
msgstr "Dalej"
@@ -13813,7 +14055,7 @@ msgstr ""
#: client/gui-sdl/graphics.c:1021
#, c-format
-msgid "Unable to initialize SDL_ttf library: %s"
+msgid "Unable to initialize SDL_ttf library: %s"
msgstr ""
#: client/gui-sdl/graphics.c:1058
@@ -13904,12 +14146,6 @@ msgstr ""
msgid "Waiting for the beginning of the game"
msgstr ""
-#: client/gui-sdl/gui_string.c:608
-msgid ""
-"Couldn't find stdfont.ttf file. Please link/copy/move anyunicode ttf font to "
-"data dir as stdfont.ttf"
-msgstr ""
-
#. TRANS: Future Technology
#: client/gui-sdl/gui_tilespec.c:506
msgid "FT"
@@ -14527,12 +14763,12 @@ msgid "Leave Game"
msgstr "Zapisz _grÄ™"
#: client/gui-sdl/optiondlg.c:2302 client/gui-sdl/pages.c:255
-#: client/gui-win32/connectdlg.c:1098 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1100 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:963
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
msgid "Start New Game"
msgstr "Rozpocznij nowÄ… grÄ™"
@@ -14660,8 +14896,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:1081
-#: client/gui-win32/connectdlg.c:1089 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
+#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
msgid "Update"
msgstr "Aktualizuj"
@@ -15093,10 +15329,6 @@ msgstr "Zmień wszystko"
msgid "Refresh"
msgstr "Odśwież"
-#: client/gui-win32/cityrep.c:882
-msgid "Select"
-msgstr "Wybierz"
-
#: client/gui-win32/cityrep.c:883
msgid "Configure"
msgstr "Konfiguracja"
@@ -15146,55 +15378,55 @@ msgstr "Nie mogę wczytać zapisanej gry"
msgid "Verify Password"
msgstr "Potwierdź hasło"
-#: client/gui-win32/connectdlg.c:912 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr "Wybór Serwera Freeciv"
-#: client/gui-win32/connectdlg.c:913
+#: client/gui-win32/connectdlg.c:915
msgid "Local Area Network"
msgstr "Sieć Lokalna"
-#: client/gui-win32/connectdlg.c:947
+#: client/gui-win32/connectdlg.c:949
msgid "Welcome to Freeciv"
msgstr "Witamy we Freeciv"
-#: client/gui-win32/connectdlg.c:965
+#: client/gui-win32/connectdlg.c:967
msgid "Load Saved Game"
msgstr "Wczytaj zachowanÄ… grÄ™"
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
msgid "Connect To Network Game"
msgstr "Przyłącz się do gry _sieciowej"
-#: client/gui-win32/connectdlg.c:977
+#: client/gui-win32/connectdlg.c:979
msgid "Choose a nation to play"
msgstr "Wybierz naród, którym będziesz grał"
-#: client/gui-win32/connectdlg.c:1012
+#: client/gui-win32/connectdlg.c:1014
msgid "Number of players (Including AI):"
msgstr "Liczba graczy (ÅÄ…cznie z botami):"
-#: client/gui-win32/connectdlg.c:1020
+#: client/gui-win32/connectdlg.c:1022
msgid "AI skill level:"
msgstr "Poziom trudności AI:"
-#: client/gui-win32/connectdlg.c:1034 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
msgid "Game Options"
msgstr "Opcje gry"
-#: client/gui-win32/connectdlg.c:1038
+#: client/gui-win32/connectdlg.c:1040
msgid "Start Game"
msgstr "Rozpocznij grÄ™"
-#: client/gui-win32/connectdlg.c:1057
+#: client/gui-win32/connectdlg.c:1059
msgid "Login:"
msgstr "Użytkownik:"
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
msgid "Host:"
msgstr "Serwer:"
-#: client/gui-win32/connectdlg.c:1060
+#: client/gui-win32/connectdlg.c:1062
msgid "Port:"
msgstr "Port:"
@@ -15457,10 +15689,6 @@ msgstr[0] "(bezczynny %d turÄ™)"
msgstr[1] "(bezczynny %d tury)"
msgstr[2] "(bezczynny %d tur)"
-#: client/gui-win32/plrdlg.c:337 data/Freeciv.in:88
-msgid "Host"
-msgstr "Komputer"
-
#: client/gui-win32/plrdlg.c:355 data/Freeciv.in:3230
msgid "Intelligence"
msgstr "Wywiad"
@@ -17244,12 +17472,12 @@ msgstr ""
#: data/helpdata.txt:781
msgid ""
-" To have a diplomatic relationship with another player, you must fist "
-"establish first contact with that player. To establish first contact, you "
-"have to move one of your units next to a city or unit belonging to that "
-"player, or vice versa. Unless you establish an embassy with that player, you "
-"may again lose contact with them after a set number of turns without direct "
-"physical contact."
+" To have a diplomatic relationship with another player, you must first "
+"establish contact with that player. To establish contact, you have to move "
+"one of your units next to a city or unit belonging to that player, or vice "
+"versa. Unless you establish an embassy with that player, you may again lose "
+"contact with them after a set number of turns without direct physical "
+"contact."
msgstr ""
#: data/helpdata.txt:788
@@ -20036,7 +20264,7 @@ msgid "Communism"
msgstr "Komunizm"
#: data/default/governments.ruleset:121 data/civ2/governments.ruleset:118
-#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:26
+#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:27
msgid "Comrade"
msgstr "Towarzysz"
@@ -20999,6 +21227,11 @@ msgstr ""
"grupy osadników i/lub inżynierów są bardzo podatne na ataki wrogich "
"jednostek."
+#: data/default/units.ruleset:238
+#, fuzzy
+msgid "?unit:Workers"
+msgstr "Robotnicy"
+
#: data/default/units.ruleset:264
msgid ""
"Workers are one of the key units in the game. They can be used to irrigate "
@@ -21659,6 +21892,11 @@ msgstr "Badacz"
msgid "Explorers are very useful for mapping unknown territory."
msgstr "Badacze sÄ… przydatki przy badaniu nieznanego terytorium."
+#: data/default/units.ruleset:1864
+#, fuzzy
+msgid "?unit:Leader"
+msgstr "Przywódca"
+
#: data/default/units.ruleset:1892
msgid "This is you. If you lose this unit, you lose the game. So don't."
msgstr ""
@@ -21926,7 +22164,7 @@ msgid "Emir"
msgstr "Emir"
#: data/nation/afghani.ruleset:25 data/nation/slovakian.ruleset:30
-#: data/nation/soviet.ruleset:27
+#: data/nation/soviet.ruleset:28
msgid "General Secretary"
msgstr "Sekretarz Generalny"
@@ -22046,10 +22284,11 @@ msgid "?plural:Armenians"
msgstr "?plural:Ormianie"
#: 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 "
-"independence from Soviet in 1991 AD"
+"independence from the Soviet Union in 1991."
msgstr ""
"Zgodnie z legendą Ormianie są potomkami Haiki praprawnuka Noego. Współczesna "
"Armenia uzyskała niepodległość od Związku Radzieckiego w 1991."
@@ -23102,12 +23341,11 @@ msgstr "?plural:WÅ‚osi"
#: data/nation/illyrian.ruleset:6
msgid ""
-"Illyrians were Indo-European tribes who appeared in the western part of the "
-"Balkan Peninsula before 1000 BC, including the Dalmatians to the north, "
-"Corcyra island and Ambracia bay in prehistoric Epirus to the south, mixing "
-"with Thracians in Dardania to the east, and settling Messapia across the "
-"Adriatic Sea. Illyrian kingdoms were independent for centuries, until "
-"conquered by the Roman Republic."
+"Illyrians were Indo-European tribes who appeared in the western part of the "
+"Balkan Peninsula before 1000 BC, including Corcyra island and Ambracia bay "
+"in prehistoric Epirus to the south. They mixed with Thracians in Dardania to "
+"the east, and settled Messapia across the Adriatic Sea. Illyrian kingdoms "
+"were independent for centuries, until conquered by the Roman Republic."
msgstr ""
#: data/nation/inca.ruleset:3
@@ -23419,7 +23657,7 @@ msgid ""
"1953."
msgstr ""
-#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:28
+#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:29
msgid "Great Leader"
msgstr "Wielki Lider"
@@ -23583,9 +23821,9 @@ msgstr "?plural:Melezyjczycy"
msgid ""
"Sub-Saharan Africa has been a cultural and ethnical melting pot for "
"millennia. In medieval times, the region was home to a succession of empires "
-"called the Sahelian kingdoms. Of these, the Islamic Mali empire with it's "
+"called the Sahelian kingdoms. Of these, the Islamic Mali empire with its "
"capital in Timbuktu was the most influential. This empire reigned from the "
-"14th to the 17th century and was famed for it's wealth and benevolent kings. "
+"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 ""
@@ -23645,8 +23883,8 @@ msgstr "?plural:Majowie"
#: data/nation/mayan.ruleset:6
msgid ""
-"The Mayans were a Mesoamerican civilization. Famous for building great "
-"pyramids and palaces in the jungle."
+"The Mayans were a Mesoamerican civilization. They are famous for building "
+"great pyramids and palaces in the jungle."
msgstr ""
#: data/nation/mayan.ruleset:19
@@ -24182,6 +24420,16 @@ msgstr ""
"1993, wcześniejszej części państwa Austriacko-Węgierskiego. Słowacja leży na "
"południe od Polski."
+#: data/nation/slovakian.ruleset:26
+#, fuzzy
+msgid "?male:Leader"
+msgstr "Przywódca"
+
+#: data/nation/slovakian.ruleset:26
+#, fuzzy
+msgid "?female:Leader"
+msgstr "?female:Towarzyszka"
+
#: data/nation/slovakian.ruleset:29
msgid "Pope"
msgstr "Papież"
@@ -24223,11 +24471,12 @@ msgstr "?plural:Szkoci"
#: data/nation/soviet.ruleset:6
msgid ""
-"Soviet Union's history starts in November 1917, when under Lenin's "
+"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 "
-"republics integrated into one country. Soviet Union became one of most "
-"powerful states in the 20th century. But by the end of 1991 due to many "
-"social shocks it disintegrated into fifteen independent countries"
+"republics integrated into one country. The Soviet Union became one of most "
+"powerful states in the 20th century, but by the end of 1991 it had "
+"disintegrated into fifteen independent countries due to social and economic "
+"problems."
msgstr ""
#: data/nation/spanish.ruleset:3
@@ -24624,8 +24873,8 @@ msgstr "?plural:Westfaliczycy"
#: data/nation/westphalian.ruleset:6
msgid ""
-"Westphalia, before becoming a Prussian province, was the western region the "
-"duchy of Saxony. Present-day it consists of the Northern part of the largest "
+"Westphalia, before becoming a Prussian province, was the western region of "
+"the duchy of Saxony. Today it makes up the northern part of the largest "
"German federal state, North Rhine-Westphalia."
msgstr ""
@@ -24774,7 +25023,7 @@ msgid ""
"The flag and background color indicate what civilization the city\n"
"belongs to (this will be useful when you meet other civilizations).\n"
"The top row of the bar also shows the name and size of the city, and\n"
-"will show one or more starts to indicate if there are units in the\n"
+"will show one or more stars to indicate if there are units in the\n"
"city. The bottom row shows what the city is building, and how long it\n"
"will take; it also shows how long the city will take to grow to the\n"
"next largest size."
@@ -24830,7 +25079,7 @@ msgid ""
"Now your city has grown to size five. As cities get larger unrest\n"
"becomes a problem. A city of this size will usually have one unhappy\n"
"citizen unless pacifying effects are used; meaning one entertainer\n"
-"specialist is required to keep your citzens content. This is basically\n"
+"specialist is required to keep your citizens content. This is basically\n"
"a wasted citizen.\n"
"\n"
"There are several things that can be done about this. One quick fix\n"
@@ -24902,7 +25151,7 @@ msgid ""
"existing cities. Generally when building new cities you want to make\n"
"sure that all tiles are covered by at least one city, but after that\n"
"it is best that your cities overlap as little as possible. Spreading\n"
-"out cities properly gives each city access to more resrouces, allowing\n"
+"out cities properly gives each city access to more resources, allowing\n"
"them to grow to larger sizes."
msgstr ""
@@ -25216,6 +25465,67 @@ msgstr "Zespół"
msgid "Team 31"
msgstr "Zespół"
+#, fuzzy
+#~ msgid "Auth config filename \"%s\" not allowed!"
+#~ msgstr "To imiÄ™ nie jest dozwolone."
+
+#~ msgid "The %s of the %s (%s)"
+#~ msgstr "%s %s (%s)"
+
+#, fuzzy
+#~ msgid ""
+#~ "Illegal alliance structure detected: %s alliance to %s reduced to peace "
+#~ "treaty."
+#~ msgstr ""
+#~ "Wykryto nieprawidłowy układ sojuszów: Sojusz pomiędzy %s i %s został "
+#~ "zamieniony na pokój."
+
+#, fuzzy
+#~ msgid "And, became more experienced!"
+#~ msgstr "Jednostka zyskała doświadczenie."
+
+#~ msgid "We can't take control of server, attempting to kill it."
+#~ msgstr "Nie można przejąć kontroli nad serwerem, próbuję go zabić."
+
+#, fuzzy
+#~ msgid "%s territory"
+#~ msgstr "%s"
+
+#~ msgid "%s territory (%d turn cease-fire)"
+#~ msgid_plural "%s territory (%d turn cease-fire)"
+#~ msgstr[0] "%s (%d tura zawieszenia broni)"
+#~ msgstr[1] "%s (%d tury zawieszenia broni)"
+#~ msgstr[2] "%s (%d tur zawieszenia broni)"
+
+#, fuzzy
+#~ msgid "%s territory (%s)"
+#~ msgstr "%s %s"
+
+#~ msgid "City: %s (%s)"
+#~ msgstr "Miasto: %s(%se)"
+
+#, fuzzy
+#~ msgid "Unit: %s (%s)"
+#~ msgstr "Jednostka: %s(%s)"
+
+#~ msgid "%s of the %s"
+#~ msgstr "%2$s %1$s"
+
+#~ msgid "no maximum, "
+#~ msgstr "bez maksimum, "
+
+#~ msgid "%d unit maximum, "
+#~ msgid_plural "%d units maximum, "
+#~ msgstr[0] "maksymalnie %d jednostka, "
+#~ msgstr[1] "maksymalnie %d jednostki, "
+#~ msgstr[2] "maksymalnie %d jednostek, "
+
+#~ msgid "%d per unit). "
+#~ msgstr "%d na jednostkÄ™). "
+
+#~ msgid "Select same type"
+#~ msgstr "Wybierz ten sam typ"
+
#~ msgid "Units: "
#~ msgstr "Oddziały: "
@@ -25339,9 +25649,6 @@ msgstr "Zespół"
#~ msgid ", nation %s"
#~ msgstr ", %s"
-#~ msgid ", team %s"
-#~ msgstr ", zespół %s"
-
#~ msgid "_Map"
#~ msgstr "_Mapa"
diff --git a/po/pt.gmo b/po/pt.gmo
index 7caf0ba..2473ca8 100644
Binary files a/po/pt.gmo and b/po/pt.gmo differ
diff --git a/po/pt.po b/po/pt.po
index 83b1af9..f8782b4 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: freeciv\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 07:45+0900\n"
+"POT-Creation-Date: 2009-03-29 21:13+0900\n"
"PO-Revision-Date: 2007-09-01 22:56+0300\n"
"Last-Translator: Duarte Loreto <happyguy_pt at hotmail.com>\n"
"Language-Team: \n"
@@ -654,7 +654,7 @@ msgid "Road"
msgstr "Estrada"
#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
-#: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
+#: client/gui-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"
@@ -671,7 +671,7 @@ msgid "Mine"
msgstr "Mina"
#: common/terrain.c:396 common/unit.c:548 server/report.c:124
-#: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
+#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr "Poluição"
@@ -717,7 +717,7 @@ msgstr "Fortificado"
msgid "Sentry"
msgstr "Sentinela"
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:851 client/gui-sdl/menu.c:648
+#: common/unit.c:566 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"
@@ -734,7 +734,7 @@ msgstr "Explorar"
msgid "Transform"
msgstr "Transformar"
-#: common/unit.c:584 client/text.c:106 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:584 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"
@@ -807,11 +807,11 @@ msgstr "MÃssil Nuclear"
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1406
+#: common/unittype.c:349 client/helpdata.c:1404
msgid " and "
msgstr " e "
-#: common/unittype.c:355 client/helpdata.c:1392
+#: common/unittype.c:355 client/helpdata.c:1390
msgid "?and:, "
msgstr "?e:, "
@@ -1371,105 +1371,100 @@ msgstr ""
#: server/auth.c:281
#, fuzzy, c-format
-msgid "Auth config filename \"%s\" not allowed!"
-msgstr "Que ligações são permitidas"
-
-#: server/auth.c:286
-#, fuzzy, c-format
msgid "Cannot load auth config file \"%s\"!"
msgstr "Incapaz de encontrar ficheiro audio %s"
-#: server/auth.c:397
+#: server/auth.c:392
#, c-format
msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
msgstr ""
-#: server/auth.c:404
+#: server/auth.c:399
#, fuzzy
msgid "Guests are not allowed on this server. Sorry."
msgstr "Desculpe, você não está autorizado a utilizar comandos do servidor."
-#: server/auth.c:406
+#: server/auth.c:401
#, fuzzy, c-format
msgid "%s was rejected: Guests not allowed."
msgstr "%s foi rejeitado, %s já estava ligado."
-#: server/auth.c:425
+#: server/auth.c:420
#, c-format
msgid ""
"There was an error reading the user database, logging in as guest connection "
"'%s'."
msgstr ""
-#: server/auth.c:431
+#: server/auth.c:426
msgid ""
"There was an error reading the user database and guest logins are not "
"allowed. Sorry"
msgstr ""
-#: server/auth.c:434
+#: server/auth.c:429
#, fuzzy, c-format
msgid "%s was rejected: Database error and guests not allowed."
msgstr "%s foi rejeitado: Nome %s já está a ser utilizado."
-#: server/auth.c:441
+#: server/auth.c:436
#, c-format
msgid "Enter password for %s:"
msgstr ""
-#: server/auth.c:450
+#: server/auth.c:445
msgid "Enter a new password (and remember it)."
msgstr ""
-#: server/auth.c:456
+#: server/auth.c:451
msgid "This server allows only preregistered users. Sorry."
msgstr ""
-#: server/auth.c:459
+#: server/auth.c:454
#, fuzzy, c-format
msgid "%s was rejected: Only preregister users allowed."
msgstr "%s foi rejeitado: Nome %s já está a ser utilizado."
-#: server/auth.c:488 server/auth.c:547
+#: server/auth.c:483 server/auth.c:542
msgid "Sorry, too many wrong tries..."
msgstr ""
-#: server/auth.c:489
+#: server/auth.c:484
#, c-format
msgid "%s was rejected: Too many wrong password verifies for new user."
msgstr ""
-#: server/auth.c:505
+#: server/auth.c:500
msgid ""
"Warning: There was an error in saving to the database. Continuing, but your "
"stats will not be saved."
msgstr ""
-#: server/auth.c:549
+#: server/auth.c:544
#, fuzzy, c-format
msgid "%s was rejected: Too many wrong password tries."
msgstr "%s foi rejeitado: Não se podem observar bárbaros."
-#: server/auth.c:558
+#: server/auth.c:553
msgid "Your password is incorrect. Try again."
msgstr ""
-#: server/auth.c:569
+#: server/auth.c:564
#, fuzzy
msgid "Sorry, your connection timed out..."
msgstr "Desculpe, patrula aérea ainda não implementada."
-#: server/auth.c:571
+#: server/auth.c:566
#, fuzzy, c-format
msgid "%s was rejected: Connection timeout waiting for password."
msgstr "%s foi rejeitado: Não se pode re-ligar como jogador humano."
-#: server/auth.c:636
+#: server/auth.c:631
#, c-format
msgid "Your password is too short, the minimum length is %d. Try again."
msgstr ""
-#: server/auth.c:642
+#: server/auth.c:637
#, c-format
msgid ""
"The password must have at least %d capital letters, %d numbers, and be at "
@@ -1978,7 +1973,7 @@ msgstr "Este é o servidor para %s"
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:237 manual/civmanual.c:380
+#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
@@ -2006,14 +2001,14 @@ msgstr ""
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:241
+#: server/civserver.c:217 client/civclient.c:242
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:245
+#: server/civserver.c:221 client/civclient.c:246
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"
@@ -2021,7 +2016,7 @@ msgstr " -d, --debug NUM\tDefine nÃvel log depuração (0 a 3)\n"
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:248 manual/civmanual.c:382
+#: server/civserver.c:225 client/civclient.c:249 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"
@@ -2072,11 +2067,11 @@ msgstr " -r, --read FICHEIRO\tLer ficheiro de arranque FICHEIRO\n"
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:267 manual/civmanual.c:383
+#: server/civserver.c:247 client/civclient.c:268 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:279
+#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, fuzzy, c-format
@@ -3329,7 +3324,7 @@ msgstr "%s causou um incidente ao incitar uma revolta em %s."
msgid "Sea moving start units are not yet supported. Nobody gets %s."
msgstr ""
-#: server/gamehand.c:310 client/text.c:632
+#: server/gamehand.c:310 client/text.c:691
#, c-format
msgid "Year: %s"
msgstr "Ano: %s"
@@ -3607,10 +3602,10 @@ msgid "Could not throw %s into civil war - no available nations"
msgstr ""
#: server/plrhand.c:1686
-#, c-format
+#, fuzzy, c-format
msgid ""
-"Your nation is thrust into civil war, %s is declared the leader of the "
-"rebel states."
+"Your nation is thrust into civil war! %s is declared the leader of the rebel "
+"states."
msgstr ""
" A sua nação caÃu numa guerra civil, %s é declarado lÃder dos estados "
"rebeldes."
@@ -3711,7 +3706,7 @@ msgstr "Vel. de Investigação"
msgid "Literacy"
msgstr "Literatura"
-#: server/report.c:121 client/cityrepdata.c:526 client/cityrepdata.c:527
+#: server/report.c:121 client/cityrepdata.c:524 client/cityrepdata.c:525
#: client/gui-sdl/cityrep.c:174
msgid "Production"
msgstr "Produção"
@@ -3863,7 +3858,7 @@ msgstr ""
"Expressão demográfica contém caracteres inválidos. Consulte \"help demography"
"\"."
-#: server/report.c:743 server/report.c:766
+#: server/report.c:743 server/report.c:768
msgid "Demographics Report:"
msgstr "Relatório Demográfico:"
@@ -3871,10 +3866,12 @@ msgstr "Relatório Demográfico:"
msgid "Sorry, the Demographics report is unavailable."
msgstr "Desculpe, o relatório Demográfico não se encontra disponÃvel."
-#: server/report.c:748
+#. TRANS: <nation adjective> <government name> (<year>).
+#. * E.g. "Polish Despotism (200 AD)".
+#: server/report.c:750
#, fuzzy, c-format
-msgid "The %s of the %s (%s)"
-msgstr "O %s dos %s"
+msgid "%s %s (%s)"
+msgstr "%s em %s (%s)\n"
#. TRANS: message about an installation error.
#: server/ruleset.c:163
@@ -3931,14 +3928,6 @@ msgstr ""
msgid "%s had invalid nation; changing to %s."
msgstr ""
-#. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4073
-#, c-format
-msgid ""
-"Illegal alliance structure detected: %s alliance to %s reduced to peace "
-"treaty."
-msgstr ""
-
#: server/settings.c:32
msgid "Geological"
msgstr ""
@@ -5098,8 +5087,8 @@ msgstr "Prefixo de nome de auto-gravação"
#: server/settings.c:1016
#, fuzzy
msgid ""
-"Automatically saved games will have name \"<prefix><year>.sav\". This "
-"setting sets the <prefix> part."
+"Automatically saved games will have name \"<prefix>-T<turn>-Y<year>.sav\". "
+"This setting sets the <prefix> part."
msgstr ""
"Jogos gravados automaticamente terão o nome \"<prefixo><ano>.sav\".\n"
"Esta opção define a parte <prefixo>."
@@ -5119,11 +5108,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:147
+#: server/sernet.c:150
msgid "Server cannot read standard input. Ignoring input."
msgstr "Servidor incapaz de ler da consola. A ignorar consola."
-#: server/sernet.c:922
+#: server/sernet.c:929
#, fuzzy, c-format
msgid "Server: bad address: [%s:%d]."
msgstr "Metaservidor: endereço inválido: [%s:%d]."
@@ -5249,114 +5238,114 @@ msgid ""
msgstr ""
" O cessar-fogo com %s expirou. Você e os %s então agora em neutralidade."
-#: server/srv_main.c:928
+#: server/srv_main.c:961
#, c-format
msgid "Failed saving game as %s"
msgstr "Falha ao gravar o jogo como %s"
-#: server/srv_main.c:930
+#: server/srv_main.c:963
#, c-format
msgid "Game saved as %s"
msgstr "Jogo gravado como %s"
-#: server/srv_main.c:962
+#: server/srv_main.c:994
msgid "The game is already running."
msgstr "O jogo já foi iniciado."
-#: server/srv_main.c:970
+#: server/srv_main.c:1002
#, c-format
msgid "%s lost control cmdlevel on game start. Use voting from now on."
msgstr ""
-#: server/srv_main.c:977
+#: server/srv_main.c:1009
msgid "Starting game."
msgstr "A iniciar o jogo."
-#: server/srv_main.c:1039
+#: server/srv_main.c:1071
#, c-format
msgid "request for unknown report (type %d)"
msgstr "pedido de relatório desconhecido (tipo %d)"
-#: server/srv_main.c:1104
+#: server/srv_main.c:1136
#, fuzzy, c-format
msgid "Warning: rejecting old client %s"
msgstr "Aviso: Receia-se fome em %s."
-#: server/srv_main.c:1206
+#: server/srv_main.c:1238
#, 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:1306
+#: server/srv_main.c:1338
msgid "Please choose a non-blank name."
msgstr "Seleccione um nome não-vazio."
-#: server/srv_main.c:1322
+#: server/srv_main.c:1354
#, fuzzy
msgid "That nation is already in use."
msgstr "O jogo já foi iniciado."
-#: server/srv_main.c:1338
+#: server/srv_main.c:1370
#, 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:1359
+#: server/srv_main.c:1391
#, fuzzy
msgid "Please choose a name containing only ASCII characters."
msgstr "Seleccione um nome não-vazio."
-#: server/srv_main.c:1458
+#: server/srv_main.c:1490
#, c-format
msgid "%s nation is not available in this scenario."
msgstr ""
-#: server/srv_main.c:1464
+#: server/srv_main.c:1496
#, fuzzy, c-format
msgid "%s nation is already in use."
msgstr "O jogo já foi iniciado."
-#: server/srv_main.c:1482
+#: server/srv_main.c:1514
#, c-format
msgid "%s is the %s ruler %s."
msgstr "%s é o governante %s %s."
-#: server/srv_main.c:1538
+#: server/srv_main.c:1570
#, 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:1582 server/srv_main.c:1586
+#: server/srv_main.c:1614 server/srv_main.c:1618
#, 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:1728
+#: server/srv_main.c:1760
#, c-format
msgid "Player %d"
msgstr "Jogador %d"
-#: server/srv_main.c:1739 server/srv_main.c:1745
+#: server/srv_main.c:1771 server/srv_main.c:1777
#, c-format
msgid "%s rules the %s."
msgstr "%s governa os %s."
-#: server/srv_main.c:1910
+#: server/srv_main.c:1942
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
msgstr ""
-#: server/srv_main.c:1961
+#: server/srv_main.c:1993
#, c-format
msgid "Sending info to metaserver [%s]"
msgstr "A enviar informação para o metaservidor [%s]"
-#: server/srv_main.c:1992
+#: server/srv_main.c:2024
msgid "The game is over..."
msgstr "O jogo terminou..."
-#: server/srv_main.c:2205
+#: server/srv_main.c:2237
msgid "Now accepting new client connections."
msgstr "A aceitar novas ligações de clientes."
@@ -6194,25 +6183,25 @@ 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:2030 client/gui-sdl/plrdlg.c:645
+#: 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
msgid "AI"
msgstr "IA"
#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
+#: client/gui-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
msgid "Human"
msgstr "Humano"
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
-#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
+#: 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
#, fuzzy
msgid "Alive"
msgstr "Activa"
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
#: client/gui-win32/connectdlg.c:200
#, fuzzy
msgid "Dead"
@@ -6484,9 +6473,9 @@ 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:242
-#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
-#: client/text.c:1201
+#: 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
#, c-format
msgid "?clistmore:, %s"
msgstr ", %s"
@@ -6741,7 +6730,7 @@ msgstr "Apenas %s podem atacar a partir do mar."
msgid "Cannot attack from sea."
msgstr "Não pode atacar a partir do mar."
-#: server/unithand.c:996 server/unittools.c:2103
+#: server/unithand.c:996 server/unittools.c:2137
msgid "Cannot attack unless you declare war first."
msgstr "Não pode atacar sem primeiro declarar guerra."
@@ -6841,100 +6830,101 @@ msgid "%s was upgraded for free to %s."
msgstr "%s actualizou %s para %s."
#: server/unittools.c:297
-#, c-format
-msgid "Not enough gold. %s disbanded"
-msgstr ""
+#, fuzzy, c-format
+msgid "Not enough gold to pay upkeep for %s. Unit disbanded."
+msgstr "%s não pode manter %s, unidade dissolvida."
-#: server/unittools.c:342
+#: server/unittools.c:343
#, c-format
msgid "Your %s has run out of hit points."
msgstr "Os seus %s ficaram sem resistência."
-#: server/unittools.c:358
+#: server/unittools.c:359
#, c-format
msgid "Your %s has been lost on the high seas."
msgstr "O seu %s foi perdido no alto mar."
-#: server/unittools.c:365
+#: server/unittools.c:366
#, c-format
msgid "Your %s survived on the high seas and became more experienced!"
msgstr ""
-#: server/unittools.c:376
+#: server/unittools.c:377
#, fuzzy, c-format
msgid "Your %s has been lost on unsafe terrain."
msgstr "O seu %s foi perdido no alto mar."
-#: server/unittools.c:430
+#: server/unittools.c:431
#, c-format
msgid "Your %s has returned to refuel."
msgstr "O seu %s voltou para se reabastecer."
-#: server/unittools.c:454
+#: server/unittools.c:455
#, c-format
msgid "Your %s has run out of fuel."
msgstr "O seu %s ficou sem combustÃvel."
-#. TRANS: And, <the unit> became ...
-#: server/unittools.c:616
-msgid "And, became more experienced!"
-msgstr ""
-
#. TRANS: Your <unit> became ...
-#: server/unittools.c:620
+#: server/unittools.c:619
#, c-format
msgid "Your %s became more experienced!"
msgstr ""
-#: server/unittools.c:1011
+#: server/unittools.c:1009
#, fuzzy, c-format
msgid "Teleported your %s to %s."
msgstr "Foi teleportada a sua %s de (%d, %d) para %s."
-#: server/unittools.c:1041
+#. TRANS: A unit is moved to resolve stack conflicts.
+#: server/unittools.c:1065
+#, fuzzy, c-format
+msgid "Moved your %s."
+msgstr "Foi dissolvida a sua %s em (%d, %d)."
+
+#: server/unittools.c:1076
#, fuzzy, c-format
msgid "Disbanded your %s."
msgstr "Foi dissolvida a sua %s em (%d, %d)."
-#: server/unittools.c:1363
+#: server/unittools.c:1397
#, c-format
msgid "Unable to defend %s, %s has lost the game."
msgstr ""
-#: server/unittools.c:1367
+#: server/unittools.c:1401
#, c-format
msgid "Losing %s meant losing the game! Be more careful next time!"
msgstr ""
-#: server/unittools.c:1469
+#: server/unittools.c:1503
#, c-format
msgid "%s escaped the destruction of %s, and fled to %s."
msgstr ""
-#: server/unittools.c:1478
+#: server/unittools.c:1512
#, c-format
msgid "%s lost when %s was lost."
msgstr "%s perdida quando %s foi perdida."
-#: server/unittools.c:1527
+#: server/unittools.c:1561
#, 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:1545
+#: server/unittools.c:1579
#, 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:1554 server/unittools.c:1612
+#: server/unittools.c:1588 server/unittools.c:1646
#, 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:1588
+#: server/unittools.c:1622
#, fuzzy, c-format
msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
msgid_plural ""
@@ -6944,14 +6934,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:1621
+#: server/unittools.c:1655
#, 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:1636
+#: server/unittools.c:1670
#, 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."
@@ -6959,7 +6949,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:1646
+#: server/unittools.c:1680
#, 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."
@@ -6969,196 +6959,196 @@ 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:1660
+#: server/unittools.c:1694
#, 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:1928
+#: server/unittools.c:1962
#, c-format
msgid "Your %s was nuked by %s."
msgstr "O seu %s foi atacado com armas nucleares por %s."
-#: server/unittools.c:1931 server/unittools.c:1947
+#: server/unittools.c:1965 server/unittools.c:1981
msgid "yourself"
msgstr "você próprio"
-#: server/unittools.c:1935
+#: server/unittools.c:1969
#, fuzzy, c-format
msgid "The %s %s was nuked."
msgstr "%s, unidade %s, sofreu um ataque nuclear."
-#: server/unittools.c:1944
+#: server/unittools.c:1978
#, c-format
msgid "%s was nuked by %s."
msgstr "%s sofreu um ataque nuclear dos %s."
-#: server/unittools.c:1952
+#: server/unittools.c:1986
#, c-format
msgid "You nuked %s."
msgstr "Você atacou os %s com armas nucleares."
-#: server/unittools.c:1993
+#: server/unittools.c:2027
#, fuzzy, c-format
msgid "The %s detonated a nuke!"
msgstr "%s detonou uma arma nuclear!"
-#: server/unittools.c:2017
+#: server/unittools.c:2051
#, c-format
msgid "%s transported successfully."
msgstr "%s transportado com sucesso."
-#: server/unittools.c:2069
+#: server/unittools.c:2103
msgid "This unit type can not be paradropped."
msgstr "Este tipo de unidade não pode ser lançada de paraquedas."
-#: server/unittools.c:2079
+#: server/unittools.c:2113
#, fuzzy
msgid "You cannot paradrop a unit that is transporting other units."
msgstr "ImpossÃvel lançar de paraquedas no oceano."
-#: server/unittools.c:2085
+#: server/unittools.c:2119
msgid "The destination location is not known."
msgstr "O local de destino não é conhecido."
-#: server/unittools.c:2092
+#: server/unittools.c:2126
#, fuzzy, c-format
msgid "This unit cannot paradrop into %s."
msgstr "ImpossÃvel lançar de paraquedas no oceano."
-#: server/unittools.c:2112
+#: server/unittools.c:2146
#, 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:2123
+#: server/unittools.c:2157
#, 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:2136
+#: server/unittools.c:2170
#, 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:2158
+#: server/unittools.c:2192
#, c-format
msgid "You found %d gold."
msgstr "Você encontrou %d moedas."
-#: server/unittools.c:2175
+#: server/unittools.c:2209
#, c-format
msgid "You found %s in ancient scrolls of wisdom."
msgstr "Você encontrou %s em antigos pergaminhos de sabedoria."
-#: server/unittools.c:2182
+#: server/unittools.c:2216
#, 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:2196
+#: server/unittools.c:2230
msgid "A band of friendly mercenaries joins your cause."
msgstr "Um bando de mercenários amistosos juntam-se à sua causa."
-#: server/unittools.c:2214
+#: server/unittools.c:2248
msgid "An abandoned village is here."
msgstr "Existe aqui uma povoação abandonada."
-#: server/unittools.c:2224
+#: server/unittools.c:2258
msgid "You have unleashed a horde of barbarians!"
msgstr "Você incitou uma horda de bárbaros!"
-#: server/unittools.c:2227
+#: server/unittools.c:2261
#, c-format
msgid "Your %s has been killed by barbarians!"
msgstr "O seu %s foi morto por bárbaros!"
-#: server/unittools.c:2243
+#: server/unittools.c:2277
msgid "You found a friendly city."
msgstr "Você encontrou uma cidade amistosa."
-#: server/unittools.c:2257
+#: server/unittools.c:2291
msgid "Friendly nomads are impressed by you, and join you."
msgstr "Você impressiona nómadas amistosos, que se juntam à sua causa."
-#: server/unittools.c:2282
+#: server/unittools.c:2316
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:2540
+#: server/unittools.c:2574
#, 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:2989
+#: server/unittools.c:3023
#, 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:3041
+#: server/unittools.c:3075
#, 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:3054
+#: server/unittools.c:3088
#, c-format
msgid "Orders for %s aborted since they give an invalid activity."
msgstr ""
-#: server/unittools.c:3068
+#: server/unittools.c:3102
#, c-format
msgid "Orders for %s aborted since they give an invalid location."
msgstr ""
-#: server/unittools.c:3078
+#: server/unittools.c:3112
#, 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:3104
+#: server/unittools.c:3138
#, c-format
msgid "Orders for %s aborted because of failed move."
msgstr ""
-#: server/unittools.c:3145
+#: server/unittools.c:3179
#, fuzzy, c-format
msgid "Attempt to change homecity for %s failed."
msgstr "Alterada a cidade base de %s em %s."
-#: server/unittools.c:3156
+#: server/unittools.c:3190
#, fuzzy, c-format
msgid "Attempt to establish trade route for %s failed."
msgstr "* Pode estabelecer rotas comerciais.\n"
-#: server/unittools.c:3168
+#: server/unittools.c:3202
#, c-format
msgid "Attempt to build wonder for %s failed."
msgstr ""
-#: server/unittools.c:3177
+#: server/unittools.c:3211
#, fuzzy, c-format
msgid "Your %s has invalid orders."
msgstr "O seu %s voltou para se reabastecer."
-#: server/generator/mapgen.c:1737
+#: server/generator/mapgen.c:1771
msgid "High landmass - this may take a few seconds."
msgstr "Massa terrestre elevada - isto pode levar alguns segundos."
-#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
+#: server/generator/mapgen.c:1969 server/generator/mapgen.c:2039
#, fuzzy, c-format
msgid "Falling back to generator %d."
msgstr "A regressar ao valor de omissão de gerador 2."
-#: server/generator/mapgen.c:2025
+#: server/generator/mapgen.c:2059
msgid "Generator 3 didn't place all big islands."
msgstr "Gerador 3 não colocou todas as ilhas maiores."
-#: server/generator/mapgen.c:2054
+#: server/generator/mapgen.c:2088
#, c-format
msgid "Generator 3 left %li landmass unplaced."
msgstr "Gerador 3 deixou %li massas terrestres por colocar."
@@ -7262,7 +7252,7 @@ msgid_plural "%3d turns"
msgstr[0] "%3d turno"
msgstr[1] "%3d turnos"
-#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:631
#: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
@@ -7382,352 +7372,352 @@ msgstr "?city_state:Paz"
msgid "(worklist)"
msgstr "(lista de tarefas)"
-#: client/cityrepdata.c:447
-msgid "Special"
-msgstr "Especial"
+#: client/cityrepdata.c:446
+msgid "?city:Name"
+msgstr "?city:Nome"
-#: client/cityrepdata.c:448
-msgid "?entertainers/scientists/taxmen:E/S/T"
-msgstr "?entertainers/scientists/taxmen:A/C/F"
+#: client/cityrepdata.c:446 client/gui-sdl/cityrep.c:169
+msgid "City Name"
+msgstr "Nome da Cidade"
-#: client/cityrepdata.c:449
-msgid "Entertainers, Scientists, Taxmen"
-msgstr "Artistas, Cientistas, Fiscais"
+#: client/cityrepdata.c:448
+msgid "?size [short]:Sz"
+msgstr "?size:Tm"
-#: client/cityrepdata.c:452
-#, fuzzy
-msgid "Concise + Rapture, - Disorder"
-msgstr "Conciso + Celebração, - Desordem"
+#: client/cityrepdata.c:448
+msgid "Size"
+msgstr "Tamanho"
-#: client/cityrepdata.c:454 client/plrdlg_common.c:261
+#: client/cityrepdata.c:450 client/plrdlg_common.c:261
#: client/gui-win32/plrdlg.c:337
msgid "State"
msgstr "Estado"
-#: client/cityrepdata.c:454
+#: client/cityrepdata.c:450
msgid "Rapture/Peace/Disorder"
msgstr "Celebração/Paz/Desordem"
+#: client/cityrepdata.c:452
+#, fuzzy
+msgid "Concise *=Rapture, X=Disorder"
+msgstr "Conciso + Celebração, - Desordem"
+
+#: client/cityrepdata.c:456
+msgid "Special"
+msgstr "Especial"
+
#: client/cityrepdata.c:457
+msgid "?entertainers/scientists/taxmen:E/S/T"
+msgstr "?entertainers/scientists/taxmen:A/C/F"
+
+#: client/cityrepdata.c:458
+msgid "Entertainers, Scientists, Taxmen"
+msgstr "Artistas, Cientistas, Fiscais"
+
+#: client/cityrepdata.c:461
msgid "?Happy workers:H"
msgstr "?Happy workers:F"
-#: client/cityrepdata.c:457
+#: client/cityrepdata.c:461
msgid "Workers: Happy"
msgstr "Operários: Feliz"
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
msgid "?Content workers:C"
msgstr "?Content workers:C"
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
msgid "Workers: Content"
msgstr "Operários: Contente"
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
msgid "?Unhappy workers:U"
msgstr "?Unhappy workers:D"
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
msgid "Workers: Unhappy"
msgstr "Operários: Descontente"
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
msgid "?Angry workers:A"
msgstr "?Angry workers:Z"
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
msgid "Workers: Angry"
msgstr "Operários: Zangado"
-#: client/cityrepdata.c:465 client/gui-xaw/citydlg.c:2401
-#: data/default/units.ruleset:238
-msgid "Workers"
+#: client/cityrepdata.c:469 client/gui-xaw/citydlg.c:2402
+#, fuzzy
+msgid "?city:Workers"
msgstr "Operários"
-#: client/cityrepdata.c:466
+#: client/cityrepdata.c:470
msgid "?happy/content/unhappy/angry:H/C/U/A"
msgstr "?happy/content/unhappy/angry:F/C/D/Z"
-#: client/cityrepdata.c:467
+#: client/cityrepdata.c:471
msgid "Workers: Happy, Content, Unhappy, Angry"
msgstr "Operários: Feliz, Contente, Descontente, Zangado"
-#: client/cityrepdata.c:470 client/cityrepdata.c:472
+#: client/cityrepdata.c:474 client/cityrepdata.c:476
msgid "Best"
msgstr "Melhor"
-#: client/cityrepdata.c:470
+#: client/cityrepdata.c:474
msgid "attack"
msgstr "ataque"
-#: client/cityrepdata.c:471
+#: client/cityrepdata.c:475
msgid "Best attacking units"
msgstr "Unidades com melhor ataque"
-#: client/cityrepdata.c:472
+#: client/cityrepdata.c:476
msgid "defense"
msgstr "defesa"
-#: client/cityrepdata.c:473
+#: client/cityrepdata.c:477
msgid "Best defending units"
msgstr "Unidades com melhor defesa"
-#: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
-#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
-#: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
-#: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
-#: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
-#: client/gui-win32/menu.c:351 client/gui-win32/repodlgs.c:616
-#: client/gui-win32/repodlgs.c:707 client/gui-win32/repodlgs.c:716
-#: client/gui-xaw/menu.c:157 client/gui-xaw/menu.c:219
-#: client/gui-xaw/menu.c:242 client/gui-xaw/repodlgs.c:881
-#: client/gui-xaw/repodlgs.c:1069 data/Freeciv.in:1895 data/helpdata.txt:909
+#: client/cityrepdata.c:478 client/cityrepdata.c:482
+#: client/gui-gtk-2.0/cityrep.c:1437 client/gui-gtk-2.0/cityrep.c:1456
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-gtk-2.0/cityrep.c:1494
+#: client/gui-gtk-2.0/cityrep.c:1514 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/repodlgs.c:960 client/gui-sdl/helpdlg.c:688
+#: client/gui-sdl/mapctrl.c:1605 client/gui-sdl/optiondlg.c:1827
+#: client/gui-sdl/repodlgs.c:356 client/gui-win32/menu.c:351
+#: client/gui-win32/repodlgs.c:616 client/gui-win32/repodlgs.c:707
+#: client/gui-win32/repodlgs.c:716 client/gui-xaw/menu.c:157
+#: client/gui-xaw/menu.c:219 client/gui-xaw/menu.c:242
+#: client/gui-xaw/repodlgs.c:881 client/gui-xaw/repodlgs.c:1069
+#: data/Freeciv.in:1895 data/helpdata.txt:909
msgid "Units"
msgstr "Unidades"
#. TRANS: Header "Number of units inside city"
-#: client/cityrepdata.c:476
+#: client/cityrepdata.c:480
#, fuzzy
msgid "?Present (units):Here"
msgstr "Pre"
-#: client/cityrepdata.c:477
+#: client/cityrepdata.c:481
msgid "Number of units present"
msgstr "Número de unidades presentes"
#. TRANS: Header "Number of units supported by given city"
-#: client/cityrepdata.c:480
+#: client/cityrepdata.c:484
#, fuzzy
msgid "?Supported (units):Owned"
msgstr "Sup"
-#: client/cityrepdata.c:481
+#: client/cityrepdata.c:485
msgid "Number of units supported"
msgstr "Número de unidades suportadas"
#. TRANS: Header "It will take this many turns before city grows"
-#: client/cityrepdata.c:484
+#: client/cityrepdata.c:488
#, fuzzy
msgid "?food (population):Grow"
msgstr "Cresce"
-#: client/cityrepdata.c:485 client/cityrepdata.c:530
+#: client/cityrepdata.c:489 client/cityrepdata.c:528
#, fuzzy
msgid "?Stock/Target:(Have/Need)"
msgstr "(Stock/Objectivo)"
-#: client/cityrepdata.c:486
+#: client/cityrepdata.c:490
msgid "Turns until growth/famine"
msgstr "Turnos até crescimento/fome"
-#: client/cityrepdata.c:488
-msgid "?size [short]:Sz"
-msgstr "?size:Tm"
-
-#: client/cityrepdata.c:488
-msgid "Size"
-msgstr "Tamanho"
-
-#: client/cityrepdata.c:492
-msgid "?city:Name"
-msgstr "?city:Nome"
-
-#: client/cityrepdata.c:492 client/gui-sdl/cityrep.c:169
-msgid "City Name"
-msgstr "Nome da Cidade"
-
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
msgid "Surplus"
msgstr "Excedente"
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
msgid "?food/production/trade:F/P/T"
msgstr "?food/production/trade:C/P/M"
-#: client/cityrepdata.c:496
+#: client/cityrepdata.c:494
msgid "Surplus: Food, Production, Trade"
msgstr "Excedentes: Comida, Produção, coMércio"
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
#, fuzzy
msgid "?Food surplus [short]:+F"
msgstr "?Food surplus [short]:+C"
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
msgid "Surplus: Food"
msgstr "Excedente: Comida"
-#: client/cityrepdata.c:500
+#: client/cityrepdata.c:498
#, fuzzy
msgid "?Production surplus [short]:+P"
msgstr "?Production surplus [short]:+P"
-#: client/cityrepdata.c:501
+#: client/cityrepdata.c:499
msgid "Surplus: Production"
msgstr "Excedente: Produção"
-#: client/cityrepdata.c:502
+#: client/cityrepdata.c:500
#, fuzzy
msgid "?Production loss (waste) [short]:-P"
msgstr "-P"
-#: client/cityrepdata.c:503
+#: client/cityrepdata.c:501
msgid "Waste"
msgstr "DesperdÃcio"
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
#, fuzzy
msgid "?Trade surplus [short]:+T"
msgstr "?Trade surplus [short]:+M"
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
msgid "Surplus: Trade"
msgstr "Excedente: Comércio"
-#: client/cityrepdata.c:506
+#: client/cityrepdata.c:504
#, fuzzy
msgid "?Trade loss (corruption) [short]:-T"
msgstr "-M"
-#: client/cityrepdata.c:507
+#: client/cityrepdata.c:505
msgid "Corruption"
msgstr "Corrupção"
-#: client/cityrepdata.c:509 client/gui-gtk-2.0/repodlgs.c:654
+#: client/cityrepdata.c:507 client/gui-gtk-2.0/repodlgs.c:654
#: client/gui-sdl/mapctrl.c:1400 client/gui-win32/repodlgs.c:334
#: client/gui-xaw/menu.c:222 client/gui-xaw/repodlgs.c:644
#: client/gui-xaw/repodlgs.c:773 data/Freeciv.in:1819
msgid "Economy"
msgstr "Economia"
-#: client/cityrepdata.c:509
+#: client/cityrepdata.c:507
msgid "?gold/luxury/science:G/L/S"
msgstr "?gold/luxury/science:M/L/C"
-#: client/cityrepdata.c:510
+#: client/cityrepdata.c:508
msgid "Economy: Gold, Luxuries, Science"
msgstr "Economia: Moedas, Luxo, Ciência"
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
msgid "?Gold:G"
msgstr "?Gold:M"
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
msgid "Economy: Gold"
msgstr "Economia: Moedas"
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
msgid "?Luxury:L"
msgstr "?Luxury:L"
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
msgid "Economy: Luxury"
msgstr "Economia: Luxo"
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
msgid "?Science:S"
msgstr "?Science:C"
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
msgid "Economy: Science"
msgstr "Economia: Ciência"
-#: client/cityrepdata.c:518
+#: client/cityrepdata.c:516
#, fuzzy
msgid "?number_trade_routes:n"
msgstr "?number_trade_routes:R"
-#: client/cityrepdata.c:518
+#: client/cityrepdata.c:516
#, fuzzy
msgid "?number_trade_routes:R"
msgstr "?number_trade_routes:c"
-#: client/cityrepdata.c:519
+#: client/cityrepdata.c:517
msgid "Number of Trade Routes"
msgstr "Número de Rotas Comerciais"
-#: client/cityrepdata.c:521
+#: client/cityrepdata.c:519
msgid "?pollution [short]:Pol"
msgstr "?pollution [short]:Pol"
-#: client/cityrepdata.c:523
+#: client/cityrepdata.c:521
msgid "?cma:Governor"
msgstr ""
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
-#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
-#: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
-#: data/Freeciv.in:1459 data/helpdata.txt:820
+#: client/cityrepdata.c:521 client/gui-gtk-2.0/cityrep.c:1766
+#: client/gui-sdl/citydlg.c:3809 client/gui-sdl/cma_fe.c:858
+#: client/gui-win32/citydlg.c:726 data/Freeciv.in:1459 data/helpdata.txt:820
msgid "Citizen Governor"
msgstr ""
-#: client/cityrepdata.c:526
+#: client/cityrepdata.c:524
#, fuzzy
msgid "Turns/Buy"
msgstr "Turnos/Compra"
-#: client/cityrepdata.c:529 client/cityrepdata.c:531
+#: client/cityrepdata.c:527 client/cityrepdata.c:529
msgid "Currently Building"
msgstr "A Construir"
-#: client/cityrepdata.c:575
+#: client/cityrepdata.c:573
#, fuzzy
msgid "?specialist:S"
msgstr "?Especiais:E"
-#: client/cityrepdata.c:578
+#: client/cityrepdata.c:576
#, fuzzy
msgid "Specialists"
msgstr "Especiais"
-#: client/civclient.c:239
+#: client/civclient.c:240
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr " -a, --autoconnect\tSaltar diálogo de ligação\n"
-#: client/civclient.c:249
+#: client/civclient.c:250
#, 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:251
+#: client/civclient.c:252
msgid " -m, --meta HOST\tConnect to the metaserver at HOST\n"
msgstr " -m, --meta SERVIDOR\tLigar ao metaservidor em SERVIDOR\n"
-#: client/civclient.c:253
+#: client/civclient.c:254
msgid " -n, --name NAME\tUse NAME as name\n"
msgstr " -n, --name NOME\tUtilizar NOME como nome\n"
-#: client/civclient.c:255
+#: client/civclient.c:256
#, 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:257
+#: client/civclient.c:258
#, 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:259
+#: client/civclient.c:260
#, 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:262
+#: client/civclient.c:263
#, 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:264
+#: client/civclient.c:265
msgid " -S, --Sound FILE\tRead sound tags from FILE\n"
msgstr " -S, --Sound FICHEIRO\tLer etiquetas de som em FICHEIRO\n"
-#: client/civclient.c:265
+#: client/civclient.c:266
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:268
+#: client/civclient.c:269
#, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -7737,145 +7727,155 @@ msgstr ""
"\t\t\tTente \"%s -- --help\" para mais informações.\n"
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:273
+#: client/civclient.c:274
#, fuzzy, c-format
msgid "Report bugs at %s\n"
msgstr "Relate erros (bugs) para <%s> (em Inglês).\n"
-#: client/civclient.c:297
+#: client/civclient.c:298
#, c-format
msgid "Invalid port \"%s\" specified with --port option.\n"
msgstr ""
-#: client/civclient.c:299 client/civclient.c:314
+#: client/civclient.c:300 client/civclient.c:315
msgid "Try using --help.\n"
msgstr ""
-#: client/civclient.c:312
+#: client/civclient.c:313
#, c-format
msgid "Invalid debug level \"%s\" specified with --debug option.\n"
msgstr ""
-#: client/civclient.c:325
+#: client/civclient.c:326
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr "Opção desconhecida: \"%s\"\n"
-#: client/civclient.c:539
+#: client/civclient.c:391
+#, fuzzy, c-format
+msgid "Updating old metaserver address \"%s\"."
+msgstr "metaservidor <endereço>"
+
+#: client/civclient.c:394
+#, fuzzy, c-format
+msgid "Default metaserver has been set to \"%s\"."
+msgstr "Opção: %s foi alterada para \"%s\"."
+
+#: client/civclient.c:550
msgid "Game started."
msgstr "Jogo iniciado."
-#: client/civclient.c:577
+#: client/civclient.c:588
msgid "There was an error while auto connecting; aborting."
msgstr "Ocorreu um erro ao liga-se automaticamente; a abortar."
-#: client/climisc.c:176
+#: client/climisc.c:177
#, c-format
msgid "Changing production of every %s into %s."
msgstr "A alterar a produção de todos os %s para %s."
-#: client/climisc.c:214
+#: client/climisc.c:215
msgid "?embassy:Both"
msgstr "?embassy:Ambos"
-#: client/climisc.c:216
+#: client/climisc.c:217
msgid "?embassy:Yes"
msgstr "?embassy:Sim"
-#: client/climisc.c:219
+#: client/climisc.c:220
msgid "?embassy:With Us"
msgstr "?embassy:Connosco"
-#: client/climisc.c:222
+#: client/climisc.c:223
msgid "?embassy:Contact"
msgstr "?embassy:Contacto"
-#: client/climisc.c:224
+#: client/climisc.c:225
#, fuzzy
msgid "?embassy:No Contact"
msgstr "?embassy:Contacto"
-#: client/climisc.c:236
+#: client/climisc.c:237
msgid "?vision:Both"
msgstr "?vision:Ambos"
-#: client/climisc.c:238
+#: client/climisc.c:239
msgid "?vision:To Them"
msgstr "?vision:Para Eles"
-#: client/climisc.c:241
+#: client/climisc.c:242
msgid "?vision:To Us"
msgstr "?vision:Para Nós"
-#: client/climisc.c:257 client/climisc.c:264
+#: client/climisc.c:258 client/climisc.c:265
#, c-format
msgid "The %s give %s"
msgstr "Os %s dão %s"
-#: client/climisc.c:268
+#: client/climisc.c:269
#, c-format
msgid "The %s give unknown city."
msgstr "Os %s dão cidade desconhecida."
-#: client/climisc.c:273
+#: client/climisc.c:274
#, c-format
msgid "The %s give %d gold"
msgstr "Os %s dão %d moedas"
-#: client/climisc.c:278
+#: client/climisc.c:279
#, c-format
msgid "The %s give their worldmap"
msgstr "Os %s dão o seu mapa mundo"
-#: client/climisc.c:282
+#: client/climisc.c:283
#, c-format
msgid "The %s give their seamap"
msgstr "Os %s dão o seu mapa marÃtimo"
-#: client/climisc.c:286
+#: client/climisc.c:287
msgid "The parties agree on a cease-fire"
msgstr "As partes acordam um cessar-fogo"
-#: client/climisc.c:289
+#: client/climisc.c:290
msgid "The parties agree on a peace"
msgstr "As partes acordam paz"
-#: client/climisc.c:292
+#: client/climisc.c:293
msgid "The parties create an alliance"
msgstr "As partes forjam uma aliança"
-#: client/climisc.c:295
+#: client/climisc.c:296
#, c-format
msgid "The %s give shared vision"
msgstr "Os %s dão visão partilhada"
-#: client/climisc.c:299
+#: client/climisc.c:300
#, fuzzy, c-format
msgid "The %s give an embassy"
msgstr "Os %s dão %s"
-#: client/climisc.c:902
+#: client/climisc.c:906
msgid "Popup Request"
msgstr "Pedido Janela"
-#: client/climisc.c:932
+#: client/climisc.c:936
msgid "Exporting output window to civgame.log ..."
msgstr "A exportar janela de resultado para civgame.log ..."
-#: client/climisc.c:936
+#: client/climisc.c:940
msgid "Export complete."
msgstr "Exportação terminada."
-#: client/climisc.c:938
+#: client/climisc.c:942
msgid "Export failed, couldn't write to file."
msgstr "Exportação falhou, incapaz de escrever no ficheiro."
-#: client/climisc.c:1038
+#: client/climisc.c:1042
#, c-format
msgid "You don't buy %s in %s!"
msgstr "Você não compra %s em %s!"
-#: client/climisc.c:1056
+#: client/climisc.c:1060
#, c-format
msgid "%s costs %d gold and you only have %d gold."
msgstr "%s custa %d moedas e você apenas tem %d moedas."
@@ -7927,21 +7927,21 @@ msgstr ""
"Ligação automática ao servidor \"%s\" no porto %d como \"%s\" a cada %d.%d "
"segundo(s) por %d vezes"
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1289
+#: client/connectdlg_common.c:79 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:1289
+#: client/connectdlg_common.c:80 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:1290
+#: client/connectdlg_common.c:81 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:1290
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
msgid "hard"
msgstr "difÃcil"
@@ -7974,41 +7974,44 @@ msgstr ""
#: client/connectdlg_common.c:470
#, fuzzy
-msgid "We have control of the server (command access level hack)"
+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
-msgid "We can't take control of server, attempting to kill it."
+msgid ""
+"Failed to obtain the required access level to take control of the server. "
+"The server will now be shutdown."
msgstr ""
-#: client/control.c:1104
+#: client/control.c:1123
msgid "Only transporter units can be unloaded."
msgstr "Apenas as unidades de transporte podem ser descarregadas."
-#: client/control.c:1353
+#: client/control.c:1425
#, 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:1444
+#: client/control.c:1516
msgid "Only nuclear units can do this."
msgstr "Apenas as unidades nucleares podem fazer isso."
-#: client/control.c:1473
+#: client/control.c:1545
msgid "Only paratrooper units can do this."
msgstr "Apenas as unidades páraquedistas podem fazer isso."
-#: client/control.c:1921
+#: client/control.c:2020
msgid "Too far for this unit."
msgstr "Demasiado longe para esta unidade."
-#: client/control.c:2131 client/control.c:2161 client/control.c:2177
+#: client/control.c:2230 client/control.c:2260 client/control.c:2276
msgid "Didn't find a route to the destination!"
msgstr "Incapaz de encontrar uma rota para o destino!"
-#: client/control.c:2221
+#: client/control.c:2320
msgid "Oh my! You seem to have no capital!"
msgstr "Oh! Parece que você não tem uma capital!"
@@ -8078,17 +8081,17 @@ msgid "Allows %s (with %s)."
msgstr "Permite %s (com %s).\n"
#. TRANS: preserve single space at beginning
-#: client/helpdata.c:418
+#: client/helpdata.c:416
#, fuzzy
msgid " Rivers"
msgstr " Rios"
-#: client/helpdata.c:576
+#: client/helpdata.c:574
#, c-format
msgid "Sorry, no help topic for %s.\n"
msgstr "Desculpe, mas não existe ajuda para %s.\n"
-#: client/helpdata.c:580
+#: client/helpdata.c:578
#, c-format
msgid ""
"Sorry, no help topic for %s.\n"
@@ -8099,13 +8102,13 @@ msgstr ""
"Esta página foi gerada automaticamente.\n"
"\n"
-#: client/helpdata.c:670
+#: client/helpdata.c:668
msgid ""
"Requires: Nothing\n"
"\n"
msgstr ""
-#: client/helpdata.c:675
+#: client/helpdata.c:673
#, fuzzy, c-format
msgid "* The discovery of %s will make %s obsolete.\n"
msgstr ""
@@ -8113,209 +8116,209 @@ msgstr ""
"\n"
"A descoberta de %s tornará %s obsoleta. "
-#: client/helpdata.c:694
+#: client/helpdata.c:692
#, fuzzy, c-format
msgid "* Allows all players with knowledge of %s to build %s units.\n"
msgstr ""
"Permite a todos os jogadores com o conhecimento de %s construir a unidade %"
"s. "
-#: client/helpdata.c:706
+#: client/helpdata.c:704
#, fuzzy, c-format
msgid "* Allows %s (with %s).\n"
msgstr "Permite %s (com %s).\n"
-#: client/helpdata.c:710
+#: client/helpdata.c:708
#, fuzzy, c-format
msgid "* Allows %s.\n"
msgstr "Permite %s.\n"
-#: client/helpdata.c:780
+#: client/helpdata.c:778
#, c-format
msgid "* Can only be built if there is %s in the city.\n"
msgstr ""
-#: client/helpdata.c:786
+#: client/helpdata.c:784
#, c-format
msgid "* Can only be built with %s as government.\n"
msgstr ""
-#: client/helpdata.c:791
+#: client/helpdata.c:789
#, fuzzy
msgid "* May not be built in cities.\n"
msgstr "* Pode construir novas cidades.\n"
-#: client/helpdata.c:794
+#: client/helpdata.c:792
msgid "* Never has a home city.\n"
msgstr ""
-#: client/helpdata.c:797
+#: client/helpdata.c:795
msgid "* Losing this unit will lose you the game!\n"
msgstr ""
-#: client/helpdata.c:801
+#: client/helpdata.c:799
msgid "* Each player may only have one of this type of unit.\n"
msgstr ""
-#: client/helpdata.c:805
+#: client/helpdata.c:803
#, c-format
msgid "* Requires %d population to build.\n"
msgstr ""
-#: client/helpdata.c:811
+#: client/helpdata.c:809
#, c-format
msgid "* Can carry and refuel %d air unit.\n"
msgid_plural "* Can carry and refuel %d air units.\n"
msgstr[0] "* Pode transportar e reabastecer %d unidade aérea.\n"
msgstr[1] "* Pode transportar e reabastecer %d unidades aéreas.\n"
-#: client/helpdata.c:816
+#: client/helpdata.c:814
#, c-format
msgid "* Can carry and refuel %d missile unit.\n"
msgid_plural "* Can carry and refuel %d missile units.\n"
msgstr[0] "* Pode transportar e reabastecer %d unidade de mÃsseis.\n"
msgstr[1] "* Pode transportar e reabastecer %d unidades de mÃsseis.\n"
-#: client/helpdata.c:821
+#: client/helpdata.c:819
#, c-format
msgid "* Can carry %d ground unit across water.\n"
msgid_plural "* Can carry %d ground units across water.\n"
msgstr[0] "* Pode transportar %d unidade terrestre através do oceano.\n"
msgstr[1] "* Pode transportar %d unidades terrestres através do oceano.\n"
-#: client/helpdata.c:830
+#: client/helpdata.c:828
msgid ""
"* Can establish trade routes (must travel to target city and must be at "
"least 9 tiles [in Manhattan distance] from this unit's home city).\n"
msgstr ""
-#: client/helpdata.c:836
+#: client/helpdata.c:834
#, fuzzy, c-format
msgid "* Can help build wonders (adds %d production).\n"
msgstr "* Pode ajudar a construir maravilhas.\n"
-#: client/helpdata.c:840
+#: client/helpdata.c:838
msgid "* May not be disbanded.\n"
msgstr ""
-#: client/helpdata.c:842
+#: client/helpdata.c:840
#, c-format
msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
msgstr ""
-#: client/helpdata.c:846
+#: client/helpdata.c:844
msgid "* Can build new cities.\n"
msgstr "* Pode construir novas cidades.\n"
-#: client/helpdata.c:849
+#: client/helpdata.c:847
#, c-format
msgid "* Can add on %d population to cities of no more than size %d.\n"
msgstr ""
-#: client/helpdata.c:858
+#: client/helpdata.c:856
#, fuzzy
msgid "* Can build roads and railroads.\n"
msgstr "* Pode ajudar a construir maravilhas.\n"
-#: client/helpdata.c:859
+#: client/helpdata.c:857
#, fuzzy
msgid "* Can build mines on tiles.\n"
msgstr "* Pode construir novas cidades.\n"
-#: client/helpdata.c:860
+#: client/helpdata.c:858
#, fuzzy
msgid "* Can build irrigation on tiles.\n"
msgstr "* Pode construir novas cidades.\n"
-#: client/helpdata.c:865
+#: client/helpdata.c:863
#, fuzzy
msgid "* Can build farmland.\n"
msgstr "Construir Quinta"
-#: client/helpdata.c:869
+#: client/helpdata.c:867
#, fuzzy, c-format
msgid "* Can build farmland (if %s is known).\n"
msgstr "* Pode construir novas cidades.\n"
-#: client/helpdata.c:873
+#: client/helpdata.c:871
#, c-format
msgid "* Can build farmland (if any of the following are known: %s).\n"
msgstr ""
-#: client/helpdata.c:881
+#: client/helpdata.c:879
#, fuzzy
msgid "* Can build fortresses.\n"
msgstr "Permite aos %s construir fortalezas.\n"
-#: client/helpdata.c:885
+#: client/helpdata.c:883
#, c-format
msgid "* Can build fortresses (if %s is known).\n"
msgstr ""
-#: client/helpdata.c:889
+#: client/helpdata.c:887
#, c-format
msgid "* Can build fortresses (if any of the following are known: %s).\n"
msgstr ""
-#: client/helpdata.c:895
+#: client/helpdata.c:893
msgid "* Can clean pollution from tiles.\n"
msgstr ""
-#: client/helpdata.c:896
+#: client/helpdata.c:894
#, fuzzy
msgid "* Can clean nuclear fallout from tiles.\n"
msgstr "Limpar Radiação Nuclear"
-#: client/helpdata.c:899
+#: client/helpdata.c:897
#, fuzzy
msgid "* Can transform tiles.\n"
msgstr "* Pode efectuar acções de colonização.\n"
-#: client/helpdata.c:902
+#: client/helpdata.c:900
#, fuzzy
msgid "* Can build airbases.\n"
msgstr "* Pode construir novas cidades.\n"
-#: client/helpdata.c:906
+#: client/helpdata.c:904
#, c-format
msgid "* May fortify, granting a 50%% defensive bonus.\n"
msgstr ""
-#: client/helpdata.c:909
+#: client/helpdata.c:907
msgid "* May pillage to destroy infrastructure from tiles.\n"
msgstr ""
-#: client/helpdata.c:913
+#: client/helpdata.c:911
msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
msgstr ""
"* Pode efectuar acções diplomáticas e acções especiais de espionagem.\n"
-#: client/helpdata.c:916
+#: client/helpdata.c:914
msgid "* Can perform diplomatic actions.\n"
msgstr "* Pode efectuar acções diplomáticas.\n"
-#: client/helpdata.c:920
+#: client/helpdata.c:918
msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
msgstr ""
-#: client/helpdata.c:923
+#: client/helpdata.c:921
msgid "* May not be bribed.\n"
msgstr ""
-#: client/helpdata.c:926
+#: client/helpdata.c:924
msgid "* Can attack enemy air units.\n"
msgstr "* Pode atacar unidades aéreas inimigas.\n"
-#: client/helpdata.c:930
+#: client/helpdata.c:928
msgid "* Is invisible except when next to an enemy unit or city.\n"
msgstr "* É invisÃvel excepto quando junto a uma unidade ou cidade enimiga.\n"
-#: client/helpdata.c:934
+#: client/helpdata.c:932
msgid "* Can only attack units on ocean squares (no land attacks).\n"
msgstr ""
"* Apenas pode atacar unidades em quadrados de oceano (não ataca em terra).\n"
-#: client/helpdata.c:938
+#: client/helpdata.c:936
#, fuzzy
msgid ""
"* Can attack from aboard sea units: against enemy cities and onto land "
@@ -8324,77 +8327,77 @@ msgstr ""
"* Pode atacar a partir de unidades navais: contra cidades inimigas e contra "
"quadrados terrestres."
-#: client/helpdata.c:943
+#: client/helpdata.c:941
#, fuzzy, c-format
msgid "* Can be paradropped from a friendly city (Range: %d).\n"
msgstr "* Pode ser lançada de paraquedas de uma cidade amistosa (Alcance: %d)."
-#: client/helpdata.c:949
+#: client/helpdata.c:947
msgid "* Gets double defense against units specified as 'mounted'.\n"
msgstr ""
"* Obtém o dobro da defesa contra unidades especificadas como 'montadas'.\n"
-#: client/helpdata.c:953
+#: client/helpdata.c:951
msgid "* Counts as 'mounted' against certain defenders.\n"
msgstr "* Conta como unidade 'montada' contra certos defensores.\n"
-#: client/helpdata.c:957
+#: client/helpdata.c:955
msgid "* A missile unit: gets used up in making an attack.\n"
msgstr "* Uma unidade mÃssil: é gasta após um ataque.\n"
-#: client/helpdata.c:960
+#: client/helpdata.c:958
msgid "* Making an attack ends this unit's turn.\n"
msgstr "* Efectuar um ataque termina o turno desta unidade.\n"
-#: client/helpdata.c:964
+#: client/helpdata.c:962
msgid "* This unit's attack causes a nuclear explosion!\n"
msgstr "* O ataque desta unidade causa uma explosão nuclear!\n"
-#: client/helpdata.c:968
+#: client/helpdata.c:966
msgid "* Gets double firepower when attacking cities.\n"
msgstr ""
-#: client/helpdata.c:971
+#: client/helpdata.c:969
msgid "* Ignores the effects of city walls.\n"
msgstr "* Ignora os efeitos das muralhas.\n"
-#: client/helpdata.c:975
+#: client/helpdata.c:973
#, c-format
msgid ""
"* Does bombard attacks (%d per turn). These attacks will only damage (never "
"kill) the defender, but have no risk for the attacker.\n"
msgstr ""
-#: client/helpdata.c:982
+#: client/helpdata.c:980
msgid "* Gets quintuple defense against missiles and aircraft.\n"
msgstr "* Obtém o quÃntuplo da defesa contra mÃsseis e aeronaves.\n"
-#: client/helpdata.c:986
+#: client/helpdata.c:984
msgid "* Ignores terrain effects (treats all squares as roads).\n"
msgstr ""
"* Ignora efeitos do terreno (trata todos os quadrados como estradas).\n"
-#: client/helpdata.c:989
+#: client/helpdata.c:987
msgid "* Ignores zones of control.\n"
msgstr "* Ignora zonas de controlo.\n"
-#: client/helpdata.c:993
+#: client/helpdata.c:991
msgid "* A non-military unit (cannot attack; no martial law).\n"
msgstr "* Unidade não-militar (não pode atacar; não pode impôr lei marcial).\n"
-#: client/helpdata.c:997
+#: client/helpdata.c:995
msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
msgstr "* Unidade de campo: gera um descontente mesmo quando não-agressiva.\n"
-#: client/helpdata.c:1000
+#: client/helpdata.c:998
msgid "* Will never achieve veteran status.\n"
msgstr ""
-#: client/helpdata.c:1002
+#: client/helpdata.c:1000
msgid "* May become veteran through training or combat.\n"
msgstr ""
-#: client/helpdata.c:1008
+#: client/helpdata.c:1006
#, fuzzy, c-format
msgid ""
"* Must end turn in a city or next to land, or has a 50%% risk of being lost "
@@ -8403,12 +8406,12 @@ msgstr ""
"* Tem de terminar turno numa cidade ou próximo da costa, ou existe o risco "
"de 50%% de ser perdida no mar."
-#: client/helpdata.c:1012
+#: client/helpdata.c:1010
#, c-format
msgid "* The discovery of %s reduces the risk to 25%%.\n"
msgstr ""
-#: client/helpdata.c:1017
+#: client/helpdata.c:1015
#, c-format
msgid "* %s reduces the risk to 12%%.\n"
msgstr ""
@@ -8417,27 +8420,27 @@ msgstr ""
#. * last two elements
#. TRANS: List of possible output types has this between
#. * last two elements
-#: client/helpdata.c:1068 client/helpdata.c:1402
+#: client/helpdata.c:1066 client/helpdata.c:1400
msgid " or "
msgstr " ou "
-#: client/helpdata.c:1070 client/helpdata.c:1390
+#: client/helpdata.c:1068 client/helpdata.c:1388
msgid "?or:, "
msgstr "?or:, "
-#: client/helpdata.c:1082
+#: 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"
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:1124
+#: client/helpdata.c:1122
#, 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:1129
+#: client/helpdata.c:1127
#, c-format
msgid ""
"To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8446,91 +8449,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:1137
+#: client/helpdata.c:1135
msgid "You cannot research this technology."
msgstr ""
-#: client/helpdata.c:1141
+#: client/helpdata.c:1139
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:1153
+#: client/helpdata.c:1151
#, 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:1158
+#: client/helpdata.c:1156
#, c-format
msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
msgstr ""
-#: client/helpdata.c:1161
+#: client/helpdata.c:1159
#, c-format
msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
msgstr ""
-#: client/helpdata.c:1165
+#: client/helpdata.c:1163
#, fuzzy
msgid "* Increases the pollution generated by the population.\n"
msgstr "Aumenta a poluição gerada pela população.\n"
-#: client/helpdata.c:1170
+#: client/helpdata.c:1168
#, 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:1177
+#: client/helpdata.c:1175
#, fuzzy, c-format
msgid "* Allows %s to build fortresses.\n"
msgstr "Permite aos %s construir fortalezas.\n"
-#: client/helpdata.c:1185
+#: client/helpdata.c:1183
#, fuzzy, c-format
msgid "* Allows %s to build airbases.\n"
msgstr "Permite aos %s construir bases aéreas.\n"
-#: client/helpdata.c:1194
+#: client/helpdata.c:1192
#, 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:1202
+#: client/helpdata.c:1200
#, 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:1236
+#: client/helpdata.c:1234
msgid "* Pollution cannot be generated on this terrain."
msgstr ""
-#: client/helpdata.c:1241
+#: client/helpdata.c:1239
#, fuzzy
msgid "* You cannot build cities on this terrain."
msgstr "Você não pode subornar uma unidade desta nação."
-#: client/helpdata.c:1247
+#: client/helpdata.c:1245
msgid "* The coastline of this terrain is unsafe."
msgstr ""
-#: client/helpdata.c:1252
+#: client/helpdata.c:1250
msgid "* This terrain is unsafe for units to travel on."
msgstr ""
-#: client/helpdata.c:1257
+#: client/helpdata.c:1255
msgid "* Land units cannot travel on oceanic terrains."
msgstr ""
-#: client/helpdata.c:1307
+#: client/helpdata.c:1305
msgid "Features:\n"
msgstr ""
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1413 client/helpdata.c:1414
+#: client/helpdata.c:1411 client/helpdata.c:1412
msgid "?outputlist: Nothing "
msgstr ""
-#: client/helpdata.c:1421
+#: client/helpdata.c:1419
#, fuzzy, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
@@ -8541,7 +8544,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:1431
+#: client/helpdata.c:1429
#, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8549,48 +8552,48 @@ msgid ""
msgstr ""
#. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1439
+#: client/helpdata.c:1437
#, c-format
msgid "* You pay %d times normal %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1444
+#: client/helpdata.c:1442
#, 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:1449
+#: client/helpdata.c:1447
#, c-format
msgid "* You pay no %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1453
+#: client/helpdata.c:1451
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:1462
+#: client/helpdata.c:1460
#, 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:1470
+#: client/helpdata.c:1468
#, c-format
msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
msgstr ""
-#: client/helpdata.c:1477
+#: client/helpdata.c:1475
#, 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:1484
+#: client/helpdata.c:1482
#, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -8598,23 +8601,23 @@ msgid ""
msgstr ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1491
+#: client/helpdata.c:1489
#, 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:1499
+#: client/helpdata.c:1497
#, c-format
msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
msgstr ""
-#: client/helpdata.c:1504
+#: client/helpdata.c:1502
msgid "Has unlimited science/gold/luxuries rates.\n"
msgstr ""
-#: client/helpdata.c:1509
+#: client/helpdata.c:1507
#, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
@@ -8625,7 +8628,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:1521
+#: client/helpdata.c:1519
#, 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"
@@ -8633,64 +8636,64 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1532
+#: client/helpdata.c:1530
#, 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:1538
+#: client/helpdata.c:1536
#, fuzzy
msgid "* Your units cannot be bribed.\n"
msgstr "Este tipo de unidade não pode ser lançada de paraquedas."
-#: client/helpdata.c:1541
+#: client/helpdata.c:1539
#, fuzzy
msgid "* Your cities cannot be incited.\n"
msgstr "Cidade não pode ser incitada!"
-#: client/helpdata.c:1545
+#: client/helpdata.c:1543
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:1551
+#: client/helpdata.c:1549
msgid "* Has a senate that may prevent declaration of war.\n"
msgstr ""
-#: client/helpdata.c:1555
+#: client/helpdata.c:1553
msgid "* Allows partisans when cities are taken by the enemy.\n"
msgstr ""
-#: client/helpdata.c:1559
+#: client/helpdata.c:1557
msgid ""
"* Buildings that normally confer bonuses against unhappiness will instead "
"give gold.\n"
msgstr ""
-#: client/helpdata.c:1563
+#: client/helpdata.c:1561
msgid "* Pays no upkeep for fanatics.\n"
msgstr ""
-#: client/helpdata.c:1566
+#: client/helpdata.c:1564
#, fuzzy
msgid "* Has no unhappy citizens.\n"
msgstr "%d cidadãos descontentes adicionais."
-#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
+#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
#, c-format
msgid "* Veteran %s units.\n"
msgstr ""
-#: client/helpdata.c:1587
+#: client/helpdata.c:1585
#, fuzzy
msgid "* Veteran units.\n"
msgstr "Unidades marÃtimas"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1593
+#: client/helpdata.c:1591
#, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8698,7 +8701,7 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1602
+#: client/helpdata.c:1600
#, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8706,463 +8709,510 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1610
+#: client/helpdata.c:1608
#, 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:1619
+#: client/helpdata.c:1617
#, c-format
msgid "* %s production is increased %d%%.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1627
+#: client/helpdata.c:1625
#, c-format
msgid "* %s production will suffer massive waste.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1632
+#: client/helpdata.c:1630
#, c-format
msgid "* %s production will suffer some waste.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1637
+#: client/helpdata.c:1635
#, 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:1645
+#: client/helpdata.c:1643
#, 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:1651
+#: client/helpdata.c:1649
#, 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:1657
+#: client/helpdata.c:1655
#, c-format
msgid "* %s waste will increase slowly with distance from capital.\n"
msgstr ""
-#: client/helpdata.c:1674
+#: client/helpdata.c:1672
#, 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:1701
+#: client/helpdata.c:1699
#, fuzzy, c-format
msgid "%s%d %s"
msgstr "%3d/%3d %s"
-#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1700 client/helpdata.c:1708 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:1709
+#: client/helpdata.c:1707
#, c-format
msgid "%s%d unhappy"
msgstr "%s%d descontente(es)"
-#: client/mapctrl_common.c:382
+#: client/mapctrl_common.c:399
#, fuzzy, c-format
msgid "You don't know how to build %s!"
msgstr "Você não compra %s!"
-#: client/mapctrl_common.c:392
+#: client/mapctrl_common.c:409
#, c-format
msgid "Copy %s to clipboard."
msgstr ""
-#: client/mapctrl_common.c:408
+#: client/mapctrl_common.c:425
msgid "Clipboard is empty."
msgstr ""
-#: client/options.c:98
+#: client/options.c:102
#, fuzzy
msgid "Graphics"
msgstr "EstatÃsticas"
-#: client/options.c:99
+#: client/options.c:103
#, fuzzy
msgid "Overview"
msgstr "Supervisão"
-#: client/options.c:100
+#: client/options.c:104
#, fuzzy
msgid "Sound"
msgstr "Turnos"
-#: client/options.c:101
+#: client/options.c:105
msgid "Interface"
msgstr ""
-#: client/options.c:102
+#: client/options.c:106
msgid "Network"
msgstr ""
-#: client/options.c:107
+#: client/options.c:111
#, fuzzy
msgid "Login name"
msgstr "Juntar-se a Jogo"
-#: client/options.c:108
+#: client/options.c:112
msgid ""
"This is the default login username that will be used in the connection "
"dialogs or with the -a command-line parameter."
msgstr ""
-#: client/options.c:113
+#: client/options.c:117
#, fuzzy
msgid "Server"
msgstr "nunca"
-#: client/options.c:114
+#: client/options.c:118
msgid ""
"This is the default server hostname that will be used in the connection "
"dialogs or with the -a command-line parameter."
msgstr ""
-#: client/options.c:119
+#: client/options.c:123
#, fuzzy
msgid "Server port"
msgstr "(linha de comando do servidor)"
-#: client/options.c:120
+#: client/options.c:124
msgid ""
"This is the default server port that will be used in the connection dialogs "
"or with the -a command-line parameter."
msgstr ""
-#: client/options.c:125 client/gui-win32/connectdlg.c:912 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
msgid "Metaserver"
msgstr "Metaservidor"
-#: client/options.c:126
+#: client/options.c:130
msgid ""
"The metaserver is a host that the client contacts to find out about games on "
"the internet. Don't change this from its default value unless you know what "
"you're doing."
msgstr ""
-#: client/options.c:132
+#: client/options.c:136
#, fuzzy
msgid "Soundset"
msgstr "Turnos"
-#: client/options.c:133
+#: client/options.c:137
msgid ""
"This is the soundset that will be used. Changing this is the same as using "
"the -S command-line parameter."
msgstr ""
-#: client/options.c:138
+#: client/options.c:142
#, fuzzy
msgid "Sound plugin"
msgstr "Plugin de som por omissão"
-#: client/options.c:139
+#: client/options.c:143
msgid ""
"If you have a problem with sound, try changing the sound plugin. The new "
"plugin won't take effect until you restart Freeciv. Changing this is the "
"same as using the -P command-line option."
msgstr ""
-#: client/options.c:144 client/gui-sdl/gui_main.c:162
+#: client/options.c:148 client/gui-sdl/gui_main.c:162
#, fuzzy
msgid "Theme"
msgstr "Templo"
-#: client/options.c:145
+#: client/options.c:149
msgid "By changing this option you change the active theme."
msgstr ""
-#: client/options.c:148
+#: client/options.c:152
#, fuzzy
msgid "Tileset"
msgstr "Terreno %s"
-#: client/options.c:149
+#: client/options.c:153
msgid ""
"By changing this option you change the active tileset. This is the same as "
"using the -t command-line parameter."
msgstr ""
-#: client/options.c:156
+#: client/options.c:160
msgid "Solid unit background color"
msgstr "Cor de fundo sólido de unidade"
-#: client/options.c:157
+#: client/options.c:161
msgid ""
"Setting this option will cause units on the map view to be drawn with a "
"solid background color instead of the flag backdrop."
msgstr ""
-#: client/options.c:161 client/gui-sdl/optiondlg.c:960
+#: client/options.c:165 client/gui-sdl/optiondlg.c:960
msgid "Sound bell at new turn"
msgstr "Campainha no inÃcio de turno"
-#: client/options.c:162
+#: client/options.c:166
msgid ""
"Set this option to have a \"bell\" event be generated at the start of a new "
"turn. You can control the behavior of the \"bell\" event by editing the "
"message options."
msgstr ""
-#: client/options.c:168
+#: client/options.c:172
msgid "Unit movement animation time (milliseconds)"
msgstr ""
-#: client/options.c:169
+#: client/options.c:173
msgid ""
"This option controls how long unit \"animation\" takes when a unit moves on "
"the map view. Set it to 0 to disable animation entirely."
msgstr ""
-#: client/options.c:174
+#: client/options.c:178
msgid "Mapview recentering time (milliseconds)"
msgstr ""
-#: client/options.c:175
+#: client/options.c:179
msgid ""
"When the map view is recentered, it will slide smoothly over the map to its "
"new position. This option controls how long this slide lasts. Set it to 0 "
"to disable mapview sliding entirely."
msgstr ""
-#: client/options.c:180 client/gui-sdl/optiondlg.c:1014
+#: client/options.c:184 client/gui-sdl/optiondlg.c:1014
msgid "Show combat animation"
msgstr "Mostrar animação de combate"
-#: client/options.c:181
+#: client/options.c:185
msgid ""
"Disabling this option will turn off combat animation between units on the "
"mapview."
msgstr ""
-#: client/options.c:184
+#: client/options.c:188
msgid "Draw the citybar"
msgstr ""
-#: client/options.c:185
+#: client/options.c:189
msgid ""
"Setting this option will display a 'citybar' containing useful information "
"beneath each city. Disabling this option will display only the city's name "
"and optionally, production."
msgstr ""
-#: client/options.c:191
+#: client/options.c:195
msgid "Show icons in the technology tree"
msgstr ""
-#: client/options.c:192
+#: client/options.c:196
msgid ""
"Setting this option will display icons on the technology tree diagram. "
"Turning this option off makes the technology tree more compact."
msgstr ""
-#: client/options.c:197
+#: client/options.c:201
msgid "Draw shield graphics for units"
msgstr ""
-#: client/options.c:198
+#: client/options.c:202
msgid ""
"Setting this option will draw a shield icon as the flags on units. If "
"unset, the full flag will be drawn."
msgstr ""
-#: client/options.c:202
+#: client/options.c:206
msgid "Manual Turn Done in AI Mode"
msgstr "Turno Terminado manual em Modo IA"
-#: client/options.c:203
+#: client/options.c:207
msgid ""
"Disable this option if you do not want to press the Turn Done button "
"manually when watching an AI player."
msgstr ""
-#: client/options.c:207 client/gui-sdl/optiondlg.c:1121
+#: client/options.c:211 client/gui-sdl/optiondlg.c:1121
msgid "Auto Center on Units"
msgstr "Auto-Centrar às Unidades"
-#: client/options.c:208
+#: client/options.c:212
msgid ""
"Set this option to have the active unit centered automatically when the unit "
"focus changes."
msgstr ""
-#: client/options.c:211 client/gui-sdl/optiondlg.c:1147
+#: client/options.c:215 client/gui-sdl/optiondlg.c:1147
msgid "Auto Center on Combat"
msgstr "Auto-Centrar no Combate"
-#: client/options.c:212
+#: client/options.c:216
msgid ""
"Set this option to have any combat be centered automatically. Disabled this "
"will speed up the time between turns but may cause you to miss combat "
"entirely."
msgstr ""
-#: client/options.c:217 client/gui-sdl/optiondlg.c:1174
+#: client/options.c:221 client/gui-sdl/optiondlg.c:1174
msgid "Focus on Awakened Units"
msgstr "Focar Unidades Acordadas"
-#: client/options.c:218
+#: client/options.c:222
msgid "Set this option to have newly awoken units be focused automatically."
msgstr ""
-#: client/options.c:221
+#: client/options.c:225
msgid "Allow goto into the unknown"
msgstr ""
-#: client/options.c:222
+#: client/options.c:226
msgid ""
"Setting this option will make the game consider moving into unknown tiles. "
"If not, then goto routes will detour around or be blocked by unknown tiles."
msgstr ""
-#: client/options.c:226
+#: client/options.c:230
msgid "Center map when Popup city"
msgstr "Centrar mapa ao Gerir cidade"
-#: client/options.c:227
+#: client/options.c:231
msgid ""
"Setting this option makes the mapview center on a city when its city dialog "
"is popped up."
msgstr ""
-#: client/options.c:230
+#: client/options.c:234
msgid "Concise City Production"
msgstr "Produção de Cidade Concisa"
-#: client/options.c:231
+#: client/options.c:235
msgid ""
"Set this option to make the city production (as shown in the city dialog) to "
"be more compact."
msgstr ""
-#: client/options.c:234 client/gui-sdl/optiondlg.c:1252
+#: client/options.c:238 client/gui-sdl/optiondlg.c:1252
msgid "End Turn when done moving"
msgstr "Terminar Turno ao finalizar movimentos"
-#: client/options.c:235
+#: client/options.c:239
msgid ""
"Setting this option makes your turn end automatically when all your units "
"are done moving."
msgstr ""
-#: client/options.c:238 client/gui-sdl/optiondlg.c:1226
+#: client/options.c:242 client/gui-sdl/optiondlg.c:1226
msgid "Prompt for city names"
msgstr "Perguntar nomes de cidades"
-#: client/options.c:239
+#: client/options.c:243
msgid ""
"Disabling this option will make the names of newly founded cities chosen "
"automatically by the server."
msgstr ""
-#: client/options.c:242 client/gui-sdl/optiondlg.c:1200
+#: client/options.c:246 client/gui-sdl/optiondlg.c:1200
msgid "Pop up city dialog for new cities"
msgstr "Mostrar janela de cidade para novas cidades"
-#: client/options.c:243
+#: client/options.c:247
msgid ""
"Setting this option will pop up a newly-founded city's city dialog "
"automatically."
msgstr ""
-#: client/options.c:248
+#: client/options.c:250
+#, fuzzy
+msgid "Pop up caravan actions"
+msgstr "Caravana"
+
+#: client/options.c:251
+msgid ""
+"If this option is enabled, when caravans arrive at a city where they can "
+"establish a traderoute or help build a wonder, a window will popup asking "
+"which action should be performed. Disabling this option means you will have "
+"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 ""
+
+#: client/options.c:260
+msgid "Enable cursor changing"
+msgstr ""
+
+#: client/options.c:261
+msgid ""
+"This option controls whether the client should try to change the mouse "
+"cursor depending on what is being pointed at, as well as to indicate changes "
+"in the client or server state."
+msgstr ""
+
+#: client/options.c:266
+msgid "Select cities before units"
+msgstr ""
+
+#: 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 ""
+
+#: client/options.c:272
+msgid "Clear unit orders on selection"
+msgstr ""
+
+#: client/options.c:273
+msgid ""
+"Enabling this option will cause unit orders to be cleared whenever one or "
+"more units are selected. If this option is disabled, selecting units will "
+"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 ""
+
+#: client/options.c:282
msgid "Background layer"
msgstr ""
-#: client/options.c:249
+#: client/options.c:283
msgid "The background layer of the overview shows just ocean and land."
msgstr ""
-#: client/options.c:252
+#: client/options.c:286
msgid "Terrain relief map layer"
msgstr ""
-#: client/options.c:253
+#: client/options.c:287
msgid "The relief layer shows all terrains on the map."
msgstr ""
-#: client/options.c:256
+#: client/options.c:290
#, fuzzy
msgid "Borders layer"
msgstr "Bóer"
-#: client/options.c:257
+#: client/options.c:291
msgid ""
"The borders layer of the overview shows which tiles are owned by each player."
msgstr ""
-#: client/options.c:261
+#: client/options.c:295
#, fuzzy
msgid "Units layer"
msgstr "Página unidades"
-#: client/options.c:262
+#: client/options.c:296
#, fuzzy
msgid "Enabling this will draw units on the overview."
msgstr ""
"Se activo, os nomes das cidades serão determinados baseados no terreno "
"circundante."
-#: client/options.c:265
+#: client/options.c:299
#, fuzzy
msgid "Cities layer"
msgstr "Cidades"
-#: client/options.c:266
+#: client/options.c:300
#, fuzzy
msgid "Enabling this will draw cities on the overview."
msgstr ""
"Se activo, os nomes das cidades serão determinados baseados no terreno "
"circundante."
-#: client/options.c:269
+#: client/options.c:303
#, fuzzy
msgid "Overview fog of war"
msgstr "Página de supervisão"
-#: client/options.c:270
+#: client/options.c:304
#, fuzzy
msgid "Enabling this will show fog of war on the overview."
msgstr ""
"Se activo, os nomes das cidades serão determinados baseados no terreno "
"circundante."
-#: client/options.c:488
+#: client/options.c:526
msgid "If you add a preset by hand, also update \"number_of_presets\""
msgstr ""
"Se adicionar uma pré-definição manualmente, actualize também "
"\"number_of_presets\""
-#: client/options.c:516
+#: client/options.c:554
msgid "Cannot find your home directory"
msgstr "Incapaz de encontrar o seu directório pessoal (home)"
-#: client/options.c:665 client/options.c:796
+#: client/options.c:703 client/options.c:834
msgid "Save failed, cannot find a filename."
msgstr "Gravação falhou, incapaz de encontrar um nome de ficheiro."
-#: client/options.c:678 client/options.c:859
+#: client/options.c:716 client/options.c:897
#, c-format
msgid "Save failed, cannot write to file %s"
msgstr "Gravação falhou, incapaz de escrever no ficheiro %s"
-#: client/options.c:680 client/options.c:862
+#: client/options.c:718 client/options.c:900
#, c-format
msgid "Saved settings to file %s"
msgstr "Configurações gravadas para o ficheiro %s"
@@ -9187,16 +9237,16 @@ msgstr "Expressão de funcionalidade do servidor: %s"
msgid "Start of turn %d"
msgstr "InÃcio do turno %d"
-#: client/packhand.c:1590
+#: client/packhand.c:1591
#, c-format
msgid "AI Mode is now %s."
msgstr "Modo IA é agora %s."
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "ON"
msgstr "ACTIVO"
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "OFF"
msgstr "INACTIVO"
@@ -9231,14 +9281,15 @@ msgid "Username"
msgstr "Renomear"
#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
-#: client/gui-gtk-2.0/pages.c:2085
+#: client/gui-gtk-2.0/pages.c:2157
msgid "Flag"
msgstr "Bandeira"
#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
-#: client/gui-gtk-2.0/pages.c:1536 client/gui-gtk-2.0/pages.c:2087
-#: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
-#: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
+#: 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/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr "Nação"
@@ -9252,7 +9303,7 @@ msgstr "Bóer"
msgid "Score"
msgstr "Obter Pontuação"
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
msgid "Team"
msgstr "Equipa"
@@ -9327,286 +9378,308 @@ msgstr "Nenhum %s pode ser vendido"
msgid "Could not open temp file."
msgstr "Incapaz de abrir \"%s\"."
-#: client/servers.c:407
+#: client/servers.c:410
#, fuzzy
msgid "Invalid $http_proxy or metaserver value, must start with 'http://'"
msgstr "Valor $http_proxy inválido, tem de começar com 'http://'"
-#: client/servers.c:413
+#: client/servers.c:416
#, fuzzy
msgid "Failed looking up metaserver's host"
msgstr "Falha ao procurar servidor"
-#: client/text.c:85 client/text.c:86 client/text.c:91
+#. TRANS: "AI <player name>"
+#: client/text.c:94
+#, c-format
+msgid "AI %s"
+msgstr ""
+
+#. TRANS: "<nation adjective>, team <team name>"
+#: client/text.c:118
+#, fuzzy, c-format
+msgid "%s, team %s"
+msgstr " próximo de %s"
+
+#: client/text.c:135 client/text.c:136 client/text.c:141
#: client/gui-sdl/mapview.c:752
#, fuzzy
msgid "?nation:Neutral"
msgstr "?duration:excedida"
-#: client/text.c:85 client/gui-sdl/mapview.c:752
+#: client/text.c:135 client/gui-sdl/mapview.c:752
msgid "?nation:Hostile"
msgstr ""
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Peaceful"
msgstr ""
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Friendly"
msgstr ""
-#: client/text.c:88 client/gui-sdl/mapview.c:755
+#: client/text.c:138 client/gui-sdl/mapview.c:755
msgid "?nation:Mysterious"
msgstr ""
-#: client/text.c:88
+#: client/text.c:138
msgid "?nation:Friendly(team)"
msgstr ""
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
#, fuzzy
msgid "?city:Neutral"
msgstr "?city:Nome"
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
#, fuzzy
msgid "?city:Hostile"
msgstr "?city:Nome"
-#: client/text.c:92 client/gui-sdl/mapview.c:786
+#: client/text.c:142 client/gui-sdl/mapview.c:786
#, fuzzy
msgid "?city:Peaceful"
msgstr "?city_state:Paz"
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Friendly"
msgstr ""
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Mysterious"
msgstr ""
-#: client/text.c:93
+#: client/text.c:143
msgid "?city:Friendly(team)"
msgstr ""
-#: client/text.c:100
+#: client/text.c:151
#, c-format
msgid "Location: (%d, %d) [%d]"
msgstr "Localização: (%d, %d) [%d]"
-#: client/text.c:109
+#: client/text.c:153
+#, fuzzy, c-format
+msgid "Native coordinates: (%d, %d)"
+msgstr "Localização: (%d, %d)"
+
+#: client/text.c:160
#, c-format
msgid "Terrain: %s"
msgstr "Terreno: %s"
-#: client/text.c:110
+#: client/text.c:161
#, c-format
msgid "Food/Prod/Trade: %s"
msgstr "Comida/Prod/Comério: %s"
-#: client/text.c:113
+#: client/text.c:164
msgid "Minor Tribe Village"
msgstr "Aldeia de Tribo Menor"
-#: client/text.c:119
+#: client/text.c:173
#, fuzzy
msgid "Our territory"
msgstr "O %s dos"
-#. TRANS: "Polish territory"
-#: client/text.c:122
+#. TRANS: "Territory of <username> (<nation + team>)"
+#: client/text.c:176
#, fuzzy, c-format
-msgid "%s territory"
-msgstr "O %s dos"
+msgid "Territory of %s (%s)"
+msgstr "O %s dos %s"
-#. TRANS: "Polish territory (5 turn cease-fire)"
-#: client/text.c:131
+#: client/text.c:186
#, fuzzy, c-format
-msgid "%s territory (%d turn cease-fire)"
-msgid_plural "%s territory (%d turn cease-fire)"
+msgid "Territory of %s (%s) (%d turn cease-fire)"
+msgid_plural "Territory of %s (%s) (%d turn cease-fire)"
msgstr[0] "Unidade: %s(%s%s)"
msgstr[1] "Unidade: %s(%s%s)"
-#. TRANS: "Polish territory (friendly)"
-#: client/text.c:140
+#. TRANS: "Territory of <username>
+#. * (<nation + team> | <diplomatic state>)"
+#: client/text.c:195
#, fuzzy, c-format
-msgid "%s territory (%s)"
+msgid "Territory of %s (%s | %s)"
msgstr "O %s dos %s"
-#: client/text.c:145
+#: client/text.c:200
msgid "Unclaimed territory"
msgstr ""
-#. TRANS: "City: Warsaw (Polish)"
-#: client/text.c:156
+#. TRANS: "City: <city name> | <username> (<nation + team>)"
+#: client/text.c:214
#, fuzzy, c-format
-msgid "City: %s (%s)"
-msgstr "Cidade: %s(%s)"
+msgid "City: %s | %s (%s)"
+msgstr "Cidade: %s(%s) %s"
-#. TRANS: "City: Warsaw (Polish, 5 turn cease-fire)"
-#: client/text.c:166
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <number> turn cease-fire)"
+#: client/text.c:224
#, fuzzy, c-format
-msgid "City: %s (%s, %d turn cease-fire)"
-msgid_plural "City: %s (%s, %d turn cease-fire)"
+msgid "City: %s | %s (%s, %d turn cease-fire)"
+msgid_plural "City: %s | %s (%s, %d turn cease-fire)"
msgstr[0] "Unidade: %s(%s%s)"
msgstr[1] "Unidade: %s(%s%s)"
-#. TRANS: "City: Warsaw (Polish,friendly)"
-#: client/text.c:174
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <diplomatic state>)"
+#: client/text.c:231
#, fuzzy, c-format
-msgid "City: %s (%s, %s)"
+msgid "City: %s | %s (%s, %s)"
msgstr "Cidade: %s(%s) %s"
#. TRANS: previous lines gave other information about the city.
-#: client/text.c:189
+#: client/text.c:246
#, fuzzy, c-format
msgid "?clistbegin: with %s"
msgstr " com %s"
#. TRANS: "Trade from Warsaw: 5"
-#: client/text.c:202
+#: client/text.c:259
#, fuzzy, c-format
msgid "Trade from %s: %d"
msgstr "longe de %s"
-#: client/text.c:210
+#: client/text.c:267
#, fuzzy, c-format
msgid "Infrastructure: %s"
msgstr "Infra-estrutura: "
-#: client/text.c:215
+#: client/text.c:272
#, fuzzy, c-format
msgid "Activity: %s"
msgstr "Actividade: "
-#. TRANS: "Unit: Musketeers (Polish, Warsaw)"
-#. TRANS: "Unit: Musketeers (Polish,friendly)"
-#: client/text.c:226 client/text.c:253
+#. TRANS: "Unit: <unit type> | <username>
+#. * (<nation + team>, <homecity>)"
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <diplomatic state>)"
+#: client/text.c:287 client/text.c:313
#, fuzzy, c-format
-msgid "Unit: %s (%s, %s)"
+msgid "Unit: %s | %s (%s, %s)"
msgstr "Unidade: %s(%s%s)"
-#. TRANS: "Unit: Musketeers (Polish)"
-#: client/text.c:232
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>)"
+#: client/text.c:292
#, fuzzy, c-format
-msgid "Unit: %s (%s)"
-msgstr "Unidade: %s(%s)"
+msgid "Unit: %s | %s (%s)"
+msgstr "Unidade: %s(%s%s)"
-#. TRANS: "Unit: Musketeers (Polish, 5 turn cease-fire)"
-#: client/text.c:245
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <number> turn cease-fire)"
+#: client/text.c:305
#, fuzzy, c-format
-msgid "Unit: %s (%s, %d turn cease-fire)"
-msgid_plural "Unit: %s (%s, %d turn cease-fire)"
+msgid "Unit: %s | %s (%s, %d turn cease-fire)"
+msgid_plural "Unit: %s | %s (%s, %d turn cease-fire)"
msgstr[0] "Unidade: %s(%s%s)"
msgstr[1] "Unidade: %s(%s%s)"
#. TRANS: "Chance to win: A:95% D:46%"
-#: client/text.c:279
+#: client/text.c:338
#, c-format
msgid "Chance to win: A:%d%% D:%d%%"
msgstr "Probabilidade de vitória: A:%d%% D:%d%%"
#. TRANS: A is attack power, D is defense power, FP is firepower,
#. * HP is hitpoints (current and max).
-#: client/text.c:286
+#: client/text.c:345
#, fuzzy, c-format
msgid "A:%d D:%d FP:%d HP:%d/%d (%s)"
msgstr "A:%d D:%d PF:%d R:%d/%d%s%s"
#. TRANS: "5 more" units on this tile
-#: client/text.c:295
+#: client/text.c:354
#, c-format
msgid " (%d more)"
msgstr " (mais %d)"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:364
+#: client/text.c:423
#, c-format
msgid "far from %s"
msgstr "longe de %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:367
+#: client/text.c:426
#, c-format
msgid "near %s"
msgstr "próximo de %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:370
+#: client/text.c:429
#, c-format
msgid "in %s"
msgstr "em %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:403
+#: client/text.c:462
#, c-format
msgid "from %s"
msgstr "de %s"
-#: client/text.c:466
+#: client/text.c:525
#, fuzzy
msgid "Progress: no research"
msgstr "Pontuações Progresso:"
-#: client/text.c:470
+#: client/text.c:529
#, fuzzy
msgid "Progress: no research target"
msgstr "Pontuações Progresso:"
-#: client/text.c:475
+#: client/text.c:534
#, fuzzy, c-format
msgid "Progress: %d turn/advance"
msgid_plural "Progress: %d turns/advance"
msgstr[0] "Vel. investigação: %d turno/avanço"
msgstr[1] "Vel. investigação: %d turnos/avanço"
-#: client/text.c:480
+#: client/text.c:539
#, fuzzy, c-format
msgid "%d bulb/turn"
msgid_plural "%d bulbs/turn"
msgstr[0] "%d turno"
msgstr[1] "%d turnos"
-#: client/text.c:485
+#: client/text.c:544
#, c-format
msgid ", %d bulb/turn from team"
msgid_plural ", %d bulbs/turn from team"
msgstr[0] ""
msgstr[1] ""
-#: client/text.c:512
+#: client/text.c:571
#, fuzzy, c-format
msgid "%d/- (never)"
msgstr "(Nunca)"
-#: client/text.c:524
+#: client/text.c:583
#, fuzzy, c-format
msgid "%d/%d (%d turn)"
msgid_plural "%d/%d (%d turns)"
msgstr[0] "%d/%d %d turnos"
msgstr[1] "%d/%d %d turnos"
-#: client/text.c:527
+#: client/text.c:586
#, fuzzy, c-format
msgid "%d/%d (never)"
msgstr "(Nunca)"
-#: client/text.c:564
+#: client/text.c:623
#, fuzzy, c-format
msgid "%d step"
msgid_plural "%d steps"
msgstr[0] "(%d passo)"
msgstr[1] "(%d passos)"
-#: client/text.c:566
+#: client/text.c:625
#, c-format
msgid "%d bulb"
msgid_plural "%d bulbs"
msgstr[0] ""
msgstr[1] ""
-#: client/text.c:570 client/agents/cma_fec.c:269 client/agents/cma_fec.c:313
+#: 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
#, c-format
msgid "%d turn"
@@ -9614,89 +9687,89 @@ msgid_plural "%d turns"
msgstr[0] "%d turno"
msgstr[1] "%d turnos"
-#: client/text.c:592
+#: client/text.c:651
#, c-format
msgid "Population: %s"
msgstr "População: %s"
-#: client/text.c:595
+#: client/text.c:654
#, fuzzy, c-format
msgid "Year: %s (T%d)"
msgstr "Ano: %s"
-#: client/text.c:598
+#: client/text.c:657
#, fuzzy, c-format
msgid "Gold: %d (%+d)"
msgstr "Moedas: %d"
-#: client/text.c:600
+#: client/text.c:659
#, fuzzy, c-format
msgid "Tax: %d Lux: %d Sci: %d"
msgstr "Impos:%d Luxo:%d Ciên:%d"
-#: client/text.c:607
+#: client/text.c:666
#, fuzzy
msgid "Moving: Nobody"
msgstr "em %s"
-#: client/text.c:609
+#: client/text.c:668
#, fuzzy, c-format
msgid "Moving: %s"
msgstr "em %s"
-#: client/text.c:613
+#: client/text.c:672
msgid "(Click for more info)"
msgstr ""
-#: client/text.c:629
+#: client/text.c:688
#, fuzzy, c-format
msgid "%s People"
msgstr "%s Bem vindo"
-#: client/text.c:633
+#: client/text.c:692
#, fuzzy, c-format
msgid "Turn: %d"
msgstr "Terreno: %s"
-#: client/text.c:635 client/gui-win32/inteldlg.c:111
+#: client/text.c:694 client/gui-win32/inteldlg.c:111
#: client/gui-xaw/inteldlg.c:208
#, c-format
msgid "Gold: %d"
msgstr "Moedas: %d"
-#: client/text.c:636
+#: client/text.c:695
#, c-format
msgid "Net Income: %d"
msgstr ""
#. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:639
+#: client/text.c:698
#, fuzzy, c-format
msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
msgstr "Impos:%d Luxo:%d Ciên:%d"
-#: client/text.c:643
+#: client/text.c:702
#, fuzzy, c-format
msgid "Researching %s: %s"
msgstr "A Pesquisar %s: %d/%d"
-#: client/text.c:650
+#: client/text.c:709
#, c-format
msgid "Global warming chance: %d%% (%+d%%/turn)"
msgstr ""
-#: client/text.c:653
+#: client/text.c:712
#, c-format
msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
msgstr ""
-#: client/text.c:658 client/gui-win32/inteldlg.c:104
+#: client/text.c:717 client/gui-win32/inteldlg.c:104
#: client/gui-xaw/inteldlg.c:200
#, c-format
msgid "Government: %s"
msgstr "Governo: %s"
-#: client/text.c:682
+#: client/text.c:741
#, fuzzy, c-format
msgid "%d unit"
msgid_plural "%d units"
@@ -9704,58 +9777,58 @@ msgstr[0] " unidade"
msgstr[1] " unidade"
#. TRANS: Impossible to reach goto target tile
-#: client/text.c:715 client/gui-sdl/mapview.c:566
+#: client/text.c:774 client/gui-sdl/mapview.c:566
msgid "?goto:Unreachable"
msgstr ""
-#: client/text.c:717 client/gui-sdl/mapview.c:568
+#: client/text.c:776 client/gui-sdl/mapview.c:568
#, c-format
msgid "Turns to target: %d"
msgstr ""
-#: client/text.c:719 client/gui-sdl/mapview.c:570
+#: client/text.c:778 client/gui-sdl/mapview.c:570
#, c-format
msgid "Turns to target: %d to %d"
msgstr ""
-#: client/text.c:725 client/gui-sdl/mapview.c:576
+#: client/text.c:784 client/gui-sdl/mapview.c:576
#, fuzzy, c-format
msgid "%d unit selected"
msgid_plural "%d units selected"
msgstr[0] "Selecção de unidade"
msgstr[1] "Selecção de unidade"
-#: client/text.c:730 client/gui-sdl/mapview.c:581
+#: client/text.c:789 client/gui-sdl/mapview.c:581
#, fuzzy
msgid "No units selected."
msgstr "Nação Seleccionada"
-#: client/text.c:804 client/gui-sdl/mapview.c:654
+#: client/text.c:863 client/gui-sdl/mapview.c:654
#, c-format
msgid "Others: %d civil; %d military"
msgstr ""
-#: client/text.c:806 client/gui-sdl/mapview.c:656
+#: client/text.c:865 client/gui-sdl/mapview.c:656
#, c-format
msgid "Others: %d civilian"
msgstr ""
-#: client/text.c:808 client/gui-sdl/mapview.c:658
+#: client/text.c:867 client/gui-sdl/mapview.c:658
#, c-format
msgid "Others: %d military"
msgstr ""
-#: client/text.c:839
+#: client/text.c:898
#, fuzzy
msgid "No units to upgrade!"
msgstr "Nenhuma unidade pode ser actualizada."
-#: client/text.c:864
+#: client/text.c:923
#, fuzzy
msgid "None of these units may be upgraded."
msgstr "Nenhuma unidade pode ser actualizada."
-#: client/text.c:870
+#: client/text.c:929
#, fuzzy, c-format
msgid ""
"Upgrade %d unit for %d gold?\n"
@@ -9770,14 +9843,14 @@ msgstr[1] ""
"Actualizar %s para %s por %d moedas?\n"
"Tesouro contém %d moedas."
-#: client/text.c:891
+#: client/text.c:950
#, fuzzy
msgid "Shows your progress in researching the current technology."
msgstr ""
"Mostra o seu progresso na pesquisa da tecnologia actual.\n"
"%s: %d/%d."
-#: client/text.c:897
+#: client/text.c:956
#, fuzzy
msgid "no research target."
msgstr ""
@@ -9785,46 +9858,46 @@ msgstr ""
"(nenhuma pesquisa)"
#. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:900
+#: client/text.c:959
#, c-format
msgid "%s: %d/%d."
msgstr ""
-#: client/text.c:920
+#: client/text.c:979
#, fuzzy
msgid "Shows the progress of global warming:"
msgstr ""
"Mostra o progresso no aquecimento global:\n"
"%d."
-#: client/text.c:921
+#: client/text.c:980
#, fuzzy, c-format
msgid "Pollution rate: %d%%"
msgstr "Poluição: %3d"
-#: client/text.c:923
+#: client/text.c:982
#, c-format
msgid "Chance of catastrophic warming each turn: %d%%"
msgstr ""
-#: client/text.c:939
+#: client/text.c:998
#, fuzzy
msgid "Shows the progress of nuclear winter:"
msgstr ""
"Mostra o progresso do inverno nuclear:\n"
"%d."
-#: client/text.c:940
+#: client/text.c:999
#, fuzzy, c-format
msgid "Fallout rate: %d%%"
msgstr "taxa máxima de %s: %d%%"
-#: client/text.c:942
+#: client/text.c:1001
#, c-format
msgid "Chance of catastrophic winter each turn: %d%%"
msgstr ""
-#: client/text.c:957
+#: client/text.c:1016
#, fuzzy
msgid "Shows your current government:"
msgstr ""
@@ -9832,25 +9905,25 @@ msgstr ""
"%s."
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:981
+#: client/text.c:1040
#, fuzzy, c-format
msgid "Population: %5d"
msgstr "População: %s"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:1043
#, c-format
msgid "Support: %5d %%"
msgstr ""
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:1047
#, fuzzy, c-format
msgid "Energy: %5d %%"
msgstr "Massa: %5d ton"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:992
+#: client/text.c:1051
#, c-format
msgid "Mass: %5d ton"
msgid_plural "Mass: %5d tons"
@@ -9858,96 +9931,97 @@ msgstr[0] "Massa: %5d ton"
msgstr[1] "Massa: %5d tons"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1057
#, c-format
msgid "Travel time: %5.1f years"
msgstr "Tempo de viagem: %5.1f anos"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1061
msgid "Travel time: N/A "
msgstr "Tempo de viagem: N/D "
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1065
#, c-format
msgid "Success prob.: %5d %%"
msgstr ""
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1010
+#: client/text.c:1069
#, c-format
msgid "Year of arrival: %8s"
msgstr ""
-#: client/text.c:1030
+#: client/text.c:1089
msgid "?timeout:off"
msgstr "?timeout:infinito"
-#: client/text.c:1054
+#: client/text.c:1113
#, c-format
msgid "?seconds:%02ds"
msgstr "?seconds:%02ds"
-#: client/text.c:1056
+#: client/text.c:1115
#, c-format
msgid "?mins/secs:%02dm %02ds"
msgstr "?mins/secs:%02dm %02ds"
-#: client/text.c:1058
+#: client/text.c:1117
#, c-format
msgid "?hrs/mns:%02dh %02dm"
msgstr "?hrs/mns:%02dh %02dm"
-#: client/text.c:1060
+#: client/text.c:1119
#, c-format
msgid "?dys/hrs:%02dd %02dh"
msgstr "?dys/hrs:%02dd %02dh"
-#: client/text.c:1063
+#: client/text.c:1122
msgid "?duration:overflow"
msgstr "?duration:excedida"
-#: client/text.c:1084
+#: client/text.c:1143
#, c-format
msgid "%6d.%02d ms"
msgstr "%6d.%02d ms"
-#. TRANS: "Republic of the Poles"
-#: client/text.c:1127
+#. TRANS: <nation adjective> <government name>.
+#. * E.g. "Polish Republic".
+#: client/text.c:1188
#, fuzzy, c-format
-msgid "%s of the %s"
-msgstr "O %s dos %s"
+msgid "?nationgovernment:%s %s"
+msgstr "Governo: %s"
#. TRANS: "Observer: 1985"
-#: client/text.c:1137
+#: client/text.c:1198
#, fuzzy, c-format
msgid "Observer: %s"
msgstr " (observador)"
-#: client/text.c:1155
+#: client/text.c:1216
msgid "Buildings: "
msgstr "EdifÃcios: "
-#: client/text.c:1172 client/text.c:1211
+#: client/text.c:1233 client/text.c:1272
msgid "None. "
msgstr "Nenhum. "
-#: client/text.c:1174 client/text.c:1213
+#: client/text.c:1235 client/text.c:1274
msgid "?clistend:."
msgstr "."
-#: client/text.c:1192
+#: client/text.c:1253
msgid "Wonders: "
msgstr "Maravilhas: "
-#: client/text.c:1247
+#: client/text.c:1308
#, 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:1251
+#: client/text.c:1312
#, fuzzy, c-format
msgid "%d content before penalty."
msgid_plural "%d content before penalty."
@@ -9955,45 +10029,47 @@ 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:1257
+#: client/text.c:1318
#, 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."
-#. TRANS: Martial law opening parenthesis
-#: client/text.c:1279
-msgid "Martial law in effect ("
+#: client/text.c:1339
+#, fuzzy
+msgid "Unlimited martial law in effect."
msgstr "Lei marcial em prática ("
-#. TRANS: no [unit] maximum
-#: client/text.c:1284
-msgid "no maximum, "
-msgstr "sem máximo, "
-
-#: client/text.c:1287
-#, c-format
-msgid "%d unit maximum, "
-msgid_plural "%d units maximum, "
-msgstr[0] "%d unidade no máximo, "
-msgstr[1] "%d unidades no máximo, "
+#: client/text.c:1341
+#, fuzzy, c-format
+msgid "%d military unit may impose martial law."
+msgid_plural "Up to %d military units may impose martial law."
+msgstr[0] ""
+"* Unidade não-militar (não pode atacar; não pode impôr lei marcial).\n"
+msgstr[1] ""
+"* Unidade não-militar (não pode atacar; não pode impôr lei marcial).\n"
-#. TRANS: Martial law closing parenthesis
-#: client/text.c:1294
-#, c-format
-msgid "%d per unit). "
-msgstr "%d por unidade). "
+#: client/text.c:1345
+#, fuzzy, c-format
+msgid "Each military unit makes %d unhappy citizen content."
+msgid_plural "Each military unit makes %d unhappy citizens content."
+msgstr[0] ""
+"Entretem os cidadãos de uma cidade, tornando 3 cidadãos descontentes em "
+"contentes."
+msgstr[1] ""
+"Entretem os cidadãos de uma cidade, tornando 3 cidadãos descontentes em "
+"contentes."
-#: client/text.c:1298
+#: client/text.c:1352
msgid "Military units in the field may cause unhappiness. "
msgstr "Unidades militares no campo poderão causar infelicidade. "
-#: client/text.c:1301
+#: client/text.c:1355
msgid "Military units have no happiness effect. "
msgstr "Unidades militares não têm qualquer efeito na felicidade. "
-#: client/text.c:1316
+#: client/text.c:1370
#, c-format
msgid "Luxury: %d total."
msgstr "Luxo: %d total."
@@ -10018,7 +10094,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:3968
+#: client/tilespec.c:3966
#, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
@@ -10040,12 +10116,12 @@ msgid ""
"have a look."
msgstr ""
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
-#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:599
+#: client/gui-gtk-2.0/cityrep.c:624 client/gui-sdl/citydlg.c:2009
msgid "none"
msgstr "nada"
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:645
msgid "custom"
msgstr "costumizado"
@@ -10359,7 +10435,7 @@ msgstr "Estabelece _Rota Comercial"
msgid "Enter Marketplace"
msgstr "Mercado"
-#: client/gui-gtk-2.0/chatline.c:144 client/gui-win32/chatline.c:134
+#: client/gui-gtk-2.0/chatline.c:218 client/gui-win32/chatline.c:134
#: client/gui-xaw/chatline.c:120
msgid "Cleared output window."
msgstr "Janela de saida limpa."
@@ -10441,11 +10517,11 @@ msgid "%d/%d %d turns"
msgstr "%d/%d %d turnos"
#: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:821
+#: client/gui-gtk-2.0/cityrep.c:1027
msgid "_Buy"
msgstr "_Comprar"
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:869
#, fuzzy
msgid "_Production"
msgstr "Produção"
@@ -10469,12 +10545,12 @@ msgid "Entertainers"
msgstr "Artistas"
#: client/gui-gtk-2.0/citydlg.c:1029 client/gui-win32/citydlg.c:1989
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2403
msgid "Scientists"
msgstr "Cientistas"
#: client/gui-gtk-2.0/citydlg.c:1030 client/gui-win32/citydlg.c:1991
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2404
msgid "Taxmen"
msgstr "Fiscais"
@@ -10568,7 +10644,7 @@ msgstr "Unidades suportadas %d"
msgid "Present units %d"
msgstr "Unidades presentes %d"
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:1019
msgid "Cen_ter"
msgstr "Cen_trar"
@@ -10660,35 +10736,65 @@ msgstr "Renomear Cidade"
msgid "What should we rename the city to?"
msgstr "Para o que devemos renomear a cidade?"
-#: client/gui-gtk-2.0/cityrep.c:699
+#: client/gui-gtk-2.0/cityrep.c:794
+#, fuzzy
+msgid "(no worklists defined)"
+msgstr "(lista de tarefas)"
+
+#: client/gui-gtk-2.0/cityrep.c:876
msgid "Chan_ge"
msgstr "_Alterar"
-#: client/gui-gtk-2.0/cityrep.c:703
+#: client/gui-gtk-2.0/cityrep.c:880
#, fuzzy
msgid "Add _First"
msgstr "Adicionar pré-definição"
-#: client/gui-gtk-2.0/cityrep.c:707
+#: client/gui-gtk-2.0/cityrep.c:884
#, fuzzy
msgid "Add _Next"
msgstr "Adicionar pré-definição"
-#: client/gui-gtk-2.0/cityrep.c:711
+#: client/gui-gtk-2.0/cityrep.c:888
+#, fuzzy
+msgid "Add _2nd Last"
+msgstr "Adicionar pré-definição"
+
+#: client/gui-gtk-2.0/cityrep.c:892
#, fuzzy
msgid "Add _Last"
msgstr "Adicionar pré-definição"
-#: client/gui-gtk-2.0/cityrep.c:715
+#: client/gui-gtk-2.0/cityrep.c:899
+#, fuzzy
+msgid "Set Worklist"
+msgstr "Lista de Tarefas"
+
+#: client/gui-gtk-2.0/cityrep.c:905
+#, fuzzy
+msgid "Append Worklist"
+msgstr "Renomear Lista Tarefas"
+
+#: client/gui-gtk-2.0/cityrep.c:911
+#, fuzzy
+msgid "Clear _Worklist"
+msgstr "Lista de _Tarefas Objectivo:"
+
+#: client/gui-gtk-2.0/cityrep.c:916
+#, fuzzy
+msgid "Gover_nor"
+msgstr "Governo"
+
+#: client/gui-gtk-2.0/cityrep.c:921
msgid "_Select"
msgstr "_Seleccionar"
-#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
+#: 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:800 client/gui-gtk-2.0/menu.c:808
+#: 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-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
#: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -10698,101 +10804,101 @@ msgstr "_Mostrar"
msgid "Cities"
msgstr "Cidades"
-#: client/gui-gtk-2.0/cityrep.c:817
+#: client/gui-gtk-2.0/cityrep.c:1023
#, fuzzy
msgid "_Inspect"
msgstr "_Visualizar"
-#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
-#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-sdl/helpdlg.c:297 client/gui-win32/menu.c:342
-#: client/gui-xaw/menu.c:241
+#: 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
+#: client/gui-gtk-2.0/cityrep.c:1518 client/gui-gtk-2.0/menu.c:823
+#: client/gui-gtk-2.0/menu.c:825 client/gui-gtk-2.0/menu.c:827
+#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:831
+#: client/gui-gtk-2.0/menu.c:833 client/gui-sdl/helpdlg.c:297
+#: client/gui-win32/menu.c:342 client/gui-xaw/menu.c:241
msgid "Improvements"
msgstr "Construções"
-#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
-#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
-#: client/gui-xaw/menu.c:247
+#: client/gui-gtk-2.0/cityrep.c:1441 client/gui-gtk-2.0/cityrep.c:1460
+#: client/gui-gtk-2.0/cityrep.c:1479 client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1522 client/gui-xaw/menu.c:247
msgid "Wonders"
msgstr "Maravilhas"
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1662 client/gui-win32/cityrep.c:439
#: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
msgid "All Cities"
msgstr "Todas as Cidades"
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1667 client/gui-win32/cityrep.c:440
msgid "No Cities"
msgstr "Nenhuma Cidade"
-#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1672 client/gui-win32/cityrep.c:441
msgid "Invert Selection"
msgstr "Inverter Selecção"
-#: client/gui-gtk-2.0/cityrep.c:1420
+#: client/gui-gtk-2.0/cityrep.c:1682
msgid "Building Units"
msgstr "Construir Unidades"
-#: client/gui-gtk-2.0/cityrep.c:1426
+#: client/gui-gtk-2.0/cityrep.c:1688
msgid "Building Improvements"
msgstr "Construir Construções"
-#: client/gui-gtk-2.0/cityrep.c:1432
+#: client/gui-gtk-2.0/cityrep.c:1694
msgid "Building Wonders"
msgstr "Construir Maravilhas"
-#: client/gui-gtk-2.0/cityrep.c:1444
+#: client/gui-gtk-2.0/cityrep.c:1706
msgid "Building Unit"
msgstr "Construir Unidade"
-#: client/gui-gtk-2.0/cityrep.c:1448
+#: client/gui-gtk-2.0/cityrep.c:1710
msgid "Building Improvement"
msgstr "Construir Construção"
-#: client/gui-gtk-2.0/cityrep.c:1452
+#: client/gui-gtk-2.0/cityrep.c:1714
msgid "Building Wonder"
msgstr "Construir Maravilha"
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1722 client/gui-win32/cityrep.c:443
msgid "Coastal Cities"
msgstr "Cidades Costeiras"
-#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1727 client/gui-win32/cityrep.c:444
msgid "Same Island"
msgstr "Mesma Ilha"
-#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1737 client/gui-win32/cityrep.c:447
msgid "Supported Units"
msgstr "Unidades Suportadas"
-#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1740 client/gui-win32/cityrep.c:454
msgid "Units Present"
msgstr "Unidades Presentes"
-#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1744 client/gui-win32/cityrep.c:469
msgid "Improvements in City"
msgstr "Construções na Cidade"
-#: client/gui-gtk-2.0/cityrep.c:1486
+#: client/gui-gtk-2.0/cityrep.c:1748
msgid "Wonders in City"
msgstr "Maravilhas na Cidade"
-#: client/gui-gtk-2.0/cityrep.c:1495
+#: client/gui-gtk-2.0/cityrep.c:1757
msgid "Available Units"
msgstr "Unidades DisponÃveis"
-#: client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1760
msgid "Available Improvements"
msgstr "Construções DisponÃveis"
-#: client/gui-gtk-2.0/cityrep.c:1501
+#: client/gui-gtk-2.0/cityrep.c:1763
msgid "Available Wonders"
msgstr "Maravilhas DisponÃveis"
-#: client/gui-gtk-2.0/cityrep.c:1625
+#: client/gui-gtk-2.0/cityrep.c:1882
#, fuzzy, c-format
msgid "Total Buy Cost: %d"
msgstr "Custo Total:"
@@ -10864,12 +10970,12 @@ 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:186
+#: client/gui-gtk-2.0/dialogs.c:196 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:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
#, fuzzy
msgid "Inspect _City"
msgstr "Visualizar _Cidade"
@@ -10899,10 +11005,10 @@ msgstr "Seleccione o que pilhar:"
msgid "Unit"
msgstr "Unidades"
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
-#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
-#: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
-#: manual/civmanual.c:302 data/Freeciv.in:80
+#: 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-win32/plrdlg.c:335 manual/civmanual.c:302 data/Freeciv.in:80
msgid "Name"
msgstr "Nome"
@@ -10928,7 +11034,7 @@ 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:1036 data/Freeciv.in:3371
+#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
#, fuzzy
msgid "Pick Nation"
msgstr "Esquadra de PolÃcia"
@@ -11011,7 +11117,7 @@ msgstr "_Mapas"
msgid "_Advances"
msgstr "_Avanços"
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:910
+#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr "_Cidades"
@@ -11117,111 +11223,181 @@ msgstr "Seleccione o destino"
msgid "Show _All Cities"
msgstr "Mostrar _Todas Cidades"
-#: client/gui-gtk-2.0/gui_main.c:150
+#: client/gui-gtk-2.0/gui_main.c:162
#, fuzzy
msgid "Show Map Scrollbars"
msgstr "Mostrar Barras Rolamento de Mapa (apenas GTK+)"
-#: client/gui-gtk-2.0/gui_main.c:151
+#: client/gui-gtk-2.0/gui_main.c:163
msgid "Disable this option to hide the scrollbars on the map view."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:155
+#: client/gui-gtk-2.0/gui_main.c:167
msgid "Keyboardless goto"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:156
+#: client/gui-gtk-2.0/gui_main.c:168
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:161
+#: client/gui-gtk-2.0/gui_main.c:173
#, fuzzy
msgid "Keep dialogs on top"
msgstr "Manter diálogos no topo (apenas GTK+ 2.0)"
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:174
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:166
+#: client/gui-gtk-2.0/gui_main.c:178
msgid "Show worklist task icons"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:179
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:171
+#: client/gui-gtk-2.0/gui_main.c:183
msgid "Enable status report tabs"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:172
+#: client/gui-gtk-2.0/gui_main.c:184
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:177 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:189 client/gui-win32/gui_main.c:110
msgid "Better fog-of-war drawing"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:178 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:190 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:277 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:195
+msgid "Show time for each chat message"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:196
+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
+msgid "Split bottom notebook area"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:202
+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
+msgid "New message events go to top of list"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:208
+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
+msgid "Show extra message window buttons"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:214
+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 "
+"is disabled, these buttons will not appear (you can still double-click with "
+"the left mouse button or right-click on a row to inspect or goto "
+"respectively). This option will only take effect once the message window is "
+"closed and reopened."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:224
+#, 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
+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
+msgid "Plain chat messages are sent to allies only"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:231
+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 "
+"messages will be sent as public chat messages. To send a public chat message "
+"with this option enabled, prefix the message with a single colon ':'. This "
+"option can also be set using a toggle button beside the chat entry (only "
+"visible in multiplayer games)."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:340 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:723 client/gui-gtk-2.0/gui_main.c:1345
+#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
msgid "Freeciv"
msgstr "Freeciv"
-#: client/gui-gtk-2.0/gui_main.c:1088 client/gui-gtk-2.0/gui_main.c:1095
+#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
#: 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:1095 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1232 client/gui-sdl/mapctrl.c:1566
#: client/gui-sdl/mapview.c:1082
msgid "Shift+Return"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1127 client/gui-gtk-2.0/menu.c:770
-#: client/gui-gtk-2.0/menu.c:772 client/gui-gtk-2.0/menu.c:774
-#: client/gui-gtk-2.0/menu.c:776 client/gui-gtk-2.0/menu.c:778
-#: client/gui-gtk-2.0/menu.c:780 client/gui-gtk-2.0/menu.c:782
-#: client/gui-gtk-2.0/menu.c:784 client/gui-gtk-2.0/menu.c:786
-#: client/gui-gtk-2.0/menu.c:788 client/gui-gtk-2.0/menu.c:790
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-gtk-2.0/menu.c:804 client/gui-gtk-2.0/menu.c:806
-#: client/gui-gtk-2.0/menu.c:808 client/gui-gtk-2.0/menu.c:810
-#: client/gui-gtk-2.0/menu.c:812 client/gui-gtk-2.0/menu.c:814
-#: client/gui-gtk-2.0/menu.c:816 client/gui-gtk-2.0/menu.c:818
-#: client/gui-gtk-2.0/menu.c:820 client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/gui_main.c:1266 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
+#: client/gui-gtk-2.0/menu.c:811 client/gui-gtk-2.0/menu.c:813
+#: client/gui-gtk-2.0/menu.c:815 client/gui-gtk-2.0/menu.c:817
+#: client/gui-gtk-2.0/menu.c:819 client/gui-gtk-2.0/menu.c:821
+#: client/gui-gtk-2.0/menu.c:823 client/gui-gtk-2.0/menu.c:825
+#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
+#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
+#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
+#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
+#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
+#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
#: data/Freeciv.in:2028
msgid "View"
msgstr "Visão"
-#: client/gui-gtk-2.0/gui_main.c:1208
+#: client/gui-gtk-2.0/gui_main.c:1359
#, fuzzy
msgid "Chat"
msgstr "Quadriga"
-#: client/gui-gtk-2.0/gui_main.c:1224 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1377 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"
@@ -11232,81 +11408,85 @@ 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:1491
+#: client/gui-gtk-2.0/gui_main.c:1392
+msgid "Allies Only"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:1657
msgid "Not _ready"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
+#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
#, fuzzy
msgid "_Ready"
msgstr "P_reparar todas"
-#: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2132
+#: 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
#, fuzzy
msgid "_Start"
msgstr "Estado"
-#: client/gui-gtk-2.0/gui_main.c:1520
+#: client/gui-gtk-2.0/gui_main.c:1686
#, fuzzy
msgid "_Take Player"
msgstr "Cidades"
-#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
+#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
#, fuzzy
msgid "Pick _Nation"
msgstr "Esquadra de PolÃcia"
-#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
+#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
#, fuzzy
msgid "_Observe"
msgstr " (observador)"
-#: client/gui-gtk-2.0/gui_main.c:1532
+#: client/gui-gtk-2.0/gui_main.c:1698
#, fuzzy
msgid "Do not _observe"
msgstr "controla agora"
-#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
#, fuzzy
msgid "<AI>"
msgstr "IA"
-#: client/gui-gtk-2.0/gui_main.c:1557
+#: client/gui-gtk-2.0/gui_main.c:1723
msgid "<Novice AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1560
+#: client/gui-gtk-2.0/gui_main.c:1726
#, fuzzy
msgid "<Easy AI>"
msgstr "IA"
-#: client/gui-gtk-2.0/gui_main.c:1563
+#: client/gui-gtk-2.0/gui_main.c:1729
msgid "<Normal AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1732
#, fuzzy
msgid "<Hard AI>"
msgstr "IA"
-#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1742 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:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
#, fuzzy
msgid "Observer"
msgstr " (observador)"
-#: client/gui-gtk-2.0/gui_main.c:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
#, fuzzy
msgid "Detached"
msgstr ", Morto"
-#: client/gui-gtk-2.0/gui_main.c:1899
+#: client/gui-gtk-2.0/gui_main.c:2073
msgid "Are you sure you want to quit?"
msgstr ""
@@ -11543,494 +11723,530 @@ msgstr "_Sim"
msgid "Foreign Intelligence: %s Empire"
msgstr "Relatório Espionagem Estrangeira"
-#: client/gui-gtk-2.0/mapctrl.c:195 client/gui-sdl/mapctrl.c:2565
+#: client/gui-gtk-2.0/mapctrl.c:179 client/gui-sdl/mapctrl.c:2565
#: client/gui-sdl/menu.c:839 client/gui-sdl/menu.c:1021
#: client/gui-win32/mapctrl.c:353
msgid "Build New City"
msgstr "Construir Nova Cidade"
-#: client/gui-gtk-2.0/mapctrl.c:196 client/gui-sdl/mapctrl.c:2594
+#: client/gui-gtk-2.0/mapctrl.c:180 client/gui-sdl/mapctrl.c:2594
#: client/gui-win32/mapctrl.c:354 client/gui-xaw/mapctrl.c:89
msgid "What should we call our new city?"
msgstr "Que nome devemos dar à nossa nova cidade?"
-#: client/gui-gtk-2.0/mapview.c:147
+#: client/gui-gtk-2.0/mapview.c:158
msgid "Shows your current luxury/science/tax rates;click to toggle them."
msgstr ""
"Mostra as suas taxas actuais de luxo/ciência/imposto; clique para as "
"alternar."
-#: client/gui-gtk-2.0/mapview.c:692 client/gui-win32/canvas.c:275
+#: client/gui-gtk-2.0/mapview.c:702 client/gui-win32/canvas.c:275
msgid "Better fog will only work in truecolor. Disabling it"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:250
+#: client/gui-gtk-2.0/menu.c:256
msgid "Leaving a local game will end it!"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:700 client/gui-win32/menu.c:303
+#: client/gui-gtk-2.0/menu.c:727 client/gui-win32/menu.c:303
msgid "_Game"
msgstr "_Jogo"
-#: client/gui-gtk-2.0/menu.c:702 client/gui-gtk-2.0/menu.c:704
-#: client/gui-gtk-2.0/menu.c:706 client/gui-gtk-2.0/menu.c:708
-#: client/gui-gtk-2.0/menu.c:710 client/gui-gtk-2.0/menu.c:712
-#: client/gui-gtk-2.0/menu.c:714 client/gui-gtk-2.0/menu.c:717
-#: client/gui-gtk-2.0/menu.c:720 client/gui-gtk-2.0/menu.c:722
-#: client/gui-gtk-2.0/menu.c:724 client/gui-gtk-2.0/menu.c:726
-#: client/gui-gtk-2.0/menu.c:728 client/gui-gtk-2.0/menu.c:730
-#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:736
-#: client/gui-gtk-2.0/menu.c:738 client/gui-gtk-2.0/menu.c:740
+#: client/gui-gtk-2.0/menu.c:729 client/gui-gtk-2.0/menu.c:731
+#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:735
+#: client/gui-gtk-2.0/menu.c:737 client/gui-gtk-2.0/menu.c:739
+#: client/gui-gtk-2.0/menu.c:741 client/gui-gtk-2.0/menu.c:744
+#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
+#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
+#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
+#: client/gui-gtk-2.0/menu.c:760 client/gui-gtk-2.0/menu.c:763
+#: client/gui-gtk-2.0/menu.c:765 client/gui-gtk-2.0/menu.c:767
#: data/Freeciv.in:2026
msgid "Game"
msgstr "Jogo"
-#: client/gui-gtk-2.0/menu.c:704 client/gui-gtk-2.0/menu.c:706
-#: client/gui-gtk-2.0/menu.c:708
+#: client/gui-gtk-2.0/menu.c:731 client/gui-gtk-2.0/menu.c:733
+#: client/gui-gtk-2.0/menu.c:735
#, fuzzy
msgid "_Chat"
msgstr "Quadriga"
-#: client/gui-gtk-2.0/menu.c:706 client/gui-win32/menu.c:314
+#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:314
msgid "_Clear Log"
msgstr "_Limpar Registo"
-#: client/gui-gtk-2.0/menu.c:708 client/gui-win32/menu.c:313
+#: client/gui-gtk-2.0/menu.c:735 client/gui-win32/menu.c:313
#, fuzzy
msgid "_Write Log"
msgstr "Exportar Registo"
-#: client/gui-gtk-2.0/menu.c:710 client/gui-win32/menu.c:304
+#: client/gui-gtk-2.0/menu.c:737 client/gui-win32/menu.c:304
#, fuzzy
msgid "Local _Options"
msgstr "Opções Locais"
-#: client/gui-gtk-2.0/menu.c:712 client/gui-win32/menu.c:305
+#: client/gui-gtk-2.0/menu.c:739 client/gui-win32/menu.c:305
#, fuzzy
msgid "_Message Options"
msgstr "Opções das Mensagens"
-#: client/gui-gtk-2.0/menu.c:717
+#: client/gui-gtk-2.0/menu.c:744
#, fuzzy
msgid "_Reload Tileset"
msgstr "Conjunto de gráficos por omissão"
-#: client/gui-gtk-2.0/menu.c:720
+#: client/gui-gtk-2.0/menu.c:747
#, fuzzy
msgid "Save Options on _Exit"
msgstr "Opções do Servidor (actuais)"
-#: client/gui-gtk-2.0/menu.c:722
+#: client/gui-gtk-2.0/menu.c:749
#, fuzzy
msgid "Sa_ve Options"
msgstr "Opções das Mensa_gens"
-#: client/gui-gtk-2.0/menu.c:726 client/gui-win32/menu.c:308
+#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:308
#, fuzzy
msgid "Server O_ptions"
msgstr "Mostra as opções do servidor."
-#: client/gui-gtk-2.0/menu.c:730 client/gui-win32/menu.c:310
+#: client/gui-gtk-2.0/menu.c:757 client/gui-win32/menu.c:310
#, fuzzy
msgid "_Save Game"
msgstr "Gravar Jogo"
-#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:311
+#: client/gui-gtk-2.0/menu.c:760 client/gui-win32/menu.c:311
#, fuzzy
msgid "Save Game _As..."
msgstr "Gravar Jogo"
-#: client/gui-gtk-2.0/menu.c:738
+#: client/gui-gtk-2.0/menu.c:765
#, fuzzy
msgid "_Leave"
msgstr "_Lider:"
-#: client/gui-gtk-2.0/menu.c:740 client/gui-win32/menu.c:317
+#: client/gui-gtk-2.0/menu.c:767 client/gui-win32/menu.c:317
msgid "_Quit"
msgstr "_Sair"
-#: client/gui-gtk-2.0/menu.c:745 client/gui-win32/menu.c:321
+#: client/gui-gtk-2.0/menu.c:772 client/gui-win32/menu.c:321
#, fuzzy
msgid "Gov_ernment"
msgstr "Governo"
-#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
-#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
-#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:774 client/gui-gtk-2.0/menu.c:776
+#: client/gui-gtk-2.0/menu.c:778 client/gui-gtk-2.0/menu.c:780
+#: client/gui-gtk-2.0/menu.c:782 client/gui-gtk-2.0/menu.c:784
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
#: client/gui-xaw/menu.c:248 data/Freeciv.in:2027 data/helpdata.txt:1320
msgid "Government"
msgstr "Governo"
-#: client/gui-gtk-2.0/menu.c:749 client/gui-win32/menu.c:322
+#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:322
msgid "_Tax Rates"
msgstr "_Impostos"
-#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:324
+#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:324
msgid "_Find City"
msgstr "Encontrar _Cidade"
-#: client/gui-gtk-2.0/menu.c:755 client/gui-win32/menu.c:325
+#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:325
#, fuzzy
msgid "_Worklists"
msgstr "Listas de _Tarefas:"
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
-#: client/gui-gtk-2.0/menu.c:764 client/gui-win32/menu.c:327
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
+#: client/gui-gtk-2.0/menu.c:791 client/gui-win32/menu.c:327
#, fuzzy
msgid "_Change Government"
msgstr "_Governo"
-#: client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:788
#, fuzzy
msgid "_Revolution..."
msgstr "_Revolução"
-#: client/gui-gtk-2.0/menu.c:764 client/gui-gtk-2.0/menu.c:970
+#: client/gui-gtk-2.0/menu.c:791 client/gui-gtk-2.0/menu.c:1013
#: client/gui-win32/menu.c:431
msgid "_Government"
msgstr "_Governo"
-#: client/gui-gtk-2.0/menu.c:768 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:795 client/gui-gtk-2.0/menu.c:959
#: client/gui-win32/menu.c:334
msgid "_View"
msgstr "_Visão"
-#: client/gui-gtk-2.0/menu.c:772
+#: client/gui-gtk-2.0/menu.c:799
#, fuzzy
msgid "City Outlines"
msgstr "Opções da Cidade"
-#: client/gui-gtk-2.0/menu.c:774 client/gui-win32/menu.c:335
+#: client/gui-gtk-2.0/menu.c:801 client/gui-win32/menu.c:335
msgid "Map _Grid"
msgstr "_QuadrÃcula Mapa"
-#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:336
+#: client/gui-gtk-2.0/menu.c:803 client/gui-win32/menu.c:336
msgid "National _Borders"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:778 client/gui-win32/menu.c:337
+#: client/gui-gtk-2.0/menu.c:805 client/gui-win32/menu.c:337
msgid "City _Names"
msgstr "_Nomes Cidades"
-#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:338
+#: client/gui-gtk-2.0/menu.c:807 client/gui-win32/menu.c:338
msgid "City G_rowth"
msgstr "C_rescimento Cidade"
-#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:339
+#: client/gui-gtk-2.0/menu.c:809 client/gui-win32/menu.c:339
msgid "City _Productions"
msgstr "_Produção Cidades"
-#: client/gui-gtk-2.0/menu.c:784 client/gui-sdl/optiondlg.c:1719
+#: client/gui-gtk-2.0/menu.c:811
+#, fuzzy
+msgid "City Buy Cost"
+msgstr "Custo Total:"
+
+#: client/gui-gtk-2.0/menu.c:813
+#, fuzzy
+msgid "City Traderoutes"
+msgstr "Rotas Comerciais"
+
+#: client/gui-gtk-2.0/menu.c:815 client/gui-sdl/optiondlg.c:1719
msgid "Draw city worker map grid"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:788 client/gui-sdl/optiondlg.c:1635
+#: client/gui-gtk-2.0/menu.c:819 client/gui-sdl/optiondlg.c:1635
#: client/gui-win32/menu.c:340 client/gui-xaw/menu.c:148
#: client/gui-xaw/menu.c:246 manual/civmanual.c:220 data/helpdata.txt:1220
msgid "Terrain"
msgstr "Terreno"
-#: client/gui-gtk-2.0/menu.c:790 client/gui-win32/menu.c:341
+#: client/gui-gtk-2.0/menu.c:821 client/gui-win32/menu.c:341
#: client/gui-xaw/menu.c:149
msgid "Coastline"
msgstr "Linha Costeira"
-#: client/gui-gtk-2.0/menu.c:796 client/gui-win32/menu.c:343
+#: client/gui-gtk-2.0/menu.c:827 client/gui-win32/menu.c:343
msgid "Roads & Rails"
msgstr "Estradas & Ferrovias"
-#: client/gui-gtk-2.0/menu.c:800 client/gui-sdl/optiondlg.c:1933
+#: client/gui-gtk-2.0/menu.c:831 client/gui-sdl/optiondlg.c:1933
#: client/gui-win32/menu.c:345 client/gui-xaw/menu.c:152
msgid "Mines"
msgstr "Minas"
-#: client/gui-gtk-2.0/menu.c:802 client/gui-win32/menu.c:346
+#: client/gui-gtk-2.0/menu.c:833 client/gui-win32/menu.c:346
msgid "Fortress & Airbase"
msgstr "Fortalezas & Bases Aéreas"
-#: client/gui-gtk-2.0/menu.c:804 client/gui-win32/menu.c:348
+#: client/gui-gtk-2.0/menu.c:835 client/gui-win32/menu.c:348
#: client/gui-xaw/menu.c:154
msgid "Specials"
msgstr "Especiais"
-#: client/gui-gtk-2.0/menu.c:806 client/gui-win32/menu.c:349
+#: client/gui-gtk-2.0/menu.c:837 client/gui-win32/menu.c:349
#: client/gui-xaw/menu.c:155
msgid "Pollution & Fallout"
msgstr "Poluição & Chuva Nuclear"
-#: client/gui-gtk-2.0/menu.c:812 client/gui-win32/menu.c:352
+#: client/gui-gtk-2.0/menu.c:843 client/gui-win32/menu.c:352
#: client/gui-xaw/menu.c:158
msgid "Focus Unit"
msgstr "Focar Unidade"
-#: client/gui-gtk-2.0/menu.c:814 client/gui-sdl/optiondlg.c:1854
+#: client/gui-gtk-2.0/menu.c:845 client/gui-sdl/optiondlg.c:1854
#: client/gui-win32/menu.c:353 client/gui-xaw/menu.c:159
msgid "Fog of War"
msgstr "Nevoeiro de Guerra"
-#: client/gui-gtk-2.0/menu.c:818
+#: client/gui-gtk-2.0/menu.c:849
msgid "_Full Screen"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/menu.c:853
msgid "_Center View"
msgstr "_Centrar Vista"
-#: client/gui-gtk-2.0/menu.c:825 client/gui-win32/menu.c:358
+#: client/gui-gtk-2.0/menu.c:856 client/gui-win32/menu.c:358
msgid "_Orders"
msgstr "_Ordens"
-#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
-#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
-#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
-#: client/gui-gtk-2.0/menu.c:855 client/gui-gtk-2.0/menu.c:857
-#: client/gui-gtk-2.0/menu.c:859 client/gui-gtk-2.0/menu.c:861
-#: client/gui-gtk-2.0/menu.c:863 client/gui-gtk-2.0/menu.c:865
-#: client/gui-gtk-2.0/menu.c:867 client/gui-gtk-2.0/menu.c:869
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875 client/gui-gtk-2.0/menu.c:877
-#: client/gui-gtk-2.0/menu.c:879 client/gui-gtk-2.0/menu.c:881
-#: client/gui-gtk-2.0/menu.c:883 client/gui-gtk-2.0/menu.c:885
-#: client/gui-gtk-2.0/menu.c:887 client/gui-gtk-2.0/menu.c:889
-#: client/gui-gtk-2.0/menu.c:891 client/gui-gtk-2.0/menu.c:893
-#: client/gui-gtk-2.0/menu.c:895 client/gui-gtk-2.0/menu.c:897
-#: client/gui-gtk-2.0/menu.c:899 client/gui-gtk-2.0/menu.c:901
-#: client/gui-gtk-2.0/menu.c:903 data/Freeciv.in:2029
+#: client/gui-gtk-2.0/menu.c:858 client/gui-gtk-2.0/menu.c:860
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:864
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:868
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:872
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:876
+#: client/gui-gtk-2.0/menu.c:878 client/gui-gtk-2.0/menu.c:880
+#: client/gui-gtk-2.0/menu.c:882 client/gui-gtk-2.0/menu.c:884
+#: client/gui-gtk-2.0/menu.c:886 client/gui-gtk-2.0/menu.c:888
+#: client/gui-gtk-2.0/menu.c:890 client/gui-gtk-2.0/menu.c:892
+#: client/gui-gtk-2.0/menu.c:894 client/gui-gtk-2.0/menu.c:896
+#: client/gui-gtk-2.0/menu.c:898 client/gui-gtk-2.0/menu.c:900
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906 client/gui-gtk-2.0/menu.c:908
+#: client/gui-gtk-2.0/menu.c:910 client/gui-gtk-2.0/menu.c:912
+#: client/gui-gtk-2.0/menu.c:914 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:918 client/gui-gtk-2.0/menu.c:920
+#: client/gui-gtk-2.0/menu.c:922 client/gui-gtk-2.0/menu.c:924
+#: client/gui-gtk-2.0/menu.c:926 client/gui-gtk-2.0/menu.c:928
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
+#: client/gui-gtk-2.0/menu.c:946 data/Freeciv.in:2029
msgid "Orders"
msgstr "Ordens"
-#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:1444
+#: client/gui-gtk-2.0/menu.c:860 client/gui-gtk-2.0/menu.c:1489
#: client/gui-win32/menu.c:359
msgid "_Build City"
msgstr "Fundar _Cidade"
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:1466
-#: client/gui-gtk-2.0/menu.c:1472 client/gui-win32/menu.c:360
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:1511
+#: client/gui-gtk-2.0/menu.c:1517 client/gui-win32/menu.c:360
msgid "Build _Road"
msgstr "Construir Est_rada"
-#: client/gui-gtk-2.0/menu.c:833 client/gui-gtk-2.0/menu.c:1360
+#: 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 "Construir _Irrigação"
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:1361
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:1406
#: client/gui-win32/menu.c:362
msgid "Build _Mine"
msgstr "Construir _Mina"
-#: client/gui-gtk-2.0/menu.c:837 client/gui-gtk-2.0/menu.c:1362
+#: client/gui-gtk-2.0/menu.c:868 client/gui-gtk-2.0/menu.c:1407
msgid "Transf_orm Terrain"
msgstr "Transf_ormar Terreno"
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:1508
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:1553
#: client/gui-win32/menu.c:364
msgid "Build _Fortress"
msgstr "Construir _Fortaleza"
-#: client/gui-gtk-2.0/menu.c:841 client/gui-win32/menu.c:365
+#: client/gui-gtk-2.0/menu.c:872 client/gui-win32/menu.c:365
msgid "Build Airbas_e"
msgstr "Construir A_eroporto"
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:1514
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:1559
#: client/gui-win32/menu.c:366
msgid "Clean _Pollution"
msgstr "Limpar _Poluição"
-#: client/gui-gtk-2.0/menu.c:845 client/gui-win32/menu.c:367
+#: client/gui-gtk-2.0/menu.c:876 client/gui-win32/menu.c:367
msgid "Clean _Nuclear Fallout"
msgstr "Limpar Radiação _Nuclear"
-#: client/gui-gtk-2.0/menu.c:849 client/gui-win32/menu.c:369
+#: client/gui-gtk-2.0/menu.c:880 client/gui-win32/menu.c:369
msgid "_Sentry"
msgstr "_Sentinela"
-#: client/gui-gtk-2.0/menu.c:855 client/gui-win32/menu.c:372
+#: client/gui-gtk-2.0/menu.c:886 client/gui-win32/menu.c:372
msgid "Make _Homecity"
msgstr "Tornar Cidade Ori_gem"
-#: client/gui-gtk-2.0/menu.c:857 client/gui-win32/menu.c:373
+#: client/gui-gtk-2.0/menu.c:888 client/gui-win32/menu.c:373
#, fuzzy
msgid "_Load"
msgstr "_Desembarcar"
-#: client/gui-gtk-2.0/menu.c:859
+#: client/gui-gtk-2.0/menu.c:890
#, fuzzy
msgid "_Unload Transporter"
msgstr "Transportador"
-#: client/gui-gtk-2.0/menu.c:861 client/gui-win32/menu.c:374
+#: client/gui-gtk-2.0/menu.c:892 client/gui-win32/menu.c:374
msgid "_Unload"
msgstr "_Desembarcar"
-#: client/gui-gtk-2.0/menu.c:863 client/gui-win32/menu.c:375
+#: client/gui-gtk-2.0/menu.c:894 client/gui-win32/menu.c:375
msgid "Wake up o_thers"
msgstr "Acordar ou_tras"
-#: client/gui-gtk-2.0/menu.c:867
+#: client/gui-gtk-2.0/menu.c:898
msgid "_Auto Settler"
msgstr "Colono _Automático"
-#: client/gui-gtk-2.0/menu.c:869 client/gui-win32/menu.c:378
+#: client/gui-gtk-2.0/menu.c:900 client/gui-win32/menu.c:378
msgid "Auto E_xplore"
msgstr "E_xplorar Automaticamente"
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906
msgid "_Connect"
msgstr "_Ligar"
-#: client/gui-gtk-2.0/menu.c:871 client/gui-win32/menu.c:380
+#: client/gui-gtk-2.0/menu.c:902 client/gui-win32/menu.c:380
#, fuzzy
msgid "_Road"
msgstr "Estrada"
-#: client/gui-gtk-2.0/menu.c:873 client/gui-win32/menu.c:381
+#: client/gui-gtk-2.0/menu.c:904 client/gui-win32/menu.c:381
#, fuzzy
msgid "Rai_l"
msgstr "Veleiro"
-#: client/gui-gtk-2.0/menu.c:875 client/gui-win32/menu.c:382
+#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:382
#, fuzzy
msgid "_Irrigate"
msgstr "Fragata"
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
#, fuzzy
msgid "Go _to"
msgstr "Ir para"
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
#, fuzzy
msgid "_Build city"
msgstr "Fundar _Cidade"
-#: client/gui-gtk-2.0/menu.c:879
+#: client/gui-gtk-2.0/menu.c:910
msgid "Patrol (_Q)"
msgstr "Patrulhar (_Q)"
-#: client/gui-gtk-2.0/menu.c:881 client/gui-win32/menu.c:385
+#: client/gui-gtk-2.0/menu.c:912 client/gui-win32/menu.c:385
msgid "_Go to"
msgstr "_Ir para"
-#: client/gui-gtk-2.0/menu.c:883
+#: client/gui-gtk-2.0/menu.c:914
msgid "Go\\/Airlift to City"
msgstr "Ir\\/Aerotransportar para Cidade"
-#: client/gui-gtk-2.0/menu.c:885 client/gui-sdl/menu.c:450
+#: client/gui-gtk-2.0/menu.c:916 client/gui-sdl/menu.c:450
#: client/gui-win32/menu.c:387 client/gui-xaw/menu.c:203
msgid "Return to nearest city"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:889 client/gui-win32/menu.c:389
+#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:389
#: client/gui-xaw/menu.c:205
msgid "Disband Unit"
msgstr "Dissolver Unidade"
-#: client/gui-gtk-2.0/menu.c:891 client/gui-sdl/citydlg.c:532
+#: client/gui-gtk-2.0/menu.c:922 client/gui-sdl/citydlg.c:532
#: data/Freeciv.in:1186
msgid "Upgrade unit"
msgstr "Actualizar unidade"
-#: client/gui-gtk-2.0/menu.c:893
+#: client/gui-gtk-2.0/menu.c:924
msgid "Diplomat\\/Spy Actions"
msgstr "Acções Diplomáticas\\/Espião"
-#: client/gui-gtk-2.0/menu.c:895 client/gui-sdl/menu.c:399
+#: client/gui-gtk-2.0/menu.c:926 client/gui-sdl/menu.c:399
#: client/gui-win32/menu.c:391 client/gui-xaw/menu.c:209
msgid "Explode Nuclear"
msgstr "Detonar Arma Nuclear"
-#: client/gui-gtk-2.0/menu.c:899
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/cityrep.c:882
+msgid "Select"
+msgstr "Seleccionar"
+
+#: client/gui-gtk-2.0/menu.c:934
#, fuzzy
-msgid "Select same type"
-msgstr "Seleccione uma cidade"
+msgid "Single"
+msgstr "Selva"
+
+#: client/gui-gtk-2.0/menu.c:936
+msgid "Same Type On Tile"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:938
+msgid "All On Tile"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:940
+msgid "Same Type On Continent"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:942
+msgid "Same Type Everywhere"
+msgstr ""
-#: client/gui-gtk-2.0/menu.c:901 client/gui-win32/menu.c:393
+#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:393
msgid "_Wait"
msgstr "_Esperar"
-#: client/gui-gtk-2.0/menu.c:903 client/gui-win32/menu.c:394
+#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:394
#: client/gui-xaw/menu.c:213
msgid "Done"
msgstr "Terminado"
-#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:398
+#: client/gui-gtk-2.0/menu.c:949 client/gui-win32/menu.c:398
msgid "_Reports"
msgstr "_Relatórios"
-#: client/gui-gtk-2.0/menu.c:908 client/gui-gtk-2.0/menu.c:910
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:914
-#: client/gui-gtk-2.0/menu.c:916 client/gui-gtk-2.0/menu.c:918
-#: client/gui-gtk-2.0/menu.c:920 client/gui-gtk-2.0/menu.c:922
-#: client/gui-gtk-2.0/menu.c:924 client/gui-gtk-2.0/menu.c:926
-#: client/gui-gtk-2.0/menu.c:928 client/gui-gtk-2.0/menu.c:930
-#: client/gui-gtk-2.0/menu.c:932 data/Freeciv.in:2030
+#: client/gui-gtk-2.0/menu.c:951 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:957
+#: client/gui-gtk-2.0/menu.c:959 client/gui-gtk-2.0/menu.c:961
+#: client/gui-gtk-2.0/menu.c:963 client/gui-gtk-2.0/menu.c:965
+#: client/gui-gtk-2.0/menu.c:967 client/gui-gtk-2.0/menu.c:969
+#: client/gui-gtk-2.0/menu.c:971 client/gui-gtk-2.0/menu.c:973
+#: client/gui-gtk-2.0/menu.c:975 data/Freeciv.in:2030
msgid "Reports"
msgstr "Relatórios"
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:958
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:1001
#: client/gui-win32/menu.c:400 client/gui-win32/menu.c:425
msgid "_Units"
msgstr "_Unidades"
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/menu.c:914 client/gui-win32/menu.c:402
+#: client/gui-gtk-2.0/menu.c:957 client/gui-win32/menu.c:402
#, fuzzy
msgid "_Nations"
msgstr "_Nações"
-#: client/gui-gtk-2.0/menu.c:918 client/gui-win32/menu.c:403
+#: client/gui-gtk-2.0/menu.c:961 client/gui-win32/menu.c:403
msgid "_Economy"
msgstr "_Economia"
#. TRANS: Research report action
-#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:405
+#: client/gui-gtk-2.0/menu.c:963 client/gui-win32/menu.c:405
#, fuzzy
msgid "_Research"
msgstr "_Pesquisar"
-#: client/gui-gtk-2.0/menu.c:924 client/gui-win32/menu.c:407
+#: client/gui-gtk-2.0/menu.c:967 client/gui-win32/menu.c:407
msgid "_Wonders of the World"
msgstr "_Maravilhas do Mundo"
-#: client/gui-gtk-2.0/menu.c:926 client/gui-win32/menu.c:408
+#: client/gui-gtk-2.0/menu.c:969 client/gui-win32/menu.c:408
msgid "_Top Five Cities"
msgstr "As _Cinco Principais Cidades"
-#: client/gui-gtk-2.0/menu.c:928 client/gui-win32/menu.c:409
+#: client/gui-gtk-2.0/menu.c:971 client/gui-win32/menu.c:409
msgid "_Messages"
msgstr "_Mensagens"
-#: client/gui-gtk-2.0/menu.c:930 client/gui-win32/menu.c:410
+#: client/gui-gtk-2.0/menu.c:973 client/gui-win32/menu.c:410
msgid "_Demographics"
msgstr "_Demografia"
-#: client/gui-gtk-2.0/menu.c:932 client/gui-gtk-2.0/plrdlg.c:471
+#: client/gui-gtk-2.0/menu.c:975 client/gui-gtk-2.0/plrdlg.c:354
#: client/gui-win32/menu.c:411
msgid "_Spaceship"
msgstr "Nave e_spacial"
-#: client/gui-gtk-2.0/menu.c:936 client/gui-win32/menu.c:415
+#: client/gui-gtk-2.0/menu.c:979 client/gui-win32/menu.c:415
msgid "_Help"
msgstr "_Ajuda"
-#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
-#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
-#: client/gui-gtk-2.0/menu.c:946 client/gui-gtk-2.0/menu.c:948
-#: client/gui-gtk-2.0/menu.c:950 client/gui-gtk-2.0/menu.c:952
-#: client/gui-gtk-2.0/menu.c:954 client/gui-gtk-2.0/menu.c:956
-#: client/gui-gtk-2.0/menu.c:958 client/gui-gtk-2.0/menu.c:960
-#: client/gui-gtk-2.0/menu.c:962 client/gui-gtk-2.0/menu.c:964
-#: client/gui-gtk-2.0/menu.c:966 client/gui-gtk-2.0/menu.c:968
-#: client/gui-gtk-2.0/menu.c:970 client/gui-gtk-2.0/menu.c:972
-#: client/gui-gtk-2.0/menu.c:974 client/gui-gtk-2.0/menu.c:976
-#: client/gui-gtk-2.0/menu.c:978 client/gui-gtk-2.0/menu.c:980
+#: client/gui-gtk-2.0/menu.c:981 client/gui-gtk-2.0/menu.c:983
+#: client/gui-gtk-2.0/menu.c:985 client/gui-gtk-2.0/menu.c:987
+#: client/gui-gtk-2.0/menu.c:989 client/gui-gtk-2.0/menu.c:991
+#: client/gui-gtk-2.0/menu.c:993 client/gui-gtk-2.0/menu.c:995
+#: client/gui-gtk-2.0/menu.c:997 client/gui-gtk-2.0/menu.c:999
+#: client/gui-gtk-2.0/menu.c:1001 client/gui-gtk-2.0/menu.c:1003
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-gtk-2.0/menu.c:1007
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-gtk-2.0/menu.c:1011
+#: client/gui-gtk-2.0/menu.c:1013 client/gui-gtk-2.0/menu.c:1015
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-gtk-2.0/menu.c:1019
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-gtk-2.0/menu.c:1023
#: client/gui-gtk-2.0/repodlgs.c:313 client/gui-win32/citydlg.c:1077
#: client/gui-win32/repodlgs.c:289 client/gui-win32/wldlg.c:846
#: data/Freeciv.in:1466 data/Freeciv.in:2031 data/Freeciv.in:2101
@@ -12038,119 +12254,119 @@ msgstr "_Ajuda"
msgid "Help"
msgstr "Ajuda"
-#: client/gui-gtk-2.0/menu.c:940 client/gui-win32/menu.c:416
+#: client/gui-gtk-2.0/menu.c:983 client/gui-win32/menu.c:416
msgid "Language_s"
msgstr "Idioma_s"
-#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/menu.c:417
+#: client/gui-gtk-2.0/menu.c:985 client/gui-win32/menu.c:417
msgid "Co_nnecting"
msgstr "_Ligar"
-#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:418
+#: client/gui-gtk-2.0/menu.c:987 client/gui-win32/menu.c:418
msgid "C_ontrols"
msgstr "C_ontrolos"
-#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:419
+#: client/gui-gtk-2.0/menu.c:989 client/gui-win32/menu.c:419
msgid "C_hatline"
msgstr "Lin_ha de Diálogo"
-#: client/gui-gtk-2.0/menu.c:948 client/gui-win32/menu.c:420
+#: client/gui-gtk-2.0/menu.c:991 client/gui-win32/menu.c:420
msgid "_Worklist Editor"
msgstr "Editor _Lista de Tarefas"
-#: client/gui-gtk-2.0/menu.c:950 client/gui-win32/menu.c:421
+#: client/gui-gtk-2.0/menu.c:993 client/gui-win32/menu.c:421
msgid "Citizen _Management"
msgstr "_Gestão de Cidadãos"
-#: client/gui-gtk-2.0/menu.c:952 client/gui-win32/menu.c:422
+#: client/gui-gtk-2.0/menu.c:995 client/gui-win32/menu.c:422
msgid "_Playing"
msgstr "_Jogar"
-#: client/gui-gtk-2.0/menu.c:956 client/gui-win32/menu.c:424
+#: client/gui-gtk-2.0/menu.c:999 client/gui-win32/menu.c:424
msgid "City _Improvements"
msgstr "Construções C_idade"
-#: client/gui-gtk-2.0/menu.c:960 client/gui-win32/menu.c:426
+#: client/gui-gtk-2.0/menu.c:1003 client/gui-win32/menu.c:426
msgid "Com_bat"
msgstr "Com_bate"
-#: client/gui-gtk-2.0/menu.c:962 client/gui-win32/menu.c:427
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-win32/menu.c:427
msgid "_ZOC"
msgstr "_ZDC"
-#: client/gui-gtk-2.0/menu.c:964 client/gui-win32/menu.c:428
+#: client/gui-gtk-2.0/menu.c:1007 client/gui-win32/menu.c:428
msgid "Techno_logy"
msgstr "Tecno_logia"
-#: client/gui-gtk-2.0/menu.c:966 client/gui-win32/menu.c:429
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-win32/menu.c:429
msgid "_Terrain"
msgstr "_Terreno"
-#: client/gui-gtk-2.0/menu.c:968 client/gui-win32/menu.c:430
+#: client/gui-gtk-2.0/menu.c:1011 client/gui-win32/menu.c:430
msgid "Won_ders"
msgstr "_Maravilhas"
-#: client/gui-gtk-2.0/menu.c:972 client/gui-win32/menu.c:432
+#: client/gui-gtk-2.0/menu.c:1015 client/gui-win32/menu.c:432
msgid "Happin_ess"
msgstr "F_elicidade"
-#: client/gui-gtk-2.0/menu.c:974 client/gui-win32/menu.c:433
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-win32/menu.c:433
msgid "Space _Race"
msgstr "Co_rrida Espacial"
-#: client/gui-gtk-2.0/menu.c:978 client/gui-win32/menu.c:435
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-win32/menu.c:435
msgid "_Copying"
msgstr "_Licença"
-#: client/gui-gtk-2.0/menu.c:980 client/gui-win32/menu.c:436
+#: client/gui-gtk-2.0/menu.c:1023 client/gui-win32/menu.c:436
msgid "_About"
msgstr "_Sobre"
-#: client/gui-gtk-2.0/menu.c:1264
+#: client/gui-gtk-2.0/menu.c:1307
#, c-format
msgid "%s..."
msgstr ""
-#: client/gui-gtk-2.0/menu.c:1352
+#: client/gui-gtk-2.0/menu.c:1397
#, c-format
msgid "Change to %s (_I)"
msgstr "Alterar para %s (_I)"
-#: client/gui-gtk-2.0/menu.c:1353
+#: client/gui-gtk-2.0/menu.c:1398
#, c-format
msgid "Change to %s (_M)"
msgstr "Alterar para %s (_M)"
-#: client/gui-gtk-2.0/menu.c:1354
+#: client/gui-gtk-2.0/menu.c:1399
#, c-format
msgid "Transf_orm to %s"
msgstr "Transf_ormar em %s"
-#: client/gui-gtk-2.0/menu.c:1427
+#: client/gui-gtk-2.0/menu.c:1472
msgid "Help _Build Wonder"
msgstr "Ajudar a Construir _Maravilha"
-#: client/gui-gtk-2.0/menu.c:1441
+#: client/gui-gtk-2.0/menu.c:1486
msgid "Add to City (_B)"
msgstr "Juntar à Cidade (_B)"
-#: client/gui-gtk-2.0/menu.c:1449
+#: client/gui-gtk-2.0/menu.c:1494
msgid "Make Trade _Route"
msgstr "Estabelecer _Rota Comercial"
-#: client/gui-gtk-2.0/menu.c:1463
+#: client/gui-gtk-2.0/menu.c:1508
msgid "Build _Railroad"
msgstr "Construir Fe_rrovia"
-#: client/gui-gtk-2.0/menu.c:1486
+#: client/gui-gtk-2.0/menu.c:1531
msgid "Bu_ild Farmland"
msgstr "Construir _Quinta"
-#: client/gui-gtk-2.0/menu.c:1506
+#: client/gui-gtk-2.0/menu.c:1551
msgid "_Fortify"
msgstr "_Fortificar"
-#: client/gui-gtk-2.0/menu.c:1512
+#: client/gui-gtk-2.0/menu.c:1557
msgid "_Paradrop"
msgstr "Lançar _Páraquedas"
@@ -12185,13 +12401,32 @@ msgstr "Men"
msgid "Pop"
msgstr "Ind"
-#: client/gui-gtk-2.0/messagewin.c:155 client/gui-sdl/messagewin.c:247
+#: client/gui-gtk-2.0/messagewin.c:186 client/gui-sdl/messagewin.c:247
#: client/gui-win32/messagewin.c:132 client/gui-xaw/menu.c:228
#: data/Freeciv.in:3273 data/Freeciv.in:3274 data/Freeciv.in:3283
msgid "Messages"
msgstr "Mensagens"
-#: client/gui-gtk-2.0/plrdlg.c:330
+#: client/gui-gtk-2.0/plrdlg.c:317
+msgid "_Meet"
+msgstr "E_ncontrar"
+
+#: client/gui-gtk-2.0/plrdlg.c:323
+#, fuzzy
+msgid "Cancel _Treaty"
+msgstr "_Cancelar Tratado"
+
+#: client/gui-gtk-2.0/plrdlg.c:329
+#, fuzzy
+msgid "_Withdraw Vision"
+msgstr "Retirar _visão"
+
+#: client/gui-gtk-2.0/plrdlg.c:348
+#, fuzzy
+msgid "_Report"
+msgstr "_Relatórios"
+
+#: client/gui-gtk-2.0/plrdlg.c:386
msgid "?show:Dead Players"
msgstr ""
@@ -12199,291 +12434,294 @@ msgstr ""
#. TRANS: Nations report action
#. TRANS: Nations report title
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/plrdlg.c:350 client/gui-sdl/mapctrl.c:1580
+#: client/gui-gtk-2.0/plrdlg.c:406 client/gui-sdl/mapctrl.c:1580
#: client/gui-sdl/plrdlg.c:608 client/gui-win32/plrdlg.c:344
#: client/gui-xaw/menu.c:221 data/Freeciv.in:3192 data/Freeciv.in:3193
#, fuzzy
msgid "Nations"
msgstr "Nação"
-#: client/gui-gtk-2.0/plrdlg.c:443
-msgid "_Intelligence"
-msgstr "_Espionagem"
-
-#: client/gui-gtk-2.0/plrdlg.c:450
-msgid "_Meet"
-msgstr "E_ncontrar"
-
-#: client/gui-gtk-2.0/plrdlg.c:457
+#: client/gui-gtk-2.0/plrdlg.c:511
#, fuzzy
-msgid "Cancel _Treaty"
-msgstr "_Cancelar Tratado"
+msgid "Di_plomacy"
+msgstr "Diplomata"
-#: client/gui-gtk-2.0/plrdlg.c:464
-msgid "_Withdraw vision"
-msgstr "Retirar _visão"
+#: client/gui-gtk-2.0/plrdlg.c:516
+msgid "_Intelligence"
+msgstr "_Espionagem"
-#: client/gui-gtk-2.0/plrdlg.c:495
+#: client/gui-gtk-2.0/plrdlg.c:526
#, fuzzy
msgid "_AI"
msgstr "IA"
-#: client/gui-gtk-2.0/plrdlg.c:501
+#: client/gui-gtk-2.0/plrdlg.c:532
msgid "_Toggle AI Mode"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:208
+#: client/gui-gtk-2.0/pages.c:221
#, fuzzy
msgid "Start _New Game"
msgstr "Iniciar Novo Jogo"
-#: client/gui-gtk-2.0/pages.c:214
+#: client/gui-gtk-2.0/pages.c:227
#, fuzzy
msgid "Start _Scenario Game"
msgstr "Iniciar Novo Jogo"
-#: client/gui-gtk-2.0/pages.c:220
+#: client/gui-gtk-2.0/pages.c:233
#, fuzzy
msgid "_Load Saved Game"
msgstr "Ler Jogo"
-#: client/gui-gtk-2.0/pages.c:229
+#: client/gui-gtk-2.0/pages.c:239
msgid "C_onnect to Network Game"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:236
+#: client/gui-gtk-2.0/pages.c:247
#, fuzzy
msgid "Connect to Gaming _Zone"
msgstr "Ligar a esta localização"
-#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:300
#: client/gui-xaw/connectdlg.c:326
msgid "Passwords don't match, enter password."
msgstr ""
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:779 client/gui-gtk-2.0/pages.c:820
+#: client/gui-win32/connectdlg.c:916
msgid "Server Name"
msgstr "Nome Servidor"
-#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
+#: 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
+#: data/Freeciv.in:96
msgid "Port"
msgstr "Porto"
-#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
+#: client/gui-win32/connectdlg.c:917
msgid "Version"
msgstr "Versão"
-#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
-#: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
+#: 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
msgid "Status"
msgstr "Estado"
-#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
-#: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
+#: 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
msgid "Players"
msgstr "Jogadores"
-#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
+#: client/gui-win32/connectdlg.c:918
msgid "Comment"
msgstr "Observações"
-#: client/gui-gtk-2.0/pages.c:747
+#: client/gui-gtk-2.0/pages.c:786
msgid "Local _Area Network"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:783
+#: client/gui-gtk-2.0/pages.c:827
#, fuzzy
msgid "Internet _Metaserver"
msgstr "Metaservidor"
-#: client/gui-gtk-2.0/pages.c:817
+#: client/gui-gtk-2.0/pages.c:864
msgid "_Host:"
msgstr "_Servidor:"
-#: client/gui-gtk-2.0/pages.c:834
+#: client/gui-gtk-2.0/pages.c:881
msgid "_Port:"
msgstr "_Porto:"
-#: client/gui-gtk-2.0/pages.c:851
+#: client/gui-gtk-2.0/pages.c:898
#, fuzzy
msgid "_Login:"
msgstr "Legião"
-#: client/gui-gtk-2.0/pages.c:869
+#: client/gui-gtk-2.0/pages.c:916
msgid "Pass_word:"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:887
+#: client/gui-gtk-2.0/pages.c:934
msgid "Conf_irm Password:"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:912
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: 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/wldlg.c:800 client/gui-win32/wldlg.c:806
+msgid "Type"
+msgstr "Tipo"
+
+#: client/gui-gtk-2.0/pages.c:952 client/gui-win32/plrdlg.c:337
+#: data/Freeciv.in:88
+msgid "Host"
+msgstr "Servidor"
+
+#: client/gui-gtk-2.0/pages.c:981
#, fuzzy
msgid "C_onnect"
msgstr "Ligar"
-#: client/gui-gtk-2.0/pages.c:1142
+#: client/gui-gtk-2.0/pages.c:1211
#, fuzzy, c-format
msgid "Connection name: %s"
msgstr "A Ligar"
-#: client/gui-gtk-2.0/pages.c:1145
+#: client/gui-gtk-2.0/pages.c:1214
#, fuzzy, c-format
msgid "Player name: %s"
msgstr "?city:Nome"
-#: client/gui-gtk-2.0/pages.c:1150
+#: client/gui-gtk-2.0/pages.c:1219
#, fuzzy, c-format
msgid "Host: %s"
msgstr "Máquina:"
-#: client/gui-gtk-2.0/pages.c:1158
+#: client/gui-gtk-2.0/pages.c:1227
msgid "Player/conn info"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1185
+#: client/gui-gtk-2.0/pages.c:1254
#, fuzzy, c-format
msgid "%s info"
msgstr "Informação cidade"
-#: client/gui-gtk-2.0/pages.c:1196
+#: client/gui-gtk-2.0/pages.c:1265
#, fuzzy
msgid "Toggle player ready"
msgstr "aitoggle <nome-de-jogador>"
-#: client/gui-gtk-2.0/pages.c:1204
+#: client/gui-gtk-2.0/pages.c:1273
#, fuzzy
msgid "Pick nation"
msgstr "Esquadra de PolÃcia"
-#: client/gui-gtk-2.0/pages.c:1214
+#: client/gui-gtk-2.0/pages.c:1283
msgid "Observe this player"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1221
+#: client/gui-gtk-2.0/pages.c:1290
#, fuzzy
msgid "Take this player"
msgstr "Cidades"
-#: client/gui-gtk-2.0/pages.c:1238
+#: client/gui-gtk-2.0/pages.c:1307
#, fuzzy
msgid "Cut connection"
msgstr "A terminar a ligação %s."
-#: client/gui-gtk-2.0/pages.c:1248
+#: client/gui-gtk-2.0/pages.c:1317
#, fuzzy
msgid "Aitoggle player"
msgstr "aitoggle <nome-de-jogador>"
-#: client/gui-gtk-2.0/pages.c:1257
+#: client/gui-gtk-2.0/pages.c:1326
#, fuzzy
msgid "Remove player"
msgstr "A remover o jogador %s."
-#: client/gui-gtk-2.0/pages.c:1268
+#: client/gui-gtk-2.0/pages.c:1337
msgid "Give info access"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1276
+#: client/gui-gtk-2.0/pages.c:1345
msgid "Give ctrl access"
msgstr ""
#. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1338
+#: client/gui-gtk-2.0/pages.c:1407
#, fuzzy, c-format
msgid "Put on %s"
msgstr "População: %s"
-#: client/gui-gtk-2.0/pages.c:1442
+#: client/gui-gtk-2.0/pages.c:1511
#, fuzzy
msgid "Number of _Players (including AI):"
msgstr "Número de jogadores a encher com IA's"
-#: client/gui-gtk-2.0/pages.c:1465
+#: client/gui-gtk-2.0/pages.c:1534
msgid "AI Skill _Level:"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1481
+#: client/gui-gtk-2.0/pages.c:1550
#, fuzzy
msgid "Ruleset _Version:"
msgstr "_Pré-definições:"
-#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
#, fuzzy
msgid "_More Game Options..."
msgstr "Opções das Mensagens..."
-#: client/gui-gtk-2.0/pages.c:1514
+#: client/gui-gtk-2.0/pages.c:1583
#, fuzzy
msgid "Record"
msgstr "Relatório"
-#: client/gui-gtk-2.0/pages.c:1519
+#: client/gui-gtk-2.0/pages.c:1588
#, fuzzy
msgid "Rating"
msgstr "A aguardar"
-#: client/gui-gtk-2.0/pages.c:1525
+#: client/gui-gtk-2.0/pages.c:1594
#, fuzzy
msgid "Ready"
msgstr "Activar todas"
-#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
-#: data/nation/slovakian.ruleset:26
-msgid "Leader"
-msgstr "Lider"
+#: client/gui-gtk-2.0/pages.c:1601
+#, fuzzy
+msgid "?player:Leader"
+msgstr "?city:Nome"
-#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1732 client/gui-sdl/chatline.c:185
msgid "Choose Saved Game to Load"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1752
+#: client/gui-gtk-2.0/pages.c:1824
msgid "Choose Saved Game to _Load:"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
-#: client/gui-gtk-2.0/pages.c:2375
+#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
+#: client/gui-gtk-2.0/pages.c:2451
msgid "_Browse..."
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1839
+#: client/gui-gtk-2.0/pages.c:1911
#, fuzzy
msgid "Choose a Scenario"
msgstr "Ler Cenário"
-#: client/gui-gtk-2.0/pages.c:1926
+#: client/gui-gtk-2.0/pages.c:1998
#, fuzzy
msgid "Choose a _Scenario:"
msgstr "Ler Cenário"
-#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
-#: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
-#: client/gui-win32/wldlg.c:806
-msgid "Type"
-msgstr "Tipo"
-
-#: client/gui-gtk-2.0/pages.c:2101
+#: client/gui-gtk-2.0/pages.c:2173
#, fuzzy
msgid "Choose a _nation to play:"
msgstr "Seleccionar actividade da unidade:"
-#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2363 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:2372 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2448 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr "Gravar Jogo"
-#: client/gui-gtk-2.0/pages.c:2413
+#: client/gui-gtk-2.0/pages.c:2489
#, fuzzy
msgid "Saved _Games:"
msgstr "Gravar Jogo"
-#: client/gui-gtk-2.0/pages.c:2440
+#: client/gui-gtk-2.0/pages.c:2516
#, fuzzy
msgid "Save _Filename:"
msgstr "Gravar Jogo"
@@ -12842,7 +13080,7 @@ msgstr "Fechar diálogo"
msgid "Total users logged in : %d"
msgstr ""
-#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1094
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
#, fuzzy
msgid "Back"
msgstr "Banco"
@@ -12853,7 +13091,7 @@ msgid "Start"
msgstr "Estado"
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:775
+#: client/gui-win32/connectdlg.c:777
msgid "Load Game"
msgstr "Ler Jogo"
@@ -12892,12 +13130,12 @@ msgid "Make new homecity"
msgstr "Tornar cidade origem"
#: client/gui-sdl/citydlg.c:546 client/gui-sdl/citydlg.c:1418
-#: client/gui-sdl/connectdlg.c:307 client/gui-sdl/connectdlg.c:616
-#: client/gui-sdl/connectdlg.c:802 client/gui-sdl/connectdlg.c:984
+#: 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/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1039
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
#: 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
@@ -12945,7 +13183,7 @@ msgstr "Comprar!"
#: client/gui-sdl/diplodlg.c:1335 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:2427
+#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
#: client/gui-xaw/cityrep.c:666 client/gui-xaw/cma_fe.c:327
#: client/gui-xaw/cma_fe.c:511 client/gui-xaw/cma_fe.c:765
#: client/gui-xaw/messagedlg.c:72 client/gui-xaw/optiondlg.c:76
@@ -12961,7 +13199,7 @@ msgstr "Não"
#: client/gui-sdl/diplodlg.c:1345 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:2427 client/gui-xaw/cityrep.c:666
+#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
#: client/gui-xaw/cma_fe.c:327 client/gui-xaw/cma_fe.c:511
#: client/gui-xaw/cma_fe.c:765 client/gui-xaw/messagedlg.c:72
#: client/gui-xaw/optiondlg.c:76 client/gui-xaw/optiondlg.c:304
@@ -13264,40 +13502,40 @@ msgstr "Aplicar uma v_ez"
msgid "Release city"
msgstr "Libe_rtar cidade"
-#: client/gui-sdl/connectdlg.c:238
+#: client/gui-sdl/connectdlg.c:239
#, fuzzy
msgid "Creating Server List..."
msgstr "Selecção Servidor Freeciv"
-#: client/gui-sdl/connectdlg.c:279 client/gui-sdl/connectdlg.c:343
+#: client/gui-sdl/connectdlg.c:280 client/gui-sdl/connectdlg.c:344
msgid "No LAN servers found"
msgstr ""
-#: client/gui-sdl/connectdlg.c:281 client/gui-sdl/connectdlg.c:345
+#: client/gui-sdl/connectdlg.c:282 client/gui-sdl/connectdlg.c:346
msgid "No public servers found"
msgstr ""
-#: client/gui-sdl/connectdlg.c:555
+#: client/gui-sdl/connectdlg.c:556
#, fuzzy
msgid "Player Name :"
msgstr "?city:Nome"
-#: client/gui-sdl/connectdlg.c:571
+#: client/gui-sdl/connectdlg.c:572
#, fuzzy
msgid "Freeciv Server :"
msgstr "Selecção Servidor Freeciv"
-#: client/gui-sdl/connectdlg.c:588
+#: client/gui-sdl/connectdlg.c:589
#, fuzzy
msgid "Port :"
msgstr "Porto:"
-#: client/gui-sdl/connectdlg.c:608 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr "Ligar"
-#: client/gui-sdl/connectdlg.c:794 client/gui-sdl/connectdlg.c:977
+#: client/gui-sdl/connectdlg.c:795 client/gui-sdl/connectdlg.c:978
#: client/gui-xaw/connectdlg.c:145
msgid "Next"
msgstr ""
@@ -13589,7 +13827,7 @@ msgstr ""
#: client/gui-sdl/graphics.c:1021
#, c-format
-msgid "Unable to initialize SDL_ttf library: %s"
+msgid "Unable to initialize SDL_ttf library: %s"
msgstr ""
#: client/gui-sdl/graphics.c:1058
@@ -13675,12 +13913,6 @@ msgstr ""
msgid "Waiting for the beginning of the game"
msgstr ""
-#: client/gui-sdl/gui_string.c:608
-msgid ""
-"Couldn't find stdfont.ttf file. Please link/copy/move anyunicode ttf font to "
-"data dir as stdfont.ttf"
-msgstr ""
-
#. TRANS: Future Technology
#: client/gui-sdl/gui_tilespec.c:506
msgid "FT"
@@ -14294,12 +14526,12 @@ msgid "Leave Game"
msgstr "Gravar Jogo"
#: client/gui-sdl/optiondlg.c:2302 client/gui-sdl/pages.c:255
-#: client/gui-win32/connectdlg.c:1098 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1100 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:963
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
msgid "Start New Game"
msgstr "Iniciar Novo Jogo"
@@ -14425,8 +14657,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:1081
-#: client/gui-win32/connectdlg.c:1089 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
+#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
msgid "Update"
msgstr "Actualizar"
@@ -14849,10 +15081,6 @@ msgstr "Alterar Todas"
msgid "Refresh"
msgstr "Actualizar (Lista)"
-#: client/gui-win32/cityrep.c:882
-msgid "Select"
-msgstr "Seleccionar"
-
#: client/gui-win32/cityrep.c:883
msgid "Configure"
msgstr "Configurar"
@@ -14904,60 +15132,60 @@ msgstr "Incapaz de ler o ficheiro de jogo gravado: %s"
msgid "Verify Password"
msgstr ""
-#: client/gui-win32/connectdlg.c:912 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr "Selecção Servidor Freeciv"
-#: client/gui-win32/connectdlg.c:913
+#: client/gui-win32/connectdlg.c:915
msgid "Local Area Network"
msgstr ""
-#: client/gui-win32/connectdlg.c:947
+#: client/gui-win32/connectdlg.c:949
#, fuzzy
msgid "Welcome to Freeciv"
msgstr "Cliente para o Freeciv"
-#: client/gui-win32/connectdlg.c:965
+#: client/gui-win32/connectdlg.c:967
#, fuzzy
msgid "Load Saved Game"
msgstr "Gravar Jogo"
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
msgid "Connect To Network Game"
msgstr ""
-#: client/gui-win32/connectdlg.c:977
+#: client/gui-win32/connectdlg.c:979
msgid "Choose a nation to play"
msgstr ""
-#: client/gui-win32/connectdlg.c:1012
+#: client/gui-win32/connectdlg.c:1014
#, fuzzy
msgid "Number of players (Including AI):"
msgstr "Número de jogadores a encher com IA's"
-#: client/gui-win32/connectdlg.c:1020
+#: client/gui-win32/connectdlg.c:1022
msgid "AI skill level:"
msgstr ""
-#: client/gui-win32/connectdlg.c:1034 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
#, fuzzy
msgid "Game Options"
msgstr "Opções das Mensagens"
-#: client/gui-win32/connectdlg.c:1038
+#: client/gui-win32/connectdlg.c:1040
msgid "Start Game"
msgstr "Iniciar Jogo"
-#: client/gui-win32/connectdlg.c:1057
+#: client/gui-win32/connectdlg.c:1059
#, fuzzy
msgid "Login:"
msgstr "Legião"
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
msgid "Host:"
msgstr "Máquina:"
-#: client/gui-win32/connectdlg.c:1060
+#: client/gui-win32/connectdlg.c:1062
msgid "Port:"
msgstr "Porto:"
@@ -15222,10 +15450,6 @@ msgid_plural "(idle %d turns)"
msgstr[0] "(inactivo à %d turno)"
msgstr[1] "(inactivo à %d turnos)"
-#: client/gui-win32/plrdlg.c:337 data/Freeciv.in:88
-msgid "Host"
-msgstr "Servidor"
-
#: client/gui-win32/plrdlg.c:355 data/Freeciv.in:3230
msgid "Intelligence"
msgstr "Espionagem"
@@ -16977,12 +17201,12 @@ msgstr ""
#: data/helpdata.txt:781
msgid ""
-" To have a diplomatic relationship with another player, you must fist "
-"establish first contact with that player. To establish first contact, you "
-"have to move one of your units next to a city or unit belonging to that "
-"player, or vice versa. Unless you establish an embassy with that player, you "
-"may again lose contact with them after a set number of turns without direct "
-"physical contact."
+" To have a diplomatic relationship with another player, you must first "
+"establish contact with that player. To establish contact, you have to move "
+"one of your units next to a city or unit belonging to that player, or vice "
+"versa. Unless you establish an embassy with that player, you may again lose "
+"contact with them after a set number of turns without direct physical "
+"contact."
msgstr ""
#: data/helpdata.txt:788
@@ -19844,7 +20068,7 @@ msgid "Communism"
msgstr "Comunismo"
#: data/default/governments.ruleset:121 data/civ2/governments.ruleset:118
-#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:26
+#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:27
msgid "Comrade"
msgstr "Camarada"
@@ -20854,6 +21078,11 @@ msgstr ""
"esforço pode ser desperdiçado, e um grupo de Colonos e/ou Engenheiros é "
"altamente vulnerável a ataques inimigos."
+#: data/default/units.ruleset:238
+#, fuzzy
+msgid "?unit:Workers"
+msgstr "Operários"
+
#: data/default/units.ruleset:264
#, fuzzy
msgid ""
@@ -21524,6 +21753,11 @@ msgstr "Explorador"
msgid "Explorers are very useful for mapping unknown territory."
msgstr "Exploradores são muito úteis para mapear território desconhecido."
+#: data/default/units.ruleset:1864
+#, fuzzy
+msgid "?unit:Leader"
+msgstr "Lider"
+
#: data/default/units.ruleset:1892
msgid "This is you. If you lose this unit, you lose the game. So don't."
msgstr ""
@@ -21790,7 +22024,7 @@ msgid "Emir"
msgstr ""
#: data/nation/afghani.ruleset:25 data/nation/slovakian.ruleset:30
-#: data/nation/soviet.ruleset:27
+#: data/nation/soviet.ruleset:28
#, fuzzy
msgid "General Secretary"
msgstr "Primeiro Secretário"
@@ -21917,7 +22151,7 @@ msgstr "?plural:Americanos"
msgid ""
"According to legend, the Armenian people are the descendants of Haik - the "
"great-great-grandson of Noah. The modern Republic of Armenia gained "
-"independence from Soviet in 1991 AD"
+"independence from the Soviet Union in 1991."
msgstr ""
#: data/nation/assyrian.ruleset:3
@@ -22978,12 +23212,11 @@ msgstr "?plural:Italianos"
#: data/nation/illyrian.ruleset:6
msgid ""
-"Illyrians were Indo-European tribes who appeared in the western part of the "
-"Balkan Peninsula before 1000 BC, including the Dalmatians to the north, "
-"Corcyra island and Ambracia bay in prehistoric Epirus to the south, mixing "
-"with Thracians in Dardania to the east, and settling Messapia across the "
-"Adriatic Sea. Illyrian kingdoms were independent for centuries, until "
-"conquered by the Roman Republic."
+"Illyrians were Indo-European tribes who appeared in the western part of the "
+"Balkan Peninsula before 1000 BC, including Corcyra island and Ambracia bay "
+"in prehistoric Epirus to the south. They mixed with Thracians in Dardania to "
+"the east, and settled Messapia across the Adriatic Sea. Illyrian kingdoms "
+"were independent for centuries, until conquered by the Roman Republic."
msgstr ""
#: data/nation/inca.ruleset:3
@@ -23301,7 +23534,7 @@ msgid ""
"1953."
msgstr ""
-#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:28
+#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:29
#, fuzzy
msgid "Great Leader"
msgstr "Maravilha"
@@ -23478,9 +23711,9 @@ msgstr "?plural:Italianos"
msgid ""
"Sub-Saharan Africa has been a cultural and ethnical melting pot for "
"millennia. In medieval times, the region was home to a succession of empires "
-"called the Sahelian kingdoms. Of these, the Islamic Mali empire with it's "
+"called the Sahelian kingdoms. Of these, the Islamic Mali empire with its "
"capital in Timbuktu was the most influential. This empire reigned from the "
-"14th to the 17th century and was famed for it's wealth and benevolent kings. "
+"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 ""
@@ -23549,8 +23782,8 @@ msgstr "?plural:Italianos"
#: data/nation/mayan.ruleset:6
msgid ""
-"The Mayans were a Mesoamerican civilization. Famous for building great "
-"pyramids and palaces in the jungle."
+"The Mayans were a Mesoamerican civilization. They are famous for building "
+"great pyramids and palaces in the jungle."
msgstr ""
#: data/nation/mayan.ruleset:19
@@ -24100,6 +24333,16 @@ msgstr ""
"A República Checa actual foi até 1933 parte da Checoslováquia, que tinha "
"sido até 1918 parte do Império Austro-Húngaro."
+#: data/nation/slovakian.ruleset:26
+#, fuzzy
+msgid "?male:Leader"
+msgstr "Lider"
+
+#: data/nation/slovakian.ruleset:26
+#, fuzzy
+msgid "?female:Leader"
+msgstr "Camarada"
+
#: data/nation/slovakian.ruleset:29
#, fuzzy
msgid "Pope"
@@ -24144,11 +24387,12 @@ msgstr "?plural:Escoceses"
#: data/nation/soviet.ruleset:6
msgid ""
-"Soviet Union's history starts in November 1917, when under Lenin's "
+"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 "
-"republics integrated into one country. Soviet Union became one of most "
-"powerful states in the 20th century. But by the end of 1991 due to many "
-"social shocks it disintegrated into fifteen independent countries"
+"republics integrated into one country. The Soviet Union became one of most "
+"powerful states in the 20th century, but by the end of 1991 it had "
+"disintegrated into fifteen independent countries due to social and economic "
+"problems."
msgstr ""
#: data/nation/spanish.ruleset:3
@@ -24564,8 +24808,8 @@ msgstr "?plural:Italianos"
#: data/nation/westphalian.ruleset:6
msgid ""
-"Westphalia, before becoming a Prussian province, was the western region the "
-"duchy of Saxony. Present-day it consists of the Northern part of the largest "
+"Westphalia, before becoming a Prussian province, was the western region of "
+"the duchy of Saxony. Today it makes up the northern part of the largest "
"German federal state, North Rhine-Westphalia."
msgstr ""
@@ -24718,7 +24962,7 @@ msgid ""
"The flag and background color indicate what civilization the city\n"
"belongs to (this will be useful when you meet other civilizations).\n"
"The top row of the bar also shows the name and size of the city, and\n"
-"will show one or more starts to indicate if there are units in the\n"
+"will show one or more stars to indicate if there are units in the\n"
"city. The bottom row shows what the city is building, and how long it\n"
"will take; it also shows how long the city will take to grow to the\n"
"next largest size."
@@ -24774,7 +25018,7 @@ msgid ""
"Now your city has grown to size five. As cities get larger unrest\n"
"becomes a problem. A city of this size will usually have one unhappy\n"
"citizen unless pacifying effects are used; meaning one entertainer\n"
-"specialist is required to keep your citzens content. This is basically\n"
+"specialist is required to keep your citizens content. This is basically\n"
"a wasted citizen.\n"
"\n"
"There are several things that can be done about this. One quick fix\n"
@@ -24846,7 +25090,7 @@ msgid ""
"existing cities. Generally when building new cities you want to make\n"
"sure that all tiles are covered by at least one city, but after that\n"
"it is best that your cities overlap as little as possible. Spreading\n"
-"out cities properly gives each city access to more resrouces, allowing\n"
+"out cities properly gives each city access to more resources, allowing\n"
"them to grow to larger sizes."
msgstr ""
@@ -25160,6 +25404,55 @@ msgstr "Equipa 30"
msgid "Team 31"
msgstr "Equipa 31"
+#, fuzzy
+#~ msgid "Auth config filename \"%s\" not allowed!"
+#~ msgstr "Que ligações são permitidas"
+
+#, fuzzy
+#~ msgid "The %s of the %s (%s)"
+#~ msgstr "O %s dos %s"
+
+#, fuzzy
+#~ msgid "%s territory"
+#~ msgstr "O %s dos"
+
+#, fuzzy
+#~ msgid "%s territory (%d turn cease-fire)"
+#~ msgid_plural "%s territory (%d turn cease-fire)"
+#~ msgstr[0] "Unidade: %s(%s%s)"
+#~ msgstr[1] "Unidade: %s(%s%s)"
+
+#, fuzzy
+#~ msgid "%s territory (%s)"
+#~ msgstr "O %s dos %s"
+
+#, fuzzy
+#~ msgid "City: %s (%s)"
+#~ msgstr "Cidade: %s(%s)"
+
+#, fuzzy
+#~ msgid "Unit: %s (%s)"
+#~ msgstr "Unidade: %s(%s)"
+
+#, fuzzy
+#~ msgid "%s of the %s"
+#~ msgstr "O %s dos %s"
+
+#~ msgid "no maximum, "
+#~ msgstr "sem máximo, "
+
+#~ msgid "%d unit maximum, "
+#~ msgid_plural "%d units maximum, "
+#~ msgstr[0] "%d unidade no máximo, "
+#~ msgstr[1] "%d unidades no máximo, "
+
+#~ msgid "%d per unit). "
+#~ msgstr "%d por unidade). "
+
+#, fuzzy
+#~ msgid "Select same type"
+#~ msgstr "Seleccione uma cidade"
+
#~ msgid "Units: "
#~ msgstr "Unidades: "
@@ -25249,10 +25542,6 @@ msgstr "Equipa 31"
#~ msgstr ", nação %s"
#, fuzzy
-#~ msgid ", team %s"
-#~ msgstr " próximo de %s"
-
-#, fuzzy
#~ msgid "_Map"
#~ msgstr "_Mapas"
@@ -27028,10 +27317,6 @@ msgstr "Equipa 31"
#~ msgstr "Erro ao criar novo jogador IA: %s\n"
#, fuzzy
-#~ msgid "Metaserver topic string set to '%s'."
-#~ msgstr "Expressão info no metaservidor definida para '%s'."
-
-#, fuzzy
#~ msgid "Metaserver topic string set to '%s', not reporting to metaserver."
#~ msgstr "Expressão info no metaservidor definida para '%s'."
@@ -28326,9 +28611,6 @@ msgstr "Equipa 31"
#~ msgid "("
#~ msgstr "("
-#~ msgid "Location: (%d, %d)"
-#~ msgstr "Localização: (%d, %d)"
-
#~ msgid "_Kingdom"
#~ msgstr "_Reino"
diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo
index bb21044..b616fdb 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 4a5a462..5eb3438 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Freeciv 2.1.0-beta3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 07:45+0900\n"
+"POT-Creation-Date: 2009-03-29 21:13+0900\n"
"PO-Revision-Date: 2007-09-01 23:06+0300\n"
"Last-Translator: Jose Carlos Medeiros <jose at psabs.com.br>\n"
"Language-Team: Portuguese/Brazil <gnome-l10n-br at listas.cipsga.org.br>\n"
@@ -637,7 +637,7 @@ msgid "Road"
msgstr "Estrada"
#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
-#: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
+#: client/gui-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"
@@ -654,7 +654,7 @@ msgid "Mine"
msgstr "Mina"
#: common/terrain.c:396 common/unit.c:548 server/report.c:124
-#: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
+#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr "Poluição"
@@ -700,7 +700,7 @@ msgstr "Guardado"
msgid "Sentry"
msgstr "Sentinela"
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:851 client/gui-sdl/menu.c:648
+#: common/unit.c:566 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"
@@ -717,7 +717,7 @@ msgstr "Explorar"
msgid "Transform"
msgstr "Transformar"
-#: common/unit.c:584 client/text.c:106 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:584 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"
@@ -786,11 +786,11 @@ msgstr "Nuclear"
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1406
+#: common/unittype.c:349 client/helpdata.c:1404
msgid " and "
msgstr " e "
-#: common/unittype.c:355 client/helpdata.c:1392
+#: common/unittype.c:355 client/helpdata.c:1390
msgid "?and:, "
msgstr "?e:, "
@@ -1373,75 +1373,70 @@ msgstr ""
#: server/auth.c:281
#, fuzzy, c-format
-msgid "Auth config filename \"%s\" not allowed!"
-msgstr "Isso não é um nome válido, tente de novo.\n"
-
-#: server/auth.c:286
-#, fuzzy, c-format
msgid "Cannot load auth config file \"%s\"!"
msgstr "Incapaz de encontrar ficheiro audio %s"
-#: server/auth.c:397
+#: server/auth.c:392
#, c-format
msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
msgstr ""
-#: server/auth.c:404
+#: server/auth.c:399
msgid "Guests are not allowed on this server. Sorry."
msgstr "Convidados não são permitidos neste servidor. Desculpe."
-#: server/auth.c:406
+#: server/auth.c:401
#, c-format
msgid "%s was rejected: Guests not allowed."
msgstr "%s foi rejeitado: Convidados não são aceitos."
-#: server/auth.c:425
+#: server/auth.c:420
#, c-format
msgid ""
"There was an error reading the user database, logging in as guest connection "
"'%s'."
msgstr ""
-#: server/auth.c:431
+#: server/auth.c:426
msgid ""
"There was an error reading the user database and guest logins are not "
"allowed. Sorry"
msgstr ""
-#: server/auth.c:434
+#: server/auth.c:429
#, c-format
msgid "%s was rejected: Database error and guests not allowed."
msgstr "%s foi rejeitado: Erro de banco e convidados não são permitidos."
-#: server/auth.c:441
+#: server/auth.c:436
#, c-format
msgid "Enter password for %s:"
msgstr "Entre com a senha para %s:"
-#: server/auth.c:450
+#: server/auth.c:445
msgid "Enter a new password (and remember it)."
msgstr "Entre com uma senha (e lembre-se dela)."
-#: server/auth.c:456
+#: server/auth.c:451
msgid "This server allows only preregistered users. Sorry."
msgstr "Este servidor apenas permite usuários pré registrados. Desculpe."
-#: server/auth.c:459
+#: server/auth.c:454
#, c-format
msgid "%s was rejected: Only preregister users allowed."
msgstr "%s foi rejeitado: Somente usuários pré-registrados são permitidos."
-#: server/auth.c:488 server/auth.c:547
+#: server/auth.c:483 server/auth.c:542
msgid "Sorry, too many wrong tries..."
msgstr "Desculpe, muitas tentativas erradas..."
-#: server/auth.c:489
+#: server/auth.c:484
#, c-format
msgid "%s was rejected: Too many wrong password verifies for new user."
msgstr ""
"%s foi rejeitado: Excesso de tentativas com senha errada para o novo usuário."
-#: server/auth.c:505
+#: server/auth.c:500
msgid ""
"Warning: There was an error in saving to the database. Continuing, but your "
"stats will not be saved."
@@ -1449,30 +1444,30 @@ msgstr ""
"Aviso: Erro ao salvar o banco de dados. Continuando, mas sua estatÃstica não "
"será gravada."
-#: server/auth.c:549
+#: server/auth.c:544
#, c-format
msgid "%s was rejected: Too many wrong password tries."
msgstr "%s foi rejeitado: Excesso de tentativas com senha errada."
-#: server/auth.c:558
+#: server/auth.c:553
msgid "Your password is incorrect. Try again."
msgstr "Sua senha está incorreta. Tente novamente."
-#: server/auth.c:569
+#: server/auth.c:564
msgid "Sorry, your connection timed out..."
msgstr "Desculpe, sua conexão congelou..."
-#: server/auth.c:571
+#: server/auth.c:566
#, c-format
msgid "%s was rejected: Connection timeout waiting for password."
msgstr "%s foi rejeitada: Conexão parou esperando pela senha."
-#: server/auth.c:636
+#: server/auth.c:631
#, c-format
msgid "Your password is too short, the minimum length is %d. Try again."
msgstr "Sua senha é muito pequena, o tamanho mÃnimo é %d. Tente novamente."
-#: server/auth.c:642
+#: server/auth.c:637
#, c-format
msgid ""
"The password must have at least %d capital letters, %d numbers, and be at "
@@ -1978,7 +1973,7 @@ msgstr "Este é o servidor do %s"
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:237 manual/civmanual.c:380
+#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
@@ -2005,14 +2000,14 @@ msgstr ""
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:241
+#: server/civserver.c:217 client/civclient.c:242
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:245
+#: server/civserver.c:221 client/civclient.c:246
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"
@@ -2020,7 +2015,7 @@ msgstr " -d, --debug NUM\tDefine nÃvel de depuração (0 a 3)\n"
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:248 manual/civmanual.c:382
+#: server/civserver.c:225 client/civclient.c:249 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"
@@ -2071,11 +2066,11 @@ 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:267 manual/civmanual.c:383
+#: server/civserver.c:247 client/civclient.c:268 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:279
+#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, fuzzy, c-format
@@ -3285,7 +3280,7 @@ msgstr "%s causou um incidente ao incitar uma revolta em %s."
msgid "Sea moving start units are not yet supported. Nobody gets %s."
msgstr ""
-#: server/gamehand.c:310 client/text.c:632
+#: server/gamehand.c:310 client/text.c:691
#, c-format
msgid "Year: %s"
msgstr "Ano: %s"
@@ -3570,10 +3565,10 @@ msgid "Could not throw %s into civil war - no available nations"
msgstr ""
#: server/plrhand.c:1686
-#, c-format
+#, fuzzy, c-format
msgid ""
-"Your nation is thrust into civil war, %s is declared the leader of the "
-"rebel states."
+"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
@@ -3674,7 +3669,7 @@ msgstr "Vel. de Investigação"
msgid "Literacy"
msgstr "Literatura"
-#: server/report.c:121 client/cityrepdata.c:526 client/cityrepdata.c:527
+#: server/report.c:121 client/cityrepdata.c:524 client/cityrepdata.c:525
#: client/gui-sdl/cityrep.c:174
msgid "Production"
msgstr "Produção"
@@ -3826,7 +3821,7 @@ msgstr ""
"Expressão demográfica contém caracteres inválidos. Consulte \"help demography"
"\"."
-#: server/report.c:743 server/report.c:766
+#: server/report.c:743 server/report.c:768
msgid "Demographics Report:"
msgstr "Relatório Demográfico:"
@@ -3834,10 +3829,12 @@ msgstr "Relatório Demográfico:"
msgid "Sorry, the Demographics report is unavailable."
msgstr "Desculpe, o relatório Demográfico não se encontra disponÃvel."
-#: server/report.c:748
-#, c-format
-msgid "The %s of the %s (%s)"
-msgstr "O %s de %s (%s)"
+#. TRANS: <nation adjective> <government name> (<year>).
+#. * E.g. "Polish Despotism (200 AD)".
+#: server/report.c:750
+#, fuzzy, c-format
+msgid "%s %s (%s)"
+msgstr "%s em %s (%s)\n"
#. TRANS: message about an installation error.
#: server/ruleset.c:163
@@ -3894,14 +3891,6 @@ msgstr ""
msgid "%s had invalid nation; changing to %s."
msgstr ""
-#. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4073
-#, c-format
-msgid ""
-"Illegal alliance structure detected: %s alliance to %s reduced to peace "
-"treaty."
-msgstr ""
-
#: server/settings.c:32
msgid "Geological"
msgstr "Geológico"
@@ -4862,8 +4851,8 @@ msgstr "Prefixo de nome de auto-gravação"
#: server/settings.c:1016
msgid ""
-"Automatically saved games will have name \"<prefix><year>.sav\". This "
-"setting sets the <prefix> part."
+"Automatically saved games will have name \"<prefix>-T<turn>-Y<year>.sav\". "
+"This setting sets the <prefix> part."
msgstr ""
#: server/settings.c:1023
@@ -4877,12 +4866,12 @@ msgid ""
"the game."
msgstr ""
-#: server/sernet.c:147
+#: server/sernet.c:150
#, fuzzy
msgid "Server cannot read standard input. Ignoring input."
msgstr "Servidor incapaz de ler da consola. A ignorar consola."
-#: server/sernet.c:922
+#: server/sernet.c:929
#, c-format
msgid "Server: bad address: [%s:%d]."
msgstr "Servidor: endereço inválido: [%s:%d]."
@@ -5017,114 +5006,114 @@ msgid ""
"alliance with both."
msgstr ""
-#: server/srv_main.c:928
+#: server/srv_main.c:961
#, c-format
msgid "Failed saving game as %s"
msgstr "Falha ao salvar jogo como %s"
-#: server/srv_main.c:930
+#: server/srv_main.c:963
#, c-format
msgid "Game saved as %s"
msgstr "Jogo salvo como %s"
-#: server/srv_main.c:962
+#: server/srv_main.c:994
msgid "The game is already running."
msgstr "O jogo já está sendo jogado."
-#: server/srv_main.c:970
+#: server/srv_main.c:1002
#, c-format
msgid "%s lost control cmdlevel on game start. Use voting from now on."
msgstr ""
-#: server/srv_main.c:977
+#: server/srv_main.c:1009
msgid "Starting game."
msgstr "Iniciando jogo."
-#: server/srv_main.c:1039
+#: server/srv_main.c:1071
#, fuzzy, c-format
msgid "request for unknown report (type %d)"
msgstr "pedido de relatório desconhecido (tipo %d)"
-#: server/srv_main.c:1104
+#: server/srv_main.c:1136
#, c-format
msgid "Warning: rejecting old client %s"
msgstr "Aviso: rejeitando cliente antigo %s"
-#: server/srv_main.c:1206
+#: server/srv_main.c:1238
#, 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:1306
+#: server/srv_main.c:1338
#, fuzzy
msgid "Please choose a non-blank name."
msgstr "Seleccione um nome não-vazio."
-#: server/srv_main.c:1322
+#: server/srv_main.c:1354
#, fuzzy
msgid "That nation is already in use."
msgstr "O jogo já está sendo jogado."
-#: server/srv_main.c:1338
+#: server/srv_main.c:1370
#, 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:1359
+#: server/srv_main.c:1391
msgid "Please choose a name containing only ASCII characters."
msgstr ""
-#: server/srv_main.c:1458
+#: server/srv_main.c:1490
#, c-format
msgid "%s nation is not available in this scenario."
msgstr ""
-#: server/srv_main.c:1464
+#: server/srv_main.c:1496
#, fuzzy, c-format
msgid "%s nation is already in use."
msgstr "A sub-categoria esta em uso"
-#: server/srv_main.c:1482
+#: server/srv_main.c:1514
#, fuzzy, c-format
msgid "%s is the %s ruler %s."
msgstr "%s é o governante %s %s."
-#: server/srv_main.c:1538
+#: server/srv_main.c:1570
#, c-format
msgid "Waiting to start game: %d out of %d players are ready to start."
msgstr ""
-#: server/srv_main.c:1582 server/srv_main.c:1586
+#: server/srv_main.c:1614 server/srv_main.c:1618
#, c-format
msgid "%s has been added as %s level AI-controlled player."
msgstr ""
-#: server/srv_main.c:1728
+#: server/srv_main.c:1760
#, c-format
msgid "Player %d"
msgstr "Jogador %d"
-#: server/srv_main.c:1739 server/srv_main.c:1745
+#: server/srv_main.c:1771 server/srv_main.c:1777
#, c-format
msgid "%s rules the %s."
msgstr "%s regra o %s."
-#: server/srv_main.c:1910
+#: server/srv_main.c:1942
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
msgstr ""
-#: server/srv_main.c:1961
+#: server/srv_main.c:1993
#, fuzzy, c-format
msgid "Sending info to metaserver [%s]"
msgstr "A enviar informação para o metaservidor [%s]"
-#: server/srv_main.c:1992
+#: server/srv_main.c:2024
msgid "The game is over..."
msgstr "O jogo acabou..."
-#: server/srv_main.c:2205
+#: server/srv_main.c:2237
msgid "Now accepting new client connections."
msgstr "Agora aceitando novas conexões de clientes."
@@ -5991,24 +5980,24 @@ 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:2030 client/gui-sdl/plrdlg.c:645
+#: 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
msgid "AI"
msgstr "IA"
#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
+#: client/gui-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
msgid "Human"
msgstr "Humano"
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
-#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
+#: 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
msgid "Alive"
msgstr "Ativar unidade"
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
#: client/gui-win32/connectdlg.c:200
msgid "Dead"
msgstr "Morto"
@@ -6282,9 +6271,9 @@ 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:242
-#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
-#: client/text.c:1201
+#: 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
#, c-format
msgid "?clistmore:, %s"
msgstr ", %s"
@@ -6540,7 +6529,7 @@ msgstr "Apenas %s podem atacar a partir do mar."
msgid "Cannot attack from sea."
msgstr "Não pode atacar a partir do mar."
-#: server/unithand.c:996 server/unittools.c:2103
+#: server/unithand.c:996 server/unittools.c:2137
#, fuzzy
msgid "Cannot attack unless you declare war first."
msgstr "Não pode atacar sem primeiro declarar guerra."
@@ -6645,99 +6634,100 @@ msgstr "%s comprado em %s por peças de ouro."
#: server/unittools.c:297
#, fuzzy, c-format
-msgid "Not enough gold. %s disbanded"
+msgid "Not enough gold to pay upkeep for %s. Unit disbanded."
msgstr "Não existem jogadores suficientes, o jogo não pode começar."
-#: server/unittools.c:342
+#: server/unittools.c:343
#, fuzzy, c-format
msgid "Your %s has run out of hit points."
msgstr "Os seus %s ficaram sem resistência."
-#: server/unittools.c:358
+#: server/unittools.c:359
#, fuzzy, c-format
msgid "Your %s has been lost on the high seas."
msgstr "O seu %s foi perdido no alto mar."
-#: server/unittools.c:365
+#: server/unittools.c:366
#, c-format
msgid "Your %s survived on the high seas and became more experienced!"
msgstr ""
-#: server/unittools.c:376
+#: server/unittools.c:377
#, fuzzy, c-format
msgid "Your %s has been lost on unsafe terrain."
msgstr "O seu %s foi perdido no alto mar."
-#: server/unittools.c:430
+#: server/unittools.c:431
#, fuzzy, c-format
msgid "Your %s has returned to refuel."
msgstr "O seu %s voltou para se reabastecer."
-#: server/unittools.c:454
+#: server/unittools.c:455
#, fuzzy, c-format
msgid "Your %s has run out of fuel."
msgstr "O seu %s ficou sem combustÃvel."
-#. TRANS: And, <the unit> became ...
-#: server/unittools.c:616
-msgid "And, became more experienced!"
-msgstr ""
-
#. TRANS: Your <unit> became ...
-#: server/unittools.c:620
+#: server/unittools.c:619
#, c-format
msgid "Your %s became more experienced!"
msgstr ""
-#: server/unittools.c:1011
+#: server/unittools.c:1009
#, fuzzy, c-format
msgid "Teleported your %s to %s."
msgstr "O seu %s voltou para se reabastecer."
-#: server/unittools.c:1041
+#. TRANS: A unit is moved to resolve stack conflicts.
+#: server/unittools.c:1065
+#, fuzzy, c-format
+msgid "Moved your %s."
+msgstr "Seu nome:"
+
+#: server/unittools.c:1076
#, fuzzy, c-format
msgid "Disbanded your %s."
msgstr "Seu nome:"
-#: server/unittools.c:1363
+#: server/unittools.c:1397
#, c-format
msgid "Unable to defend %s, %s has lost the game."
msgstr ""
-#: server/unittools.c:1367
+#: server/unittools.c:1401
#, c-format
msgid "Losing %s meant losing the game! Be more careful next time!"
msgstr ""
-#: server/unittools.c:1469
+#: server/unittools.c:1503
#, c-format
msgid "%s escaped the destruction of %s, and fled to %s."
msgstr ""
-#: server/unittools.c:1478
+#: server/unittools.c:1512
#, fuzzy, c-format
msgid "%s lost when %s was lost."
msgstr "%s perdida quando %s foi perdida."
-#: server/unittools.c:1527
+#: server/unittools.c:1561
#, 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:1545
+#: server/unittools.c:1579
#, 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:1554 server/unittools.c:1612
+#: server/unittools.c:1588 server/unittools.c:1646
#, 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:1588
+#: server/unittools.c:1622
#, fuzzy, c-format
msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
msgid_plural ""
@@ -6747,14 +6737,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:1621
+#: server/unittools.c:1655
#, 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:1636
+#: server/unittools.c:1670
#, 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."
@@ -6762,7 +6752,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:1646
+#: server/unittools.c:1680
#, 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."
@@ -6772,205 +6762,205 @@ 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:1660
+#: server/unittools.c:1694
#, 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:1928
+#: server/unittools.c:1962
#, fuzzy, c-format
msgid "Your %s was nuked by %s."
msgstr "O seu %s foi atacado com armas nucleares por %s."
-#: server/unittools.c:1931 server/unittools.c:1947
+#: server/unittools.c:1965 server/unittools.c:1981
msgid "yourself"
msgstr "você próprio"
-#: server/unittools.c:1935
+#: server/unittools.c:1969
#, fuzzy, c-format
msgid "The %s %s was nuked."
msgstr "%s, unidade %s, sofreu um ataque nuclear."
-#: server/unittools.c:1944
+#: server/unittools.c:1978
#, fuzzy, c-format
msgid "%s was nuked by %s."
msgstr "%s sofreu um ataque nuclear dos %s."
-#: server/unittools.c:1952
+#: server/unittools.c:1986
#, fuzzy, c-format
msgid "You nuked %s."
msgstr "Você atacou os %s com armas nucleares."
-#: server/unittools.c:1993
+#: server/unittools.c:2027
#, fuzzy, c-format
msgid "The %s detonated a nuke!"
msgstr "%s detonou uma arma nuclear!"
-#: server/unittools.c:2017
+#: server/unittools.c:2051
#, fuzzy, c-format
msgid "%s transported successfully."
msgstr "%s transportado com sucesso."
-#: server/unittools.c:2069
+#: server/unittools.c:2103
#, 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:2079
+#: server/unittools.c:2113
#, fuzzy
msgid "You cannot paradrop a unit that is transporting other units."
msgstr "Você apenas pode ?? unidades de transporte."
-#: server/unittools.c:2085
+#: server/unittools.c:2119
#, fuzzy
msgid "The destination location is not known."
msgstr "O local de destino não é conhecido."
-#: server/unittools.c:2092
+#: server/unittools.c:2126
#, fuzzy, c-format
msgid "This unit cannot paradrop into %s."
msgstr "Você não possui mais pontos de movimento"
-#: server/unittools.c:2112
+#: server/unittools.c:2146
#, 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:2123
+#: server/unittools.c:2157
#, 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:2136
+#: server/unittools.c:2170
#, 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:2158
+#: server/unittools.c:2192
#, fuzzy, c-format
msgid "You found %d gold."
msgstr "Você encontrou %d moedas."
-#: server/unittools.c:2175
+#: server/unittools.c:2209
#, fuzzy, c-format
msgid "You found %s in ancient scrolls of wisdom."
msgstr "Você encontrou %s em antigos pergaminhos de sabedoria."
-#: server/unittools.c:2182
+#: server/unittools.c:2216
#, 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:2196
+#: server/unittools.c:2230
#, fuzzy
msgid "A band of friendly mercenaries joins your cause."
msgstr "Um bando de mercenários amistosos juntam-se à sua causa."
-#: server/unittools.c:2214
+#: server/unittools.c:2248
#, fuzzy
msgid "An abandoned village is here."
msgstr "Existe aqui uma povoação abandonada."
-#: server/unittools.c:2224
+#: server/unittools.c:2258
#, fuzzy
msgid "You have unleashed a horde of barbarians!"
msgstr "Você incitou uma horda de bárbaros!"
-#: server/unittools.c:2227
+#: server/unittools.c:2261
#, fuzzy, c-format
msgid "Your %s has been killed by barbarians!"
msgstr "O seu %s foi morto por bárbaros!"
-#: server/unittools.c:2243
+#: server/unittools.c:2277
#, fuzzy
msgid "You found a friendly city."
msgstr "Você encontrou uma cidade amistosa."
-#: server/unittools.c:2257
+#: server/unittools.c:2291
#, 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:2282
+#: server/unittools.c:2316
#, 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:2540
+#: server/unittools.c:2574
#, c-format
msgid "Orders for %s aborted after enemy movement was spotted."
msgstr ""
-#: server/unittools.c:2989
+#: server/unittools.c:3023
#, c-format
msgid "Orders for %s aborted as there are units nearby."
msgstr ""
-#: server/unittools.c:3041
+#: server/unittools.c:3075
#, c-format
msgid "Orders for %s aborted because building of city failed."
msgstr ""
-#: server/unittools.c:3054
+#: server/unittools.c:3088
#, c-format
msgid "Orders for %s aborted since they give an invalid activity."
msgstr ""
-#: server/unittools.c:3068
+#: server/unittools.c:3102
#, c-format
msgid "Orders for %s aborted since they give an invalid location."
msgstr ""
-#: server/unittools.c:3078
+#: server/unittools.c:3112
#, c-format
msgid "Orders for %s aborted as there are units in the way."
msgstr ""
-#: server/unittools.c:3104
+#: server/unittools.c:3138
#, c-format
msgid "Orders for %s aborted because of failed move."
msgstr ""
-#: server/unittools.c:3145
+#: server/unittools.c:3179
#, fuzzy, c-format
msgid "Attempt to change homecity for %s failed."
msgstr "Mudando a cidade natal de %s em %s."
-#: server/unittools.c:3156
+#: server/unittools.c:3190
#, fuzzy, c-format
msgid "Attempt to establish trade route for %s failed."
msgstr "Estabelece rota comercial"
-#: server/unittools.c:3168
+#: server/unittools.c:3202
#, c-format
msgid "Attempt to build wonder for %s failed."
msgstr ""
-#: server/unittools.c:3177
+#: server/unittools.c:3211
#, fuzzy, c-format
msgid "Your %s has invalid orders."
msgstr "A Sua Caravana Chegou"
-#: server/generator/mapgen.c:1737
+#: server/generator/mapgen.c:1771
#, fuzzy
msgid "High landmass - this may take a few seconds."
msgstr "Massa terrestre elevada - isto pode levar alguns segundos."
-#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
+#: server/generator/mapgen.c:1969 server/generator/mapgen.c:2039
#, fuzzy, c-format
msgid "Falling back to generator %d."
msgstr "caÃndo para o frontend; %s"
-#: server/generator/mapgen.c:2025
+#: server/generator/mapgen.c:2059
#, fuzzy
msgid "Generator 3 didn't place all big islands."
msgstr "Gerador 3 não colocou todas as ilhas maiores."
-#: server/generator/mapgen.c:2054
+#: server/generator/mapgen.c:2088
#, fuzzy, c-format
msgid "Generator 3 left %li landmass unplaced."
msgstr "Gerador 3 deixou %li massas terrestres por colocar."
@@ -7079,7 +7069,7 @@ msgid_plural "%3d turns"
msgstr[0] "%3d turno"
msgstr[1] "%3d turnos"
-#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:631
#: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
@@ -7199,352 +7189,352 @@ msgstr "Paz"
msgid "(worklist)"
msgstr "(lista de tarefas)"
-#: client/cityrepdata.c:447
-msgid "Special"
-msgstr "Especial"
+#: client/cityrepdata.c:446
+msgid "?city:Name"
+msgstr "Nome"
-#: client/cityrepdata.c:448
-msgid "?entertainers/scientists/taxmen:E/S/T"
-msgstr "A/C/F"
+#: client/cityrepdata.c:446 client/gui-sdl/cityrep.c:169
+msgid "City Name"
+msgstr "Nome da Cidade"
-#: client/cityrepdata.c:449
-msgid "Entertainers, Scientists, Taxmen"
-msgstr "Artistas, Cientistas, Fiscais"
+#: client/cityrepdata.c:448
+msgid "?size [short]:Sz"
+msgstr "Tm"
-#: client/cityrepdata.c:452
-#, fuzzy
-msgid "Concise + Rapture, - Disorder"
-msgstr "Conciso + Celebração, - Desordem"
+#: client/cityrepdata.c:448
+msgid "Size"
+msgstr "Tamanho"
-#: client/cityrepdata.c:454 client/plrdlg_common.c:261
+#: client/cityrepdata.c:450 client/plrdlg_common.c:261
#: client/gui-win32/plrdlg.c:337
msgid "State"
msgstr "Estado"
-#: client/cityrepdata.c:454
+#: client/cityrepdata.c:450
msgid "Rapture/Peace/Disorder"
msgstr "Celebração/Paz/Desordem"
+#: client/cityrepdata.c:452
+#, fuzzy
+msgid "Concise *=Rapture, X=Disorder"
+msgstr "Conciso + Celebração, - Desordem"
+
+#: client/cityrepdata.c:456
+msgid "Special"
+msgstr "Especial"
+
#: client/cityrepdata.c:457
+msgid "?entertainers/scientists/taxmen:E/S/T"
+msgstr "A/C/F"
+
+#: client/cityrepdata.c:458
+msgid "Entertainers, Scientists, Taxmen"
+msgstr "Artistas, Cientistas, Fiscais"
+
+#: client/cityrepdata.c:461
msgid "?Happy workers:H"
msgstr "F"
-#: client/cityrepdata.c:457
+#: client/cityrepdata.c:461
msgid "Workers: Happy"
msgstr "Operários: Feliz"
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
msgid "?Content workers:C"
msgstr "C"
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
msgid "Workers: Content"
msgstr "Operários: Contente"
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
msgid "?Unhappy workers:U"
msgstr "D"
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
msgid "Workers: Unhappy"
msgstr "Operários: Descontente"
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
msgid "?Angry workers:A"
msgstr "Z"
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
msgid "Workers: Angry"
msgstr "Operários: Zangado"
-#: client/cityrepdata.c:465 client/gui-xaw/citydlg.c:2401
-#: data/default/units.ruleset:238
-msgid "Workers"
+#: client/cityrepdata.c:469 client/gui-xaw/citydlg.c:2402
+#, fuzzy
+msgid "?city:Workers"
msgstr "Operários"
-#: client/cityrepdata.c:466
+#: client/cityrepdata.c:470
msgid "?happy/content/unhappy/angry:H/C/U/A"
msgstr "F/C/D/Z"
-#: client/cityrepdata.c:467
+#: client/cityrepdata.c:471
msgid "Workers: Happy, Content, Unhappy, Angry"
msgstr "Operários: Feliz, Contente, Descontente, Zangado"
-#: client/cityrepdata.c:470 client/cityrepdata.c:472
+#: client/cityrepdata.c:474 client/cityrepdata.c:476
msgid "Best"
msgstr "Melhor"
-#: client/cityrepdata.c:470
+#: client/cityrepdata.c:474
msgid "attack"
msgstr "ataque"
-#: client/cityrepdata.c:471
+#: client/cityrepdata.c:475
msgid "Best attacking units"
msgstr "Unidades com melhor ataque"
-#: client/cityrepdata.c:472
+#: client/cityrepdata.c:476
msgid "defense"
msgstr "defesa"
-#: client/cityrepdata.c:473
+#: client/cityrepdata.c:477
msgid "Best defending units"
msgstr "Unidades com melhor defesa"
-#: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
-#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
-#: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
-#: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
-#: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
-#: client/gui-win32/menu.c:351 client/gui-win32/repodlgs.c:616
-#: client/gui-win32/repodlgs.c:707 client/gui-win32/repodlgs.c:716
-#: client/gui-xaw/menu.c:157 client/gui-xaw/menu.c:219
-#: client/gui-xaw/menu.c:242 client/gui-xaw/repodlgs.c:881
-#: client/gui-xaw/repodlgs.c:1069 data/Freeciv.in:1895 data/helpdata.txt:909
+#: client/cityrepdata.c:478 client/cityrepdata.c:482
+#: client/gui-gtk-2.0/cityrep.c:1437 client/gui-gtk-2.0/cityrep.c:1456
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-gtk-2.0/cityrep.c:1494
+#: client/gui-gtk-2.0/cityrep.c:1514 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/repodlgs.c:960 client/gui-sdl/helpdlg.c:688
+#: client/gui-sdl/mapctrl.c:1605 client/gui-sdl/optiondlg.c:1827
+#: client/gui-sdl/repodlgs.c:356 client/gui-win32/menu.c:351
+#: client/gui-win32/repodlgs.c:616 client/gui-win32/repodlgs.c:707
+#: client/gui-win32/repodlgs.c:716 client/gui-xaw/menu.c:157
+#: client/gui-xaw/menu.c:219 client/gui-xaw/menu.c:242
+#: client/gui-xaw/repodlgs.c:881 client/gui-xaw/repodlgs.c:1069
+#: data/Freeciv.in:1895 data/helpdata.txt:909
msgid "Units"
msgstr "Unidades"
#. TRANS: Header "Number of units inside city"
-#: client/cityrepdata.c:476
+#: client/cityrepdata.c:480
#, fuzzy
msgid "?Present (units):Here"
msgstr "Prs"
-#: client/cityrepdata.c:477
+#: client/cityrepdata.c:481
msgid "Number of units present"
msgstr "Número de unidades presentes"
#. TRANS: Header "Number of units supported by given city"
-#: client/cityrepdata.c:480
+#: client/cityrepdata.c:484
#, fuzzy
msgid "?Supported (units):Owned"
msgstr "Sup"
-#: client/cityrepdata.c:481
+#: client/cityrepdata.c:485
msgid "Number of units supported"
msgstr "Número de unidades suportadas"
#. TRANS: Header "It will take this many turns before city grows"
-#: client/cityrepdata.c:484
+#: client/cityrepdata.c:488
#, fuzzy
msgid "?food (population):Grow"
msgstr "Cresce"
-#: client/cityrepdata.c:485 client/cityrepdata.c:530
+#: client/cityrepdata.c:489 client/cityrepdata.c:528
#, fuzzy
msgid "?Stock/Target:(Have/Need)"
msgstr "(Estoque/Objetivo)"
-#: client/cityrepdata.c:486
+#: client/cityrepdata.c:490
msgid "Turns until growth/famine"
msgstr "Turnos até crescimento/fome"
-#: client/cityrepdata.c:488
-msgid "?size [short]:Sz"
-msgstr "Tm"
-
-#: client/cityrepdata.c:488
-msgid "Size"
-msgstr "Tamanho"
-
-#: client/cityrepdata.c:492
-msgid "?city:Name"
-msgstr "Nome"
-
-#: client/cityrepdata.c:492 client/gui-sdl/cityrep.c:169
-msgid "City Name"
-msgstr "Nome da Cidade"
-
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
msgid "Surplus"
msgstr "Excedentes"
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
msgid "?food/production/trade:F/P/T"
msgstr "C/P/M"
-#: client/cityrepdata.c:496
+#: client/cityrepdata.c:494
msgid "Surplus: Food, Production, Trade"
msgstr "Excedentes: Comida, Produção, Comércio"
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
#, fuzzy
msgid "?Food surplus [short]:+F"
msgstr "+C"
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
msgid "Surplus: Food"
msgstr "Excedente: Comida"
-#: client/cityrepdata.c:500
+#: client/cityrepdata.c:498
#, fuzzy
msgid "?Production surplus [short]:+P"
msgstr "+P"
-#: client/cityrepdata.c:501
+#: client/cityrepdata.c:499
msgid "Surplus: Production"
msgstr "Excedente: Produção"
-#: client/cityrepdata.c:502
+#: client/cityrepdata.c:500
#, fuzzy
msgid "?Production loss (waste) [short]:-P"
msgstr "-P"
-#: client/cityrepdata.c:503
+#: client/cityrepdata.c:501
msgid "Waste"
msgstr "DesperdÃcio"
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
#, fuzzy
msgid "?Trade surplus [short]:+T"
msgstr "+M"
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
msgid "Surplus: Trade"
msgstr "Excedente: Comércio"
-#: client/cityrepdata.c:506
+#: client/cityrepdata.c:504
#, fuzzy
msgid "?Trade loss (corruption) [short]:-T"
msgstr "-M"
-#: client/cityrepdata.c:507
+#: client/cityrepdata.c:505
msgid "Corruption"
msgstr "Corrupção"
-#: client/cityrepdata.c:509 client/gui-gtk-2.0/repodlgs.c:654
+#: client/cityrepdata.c:507 client/gui-gtk-2.0/repodlgs.c:654
#: client/gui-sdl/mapctrl.c:1400 client/gui-win32/repodlgs.c:334
#: client/gui-xaw/menu.c:222 client/gui-xaw/repodlgs.c:644
#: client/gui-xaw/repodlgs.c:773 data/Freeciv.in:1819
msgid "Economy"
msgstr "Economia"
-#: client/cityrepdata.c:509
+#: client/cityrepdata.c:507
msgid "?gold/luxury/science:G/L/S"
msgstr "M/L/C"
-#: client/cityrepdata.c:510
+#: client/cityrepdata.c:508
msgid "Economy: Gold, Luxuries, Science"
msgstr "Economia: Ouro, Luxo, Ciência"
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
msgid "?Gold:G"
msgstr "M"
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
msgid "Economy: Gold"
msgstr "Economia: Moedas"
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
msgid "?Luxury:L"
msgstr "L"
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
msgid "Economy: Luxury"
msgstr "Economia: Luxo"
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
msgid "?Science:S"
msgstr "C"
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
msgid "Economy: Science"
msgstr "Economia: Ciência"
-#: client/cityrepdata.c:518
+#: client/cityrepdata.c:516
#, fuzzy
msgid "?number_trade_routes:n"
msgstr "n"
-#: client/cityrepdata.c:518
+#: client/cityrepdata.c:516
#, fuzzy
msgid "?number_trade_routes:R"
msgstr "R"
-#: client/cityrepdata.c:519
+#: client/cityrepdata.c:517
msgid "Number of Trade Routes"
msgstr "Número de Rotas Comerciais"
-#: client/cityrepdata.c:521
+#: client/cityrepdata.c:519
msgid "?pollution [short]:Pol"
msgstr "Pol"
-#: client/cityrepdata.c:523
+#: client/cityrepdata.c:521
msgid "?cma:Governor"
msgstr "Governo"
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
-#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
-#: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
-#: data/Freeciv.in:1459 data/helpdata.txt:820
+#: client/cityrepdata.c:521 client/gui-gtk-2.0/cityrep.c:1766
+#: client/gui-sdl/citydlg.c:3809 client/gui-sdl/cma_fe.c:858
+#: client/gui-win32/citydlg.c:726 data/Freeciv.in:1459 data/helpdata.txt:820
msgid "Citizen Governor"
msgstr "Gestão de Cidadãos"
-#: client/cityrepdata.c:526
+#: client/cityrepdata.c:524
#, fuzzy
msgid "Turns/Buy"
msgstr "Turnos/Compra"
-#: client/cityrepdata.c:529 client/cityrepdata.c:531
+#: client/cityrepdata.c:527 client/cityrepdata.c:529
msgid "Currently Building"
msgstr "Atualmente Construindo"
-#: client/cityrepdata.c:575
+#: client/cityrepdata.c:573
msgid "?specialist:S"
msgstr "E"
-#: client/cityrepdata.c:578
+#: client/cityrepdata.c:576
#, fuzzy
msgid "Specialists"
msgstr "Especialistas"
-#: client/civclient.c:239
+#: client/civclient.c:240
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr " -a, --autoconnect\tSaltar diálogo de conexão\n"
-#: client/civclient.c:249
+#: client/civclient.c:250
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:251
+#: client/civclient.c:252
msgid " -m, --meta HOST\tConnect to the metaserver at HOST\n"
msgstr " -m, --meta SERVIDOR\tConecta ao metaservidor em SERVIDOR\n"
-#: client/civclient.c:253
+#: client/civclient.c:254
msgid " -n, --name NAME\tUse NAME as name\n"
msgstr " -n, --name NOME\tUtilizar NOME como nome\n"
-#: client/civclient.c:255
+#: client/civclient.c:256
#, 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:257
+#: client/civclient.c:258
#, 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:259
+#: client/civclient.c:260
#, 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:262
+#: client/civclient.c:263
#, 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:264
+#: client/civclient.c:265
#, 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:265
+#: client/civclient.c:266
#, 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:268
+#: client/civclient.c:269
#, fuzzy, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -7554,146 +7544,156 @@ msgstr ""
"\t\t\tTente \"%s -- --help\" para mais informações.\n"
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:273
+#: client/civclient.c:274
#, fuzzy, c-format
msgid "Report bugs at %s\n"
msgstr "Informe bugs a %s.\n"
-#: client/civclient.c:297
+#: client/civclient.c:298
#, c-format
msgid "Invalid port \"%s\" specified with --port option.\n"
msgstr ""
-#: client/civclient.c:299 client/civclient.c:314
+#: client/civclient.c:300 client/civclient.c:315
msgid "Try using --help.\n"
msgstr "Tente usar --help.\n"
-#: client/civclient.c:312
+#: client/civclient.c:313
#, 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:325
+#: client/civclient.c:326
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr "Opção desconhecida: \"%s\"\n"
-#: client/civclient.c:539
+#: client/civclient.c:391
+#, fuzzy, c-format
+msgid "Updating old metaserver address \"%s\"."
+msgstr "metaservidor <endereço>"
+
+#: client/civclient.c:394
+#, fuzzy, c-format
+msgid "Default metaserver has been set to \"%s\"."
+msgstr "Opção: %s foi alterada para \"%s\"."
+
+#: client/civclient.c:550
msgid "Game started."
msgstr "Jogo iniciado."
-#: client/civclient.c:577
+#: client/civclient.c:588
msgid "There was an error while auto connecting; aborting."
msgstr "Ocorreu um erro ao conectar automaticamente; abortando."
-#: client/climisc.c:176
+#: client/climisc.c:177
#, c-format
msgid "Changing production of every %s into %s."
msgstr "Mudando a produção de todos os %s para %s."
-#: client/climisc.c:214
+#: client/climisc.c:215
msgid "?embassy:Both"
msgstr "Ambos"
-#: client/climisc.c:216
+#: client/climisc.c:217
msgid "?embassy:Yes"
msgstr "Sim"
-#: client/climisc.c:219
+#: client/climisc.c:220
msgid "?embassy:With Us"
msgstr "Connosco"
-#: client/climisc.c:222
+#: client/climisc.c:223
msgid "?embassy:Contact"
msgstr "Contato"
-#: client/climisc.c:224
+#: client/climisc.c:225
msgid "?embassy:No Contact"
msgstr "Sem Contato"
-#: client/climisc.c:236
+#: client/climisc.c:237
msgid "?vision:Both"
msgstr "Ambos"
-#: client/climisc.c:238
+#: client/climisc.c:239
msgid "?vision:To Them"
msgstr "Para Eles"
-#: client/climisc.c:241
+#: client/climisc.c:242
msgid "?vision:To Us"
msgstr "Para Nós"
-#: client/climisc.c:257 client/climisc.c:264
+#: client/climisc.c:258 client/climisc.c:265
#, c-format
msgid "The %s give %s"
msgstr "Os %s dão %s"
-#: client/climisc.c:268
+#: client/climisc.c:269
#, c-format
msgid "The %s give unknown city."
msgstr "Os %s dão cidade desconhecida."
-#: client/climisc.c:273
+#: client/climisc.c:274
#, c-format
msgid "The %s give %d gold"
msgstr "Os %s dão %d moedas"
-#: client/climisc.c:278
+#: client/climisc.c:279
#, c-format
msgid "The %s give their worldmap"
msgstr "Os %s dão o seu mapa mundo"
-#: client/climisc.c:282
+#: client/climisc.c:283
#, c-format
msgid "The %s give their seamap"
msgstr "Os %s dão o seu mapa do oceano"
-#: client/climisc.c:286
+#: client/climisc.c:287
msgid "The parties agree on a cease-fire"
msgstr "As partes acordam um cessar-fogo"
-#: client/climisc.c:289
+#: client/climisc.c:290
msgid "The parties agree on a peace"
msgstr "As partes acordam paz"
-#: client/climisc.c:292
+#: client/climisc.c:293
msgid "The parties create an alliance"
msgstr "As partes forjam uma aliança"
-#: client/climisc.c:295
+#: client/climisc.c:296
#, c-format
msgid "The %s give shared vision"
msgstr "Os %s dão visão compartilhada"
-#: client/climisc.c:299
+#: client/climisc.c:300
#, c-format
msgid "The %s give an embassy"
msgstr "Os %s dão uma embaixada"
-#: client/climisc.c:902
+#: client/climisc.c:906
#, fuzzy
msgid "Popup Request"
msgstr "Pedido Janela"
-#: client/climisc.c:932
+#: client/climisc.c:936
#, fuzzy
msgid "Exporting output window to civgame.log ..."
msgstr "A exportar janela de resultado para civgame.log ..."
-#: client/climisc.c:936
+#: client/climisc.c:940
msgid "Export complete."
msgstr "Exportação terminada."
-#: client/climisc.c:938
+#: client/climisc.c:942
msgid "Export failed, couldn't write to file."
msgstr "Exportação falhou, incapaz de escrever no arquivo."
-#: client/climisc.c:1038
+#: client/climisc.c:1042
#, c-format
msgid "You don't buy %s in %s!"
msgstr "Você não compra %s em %s!"
-#: client/climisc.c:1056
+#: client/climisc.c:1060
#, c-format
msgid "%s costs %d gold and you only have %d gold."
msgstr "%s custa %d moedas e você apenas tem %d."
@@ -7741,19 +7741,19 @@ msgid ""
"%d times"
msgstr ""
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1289
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
msgid "novice"
msgstr "iniciante"
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1289
+#: client/connectdlg_common.c:80 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:1290
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
msgid "normal"
msgstr "normal"
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1290
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
msgid "hard"
msgstr "difÃcil"
@@ -7782,38 +7782,41 @@ msgid "We probably couldn't start it from here."
msgstr ""
#: client/connectdlg_common.c:470
-msgid "We have control of the server (command access level hack)"
+msgid ""
+"Established control over the server. You have command access level 'hack'."
msgstr ""
#: client/connectdlg_common.c:475
-msgid "We can't take control of server, attempting to kill it."
+msgid ""
+"Failed to obtain the required access level to take control of the server. "
+"The server will now be shutdown."
msgstr ""
-#: client/control.c:1104
+#: client/control.c:1123
msgid "Only transporter units can be unloaded."
msgstr "Apenas as unidades de transporte podem ser descarregadas."
-#: client/control.c:1353
+#: client/control.c:1425
msgid "Only settler units can be put into auto mode."
msgstr "Somente colonos podem ser colocados em modo automático."
-#: client/control.c:1444
+#: client/control.c:1516
msgid "Only nuclear units can do this."
msgstr "Só as unidades nucleares podem fazer isso."
-#: client/control.c:1473
+#: client/control.c:1545
msgid "Only paratrooper units can do this."
msgstr "Apenas as unidades páraquedistas podem fazer isso."
-#: client/control.c:1921
+#: client/control.c:2020
msgid "Too far for this unit."
msgstr "Muito longe para esta unidade."
-#: client/control.c:2131 client/control.c:2161 client/control.c:2177
+#: client/control.c:2230 client/control.c:2260 client/control.c:2276
msgid "Didn't find a route to the destination!"
msgstr "Incapaz de encontrar uma rota para o destino!"
-#: client/control.c:2221
+#: client/control.c:2320
msgid "Oh my! You seem to have no capital!"
msgstr "Oh! Parece que você não tem uma capital!"
@@ -7902,16 +7905,16 @@ msgid "Allows %s (with %s)."
msgstr "Permite %s (com %s)."
#. TRANS: preserve single space at beginning
-#: client/helpdata.c:418
+#: client/helpdata.c:416
msgid " Rivers"
msgstr "Rios"
-#: client/helpdata.c:576
+#: client/helpdata.c:574
#, c-format
msgid "Sorry, no help topic for %s.\n"
msgstr "Desculpe, mas não existe ajuda para %s.\n"
-#: client/helpdata.c:580
+#: client/helpdata.c:578
#, c-format
msgid ""
"Sorry, no help topic for %s.\n"
@@ -7922,7 +7925,7 @@ msgstr ""
"Esta página foi gerada automaticamente.\n"
"\n"
-#: client/helpdata.c:670
+#: client/helpdata.c:668
#, fuzzy
msgid ""
"Requires: Nothing\n"
@@ -7931,212 +7934,212 @@ msgstr ""
"Requer o edifÃcio %s.\n"
"\n"
-#: client/helpdata.c:675
+#: client/helpdata.c:673
#, c-format
msgid "* The discovery of %s will make %s obsolete.\n"
msgstr "* A descoberta de %s tornará %s obsoleta.\n"
-#: client/helpdata.c:694
+#: client/helpdata.c:692
#, fuzzy, c-format
msgid "* Allows all players with knowledge of %s to build %s units.\n"
msgstr ""
"Permite a todos os jogadores com o conhecimento de %s construir unidades de %"
"s. "
-#: client/helpdata.c:706
+#: client/helpdata.c:704
#, c-format
msgid "* Allows %s (with %s).\n"
msgstr "* Permite %s (com %s).\n"
-#: client/helpdata.c:710
+#: client/helpdata.c:708
#, c-format
msgid "* Allows %s.\n"
msgstr "* Permite %s.\n"
-#: client/helpdata.c:780
+#: client/helpdata.c:778
#, c-format
msgid "* Can only be built if there is %s in the city.\n"
msgstr ""
-#: client/helpdata.c:786
+#: client/helpdata.c:784
#, c-format
msgid "* Can only be built with %s as government.\n"
msgstr ""
-#: client/helpdata.c:791
+#: client/helpdata.c:789
#, fuzzy
msgid "* May not be built in cities.\n"
msgstr "Ajuda a construir Maravilha"
-#: client/helpdata.c:794
+#: client/helpdata.c:792
msgid "* Never has a home city.\n"
msgstr ""
-#: client/helpdata.c:797
+#: client/helpdata.c:795
msgid "* Losing this unit will lose you the game!\n"
msgstr ""
-#: client/helpdata.c:801
+#: client/helpdata.c:799
msgid "* Each player may only have one of this type of unit.\n"
msgstr ""
-#: client/helpdata.c:805
+#: client/helpdata.c:803
#, fuzzy, c-format
msgid "* Requires %d population to build.\n"
msgstr "Falha ao processar as dependências de compilação"
-#: client/helpdata.c:811
+#: client/helpdata.c:809
#, fuzzy, c-format
msgid "* Can carry and refuel %d air unit.\n"
msgid_plural "* Can carry and refuel %d air units.\n"
msgstr[0] "* * Pode transportar e reabastecer %d unidades aéreas.\n"
-#: client/helpdata.c:816
+#: client/helpdata.c:814
#, fuzzy, c-format
msgid "* Can carry and refuel %d missile unit.\n"
msgid_plural "* Can carry and refuel %d missile units.\n"
msgstr[0] "* * Pode transportar e reabastecer %d unidades aéreas.\n"
-#: client/helpdata.c:821
+#: client/helpdata.c:819
#, fuzzy, c-format
msgid "* Can carry %d ground unit across water.\n"
msgid_plural "* Can carry %d ground units across water.\n"
msgstr[0] "* * Pode transportar e reabastecer %d unidades aéreas.\n"
-#: client/helpdata.c:830
+#: client/helpdata.c:828
msgid ""
"* Can establish trade routes (must travel to target city and must be at "
"least 9 tiles [in Manhattan distance] from this unit's home city).\n"
msgstr ""
-#: client/helpdata.c:836
+#: client/helpdata.c:834
#, fuzzy, c-format
msgid "* Can help build wonders (adds %d production).\n"
msgstr "Ajuda a construir Maravilha"
-#: client/helpdata.c:840
+#: client/helpdata.c:838
msgid "* May not be disbanded.\n"
msgstr "* Não podem ser dissolvidas.\n"
-#: client/helpdata.c:842
+#: client/helpdata.c:840
#, c-format
msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
msgstr ""
-#: client/helpdata.c:846
+#: client/helpdata.c:844
msgid "* Can build new cities.\n"
msgstr "* Pode construir novas cidades.\n"
-#: client/helpdata.c:849
+#: client/helpdata.c:847
#, c-format
msgid "* Can add on %d population to cities of no more than size %d.\n"
msgstr ""
-#: client/helpdata.c:858
+#: client/helpdata.c:856
#, fuzzy
msgid "* Can build roads and railroads.\n"
msgstr "Ajuda a construir Maravilha"
-#: client/helpdata.c:859
+#: client/helpdata.c:857
#, fuzzy
msgid "* Can build mines on tiles.\n"
msgstr "Ajuda a construir Maravilha"
-#: client/helpdata.c:860
+#: client/helpdata.c:858
#, fuzzy
msgid "* Can build irrigation on tiles.\n"
msgstr "Ajuda a construir Maravilha"
-#: client/helpdata.c:865
+#: client/helpdata.c:863
#, fuzzy
msgid "* Can build farmland.\n"
msgstr "%s ainda não podem construir %s."
-#: client/helpdata.c:869
+#: client/helpdata.c:867
#, c-format
msgid "* Can build farmland (if %s is known).\n"
msgstr ""
-#: client/helpdata.c:873
+#: client/helpdata.c:871
#, c-format
msgid "* Can build farmland (if any of the following are known: %s).\n"
msgstr ""
-#: client/helpdata.c:881
+#: client/helpdata.c:879
#, fuzzy
msgid "* Can build fortresses.\n"
msgstr "%s ainda não podem construir %s."
-#: client/helpdata.c:885
+#: client/helpdata.c:883
#, c-format
msgid "* Can build fortresses (if %s is known).\n"
msgstr ""
-#: client/helpdata.c:889
+#: client/helpdata.c:887
#, c-format
msgid "* Can build fortresses (if any of the following are known: %s).\n"
msgstr ""
-#: client/helpdata.c:895
+#: client/helpdata.c:893
msgid "* Can clean pollution from tiles.\n"
msgstr ""
-#: client/helpdata.c:896
+#: client/helpdata.c:894
msgid "* Can clean nuclear fallout from tiles.\n"
msgstr ""
-#: client/helpdata.c:899
+#: client/helpdata.c:897
#, fuzzy
msgid "* Can transform tiles.\n"
msgstr "debconf: não pode fazer chmod: %s"
-#: client/helpdata.c:902
+#: client/helpdata.c:900
#, fuzzy
msgid "* Can build airbases.\n"
msgstr "%s ainda não podem construir %s."
-#: client/helpdata.c:906
+#: client/helpdata.c:904
#, c-format
msgid "* May fortify, granting a 50%% defensive bonus.\n"
msgstr ""
-#: client/helpdata.c:909
+#: client/helpdata.c:907
msgid "* May pillage to destroy infrastructure from tiles.\n"
msgstr ""
-#: client/helpdata.c:913
+#: client/helpdata.c:911
msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
msgstr "* Pode executar ações diplomáticas e ações especiais de espionagem.\n"
-#: client/helpdata.c:916
+#: client/helpdata.c:914
msgid "* Can perform diplomatic actions.\n"
msgstr "* Pode executar ações diplomáticas.\n"
-#: client/helpdata.c:920
+#: client/helpdata.c:918
msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
msgstr ""
-#: client/helpdata.c:923
+#: client/helpdata.c:921
#, fuzzy
msgid "* May not be bribed.\n"
msgstr "não pode ser uma string vazia"
-#: client/helpdata.c:926
+#: client/helpdata.c:924
msgid "* Can attack enemy air units.\n"
msgstr "* Pode atacar unidades aéreas inimigas.\n"
-#: client/helpdata.c:930
+#: client/helpdata.c:928
#, fuzzy
msgid "* Is invisible except when next to an enemy unit or city.\n"
msgstr "* É invisÃvel excepto quando junto a uma unidade ou cidade enimiga.\n"
-#: client/helpdata.c:934
+#: client/helpdata.c:932
#, fuzzy
msgid "* Can only attack units on ocean squares (no land attacks).\n"
msgstr ""
"* Apenas pode atacar unidades em quadrados de oceano (não ataca em terra).\n"
-#: client/helpdata.c:938
+#: client/helpdata.c:936
#, fuzzy
msgid ""
"* Can attack from aboard sea units: against enemy cities and onto land "
@@ -8145,78 +8148,78 @@ msgstr ""
"Pode atacar a bordo de unidades navais: contra cidades inimigas e contra "
"quadrados terrestres."
-#: client/helpdata.c:943
+#: client/helpdata.c:941
#, c-format
msgid "* Can be paradropped from a friendly city (Range: %d).\n"
msgstr ""
-#: client/helpdata.c:949
+#: client/helpdata.c:947
msgid "* Gets double defense against units specified as 'mounted'.\n"
msgstr "* Tem o dobro da defesa contra unidades definidas como 'montadas'.\n"
-#: client/helpdata.c:953
+#: client/helpdata.c:951
msgid "* Counts as 'mounted' against certain defenders.\n"
msgstr "* Conta como unidade 'montada' contra certos defensores.\n"
-#: client/helpdata.c:957
+#: client/helpdata.c:955
#, fuzzy
msgid "* A missile unit: gets used up in making an attack.\n"
msgstr "* Uma unidade mÃssil: é gasta após um ataque.\n"
-#: client/helpdata.c:960
+#: client/helpdata.c:958
msgid "* Making an attack ends this unit's turn.\n"
msgstr "* Executar um ataque termina a vez desta unidade.\n"
-#: client/helpdata.c:964
+#: client/helpdata.c:962
msgid "* This unit's attack causes a nuclear explosion!\n"
msgstr "* O ataque desta unidade causa uma explosão nuclear!\n"
-#: client/helpdata.c:968
+#: client/helpdata.c:966
msgid "* Gets double firepower when attacking cities.\n"
msgstr ""
-#: client/helpdata.c:971
+#: client/helpdata.c:969
msgid "* Ignores the effects of city walls.\n"
msgstr "* Ignora os efeitos das muralhas.\n"
-#: client/helpdata.c:975
+#: client/helpdata.c:973
#, c-format
msgid ""
"* Does bombard attacks (%d per turn). These attacks will only damage (never "
"kill) the defender, but have no risk for the attacker.\n"
msgstr ""
-#: client/helpdata.c:982
+#: client/helpdata.c:980
msgid "* Gets quintuple defense against missiles and aircraft.\n"
msgstr "* Dá 5x mais defesa contra mÃsseis e aeronaves.\n"
-#: client/helpdata.c:986
+#: client/helpdata.c:984
msgid "* Ignores terrain effects (treats all squares as roads).\n"
msgstr "* Ignora efeitos do terreno (trata os quadrados como estradas).\n"
-#: client/helpdata.c:989
+#: client/helpdata.c:987
msgid "* Ignores zones of control.\n"
msgstr "* Ignora zonas de controle.\n"
-#: client/helpdata.c:993
+#: client/helpdata.c:991
msgid "* A non-military unit (cannot attack; no martial law).\n"
msgstr ""
"* Uma unidade não-militar (não pode atacar; não pode impôr lei marcial).\n"
-#: client/helpdata.c:997
+#: client/helpdata.c:995
#, fuzzy
msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
msgstr "* Unidade de campo: gera um descontente mesmo quando não-agressiva.\n"
-#: client/helpdata.c:1000
+#: client/helpdata.c:998
msgid "* Will never achieve veteran status.\n"
msgstr ""
-#: client/helpdata.c:1002
+#: client/helpdata.c:1000
msgid "* May become veteran through training or combat.\n"
msgstr ""
-#: client/helpdata.c:1008
+#: client/helpdata.c:1006
#, fuzzy, c-format
msgid ""
"* Must end turn in a city or next to land, or has a 50%% risk of being lost "
@@ -8225,12 +8228,12 @@ msgstr ""
"* Deve acabar a sua vez numa cidade ou próxima da costa, ou tem uma chance "
"de 50%% de ser perdida no mar."
-#: client/helpdata.c:1012
+#: client/helpdata.c:1010
#, fuzzy, c-format
msgid "* The discovery of %s reduces the risk to 25%%.\n"
msgstr "A descoberta de %s reduzirá este valor por 1. "
-#: client/helpdata.c:1017
+#: client/helpdata.c:1015
#, c-format
msgid "* %s reduces the risk to 12%%.\n"
msgstr ""
@@ -8239,27 +8242,27 @@ msgstr ""
#. * last two elements
#. TRANS: List of possible output types has this between
#. * last two elements
-#: client/helpdata.c:1068 client/helpdata.c:1402
+#: client/helpdata.c:1066 client/helpdata.c:1400
msgid " or "
msgstr " ou "
-#: client/helpdata.c:1070 client/helpdata.c:1390
+#: client/helpdata.c:1068 client/helpdata.c:1388
msgid "?or:, "
msgstr "?or:, "
-#: client/helpdata.c:1082
+#: client/helpdata.c:1080
#, fuzzy, c-format
msgid "* Unit has to be in a city, or on a %s after %d turn.\n"
msgid_plural "* Unit has to be in a city, or on a %s after %d turns.\n"
msgstr[0] "* Unidade tem de estar numa cidade, ou num %s após %d turno.\n"
msgstr[1] "* Unidade tem de estar numa cidade, ou num %s após %d turno.\n"
-#: client/helpdata.c:1124
+#: client/helpdata.c:1122
#, 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:1129
+#: client/helpdata.c:1127
#, fuzzy, c-format
msgid ""
"To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8268,95 +8271,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:1137
+#: client/helpdata.c:1135
#, fuzzy
msgid "You cannot research this technology."
msgstr "Você não pode assinar digitalmente esta mensagem."
-#: client/helpdata.c:1141
+#: client/helpdata.c:1139
#, 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:1153
+#: client/helpdata.c:1151
#, 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:1158
+#: client/helpdata.c:1156
#, c-format
msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
msgstr ""
-#: client/helpdata.c:1161
+#: client/helpdata.c:1159
#, c-format
msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
msgstr ""
-#: client/helpdata.c:1165
+#: client/helpdata.c:1163
#, fuzzy
msgid "* Increases the pollution generated by the population.\n"
msgstr "Aumenta a poluição gerada pela população.\n"
-#: client/helpdata.c:1170
+#: client/helpdata.c:1168
#, 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:1177
+#: client/helpdata.c:1175
#, fuzzy, c-format
msgid "* Allows %s to build fortresses.\n"
msgstr "Falha ao processar as dependências de compilação"
-#: client/helpdata.c:1185
+#: client/helpdata.c:1183
#, fuzzy, c-format
msgid "* Allows %s to build airbases.\n"
msgstr "Falha ao processar as dependências de compilação"
-#: client/helpdata.c:1194
+#: client/helpdata.c:1192
#, 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:1202
+#: client/helpdata.c:1200
#, 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:1236
+#: client/helpdata.c:1234
msgid "* Pollution cannot be generated on this terrain."
msgstr ""
-#: client/helpdata.c:1241
+#: client/helpdata.c:1239
#, fuzzy
msgid "* You cannot build cities on this terrain."
msgstr "Não é possÃvel comprar em uma cidade criada neste turno."
-#: client/helpdata.c:1247
+#: client/helpdata.c:1245
msgid "* The coastline of this terrain is unsafe."
msgstr ""
-#: client/helpdata.c:1252
+#: client/helpdata.c:1250
msgid "* This terrain is unsafe for units to travel on."
msgstr ""
-#: client/helpdata.c:1257
+#: client/helpdata.c:1255
msgid "* Land units cannot travel on oceanic terrains."
msgstr ""
-#: client/helpdata.c:1307
+#: client/helpdata.c:1305
msgid "Features:\n"
msgstr "Recursos:\n"
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1413 client/helpdata.c:1414
+#: client/helpdata.c:1411 client/helpdata.c:1412
msgid "?outputlist: Nothing "
msgstr ""
-#: client/helpdata.c:1421
+#: client/helpdata.c:1419
#, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
@@ -8367,7 +8370,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:1431
+#: client/helpdata.c:1429
#, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8375,48 +8378,48 @@ msgid ""
msgstr ""
#. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1439
+#: client/helpdata.c:1437
#, c-format
msgid "* You pay %d times normal %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1444
+#: client/helpdata.c:1442
#, 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:1449
+#: client/helpdata.c:1447
#, c-format
msgid "* You pay no %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1453
+#: client/helpdata.c:1451
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:1462
+#: client/helpdata.c:1460
#, 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:1470
+#: client/helpdata.c:1468
#, c-format
msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
msgstr ""
-#: client/helpdata.c:1477
+#: client/helpdata.c:1475
#, 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:1484
+#: client/helpdata.c:1482
#, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -8424,23 +8427,23 @@ msgid ""
msgstr ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1491
+#: client/helpdata.c:1489
#, 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:1499
+#: client/helpdata.c:1497
#, c-format
msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
msgstr ""
-#: client/helpdata.c:1504
+#: client/helpdata.c:1502
msgid "Has unlimited science/gold/luxuries rates.\n"
msgstr ""
-#: client/helpdata.c:1509
+#: client/helpdata.c:1507
#, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
@@ -8451,7 +8454,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:1521
+#: client/helpdata.c:1519
#, 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"
@@ -8459,64 +8462,64 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1532
+#: client/helpdata.c:1530
#, 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:1538
+#: client/helpdata.c:1536
#, fuzzy
msgid "* Your units cannot be bribed.\n"
msgstr "Você não possui mais pontos de movimento"
-#: client/helpdata.c:1541
+#: client/helpdata.c:1539
#, fuzzy
msgid "* Your cities cannot be incited.\n"
msgstr "%s não pode manter %s, unidade debandada."
-#: client/helpdata.c:1545
+#: client/helpdata.c:1543
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:1551
+#: client/helpdata.c:1549
msgid "* Has a senate that may prevent declaration of war.\n"
msgstr ""
-#: client/helpdata.c:1555
+#: client/helpdata.c:1553
msgid "* Allows partisans when cities are taken by the enemy.\n"
msgstr ""
-#: client/helpdata.c:1559
+#: client/helpdata.c:1557
msgid ""
"* Buildings that normally confer bonuses against unhappiness will instead "
"give gold.\n"
msgstr ""
-#: client/helpdata.c:1563
+#: client/helpdata.c:1561
msgid "* Pays no upkeep for fanatics.\n"
msgstr ""
-#: client/helpdata.c:1566
+#: client/helpdata.c:1564
#, fuzzy
msgid "* Has no unhappy citizens.\n"
msgstr " %s não possui entrada override\n"
-#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
+#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
#, fuzzy, c-format
msgid "* Veteran %s units.\n"
msgstr "Unidades suportadas %d"
-#: client/helpdata.c:1587
+#: client/helpdata.c:1585
#, fuzzy
msgid "* Veteran units.\n"
msgstr "Unidades suportadas %d"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1593
+#: client/helpdata.c:1591
#, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8524,7 +8527,7 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1602
+#: client/helpdata.c:1600
#, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8532,460 +8535,508 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1610
+#: client/helpdata.c:1608
#, 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:1619
+#: client/helpdata.c:1617
#, c-format
msgid "* %s production is increased %d%%.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1627
+#: client/helpdata.c:1625
#, c-format
msgid "* %s production will suffer massive waste.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1632
+#: client/helpdata.c:1630
#, c-format
msgid "* %s production will suffer some waste.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1637
+#: client/helpdata.c:1635
#, 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:1645
+#: client/helpdata.c:1643
#, 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:1651
+#: client/helpdata.c:1649
#, 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:1657
+#: client/helpdata.c:1655
#, c-format
msgid "* %s waste will increase slowly with distance from capital.\n"
msgstr ""
-#: client/helpdata.c:1674
+#: client/helpdata.c:1672
#, 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:1701
+#: client/helpdata.c:1699
#, c-format
msgid "%s%d %s"
msgstr "%s%d %s"
-#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1700 client/helpdata.c:1708 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:1709
+#: client/helpdata.c:1707
#, c-format
msgid "%s%d unhappy"
msgstr "%s%d infelizes"
-#: client/mapctrl_common.c:382
+#: client/mapctrl_common.c:399
#, fuzzy, c-format
msgid "You don't know how to build %s!"
msgstr "Você não compra %s!"
-#: client/mapctrl_common.c:392
+#: client/mapctrl_common.c:409
#, c-format
msgid "Copy %s to clipboard."
msgstr "Copiar %s para a área de transferência."
-#: client/mapctrl_common.c:408
+#: client/mapctrl_common.c:425
msgid "Clipboard is empty."
msgstr "Clipboard esta vazia."
-#: client/options.c:98
+#: client/options.c:102
msgid "Graphics"
msgstr "Gráficos"
-#: client/options.c:99
+#: client/options.c:103
msgid "Overview"
msgstr "Visão geral"
-#: client/options.c:100
+#: client/options.c:104
msgid "Sound"
msgstr "Som"
-#: client/options.c:101
+#: client/options.c:105
msgid "Interface"
msgstr "Interface do utilizador"
-#: client/options.c:102
+#: client/options.c:106
msgid "Network"
msgstr "Rede"
-#: client/options.c:107
+#: client/options.c:111
msgid "Login name"
msgstr "Nome"
-#: client/options.c:108
+#: client/options.c:112
msgid ""
"This is the default login username that will be used in the connection "
"dialogs or with the -a command-line parameter."
msgstr ""
-#: client/options.c:113
+#: client/options.c:117
msgid "Server"
msgstr "Servidor"
-#: client/options.c:114
+#: client/options.c:118
msgid ""
"This is the default server hostname that will be used in the connection "
"dialogs or with the -a command-line parameter."
msgstr ""
-#: client/options.c:119
+#: client/options.c:123
msgid "Server port"
msgstr "Porta"
-#: client/options.c:120
+#: client/options.c:124
msgid ""
"This is the default server port that will be used in the connection dialogs "
"or with the -a command-line parameter."
msgstr ""
-#: client/options.c:125 client/gui-win32/connectdlg.c:912 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
msgid "Metaserver"
msgstr "Metaservidor"
-#: client/options.c:126
+#: client/options.c:130
msgid ""
"The metaserver is a host that the client contacts to find out about games on "
"the internet. Don't change this from its default value unless you know what "
"you're doing."
msgstr ""
-#: client/options.c:132
+#: client/options.c:136
msgid "Soundset"
msgstr "Ãudio"
-#: client/options.c:133
+#: client/options.c:137
msgid ""
"This is the soundset that will be used. Changing this is the same as using "
"the -S command-line parameter."
msgstr ""
-#: client/options.c:138
+#: client/options.c:142
msgid "Sound plugin"
msgstr "Efeitos Sonoros"
-#: client/options.c:139
+#: client/options.c:143
msgid ""
"If you have a problem with sound, try changing the sound plugin. The new "
"plugin won't take effect until you restart Freeciv. Changing this is the "
"same as using the -P command-line option."
msgstr ""
-#: client/options.c:144 client/gui-sdl/gui_main.c:162
+#: client/options.c:148 client/gui-sdl/gui_main.c:162
msgid "Theme"
msgstr "Tema"
-#: client/options.c:145
+#: client/options.c:149
msgid "By changing this option you change the active theme."
msgstr ""
-#: client/options.c:148
+#: client/options.c:152
#, fuzzy
msgid "Tileset"
msgstr "A tentar conjunto de imagens \"%s\"."
-#: client/options.c:149
+#: client/options.c:153
msgid ""
"By changing this option you change the active tileset. This is the same as "
"using the -t command-line parameter."
msgstr ""
-#: client/options.c:156
+#: client/options.c:160
#, fuzzy
msgid "Solid unit background color"
msgstr "Cor de fundo sólido de unidade"
-#: client/options.c:157
+#: client/options.c:161
msgid ""
"Setting this option will cause units on the map view to be drawn with a "
"solid background color instead of the flag backdrop."
msgstr ""
-#: client/options.c:161 client/gui-sdl/optiondlg.c:960
+#: client/options.c:165 client/gui-sdl/optiondlg.c:960
#, fuzzy
msgid "Sound bell at new turn"
msgstr "Campainha no inÃcio de turno"
-#: client/options.c:162
+#: client/options.c:166
msgid ""
"Set this option to have a \"bell\" event be generated at the start of a new "
"turn. You can control the behavior of the \"bell\" event by editing the "
"message options."
msgstr ""
-#: client/options.c:168
+#: client/options.c:172
msgid "Unit movement animation time (milliseconds)"
msgstr ""
-#: client/options.c:169
+#: client/options.c:173
msgid ""
"This option controls how long unit \"animation\" takes when a unit moves on "
"the map view. Set it to 0 to disable animation entirely."
msgstr ""
-#: client/options.c:174
+#: client/options.c:178
msgid "Mapview recentering time (milliseconds)"
msgstr ""
-#: client/options.c:175
+#: client/options.c:179
msgid ""
"When the map view is recentered, it will slide smoothly over the map to its "
"new position. This option controls how long this slide lasts. Set it to 0 "
"to disable mapview sliding entirely."
msgstr ""
-#: client/options.c:180 client/gui-sdl/optiondlg.c:1014
+#: client/options.c:184 client/gui-sdl/optiondlg.c:1014
#, fuzzy
msgid "Show combat animation"
msgstr "Mostrar animação de combate"
-#: client/options.c:181
+#: client/options.c:185
msgid ""
"Disabling this option will turn off combat animation between units on the "
"mapview."
msgstr ""
-#: client/options.c:184
+#: client/options.c:188
#, fuzzy
msgid "Draw the citybar"
msgstr "Jogo terminou com um empate"
-#: client/options.c:185
+#: client/options.c:189
msgid ""
"Setting this option will display a 'citybar' containing useful information "
"beneath each city. Disabling this option will display only the city's name "
"and optionally, production."
msgstr ""
-#: client/options.c:191
+#: client/options.c:195
msgid "Show icons in the technology tree"
msgstr ""
-#: client/options.c:192
+#: client/options.c:196
msgid ""
"Setting this option will display icons on the technology tree diagram. "
"Turning this option off makes the technology tree more compact."
msgstr ""
-#: client/options.c:197
+#: client/options.c:201
msgid "Draw shield graphics for units"
msgstr ""
-#: client/options.c:198
+#: client/options.c:202
msgid ""
"Setting this option will draw a shield icon as the flags on units. If "
"unset, the full flag will be drawn."
msgstr ""
-#: client/options.c:202
+#: client/options.c:206
#, fuzzy
msgid "Manual Turn Done in AI Mode"
msgstr "Turno Terminado manual em Modo IA"
-#: client/options.c:203
+#: client/options.c:207
msgid ""
"Disable this option if you do not want to press the Turn Done button "
"manually when watching an AI player."
msgstr ""
-#: client/options.c:207 client/gui-sdl/optiondlg.c:1121
+#: client/options.c:211 client/gui-sdl/optiondlg.c:1121
#, fuzzy
msgid "Auto Center on Units"
msgstr "Auto-Centrar às Unidades"
-#: client/options.c:208
+#: client/options.c:212
msgid ""
"Set this option to have the active unit centered automatically when the unit "
"focus changes."
msgstr ""
-#: client/options.c:211 client/gui-sdl/optiondlg.c:1147
+#: client/options.c:215 client/gui-sdl/optiondlg.c:1147
#, fuzzy
msgid "Auto Center on Combat"
msgstr "Auto-Centrar no Combate"
-#: client/options.c:212
+#: client/options.c:216
msgid ""
"Set this option to have any combat be centered automatically. Disabled this "
"will speed up the time between turns but may cause you to miss combat "
"entirely."
msgstr ""
-#: client/options.c:217 client/gui-sdl/optiondlg.c:1174
+#: client/options.c:221 client/gui-sdl/optiondlg.c:1174
#, fuzzy
msgid "Focus on Awakened Units"
msgstr "Focar Unidades Acordadas"
-#: client/options.c:218
+#: client/options.c:222
msgid "Set this option to have newly awoken units be focused automatically."
msgstr ""
-#: client/options.c:221
+#: client/options.c:225
msgid "Allow goto into the unknown"
msgstr ""
-#: client/options.c:222
+#: client/options.c:226
msgid ""
"Setting this option will make the game consider moving into unknown tiles. "
"If not, then goto routes will detour around or be blocked by unknown tiles."
msgstr ""
-#: client/options.c:226
+#: client/options.c:230
#, fuzzy
msgid "Center map when Popup city"
msgstr "Centrar mapa ao Gerir cidade"
-#: client/options.c:227
+#: client/options.c:231
msgid ""
"Setting this option makes the mapview center on a city when its city dialog "
"is popped up."
msgstr ""
-#: client/options.c:230
+#: client/options.c:234
#, fuzzy
msgid "Concise City Production"
msgstr "Produção de Cidade Concisa"
-#: client/options.c:231
+#: client/options.c:235
msgid ""
"Set this option to make the city production (as shown in the city dialog) to "
"be more compact."
msgstr ""
-#: client/options.c:234 client/gui-sdl/optiondlg.c:1252
+#: client/options.c:238 client/gui-sdl/optiondlg.c:1252
#, fuzzy
msgid "End Turn when done moving"
msgstr "Terminar Turno ao finalizar movimentos"
-#: client/options.c:235
+#: client/options.c:239
msgid ""
"Setting this option makes your turn end automatically when all your units "
"are done moving."
msgstr ""
-#: client/options.c:238 client/gui-sdl/optiondlg.c:1226
+#: client/options.c:242 client/gui-sdl/optiondlg.c:1226
#, fuzzy
msgid "Prompt for city names"
msgstr "Perguntar nomes de cidades"
-#: client/options.c:239
+#: client/options.c:243
msgid ""
"Disabling this option will make the names of newly founded cities chosen "
"automatically by the server."
msgstr ""
-#: client/options.c:242 client/gui-sdl/optiondlg.c:1200
+#: client/options.c:246 client/gui-sdl/optiondlg.c:1200
#, fuzzy
msgid "Pop up city dialog for new cities"
msgstr "Mostrar janela de cidade para novas cidades"
-#: client/options.c:243
+#: client/options.c:247
msgid ""
"Setting this option will pop up a newly-founded city's city dialog "
"automatically."
msgstr ""
-#: client/options.c:248
+#: client/options.c:250
+#, fuzzy
+msgid "Pop up caravan actions"
+msgstr "Ações da Caravana"
+
+#: client/options.c:251
+msgid ""
+"If this option is enabled, when caravans arrive at a city where they can "
+"establish a traderoute or help build a wonder, a window will popup asking "
+"which action should be performed. Disabling this option means you will have "
+"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 ""
+
+#: client/options.c:260
+#, fuzzy
+msgid "Enable cursor changing"
+msgstr "Habilitar fusão alfa"
+
+#: client/options.c:261
+msgid ""
+"This option controls whether the client should try to change the mouse "
+"cursor depending on what is being pointed at, as well as to indicate changes "
+"in the client or server state."
+msgstr ""
+
+#: client/options.c:266
+msgid "Select cities before units"
+msgstr ""
+
+#: 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 ""
+
+#: client/options.c:272
+msgid "Clear unit orders on selection"
+msgstr ""
+
+#: client/options.c:273
+msgid ""
+"Enabling this option will cause unit orders to be cleared whenever one or "
+"more units are selected. If this option is disabled, selecting units will "
+"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 ""
+
+#: client/options.c:282
#, fuzzy
msgid "Background layer"
msgstr "Imagem de Fundo:"
-#: client/options.c:249
+#: client/options.c:283
msgid "The background layer of the overview shows just ocean and land."
msgstr ""
-#: client/options.c:252
+#: client/options.c:286
msgid "Terrain relief map layer"
msgstr ""
-#: client/options.c:253
+#: client/options.c:287
msgid "The relief layer shows all terrains on the map."
msgstr ""
-#: client/options.c:256
+#: client/options.c:290
#, fuzzy
msgid "Borders layer"
msgstr "Bordas e espaçamento"
-#: client/options.c:257
+#: client/options.c:291
msgid ""
"The borders layer of the overview shows which tiles are owned by each player."
msgstr ""
-#: client/options.c:261
+#: client/options.c:295
#, fuzzy
msgid "Units layer"
msgstr "Unidades suportadas %d"
-#: client/options.c:262
+#: client/options.c:296
msgid "Enabling this will draw units on the overview."
msgstr ""
-#: client/options.c:265
+#: client/options.c:299
#, fuzzy
msgid "Cities layer"
msgstr "Todas as Cidades"
-#: client/options.c:266
+#: client/options.c:300
msgid "Enabling this will draw cities on the overview."
msgstr ""
-#: client/options.c:269
+#: client/options.c:303
msgid "Overview fog of war"
msgstr "Visão do nevoeiro de guerra"
-#: client/options.c:270
+#: client/options.c:304
msgid "Enabling this will show fog of war on the overview."
msgstr ""
-#: client/options.c:488
+#: client/options.c:526
#, fuzzy
msgid "If you add a preset by hand, also update \"number_of_presets\""
msgstr ""
"Se adicionar uma pré-definição manualmente, actualize também "
"\"number_of_presets\""
-#: client/options.c:516
+#: client/options.c:554
msgid "Cannot find your home directory"
msgstr "Não encontro o seu diretório pessoal"
-#: client/options.c:665 client/options.c:796
+#: client/options.c:703 client/options.c:834
#, fuzzy
msgid "Save failed, cannot find a filename."
msgstr "Gravação falhou, incapaz de encontrar um nome de ficheiro."
-#: client/options.c:678 client/options.c:859
+#: client/options.c:716 client/options.c:897
#, fuzzy, c-format
msgid "Save failed, cannot write to file %s"
msgstr "Gravação falhou, incapaz de escrever no ficheiro %s"
-#: client/options.c:680 client/options.c:862
+#: client/options.c:718 client/options.c:900
#, fuzzy, c-format
msgid "Saved settings to file %s"
msgstr "Configurações gravadas para o ficheiro %s"
@@ -9010,16 +9061,16 @@ msgstr "Capacidade do servidor: %s"
msgid "Start of turn %d"
msgstr "InÃcio do turno %d"
-#: client/packhand.c:1590
+#: client/packhand.c:1591
#, c-format
msgid "AI Mode is now %s."
msgstr "Modo IA agora está %s."
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "ON"
msgstr "LIGADO"
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "OFF"
msgstr "DESLIGADO"
@@ -9051,14 +9102,15 @@ 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:2085
+#: client/gui-gtk-2.0/pages.c:2157
msgid "Flag"
msgstr "Bandeira"
#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
-#: client/gui-gtk-2.0/pages.c:1536 client/gui-gtk-2.0/pages.c:2087
-#: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
-#: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
+#: 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/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr "Nação"
@@ -9070,7 +9122,7 @@ msgstr "Borda"
msgid "Score"
msgstr "Pontuação"
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
msgid "Team"
msgstr "Time"
@@ -9142,279 +9194,305 @@ msgstr "Nenhum %s pode ser dissolvido."
msgid "Could not open temp file."
msgstr "ImpossÃvel abrir o arquivo temporário."
-#: client/servers.c:407
+#: client/servers.c:410
msgid "Invalid $http_proxy or metaserver value, must start with 'http://'"
msgstr ""
-#: client/servers.c:413
+#: client/servers.c:416
#, fuzzy
msgid "Failed looking up metaserver's host"
msgstr "Não consigo encontrar esse servidor"
-#: client/text.c:85 client/text.c:86 client/text.c:91
+#. TRANS: "AI <player name>"
+#: client/text.c:94
+#, c-format
+msgid "AI %s"
+msgstr ""
+
+#. TRANS: "<nation adjective>, team <team name>"
+#: client/text.c:118
+#, fuzzy, c-format
+msgid "%s, team %s"
+msgstr ", time %s"
+
+#: client/text.c:135 client/text.c:136 client/text.c:141
#: client/gui-sdl/mapview.c:752
msgid "?nation:Neutral"
msgstr "Neutro"
-#: client/text.c:85 client/gui-sdl/mapview.c:752
+#: client/text.c:135 client/gui-sdl/mapview.c:752
msgid "?nation:Hostile"
msgstr "Hostil"
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Peaceful"
msgstr "PacÃfico"
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Friendly"
msgstr "Amigável"
-#: client/text.c:88 client/gui-sdl/mapview.c:755
+#: client/text.c:138 client/gui-sdl/mapview.c:755
msgid "?nation:Mysterious"
msgstr "Misterioso"
-#: client/text.c:88
+#: client/text.c:138
msgid "?nation:Friendly(team)"
msgstr "Amigável (time)"
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
msgid "?city:Neutral"
msgstr "Neutro"
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
msgid "?city:Hostile"
msgstr "Hostil"
-#: client/text.c:92 client/gui-sdl/mapview.c:786
+#: client/text.c:142 client/gui-sdl/mapview.c:786
msgid "?city:Peaceful"
msgstr "PacÃfico"
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Friendly"
msgstr "Amigável"
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Mysterious"
msgstr "Misterioso"
-#: client/text.c:93
+#: client/text.c:143
msgid "?city:Friendly(team)"
msgstr "Amigável (time)"
-#: client/text.c:100
+#: client/text.c:151
#, c-format
msgid "Location: (%d, %d) [%d]"
msgstr "Localização: (%d, %d) [%d]"
-#: client/text.c:109
+#: client/text.c:153
+#, c-format
+msgid "Native coordinates: (%d, %d)"
+msgstr ""
+
+#: client/text.c:160
#, c-format
msgid "Terrain: %s"
msgstr "Terreno: %s"
-#: client/text.c:110
+#: client/text.c:161
#, c-format
msgid "Food/Prod/Trade: %s"
msgstr "Comida/Prod/Comério: %s"
-#: client/text.c:113
+#: client/text.c:164
msgid "Minor Tribe Village"
msgstr "Pequena Aldeia Tribal"
-#: client/text.c:119
+#: client/text.c:173
#, fuzzy
msgid "Our territory"
msgstr "Nosso Território"
-#. TRANS: "Polish territory"
-#: client/text.c:122
+#. TRANS: "Territory of <username> (<nation + team>)"
+#: client/text.c:176
#, fuzzy, c-format
-msgid "%s territory"
-msgstr "Território de %s"
+msgid "Territory of %s (%s)"
+msgstr ""
+"\n"
+"Território do %s %s"
-#. TRANS: "Polish territory (5 turn cease-fire)"
-#: client/text.c:131
+#: client/text.c:186
#, fuzzy, c-format
-msgid "%s territory (%d turn cease-fire)"
-msgid_plural "%s territory (%d turn cease-fire)"
-msgstr[0] "%s território (%d turno cessar-fogo)"
-msgstr[1] "%s território (%d turno cessar-fogo)"
+msgid "Territory of %s (%s) (%d turn cease-fire)"
+msgid_plural "Territory of %s (%s) (%d turn cease-fire)"
+msgstr[0] "Cidade: %s (%s, %d turno cessar-fogo)"
+msgstr[1] "Cidade: %s (%s, %d turno cessar-fogo)"
-#. TRANS: "Polish territory (friendly)"
-#: client/text.c:140
+#. TRANS: "Territory of <username>
+#. * (<nation + team> | <diplomatic state>)"
+#: client/text.c:195
#, fuzzy, c-format
-msgid "%s territory (%s)"
-msgstr "Territórios de %s %s"
+msgid "Territory of %s (%s | %s)"
+msgstr ""
+"\n"
+"Território do %s %s"
-#: client/text.c:145
+#: client/text.c:200
msgid "Unclaimed territory"
msgstr "Territórios não reclamados"
-#. TRANS: "City: Warsaw (Polish)"
-#: client/text.c:156
-#, c-format
-msgid "City: %s (%s)"
-msgstr "Cidade: %s (%s)"
+#. TRANS: "City: <city name> | <username> (<nation + team>)"
+#: client/text.c:214
+#, fuzzy, c-format
+msgid "City: %s | %s (%s)"
+msgstr "Cidade: %s (%s, %s)"
-#. TRANS: "City: Warsaw (Polish, 5 turn cease-fire)"
-#: client/text.c:166
-#, c-format
-msgid "City: %s (%s, %d turn cease-fire)"
-msgid_plural "City: %s (%s, %d turn cease-fire)"
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <number> turn cease-fire)"
+#: client/text.c:224
+#, fuzzy, c-format
+msgid "City: %s | %s (%s, %d turn cease-fire)"
+msgid_plural "City: %s | %s (%s, %d turn cease-fire)"
msgstr[0] "Cidade: %s (%s, %d turno cessar-fogo)"
msgstr[1] "Cidade: %s (%s, %d turno cessar-fogo)"
-#. TRANS: "City: Warsaw (Polish,friendly)"
-#: client/text.c:174
-#, c-format
-msgid "City: %s (%s, %s)"
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <diplomatic state>)"
+#: client/text.c:231
+#, fuzzy, c-format
+msgid "City: %s | %s (%s, %s)"
msgstr "Cidade: %s (%s, %s)"
#. TRANS: previous lines gave other information about the city.
-#: client/text.c:189
+#: client/text.c:246
#, fuzzy, c-format
msgid "?clistbegin: with %s"
msgstr " com %s"
#. TRANS: "Trade from Warsaw: 5"
-#: client/text.c:202
+#: client/text.c:259
#, c-format
msgid "Trade from %s: %d"
msgstr "Comércio de %s: %d"
-#: client/text.c:210
+#: client/text.c:267
#, c-format
msgid "Infrastructure: %s"
msgstr "Infraestrutura: %s"
-#: client/text.c:215
+#: client/text.c:272
#, c-format
msgid "Activity: %s"
msgstr "Atividade: %s"
-#. TRANS: "Unit: Musketeers (Polish, Warsaw)"
-#. TRANS: "Unit: Musketeers (Polish,friendly)"
-#: client/text.c:226 client/text.c:253
-#, c-format
-msgid "Unit: %s (%s, %s)"
+#. TRANS: "Unit: <unit type> | <username>
+#. * (<nation + team>, <homecity>)"
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <diplomatic state>)"
+#: client/text.c:287 client/text.c:313
+#, fuzzy, c-format
+msgid "Unit: %s | %s (%s, %s)"
msgstr "Unidade: %s (%s, %s)"
-#. TRANS: "Unit: Musketeers (Polish)"
-#: client/text.c:232
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>)"
+#: client/text.c:292
#, fuzzy, c-format
-msgid "Unit: %s (%s)"
-msgstr "Unidade: %s (%s)"
+msgid "Unit: %s | %s (%s)"
+msgstr "Unidade: %s (%s, %s)"
-#. TRANS: "Unit: Musketeers (Polish, 5 turn cease-fire)"
-#: client/text.c:245
-#, c-format
-msgid "Unit: %s (%s, %d turn cease-fire)"
-msgid_plural "Unit: %s (%s, %d turn cease-fire)"
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <number> turn cease-fire)"
+#: client/text.c:305
+#, fuzzy, c-format
+msgid "Unit: %s | %s (%s, %d turn cease-fire)"
+msgid_plural "Unit: %s | %s (%s, %d turn cease-fire)"
msgstr[0] "Unidade: %s (%s, %d turno cessar-fogo)"
msgstr[1] "Unidade: %s (%s, %d turno cessar-fogo)"
#. TRANS: "Chance to win: A:95% D:46%"
-#: client/text.c:279
+#: client/text.c:338
#, c-format
msgid "Chance to win: A:%d%% D:%d%%"
msgstr "Chance de vitória: A:%d%% D:%d%%"
#. TRANS: A is attack power, D is defense power, FP is firepower,
#. * HP is hitpoints (current and max).
-#: client/text.c:286
+#: client/text.c:345
#, c-format
msgid "A:%d D:%d FP:%d HP:%d/%d (%s)"
msgstr "A:%d D:%d FP:%d HP:%d/%d (%s)"
#. TRANS: "5 more" units on this tile
-#: client/text.c:295
+#: client/text.c:354
#, c-format
msgid " (%d more)"
msgstr " (mais %d)"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:364
+#: client/text.c:423
#, c-format
msgid "far from %s"
msgstr "longe de %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:367
+#: client/text.c:426
#, c-format
msgid "near %s"
msgstr "perto de %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:370
+#: client/text.c:429
#, c-format
msgid "in %s"
msgstr "em %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:403
+#: client/text.c:462
#, c-format
msgid "from %s"
msgstr "de %s"
-#: client/text.c:466
+#: client/text.c:525
msgid "Progress: no research"
msgstr "Progresso: sem pesquisas"
-#: client/text.c:470
+#: client/text.c:529
msgid "Progress: no research target"
msgstr ""
-#: client/text.c:475
+#: client/text.c:534
#, c-format
msgid "Progress: %d turn/advance"
msgid_plural "Progress: %d turns/advance"
msgstr[0] "Progresso: %d turno/avanço"
msgstr[1] "Progresso: %d turnos/avanço"
-#: client/text.c:480
+#: client/text.c:539
#, c-format
msgid "%d bulb/turn"
msgid_plural "%d bulbs/turn"
msgstr[0] "%d lâmpada/turno"
msgstr[1] "%d lâmpadas/turno"
-#: client/text.c:485
+#: client/text.c:544
#, c-format
msgid ", %d bulb/turn from team"
msgid_plural ", %d bulbs/turn from team"
msgstr[0] ""
msgstr[1] ""
-#: client/text.c:512
+#: client/text.c:571
#, c-format
msgid "%d/- (never)"
msgstr "%d/- (nunca)"
-#: client/text.c:524
+#: client/text.c:583
#, c-format
msgid "%d/%d (%d turn)"
msgid_plural "%d/%d (%d turns)"
msgstr[0] "%d/%d (%d turno)"
msgstr[1] "%d/%d (%d turnos)"
-#: client/text.c:527
+#: client/text.c:586
#, c-format
msgid "%d/%d (never)"
msgstr "%d/%d (nunca)"
-#: client/text.c:564
+#: client/text.c:623
#, c-format
msgid "%d step"
msgid_plural "%d steps"
msgstr[0] "%d passo"
msgstr[1] "%d passos"
-#: client/text.c:566
+#: client/text.c:625
#, c-format
msgid "%d bulb"
msgid_plural "%d bulbs"
msgstr[0] ""
msgstr[1] ""
-#: client/text.c:570 client/agents/cma_fec.c:269 client/agents/cma_fec.c:313
+#: 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
#, c-format
msgid "%d turn"
@@ -9422,89 +9500,89 @@ msgid_plural "%d turns"
msgstr[0] "%d turno"
msgstr[1] "%d turnos"
-#: client/text.c:592
+#: client/text.c:651
#, c-format
msgid "Population: %s"
msgstr "População: %s"
-#: client/text.c:595
+#: client/text.c:654
#, c-format
msgid "Year: %s (T%d)"
msgstr "Ano: %s (T%d)"
-#: client/text.c:598
+#: client/text.c:657
#, c-format
msgid "Gold: %d (%+d)"
msgstr "Ouro: %d (%+d)"
-#: client/text.c:600
+#: client/text.c:659
#, c-format
msgid "Tax: %d Lux: %d Sci: %d"
msgstr "Tax: %d Lux: %d Ciê: %d"
-#: client/text.c:607
+#: client/text.c:666
#, fuzzy
msgid "Moving: Nobody"
msgstr "Movendo: %s"
-#: client/text.c:609
+#: client/text.c:668
#, c-format
msgid "Moving: %s"
msgstr "Movendo: %s"
-#: client/text.c:613
+#: client/text.c:672
msgid "(Click for more info)"
msgstr "(Clique para informações)"
-#: client/text.c:629
+#: client/text.c:688
#, c-format
msgid "%s People"
msgstr "%s Pessoas"
-#: client/text.c:633
+#: client/text.c:692
#, c-format
msgid "Turn: %d"
msgstr "Turno: %d"
-#: client/text.c:635 client/gui-win32/inteldlg.c:111
+#: client/text.c:694 client/gui-win32/inteldlg.c:111
#: client/gui-xaw/inteldlg.c:208
#, c-format
msgid "Gold: %d"
msgstr "Moedas: %d"
-#: client/text.c:636
+#: client/text.c:695
#, fuzzy, c-format
msgid "Net Income: %d"
msgstr "Taxa de Entrada"
#. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:639
+#: client/text.c:698
#, c-format
msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
msgstr "Taxas: Moedas:%d%% Luxo:%d%% Ciência:%d%%"
-#: client/text.c:643
+#: client/text.c:702
#, c-format
msgid "Researching %s: %s"
msgstr "Pesquisando %s: %s"
-#: client/text.c:650
+#: client/text.c:709
#, fuzzy, c-format
msgid "Global warming chance: %d%% (%+d%%/turn)"
msgstr "Ocorreu um aquecimento global!"
-#: client/text.c:653
+#: client/text.c:712
#, fuzzy, c-format
msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
msgstr "Ocorreu um inverno nuclear!"
-#: client/text.c:658 client/gui-win32/inteldlg.c:104
+#: client/text.c:717 client/gui-win32/inteldlg.c:104
#: client/gui-xaw/inteldlg.c:200
#, c-format
msgid "Government: %s"
msgstr "Governo: %s"
-#: client/text.c:682
+#: client/text.c:741
#, c-format
msgid "%d unit"
msgid_plural "%d units"
@@ -9512,55 +9590,55 @@ msgstr[0] "%d unidade"
msgstr[1] "%d unidades"
#. TRANS: Impossible to reach goto target tile
-#: client/text.c:715 client/gui-sdl/mapview.c:566
+#: client/text.c:774 client/gui-sdl/mapview.c:566
msgid "?goto:Unreachable"
msgstr ""
-#: client/text.c:717 client/gui-sdl/mapview.c:568
+#: client/text.c:776 client/gui-sdl/mapview.c:568
#, c-format
msgid "Turns to target: %d"
msgstr "Turnos para alcançar: %d"
-#: client/text.c:719 client/gui-sdl/mapview.c:570
+#: client/text.c:778 client/gui-sdl/mapview.c:570
#, c-format
msgid "Turns to target: %d to %d"
msgstr "Turnos para alcançar: %d para %d"
-#: client/text.c:725 client/gui-sdl/mapview.c:576
+#: client/text.c:784 client/gui-sdl/mapview.c:576
#, c-format
msgid "%d unit selected"
msgid_plural "%d units selected"
msgstr[0] "%d unidade selecionada"
msgstr[1] "%d unidades selecionadas"
-#: client/text.c:730 client/gui-sdl/mapview.c:581
+#: client/text.c:789 client/gui-sdl/mapview.c:581
msgid "No units selected."
msgstr "Nenhuma unidade selecionada."
-#: client/text.c:804 client/gui-sdl/mapview.c:654
+#: client/text.c:863 client/gui-sdl/mapview.c:654
#, fuzzy, c-format
msgid "Others: %d civil; %d military"
msgstr "Desordem pública em %s."
-#: client/text.c:806 client/gui-sdl/mapview.c:656
+#: client/text.c:865 client/gui-sdl/mapview.c:656
#, c-format
msgid "Others: %d civilian"
msgstr "Outros: %d civil"
-#: client/text.c:808 client/gui-sdl/mapview.c:658
+#: client/text.c:867 client/gui-sdl/mapview.c:658
#, c-format
msgid "Others: %d military"
msgstr "Outros: %d militar"
-#: client/text.c:839
+#: client/text.c:898
msgid "No units to upgrade!"
msgstr "Nenhuma unidade para atualizar!"
-#: client/text.c:864
+#: client/text.c:923
msgid "None of these units may be upgraded."
msgstr "Nenhuma destas unidades podem ser atualizadas."
-#: client/text.c:870
+#: client/text.c:929
#, fuzzy, c-format
msgid ""
"Upgrade %d unit for %d gold?\n"
@@ -9575,74 +9653,74 @@ msgstr[1] ""
"Atualizar %s para %s por %d moedas?\n"
"O Tesouro contém %d moedas."
-#: client/text.c:891
+#: client/text.c:950
msgid "Shows your progress in researching the current technology."
msgstr ""
-#: client/text.c:897
+#: client/text.c:956
msgid "no research target."
msgstr "sem nada a pesquisar"
#. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:900
+#: client/text.c:959
#, c-format
msgid "%s: %d/%d."
msgstr "%s: %d/%d."
-#: client/text.c:920
+#: client/text.c:979
#, fuzzy
msgid "Shows the progress of global warming:"
msgstr "Ocorreu um aquecimento global!"
-#: client/text.c:921
+#: client/text.c:980
#, c-format
msgid "Pollution rate: %d%%"
msgstr "Taxa de poluição: %d%%"
-#: client/text.c:923
+#: client/text.c:982
#, c-format
msgid "Chance of catastrophic warming each turn: %d%%"
msgstr ""
-#: client/text.c:939
+#: client/text.c:998
#, fuzzy
msgid "Shows the progress of nuclear winter:"
msgstr "Ocorreu um inverno nuclear!"
-#: client/text.c:940
+#: client/text.c:999
#, fuzzy, c-format
msgid "Fallout rate: %d%%"
msgstr "Taxa de Atualização"
-#: client/text.c:942
+#: client/text.c:1001
#, c-format
msgid "Chance of catastrophic winter each turn: %d%%"
msgstr ""
-#: client/text.c:957
+#: client/text.c:1016
msgid "Shows your current government:"
msgstr "Mostra seu sistema de governo atual:"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:981
+#: client/text.c:1040
#, c-format
msgid "Population: %5d"
msgstr "População: %5d"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:1043
#, c-format
msgid "Support: %5d %%"
msgstr "Suporte: %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:1047
#, c-format
msgid "Energy: %5d %%"
msgstr "Energia: %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:992
+#: client/text.c:1051
#, fuzzy, c-format
msgid "Mass: %5d ton"
msgid_plural "Mass: %5d tons"
@@ -9650,96 +9728,97 @@ msgstr[0] "Massa: %5d ton"
msgstr[1] "Massa: %5d ton"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1057
#, c-format
msgid "Travel time: %5.1f years"
msgstr "Tempo de viagem: %5.1f anos"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1061
msgid "Travel time: N/A "
msgstr "Tempo de viagem: N/D "
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1065
#, fuzzy, c-format
msgid "Success prob.: %5d %%"
msgstr "Massa: %5d ton"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1010
+#: client/text.c:1069
#, fuzzy, c-format
msgid "Year of arrival: %8s"
msgstr "Ano da invasão bárbara"
-#: client/text.c:1030
+#: client/text.c:1089
msgid "?timeout:off"
msgstr "desligado"
-#: client/text.c:1054
+#: client/text.c:1113
#, c-format
msgid "?seconds:%02ds"
msgstr "%02ds"
-#: client/text.c:1056
+#: client/text.c:1115
#, c-format
msgid "?mins/secs:%02dm %02ds"
msgstr "%02dm %02ds"
-#: client/text.c:1058
+#: client/text.c:1117
#, c-format
msgid "?hrs/mns:%02dh %02dm"
msgstr "%02dh %02dm"
-#: client/text.c:1060
+#: client/text.c:1119
#, c-format
msgid "?dys/hrs:%02dd %02dh"
msgstr "%02dd %02dh"
-#: client/text.c:1063
+#: client/text.c:1122
msgid "?duration:overflow"
msgstr "excedida"
-#: client/text.c:1084
+#: client/text.c:1143
#, c-format
msgid "%6d.%02d ms"
msgstr "%6d.%02d ms"
-#. TRANS: "Republic of the Poles"
-#: client/text.c:1127
-#, c-format
-msgid "%s of the %s"
-msgstr "%s de %s"
+#. TRANS: <nation adjective> <government name>.
+#. * E.g. "Polish Republic".
+#: client/text.c:1188
+#, fuzzy, c-format
+msgid "?nationgovernment:%s %s"
+msgstr "Governo: %s"
#. TRANS: "Observer: 1985"
-#: client/text.c:1137
+#: client/text.c:1198
#, c-format
msgid "Observer: %s"
msgstr "Observador: %s"
-#: client/text.c:1155
+#: client/text.c:1216
msgid "Buildings: "
msgstr "EdifÃcios: "
-#: client/text.c:1172 client/text.c:1211
+#: client/text.c:1233 client/text.c:1272
msgid "None. "
msgstr "Nenhum. "
-#: client/text.c:1174 client/text.c:1213
+#: client/text.c:1235 client/text.c:1274
msgid "?clistend:."
msgstr "."
-#: client/text.c:1192
+#: client/text.c:1253
msgid "Wonders: "
msgstr "Maravilhas: "
-#: client/text.c:1247
+#: client/text.c:1308
#, 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:1251
+#: client/text.c:1312
#, fuzzy, c-format
msgid "%d content before penalty."
msgid_plural "%d content before penalty."
@@ -9747,48 +9826,49 @@ 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:1257
+#: client/text.c:1318
#, 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."
-#. TRANS: Martial law opening parenthesis
-#: client/text.c:1279
+#: client/text.c:1339
#, fuzzy
-msgid "Martial law in effect ("
+msgid "Unlimited martial law in effect."
msgstr "Lei marcial em prática ("
-#. TRANS: no [unit] maximum
-#: client/text.c:1284
-#, fuzzy
-msgid "no maximum, "
-msgstr "sem máximo, "
-
-#: client/text.c:1287
+#: client/text.c:1341
#, fuzzy, c-format
-msgid "%d unit maximum, "
-msgid_plural "%d units maximum, "
-msgstr[0] "%d unidade no máximo, "
+msgid "%d military unit may impose martial law."
+msgid_plural "Up to %d military units may impose martial law."
+msgstr[0] ""
+"* Uma unidade não-militar (não pode atacar; não pode impôr lei marcial).\n"
+msgstr[1] ""
+"* Uma unidade não-militar (não pode atacar; não pode impôr lei marcial).\n"
-#. TRANS: Martial law closing parenthesis
-#: client/text.c:1294
+#: client/text.c:1345
#, fuzzy, c-format
-msgid "%d per unit). "
-msgstr "%d por unidade). "
+msgid "Each military unit makes %d unhappy citizen content."
+msgid_plural "Each military unit makes %d unhappy citizens content."
+msgstr[0] ""
+"Entretem os cidadãos de uma cidade, tornando 3 cidadãos descontentes em "
+"contentes."
+msgstr[1] ""
+"Entretem os cidadãos de uma cidade, tornando 3 cidadãos descontentes em "
+"contentes."
-#: client/text.c:1298
+#: client/text.c:1352
#, fuzzy
msgid "Military units in the field may cause unhappiness. "
msgstr "Unidades militares no campo poderão causar infelicidade. "
-#: client/text.c:1301
+#: client/text.c:1355
#, fuzzy
msgid "Military units have no happiness effect. "
msgstr "Unidades militares não têm qualquer efeito na felicidade. "
-#: client/text.c:1316
+#: client/text.c:1370
#, fuzzy, c-format
msgid "Luxury: %d total."
msgstr "Luxo: %d total."
@@ -9816,7 +9896,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:3968
+#: client/tilespec.c:3966
#, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
@@ -9837,12 +9917,12 @@ msgid ""
"have a look."
msgstr ""
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
-#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:599
+#: client/gui-gtk-2.0/cityrep.c:624 client/gui-sdl/citydlg.c:2009
msgid "none"
msgstr "nenhum"
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:645
msgid "custom"
msgstr "custumizado"
@@ -10154,7 +10234,7 @@ msgstr "Estabelece _Rota Comercial"
msgid "Enter Marketplace"
msgstr "Transação de Entrada"
-#: client/gui-gtk-2.0/chatline.c:144 client/gui-win32/chatline.c:134
+#: client/gui-gtk-2.0/chatline.c:218 client/gui-win32/chatline.c:134
#: client/gui-xaw/chatline.c:120
#, fuzzy
msgid "Cleared output window."
@@ -10236,11 +10316,11 @@ msgid "%d/%d %d turns"
msgstr "%d/%d %d turnos"
#: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:821
+#: client/gui-gtk-2.0/cityrep.c:1027
msgid "_Buy"
msgstr "_Comprar"
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:869
#, fuzzy
msgid "_Production"
msgstr "Pro_dução"
@@ -10262,12 +10342,12 @@ msgid "Entertainers"
msgstr "Artistas"
#: client/gui-gtk-2.0/citydlg.c:1029 client/gui-win32/citydlg.c:1989
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2403
msgid "Scientists"
msgstr "Cientistas"
#: client/gui-gtk-2.0/citydlg.c:1030 client/gui-win32/citydlg.c:1991
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2404
msgid "Taxmen"
msgstr "Fiscais"
@@ -10360,7 +10440,7 @@ msgstr "Unidades suportadas %d"
msgid "Present units %d"
msgstr "Unidades presentes %d"
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:1019
msgid "Cen_ter"
msgstr "Cen_tralizar"
@@ -10452,32 +10532,62 @@ msgstr "Renomear Cidade"
msgid "What should we rename the city to?"
msgstr "Para o que devemos renomear a cidade?"
-#: client/gui-gtk-2.0/cityrep.c:699
+#: client/gui-gtk-2.0/cityrep.c:794
+#, fuzzy
+msgid "(no worklists defined)"
+msgstr "(lista de tarefas)"
+
+#: client/gui-gtk-2.0/cityrep.c:876
msgid "Chan_ge"
msgstr "_Alterar"
-#: client/gui-gtk-2.0/cityrep.c:703
+#: client/gui-gtk-2.0/cityrep.c:880
msgid "Add _First"
msgstr "Adicionar _Antes"
-#: client/gui-gtk-2.0/cityrep.c:707
+#: client/gui-gtk-2.0/cityrep.c:884
msgid "Add _Next"
msgstr "Adicionar _Após"
-#: client/gui-gtk-2.0/cityrep.c:711
+#: client/gui-gtk-2.0/cityrep.c:888
+#, fuzzy
+msgid "Add _2nd Last"
+msgstr "Adicionar por Ú_ltimo"
+
+#: client/gui-gtk-2.0/cityrep.c:892
msgid "Add _Last"
msgstr "Adicionar por Ú_ltimo"
-#: client/gui-gtk-2.0/cityrep.c:715
+#: client/gui-gtk-2.0/cityrep.c:899
+#, fuzzy
+msgid "Set Worklist"
+msgstr "Lista de Tarefas"
+
+#: client/gui-gtk-2.0/cityrep.c:905
+#, fuzzy
+msgid "Append Worklist"
+msgstr "Renomear Lista Tarefas"
+
+#: client/gui-gtk-2.0/cityrep.c:911
+#, fuzzy
+msgid "Clear _Worklist"
+msgstr "Lista de _Tarefas Objectivo:"
+
+#: client/gui-gtk-2.0/cityrep.c:916
+#, fuzzy
+msgid "Gover_nor"
+msgstr "Governador"
+
+#: client/gui-gtk-2.0/cityrep.c:921
msgid "_Select"
msgstr "_Selecionar"
-#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
+#: 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:800 client/gui-gtk-2.0/menu.c:808
+#: 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-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
#: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -10487,103 +10597,103 @@ msgstr "_Mostrar"
msgid "Cities"
msgstr "Cidades"
-#: client/gui-gtk-2.0/cityrep.c:817
+#: client/gui-gtk-2.0/cityrep.c:1023
#, fuzzy
msgid "_Inspect"
msgstr "_Visualizar"
-#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
-#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-sdl/helpdlg.c:297 client/gui-win32/menu.c:342
-#: client/gui-xaw/menu.c:241
+#: 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
+#: client/gui-gtk-2.0/cityrep.c:1518 client/gui-gtk-2.0/menu.c:823
+#: client/gui-gtk-2.0/menu.c:825 client/gui-gtk-2.0/menu.c:827
+#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:831
+#: client/gui-gtk-2.0/menu.c:833 client/gui-sdl/helpdlg.c:297
+#: client/gui-win32/menu.c:342 client/gui-xaw/menu.c:241
msgid "Improvements"
msgstr "Construções"
-#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
-#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
-#: client/gui-xaw/menu.c:247
+#: client/gui-gtk-2.0/cityrep.c:1441 client/gui-gtk-2.0/cityrep.c:1460
+#: client/gui-gtk-2.0/cityrep.c:1479 client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1522 client/gui-xaw/menu.c:247
msgid "Wonders"
msgstr "Maravilhas"
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1662 client/gui-win32/cityrep.c:439
#: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
msgid "All Cities"
msgstr "Todas as Cidades"
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1667 client/gui-win32/cityrep.c:440
msgid "No Cities"
msgstr "Nenhuma Cidade"
-#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1672 client/gui-win32/cityrep.c:441
msgid "Invert Selection"
msgstr "Inverter Seleção"
-#: client/gui-gtk-2.0/cityrep.c:1420
+#: client/gui-gtk-2.0/cityrep.c:1682
msgid "Building Units"
msgstr "Construir Unidades"
-#: client/gui-gtk-2.0/cityrep.c:1426
+#: client/gui-gtk-2.0/cityrep.c:1688
msgid "Building Improvements"
msgstr "Construir Construções"
-#: client/gui-gtk-2.0/cityrep.c:1432
+#: client/gui-gtk-2.0/cityrep.c:1694
msgid "Building Wonders"
msgstr "Construir Maravilhas"
-#: client/gui-gtk-2.0/cityrep.c:1444
+#: client/gui-gtk-2.0/cityrep.c:1706
msgid "Building Unit"
msgstr "Construir Unidade"
-#: client/gui-gtk-2.0/cityrep.c:1448
+#: client/gui-gtk-2.0/cityrep.c:1710
msgid "Building Improvement"
msgstr "Construir Construção"
-#: client/gui-gtk-2.0/cityrep.c:1452
+#: client/gui-gtk-2.0/cityrep.c:1714
msgid "Building Wonder"
msgstr "Construir Maravilha"
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1722 client/gui-win32/cityrep.c:443
msgid "Coastal Cities"
msgstr "Cidades Costeiras"
-#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1727 client/gui-win32/cityrep.c:444
msgid "Same Island"
msgstr "Mesma Ilha"
-#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1737 client/gui-win32/cityrep.c:447
msgid "Supported Units"
msgstr "Unidades Suportadas"
-#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1740 client/gui-win32/cityrep.c:454
msgid "Units Present"
msgstr "Unidades Presentes"
-#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1744 client/gui-win32/cityrep.c:469
#, fuzzy
msgid "Improvements in City"
msgstr "Construções na Cidade"
-#: client/gui-gtk-2.0/cityrep.c:1486
+#: client/gui-gtk-2.0/cityrep.c:1748
msgid "Wonders in City"
msgstr "Maravilhas na Cidade"
-#: client/gui-gtk-2.0/cityrep.c:1495
+#: client/gui-gtk-2.0/cityrep.c:1757
msgid "Available Units"
msgstr "Unidades DisponÃveis"
-#: client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1760
#, fuzzy
msgid "Available Improvements"
msgstr "Construções DisponÃveis"
-#: client/gui-gtk-2.0/cityrep.c:1501
+#: client/gui-gtk-2.0/cityrep.c:1763
msgid "Available Wonders"
msgstr "Maravilhas DisponÃveis"
-#: client/gui-gtk-2.0/cityrep.c:1625
+#: client/gui-gtk-2.0/cityrep.c:1882
#, fuzzy, c-format
msgid "Total Buy Cost: %d"
msgstr "Custo Total:"
@@ -10652,12 +10762,12 @@ 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:186
+#: client/gui-gtk-2.0/dialogs.c:196 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:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
#, fuzzy
msgid "Inspect _City"
msgstr "Visualizar _Cidade"
@@ -10686,10 +10796,10 @@ msgstr "Selecione o que pilhar:"
msgid "Unit"
msgstr "Unidade"
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
-#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
-#: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
-#: manual/civmanual.c:302 data/Freeciv.in:80
+#: 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-win32/plrdlg.c:335 manual/civmanual.c:302 data/Freeciv.in:80
msgid "Name"
msgstr "Nome"
@@ -10716,7 +10826,7 @@ 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:1036 data/Freeciv.in:3371
+#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
#, fuzzy
msgid "Pick Nation"
msgstr "Seleccione uma nação"
@@ -10801,7 +10911,7 @@ msgstr "_Mapas"
msgid "_Advances"
msgstr "_Avanços"
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:910
+#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr "_Cidades"
@@ -10915,111 +11025,180 @@ msgstr "Selecione o destino"
msgid "Show _All Cities"
msgstr "Mostrar _Todas Cidades"
-#: client/gui-gtk-2.0/gui_main.c:150
+#: client/gui-gtk-2.0/gui_main.c:162
#, fuzzy
msgid "Show Map Scrollbars"
msgstr "Exibir mapa plano"
-#: client/gui-gtk-2.0/gui_main.c:151
+#: client/gui-gtk-2.0/gui_main.c:163
msgid "Disable this option to hide the scrollbars on the map view."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:155
+#: client/gui-gtk-2.0/gui_main.c:167
#, fuzzy
msgid "Keyboardless goto"
msgstr "Ir para macador"
-#: client/gui-gtk-2.0/gui_main.c:156
+#: client/gui-gtk-2.0/gui_main.c:168
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:161
+#: client/gui-gtk-2.0/gui_main.c:173
msgid "Keep dialogs on top"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:174
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:166
+#: client/gui-gtk-2.0/gui_main.c:178
msgid "Show worklist task icons"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:179
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:171
+#: client/gui-gtk-2.0/gui_main.c:183
msgid "Enable status report tabs"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:172
+#: client/gui-gtk-2.0/gui_main.c:184
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:177 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:189 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:178 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:190 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:277 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:195
+msgid "Show time for each chat message"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:196
+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
+msgid "Split bottom notebook area"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:202
+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
+msgid "New message events go to top of list"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:208
+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
+msgid "Show extra message window buttons"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:214
+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 "
+"is disabled, these buttons will not appear (you can still double-click with "
+"the left mouse button or right-click on a row to inspect or goto "
+"respectively). This option will only take effect once the message window is "
+"closed and reopened."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:224
+msgid "Metaserver tab first in network page"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:225
+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
+msgid "Plain chat messages are sent to allies only"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:231
+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 "
+"messages will be sent as public chat messages. To send a public chat message "
+"with this option enabled, prefix the message with a single colon ':'. This "
+"option can also be set using a toggle button beside the chat entry (only "
+"visible in multiplayer games)."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:340 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:723 client/gui-gtk-2.0/gui_main.c:1345
+#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
msgid "Freeciv"
msgstr "Freeciv"
-#: client/gui-gtk-2.0/gui_main.c:1088 client/gui-gtk-2.0/gui_main.c:1095
+#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
#: 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:1095 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1232 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:1127 client/gui-gtk-2.0/menu.c:770
-#: client/gui-gtk-2.0/menu.c:772 client/gui-gtk-2.0/menu.c:774
-#: client/gui-gtk-2.0/menu.c:776 client/gui-gtk-2.0/menu.c:778
-#: client/gui-gtk-2.0/menu.c:780 client/gui-gtk-2.0/menu.c:782
-#: client/gui-gtk-2.0/menu.c:784 client/gui-gtk-2.0/menu.c:786
-#: client/gui-gtk-2.0/menu.c:788 client/gui-gtk-2.0/menu.c:790
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-gtk-2.0/menu.c:804 client/gui-gtk-2.0/menu.c:806
-#: client/gui-gtk-2.0/menu.c:808 client/gui-gtk-2.0/menu.c:810
-#: client/gui-gtk-2.0/menu.c:812 client/gui-gtk-2.0/menu.c:814
-#: client/gui-gtk-2.0/menu.c:816 client/gui-gtk-2.0/menu.c:818
-#: client/gui-gtk-2.0/menu.c:820 client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/gui_main.c:1266 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
+#: client/gui-gtk-2.0/menu.c:811 client/gui-gtk-2.0/menu.c:813
+#: client/gui-gtk-2.0/menu.c:815 client/gui-gtk-2.0/menu.c:817
+#: client/gui-gtk-2.0/menu.c:819 client/gui-gtk-2.0/menu.c:821
+#: client/gui-gtk-2.0/menu.c:823 client/gui-gtk-2.0/menu.c:825
+#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
+#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
+#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
+#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
+#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
+#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
#: data/Freeciv.in:2028
msgid "View"
msgstr "Visão"
-#: client/gui-gtk-2.0/gui_main.c:1208
+#: client/gui-gtk-2.0/gui_main.c:1359
msgid "Chat"
msgstr "Chat"
-#: client/gui-gtk-2.0/gui_main.c:1224 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1377 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"
@@ -11030,80 +11209,84 @@ 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:1491
+#: client/gui-gtk-2.0/gui_main.c:1392
+msgid "Allies Only"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:1657
#, fuzzy
msgid "Not _ready"
msgstr "P_reparar todas"
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
+#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
msgid "_Ready"
msgstr "_Pronto"
-#: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2132
+#: 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
#, fuzzy
msgid "_Start"
msgstr "Iniciar : "
-#: client/gui-gtk-2.0/gui_main.c:1520
+#: client/gui-gtk-2.0/gui_main.c:1686
#, fuzzy
msgid "_Take Player"
msgstr "take [nome-ligação] <nome-de-jogador>"
-#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
+#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
#, fuzzy
msgid "Pick _Nation"
msgstr "Seleccione uma nação"
-#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
+#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
msgid "_Observe"
msgstr "_Observar"
-#: client/gui-gtk-2.0/gui_main.c:1532
+#: client/gui-gtk-2.0/gui_main.c:1698
#, fuzzy
msgid "Do not _observe"
msgstr "Não _observar"
-#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
msgid "<AI>"
msgstr "<AI>"
-#: client/gui-gtk-2.0/gui_main.c:1557
+#: client/gui-gtk-2.0/gui_main.c:1723
#, fuzzy
msgid "<Novice AI>"
msgstr "Alterna estado IA do jogador."
-#: client/gui-gtk-2.0/gui_main.c:1560
+#: client/gui-gtk-2.0/gui_main.c:1726
#, fuzzy
msgid "<Easy AI>"
msgstr "Alterna estado IA do jogador."
-#: client/gui-gtk-2.0/gui_main.c:1563
+#: client/gui-gtk-2.0/gui_main.c:1729
#, fuzzy
msgid "<Normal AI>"
msgstr " Pacotes Normais: "
-#: client/gui-gtk-2.0/gui_main.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1732
#, fuzzy
msgid "<Hard AI>"
msgstr "Disco RÃgido 3:"
-#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1742 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:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
#, fuzzy
msgid "Observer"
msgstr " (observador)"
-#: client/gui-gtk-2.0/gui_main.c:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
#, fuzzy
msgid "Detached"
msgstr "Holandês"
-#: client/gui-gtk-2.0/gui_main.c:1899
+#: client/gui-gtk-2.0/gui_main.c:2073
#, fuzzy
msgid "Are you sure you want to quit?"
msgstr "Tem certeza que deseja apagar \"%s\" ?"
@@ -11345,499 +11528,535 @@ msgstr "Sim"
msgid "Foreign Intelligence: %s Empire"
msgstr "Relatório Espionagem Estrangeira"
-#: client/gui-gtk-2.0/mapctrl.c:195 client/gui-sdl/mapctrl.c:2565
+#: client/gui-gtk-2.0/mapctrl.c:179 client/gui-sdl/mapctrl.c:2565
#: client/gui-sdl/menu.c:839 client/gui-sdl/menu.c:1021
#: client/gui-win32/mapctrl.c:353
msgid "Build New City"
msgstr "Construir Nova Cidade"
-#: client/gui-gtk-2.0/mapctrl.c:196 client/gui-sdl/mapctrl.c:2594
+#: client/gui-gtk-2.0/mapctrl.c:180 client/gui-sdl/mapctrl.c:2594
#: client/gui-win32/mapctrl.c:354 client/gui-xaw/mapctrl.c:89
msgid "What should we call our new city?"
msgstr "Que nome devemos dar à nossa nova cidade?"
-#: client/gui-gtk-2.0/mapview.c:147
+#: client/gui-gtk-2.0/mapview.c:158
#, fuzzy
msgid "Shows your current luxury/science/tax rates;click to toggle them."
msgstr ""
"Mostra as suas taxas actuais de luxo/ciência/imposto; clique para as "
"alternar."
-#: client/gui-gtk-2.0/mapview.c:692 client/gui-win32/canvas.c:275
+#: client/gui-gtk-2.0/mapview.c:702 client/gui-win32/canvas.c:275
msgid "Better fog will only work in truecolor. Disabling it"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:250
+#: client/gui-gtk-2.0/menu.c:256
msgid "Leaving a local game will end it!"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:700 client/gui-win32/menu.c:303
+#: client/gui-gtk-2.0/menu.c:727 client/gui-win32/menu.c:303
msgid "_Game"
msgstr "_Jogo"
-#: client/gui-gtk-2.0/menu.c:702 client/gui-gtk-2.0/menu.c:704
-#: client/gui-gtk-2.0/menu.c:706 client/gui-gtk-2.0/menu.c:708
-#: client/gui-gtk-2.0/menu.c:710 client/gui-gtk-2.0/menu.c:712
-#: client/gui-gtk-2.0/menu.c:714 client/gui-gtk-2.0/menu.c:717
-#: client/gui-gtk-2.0/menu.c:720 client/gui-gtk-2.0/menu.c:722
-#: client/gui-gtk-2.0/menu.c:724 client/gui-gtk-2.0/menu.c:726
-#: client/gui-gtk-2.0/menu.c:728 client/gui-gtk-2.0/menu.c:730
-#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:736
-#: client/gui-gtk-2.0/menu.c:738 client/gui-gtk-2.0/menu.c:740
+#: client/gui-gtk-2.0/menu.c:729 client/gui-gtk-2.0/menu.c:731
+#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:735
+#: client/gui-gtk-2.0/menu.c:737 client/gui-gtk-2.0/menu.c:739
+#: client/gui-gtk-2.0/menu.c:741 client/gui-gtk-2.0/menu.c:744
+#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
+#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
+#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
+#: client/gui-gtk-2.0/menu.c:760 client/gui-gtk-2.0/menu.c:763
+#: client/gui-gtk-2.0/menu.c:765 client/gui-gtk-2.0/menu.c:767
#: data/Freeciv.in:2026
msgid "Game"
msgstr "Jogo"
-#: client/gui-gtk-2.0/menu.c:704 client/gui-gtk-2.0/menu.c:706
-#: client/gui-gtk-2.0/menu.c:708
+#: client/gui-gtk-2.0/menu.c:731 client/gui-gtk-2.0/menu.c:733
+#: client/gui-gtk-2.0/menu.c:735
msgid "_Chat"
msgstr "_Chat"
-#: client/gui-gtk-2.0/menu.c:706 client/gui-win32/menu.c:314
+#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:314
#, fuzzy
msgid "_Clear Log"
msgstr "_Limpar Registo"
-#: client/gui-gtk-2.0/menu.c:708 client/gui-win32/menu.c:313
+#: client/gui-gtk-2.0/menu.c:735 client/gui-win32/menu.c:313
#, fuzzy
msgid "_Write Log"
msgstr "Comando"
-#: client/gui-gtk-2.0/menu.c:710 client/gui-win32/menu.c:304
+#: client/gui-gtk-2.0/menu.c:737 client/gui-win32/menu.c:304
#, fuzzy
msgid "Local _Options"
msgstr "Opções Locais"
-#: client/gui-gtk-2.0/menu.c:712 client/gui-win32/menu.c:305
+#: client/gui-gtk-2.0/menu.c:739 client/gui-win32/menu.c:305
#, fuzzy
msgid "_Message Options"
msgstr "Opções das Mensagens"
-#: client/gui-gtk-2.0/menu.c:717
+#: client/gui-gtk-2.0/menu.c:744
#, fuzzy
msgid "_Reload Tileset"
msgstr "A tentar conjunto de imagens \"%s\"."
-#: client/gui-gtk-2.0/menu.c:720
+#: client/gui-gtk-2.0/menu.c:747
#, fuzzy
msgid "Save Options on _Exit"
msgstr "Gravar Mudanças e Sair"
-#: client/gui-gtk-2.0/menu.c:722
+#: client/gui-gtk-2.0/menu.c:749
#, fuzzy
msgid "Sa_ve Options"
msgstr ""
"\n"
"Uso: %s [opções] [nome dos ficheiros ...]\n"
-#: client/gui-gtk-2.0/menu.c:726 client/gui-win32/menu.c:308
+#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:308
#, fuzzy
msgid "Server O_ptions"
msgstr "Operador do Servidor: %s"
-#: client/gui-gtk-2.0/menu.c:730 client/gui-win32/menu.c:310
+#: client/gui-gtk-2.0/menu.c:757 client/gui-win32/menu.c:310
#, fuzzy
msgid "_Save Game"
msgstr "Gravar Jogo"
-#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:311
+#: client/gui-gtk-2.0/menu.c:760 client/gui-win32/menu.c:311
#, fuzzy
msgid "Save Game _As..."
msgstr "Jogo gravado como %s"
-#: client/gui-gtk-2.0/menu.c:738
+#: client/gui-gtk-2.0/menu.c:765
#, fuzzy
msgid "_Leave"
msgstr "Liderança"
-#: client/gui-gtk-2.0/menu.c:740 client/gui-win32/menu.c:317
+#: client/gui-gtk-2.0/menu.c:767 client/gui-win32/menu.c:317
msgid "_Quit"
msgstr "_Sair"
-#: client/gui-gtk-2.0/menu.c:745 client/gui-win32/menu.c:321
+#: client/gui-gtk-2.0/menu.c:772 client/gui-win32/menu.c:321
msgid "Gov_ernment"
msgstr "Gov_erno"
-#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
-#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
-#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:774 client/gui-gtk-2.0/menu.c:776
+#: client/gui-gtk-2.0/menu.c:778 client/gui-gtk-2.0/menu.c:780
+#: client/gui-gtk-2.0/menu.c:782 client/gui-gtk-2.0/menu.c:784
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
#: client/gui-xaw/menu.c:248 data/Freeciv.in:2027 data/helpdata.txt:1320
msgid "Government"
msgstr "Governo"
-#: client/gui-gtk-2.0/menu.c:749 client/gui-win32/menu.c:322
+#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:322
msgid "_Tax Rates"
msgstr "_Impostos"
-#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:324
+#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:324
#, fuzzy
msgid "_Find City"
msgstr "Encontrar _Cidade"
-#: client/gui-gtk-2.0/menu.c:755 client/gui-win32/menu.c:325
+#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:325
#, fuzzy
msgid "_Worklists"
msgstr "Listas de _Tarefas:"
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
-#: client/gui-gtk-2.0/menu.c:764 client/gui-win32/menu.c:327
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
+#: client/gui-gtk-2.0/menu.c:791 client/gui-win32/menu.c:327
#, fuzzy
msgid "_Change Government"
msgstr "Mudar para:"
-#: client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:788
#, fuzzy
msgid "_Revolution..."
msgstr "Revolução!"
-#: client/gui-gtk-2.0/menu.c:764 client/gui-gtk-2.0/menu.c:970
+#: client/gui-gtk-2.0/menu.c:791 client/gui-gtk-2.0/menu.c:1013
#: client/gui-win32/menu.c:431
#, fuzzy
msgid "_Government"
msgstr "_Governo"
-#: client/gui-gtk-2.0/menu.c:768 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:795 client/gui-gtk-2.0/menu.c:959
#: client/gui-win32/menu.c:334
msgid "_View"
msgstr "_Visão"
-#: client/gui-gtk-2.0/menu.c:772
+#: client/gui-gtk-2.0/menu.c:799
#, fuzzy
msgid "City Outlines"
msgstr "Cidade nº %d"
-#: client/gui-gtk-2.0/menu.c:774 client/gui-win32/menu.c:335
+#: client/gui-gtk-2.0/menu.c:801 client/gui-win32/menu.c:335
msgid "Map _Grid"
msgstr "_QuadrÃcula Mapa"
-#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:336
+#: client/gui-gtk-2.0/menu.c:803 client/gui-win32/menu.c:336
#, fuzzy
msgid "National _Borders"
msgstr "Bordas e espaçamento"
-#: client/gui-gtk-2.0/menu.c:778 client/gui-win32/menu.c:337
+#: client/gui-gtk-2.0/menu.c:805 client/gui-win32/menu.c:337
msgid "City _Names"
msgstr "_Nomes Cidades"
-#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:338
+#: client/gui-gtk-2.0/menu.c:807 client/gui-win32/menu.c:338
msgid "City G_rowth"
msgstr "C_rescimento Cidade"
-#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:339
+#: client/gui-gtk-2.0/menu.c:809 client/gui-win32/menu.c:339
msgid "City _Productions"
msgstr "_Produção Cidades"
-#: client/gui-gtk-2.0/menu.c:784 client/gui-sdl/optiondlg.c:1719
+#: client/gui-gtk-2.0/menu.c:811
+#, fuzzy
+msgid "City Buy Cost"
+msgstr "Custo Total:"
+
+#: client/gui-gtk-2.0/menu.c:813
+#, fuzzy
+msgid "City Traderoutes"
+msgstr "Rotas de comércio:"
+
+#: client/gui-gtk-2.0/menu.c:815 client/gui-sdl/optiondlg.c:1719
msgid "Draw city worker map grid"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:788 client/gui-sdl/optiondlg.c:1635
+#: client/gui-gtk-2.0/menu.c:819 client/gui-sdl/optiondlg.c:1635
#: client/gui-win32/menu.c:340 client/gui-xaw/menu.c:148
#: client/gui-xaw/menu.c:246 manual/civmanual.c:220 data/helpdata.txt:1220
msgid "Terrain"
msgstr "Terreno"
-#: client/gui-gtk-2.0/menu.c:790 client/gui-win32/menu.c:341
+#: client/gui-gtk-2.0/menu.c:821 client/gui-win32/menu.c:341
#: client/gui-xaw/menu.c:149
msgid "Coastline"
msgstr "Linha Costeira"
-#: client/gui-gtk-2.0/menu.c:796 client/gui-win32/menu.c:343
+#: client/gui-gtk-2.0/menu.c:827 client/gui-win32/menu.c:343
msgid "Roads & Rails"
msgstr "Estradas & Ferrovias"
-#: client/gui-gtk-2.0/menu.c:800 client/gui-sdl/optiondlg.c:1933
+#: client/gui-gtk-2.0/menu.c:831 client/gui-sdl/optiondlg.c:1933
#: client/gui-win32/menu.c:345 client/gui-xaw/menu.c:152
msgid "Mines"
msgstr "Minas"
-#: client/gui-gtk-2.0/menu.c:802 client/gui-win32/menu.c:346
+#: client/gui-gtk-2.0/menu.c:833 client/gui-win32/menu.c:346
msgid "Fortress & Airbase"
msgstr "Fortalezas & Bases Aéreas"
-#: client/gui-gtk-2.0/menu.c:804 client/gui-win32/menu.c:348
+#: client/gui-gtk-2.0/menu.c:835 client/gui-win32/menu.c:348
#: client/gui-xaw/menu.c:154
msgid "Specials"
msgstr "Especiais"
-#: client/gui-gtk-2.0/menu.c:806 client/gui-win32/menu.c:349
+#: client/gui-gtk-2.0/menu.c:837 client/gui-win32/menu.c:349
#: client/gui-xaw/menu.c:155
msgid "Pollution & Fallout"
msgstr "Poluição & Chuva Nuclear"
-#: client/gui-gtk-2.0/menu.c:812 client/gui-win32/menu.c:352
+#: client/gui-gtk-2.0/menu.c:843 client/gui-win32/menu.c:352
#: client/gui-xaw/menu.c:158
msgid "Focus Unit"
msgstr "Focar Unidade"
-#: client/gui-gtk-2.0/menu.c:814 client/gui-sdl/optiondlg.c:1854
+#: client/gui-gtk-2.0/menu.c:845 client/gui-sdl/optiondlg.c:1854
#: client/gui-win32/menu.c:353 client/gui-xaw/menu.c:159
msgid "Fog of War"
msgstr "Nevoeiro de Guerra"
-#: client/gui-gtk-2.0/menu.c:818
+#: client/gui-gtk-2.0/menu.c:849
msgid "_Full Screen"
msgstr "_Tela Cheia"
-#: client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/menu.c:853
msgid "_Center View"
msgstr "_Centrar Vista"
-#: client/gui-gtk-2.0/menu.c:825 client/gui-win32/menu.c:358
+#: client/gui-gtk-2.0/menu.c:856 client/gui-win32/menu.c:358
msgid "_Orders"
msgstr "_Ordens"
-#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
-#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
-#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
-#: client/gui-gtk-2.0/menu.c:855 client/gui-gtk-2.0/menu.c:857
-#: client/gui-gtk-2.0/menu.c:859 client/gui-gtk-2.0/menu.c:861
-#: client/gui-gtk-2.0/menu.c:863 client/gui-gtk-2.0/menu.c:865
-#: client/gui-gtk-2.0/menu.c:867 client/gui-gtk-2.0/menu.c:869
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875 client/gui-gtk-2.0/menu.c:877
-#: client/gui-gtk-2.0/menu.c:879 client/gui-gtk-2.0/menu.c:881
-#: client/gui-gtk-2.0/menu.c:883 client/gui-gtk-2.0/menu.c:885
-#: client/gui-gtk-2.0/menu.c:887 client/gui-gtk-2.0/menu.c:889
-#: client/gui-gtk-2.0/menu.c:891 client/gui-gtk-2.0/menu.c:893
-#: client/gui-gtk-2.0/menu.c:895 client/gui-gtk-2.0/menu.c:897
-#: client/gui-gtk-2.0/menu.c:899 client/gui-gtk-2.0/menu.c:901
-#: client/gui-gtk-2.0/menu.c:903 data/Freeciv.in:2029
+#: client/gui-gtk-2.0/menu.c:858 client/gui-gtk-2.0/menu.c:860
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:864
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:868
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:872
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:876
+#: client/gui-gtk-2.0/menu.c:878 client/gui-gtk-2.0/menu.c:880
+#: client/gui-gtk-2.0/menu.c:882 client/gui-gtk-2.0/menu.c:884
+#: client/gui-gtk-2.0/menu.c:886 client/gui-gtk-2.0/menu.c:888
+#: client/gui-gtk-2.0/menu.c:890 client/gui-gtk-2.0/menu.c:892
+#: client/gui-gtk-2.0/menu.c:894 client/gui-gtk-2.0/menu.c:896
+#: client/gui-gtk-2.0/menu.c:898 client/gui-gtk-2.0/menu.c:900
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906 client/gui-gtk-2.0/menu.c:908
+#: client/gui-gtk-2.0/menu.c:910 client/gui-gtk-2.0/menu.c:912
+#: client/gui-gtk-2.0/menu.c:914 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:918 client/gui-gtk-2.0/menu.c:920
+#: client/gui-gtk-2.0/menu.c:922 client/gui-gtk-2.0/menu.c:924
+#: client/gui-gtk-2.0/menu.c:926 client/gui-gtk-2.0/menu.c:928
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
+#: client/gui-gtk-2.0/menu.c:946 data/Freeciv.in:2029
msgid "Orders"
msgstr "Ordens"
-#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:1444
+#: client/gui-gtk-2.0/menu.c:860 client/gui-gtk-2.0/menu.c:1489
#: client/gui-win32/menu.c:359
msgid "_Build City"
msgstr "Fundar _Cidade"
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:1466
-#: client/gui-gtk-2.0/menu.c:1472 client/gui-win32/menu.c:360
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:1511
+#: client/gui-gtk-2.0/menu.c:1517 client/gui-win32/menu.c:360
msgid "Build _Road"
msgstr "Construir Est_rada"
-#: client/gui-gtk-2.0/menu.c:833 client/gui-gtk-2.0/menu.c:1360
+#: 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 "Construir _Irrigação"
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:1361
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:1406
#: client/gui-win32/menu.c:362
msgid "Build _Mine"
msgstr "Construir _Mina"
-#: client/gui-gtk-2.0/menu.c:837 client/gui-gtk-2.0/menu.c:1362
+#: client/gui-gtk-2.0/menu.c:868 client/gui-gtk-2.0/menu.c:1407
msgid "Transf_orm Terrain"
msgstr "Transf_ormar Terreno"
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:1508
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:1553
#: client/gui-win32/menu.c:364
msgid "Build _Fortress"
msgstr "Construir _Fortaleza"
-#: client/gui-gtk-2.0/menu.c:841 client/gui-win32/menu.c:365
+#: client/gui-gtk-2.0/menu.c:872 client/gui-win32/menu.c:365
msgid "Build Airbas_e"
msgstr "Construir A_eroporto"
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:1514
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:1559
#: client/gui-win32/menu.c:366
msgid "Clean _Pollution"
msgstr "Limpar _Poluição"
-#: client/gui-gtk-2.0/menu.c:845 client/gui-win32/menu.c:367
+#: client/gui-gtk-2.0/menu.c:876 client/gui-win32/menu.c:367
msgid "Clean _Nuclear Fallout"
msgstr "Limpar Radiação _Nuclear"
-#: client/gui-gtk-2.0/menu.c:849 client/gui-win32/menu.c:369
+#: client/gui-gtk-2.0/menu.c:880 client/gui-win32/menu.c:369
msgid "_Sentry"
msgstr "_Sentinela"
-#: client/gui-gtk-2.0/menu.c:855 client/gui-win32/menu.c:372
+#: client/gui-gtk-2.0/menu.c:886 client/gui-win32/menu.c:372
msgid "Make _Homecity"
msgstr "Tornar Cidade Ori_gem"
-#: client/gui-gtk-2.0/menu.c:857 client/gui-win32/menu.c:373
+#: client/gui-gtk-2.0/menu.c:888 client/gui-win32/menu.c:373
msgid "_Load"
msgstr "_Carregar"
-#: client/gui-gtk-2.0/menu.c:859
+#: client/gui-gtk-2.0/menu.c:890
msgid "_Unload Transporter"
msgstr "_Desembarcar Transporte"
-#: client/gui-gtk-2.0/menu.c:861 client/gui-win32/menu.c:374
+#: client/gui-gtk-2.0/menu.c:892 client/gui-win32/menu.c:374
msgid "_Unload"
msgstr "_Desembarcar"
-#: client/gui-gtk-2.0/menu.c:863 client/gui-win32/menu.c:375
+#: client/gui-gtk-2.0/menu.c:894 client/gui-win32/menu.c:375
msgid "Wake up o_thers"
msgstr "Acordar ou_tras"
-#: client/gui-gtk-2.0/menu.c:867
+#: client/gui-gtk-2.0/menu.c:898
msgid "_Auto Settler"
msgstr "Colono _Automático"
-#: client/gui-gtk-2.0/menu.c:869 client/gui-win32/menu.c:378
+#: client/gui-gtk-2.0/menu.c:900 client/gui-win32/menu.c:378
msgid "Auto E_xplore"
msgstr "E_xplorar Automaticamente"
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906
msgid "_Connect"
msgstr "_Conectar"
-#: client/gui-gtk-2.0/menu.c:871 client/gui-win32/menu.c:380
+#: client/gui-gtk-2.0/menu.c:902 client/gui-win32/menu.c:380
msgid "_Road"
msgstr "_Estrada"
-#: client/gui-gtk-2.0/menu.c:873 client/gui-win32/menu.c:381
+#: client/gui-gtk-2.0/menu.c:904 client/gui-win32/menu.c:381
#, fuzzy
msgid "Rai_l"
msgstr "Veleiro"
-#: client/gui-gtk-2.0/menu.c:875 client/gui-win32/menu.c:382
+#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:382
msgid "_Irrigate"
msgstr "_Irrigar"
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
msgid "Go _to"
msgstr "_Ir para"
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
msgid "_Build city"
msgstr "Fundar _Cidade"
-#: client/gui-gtk-2.0/menu.c:879
+#: client/gui-gtk-2.0/menu.c:910
msgid "Patrol (_Q)"
msgstr "Patrulhar (_Q)"
-#: client/gui-gtk-2.0/menu.c:881 client/gui-win32/menu.c:385
+#: client/gui-gtk-2.0/menu.c:912 client/gui-win32/menu.c:385
msgid "_Go to"
msgstr "_Ir para"
-#: client/gui-gtk-2.0/menu.c:883
+#: client/gui-gtk-2.0/menu.c:914
#, fuzzy
msgid "Go\\/Airlift to City"
msgstr "Ir\\/Aerotransportar para Cidade"
-#: client/gui-gtk-2.0/menu.c:885 client/gui-sdl/menu.c:450
+#: client/gui-gtk-2.0/menu.c:916 client/gui-sdl/menu.c:450
#: client/gui-win32/menu.c:387 client/gui-xaw/menu.c:203
#, fuzzy
msgid "Return to nearest city"
msgstr "Você dá a cidade de %s aos %s."
-#: client/gui-gtk-2.0/menu.c:889 client/gui-win32/menu.c:389
+#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:389
#: client/gui-xaw/menu.c:205
msgid "Disband Unit"
msgstr "Dissolver Unidade"
-#: client/gui-gtk-2.0/menu.c:891 client/gui-sdl/citydlg.c:532
+#: client/gui-gtk-2.0/menu.c:922 client/gui-sdl/citydlg.c:532
#: data/Freeciv.in:1186
#, fuzzy
msgid "Upgrade unit"
msgstr "Actualizar unidade"
-#: client/gui-gtk-2.0/menu.c:893
+#: client/gui-gtk-2.0/menu.c:924
#, fuzzy
msgid "Diplomat\\/Spy Actions"
msgstr "Acções Diplomáticas\\/Espião"
-#: client/gui-gtk-2.0/menu.c:895 client/gui-sdl/menu.c:399
+#: client/gui-gtk-2.0/menu.c:926 client/gui-sdl/menu.c:399
#: client/gui-win32/menu.c:391 client/gui-xaw/menu.c:209
msgid "Explode Nuclear"
msgstr "Detonar Arma Nuclear"
-#: client/gui-gtk-2.0/menu.c:899
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/cityrep.c:882
+msgid "Select"
+msgstr "Selecionar"
+
+#: client/gui-gtk-2.0/menu.c:934
#, fuzzy
-msgid "Select same type"
-msgstr "Selecione o tipo do bem"
+msgid "Single"
+msgstr "Selva"
+
+#: client/gui-gtk-2.0/menu.c:936
+msgid "Same Type On Tile"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:938
+msgid "All On Tile"
+msgstr ""
-#: client/gui-gtk-2.0/menu.c:901 client/gui-win32/menu.c:393
+#: client/gui-gtk-2.0/menu.c:940
+msgid "Same Type On Continent"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:942
+msgid "Same Type Everywhere"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:393
msgid "_Wait"
msgstr "_Esperar"
-#: client/gui-gtk-2.0/menu.c:903 client/gui-win32/menu.c:394
+#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:394
#: client/gui-xaw/menu.c:213
msgid "Done"
msgstr "Acabei"
-#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:398
+#: client/gui-gtk-2.0/menu.c:949 client/gui-win32/menu.c:398
msgid "_Reports"
msgstr "_Relatórios"
-#: client/gui-gtk-2.0/menu.c:908 client/gui-gtk-2.0/menu.c:910
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:914
-#: client/gui-gtk-2.0/menu.c:916 client/gui-gtk-2.0/menu.c:918
-#: client/gui-gtk-2.0/menu.c:920 client/gui-gtk-2.0/menu.c:922
-#: client/gui-gtk-2.0/menu.c:924 client/gui-gtk-2.0/menu.c:926
-#: client/gui-gtk-2.0/menu.c:928 client/gui-gtk-2.0/menu.c:930
-#: client/gui-gtk-2.0/menu.c:932 data/Freeciv.in:2030
+#: client/gui-gtk-2.0/menu.c:951 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:957
+#: client/gui-gtk-2.0/menu.c:959 client/gui-gtk-2.0/menu.c:961
+#: client/gui-gtk-2.0/menu.c:963 client/gui-gtk-2.0/menu.c:965
+#: client/gui-gtk-2.0/menu.c:967 client/gui-gtk-2.0/menu.c:969
+#: client/gui-gtk-2.0/menu.c:971 client/gui-gtk-2.0/menu.c:973
+#: client/gui-gtk-2.0/menu.c:975 data/Freeciv.in:2030
msgid "Reports"
msgstr "Relatórios"
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:958
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:1001
#: client/gui-win32/menu.c:400 client/gui-win32/menu.c:425
msgid "_Units"
msgstr "_Unidades"
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/menu.c:914 client/gui-win32/menu.c:402
+#: client/gui-gtk-2.0/menu.c:957 client/gui-win32/menu.c:402
#, fuzzy
msgid "_Nations"
msgstr "_Nações"
-#: client/gui-gtk-2.0/menu.c:918 client/gui-win32/menu.c:403
+#: client/gui-gtk-2.0/menu.c:961 client/gui-win32/menu.c:403
msgid "_Economy"
msgstr "_Economia"
#. TRANS: Research report action
-#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:405
+#: client/gui-gtk-2.0/menu.c:963 client/gui-win32/menu.c:405
#, fuzzy
msgid "_Research"
msgstr "_Pesquisar"
-#: client/gui-gtk-2.0/menu.c:924 client/gui-win32/menu.c:407
+#: client/gui-gtk-2.0/menu.c:967 client/gui-win32/menu.c:407
msgid "_Wonders of the World"
msgstr "_Maravilhas do Mundo"
-#: client/gui-gtk-2.0/menu.c:926 client/gui-win32/menu.c:408
+#: client/gui-gtk-2.0/menu.c:969 client/gui-win32/menu.c:408
#, fuzzy
msgid "_Top Five Cities"
msgstr "As _Cinco Principais Cidades"
-#: client/gui-gtk-2.0/menu.c:928 client/gui-win32/menu.c:409
+#: client/gui-gtk-2.0/menu.c:971 client/gui-win32/menu.c:409
msgid "_Messages"
msgstr "_Mensagens"
-#: client/gui-gtk-2.0/menu.c:930 client/gui-win32/menu.c:410
+#: client/gui-gtk-2.0/menu.c:973 client/gui-win32/menu.c:410
#, fuzzy
msgid "_Demographics"
msgstr "_Demografia"
-#: client/gui-gtk-2.0/menu.c:932 client/gui-gtk-2.0/plrdlg.c:471
+#: client/gui-gtk-2.0/menu.c:975 client/gui-gtk-2.0/plrdlg.c:354
#: client/gui-win32/menu.c:411
msgid "_Spaceship"
msgstr "Nave e_spacial"
-#: client/gui-gtk-2.0/menu.c:936 client/gui-win32/menu.c:415
+#: client/gui-gtk-2.0/menu.c:979 client/gui-win32/menu.c:415
msgid "_Help"
msgstr "_Ajuda"
-#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
-#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
-#: client/gui-gtk-2.0/menu.c:946 client/gui-gtk-2.0/menu.c:948
-#: client/gui-gtk-2.0/menu.c:950 client/gui-gtk-2.0/menu.c:952
-#: client/gui-gtk-2.0/menu.c:954 client/gui-gtk-2.0/menu.c:956
-#: client/gui-gtk-2.0/menu.c:958 client/gui-gtk-2.0/menu.c:960
-#: client/gui-gtk-2.0/menu.c:962 client/gui-gtk-2.0/menu.c:964
-#: client/gui-gtk-2.0/menu.c:966 client/gui-gtk-2.0/menu.c:968
-#: client/gui-gtk-2.0/menu.c:970 client/gui-gtk-2.0/menu.c:972
-#: client/gui-gtk-2.0/menu.c:974 client/gui-gtk-2.0/menu.c:976
-#: client/gui-gtk-2.0/menu.c:978 client/gui-gtk-2.0/menu.c:980
+#: client/gui-gtk-2.0/menu.c:981 client/gui-gtk-2.0/menu.c:983
+#: client/gui-gtk-2.0/menu.c:985 client/gui-gtk-2.0/menu.c:987
+#: client/gui-gtk-2.0/menu.c:989 client/gui-gtk-2.0/menu.c:991
+#: client/gui-gtk-2.0/menu.c:993 client/gui-gtk-2.0/menu.c:995
+#: client/gui-gtk-2.0/menu.c:997 client/gui-gtk-2.0/menu.c:999
+#: client/gui-gtk-2.0/menu.c:1001 client/gui-gtk-2.0/menu.c:1003
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-gtk-2.0/menu.c:1007
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-gtk-2.0/menu.c:1011
+#: client/gui-gtk-2.0/menu.c:1013 client/gui-gtk-2.0/menu.c:1015
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-gtk-2.0/menu.c:1019
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-gtk-2.0/menu.c:1023
#: client/gui-gtk-2.0/repodlgs.c:313 client/gui-win32/citydlg.c:1077
#: client/gui-win32/repodlgs.c:289 client/gui-win32/wldlg.c:846
#: data/Freeciv.in:1466 data/Freeciv.in:2031 data/Freeciv.in:2101
@@ -11845,129 +12064,129 @@ msgstr "_Ajuda"
msgid "Help"
msgstr "Ajuda"
-#: client/gui-gtk-2.0/menu.c:940 client/gui-win32/menu.c:416
+#: client/gui-gtk-2.0/menu.c:983 client/gui-win32/menu.c:416
msgid "Language_s"
msgstr "Idioma_s"
-#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/menu.c:417
+#: client/gui-gtk-2.0/menu.c:985 client/gui-win32/menu.c:417
msgid "Co_nnecting"
msgstr "Co_nectar"
-#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:418
+#: client/gui-gtk-2.0/menu.c:987 client/gui-win32/menu.c:418
#, fuzzy
msgid "C_ontrols"
msgstr "C_ontrolos"
-#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:419
+#: client/gui-gtk-2.0/menu.c:989 client/gui-win32/menu.c:419
#, fuzzy
msgid "C_hatline"
msgstr "Lin_ha de Diálogo"
-#: client/gui-gtk-2.0/menu.c:948 client/gui-win32/menu.c:420
+#: client/gui-gtk-2.0/menu.c:991 client/gui-win32/menu.c:420
#, fuzzy
msgid "_Worklist Editor"
msgstr "Editor _Lista de Tarefas"
-#: client/gui-gtk-2.0/menu.c:950 client/gui-win32/menu.c:421
+#: client/gui-gtk-2.0/menu.c:993 client/gui-win32/menu.c:421
#, fuzzy
msgid "Citizen _Management"
msgstr "_Gestão de Cidadãos"
-#: client/gui-gtk-2.0/menu.c:952 client/gui-win32/menu.c:422
+#: client/gui-gtk-2.0/menu.c:995 client/gui-win32/menu.c:422
msgid "_Playing"
msgstr "_Jogar"
-#: client/gui-gtk-2.0/menu.c:956 client/gui-win32/menu.c:424
+#: client/gui-gtk-2.0/menu.c:999 client/gui-win32/menu.c:424
#, fuzzy
msgid "City _Improvements"
msgstr "Construções C_idade"
-#: client/gui-gtk-2.0/menu.c:960 client/gui-win32/menu.c:426
+#: client/gui-gtk-2.0/menu.c:1003 client/gui-win32/menu.c:426
msgid "Com_bat"
msgstr "Com_bate"
-#: client/gui-gtk-2.0/menu.c:962 client/gui-win32/menu.c:427
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-win32/menu.c:427
msgid "_ZOC"
msgstr "_ZDC"
-#: client/gui-gtk-2.0/menu.c:964 client/gui-win32/menu.c:428
+#: client/gui-gtk-2.0/menu.c:1007 client/gui-win32/menu.c:428
msgid "Techno_logy"
msgstr "Tecno_logia"
-#: client/gui-gtk-2.0/menu.c:966 client/gui-win32/menu.c:429
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-win32/menu.c:429
msgid "_Terrain"
msgstr "_Terreno"
-#: client/gui-gtk-2.0/menu.c:968 client/gui-win32/menu.c:430
+#: client/gui-gtk-2.0/menu.c:1011 client/gui-win32/menu.c:430
msgid "Won_ders"
msgstr "_Maravilhas"
-#: client/gui-gtk-2.0/menu.c:972 client/gui-win32/menu.c:432
+#: client/gui-gtk-2.0/menu.c:1015 client/gui-win32/menu.c:432
msgid "Happin_ess"
msgstr "F_elicidade"
-#: client/gui-gtk-2.0/menu.c:974 client/gui-win32/menu.c:433
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-win32/menu.c:433
msgid "Space _Race"
msgstr "Co_rrida Espacial"
-#: client/gui-gtk-2.0/menu.c:978 client/gui-win32/menu.c:435
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-win32/menu.c:435
msgid "_Copying"
msgstr "_Licença"
-#: client/gui-gtk-2.0/menu.c:980 client/gui-win32/menu.c:436
+#: client/gui-gtk-2.0/menu.c:1023 client/gui-win32/menu.c:436
msgid "_About"
msgstr "_Sobre"
-#: client/gui-gtk-2.0/menu.c:1264
+#: client/gui-gtk-2.0/menu.c:1307
#, c-format
msgid "%s..."
msgstr "%s..."
-#: client/gui-gtk-2.0/menu.c:1352
+#: client/gui-gtk-2.0/menu.c:1397
#, fuzzy, c-format
msgid "Change to %s (_I)"
msgstr "Alterar para %s (_I)"
-#: client/gui-gtk-2.0/menu.c:1353
+#: client/gui-gtk-2.0/menu.c:1398
#, fuzzy, c-format
msgid "Change to %s (_M)"
msgstr "Alterar para %s (_M)"
-#: client/gui-gtk-2.0/menu.c:1354
+#: client/gui-gtk-2.0/menu.c:1399
#, fuzzy, c-format
msgid "Transf_orm to %s"
msgstr "Transf_ormar em %s"
-#: client/gui-gtk-2.0/menu.c:1427
+#: client/gui-gtk-2.0/menu.c:1472
#, fuzzy
msgid "Help _Build Wonder"
msgstr "Ajudar a Construir _Maravilha"
-#: client/gui-gtk-2.0/menu.c:1441
+#: client/gui-gtk-2.0/menu.c:1486
#, fuzzy
msgid "Add to City (_B)"
msgstr "Juntar à Cidade (_B)"
-#: client/gui-gtk-2.0/menu.c:1449
+#: client/gui-gtk-2.0/menu.c:1494
#, fuzzy
msgid "Make Trade _Route"
msgstr "Estabelecer _Rota Comercial"
-#: client/gui-gtk-2.0/menu.c:1463
+#: client/gui-gtk-2.0/menu.c:1508
#, fuzzy
msgid "Build _Railroad"
msgstr "Construir Fe_rrovia"
-#: client/gui-gtk-2.0/menu.c:1486
+#: client/gui-gtk-2.0/menu.c:1531
#, fuzzy
msgid "Bu_ild Farmland"
msgstr "Construir _Quinta"
-#: client/gui-gtk-2.0/menu.c:1506
+#: client/gui-gtk-2.0/menu.c:1551
msgid "_Fortify"
msgstr "_Fortificar"
-#: client/gui-gtk-2.0/menu.c:1512
+#: client/gui-gtk-2.0/menu.c:1557
#, fuzzy
msgid "_Paradrop"
msgstr "Lançar _Páraquedas"
@@ -12000,13 +12219,32 @@ msgstr "Men"
msgid "Pop"
msgstr "Ind"
-#: client/gui-gtk-2.0/messagewin.c:155 client/gui-sdl/messagewin.c:247
+#: client/gui-gtk-2.0/messagewin.c:186 client/gui-sdl/messagewin.c:247
#: client/gui-win32/messagewin.c:132 client/gui-xaw/menu.c:228
#: data/Freeciv.in:3273 data/Freeciv.in:3274 data/Freeciv.in:3283
msgid "Messages"
msgstr "Mensagens"
-#: client/gui-gtk-2.0/plrdlg.c:330
+#: client/gui-gtk-2.0/plrdlg.c:317
+msgid "_Meet"
+msgstr "E_ncontrar"
+
+#: client/gui-gtk-2.0/plrdlg.c:323
+#, fuzzy
+msgid "Cancel _Treaty"
+msgstr "_Cancelar Tratado"
+
+#: client/gui-gtk-2.0/plrdlg.c:329
+#, fuzzy
+msgid "_Withdraw Vision"
+msgstr "Retirar _visão"
+
+#: client/gui-gtk-2.0/plrdlg.c:348
+#, fuzzy
+msgid "_Report"
+msgstr "_Relatórios"
+
+#: client/gui-gtk-2.0/plrdlg.c:386
#, fuzzy
msgid "?show:Dead Players"
msgstr "Número mÃnimo de jogadores"
@@ -12015,294 +12253,296 @@ msgstr "Número mÃnimo de jogadores"
#. TRANS: Nations report action
#. TRANS: Nations report title
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/plrdlg.c:350 client/gui-sdl/mapctrl.c:1580
+#: client/gui-gtk-2.0/plrdlg.c:406 client/gui-sdl/mapctrl.c:1580
#: client/gui-sdl/plrdlg.c:608 client/gui-win32/plrdlg.c:344
#: client/gui-xaw/menu.c:221 data/Freeciv.in:3192 data/Freeciv.in:3193
msgid "Nations"
msgstr "Nações"
-#: client/gui-gtk-2.0/plrdlg.c:443
-msgid "_Intelligence"
-msgstr "_Inteligência"
-
-#: client/gui-gtk-2.0/plrdlg.c:450
-msgid "_Meet"
-msgstr "E_ncontrar"
-
-#: client/gui-gtk-2.0/plrdlg.c:457
+#: client/gui-gtk-2.0/plrdlg.c:511
#, fuzzy
-msgid "Cancel _Treaty"
-msgstr "_Cancelar Tratado"
+msgid "Di_plomacy"
+msgstr "Diplomacia"
-#: client/gui-gtk-2.0/plrdlg.c:464
-#, fuzzy
-msgid "_Withdraw vision"
-msgstr "Retirar _visão"
+#: client/gui-gtk-2.0/plrdlg.c:516
+msgid "_Intelligence"
+msgstr "_Inteligência"
-#: client/gui-gtk-2.0/plrdlg.c:495
+#: client/gui-gtk-2.0/plrdlg.c:526
msgid "_AI"
msgstr "_IA"
-#: client/gui-gtk-2.0/plrdlg.c:501
+#: client/gui-gtk-2.0/plrdlg.c:532
#, fuzzy
msgid "_Toggle AI Mode"
msgstr "Modo IA é agora %s."
-#: client/gui-gtk-2.0/pages.c:208
+#: client/gui-gtk-2.0/pages.c:221
#, fuzzy
msgid "Start _New Game"
msgstr "Iniciar Novo Jogo"
-#: client/gui-gtk-2.0/pages.c:214
+#: client/gui-gtk-2.0/pages.c:227
#, fuzzy
msgid "Start _Scenario Game"
msgstr "Iniciar Novo Jogo"
-#: client/gui-gtk-2.0/pages.c:220
+#: client/gui-gtk-2.0/pages.c:233
#, fuzzy
msgid "_Load Saved Game"
msgstr "Jogo gravado como %s"
-#: client/gui-gtk-2.0/pages.c:229
+#: client/gui-gtk-2.0/pages.c:239
#, fuzzy
msgid "C_onnect to Network Game"
msgstr "Grava jogo para ficheiro."
-#: client/gui-gtk-2.0/pages.c:236
+#: client/gui-gtk-2.0/pages.c:247
#, fuzzy
msgid "Connect to Gaming _Zone"
msgstr "Não foi possÃvel ligar em %s:%s (%s)."
-#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:300
#: client/gui-xaw/connectdlg.c:326
msgid "Passwords don't match, enter password."
msgstr ""
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:779 client/gui-gtk-2.0/pages.c:820
+#: client/gui-win32/connectdlg.c:916
msgid "Server Name"
msgstr "Servidor"
-#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
+#: 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
+#: data/Freeciv.in:96
msgid "Port"
msgstr "Porta"
-#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
+#: client/gui-win32/connectdlg.c:917
msgid "Version"
msgstr "Versão"
-#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
-#: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
+#: 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
msgid "Status"
msgstr "Estado"
-#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
-#: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
+#: 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
msgid "Players"
msgstr "Jogadores"
-#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
+#: client/gui-win32/connectdlg.c:918
msgid "Comment"
msgstr "Comentário"
-#: client/gui-gtk-2.0/pages.c:747
+#: client/gui-gtk-2.0/pages.c:786
#, fuzzy
msgid "Local _Area Network"
msgstr "Escolha o servidor de rede"
-#: client/gui-gtk-2.0/pages.c:783
+#: client/gui-gtk-2.0/pages.c:827
#, fuzzy
msgid "Internet _Metaserver"
msgstr "metaservidor <endereço>"
-#: client/gui-gtk-2.0/pages.c:817
+#: client/gui-gtk-2.0/pages.c:864
msgid "_Host:"
msgstr "_Servidor:"
-#: client/gui-gtk-2.0/pages.c:834
+#: client/gui-gtk-2.0/pages.c:881
msgid "_Port:"
msgstr "_Porta:"
-#: client/gui-gtk-2.0/pages.c:851
+#: client/gui-gtk-2.0/pages.c:898
msgid "_Login:"
msgstr "_Conectar..."
-#: client/gui-gtk-2.0/pages.c:869
+#: client/gui-gtk-2.0/pages.c:916
#, fuzzy
msgid "Pass_word:"
msgstr "Palavra errada:"
-#: client/gui-gtk-2.0/pages.c:887
+#: client/gui-gtk-2.0/pages.c:934
#, fuzzy
msgid "Conf_irm Password:"
msgstr "Digite a senha do pacote"
-#: client/gui-gtk-2.0/pages.c:912
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: 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/wldlg.c:800 client/gui-win32/wldlg.c:806
+msgid "Type"
+msgstr "Tipo"
+
+#: client/gui-gtk-2.0/pages.c:952 client/gui-win32/plrdlg.c:337
+#: data/Freeciv.in:88
+msgid "Host"
+msgstr "Servidor"
+
+#: client/gui-gtk-2.0/pages.c:981
msgid "C_onnect"
msgstr "C_onectar"
-#: client/gui-gtk-2.0/pages.c:1142
+#: client/gui-gtk-2.0/pages.c:1211
#, fuzzy, c-format
msgid "Connection name: %s"
msgstr "cut <nome-ligação>"
-#: client/gui-gtk-2.0/pages.c:1145
+#: client/gui-gtk-2.0/pages.c:1214
#, fuzzy, c-format
msgid "Player name: %s"
msgstr "aitoggle <nome-de-jogador>"
-#: client/gui-gtk-2.0/pages.c:1150
+#: client/gui-gtk-2.0/pages.c:1219
#, c-format
msgid "Host: %s"
msgstr "Servidor: %s"
-#: client/gui-gtk-2.0/pages.c:1158
+#: client/gui-gtk-2.0/pages.c:1227
msgid "Player/conn info"
msgstr "Jogador/info conec"
-#: client/gui-gtk-2.0/pages.c:1185
+#: client/gui-gtk-2.0/pages.c:1254
#, c-format
msgid "%s info"
msgstr "%s info"
-#: client/gui-gtk-2.0/pages.c:1196
+#: client/gui-gtk-2.0/pages.c:1265
#, fuzzy
msgid "Toggle player ready"
msgstr "Alterna estado IA do jogador."
-#: client/gui-gtk-2.0/pages.c:1204
+#: client/gui-gtk-2.0/pages.c:1273
#, fuzzy
msgid "Pick nation"
msgstr "Seleccione uma nação"
-#: client/gui-gtk-2.0/pages.c:1214
+#: client/gui-gtk-2.0/pages.c:1283
#, fuzzy
msgid "Observe this player"
msgstr "aitoggle <nome-de-jogador>"
-#: client/gui-gtk-2.0/pages.c:1221
+#: client/gui-gtk-2.0/pages.c:1290
#, fuzzy
msgid "Take this player"
msgstr "take [nome-ligação] <nome-de-jogador>"
-#: client/gui-gtk-2.0/pages.c:1238
+#: client/gui-gtk-2.0/pages.c:1307
#, fuzzy
msgid "Cut connection"
msgstr "cut <nome-ligação>"
-#: client/gui-gtk-2.0/pages.c:1248
+#: client/gui-gtk-2.0/pages.c:1317
#, fuzzy
msgid "Aitoggle player"
msgstr "aitoggle <nome-de-jogador>"
-#: client/gui-gtk-2.0/pages.c:1257
+#: client/gui-gtk-2.0/pages.c:1326
#, fuzzy
msgid "Remove player"
msgstr "remove <nome-de-jogador>"
-#: client/gui-gtk-2.0/pages.c:1268
+#: client/gui-gtk-2.0/pages.c:1337
#, fuzzy
msgid "Give info access"
msgstr "não pode aceder ao arquivo"
-#: client/gui-gtk-2.0/pages.c:1276
+#: client/gui-gtk-2.0/pages.c:1345
#, fuzzy
msgid "Give ctrl access"
msgstr "não pode aceder ao arquivo"
#. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1338
+#: client/gui-gtk-2.0/pages.c:1407
#, fuzzy, c-format
msgid "Put on %s"
msgstr "Debconf em %s"
-#: client/gui-gtk-2.0/pages.c:1442
+#: client/gui-gtk-2.0/pages.c:1511
msgid "Number of _Players (including AI):"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1465
+#: client/gui-gtk-2.0/pages.c:1534
#, fuzzy
msgid "AI Skill _Level:"
msgstr "NÃvel de _depuração:"
-#: client/gui-gtk-2.0/pages.c:1481
+#: client/gui-gtk-2.0/pages.c:1550
#, fuzzy
msgid "Ruleset _Version:"
msgstr "Escolha o seu _sexo"
-#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
msgid "_More Game Options..."
msgstr "_Mais Opções..."
-#: client/gui-gtk-2.0/pages.c:1514
+#: client/gui-gtk-2.0/pages.c:1583
msgid "Record"
msgstr "Record"
-#: client/gui-gtk-2.0/pages.c:1519
+#: client/gui-gtk-2.0/pages.c:1588
#, fuzzy
msgid "Rating"
msgstr "Escrita"
-#: client/gui-gtk-2.0/pages.c:1525
+#: client/gui-gtk-2.0/pages.c:1594
msgid "Ready"
msgstr "Pronto"
-#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
-#: data/nation/slovakian.ruleset:26
-msgid "Leader"
-msgstr "Lider"
+#: client/gui-gtk-2.0/pages.c:1601
+#, fuzzy
+msgid "?player:Leader"
+msgstr "LÃder"
-#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1732 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:1752
+#: client/gui-gtk-2.0/pages.c:1824
#, fuzzy
msgid "Choose Saved Game to _Load:"
msgstr "Selecione um dispositivo PKCS#11 para carregar"
-#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
-#: client/gui-gtk-2.0/pages.c:2375
+#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
+#: client/gui-gtk-2.0/pages.c:2451
msgid "_Browse..."
msgstr "_Navegar..."
-#: client/gui-gtk-2.0/pages.c:1839
+#: client/gui-gtk-2.0/pages.c:1911
#, fuzzy
msgid "Choose a Scenario"
msgstr "Escolha o senário"
-#: client/gui-gtk-2.0/pages.c:1926
+#: client/gui-gtk-2.0/pages.c:1998
#, fuzzy
msgid "Choose a _Scenario:"
msgstr "Escolha o senário"
-#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
-#: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
-#: client/gui-win32/wldlg.c:806
-msgid "Type"
-msgstr "Tipo"
-
-#: client/gui-gtk-2.0/pages.c:2101
+#: client/gui-gtk-2.0/pages.c:2173
#, fuzzy
msgid "Choose a _nation to play:"
msgstr "Escolha o tipo do pacote a ser criado"
-#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2363 client/gui-win32/menu.c:581
#, fuzzy
msgid "Select Location to Save"
msgstr "Grava jogo para ficheiro."
-#: client/gui-gtk-2.0/pages.c:2372 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2448 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr "Salvar o Jogo"
-#: client/gui-gtk-2.0/pages.c:2413
+#: client/gui-gtk-2.0/pages.c:2489
msgid "Saved _Games:"
msgstr "_Jogos Salvos"
-#: client/gui-gtk-2.0/pages.c:2440
+#: client/gui-gtk-2.0/pages.c:2516
msgid "Save _Filename:"
msgstr "Salvar _Arquivo:"
@@ -12655,7 +12895,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:1094
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
msgid "Back"
msgstr "Anterior"
@@ -12664,7 +12904,7 @@ msgid "Start"
msgstr "Iniciar"
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:775
+#: client/gui-win32/connectdlg.c:777
msgid "Load Game"
msgstr "Ler Jogo"
@@ -12703,12 +12943,12 @@ msgid "Make new homecity"
msgstr "Faz Terra Natal"
#: client/gui-sdl/citydlg.c:546 client/gui-sdl/citydlg.c:1418
-#: client/gui-sdl/connectdlg.c:307 client/gui-sdl/connectdlg.c:616
-#: client/gui-sdl/connectdlg.c:802 client/gui-sdl/connectdlg.c:984
+#: 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/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1039
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
#: 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
@@ -12757,7 +12997,7 @@ msgstr "Comprar?"
#: client/gui-sdl/diplodlg.c:1335 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:2427
+#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
#: client/gui-xaw/cityrep.c:666 client/gui-xaw/cma_fe.c:327
#: client/gui-xaw/cma_fe.c:511 client/gui-xaw/cma_fe.c:765
#: client/gui-xaw/messagedlg.c:72 client/gui-xaw/optiondlg.c:76
@@ -12773,7 +13013,7 @@ msgstr "Não"
#: client/gui-sdl/diplodlg.c:1345 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:2427 client/gui-xaw/cityrep.c:666
+#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
#: client/gui-xaw/cma_fe.c:327 client/gui-xaw/cma_fe.c:511
#: client/gui-xaw/cma_fe.c:765 client/gui-xaw/messagedlg.c:72
#: client/gui-xaw/optiondlg.c:76 client/gui-xaw/optiondlg.c:304
@@ -13058,39 +13298,39 @@ msgstr "Aplicar uma vez"
msgid "Release city"
msgstr "Libe_rtar cidade"
-#: client/gui-sdl/connectdlg.c:238
+#: client/gui-sdl/connectdlg.c:239
#, fuzzy
msgid "Creating Server List..."
msgstr "Lista de ligações ao servidor:"
-#: client/gui-sdl/connectdlg.c:279 client/gui-sdl/connectdlg.c:343
+#: client/gui-sdl/connectdlg.c:280 client/gui-sdl/connectdlg.c:344
#, fuzzy
msgid "No LAN servers found"
msgstr "Servidores da LAN"
-#: client/gui-sdl/connectdlg.c:281 client/gui-sdl/connectdlg.c:345
+#: client/gui-sdl/connectdlg.c:282 client/gui-sdl/connectdlg.c:346
msgid "No public servers found"
msgstr ""
-#: client/gui-sdl/connectdlg.c:555
+#: client/gui-sdl/connectdlg.c:556
#, fuzzy
msgid "Player Name :"
msgstr "aitoggle <nome-de-jogador>"
-#: client/gui-sdl/connectdlg.c:571
+#: client/gui-sdl/connectdlg.c:572
msgid "Freeciv Server :"
msgstr "Servidor Freeciv :"
-#: client/gui-sdl/connectdlg.c:588
+#: client/gui-sdl/connectdlg.c:589
msgid "Port :"
msgstr "Porta :"
-#: client/gui-sdl/connectdlg.c:608 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr "Ligar"
-#: client/gui-sdl/connectdlg.c:794 client/gui-sdl/connectdlg.c:977
+#: client/gui-sdl/connectdlg.c:795 client/gui-sdl/connectdlg.c:978
#: client/gui-xaw/connectdlg.c:145
msgid "Next"
msgstr "Próximo"
@@ -13375,7 +13615,7 @@ msgstr ""
#: client/gui-sdl/graphics.c:1021
#, c-format
-msgid "Unable to initialize SDL_ttf library: %s"
+msgid "Unable to initialize SDL_ttf library: %s"
msgstr ""
#: client/gui-sdl/graphics.c:1058
@@ -13461,12 +13701,6 @@ msgstr "Inicializando o Cliente"
msgid "Waiting for the beginning of the game"
msgstr "Jogo terminou com a vitória de %s"
-#: client/gui-sdl/gui_string.c:608
-msgid ""
-"Couldn't find stdfont.ttf file. Please link/copy/move anyunicode ttf font to "
-"data dir as stdfont.ttf"
-msgstr ""
-
#. TRANS: Future Technology
#: client/gui-sdl/gui_tilespec.c:506
msgid "FT"
@@ -14075,12 +14309,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:1098 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1100 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:963
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
msgid "Start New Game"
msgstr "Iniciar Novo Jogo"
@@ -14199,8 +14433,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:1081
-#: client/gui-win32/connectdlg.c:1089 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
+#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
msgid "Update"
msgstr "Atualizar"
@@ -14651,10 +14885,6 @@ msgstr "Alterar Todas"
msgid "Refresh"
msgstr "Recarregar"
-#: client/gui-win32/cityrep.c:882
-msgid "Select"
-msgstr "Selecionar"
-
#: client/gui-win32/cityrep.c:883
msgid "Configure"
msgstr "Configurar"
@@ -14704,55 +14934,55 @@ msgstr "Não pude abrir o jogo salvo"
msgid "Verify Password"
msgstr "Checar a Senha"
-#: client/gui-win32/connectdlg.c:912 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr "Seleção do Servidor Freeciv"
-#: client/gui-win32/connectdlg.c:913
+#: client/gui-win32/connectdlg.c:915
msgid "Local Area Network"
msgstr "Rede Local"
-#: client/gui-win32/connectdlg.c:947
+#: client/gui-win32/connectdlg.c:949
msgid "Welcome to Freeciv"
msgstr "Bem-vindo ao Freeciv"
-#: client/gui-win32/connectdlg.c:965
+#: client/gui-win32/connectdlg.c:967
msgid "Load Saved Game"
msgstr "Abrir Jogo Salvo"
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
msgid "Connect To Network Game"
msgstr "Conectar ao Jogo em Rede"
-#: client/gui-win32/connectdlg.c:977
+#: client/gui-win32/connectdlg.c:979
msgid "Choose a nation to play"
msgstr "Escolha uma nação"
-#: client/gui-win32/connectdlg.c:1012
+#: client/gui-win32/connectdlg.c:1014
msgid "Number of players (Including AI):"
msgstr "Número de jogadores (Incluindo o CPU):"
-#: client/gui-win32/connectdlg.c:1020
+#: client/gui-win32/connectdlg.c:1022
msgid "AI skill level:"
msgstr "NÃvel de experiência IA:"
-#: client/gui-win32/connectdlg.c:1034 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
msgid "Game Options"
msgstr "Opções do Jogo"
-#: client/gui-win32/connectdlg.c:1038
+#: client/gui-win32/connectdlg.c:1040
msgid "Start Game"
msgstr "Iniciar Jogo"
-#: client/gui-win32/connectdlg.c:1057
+#: client/gui-win32/connectdlg.c:1059
msgid "Login:"
msgstr "Conectar:"
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
msgid "Host:"
msgstr "Servidor:"
-#: client/gui-win32/connectdlg.c:1060
+#: client/gui-win32/connectdlg.c:1062
msgid "Port:"
msgstr "Porta:"
@@ -15014,10 +15244,6 @@ msgid_plural "(idle %d turns)"
msgstr[0] "(inativo à %d turno)"
msgstr[1] "(inativo à %d turnos)"
-#: client/gui-win32/plrdlg.c:337 data/Freeciv.in:88
-msgid "Host"
-msgstr "Servidor"
-
#: client/gui-win32/plrdlg.c:355 data/Freeciv.in:3230
msgid "Intelligence"
msgstr "Espionagem"
@@ -16811,12 +17037,12 @@ msgstr ""
#: data/helpdata.txt:781
msgid ""
-" To have a diplomatic relationship with another player, you must fist "
-"establish first contact with that player. To establish first contact, you "
-"have to move one of your units next to a city or unit belonging to that "
-"player, or vice versa. Unless you establish an embassy with that player, you "
-"may again lose contact with them after a set number of turns without direct "
-"physical contact."
+" To have a diplomatic relationship with another player, you must first "
+"establish contact with that player. To establish contact, you have to move "
+"one of your units next to a city or unit belonging to that player, or vice "
+"versa. Unless you establish an embassy with that player, you may again lose "
+"contact with them after a set number of turns without direct physical "
+"contact."
msgstr ""
#: data/helpdata.txt:788
@@ -19811,7 +20037,7 @@ msgid "Communism"
msgstr "Comunismo"
#: data/default/governments.ruleset:121 data/civ2/governments.ruleset:118
-#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:26
+#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:27
msgid "Comrade"
msgstr "Camarada"
@@ -20823,6 +21049,11 @@ msgstr ""
"esforço pode ser desperdiçado, e um grupo de Colonos e/ou Engenheiros é "
"altamente vulnerável a ataques inimigos."
+#: data/default/units.ruleset:238
+#, fuzzy
+msgid "?unit:Workers"
+msgstr "Operários"
+
#: data/default/units.ruleset:264
#, fuzzy
msgid ""
@@ -21508,6 +21739,11 @@ msgstr "Explorador"
msgid "Explorers are very useful for mapping unknown territory."
msgstr "Exploradores são muito úteis para mapear território desconhecido."
+#: data/default/units.ruleset:1864
+#, fuzzy
+msgid "?unit:Leader"
+msgstr "Lider"
+
#: data/default/units.ruleset:1892
msgid "This is you. If you lose this unit, you lose the game. So don't."
msgstr ""
@@ -21778,7 +22014,7 @@ msgid "Emir"
msgstr "Emir"
#: data/nation/afghani.ruleset:25 data/nation/slovakian.ruleset:30
-#: data/nation/soviet.ruleset:27
+#: data/nation/soviet.ruleset:28
msgid "General Secretary"
msgstr "Secretário das Forças Armadas"
@@ -21893,7 +22129,7 @@ msgstr "Armênios"
msgid ""
"According to legend, the Armenian people are the descendants of Haik - the "
"great-great-grandson of Noah. The modern Republic of Armenia gained "
-"independence from Soviet in 1991 AD"
+"independence from the Soviet Union in 1991."
msgstr ""
#: data/nation/assyrian.ruleset:3
@@ -22905,12 +23141,11 @@ msgstr "Illyrians"
#: data/nation/illyrian.ruleset:6
msgid ""
-"Illyrians were Indo-European tribes who appeared in the western part of the "
-"Balkan Peninsula before 1000 BC, including the Dalmatians to the north, "
-"Corcyra island and Ambracia bay in prehistoric Epirus to the south, mixing "
-"with Thracians in Dardania to the east, and settling Messapia across the "
-"Adriatic Sea. Illyrian kingdoms were independent for centuries, until "
-"conquered by the Roman Republic."
+"Illyrians were Indo-European tribes who appeared in the western part of the "
+"Balkan Peninsula before 1000 BC, including Corcyra island and Ambracia bay "
+"in prehistoric Epirus to the south. They mixed with Thracians in Dardania to "
+"the east, and settled Messapia across the Adriatic Sea. Illyrian kingdoms "
+"were independent for centuries, until conquered by the Roman Republic."
msgstr ""
#: data/nation/inca.ruleset:3
@@ -23210,7 +23445,7 @@ msgid ""
"1953."
msgstr ""
-#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:28
+#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:29
msgid "Great Leader"
msgstr "Grande LÃder"
@@ -23371,9 +23606,9 @@ msgstr "Malians"
msgid ""
"Sub-Saharan Africa has been a cultural and ethnical melting pot for "
"millennia. In medieval times, the region was home to a succession of empires "
-"called the Sahelian kingdoms. Of these, the Islamic Mali empire with it's "
+"called the Sahelian kingdoms. Of these, the Islamic Mali empire with its "
"capital in Timbuktu was the most influential. This empire reigned from the "
-"14th to the 17th century and was famed for it's wealth and benevolent kings. "
+"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 ""
@@ -23433,8 +23668,8 @@ msgstr "Maias"
#: data/nation/mayan.ruleset:6
msgid ""
-"The Mayans were a Mesoamerican civilization. Famous for building great "
-"pyramids and palaces in the jungle."
+"The Mayans were a Mesoamerican civilization. They are famous for building "
+"great pyramids and palaces in the jungle."
msgstr ""
#: data/nation/mayan.ruleset:19
@@ -23946,6 +24181,15 @@ msgstr ""
"A República Checa actual foi até 1933 parte da Checoslováquia, que tinha "
"sido até 1918 parte do Império Austro-Húngaro."
+#: data/nation/slovakian.ruleset:26
+#, fuzzy
+msgid "?male:Leader"
+msgstr "LÃder"
+
+#: data/nation/slovakian.ruleset:26
+msgid "?female:Leader"
+msgstr "LÃder"
+
#: data/nation/slovakian.ruleset:29
msgid "Pope"
msgstr "Papa"
@@ -23984,11 +24228,12 @@ msgstr "Soviéticos"
#: data/nation/soviet.ruleset:6
msgid ""
-"Soviet Union's history starts in November 1917, when under Lenin's "
+"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 "
-"republics integrated into one country. Soviet Union became one of most "
-"powerful states in the 20th century. But by the end of 1991 due to many "
-"social shocks it disintegrated into fifteen independent countries"
+"republics integrated into one country. The Soviet Union became one of most "
+"powerful states in the 20th century, but by the end of 1991 it had "
+"disintegrated into fifteen independent countries due to social and economic "
+"problems."
msgstr ""
#: data/nation/spanish.ruleset:3
@@ -24380,8 +24625,8 @@ msgstr "Westphalians"
#: data/nation/westphalian.ruleset:6
msgid ""
-"Westphalia, before becoming a Prussian province, was the western region the "
-"duchy of Saxony. Present-day it consists of the Northern part of the largest "
+"Westphalia, before becoming a Prussian province, was the western region of "
+"the duchy of Saxony. Today it makes up the northern part of the largest "
"German federal state, North Rhine-Westphalia."
msgstr ""
@@ -24529,7 +24774,7 @@ msgid ""
"The flag and background color indicate what civilization the city\n"
"belongs to (this will be useful when you meet other civilizations).\n"
"The top row of the bar also shows the name and size of the city, and\n"
-"will show one or more starts to indicate if there are units in the\n"
+"will show one or more stars to indicate if there are units in the\n"
"city. The bottom row shows what the city is building, and how long it\n"
"will take; it also shows how long the city will take to grow to the\n"
"next largest size."
@@ -24585,7 +24830,7 @@ msgid ""
"Now your city has grown to size five. As cities get larger unrest\n"
"becomes a problem. A city of this size will usually have one unhappy\n"
"citizen unless pacifying effects are used; meaning one entertainer\n"
-"specialist is required to keep your citzens content. This is basically\n"
+"specialist is required to keep your citizens content. This is basically\n"
"a wasted citizen.\n"
"\n"
"There are several things that can be done about this. One quick fix\n"
@@ -24657,7 +24902,7 @@ msgid ""
"existing cities. Generally when building new cities you want to make\n"
"sure that all tiles are covered by at least one city, but after that\n"
"it is best that your cities overlap as little as possible. Spreading\n"
-"out cities properly gives each city access to more resrouces, allowing\n"
+"out cities properly gives each city access to more resources, allowing\n"
"them to grow to larger sizes."
msgstr ""
@@ -24940,6 +25185,54 @@ msgstr "Time 30"
msgid "Team 31"
msgstr "Time 31"
+#, fuzzy
+#~ msgid "Auth config filename \"%s\" not allowed!"
+#~ msgstr "Isso não é um nome válido, tente de novo.\n"
+
+#~ msgid "The %s of the %s (%s)"
+#~ msgstr "O %s de %s (%s)"
+
+#, fuzzy
+#~ msgid "%s territory"
+#~ msgstr "Território de %s"
+
+#, fuzzy
+#~ msgid "%s territory (%d turn cease-fire)"
+#~ msgid_plural "%s territory (%d turn cease-fire)"
+#~ msgstr[0] "%s território (%d turno cessar-fogo)"
+#~ msgstr[1] "%s território (%d turno cessar-fogo)"
+
+#, fuzzy
+#~ msgid "%s territory (%s)"
+#~ msgstr "Territórios de %s %s"
+
+#~ msgid "City: %s (%s)"
+#~ msgstr "Cidade: %s (%s)"
+
+#, fuzzy
+#~ msgid "Unit: %s (%s)"
+#~ msgstr "Unidade: %s (%s)"
+
+#~ msgid "%s of the %s"
+#~ msgstr "%s de %s"
+
+#, fuzzy
+#~ msgid "no maximum, "
+#~ msgstr "sem máximo, "
+
+#, fuzzy
+#~ msgid "%d unit maximum, "
+#~ msgid_plural "%d units maximum, "
+#~ msgstr[0] "%d unidade no máximo, "
+
+#, fuzzy
+#~ msgid "%d per unit). "
+#~ msgstr "%d por unidade). "
+
+#, fuzzy
+#~ msgid "Select same type"
+#~ msgstr "Selecione o tipo do bem"
+
#~ msgid "Units: "
#~ msgstr "Unidades: "
@@ -25002,9 +25295,6 @@ msgstr "Time 31"
#~ msgid ", nation %s"
#~ msgstr ", nação %s"
-#~ msgid ", team %s"
-#~ msgstr ", time %s"
-
#~ msgid "_Map"
#~ msgstr "_Mapa"
@@ -26225,9 +26515,6 @@ msgstr "Time 31"
#~ msgid "?female:Encik"
#~ msgstr "Encik"
-#~ msgid "?female:Leader"
-#~ msgstr "LÃder"
-
#~ msgid "?female:General Secretary"
#~ msgstr "Secretário de Segurança"
diff --git a/po/ro.gmo b/po/ro.gmo
index 22b1c4d..9ad85a7 100644
Binary files a/po/ro.gmo and b/po/ro.gmo differ
diff --git a/po/ro.po b/po/ro.po
index 96fa8f0..d72e8c7 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: po-debconf://kdebase\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 07:45+0900\n"
+"POT-Creation-Date: 2009-03-29 21:13+0900\n"
"PO-Revision-Date: 2007-09-05 03:37+0300\n"
"Last-Translator: stan ioan-eugen <stan.ieugen at gmail.com>\n"
"Language-Team: romanian <debian-l10n-romanian at lists.debian.org>\n"
@@ -638,7 +638,7 @@ msgid "Road"
msgstr "Drum"
#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
-#: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
+#: client/gui-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"
@@ -655,7 +655,7 @@ msgid "Mine"
msgstr "Mină"
#: common/terrain.c:396 common/unit.c:548 server/report.c:124
-#: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
+#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr "Poluare"
@@ -701,7 +701,7 @@ msgstr "Fortificat"
msgid "Sentry"
msgstr "Pază"
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:851 client/gui-sdl/menu.c:648
+#: common/unit.c:566 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ă"
@@ -718,7 +718,7 @@ msgstr "Explorează"
msgid "Transform"
msgstr "Transformă"
-#: common/unit.c:584 client/text.c:106 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:584 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"
@@ -793,11 +793,11 @@ msgstr "Bomba atomică"
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1406
+#: common/unittype.c:349 client/helpdata.c:1404
msgid " and "
msgstr " ÅŸi "
-#: common/unittype.c:355 client/helpdata.c:1392
+#: common/unittype.c:355 client/helpdata.c:1390
msgid "?and:, "
msgstr "?and:, "
@@ -1414,31 +1414,26 @@ msgstr ""
#: server/auth.c:281
#, fuzzy, c-format
-msgid "Auth config filename \"%s\" not allowed!"
-msgstr "Numele acesta nu este permis."
-
-#: server/auth.c:286
-#, fuzzy, c-format
msgid "Cannot load auth config file \"%s\"!"
msgstr "Nu s-a găsit fişierul audio %s"
-#: server/auth.c:397
+#: server/auth.c:392
#, c-format
msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
msgstr ""
"Avertizare: numele de oaspete '%s' a fost luat, redenumesc ca utilizator '%"
"s'."
-#: server/auth.c:404
+#: server/auth.c:399
msgid "Guests are not allowed on this server. Sorry."
msgstr "Oaspeţii nu au acces pe acest server."
-#: server/auth.c:406
+#: server/auth.c:401
#, c-format
msgid "%s was rejected: Guests not allowed."
msgstr "%s a fost respins: Oaspeţii nu au acces"
-#: server/auth.c:425
+#: server/auth.c:420
#, c-format
msgid ""
"There was an error reading the user database, logging in as guest connection "
@@ -1447,7 +1442,7 @@ msgstr ""
"A fost o erare la citirea bazei de date cu utilizatori, conexiunea '%s' "
"autentificată ca oaspete."
-#: server/auth.c:431
+#: server/auth.c:426
msgid ""
"There was an error reading the user database and guest logins are not "
"allowed. Sorry"
@@ -1455,44 +1450,44 @@ msgstr ""
"A fost o erare la citirea bazei de date cu utilizatori şi autentificările ca "
"oaspete nu sunt permise. Îmi pare rău"
-#: server/auth.c:434
+#: server/auth.c:429
#, c-format
msgid "%s was rejected: Database error and guests not allowed."
msgstr ""
"%s a fost respins: Eroare la baza de date ÅŸi conexiunile ca oaspete nu sunt "
"permise."
-#: server/auth.c:441
+#: server/auth.c:436
#, c-format
msgid "Enter password for %s:"
msgstr "Introduceţi parola pentru %s:"
-#: server/auth.c:450
+#: server/auth.c:445
msgid "Enter a new password (and remember it)."
msgstr "Introduceţi o parolă nouă (şi memoraţi-o)."
-#: server/auth.c:456
+#: server/auth.c:451
msgid "This server allows only preregistered users. Sorry."
msgstr ""
"Ne pare rău. Acest server permite accesul numai utilizatorilor înregistraţi."
-#: server/auth.c:459
+#: server/auth.c:454
#, c-format
msgid "%s was rejected: Only preregister users allowed."
msgstr "%s a fost respins: Sunt permişi numai utilizatorii înregistraţi."
-#: server/auth.c:488 server/auth.c:547
+#: server/auth.c:483 server/auth.c:542
msgid "Sorry, too many wrong tries..."
msgstr "Imî pare rău, prea multe încercări nereuşite..."
-#: server/auth.c:489
+#: server/auth.c:484
#, c-format
msgid "%s was rejected: Too many wrong password verifies for new user."
msgstr ""
"%s a fost respins: Prea multe verificări de parolă incorecte pentru noul "
"utilizator."
-#: server/auth.c:505
+#: server/auth.c:500
msgid ""
"Warning: There was an error in saving to the database. Continuing, but your "
"stats will not be saved."
@@ -1500,32 +1495,32 @@ msgstr ""
"Avertizare: A apărut o eroare la salvarea bazei de date. Se continuă, dar "
"scorul nu va fi salvat."
-#: server/auth.c:549
+#: server/auth.c:544
#, c-format
msgid "%s was rejected: Too many wrong password tries."
msgstr "%s a fost respins: Prea multe încercări de înregistrare eşuate"
-#: server/auth.c:558
+#: server/auth.c:553
msgid "Your password is incorrect. Try again."
msgstr "Parola furnizată este incorectă. Mai încercaţi odată."
-#: server/auth.c:569
+#: server/auth.c:564
msgid "Sorry, your connection timed out..."
msgstr "Din păcate conexiunea dumneavoastră a expirat..."
-#: server/auth.c:571
+#: server/auth.c:566
#, c-format
msgid "%s was rejected: Connection timeout waiting for password."
msgstr "%s a fost respins: Conexiunea a expirat aştepând parola."
-#: server/auth.c:636
+#: server/auth.c:631
#, c-format
msgid "Your password is too short, the minimum length is %d. Try again."
msgstr ""
"Parola furnizată este prea scurtă, lungimea minimă este %d. Mai încearcaţi "
"odată."
-#: server/auth.c:642
+#: server/auth.c:637
#, c-format
msgid ""
"The password must have at least %d capital letters, %d numbers, and be at "
@@ -2042,7 +2037,7 @@ msgstr "Acesta este serverul %s"
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:237 manual/civmanual.c:380
+#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
@@ -2074,13 +2069,13 @@ msgstr ""
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:241
+#: server/civserver.c:217 client/civclient.c:242
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:245
+#: server/civserver.c:221 client/civclient.c:246
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 "
@@ -2090,7 +2085,7 @@ msgstr ""
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:248 manual/civmanual.c:382
+#: server/civserver.c:225 client/civclient.c:249 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"
@@ -2144,11 +2139,11 @@ msgstr " -r, --read FIŞIER\tCiteşte scriptul de început din FIŞIER\n"
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:267 manual/civmanual.c:383
+#: server/civserver.c:247 client/civclient.c:268 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:279
+#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, fuzzy, c-format
@@ -3421,7 +3416,7 @@ msgstr ""
"Unităţi de început care se pot deplasa pe mare nu sunt încă suportate. "
"Nimeni nu primeÅŸte %s."
-#: server/gamehand.c:310 client/text.c:632
+#: server/gamehand.c:310 client/text.c:691
#, c-format
msgid "Year: %s"
msgstr "Anul: %s"
@@ -3710,10 +3705,10 @@ 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
-#, c-format
+#, fuzzy, c-format
msgid ""
-"Your nation is thrust into civil war, %s is declared the leader of the "
-"rebel states."
+"Your nation is thrust into civil war! %s is declared the leader of the rebel "
+"states."
msgstr ""
"Naţiunea dumneavoastră a fost aruncată într-un război civil, %s a fost "
"declarat liderul statelor rebele."
@@ -3815,7 +3810,7 @@ msgstr "Viteza de cercetare"
msgid "Literacy"
msgstr "Educaţia"
-#: server/report.c:121 client/cityrepdata.c:526 client/cityrepdata.c:527
+#: server/report.c:121 client/cityrepdata.c:524 client/cityrepdata.c:525
#: client/gui-sdl/cityrep.c:174
msgid "Production"
msgstr "Producţie"
@@ -3967,7 +3962,7 @@ msgstr ""
"Şirul de caractere demografic conţine caractere nepermise. Încercaţi \"help "
"demography\"."
-#: server/report.c:743 server/report.c:766
+#: server/report.c:743 server/report.c:768
msgid "Demographics Report:"
msgstr "Raport demografic:"
@@ -3975,10 +3970,12 @@ msgstr "Raport demografic:"
msgid "Sorry, the Demographics report is unavailable."
msgstr "Raportul demografic nu este disponibil."
-#: server/report.c:748
-#, c-format
-msgid "The %s of the %s (%s)"
-msgstr "%s al %slor (%s)"
+#. TRANS: <nation adjective> <government name> (<year>).
+#. * E.g. "Polish Despotism (200 AD)".
+#: server/report.c:750
+#, fuzzy, c-format
+msgid "%s %s (%s)"
+msgstr "%s în %s (%s)\n"
#. TRANS: message about an installation error.
#: server/ruleset.c:163
@@ -4037,16 +4034,6 @@ msgstr ""
msgid "%s had invalid nation; changing to %s."
msgstr ""
-#. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4073
-#, fuzzy, c-format
-msgid ""
-"Illegal alliance structure detected: %s alliance to %s reduced to peace "
-"treaty."
-msgstr ""
-"S-a detectat o structură de alianţă ilegală: alianţa lui %s cu %s a fost "
-"redusă la tratat de pace."
-
#: server/settings.c:32
msgid "Geological"
msgstr "Geologic"
@@ -5320,9 +5307,10 @@ msgid "Auto-save name prefix"
msgstr "Prefixul salvărilor efectuate automat"
#: server/settings.c:1016
+#, fuzzy
msgid ""
-"Automatically saved games will have name \"<prefix><year>.sav\". This "
-"setting sets the <prefix> part."
+"Automatically saved games will have name \"<prefix>-T<turn>-Y<year>.sav\". "
+"This setting sets the <prefix> part."
msgstr ""
"Salvările efectuate automat vor avea numele de forma \"<prefix><an>.sav\". "
"Această opţiune stabileşte partea <prefix>"
@@ -5341,11 +5329,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:147
+#: server/sernet.c:150
msgid "Server cannot read standard input. Ignoring input."
msgstr "Serverul nu poate citi intrarea standard. Se ignoră intrarea."
-#: server/sernet.c:922
+#: server/sernet.c:929
#, c-format
msgid "Server: bad address: [%s:%d]."
msgstr "Server: adresă invalidă: [%s:%d]."
@@ -5477,115 +5465,115 @@ 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:928
+#: server/srv_main.c:961
#, c-format
msgid "Failed saving game as %s"
msgstr "Salvarea jocului ca %s a eÅŸuat"
-#: server/srv_main.c:930
+#: server/srv_main.c:963
#, c-format
msgid "Game saved as %s"
msgstr "Jocul salvat ca %s"
-#: server/srv_main.c:962
+#: server/srv_main.c:994
msgid "The game is already running."
msgstr "Jocul rulează deja."
-#: server/srv_main.c:970
+#: server/srv_main.c:1002
#, 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:977
+#: server/srv_main.c:1009
msgid "Starting game."
msgstr "Pornesc jocul."
-#: server/srv_main.c:1039
+#: server/srv_main.c:1071
#, c-format
msgid "request for unknown report (type %d)"
msgstr "cerere pentru raport necunoscut (tip %d)"
-#: server/srv_main.c:1104
+#: server/srv_main.c:1136
#, c-format
msgid "Warning: rejecting old client %s"
msgstr "Avertisment: refuz o versiune veche de client %s"
-#: server/srv_main.c:1206
+#: server/srv_main.c:1238
#, 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:1306
+#: server/srv_main.c:1338
msgid "Please choose a non-blank name."
msgstr "Alegeţi un nume diferit de spaţiu."
-#: server/srv_main.c:1322
+#: server/srv_main.c:1354
msgid "That nation is already in use."
msgstr "Naţiunea este deja aleasă de către cineva."
-#: server/srv_main.c:1338
+#: server/srv_main.c:1370
#, 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:1359
+#: server/srv_main.c:1391
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:1458
+#: server/srv_main.c:1490
#, 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:1464
+#: server/srv_main.c:1496
#, c-format
msgid "%s nation is already in use."
msgstr "Naţiunea %s este deja aleasă."
-#: server/srv_main.c:1482
+#: server/srv_main.c:1514
#, c-format
msgid "%s is the %s ruler %s."
msgstr "%s este conducătorul %s %s"
-#: server/srv_main.c:1538
+#: server/srv_main.c:1570
#, 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:1582 server/srv_main.c:1586
+#: server/srv_main.c:1614 server/srv_main.c:1618
#, 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:1728
+#: server/srv_main.c:1760
#, c-format
msgid "Player %d"
msgstr "Jucătorul %d"
-#: server/srv_main.c:1739 server/srv_main.c:1745
+#: server/srv_main.c:1771 server/srv_main.c:1777
#, c-format
msgid "%s rules the %s."
msgstr "%s îi conduce pe %s."
-#: server/srv_main.c:1910
+#: server/srv_main.c:1942
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
msgstr ""
-#: server/srv_main.c:1961
+#: server/srv_main.c:1993
#, c-format
msgid "Sending info to metaserver [%s]"
msgstr "Se trimite informaţia la metaserver [%s]"
-#: server/srv_main.c:1992
+#: server/srv_main.c:2024
msgid "The game is over..."
msgstr "Jocul sa terminat ..."
-#: server/srv_main.c:2205
+#: server/srv_main.c:2237
msgid "Now accepting new client connections."
msgstr "Se acceptă jucători ..."
@@ -6404,24 +6392,24 @@ msgid "Barbarian"
msgstr "Barbar"
#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2030 client/gui-sdl/plrdlg.c:645
+#: client/gui-gtk-2.0/pages.c:2102 client/gui-sdl/plrdlg.c:645
#: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
msgid "AI"
msgstr "AI"
#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
+#: 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
msgid "Human"
msgstr "Om"
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
-#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
+#: 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
msgid "Alive"
msgstr "Activ"
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
#: client/gui-win32/connectdlg.c:200
msgid "Dead"
msgstr "Decedat"
@@ -6687,9 +6675,9 @@ 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:242
-#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
-#: client/text.c:1201
+#: 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
#, c-format
msgid "?clistmore:, %s"
msgstr ", %s"
@@ -6945,7 +6933,7 @@ msgstr "Doar %s poate ataca de pe mare."
msgid "Cannot attack from sea."
msgstr "Nu puteţi ataca de pe mare."
-#: server/unithand.c:996 server/unittools.c:2103
+#: server/unithand.c:996 server/unittools.c:2137
msgid "Cannot attack unless you declare war first."
msgstr "Nu puteţi ataca înainte de a declara război."
@@ -7047,104 +7035,104 @@ msgid "%s was upgraded for free to %s."
msgstr "%s a fost modernizat gratuit în %s."
#: server/unittools.c:297
-#, c-format
-msgid "Not enough gold. %s disbanded"
+#, fuzzy, c-format
+msgid "Not enough gold to pay upkeep for %s. Unit disbanded."
msgstr "Galbeni insuficienţi. %s a fost dezmembrat."
-#: server/unittools.c:342
+#: server/unittools.c:343
#, c-format
msgid "Your %s has run out of hit points."
msgstr "%s dvs. a rămas fără punte de viaţă."
-#: server/unittools.c:358
+#: server/unittools.c:359
#, c-format
msgid "Your %s has been lost on the high seas."
msgstr "%s dumneavoastră a fost pierdută în largul oceanului."
-#: server/unittools.c:365
+#: server/unittools.c:366
#, c-format
msgid "Your %s survived on the high seas and became more experienced!"
msgstr ""
"%sa dvs. a supravieţuit în largul oceanului şî a devenit mai experimentată!"
-#: server/unittools.c:376
+#: server/unittools.c:377
#, c-format
msgid "Your %s has been lost on unsafe terrain."
msgstr "%s dvs a fost pierdut în teritoriu nesigur."
-#: server/unittools.c:430
+#: server/unittools.c:431
#, c-format
msgid "Your %s has returned to refuel."
msgstr "%s dumneavoastră s-a întors la realimentare."
-#: server/unittools.c:454
+#: server/unittools.c:455
#, c-format
msgid "Your %s has run out of fuel."
msgstr "%sul dumneavoastră a ramas fară combustibil."
-#. TRANS: And, <the unit> became ...
-#: server/unittools.c:616
-#, fuzzy
-msgid "And, became more experienced!"
-msgstr " a devenit mai experimentat!"
-
#. TRANS: Your <unit> became ...
-#: server/unittools.c:620
+#: server/unittools.c:619
#, c-format
msgid "Your %s became more experienced!"
msgstr "%sul dvs. a devenit mai experimentat!"
-#: server/unittools.c:1011
+#: server/unittools.c:1009
#, c-format
msgid "Teleported your %s to %s."
msgstr "Am Teleportat %s la %s."
-#: server/unittools.c:1041
+#. TRANS: A unit is moved to resolve stack conflicts.
+#: server/unittools.c:1065
+#, fuzzy, c-format
+msgid "Moved your %s."
+msgstr "%s a fost dizolvat."
+
+#: server/unittools.c:1076
#, c-format
msgid "Disbanded your %s."
msgstr "%s a fost dizolvat."
-#: server/unittools.c:1363
+#: server/unittools.c:1397
#, 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:1367
+#: server/unittools.c:1401
#, 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:1469
+#: server/unittools.c:1503
#, 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:1478
+#: server/unittools.c:1512
#, c-format
msgid "%s lost when %s was lost."
msgstr "%s a fost pierdut după pierderea %s."
-#: server/unittools.c:1527
+#: server/unittools.c:1561
#, 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:1545
+#: server/unittools.c:1579
#, 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:1554 server/unittools.c:1612
+#: server/unittools.c:1588 server/unittools.c:1646
#, 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:1588
+#: server/unittools.c:1622
#, fuzzy, c-format
msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
msgid_plural ""
@@ -7158,14 +7146,14 @@ msgstr[1] ""
#. TRANS: "Cannon lost when the Polish Destroyer
#. * attacked the German Musketeers."
-#: server/unittools.c:1621
+#: server/unittools.c:1655
#, 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:1636
+#: server/unittools.c:1670
#, 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."
@@ -7173,7 +7161,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:1646
+#: server/unittools.c:1680
#, 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."
@@ -7185,204 +7173,204 @@ 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:1660
+#: server/unittools.c:1694
#, 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:1928
+#: server/unittools.c:1962
#, c-format
msgid "Your %s was nuked by %s."
msgstr "%s dvs. a fost bombardata nuclear de către %s."
-#: server/unittools.c:1931 server/unittools.c:1947
+#: server/unittools.c:1965 server/unittools.c:1981
msgid "yourself"
msgstr "dumneavoastră"
-#: server/unittools.c:1935
+#: server/unittools.c:1969
#, fuzzy, c-format
msgid "The %s %s was nuked."
msgstr "%2$s a lui %1$s a fost bombardată nuclear."
-#: server/unittools.c:1944
+#: server/unittools.c:1978
#, c-format
msgid "%s was nuked by %s."
msgstr "%s a fost bombardată nuclear de %s."
-#: server/unittools.c:1952
+#: server/unittools.c:1986
#, c-format
msgid "You nuked %s."
msgstr "AÅ£i bombardat nuclear%s."
-#: server/unittools.c:1993
+#: server/unittools.c:2027
#, fuzzy, c-format
msgid "The %s detonated a nuke!"
msgstr "%si au explodat o bombă nucleară!"
-#: server/unittools.c:2017
+#: server/unittools.c:2051
#, c-format
msgid "%s transported successfully."
msgstr "%s a fost transportat cu succes."
-#: server/unittools.c:2069
+#: server/unittools.c:2103
msgid "This unit type can not be paradropped."
msgstr "Această unitate nu poate fi paraşutată."
-#: server/unittools.c:2079
+#: server/unittools.c:2113
#, fuzzy
msgid "You cannot paradrop a unit that is transporting other units."
msgstr "Nu se poate paraÅŸuta o unitate transportoare."
-#: server/unittools.c:2085
+#: server/unittools.c:2119
msgid "The destination location is not known."
msgstr "Locul destinaţiei nu este cunoscut."
-#: server/unittools.c:2092
+#: server/unittools.c:2126
#, c-format
msgid "This unit cannot paradrop into %s."
msgstr "Această unitate nu poate paraşuta în %s."
-#: server/unittools.c:2112
+#: server/unittools.c:2146
#, 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:2123
+#: server/unittools.c:2157
#, 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:2136
+#: server/unittools.c:2170
#, 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:2158
+#: server/unittools.c:2192
#, c-format
msgid "You found %d gold."
msgstr "Aţi găsit %d galbeni."
-#: server/unittools.c:2175
+#: server/unittools.c:2209
#, c-format
msgid "You found %s in ancient scrolls of wisdom."
msgstr "Aţi găsit %s intr-o scriptură veche."
-#: server/unittools.c:2182
+#: server/unittools.c:2216
#, 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:2196
+#: server/unittools.c:2230
msgid "A band of friendly mercenaries joins your cause."
msgstr "Un trup de mercenari vrea să lupte sub comanda dvs."
-#: server/unittools.c:2214
+#: server/unittools.c:2248
msgid "An abandoned village is here."
msgstr "Aici este o localitate abandonată."
-#: server/unittools.c:2224
+#: server/unittools.c:2258
msgid "You have unleashed a horde of barbarians!"
msgstr "Aţi dezlegat o hoardă de barbari!"
-#: server/unittools.c:2227
+#: server/unittools.c:2261
#, c-format
msgid "Your %s has been killed by barbarians!"
msgstr "%s dumneavoastră a fost ucis de barbari!"
-#: server/unittools.c:2243
+#: server/unittools.c:2277
msgid "You found a friendly city."
msgstr "Aţi găsit un oraş prietenos."
-#: server/unittools.c:2257
+#: server/unittools.c:2291
msgid "Friendly nomads are impressed by you, and join you."
msgstr "Un grup de nomazi vi se alătură."
-#: server/unittools.c:2282
+#: server/unittools.c:2316
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:2540
+#: server/unittools.c:2574
#, 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:2989
+#: server/unittools.c:3023
#, 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:3041
+#: server/unittools.c:3075
#, 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:3054
+#: server/unittools.c:3088
#, 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:3068
+#: server/unittools.c:3102
#, 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:3078
+#: server/unittools.c:3112
#, 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:3104
+#: server/unittools.c:3138
#, 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:3145
+#: server/unittools.c:3179
#, 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:3156
+#: server/unittools.c:3190
#, 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:3168
+#: server/unittools.c:3202
#, 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:3177
+#: server/unittools.c:3211
#, c-format
msgid "Your %s has invalid orders."
msgstr "%s dvs a primit ordine invalide."
-#: server/generator/mapgen.c:1737
+#: server/generator/mapgen.c:1771
msgid "High landmass - this may take a few seconds."
msgstr "Suprafaţă mare - posibil să dureze câteva secunde."
-#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
+#: server/generator/mapgen.c:1969 server/generator/mapgen.c:2039
#, c-format
msgid "Falling back to generator %d."
msgstr "întoarcere la generator %d."
-#: server/generator/mapgen.c:2025
+#: server/generator/mapgen.c:2059
msgid "Generator 3 didn't place all big islands."
msgstr "Generatorul 3 nu a amplasat toate insulele mari."
-#: server/generator/mapgen.c:2054
+#: server/generator/mapgen.c:2088
#, c-format
msgid "Generator 3 left %li landmass unplaced."
msgstr "Generatorul 3 a lăsat suprafaţa%li neamplasată."
@@ -7491,7 +7479,7 @@ msgid_plural "%3d turns"
msgstr[0] "%3d rundă"
msgstr[1] "%3d runde"
-#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:631
#: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
@@ -7612,368 +7600,368 @@ msgstr "LiniÅŸte"
msgid "(worklist)"
msgstr "(plan de lucru)"
-#: client/cityrepdata.c:447
-msgid "Special"
-msgstr "Special"
-
-#: client/cityrepdata.c:448
-msgid "?entertainers/scientists/taxmen:E/S/T"
-msgstr "?entertainers/scientists/taxmen:M/C/ÃŽ"
+#: client/cityrepdata.c:446
+msgid "?city:Name"
+msgstr "?city:Nume"
-#: client/cityrepdata.c:449
-msgid "Entertainers, Scientists, Taxmen"
-msgstr "Muncitori, Cercetători, Încasatori"
+#: client/cityrepdata.c:446 client/gui-sdl/cityrep.c:169
+msgid "City Name"
+msgstr "Numele OraÅŸului"
-#: client/cityrepdata.c:452
+#: client/cityrepdata.c:448
#, fuzzy
-msgid "Concise + Rapture, - Disorder"
-msgstr "Concis + Bucurie, - Dezordine"
+msgid "?size [short]:Sz"
+msgstr "Mă"
+
+#: client/cityrepdata.c:448
+msgid "Size"
+msgstr "Mărime"
-#: client/cityrepdata.c:454 client/plrdlg_common.c:261
+#: client/cityrepdata.c:450 client/plrdlg_common.c:261
#: client/gui-win32/plrdlg.c:337
msgid "State"
msgstr "Stare"
-#: client/cityrepdata.c:454
+#: client/cityrepdata.c:450
msgid "Rapture/Peace/Disorder"
msgstr "Bucurie/LiniÅŸte/Dezordine"
+#: client/cityrepdata.c:452
+#, fuzzy
+msgid "Concise *=Rapture, X=Disorder"
+msgstr "Concis + Bucurie, - Dezordine"
+
+#: client/cityrepdata.c:456
+msgid "Special"
+msgstr "Special"
+
#: client/cityrepdata.c:457
+msgid "?entertainers/scientists/taxmen:E/S/T"
+msgstr "?entertainers/scientists/taxmen:M/C/ÃŽ"
+
+#: client/cityrepdata.c:458
+msgid "Entertainers, Scientists, Taxmen"
+msgstr "Muncitori, Cercetători, Încasatori"
+
+#: client/cityrepdata.c:461
#, fuzzy
msgid "?Happy workers:H"
msgstr "F"
-#: client/cityrepdata.c:457
+#: client/cityrepdata.c:461
msgid "Workers: Happy"
msgstr "Lucrători: Fericiţi"
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
#, fuzzy
msgid "?Content workers:C"
msgstr "M"
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
msgid "Workers: Content"
msgstr "Lucrători: Mulţumiţi"
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
#, fuzzy
msgid "?Unhappy workers:U"
msgstr "N"
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
msgid "Workers: Unhappy"
msgstr "Lucrători: Nemulţumiţi"
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
#, fuzzy
msgid "?Angry workers:A"
msgstr "ÃŽ"
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
msgid "Workers: Angry"
msgstr "Lucrători: Înfuriaţî"
-#: client/cityrepdata.c:465 client/gui-xaw/citydlg.c:2401
-#: data/default/units.ruleset:238
-msgid "Workers"
+#: client/cityrepdata.c:469 client/gui-xaw/citydlg.c:2402
+#, fuzzy
+msgid "?city:Workers"
msgstr "Lucrători"
-#: client/cityrepdata.c:466
+#: client/cityrepdata.c:470
#, fuzzy
msgid "?happy/content/unhappy/angry:H/C/U/A"
msgstr "F/M/N/ÃŽ"
-#: client/cityrepdata.c:467
+#: client/cityrepdata.c:471
msgid "Workers: Happy, Content, Unhappy, Angry"
msgstr "Lucrători: Fericiţi, Mulţumiţi, Nemulţumiţi, Înfuriaţi"
-#: client/cityrepdata.c:470 client/cityrepdata.c:472
+#: client/cityrepdata.c:474 client/cityrepdata.c:476
msgid "Best"
msgstr "Cel mai bun"
-#: client/cityrepdata.c:470
+#: client/cityrepdata.c:474
msgid "attack"
msgstr "atac"
-#: client/cityrepdata.c:471
+#: client/cityrepdata.c:475
msgid "Best attacking units"
msgstr "Cele mai bune unităţi de atac"
-#: client/cityrepdata.c:472
+#: client/cityrepdata.c:476
msgid "defense"
msgstr "apărare"
-#: client/cityrepdata.c:473
+#: client/cityrepdata.c:477
msgid "Best defending units"
msgstr "Cele mai bune unităţi de apărare"
-#: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
-#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
-#: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
-#: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
-#: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
-#: client/gui-win32/menu.c:351 client/gui-win32/repodlgs.c:616
-#: client/gui-win32/repodlgs.c:707 client/gui-win32/repodlgs.c:716
-#: client/gui-xaw/menu.c:157 client/gui-xaw/menu.c:219
-#: client/gui-xaw/menu.c:242 client/gui-xaw/repodlgs.c:881
-#: client/gui-xaw/repodlgs.c:1069 data/Freeciv.in:1895 data/helpdata.txt:909
+#: client/cityrepdata.c:478 client/cityrepdata.c:482
+#: client/gui-gtk-2.0/cityrep.c:1437 client/gui-gtk-2.0/cityrep.c:1456
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-gtk-2.0/cityrep.c:1494
+#: client/gui-gtk-2.0/cityrep.c:1514 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/repodlgs.c:960 client/gui-sdl/helpdlg.c:688
+#: client/gui-sdl/mapctrl.c:1605 client/gui-sdl/optiondlg.c:1827
+#: client/gui-sdl/repodlgs.c:356 client/gui-win32/menu.c:351
+#: client/gui-win32/repodlgs.c:616 client/gui-win32/repodlgs.c:707
+#: client/gui-win32/repodlgs.c:716 client/gui-xaw/menu.c:157
+#: client/gui-xaw/menu.c:219 client/gui-xaw/menu.c:242
+#: client/gui-xaw/repodlgs.c:881 client/gui-xaw/repodlgs.c:1069
+#: data/Freeciv.in:1895 data/helpdata.txt:909
msgid "Units"
msgstr "Unităţi"
#. TRANS: Header "Number of units inside city"
-#: client/cityrepdata.c:476
+#: client/cityrepdata.c:480
#, fuzzy
msgid "?Present (units):Here"
msgstr "prez"
-#: client/cityrepdata.c:477
+#: client/cityrepdata.c:481
msgid "Number of units present"
msgstr "Număr de unităţi prezente"
#. TRANS: Header "Number of units supported by given city"
-#: client/cityrepdata.c:480
+#: client/cityrepdata.c:484
#, fuzzy
msgid "?Supported (units):Owned"
msgstr "?Unităţi întreţinute:Înt"
-#: client/cityrepdata.c:481
+#: client/cityrepdata.c:485
msgid "Number of units supported"
msgstr "Numărul de unităţi întreţinute"
#. TRANS: Header "It will take this many turns before city grows"
-#: client/cityrepdata.c:484
+#: client/cityrepdata.c:488
#, fuzzy
msgid "?food (population):Grow"
msgstr "CreÅŸte"
-#: client/cityrepdata.c:485 client/cityrepdata.c:530
+#: client/cityrepdata.c:489 client/cityrepdata.c:528
#, fuzzy
msgid "?Stock/Target:(Have/Need)"
msgstr "(Stoc/Necesar)"
-#: client/cityrepdata.c:486
+#: client/cityrepdata.c:490
msgid "Turns until growth/famine"
msgstr "Runde până la creştere/foamete"
-#: client/cityrepdata.c:488
-#, fuzzy
-msgid "?size [short]:Sz"
-msgstr "Mă"
-
-#: client/cityrepdata.c:488
-msgid "Size"
-msgstr "Mărime"
-
-#: client/cityrepdata.c:492
-msgid "?city:Name"
-msgstr "?city:Nume"
-
-#: client/cityrepdata.c:492 client/gui-sdl/cityrep.c:169
-msgid "City Name"
-msgstr "Numele OraÅŸului"
-
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
msgid "Surplus"
msgstr "Surplus"
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
#, fuzzy
msgid "?food/production/trade:F/P/T"
msgstr "H/P/C"
-#: client/cityrepdata.c:496
+#: client/cityrepdata.c:494
msgid "Surplus: Food, Production, Trade"
msgstr "Surplus: Hrană, Producţie, Comerţ"
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
#, fuzzy
msgid "?Food surplus [short]:+F"
msgstr "+H"
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
msgid "Surplus: Food"
msgstr "Surplus: Hrană"
-#: client/cityrepdata.c:500
+#: client/cityrepdata.c:498
#, fuzzy
msgid "?Production surplus [short]:+P"
msgstr "+P"
-#: client/cityrepdata.c:501
+#: client/cityrepdata.c:499
msgid "Surplus: Production"
msgstr "Surplus: Producţie"
-#: client/cityrepdata.c:502
+#: client/cityrepdata.c:500
#, fuzzy
msgid "?Production loss (waste) [short]:-P"
msgstr "-P"
-#: client/cityrepdata.c:503
+#: client/cityrepdata.c:501
msgid "Waste"
msgstr "DeÅŸeuri"
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
#, fuzzy
msgid "?Trade surplus [short]:+T"
msgstr "+C"
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
msgid "Surplus: Trade"
msgstr "Surplus: Comerţ"
-#: client/cityrepdata.c:506
+#: client/cityrepdata.c:504
#, fuzzy
msgid "?Trade loss (corruption) [short]:-T"
msgstr "-C"
-#: client/cityrepdata.c:507
+#: client/cityrepdata.c:505
msgid "Corruption"
msgstr "Corupţie"
-#: client/cityrepdata.c:509 client/gui-gtk-2.0/repodlgs.c:654
+#: client/cityrepdata.c:507 client/gui-gtk-2.0/repodlgs.c:654
#: client/gui-sdl/mapctrl.c:1400 client/gui-win32/repodlgs.c:334
#: client/gui-xaw/menu.c:222 client/gui-xaw/repodlgs.c:644
#: client/gui-xaw/repodlgs.c:773 data/Freeciv.in:1819
msgid "Economy"
msgstr "Economie"
-#: client/cityrepdata.c:509
+#: client/cityrepdata.c:507
#, fuzzy
msgid "?gold/luxury/science:G/L/S"
msgstr "G/L/Åž"
-#: client/cityrepdata.c:510
+#: client/cityrepdata.c:508
msgid "Economy: Gold, Luxuries, Science"
msgstr "Economie: Galbeni, Lux, Ştiinţă"
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
#, fuzzy
msgid "?Gold:G"
msgstr "?Galbeni:G"
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
msgid "Economy: Gold"
msgstr "Economie: Galbeni"
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
#, fuzzy
msgid "?Luxury:L"
msgstr "?Lux:L"
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
msgid "Economy: Luxury"
msgstr "Economie: Lux"
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
#, fuzzy
msgid "?Science:S"
msgstr "Åž"
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
msgid "Economy: Science"
msgstr "Economie: Ştiinţă"
-#: client/cityrepdata.c:518
+#: client/cityrepdata.c:516
#, fuzzy
msgid "?number_trade_routes:n"
msgstr "?Rata de _Impozit:R"
-#: client/cityrepdata.c:518
+#: client/cityrepdata.c:516
#, fuzzy
msgid "?number_trade_routes:R"
msgstr "?Rata de _Impozit:C"
-#: client/cityrepdata.c:519
+#: client/cityrepdata.c:517
msgid "Number of Trade Routes"
msgstr "Numărul de rute comerciale"
-#: client/cityrepdata.c:521
+#: client/cityrepdata.c:519
#, fuzzy
msgid "?pollution [short]:Pol"
msgstr "?pollution [short]:Pol"
-#: client/cityrepdata.c:523
+#: client/cityrepdata.c:521
msgid "?cma:Governor"
msgstr "?cma:Guvernator"
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
-#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
-#: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
-#: data/Freeciv.in:1459 data/helpdata.txt:820
+#: client/cityrepdata.c:521 client/gui-gtk-2.0/cityrep.c:1766
+#: client/gui-sdl/citydlg.c:3809 client/gui-sdl/cma_fe.c:858
+#: client/gui-win32/citydlg.c:726 data/Freeciv.in:1459 data/helpdata.txt:820
msgid "Citizen Governor"
msgstr "Guvernatorul cetăţenilor"
-#: client/cityrepdata.c:526
+#: client/cityrepdata.c:524
#, fuzzy
msgid "Turns/Buy"
msgstr "Runde/Cumpărare"
-#: client/cityrepdata.c:529 client/cityrepdata.c:531
+#: client/cityrepdata.c:527 client/cityrepdata.c:529
msgid "Currently Building"
msgstr "În construcţie"
-#: client/cityrepdata.c:575
+#: client/cityrepdata.c:573
#, fuzzy
msgid "?specialist:S"
msgstr "?Speciale:S"
-#: client/cityrepdata.c:578
+#: client/cityrepdata.c:576
#, fuzzy
msgid "Specialists"
msgstr "Speciale"
-#: client/civclient.c:239
+#: client/civclient.c:240
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr " -a, --autoconnect\tSări peste dialogul de conectare\n"
-#: client/civclient.c:249
+#: client/civclient.c:250
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:251
+#: client/civclient.c:252
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:253
+#: client/civclient.c:254
msgid " -n, --name NAME\tUse NAME as name\n"
msgstr " -n, --name NUME\tFoloseÅŸte NUME ca nume\n"
-#: client/civclient.c:255
+#: client/civclient.c:256
#, 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:257
+#: client/civclient.c:258
#, 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:259
+#: client/civclient.c:260
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:262
+#: client/civclient.c:263
#, 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:264
+#: client/civclient.c:265
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:265
+#: client/civclient.c:266
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:268
+#: client/civclient.c:269
#, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -7983,144 +7971,154 @@ msgstr ""
"\t\t\tTry \"%s -- --help\" pentru mai multe detalii.\n"
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:273
+#: client/civclient.c:274
#, fuzzy, c-format
msgid "Report bugs at %s\n"
msgstr "Raportează erorile la <%s>.\n"
-#: client/civclient.c:297
+#: client/civclient.c:298
#, c-format
msgid "Invalid port \"%s\" specified with --port option.\n"
msgstr "Port invalid \"%s\" specificat cu opţiunea --port.\n"
-#: client/civclient.c:299 client/civclient.c:314
+#: client/civclient.c:300 client/civclient.c:315
msgid "Try using --help.\n"
msgstr "Încercaţi să folosiţi --help.\n"
-#: client/civclient.c:312
+#: client/civclient.c:313
#, 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:325
+#: client/civclient.c:326
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr "Opţiune nerecunoscută: \"%s\"\n"
-#: client/civclient.c:539
+#: client/civclient.c:391
+#, fuzzy, c-format
+msgid "Updating old metaserver address \"%s\"."
+msgstr "metaserver <adresa>"
+
+#: client/civclient.c:394
+#, fuzzy, c-format
+msgid "Default metaserver has been set to \"%s\"."
+msgstr "Opţiunea: %s a fost setată la \"%s\"."
+
+#: client/civclient.c:550
msgid "Game started."
msgstr "Jocul a pornit."
-#: client/civclient.c:577
+#: client/civclient.c:588
msgid "There was an error while auto connecting; aborting."
msgstr "S-a produs o eroare în timp ce se auto-conecta, se abandonează."
-#: client/climisc.c:176
+#: client/climisc.c:177
#, c-format
msgid "Changing production of every %s into %s."
msgstr "Se schimbă producţia fiecărui %s în %s."
-#: client/climisc.c:214
+#: client/climisc.c:215
msgid "?embassy:Both"
msgstr "?embassy:Ambii"
-#: client/climisc.c:216
+#: client/climisc.c:217
msgid "?embassy:Yes"
msgstr "?embassy:Da"
-#: client/climisc.c:219
+#: client/climisc.c:220
msgid "?embassy:With Us"
msgstr "?embassy:Cu noi"
-#: client/climisc.c:222
+#: client/climisc.c:223
msgid "?embassy:Contact"
msgstr "?embassy:Contact"
-#: client/climisc.c:224
+#: client/climisc.c:225
msgid "?embassy:No Contact"
msgstr "?embassy:Fără contact"
-#: client/climisc.c:236
+#: client/climisc.c:237
msgid "?vision:Both"
msgstr "?vision:Ambii"
-#: client/climisc.c:238
+#: client/climisc.c:239
msgid "?vision:To Them"
msgstr "?vision:Pentru ei"
-#: client/climisc.c:241
+#: client/climisc.c:242
msgid "?vision:To Us"
msgstr "?vision:Pentru noi"
-#: client/climisc.c:257 client/climisc.c:264
+#: client/climisc.c:258 client/climisc.c:265
#, c-format
msgid "The %s give %s"
msgstr "%s dăruieşte %s"
-#: client/climisc.c:268
+#: client/climisc.c:269
#, c-format
msgid "The %s give unknown city."
msgstr "%s daruieÅŸte un oraÅŸ necunoscut."
-#: client/climisc.c:273
+#: client/climisc.c:274
#, c-format
msgid "The %s give %d gold"
msgstr "%s ne plăteşte %d galbeni"
-#: client/climisc.c:278
+#: client/climisc.c:279
#, c-format
msgid "The %s give their worldmap"
msgstr "%s ne dăruieşte harta lumii"
-#: client/climisc.c:282
+#: client/climisc.c:283
#, c-format
msgid "The %s give their seamap"
msgstr "%s ne dăruieşte harta maritimă"
-#: client/climisc.c:286
+#: client/climisc.c:287
msgid "The parties agree on a cease-fire"
msgstr "Părţile se înţeleg să înceteze focul"
-#: client/climisc.c:289
+#: client/climisc.c:290
msgid "The parties agree on a peace"
msgstr "Părţile se înţeleg să facă pace"
-#: client/climisc.c:292
+#: client/climisc.c:293
msgid "The parties create an alliance"
msgstr "Părţile se înţeleg să facă o alianţă"
-#: client/climisc.c:295
+#: client/climisc.c:296
#, c-format
msgid "The %s give shared vision"
msgstr "%s ne dăruieşte vedere comună"
-#: client/climisc.c:299
+#: client/climisc.c:300
#, c-format
msgid "The %s give an embassy"
msgstr "%s dăruieşte o ambasadă"
-#: client/climisc.c:902
+#: client/climisc.c:906
msgid "Popup Request"
msgstr "Cerere"
-#: client/climisc.c:932
+#: client/climisc.c:936
msgid "Exporting output window to civgame.log ..."
msgstr "Se exportă fereastra de ieşire în civgame.log ..."
-#: client/climisc.c:936
+#: client/climisc.c:940
msgid "Export complete."
msgstr "Exportare completă."
-#: client/climisc.c:938
+#: client/climisc.c:942
msgid "Export failed, couldn't write to file."
msgstr "Exportarea a eşuat, nu s-a putut scrie în fişier."
-#: client/climisc.c:1038
+#: client/climisc.c:1042
#, c-format
msgid "You don't buy %s in %s!"
msgstr "Nu cumpăraţi %s în %s!"
-#: client/climisc.c:1056
+#: client/climisc.c:1060
#, c-format
msgid "%s costs %d gold and you only have %d gold."
msgstr "%s costă %d galbeni iar dvs. aveţi doar %d galbeni."
@@ -8170,19 +8168,19 @@ msgstr ""
"Conectarea automată la serverul \"%s\" la portul %d ca \"%s\" la fiecare %f "
"secunde pentru %d încercări"
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1289
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
msgid "novice"
msgstr "novice"
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1289
+#: client/connectdlg_common.c:80 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:1290
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
msgid "normal"
msgstr "normal"
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1290
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
msgid "hard"
msgstr "greu"
@@ -8211,39 +8209,42 @@ 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
-msgid "We have control of the server (command access level hack)"
+#, 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
-msgid "We can't take control of server, attempting to kill it."
+msgid ""
+"Failed to obtain the required access level to take control of the server. "
+"The server will now be shutdown."
msgstr ""
-"Nu se poate prelua controlul asupra serverului, se încearcă oprirea sa."
-#: client/control.c:1104
+#: client/control.c:1123
msgid "Only transporter units can be unloaded."
msgstr "Doar unităţile transportatoare pot fi descărcate."
-#: client/control.c:1353
+#: client/control.c:1425
msgid "Only settler units can be put into auto mode."
msgstr "Doar coloniştii pot fi puşi în modul autonom."
-#: client/control.c:1444
+#: client/control.c:1516
msgid "Only nuclear units can do this."
msgstr "Doar unităţile nucleare pot face aşa ceva."
-#: client/control.c:1473
+#: client/control.c:1545
msgid "Only paratrooper units can do this."
msgstr "Doar paraÅŸutiÅŸti pot face aÅŸa ceva."
-#: client/control.c:1921
+#: client/control.c:2020
msgid "Too far for this unit."
msgstr "Prea departe pentru această unitate."
-#: client/control.c:2131 client/control.c:2161 client/control.c:2177
+#: client/control.c:2230 client/control.c:2260 client/control.c:2276
msgid "Didn't find a route to the destination!"
msgstr "N-am găsit o rută spre destinaţie!"
-#: client/control.c:2221
+#: client/control.c:2320
msgid "Oh my! You seem to have no capital!"
msgstr "Uliu maică! Se pare că nu aveţi o capitală!"
@@ -8330,16 +8331,16 @@ msgid "Allows %s (with %s)."
msgstr "Permite %s (cu %s)."
#. TRANS: preserve single space at beginning
-#: client/helpdata.c:418
+#: client/helpdata.c:416
msgid " Rivers"
msgstr " Râuri"
-#: client/helpdata.c:576
+#: client/helpdata.c:574
#, c-format
msgid "Sorry, no help topic for %s.\n"
msgstr "Nici o referinţă pentru %s.\n"
-#: client/helpdata.c:580
+#: client/helpdata.c:578
#, c-format
msgid ""
"Sorry, no help topic for %s.\n"
@@ -8350,7 +8351,7 @@ msgstr ""
"Această pagină a fost generată automat.\n"
"\n"
-#: client/helpdata.c:670
+#: client/helpdata.c:668
#, fuzzy
msgid ""
"Requires: Nothing\n"
@@ -8359,81 +8360,81 @@ msgstr ""
"Este necesară clădirea %s.\n"
"\n"
-#: client/helpdata.c:675
+#: client/helpdata.c:673
#, c-format
msgid "* The discovery of %s will make %s obsolete.\n"
msgstr "* Descoperirea %s va învechi %s.\n"
-#: client/helpdata.c:694
+#: client/helpdata.c:692
#, c-format
msgid "* Allows all players with knowledge of %s to build %s units.\n"
msgstr ""
"* Permite jucătorilor care au cunoştinţă de %s să construiască unităţile %"
"s.\n"
-#: client/helpdata.c:706
+#: client/helpdata.c:704
#, c-format
msgid "* Allows %s (with %s).\n"
msgstr "* Permite %s (cu %s).\n"
-#: client/helpdata.c:710
+#: client/helpdata.c:708
#, c-format
msgid "* Allows %s.\n"
msgstr "* Permite %s.\n"
-#: client/helpdata.c:780
+#: client/helpdata.c:778
#, fuzzy, c-format
msgid "* Can only be built if there is %s in the city.\n"
msgstr "* Poate fi construită doar sub forma de guvernământ %s.\n"
-#: client/helpdata.c:786
+#: client/helpdata.c:784
#, c-format
msgid "* Can only be built with %s as government.\n"
msgstr "* Poate fi construită doar sub forma de guvernământ %s.\n"
-#: client/helpdata.c:791
+#: client/helpdata.c:789
msgid "* May not be built in cities.\n"
msgstr "* Nu poate fi construită în oraşe.\n"
-#: client/helpdata.c:794
+#: client/helpdata.c:792
msgid "* Never has a home city.\n"
msgstr "* Nu poate avea un oraÅŸ natal.\n"
-#: client/helpdata.c:797
+#: client/helpdata.c:795
msgid "* Losing this unit will lose you the game!\n"
msgstr "* Dacă pierdeţi această unitate veţi pierde jocul!\n"
-#: client/helpdata.c:801
+#: client/helpdata.c:799
msgid "* Each player may only have one of this type of unit.\n"
msgstr "* Fiecare jucător poate avea o singură unitate de acest tip.\n"
-#: client/helpdata.c:805
+#: client/helpdata.c:803
#, c-format
msgid "* Requires %d population to build.\n"
msgstr "* Este necesară o populaţie de %d pentru a construi.\n"
-#: client/helpdata.c:811
+#: client/helpdata.c:809
#, c-format
msgid "* Can carry and refuel %d air unit.\n"
msgid_plural "* Can carry and refuel %d air units.\n"
msgstr[0] "* Poate transporta şi realimenta %d unitate aerienă.\n"
msgstr[1] "* Poate transporta şi realimenta %d unităţi aeriene.\n"
-#: client/helpdata.c:816
+#: client/helpdata.c:814
#, c-format
msgid "* Can carry and refuel %d missile unit.\n"
msgid_plural "* Can carry and refuel %d missile units.\n"
msgstr[0] "* Poate transporta şi realimenta %d rachetă.\n"
msgstr[1] "* Poate transporta ÅŸi realimenta %d rachete.\n"
-#: client/helpdata.c:821
+#: client/helpdata.c:819
#, c-format
msgid "* Can carry %d ground unit across water.\n"
msgid_plural "* Can carry %d ground units across water.\n"
msgstr[0] "* Poate transporta %d unitate peste mare.\n"
msgstr[1] "* Poate transporta %d unităţi peste mare.\n"
-#: client/helpdata.c:830
+#: client/helpdata.c:828
msgid ""
"* Can establish trade routes (must travel to target city and must be at "
"least 9 tiles [in Manhattan distance] from this unit's home city).\n"
@@ -8442,170 +8443,170 @@ msgstr ""
"destinaţie care trebuie să fie la 9 unităţi geometrice distanţă [distanţă "
"Manhattan] faţă de oraşul natal).\n"
-#: client/helpdata.c:836
+#: client/helpdata.c:834
#, c-format
msgid "* Can help build wonders (adds %d production).\n"
msgstr "* Poate ajută la construcţia minunilor (adaugă %d producţie).\n"
-#: client/helpdata.c:840
+#: client/helpdata.c:838
msgid "* May not be disbanded.\n"
msgstr "* Nu poate fi dizolvată.\n"
-#: client/helpdata.c:842
+#: client/helpdata.c:840
#, c-format
msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
msgstr ""
"* Poate fi dizolvată într-un oraş pentru a recupera 50%% din costul "
"producţiei.\n"
-#: client/helpdata.c:846
+#: client/helpdata.c:844
msgid "* Can build new cities.\n"
msgstr "* Poate întemeia oraşe.\n"
-#: client/helpdata.c:849
+#: client/helpdata.c:847
#, c-format
msgid "* Can add on %d population to cities of no more than size %d.\n"
msgstr "* Poate adăuga o populaţie de %d oraşelor mai mici decât %d.\n"
-#: client/helpdata.c:858
+#: client/helpdata.c:856
msgid "* Can build roads and railroads.\n"
msgstr "* Poate construi drumuri şi căi ferate.\n"
-#: client/helpdata.c:859
+#: client/helpdata.c:857
msgid "* Can build mines on tiles.\n"
msgstr "* Poate construi mine.\n"
-#: client/helpdata.c:860
+#: client/helpdata.c:858
msgid "* Can build irrigation on tiles.\n"
msgstr "* Poate construi irigaţii.\n"
-#: client/helpdata.c:865
+#: client/helpdata.c:863
msgid "* Can build farmland.\n"
msgstr "* Poate construi teren arabil.\n"
-#: client/helpdata.c:869
+#: client/helpdata.c:867
#, c-format
msgid "* Can build farmland (if %s is known).\n"
msgstr "* Poate construi teren arabil (dacă se cunoaşte %s).\n"
-#: client/helpdata.c:873
+#: client/helpdata.c:871
#, c-format
msgid "* Can build farmland (if any of the following are known: %s).\n"
msgstr ""
"* Poate construi teren arabil (dacă se cunoaşte una din următoarele: %s).\n"
-#: client/helpdata.c:881
+#: client/helpdata.c:879
msgid "* Can build fortresses.\n"
msgstr "* Poate construi fortăreţe.\n"
-#: client/helpdata.c:885
+#: client/helpdata.c:883
#, c-format
msgid "* Can build fortresses (if %s is known).\n"
msgstr "* Poate construi fortăreţe (dacă se cunoaşte %s).\n"
-#: client/helpdata.c:889
+#: client/helpdata.c:887
#, c-format
msgid "* Can build fortresses (if any of the following are known: %s).\n"
msgstr ""
"* Poate construi fortăreţe (dacă se cunoaşte una din următoarele: %s).\n"
-#: client/helpdata.c:895
+#: client/helpdata.c:893
msgid "* Can clean pollution from tiles.\n"
msgstr "* Poate curăţa poluarea din formele geometrice.\n"
-#: client/helpdata.c:896
+#: client/helpdata.c:894
msgid "* Can clean nuclear fallout from tiles.\n"
msgstr "* Poate decontamina formele geometrice.\n"
-#: client/helpdata.c:899
+#: client/helpdata.c:897
msgid "* Can transform tiles.\n"
msgstr "* Poate transforma formele geometrice.\n"
-#: client/helpdata.c:902
+#: client/helpdata.c:900
msgid "* Can build airbases.\n"
msgstr "* Poate construi baze aeriene.\n"
-#: client/helpdata.c:906
+#: client/helpdata.c:904
#, c-format
msgid "* May fortify, granting a 50%% defensive bonus.\n"
msgstr "* Poate fortifica, cu un bonus de la apărare de 50%%.\n"
-#: client/helpdata.c:909
+#: client/helpdata.c:907
msgid "* May pillage to destroy infrastructure from tiles.\n"
msgstr "* Poate prăda formele geometrice distrugând infrastructura.\n"
-#: client/helpdata.c:913
+#: client/helpdata.c:911
msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
msgstr ""
"* Poate executa acţiuni diplomatice, având abilităţi speciale de spionaj.\n"
-#: client/helpdata.c:916
+#: client/helpdata.c:914
msgid "* Can perform diplomatic actions.\n"
msgstr "* Poate executa acţiuni diplomatice.\n"
-#: client/helpdata.c:920
+#: client/helpdata.c:918
msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
msgstr "* Nu va pierde niciodată o luptă diplomat-contra-diplomat.\n"
-#: client/helpdata.c:923
+#: client/helpdata.c:921
msgid "* May not be bribed.\n"
msgstr "* Nu pot fi mituiţi.\n"
-#: client/helpdata.c:926
+#: client/helpdata.c:924
msgid "* Can attack enemy air units.\n"
msgstr "* Poate ataca unitaţi aeriene inamice.\n"
-#: client/helpdata.c:930
+#: client/helpdata.c:928
msgid "* Is invisible except when next to an enemy unit or city.\n"
msgstr ""
"* Este invizibil, mai puţin când se afla lângă o unitate sau un oraş "
"inamic.\n"
-#: client/helpdata.c:934
+#: client/helpdata.c:932
msgid "* Can only attack units on ocean squares (no land attacks).\n"
msgstr "* Poate ataca doar unităţi aflate pe pătrate de ocean.\n"
-#: client/helpdata.c:938
+#: client/helpdata.c:936
msgid ""
"* Can attack from aboard sea units: against enemy cities and onto land "
"squares.\n"
msgstr ""
"* Poate ataca de pe mare: împotriva oraşelor inamice sau zonelor de pământ.\n"
-#: client/helpdata.c:943
+#: client/helpdata.c:941
#, c-format
msgid "* Can be paradropped from a friendly city (Range: %d).\n"
msgstr "* Poate fi paraşutat dintr-un oraş aliat (Rază de acţiune: %d).\n"
-#: client/helpdata.c:949
+#: client/helpdata.c:947
msgid "* Gets double defense against units specified as 'mounted'.\n"
msgstr "* Beneficiază de apărare dublă împotriva unităţilor 'călare'.\n"
-#: client/helpdata.c:953
+#: client/helpdata.c:951
msgid "* Counts as 'mounted' against certain defenders.\n"
msgstr "* Este considerată unitate 'călare' împotriva unor apărători.\n"
-#: client/helpdata.c:957
+#: client/helpdata.c:955
msgid "* A missile unit: gets used up in making an attack.\n"
msgstr "* O rachetă: explodează în urma atacului.\n"
-#: client/helpdata.c:960
+#: client/helpdata.c:958
msgid "* Making an attack ends this unit's turn.\n"
msgstr "* Atacul acestei unităţi termină runda ei.\n"
-#: client/helpdata.c:964
+#: client/helpdata.c:962
msgid "* This unit's attack causes a nuclear explosion!\n"
msgstr "* Atacul acestei unităţi provoacă o explozie nucleară!\n"
-#: client/helpdata.c:968
+#: client/helpdata.c:966
msgid "* Gets double firepower when attacking cities.\n"
msgstr "* Beneficiază de putere de foc dublă când atacă un oraş.\n"
-#: client/helpdata.c:971
+#: client/helpdata.c:969
msgid "* Ignores the effects of city walls.\n"
msgstr "* Ignoră efectul zidului oraşului.\n"
-#: client/helpdata.c:975
+#: client/helpdata.c:973
#, c-format
msgid ""
"* Does bombard attacks (%d per turn). These attacks will only damage (never "
@@ -8614,38 +8615,38 @@ msgstr ""
"* Efectuează bombardamente (%d pe rundă). Aceste atacuri doar rănesc (nu-l "
"omoară niciodată) apărătorul dar nu implică nici un risc atacatorului.\n"
-#: client/helpdata.c:982
+#: client/helpdata.c:980
msgid "* Gets quintuple defense against missiles and aircraft.\n"
msgstr ""
"* Beneficiază de apărare de cinci ori mai mare împotriva rachetelor şi "
"avioanelor.\n"
-#: client/helpdata.c:986
+#: client/helpdata.c:984
msgid "* Ignores terrain effects (treats all squares as roads).\n"
msgstr "* Ignoră efectul terenului (orice teren este considerat ca drum).\n"
-#: client/helpdata.c:989
+#: client/helpdata.c:987
msgid "* Ignores zones of control.\n"
msgstr "* Ignoră zonele de control.\n"
-#: client/helpdata.c:993
+#: client/helpdata.c:991
msgid "* A non-military unit (cannot attack; no martial law).\n"
msgstr "* O unitate civilă (nu poate ataca; nu impune legea marţială).\n"
-#: client/helpdata.c:997
+#: client/helpdata.c:995
msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
msgstr ""
"* O unitate de luptă: crează nefericire şi atunci când nu este agresivă.\n"
-#: client/helpdata.c:1000
+#: client/helpdata.c:998
msgid "* Will never achieve veteran status.\n"
msgstr "* Nu va ajunge niciodată veterean.\n"
-#: client/helpdata.c:1002
+#: client/helpdata.c:1000
msgid "* May become veteran through training or combat.\n"
msgstr "* Poate ajunge veterean prin antrenamente şi luptă.\n"
-#: client/helpdata.c:1008
+#: client/helpdata.c:1006
#, c-format
msgid ""
"* Must end turn in a city or next to land, or has a 50%% risk of being lost "
@@ -8654,12 +8655,12 @@ msgstr ""
"* Trebuie să termine runda într-un oraş sau în apropierea ţarmului, sau "
"riscă să fie pierdută în larg cu o probalitate de 50%%.\n"
-#: client/helpdata.c:1012
+#: client/helpdata.c:1010
#, c-format
msgid "* The discovery of %s reduces the risk to 25%%.\n"
msgstr "* Descoperirea %s reduce riscul la 25%%\n"
-#: client/helpdata.c:1017
+#: client/helpdata.c:1015
#, c-format
msgid "* %s reduces the risk to 12%%.\n"
msgstr "* %s reduce riscul la 12%%.\n"
@@ -8668,15 +8669,15 @@ msgstr "* %s reduce riscul la 12%%.\n"
#. * last two elements
#. TRANS: List of possible output types has this between
#. * last two elements
-#: client/helpdata.c:1068 client/helpdata.c:1402
+#: client/helpdata.c:1066 client/helpdata.c:1400
msgid " or "
msgstr " sau "
-#: client/helpdata.c:1070 client/helpdata.c:1390
+#: client/helpdata.c:1068 client/helpdata.c:1388
msgid "?or:, "
msgstr "?or:, "
-#: client/helpdata.c:1082
+#: 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"
@@ -8685,12 +8686,12 @@ msgstr[0] ""
msgstr[1] ""
"* Unitatea trebuie să fie într-un oraş sau pe un %s după %d runde.\n"
-#: client/helpdata.c:1124
+#: client/helpdata.c:1122
#, 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:1129
+#: client/helpdata.c:1127
#, c-format
msgid ""
"To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8699,92 +8700,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:1137
+#: client/helpdata.c:1135
msgid "You cannot research this technology."
msgstr "Nu puteţi cerceta această tehnologie."
-#: client/helpdata.c:1141
+#: client/helpdata.c:1139
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:1153
+#: client/helpdata.c:1151
#, 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:1158
+#: client/helpdata.c:1156
#, 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:1161
+#: client/helpdata.c:1159
#, 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:1165
+#: client/helpdata.c:1163
msgid "* Increases the pollution generated by the population.\n"
msgstr "* Creşte poluarea generată de populaţie.\n"
-#: client/helpdata.c:1170
+#: client/helpdata.c:1168
#, 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:1177
+#: client/helpdata.c:1175
#, c-format
msgid "* Allows %s to build fortresses.\n"
msgstr "* Permite %silor construcţia de fortăreţe.\n"
-#: client/helpdata.c:1185
+#: client/helpdata.c:1183
#, c-format
msgid "* Allows %s to build airbases.\n"
msgstr "* Permite %silor să construiască baze aeriene.\n"
-#: client/helpdata.c:1194
+#: client/helpdata.c:1192
#, 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:1202
+#: client/helpdata.c:1200
#, 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:1236
+#: client/helpdata.c:1234
msgid "* Pollution cannot be generated on this terrain."
msgstr "* Acest teren nu poate produce poluare."
-#: client/helpdata.c:1241
+#: client/helpdata.c:1239
msgid "* You cannot build cities on this terrain."
msgstr "* Nu puteţi construi oraşe pe acest teren."
-#: client/helpdata.c:1247
+#: client/helpdata.c:1245
msgid "* The coastline of this terrain is unsafe."
msgstr "* Linia de coastă a acestui teren nu este sigură."
-#: client/helpdata.c:1252
+#: client/helpdata.c:1250
msgid "* This terrain is unsafe for units to travel on."
msgstr "* Terenul este nesigur pentru unităţi."
-#: client/helpdata.c:1257
+#: client/helpdata.c:1255
msgid "* Land units cannot travel on oceanic terrains."
msgstr "* Unităţile terestre nu pot merge pe ocean."
-#: client/helpdata.c:1307
+#: client/helpdata.c:1305
msgid "Features:\n"
msgstr "Caracteristici:\n"
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1413 client/helpdata.c:1414
+#: client/helpdata.c:1411 client/helpdata.c:1412
msgid "?outputlist: Nothing "
msgstr ""
-#: client/helpdata.c:1421
+#: client/helpdata.c:1419
#, fuzzy, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
@@ -8799,7 +8800,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:1431
+#: client/helpdata.c:1429
#, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8809,23 +8810,23 @@ msgstr ""
"unităţilor.\n"
#. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1439
+#: client/helpdata.c:1437
#, 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:1444
+#: client/helpdata.c:1442
#, 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:1449
+#: client/helpdata.c:1447
#, 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:1453
+#: client/helpdata.c:1451
#, 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"
@@ -8833,7 +8834,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:1462
+#: client/helpdata.c:1460
#, c-format
msgid "* Each of your cities will avoid paying %d %s towards unit upkeep.\n"
msgstr ""
@@ -8841,19 +8842,19 @@ msgstr ""
#. TRANS: Amount is subtracted from upkeep cost
#. * for each upkeep type.
-#: client/helpdata.c:1470
+#: client/helpdata.c:1468
#, 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:1477
+#: client/helpdata.c:1475
#, 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:1484
+#: client/helpdata.c:1482
#, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -8863,7 +8864,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:1491
+#: client/helpdata.c:1489
#, c-format
msgid ""
"* After the first unhappy citizen due to city size, for each %d additional "
@@ -8872,18 +8873,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:1499
+#: client/helpdata.c:1497
#, 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:1504
+#: client/helpdata.c:1502
msgid "Has unlimited science/gold/luxuries rates.\n"
msgstr "Rate nelimitate pentru ştiinţă/galbeni/lux.\n"
-#: client/helpdata.c:1509
+#: client/helpdata.c:1507
#, fuzzy, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
@@ -8898,7 +8899,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:1521
+#: client/helpdata.c:1519
#, 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"
@@ -8906,7 +8907,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:1532
+#: client/helpdata.c:1530
#, c-format
msgid ""
"* You may grow your cities by means of celebrations. Your cities must be at "
@@ -8915,15 +8916,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:1538
+#: client/helpdata.c:1536
msgid "* Your units cannot be bribed.\n"
msgstr "* Unităţile dumneavoastră nu pot fi mituite.\n"
-#: client/helpdata.c:1541
+#: client/helpdata.c:1539
msgid "* Your cities cannot be incited.\n"
msgstr "* Oraşele dumneavoastră nu pot fi incitate la revoltă.\n"
-#: client/helpdata.c:1545
+#: client/helpdata.c:1543
msgid ""
"* Government will fall into anarchy if any city is in disorder for more than "
"two turns in a row.\n"
@@ -8931,17 +8932,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:1551
+#: client/helpdata.c:1549
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:1555
+#: client/helpdata.c:1553
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:1559
+#: client/helpdata.c:1557
msgid ""
"* Buildings that normally confer bonuses against unhappiness will instead "
"give gold.\n"
@@ -8949,25 +8950,25 @@ msgstr ""
"* Construcţiile care în mod normal ofereau bonusuri pentru fericire vor "
"oferi în schimb galbeni.\n"
-#: client/helpdata.c:1563
+#: client/helpdata.c:1561
msgid "* Pays no upkeep for fanatics.\n"
msgstr "* Nu se plăteşte întreţinere pentru fanatici.\n"
-#: client/helpdata.c:1566
+#: client/helpdata.c:1564
msgid "* Has no unhappy citizens.\n"
msgstr "* Nu are cetăţeni nefericiţi.\n"
-#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
+#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
#, c-format
msgid "* Veteran %s units.\n"
msgstr "* Unităţi %s veterane.\n"
-#: client/helpdata.c:1587
+#: client/helpdata.c:1585
msgid "* Veteran units.\n"
msgstr "* Unităţi veterane.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1593
+#: client/helpdata.c:1591
#, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8977,7 +8978,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:1602
+#: client/helpdata.c:1600
#, fuzzy, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8987,7 +8988,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:1610
+#: client/helpdata.c:1608
#, fuzzy, c-format
msgid "* Each worked tile with at least 1 %s will yield %d more of it.\n"
msgstr ""
@@ -8995,109 +8996,109 @@ msgstr ""
"în plus %d %s.\n"
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1619
+#: client/helpdata.c:1617
#, 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:1627
+#: client/helpdata.c:1625
#, 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:1632
+#: client/helpdata.c:1630
#, 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:1637
+#: client/helpdata.c:1635
#, 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:1645
+#: client/helpdata.c:1643
#, 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:1651
+#: client/helpdata.c:1649
#, 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:1657
+#: client/helpdata.c:1655
#, 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:1674
+#: client/helpdata.c:1672
#, c-format
msgid "* Allows you to build %s.\n"
msgstr "* Permite contruirea %s.\n"
#. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1701
+#: client/helpdata.c:1699
#, c-format
msgid "%s%d %s"
msgstr "%s%d %s "
-#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1700 client/helpdata.c:1708 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:1709
+#: client/helpdata.c:1707
#, c-format
msgid "%s%d unhappy"
msgstr "%s%d nemulţumiţi"
-#: client/mapctrl_common.c:382
+#: client/mapctrl_common.c:399
#, c-format
msgid "You don't know how to build %s!"
msgstr "Nu ştiţi cum să construiţi %s!"
-#: client/mapctrl_common.c:392
+#: client/mapctrl_common.c:409
#, c-format
msgid "Copy %s to clipboard."
msgstr "Copiază %s în clipboard."
-#: client/mapctrl_common.c:408
+#: client/mapctrl_common.c:425
msgid "Clipboard is empty."
msgstr "Clipboardul este gol."
-#: client/options.c:98
+#: client/options.c:102
msgid "Graphics"
msgstr "Grafică"
-#: client/options.c:99
+#: client/options.c:103
msgid "Overview"
msgstr "Opţiuni generale"
-#: client/options.c:100
+#: client/options.c:104
msgid "Sound"
msgstr "Sunet"
-#: client/options.c:101
+#: client/options.c:105
msgid "Interface"
msgstr "Interfaţă"
-#: client/options.c:102
+#: client/options.c:106
msgid "Network"
msgstr "Reţea"
-#: client/options.c:107
+#: client/options.c:111
msgid "Login name"
msgstr "Nume de autentificare"
-#: client/options.c:108
+#: client/options.c:112
msgid ""
"This is the default login username that will be used in the connection "
"dialogs or with the -a command-line parameter."
@@ -9106,11 +9107,11 @@ msgstr ""
"dialogurile conexiunii, aÅŸa cum este sau cu parametrul '-a' pentru linia de "
"comandă."
-#: client/options.c:113
+#: client/options.c:117
msgid "Server"
msgstr "Server"
-#: client/options.c:114
+#: client/options.c:118
msgid ""
"This is the default server hostname that will be used in the connection "
"dialogs or with the -a command-line parameter."
@@ -9119,11 +9120,11 @@ msgstr ""
"pentru toate dialogurile conexiunii sau cu parametrul '-a' pentru linia de "
"comandă."
-#: client/options.c:119
+#: client/options.c:123
msgid "Server port"
msgstr "Port server"
-#: client/options.c:120
+#: client/options.c:124
msgid ""
"This is the default server port that will be used in the connection dialogs "
"or with the -a command-line parameter."
@@ -9131,11 +9132,11 @@ 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:125 client/gui-win32/connectdlg.c:912 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
msgid "Metaserver"
msgstr "Metaserver"
-#: client/options.c:126
+#: client/options.c:130
msgid ""
"The metaserver is a host that the client contacts to find out about games on "
"the internet. Don't change this from its default value unless you know what "
@@ -9145,11 +9146,11 @@ msgstr ""
"despre jocurile ce se ţin pe internet. Nu modificaţi valoarea implicită "
"decât dacă ştiţi ce faceţi."
-#: client/options.c:132
+#: client/options.c:136
msgid "Soundset"
msgstr "Set de sunete"
-#: client/options.c:133
+#: client/options.c:137
msgid ""
"This is the soundset that will be used. Changing this is the same as using "
"the -S command-line parameter."
@@ -9157,11 +9158,11 @@ msgstr ""
"Acesta este setul de sunete care va fi folosit. Această opţiune ese "
"echivalentă cu folosirea parametrului '-S' din linia de comandă."
-#: client/options.c:138
+#: client/options.c:142
msgid "Sound plugin"
msgstr "Modul pentru sunet"
-#: client/options.c:139
+#: client/options.c:143
msgid ""
"If you have a problem with sound, try changing the sound plugin. The new "
"plugin won't take effect until you restart Freeciv. Changing this is the "
@@ -9172,12 +9173,12 @@ msgstr ""
"Această valoare este echivalentul folosirii opţiunii '-P' din linia de "
"comandă."
-#: client/options.c:144 client/gui-sdl/gui_main.c:162
+#: client/options.c:148 client/gui-sdl/gui_main.c:162
#, fuzzy
msgid "Theme"
msgstr "Templu"
-#: client/options.c:145
+#: client/options.c:149
#, fuzzy
msgid "By changing this option you change the active theme."
msgstr ""
@@ -9185,11 +9186,11 @@ msgstr ""
"Opţiunea este echivalentă cu folosirea parametrului '-t' din linia de "
"comandă."
-#: client/options.c:148
+#: client/options.c:152
msgid "Tileset"
msgstr "Set de forme geometrice"
-#: client/options.c:149
+#: client/options.c:153
msgid ""
"By changing this option you change the active tileset. This is the same as "
"using the -t command-line parameter."
@@ -9198,11 +9199,11 @@ msgstr ""
"Opţiunea este echivalentă cu folosirea parametrului '-t' din linia de "
"comandă."
-#: client/options.c:156
+#: client/options.c:160
msgid "Solid unit background color"
msgstr "Culoarea de fundal a unităţilor"
-#: client/options.c:157
+#: client/options.c:161
msgid ""
"Setting this option will cause units on the map view to be drawn with a "
"solid background color instead of the flag backdrop."
@@ -9210,11 +9211,11 @@ msgstr ""
"Această opţiune va face ca unităţile să fie desenate pe hartă folosind "
"pentru fundal o culoare solidă în locul steagului."
-#: client/options.c:161 client/gui-sdl/optiondlg.c:960
+#: client/options.c:165 client/gui-sdl/optiondlg.c:960
msgid "Sound bell at new turn"
msgstr "Clopoţel la începutul rundei"
-#: client/options.c:162
+#: client/options.c:166
msgid ""
"Set this option to have a \"bell\" event be generated at the start of a new "
"turn. You can control the behavior of the \"bell\" event by editing the "
@@ -9224,11 +9225,11 @@ msgstr ""
"începutul fiecărei runde. Puteţi controla comportamentul \"clopoţelului\" "
"editând opţiunile pentru mesaje."
-#: client/options.c:168
+#: client/options.c:172
msgid "Unit movement animation time (milliseconds)"
msgstr "Timpul de animaţie al mişcării unităţilor (în milisecunde)"
-#: client/options.c:169
+#: client/options.c:173
msgid ""
"This option controls how long unit \"animation\" takes when a unit moves on "
"the map view. Set it to 0 to disable animation entirely."
@@ -9236,11 +9237,11 @@ msgstr ""
"Această opţiune controlează cât timp durează o \"animaţie\" atunci cănd se "
"mişcă o unitate pe hartă. Valoarea 0 înseamnă că animaţia va fi dezactivată."
-#: client/options.c:174
+#: client/options.c:178
msgid "Mapview recentering time (milliseconds)"
msgstr "Timpul necesar recentrării hărţii (în milisecunde)"
-#: client/options.c:175
+#: client/options.c:179
msgid ""
"When the map view is recentered, it will slide smoothly over the map to its "
"new position. This option controls how long this slide lasts. Set it to 0 "
@@ -9250,22 +9251,22 @@ msgstr ""
"Această opţiune controlează cât timp va dura această alunecare. Valoarea 0 a "
"dezactiva alunecarea hărţii."
-#: client/options.c:180 client/gui-sdl/optiondlg.c:1014
+#: client/options.c:184 client/gui-sdl/optiondlg.c:1014
msgid "Show combat animation"
msgstr "Animează lupta"
-#: client/options.c:181
+#: client/options.c:185
msgid ""
"Disabling this option will turn off combat animation between units on the "
"mapview."
msgstr ""
"Dezactivând această opţiune luptele dintre unităţi nu vor mai fi animate."
-#: client/options.c:184
+#: client/options.c:188
msgid "Draw the citybar"
msgstr "Desenează bara de stare a oraşului"
-#: client/options.c:185
+#: client/options.c:189
msgid ""
"Setting this option will display a 'citybar' containing useful information "
"beneath each city. Disabling this option will display only the city's name "
@@ -9275,11 +9276,11 @@ msgstr ""
"folositoare. Dacă este dezactivată se va afişa decât numele oraşului şi "
"opţional producţia."
-#: client/options.c:191
+#: client/options.c:195
msgid "Show icons in the technology tree"
msgstr "Arată iconiţele în arborele cu tehnologii"
-#: client/options.c:192
+#: client/options.c:196
msgid ""
"Setting this option will display icons on the technology tree diagram. "
"Turning this option off makes the technology tree more compact."
@@ -9288,11 +9289,11 @@ msgstr ""
"tehnologiilor. Dezactivând această opţiune va face arborele cu tehnologii "
"mai compact."
-#: client/options.c:197
+#: client/options.c:201
msgid "Draw shield graphics for units"
msgstr "Desenează steagul ca scut pentru unităţi"
-#: client/options.c:198
+#: client/options.c:202
msgid ""
"Setting this option will draw a shield icon as the flags on units. If "
"unset, the full flag will be drawn."
@@ -9300,11 +9301,11 @@ msgstr ""
"Activând această opţiune se va desena un scut ca steag pentru unităţi. Dacă "
"este dezactivată se va desena tot steagul."
-#: client/options.c:202
+#: client/options.c:206
msgid "Manual Turn Done in AI Mode"
msgstr "Termină runda manual în modul AI"
-#: client/options.c:203
+#: client/options.c:207
msgid ""
"Disable this option if you do not want to press the Turn Done button "
"manually when watching an AI player."
@@ -9312,11 +9313,11 @@ msgstr ""
"Dezactivaţi această opţiune dacă nu doriţi să apăsaţi Termină runda după ce "
"urmăriţi jucătorul AI."
-#: client/options.c:207 client/gui-sdl/optiondlg.c:1121
+#: client/options.c:211 client/gui-sdl/optiondlg.c:1121
msgid "Auto Center on Units"
msgstr "Auto centrează vizualizarea pe unităţi"
-#: client/options.c:208
+#: client/options.c:212
msgid ""
"Set this option to have the active unit centered automatically when the unit "
"focus changes."
@@ -9324,11 +9325,11 @@ msgstr ""
"Setaţi această opţiune pentru a centra automat vizualizarea pe unitatea "
"activă atunci când se schimbă focalizarea."
-#: client/options.c:211 client/gui-sdl/optiondlg.c:1147
+#: client/options.c:215 client/gui-sdl/optiondlg.c:1147
msgid "Auto Center on Combat"
msgstr "Auto centrează vizualizarea pe luptă"
-#: client/options.c:212
+#: client/options.c:216
msgid ""
"Set this option to have any combat be centered automatically. Disabled this "
"will speed up the time between turns but may cause you to miss combat "
@@ -9338,21 +9339,21 @@ msgstr ""
"această opţiune va ca rundele să treacă mai repede, dar este posibil să nu "
"observaţi deloc unele lupte."
-#: client/options.c:217 client/gui-sdl/optiondlg.c:1174
+#: client/options.c:221 client/gui-sdl/optiondlg.c:1174
msgid "Focus on Awakened Units"
msgstr "Focalizează unităţile care s-au deşteptat"
-#: client/options.c:218
+#: client/options.c:222
msgid "Set this option to have newly awoken units be focused automatically."
msgstr ""
"Setaţi acestă opţiune pentru a focaliza automat unităţile noi care s-au "
"deştepţat."
-#: client/options.c:221
+#: client/options.c:225
msgid "Allow goto into the unknown"
msgstr "Permite deplasare în necunoscut"
-#: client/options.c:222
+#: client/options.c:226
msgid ""
"Setting this option will make the game consider moving into unknown tiles. "
"If not, then goto routes will detour around or be blocked by unknown tiles."
@@ -9361,11 +9362,11 @@ msgstr ""
"zone necunoscute. Dacă nu, rutele de deplasare vor ocoli sau vor fi blocate "
"de zonele necunoscute."
-#: client/options.c:226
+#: client/options.c:230
msgid "Center map when Popup city"
msgstr "Centrează harta pentru Dialogl oraşului"
-#: client/options.c:227
+#: client/options.c:231
msgid ""
"Setting this option makes the mapview center on a city when its city dialog "
"is popped up."
@@ -9373,11 +9374,11 @@ msgstr ""
"Dacă este activată, această opţiune centrează harta pe oraş atunci când se "
"dechide Dialogul oraÅŸului."
-#: client/options.c:230
+#: client/options.c:234
msgid "Concise City Production"
msgstr "Producţia oraşului compactă"
-#: client/options.c:231
+#: client/options.c:235
msgid ""
"Set this option to make the city production (as shown in the city dialog) to "
"be more compact."
@@ -9385,11 +9386,11 @@ msgstr ""
"Setaţi această opţiune pentru a face ca producţia oraşului (aşa cum este "
"prezentată în dialogul oraşului) să fie afişată mai compact."
-#: client/options.c:234 client/gui-sdl/optiondlg.c:1252
+#: client/options.c:238 client/gui-sdl/optiondlg.c:1252
msgid "End Turn when done moving"
msgstr "Termină runda după ultima mişcare"
-#: client/options.c:235
+#: client/options.c:239
msgid ""
"Setting this option makes your turn end automatically when all your units "
"are done moving."
@@ -9397,11 +9398,11 @@ msgstr ""
"Dacă este setată, această opţiune va încheia runda atunci când toate "
"unităţile au terminat de mişcat."
-#: client/options.c:238 client/gui-sdl/optiondlg.c:1226
+#: client/options.c:242 client/gui-sdl/optiondlg.c:1226
msgid "Prompt for city names"
msgstr "Cere nume pentru oraÅŸe"
-#: client/options.c:239
+#: client/options.c:243
msgid ""
"Disabling this option will make the names of newly founded cities chosen "
"automatically by the server."
@@ -9409,11 +9410,11 @@ msgstr ""
"Dezactivănd această opţiune va face ca noile oraşe să aibă nume alese "
"automat de server."
-#: client/options.c:242 client/gui-sdl/optiondlg.c:1200
+#: client/options.c:246 client/gui-sdl/optiondlg.c:1200
msgid "Pop up city dialog for new cities"
msgstr "Deschide Dialogul oraÅŸului pentru noile oraÅŸe"
-#: client/options.c:243
+#: client/options.c:247
msgid ""
"Setting this option will pop up a newly-founded city's city dialog "
"automatically."
@@ -9421,76 +9422,124 @@ msgstr ""
"Setând această opţiune va deschide automat Dialogul oraşului pentru oraşele "
"nou fondate."
-#: client/options.c:248
+#: client/options.c:250
+#, fuzzy
+msgid "Pop up caravan actions"
+msgstr "Acţiuni caravană"
+
+#: client/options.c:251
+msgid ""
+"If this option is enabled, when caravans arrive at a city where they can "
+"establish a traderoute or help build a wonder, a window will popup asking "
+"which action should be performed. Disabling this option means you will have "
+"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 ""
+
+#: client/options.c:260
+#, fuzzy
+msgid "Enable cursor changing"
+msgstr "Activează îmbinarea alfa"
+
+#: client/options.c:261
+msgid ""
+"This option controls whether the client should try to change the mouse "
+"cursor depending on what is being pointed at, as well as to indicate changes "
+"in the client or server state."
+msgstr ""
+
+#: client/options.c:266
+msgid "Select cities before units"
+msgstr ""
+
+#: 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 ""
+
+#: client/options.c:272
+msgid "Clear unit orders on selection"
+msgstr ""
+
+#: client/options.c:273
+msgid ""
+"Enabling this option will cause unit orders to be cleared whenever one or "
+"more units are selected. If this option is disabled, selecting units will "
+"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 ""
+
+#: client/options.c:282
msgid "Background layer"
msgstr "Stratul de fundal"
-#: client/options.c:249
+#: client/options.c:283
msgid "The background layer of the overview shows just ocean and land."
msgstr "stratul de fundal pentru privire generală arată doar ocean şi pământ."
-#: client/options.c:252
+#: client/options.c:286
msgid "Terrain relief map layer"
msgstr "Stratul pentru relief al terenului hărţii"
-#: client/options.c:253
+#: client/options.c:287
msgid "The relief layer shows all terrains on the map."
msgstr "Stratul relief arată toate tipurile de teren de pe hartă."
-#: client/options.c:256
+#: client/options.c:290
msgid "Borders layer"
msgstr "Stratul graniţelor"
-#: client/options.c:257
+#: client/options.c:291
msgid ""
"The borders layer of the overview shows which tiles are owned by each player."
msgstr ""
"Stratul graniţelor apentru privirea generală arată care forme geometrice "
"sunt stăpânite de fiecare jucător."
-#: client/options.c:261
+#: client/options.c:295
msgid "Units layer"
msgstr "Stratul unităţilor"
-#: client/options.c:262
+#: client/options.c:296
msgid "Enabling this will draw units on the overview."
msgstr ""
"Activdând această opţiune, untităţile vor fi desenate pe privirea generală."
-#: client/options.c:265
+#: client/options.c:299
msgid "Cities layer"
msgstr "Startul oraÅŸelor"
-#: client/options.c:266
+#: client/options.c:300
msgid "Enabling this will draw cities on the overview."
msgstr "Activând acestă opţiune, vor fi desenate pe privirea generală oraşele."
-#: client/options.c:269
+#: client/options.c:303
msgid "Overview fog of war"
msgstr "Ceaţă pentru privirea generală"
-#: client/options.c:270
+#: client/options.c:304
msgid "Enabling this will show fog of war on the overview."
msgstr "Activănd această opţiune va fi desenată ceaţa pe privirea generală."
-#: client/options.c:488
+#: client/options.c:526
msgid "If you add a preset by hand, also update \"number_of_presets\""
msgstr "Dacă adăugaţi o setare manual, actualizaţi şi \"numărul_de_setări\""
-#: client/options.c:516
+#: client/options.c:554
msgid "Cannot find your home directory"
msgstr "Nu se poate găsi diectorul personal (home)"
-#: client/options.c:665 client/options.c:796
+#: client/options.c:703 client/options.c:834
msgid "Save failed, cannot find a filename."
msgstr "Salvarea a eşuat, nu s-a găsit nici un nume de fişier. "
-#: client/options.c:678 client/options.c:859
+#: client/options.c:716 client/options.c:897
#, c-format
msgid "Save failed, cannot write to file %s"
msgstr "Salvarea a eşuat, nu pot scrie în fişierul %s"
-#: client/options.c:680 client/options.c:862
+#: client/options.c:718 client/options.c:900
#, c-format
msgid "Saved settings to file %s"
msgstr "S-au salvat setările în fişierul %s"
@@ -9515,16 +9564,16 @@ msgstr "Şirul de capabilităţi al serverului: %s"
msgid "Start of turn %d"
msgstr "ÃŽnceputul rundei %d"
-#: client/packhand.c:1590
+#: client/packhand.c:1591
#, c-format
msgid "AI Mode is now %s."
msgstr "Modul AI este acum %s."
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "ON"
msgstr "Activat"
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "OFF"
msgstr "Dezactivat"
@@ -9556,14 +9605,15 @@ 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:2085
+#: client/gui-gtk-2.0/pages.c:2157
msgid "Flag"
msgstr "Drapel"
#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
-#: client/gui-gtk-2.0/pages.c:1536 client/gui-gtk-2.0/pages.c:2087
-#: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
-#: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
+#: 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/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr "Naţiune"
@@ -9575,7 +9625,7 @@ msgstr "graniţă"
msgid "Score"
msgstr "Scor"
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
msgid "Team"
msgstr "Echipa"
@@ -9646,280 +9696,306 @@ msgstr "Nici un %s n-a putut fi dizolvat."
msgid "Could not open temp file."
msgstr "N-am putut deschide fiÅŸierul temporar."
-#: client/servers.c:407
+#: client/servers.c:410
msgid "Invalid $http_proxy or metaserver value, must start with 'http://'"
msgstr ""
"Valoare invalidă pentru $http_proxy sau pentru metaserver, trebuie să "
"înceapă cu 'http://'"
-#: client/servers.c:413
+#: client/servers.c:416
msgid "Failed looking up metaserver's host"
msgstr "Căutarea numelui de gazdă al metaserverului a eşuat."
-#: client/text.c:85 client/text.c:86 client/text.c:91
+#. TRANS: "AI <player name>"
+#: client/text.c:94
+#, c-format
+msgid "AI %s"
+msgstr ""
+
+#. TRANS: "<nation adjective>, team <team name>"
+#: client/text.c:118
+#, fuzzy, c-format
+msgid "%s, team %s"
+msgstr ", echipa %s"
+
+#: client/text.c:135 client/text.c:136 client/text.c:141
#: client/gui-sdl/mapview.c:752
msgid "?nation:Neutral"
msgstr " ?diplomatic_state:Neutru"
-#: client/text.c:85 client/gui-sdl/mapview.c:752
+#: client/text.c:135 client/gui-sdl/mapview.c:752
msgid "?nation:Hostile"
msgstr "?nation:Ostilă"
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Peaceful"
msgstr "?nation:Paşnică"
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Friendly"
msgstr "?nation:Prietenoasă"
-#: client/text.c:88 client/gui-sdl/mapview.c:755
+#: client/text.c:138 client/gui-sdl/mapview.c:755
msgid "?nation:Mysterious"
msgstr "?nation:Misterioasă"
-#: client/text.c:88
+#: client/text.c:138
msgid "?nation:Friendly(team)"
msgstr "?nation:Prietenoasă(echipă)"
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
msgid "?city:Neutral"
msgstr "?city:Nume"
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
msgid "?city:Hostile"
msgstr "?city:Nume"
-#: client/text.c:92 client/gui-sdl/mapview.c:786
+#: client/text.c:142 client/gui-sdl/mapview.c:786
msgid "?city:Peaceful"
msgstr "?city:PaÅŸnic"
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Friendly"
msgstr "?city:Prietenos"
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Mysterious"
msgstr "?city:Misterios"
-#: client/text.c:93
+#: client/text.c:143
msgid "?city:Friendly(team)"
msgstr "?city:Prietenos(echipă)"
-#: client/text.c:100
+#: client/text.c:151
#, c-format
msgid "Location: (%d, %d) [%d]"
msgstr "Locaţie: (%d, %d) [%d]"
-#: client/text.c:109
+#: client/text.c:153
+#, c-format
+msgid "Native coordinates: (%d, %d)"
+msgstr ""
+
+#: client/text.c:160
#, c-format
msgid "Terrain: %s"
msgstr "Teren: %s"
-#: client/text.c:110
+#: client/text.c:161
#, c-format
msgid "Food/Prod/Trade: %s"
msgstr "Hrană/Prod/Negoţ: %s"
-#: client/text.c:113
+#: client/text.c:164
msgid "Minor Tribe Village"
msgstr "Sat mic tribal"
-#: client/text.c:119
+#: client/text.c:173
#, fuzzy
msgid "Our territory"
msgstr "Teritoriul nostru"
-#. TRANS: "Polish territory"
-#: client/text.c:122
+#. TRANS: "Territory of <username> (<nation + team>)"
+#: client/text.c:176
#, fuzzy, c-format
-msgid "%s territory"
-msgstr "Teritoriul %slor"
+msgid "Territory of %s (%s)"
+msgstr ""
+"\n"
+"Teritoriul %s %s"
-#. TRANS: "Polish territory (5 turn cease-fire)"
-#: client/text.c:131
-#, c-format
-msgid "%s territory (%d turn cease-fire)"
-msgid_plural "%s territory (%d turn cease-fire)"
-msgstr[0] "teritoriu %s (%d rundă de încetarea focului)"
-msgstr[1] "teritoriu %s (%d runde de încetarea focului)"
+#: client/text.c:186
+#, fuzzy, c-format
+msgid "Territory of %s (%s) (%d turn cease-fire)"
+msgid_plural "Territory of %s (%s) (%d turn cease-fire)"
+msgstr[0] "Oraş: %s (%s, %d rendă de încetarea focului)"
+msgstr[1] "Oraş: %s (%s, %d runde de încetarea focului)"
-#. TRANS: "Polish territory (friendly)"
-#: client/text.c:140
+#. TRANS: "Territory of <username>
+#. * (<nation + team> | <diplomatic state>)"
+#: client/text.c:195
#, fuzzy, c-format
-msgid "%s territory (%s)"
-msgstr "teritoriul %s %s"
+msgid "Territory of %s (%s | %s)"
+msgstr ""
+"\n"
+"Teritoriul %s %s"
-#: client/text.c:145
+#: client/text.c:200
msgid "Unclaimed territory"
msgstr "Teritoriu nerevendicat"
-#. TRANS: "City: Warsaw (Polish)"
-#: client/text.c:156
-#, c-format
-msgid "City: %s (%s)"
-msgstr "OraÅŸ: %s(%s)"
+#. TRANS: "City: <city name> | <username> (<nation + team>)"
+#: client/text.c:214
+#, fuzzy, c-format
+msgid "City: %s | %s (%s)"
+msgstr "OraÅŸul: %s(%s, %s)"
-#. TRANS: "City: Warsaw (Polish, 5 turn cease-fire)"
-#: client/text.c:166
-#, c-format
-msgid "City: %s (%s, %d turn cease-fire)"
-msgid_plural "City: %s (%s, %d turn cease-fire)"
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <number> turn cease-fire)"
+#: client/text.c:224
+#, fuzzy, c-format
+msgid "City: %s | %s (%s, %d turn cease-fire)"
+msgid_plural "City: %s | %s (%s, %d turn cease-fire)"
msgstr[0] "Oraş: %s (%s, %d rendă de încetarea focului)"
msgstr[1] "Oraş: %s (%s, %d runde de încetarea focului)"
-#. TRANS: "City: Warsaw (Polish,friendly)"
-#: client/text.c:174
-#, c-format
-msgid "City: %s (%s, %s)"
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <diplomatic state>)"
+#: client/text.c:231
+#, fuzzy, c-format
+msgid "City: %s | %s (%s, %s)"
msgstr "OraÅŸul: %s(%s, %s)"
#. TRANS: previous lines gave other information about the city.
-#: client/text.c:189
+#: client/text.c:246
#, fuzzy, c-format
msgid "?clistbegin: with %s"
msgstr " cu %s"
#. TRANS: "Trade from Warsaw: 5"
-#: client/text.c:202
+#: client/text.c:259
#, c-format
msgid "Trade from %s: %d"
msgstr "Negoţ de la %s: %d"
-#: client/text.c:210
+#: client/text.c:267
#, c-format
msgid "Infrastructure: %s"
msgstr "Infrastructură: %s"
-#: client/text.c:215
+#: client/text.c:272
#, c-format
msgid "Activity: %s"
msgstr "Activitate: %s"
-#. TRANS: "Unit: Musketeers (Polish, Warsaw)"
-#. TRANS: "Unit: Musketeers (Polish,friendly)"
-#: client/text.c:226 client/text.c:253
-#, c-format
-msgid "Unit: %s (%s, %s)"
+#. TRANS: "Unit: <unit type> | <username>
+#. * (<nation + team>, <homecity>)"
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <diplomatic state>)"
+#: client/text.c:287 client/text.c:313
+#, fuzzy, c-format
+msgid "Unit: %s | %s (%s, %s)"
msgstr "Unitate: %s(%s, %s)"
-#. TRANS: "Unit: Musketeers (Polish)"
-#: client/text.c:232
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>)"
+#: client/text.c:292
#, fuzzy, c-format
-msgid "Unit: %s (%s)"
-msgstr "Unitate: %s(%s)"
+msgid "Unit: %s | %s (%s)"
+msgstr "Unitate: %s(%s, %s)"
-#. TRANS: "Unit: Musketeers (Polish, 5 turn cease-fire)"
-#: client/text.c:245
-#, c-format
-msgid "Unit: %s (%s, %d turn cease-fire)"
-msgid_plural "Unit: %s (%s, %d turn cease-fire)"
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <number> turn cease-fire)"
+#: client/text.c:305
+#, fuzzy, c-format
+msgid "Unit: %s | %s (%s, %d turn cease-fire)"
+msgid_plural "Unit: %s | %s (%s, %d turn cease-fire)"
msgstr[0] "Unitate: %s(%s, %d rundă de încetarea focului)"
msgstr[1] "Unitate: %s(%s, %d runde de încetarea focului)"
#. TRANS: "Chance to win: A:95% D:46%"
-#: client/text.c:279
+#: client/text.c:338
#, c-format
msgid "Chance to win: A:%d%% D:%d%%"
msgstr "Şansă de câştig: A:%d%% D:%d%%"
#. TRANS: A is attack power, D is defense power, FP is firepower,
#. * HP is hitpoints (current and max).
-#: client/text.c:286
+#: client/text.c:345
#, c-format
msgid "A:%d D:%d FP:%d HP:%d/%d (%s)"
msgstr "A:%d D:%d FP:%d HP:%d/%d (%s)"
#. TRANS: "5 more" units on this tile
-#: client/text.c:295
+#: client/text.c:354
#, c-format
msgid " (%d more)"
msgstr " (%d mai mult)"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:364
+#: client/text.c:423
#, c-format
msgid "far from %s"
msgstr "departe de %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:367
+#: client/text.c:426
#, c-format
msgid "near %s"
msgstr "aproape de %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:370
+#: client/text.c:429
#, c-format
msgid "in %s"
msgstr "în %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:403
+#: client/text.c:462
#, c-format
msgid "from %s"
msgstr "de la %s"
-#: client/text.c:466
+#: client/text.c:525
msgid "Progress: no research"
msgstr "Viteza de cercetare: zero"
-#: client/text.c:470
+#: client/text.c:529
msgid "Progress: no research target"
msgstr "Viteza de cercetare: fără ţintă"
-#: client/text.c:475
+#: client/text.c:534
#, c-format
msgid "Progress: %d turn/advance"
msgid_plural "Progress: %d turns/advance"
msgstr[0] "Viteza de cercetare: %d rundă/avans"
msgstr[1] "Viteza de cercetare: %d runde/avans"
-#: client/text.c:480
+#: client/text.c:539
#, c-format
msgid "%d bulb/turn"
msgid_plural "%d bulbs/turn"
msgstr[0] "%d bulb/rundă"
msgstr[1] "%d bulbi/rundă"
-#: client/text.c:485
+#: client/text.c:544
#, c-format
msgid ", %d bulb/turn from team"
msgid_plural ", %d bulbs/turn from team"
msgstr[0] ", %d bulb/rundă de la echipă"
msgstr[1] ", %d bulbi/rundă de la echipă"
-#: client/text.c:512
+#: client/text.c:571
#, c-format
msgid "%d/- (never)"
msgstr "%d/- (niciodată)"
-#: client/text.c:524
+#: client/text.c:583
#, c-format
msgid "%d/%d (%d turn)"
msgid_plural "%d/%d (%d turns)"
msgstr[0] "%d/%d (%d rundă)"
msgstr[1] "%d/%d (%d runde)"
-#: client/text.c:527
+#: client/text.c:586
#, c-format
msgid "%d/%d (never)"
msgstr "%d/%d (niciodată)"
-#: client/text.c:564
+#: client/text.c:623
#, c-format
msgid "%d step"
msgid_plural "%d steps"
msgstr[0] "%d pas"
msgstr[1] "%d paÅŸi"
-#: client/text.c:566
+#: client/text.c:625
#, c-format
msgid "%d bulb"
msgid_plural "%d bulbs"
msgstr[0] "%d bulb"
msgstr[1] "%d bulbi"
-#: client/text.c:570 client/agents/cma_fec.c:269 client/agents/cma_fec.c:313
+#: 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
#, c-format
msgid "%d turn"
@@ -9927,89 +10003,89 @@ msgid_plural "%d turns"
msgstr[0] "%d rundă"
msgstr[1] "%d runde"
-#: client/text.c:592
+#: client/text.c:651
#, c-format
msgid "Population: %s"
msgstr "Populaţia: %s"
-#: client/text.c:595
+#: client/text.c:654
#, c-format
msgid "Year: %s (T%d)"
msgstr "Anul: %s (R%d)"
-#: client/text.c:598
+#: client/text.c:657
#, c-format
msgid "Gold: %d (%+d)"
msgstr "Galbeni: %d (%+d)"
-#: client/text.c:600
+#: client/text.c:659
#, c-format
msgid "Tax: %d Lux: %d Sci: %d"
msgstr "Imp:%d Lux:%d Åžti:%d"
-#: client/text.c:607
+#: client/text.c:666
#, fuzzy
msgid "Moving: Nobody"
msgstr "în mişcare: %s"
-#: client/text.c:609
+#: client/text.c:668
#, c-format
msgid "Moving: %s"
msgstr "în mişcare: %s"
-#: client/text.c:613
+#: client/text.c:672
msgid "(Click for more info)"
msgstr "(Apasă pentru informaţii suplimentare)"
-#: client/text.c:629
+#: client/text.c:688
#, c-format
msgid "%s People"
msgstr "%s populaţie"
-#: client/text.c:633
+#: client/text.c:692
#, c-format
msgid "Turn: %d"
msgstr "Runda: %d"
-#: client/text.c:635 client/gui-win32/inteldlg.c:111
+#: client/text.c:694 client/gui-win32/inteldlg.c:111
#: client/gui-xaw/inteldlg.c:208
#, c-format
msgid "Gold: %d"
msgstr "Galbeni: %d"
-#: client/text.c:636
+#: client/text.c:695
#, c-format
msgid "Net Income: %d"
msgstr "Venit net: %d"
#. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:639
+#: client/text.c:698
#, c-format
msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
msgstr "Rata taxelor: Galbeni:%d%% Lux:%d%% Ştiinţă:%d%%"
-#: client/text.c:643
+#: client/text.c:702
#, c-format
msgid "Researching %s: %s"
msgstr "Cercetând %s: %s"
-#: client/text.c:650
+#: client/text.c:709
#, c-format
msgid "Global warming chance: %d%% (%+d%%/turn)"
msgstr "Şansă de încălzire globală: %d%% (%+d%%/rundă)"
-#: client/text.c:653
+#: client/text.c:712
#, c-format
msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
msgstr "Şansă de iarnă nucleară: %d%% (%+d%%/rundă)"
-#: client/text.c:658 client/gui-win32/inteldlg.c:104
+#: client/text.c:717 client/gui-win32/inteldlg.c:104
#: client/gui-xaw/inteldlg.c:200
#, c-format
msgid "Government: %s"
msgstr "Guvern: %s"
-#: client/text.c:682
+#: client/text.c:741
#, c-format
msgid "%d unit"
msgid_plural "%d units"
@@ -10017,55 +10093,55 @@ msgstr[0] "%d unitate"
msgstr[1] "%d unităţi"
#. TRANS: Impossible to reach goto target tile
-#: client/text.c:715 client/gui-sdl/mapview.c:566
+#: client/text.c:774 client/gui-sdl/mapview.c:566
msgid "?goto:Unreachable"
msgstr ""
-#: client/text.c:717 client/gui-sdl/mapview.c:568
+#: client/text.c:776 client/gui-sdl/mapview.c:568
#, c-format
msgid "Turns to target: %d"
msgstr "Runde până la ţintă: %d"
-#: client/text.c:719 client/gui-sdl/mapview.c:570
+#: client/text.c:778 client/gui-sdl/mapview.c:570
#, c-format
msgid "Turns to target: %d to %d"
msgstr "Runde până la ţintă: %d la %d"
-#: client/text.c:725 client/gui-sdl/mapview.c:576
+#: client/text.c:784 client/gui-sdl/mapview.c:576
#, c-format
msgid "%d unit selected"
msgid_plural "%d units selected"
msgstr[0] "%d unitate selectată"
msgstr[1] "%d unităţi selectate"
-#: client/text.c:730 client/gui-sdl/mapview.c:581
+#: client/text.c:789 client/gui-sdl/mapview.c:581
msgid "No units selected."
msgstr "Nu aţi selectat nici o naţiune."
-#: client/text.c:804 client/gui-sdl/mapview.c:654
+#: client/text.c:863 client/gui-sdl/mapview.c:654
#, c-format
msgid "Others: %d civil; %d military"
msgstr "Alţii: %d civili; %d militari"
-#: client/text.c:806 client/gui-sdl/mapview.c:656
+#: client/text.c:865 client/gui-sdl/mapview.c:656
#, c-format
msgid "Others: %d civilian"
msgstr "Alţii: %d civili"
-#: client/text.c:808 client/gui-sdl/mapview.c:658
+#: client/text.c:867 client/gui-sdl/mapview.c:658
#, c-format
msgid "Others: %d military"
msgstr "Alţii: %d militari"
-#: client/text.c:839
+#: client/text.c:898
msgid "No units to upgrade!"
msgstr "Nici o unitate pentru modernizare!"
-#: client/text.c:864
+#: client/text.c:923
msgid "None of these units may be upgraded."
msgstr "Nici una din unităţi nu poate fi modernizată."
-#: client/text.c:870
+#: client/text.c:929
#, fuzzy, c-format
msgid ""
"Upgrade %d unit for %d gold?\n"
@@ -10080,72 +10156,72 @@ msgstr[1] ""
"Modernizează %s în %s pentru %d galbeni?\n"
"Trezoreria conţine %d galbeni."
-#: client/text.c:891
+#: client/text.c:950
msgid "Shows your progress in researching the current technology."
msgstr "Arată progresul în cercetarea tehnologiei curente."
-#: client/text.c:897
+#: client/text.c:956
msgid "no research target."
msgstr "fără ţintă de cercetare."
#. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:900
+#: client/text.c:959
#, c-format
msgid "%s: %d/%d."
msgstr "%s: %d/%d."
-#: client/text.c:920
+#: client/text.c:979
msgid "Shows the progress of global warming:"
msgstr "Arată evoluţia încălzirii globale:"
-#: client/text.c:921
+#: client/text.c:980
#, c-format
msgid "Pollution rate: %d%%"
msgstr "Rata poluării: %d%%"
-#: client/text.c:923
+#: client/text.c:982
#, c-format
msgid "Chance of catastrophic warming each turn: %d%%"
msgstr "Şansa unei încălziri catastrofale: %d%%(pe rundă)"
-#: client/text.c:939
+#: client/text.c:998
msgid "Shows the progress of nuclear winter:"
msgstr "Arată evoluţia iernii nucleare:"
-#: client/text.c:940
+#: client/text.c:999
#, c-format
msgid "Fallout rate: %d%%"
msgstr "Rata împrăştierii nucleare: %d%%"
-#: client/text.c:942
+#: client/text.c:1001
#, c-format
msgid "Chance of catastrophic winter each turn: %d%%"
msgstr "Şansa unei ierni catastrofale: %d%%(pe rundă)"
-#: client/text.c:957
+#: client/text.c:1016
msgid "Shows your current government:"
msgstr "Arată forma de guvernământ curentă:"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:981
+#: client/text.c:1040
#, c-format
msgid "Population: %5d"
msgstr "Populaţia: %5d"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:1043
#, c-format
msgid "Support: %5d %%"
msgstr "Suport: %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:1047
#, c-format
msgid "Energy: %5d %%"
msgstr "Energie: %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:992
+#: client/text.c:1051
#, c-format
msgid "Mass: %5d ton"
msgid_plural "Mass: %5d tons"
@@ -10153,96 +10229,97 @@ msgstr[0] "Masă: %5d tonă"
msgstr[1] "Masă: %5d tone"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1057
#, c-format
msgid "Travel time: %5.1f years"
msgstr "Durata de zbor: %5.1f ani"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1061
msgid "Travel time: N/A "
msgstr "Durata de zbor:necunoscută"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1065
#, c-format
msgid "Success prob.: %5d %%"
msgstr "Prob.de succes: %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1010
+#: client/text.c:1069
#, c-format
msgid "Year of arrival: %8s"
msgstr "Anul sosirii: %8s"
-#: client/text.c:1030
+#: client/text.c:1089
msgid "?timeout:off"
msgstr "?timeout:fără"
-#: client/text.c:1054
+#: client/text.c:1113
#, c-format
msgid "?seconds:%02ds"
msgstr "?seconds:%02ds"
-#: client/text.c:1056
+#: client/text.c:1115
#, c-format
msgid "?mins/secs:%02dm %02ds"
msgstr "?min/sec:%02dm %02ds"
-#: client/text.c:1058
+#: client/text.c:1117
#, c-format
msgid "?hrs/mns:%02dh %02dm"
msgstr "?hrs/mns:%02dh %02dm"
-#: client/text.c:1060
+#: client/text.c:1119
#, c-format
msgid "?dys/hrs:%02dd %02dh"
msgstr "?dys/hrs:%02dz %02dh"
-#: client/text.c:1063
+#: client/text.c:1122
msgid "?duration:overflow"
msgstr "?durată:depăşire"
-#: client/text.c:1084
+#: client/text.c:1143
#, c-format
msgid "%6d.%02d ms"
msgstr "%6d.%02d ms"
-#. TRANS: "Republic of the Poles"
-#: client/text.c:1127
-#, c-format
-msgid "%s of the %s"
-msgstr "%s al %s"
+#. TRANS: <nation adjective> <government name>.
+#. * E.g. "Polish Republic".
+#: client/text.c:1188
+#, fuzzy, c-format
+msgid "?nationgovernment:%s %s"
+msgstr "Guvern: %s"
#. TRANS: "Observer: 1985"
-#: client/text.c:1137
+#: client/text.c:1198
#, c-format
msgid "Observer: %s"
msgstr "Observator: %s"
-#: client/text.c:1155
+#: client/text.c:1216
msgid "Buildings: "
msgstr "Edificii: "
-#: client/text.c:1172 client/text.c:1211
+#: client/text.c:1233 client/text.c:1272
msgid "None. "
msgstr "Nimic. "
-#: client/text.c:1174 client/text.c:1213
+#: client/text.c:1235 client/text.c:1274
msgid "?clistend:."
msgstr ". "
-#: client/text.c:1192
+#: client/text.c:1253
msgid "Wonders: "
msgstr "Minuni: "
-#: client/text.c:1247
+#: client/text.c:1308
#, 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:1251
+#: client/text.c:1312
#, fuzzy, c-format
msgid "%d content before penalty."
msgid_plural "%d content before penalty."
@@ -10250,45 +10327,41 @@ 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:1257
+#: client/text.c:1318
#, 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."
-#. TRANS: Martial law opening parenthesis
-#: client/text.c:1279
-msgid "Martial law in effect ("
+#: client/text.c:1339
+#, fuzzy
+msgid "Unlimited martial law in effect."
msgstr "Legea marţială în efect ("
-#. TRANS: no [unit] maximum
-#: client/text.c:1284
-msgid "no maximum, "
-msgstr "fără maxim, "
-
-#: client/text.c:1287
-#, c-format
-msgid "%d unit maximum, "
-msgid_plural "%d units maximum, "
-msgstr[0] "%d unitate maxim, "
-msgstr[1] "%d unităţi maxim, "
+#: client/text.c:1341
+#, 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"
-#. TRANS: Martial law closing parenthesis
-#: client/text.c:1294
-#, c-format
-msgid "%d per unit). "
-msgstr "%d pe unitate). "
+#: client/text.c:1345
+#, 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:1298
+#: client/text.c:1352
msgid "Military units in the field may cause unhappiness. "
msgstr "Unităţi militate în afara oraşului pot produce nefericire. "
-#: client/text.c:1301
+#: client/text.c:1355
msgid "Military units have no happiness effect. "
msgstr "Unităţi militare n-au efect asupra fericirii. "
-#: client/text.c:1316
+#: client/text.c:1370
#, c-format
msgid "Luxury: %d total."
msgstr "Lux: %d total."
@@ -10313,7 +10386,7 @@ msgstr ""
"Clientul nu suportă seturi de forme cu vedere de deasupra. Sefoloseşte în "
"schimb setul de forme implicit."
-#: client/tilespec.c:3968
+#: client/tilespec.c:3966
#, fuzzy, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
@@ -10340,12 +10413,12 @@ msgstr ""
"Guvernatorul oraşului este confuz în legătură cu %s. Ar fi bine să aruncaţi "
"o privire."
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
-#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:599
+#: client/gui-gtk-2.0/cityrep.c:624 client/gui-sdl/citydlg.c:2009
msgid "none"
msgstr "nimic"
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:645
msgid "custom"
msgstr "individual"
@@ -10654,7 +10727,7 @@ msgstr "StabileÅŸte un Schimb _Comercial"
msgid "Enter Marketplace"
msgstr "Intraţi în piaţă"
-#: client/gui-gtk-2.0/chatline.c:144 client/gui-win32/chatline.c:134
+#: client/gui-gtk-2.0/chatline.c:218 client/gui-win32/chatline.c:134
#: client/gui-xaw/chatline.c:120
msgid "Cleared output window."
msgstr "Am curăţat fereastra de ieşire."
@@ -10735,11 +10808,11 @@ msgid "%d/%d %d turns"
msgstr "%d/%d %d runde"
#: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:821
+#: client/gui-gtk-2.0/cityrep.c:1027
msgid "_Buy"
msgstr "_Cumpără"
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:869
#, fuzzy
msgid "_Production"
msgstr "Pro_ducţie"
@@ -10761,12 +10834,12 @@ msgid "Entertainers"
msgstr "Comedianţi"
#: client/gui-gtk-2.0/citydlg.c:1029 client/gui-win32/citydlg.c:1989
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2403
msgid "Scientists"
msgstr "Cercetători"
#: client/gui-gtk-2.0/citydlg.c:1030 client/gui-win32/citydlg.c:1991
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2404
msgid "Taxmen"
msgstr "Perceptori de taxe"
@@ -10859,7 +10932,7 @@ msgstr "Unităţi întreţinute %d"
msgid "Present units %d"
msgstr "Unităţi prezente %d"
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:1019
msgid "Cen_ter"
msgstr "_Centrează"
@@ -10948,32 +11021,62 @@ msgstr "RedenumeÅŸte oraÅŸul"
msgid "What should we rename the city to?"
msgstr "Care să fie numele oraşului?"
-#: client/gui-gtk-2.0/cityrep.c:699
+#: client/gui-gtk-2.0/cityrep.c:794
+#, fuzzy
+msgid "(no worklists defined)"
+msgstr "(plan de lucru)"
+
+#: client/gui-gtk-2.0/cityrep.c:876
msgid "Chan_ge"
msgstr "_Schimbă"
-#: client/gui-gtk-2.0/cityrep.c:703
+#: client/gui-gtk-2.0/cityrep.c:880
msgid "Add _First"
msgstr "Adaugă prima"
-#: client/gui-gtk-2.0/cityrep.c:707
+#: client/gui-gtk-2.0/cityrep.c:884
msgid "Add _Next"
msgstr "Adaugă următoarea"
-#: client/gui-gtk-2.0/cityrep.c:711
+#: client/gui-gtk-2.0/cityrep.c:888
+#, fuzzy
+msgid "Add _2nd Last"
+msgstr "Adaugă ultima"
+
+#: client/gui-gtk-2.0/cityrep.c:892
msgid "Add _Last"
msgstr "Adaugă ultima"
-#: client/gui-gtk-2.0/cityrep.c:715
+#: client/gui-gtk-2.0/cityrep.c:899
+#, fuzzy
+msgid "Set Worklist"
+msgstr "Plan de lucru"
+
+#: client/gui-gtk-2.0/cityrep.c:905
+#, fuzzy
+msgid "Append Worklist"
+msgstr "RedenumeÅŸte Planul de Lucru"
+
+#: client/gui-gtk-2.0/cityrep.c:911
+#, fuzzy
+msgid "Clear _Worklist"
+msgstr "Ţintă plan de lucru:"
+
+#: client/gui-gtk-2.0/cityrep.c:916
+#, fuzzy
+msgid "Gover_nor"
+msgstr "Guvernator"
+
+#: client/gui-gtk-2.0/cityrep.c:921
msgid "_Select"
msgstr "_Selectează"
-#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
+#: client/gui-gtk-2.0/cityrep.c:925 client/gui-gtk-2.0/plrdlg.c:521
#, fuzzy
msgid "_Display"
msgstr "Ar_ată"
-#: client/gui-gtk-2.0/cityrep.c:800 client/gui-gtk-2.0/menu.c:808
+#: 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-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
#: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -10983,101 +11086,101 @@ msgstr "Ar_ată"
msgid "Cities"
msgstr "OraÅŸe"
-#: client/gui-gtk-2.0/cityrep.c:817
+#: client/gui-gtk-2.0/cityrep.c:1023
#, fuzzy
msgid "_Inspect"
msgstr "Afişează oraşul"
-#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
-#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-sdl/helpdlg.c:297 client/gui-win32/menu.c:342
-#: client/gui-xaw/menu.c:241
+#: 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
+#: client/gui-gtk-2.0/cityrep.c:1518 client/gui-gtk-2.0/menu.c:823
+#: client/gui-gtk-2.0/menu.c:825 client/gui-gtk-2.0/menu.c:827
+#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:831
+#: client/gui-gtk-2.0/menu.c:833 client/gui-sdl/helpdlg.c:297
+#: client/gui-win32/menu.c:342 client/gui-xaw/menu.c:241
msgid "Improvements"
msgstr "Înbunătăţiri"
-#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
-#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
-#: client/gui-xaw/menu.c:247
+#: client/gui-gtk-2.0/cityrep.c:1441 client/gui-gtk-2.0/cityrep.c:1460
+#: client/gui-gtk-2.0/cityrep.c:1479 client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1522 client/gui-xaw/menu.c:247
msgid "Wonders"
msgstr "Minuni"
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1662 client/gui-win32/cityrep.c:439
#: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
msgid "All Cities"
msgstr "Toate oraÅŸele"
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1667 client/gui-win32/cityrep.c:440
msgid "No Cities"
msgstr "Nici un oraÅŸ"
-#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1672 client/gui-win32/cityrep.c:441
msgid "Invert Selection"
msgstr "Invertează Selecţia"
-#: client/gui-gtk-2.0/cityrep.c:1420
+#: client/gui-gtk-2.0/cityrep.c:1682
msgid "Building Units"
msgstr "Constuind Unităţi"
-#: client/gui-gtk-2.0/cityrep.c:1426
+#: client/gui-gtk-2.0/cityrep.c:1688
msgid "Building Improvements"
msgstr "Construind Înbunătăţiri"
-#: client/gui-gtk-2.0/cityrep.c:1432
+#: client/gui-gtk-2.0/cityrep.c:1694
msgid "Building Wonders"
msgstr "Construind Minuni"
-#: client/gui-gtk-2.0/cityrep.c:1444
+#: client/gui-gtk-2.0/cityrep.c:1706
msgid "Building Unit"
msgstr "Construind Unitatea"
-#: client/gui-gtk-2.0/cityrep.c:1448
+#: client/gui-gtk-2.0/cityrep.c:1710
msgid "Building Improvement"
msgstr "Construind Îmbunătăţirea"
-#: client/gui-gtk-2.0/cityrep.c:1452
+#: client/gui-gtk-2.0/cityrep.c:1714
msgid "Building Wonder"
msgstr "Construind Minunea"
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1722 client/gui-win32/cityrep.c:443
msgid "Coastal Cities"
msgstr "Oraşe de Coastă"
-#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1727 client/gui-win32/cityrep.c:444
msgid "Same Island"
msgstr "Aceaşi Insulă"
-#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1737 client/gui-win32/cityrep.c:447
msgid "Supported Units"
msgstr "Unităţi întreţinute"
-#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1740 client/gui-win32/cityrep.c:454
msgid "Units Present"
msgstr "Unităţi Prezente"
-#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1744 client/gui-win32/cityrep.c:469
msgid "Improvements in City"
msgstr "Înbunătăţiri în oraş"
-#: client/gui-gtk-2.0/cityrep.c:1486
+#: client/gui-gtk-2.0/cityrep.c:1748
msgid "Wonders in City"
msgstr "Minuni în oraş"
-#: client/gui-gtk-2.0/cityrep.c:1495
+#: client/gui-gtk-2.0/cityrep.c:1757
msgid "Available Units"
msgstr "Unităţi disponibile"
-#: client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1760
msgid "Available Improvements"
msgstr "Înbunătăţiri disponibile"
-#: client/gui-gtk-2.0/cityrep.c:1501
+#: client/gui-gtk-2.0/cityrep.c:1763
msgid "Available Wonders"
msgstr "Minuni disponibile"
-#: client/gui-gtk-2.0/cityrep.c:1625
+#: client/gui-gtk-2.0/cityrep.c:1882
#, fuzzy, c-format
msgid "Total Buy Cost: %d"
msgstr "Cost total: "
@@ -11147,12 +11250,12 @@ 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:186
+#: client/gui-gtk-2.0/dialogs.c:196 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:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
#, fuzzy
msgid "Inspect _City"
msgstr "Afişează oraşul"
@@ -11181,10 +11284,10 @@ msgstr "Alegeţi pentru prădare"
msgid "Unit"
msgstr "Unitate"
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
-#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
-#: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
-#: manual/civmanual.c:302 data/Freeciv.in:80
+#: 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-win32/plrdlg.c:335 manual/civmanual.c:302 data/Freeciv.in:80
msgid "Name"
msgstr "Nume"
@@ -11210,7 +11313,7 @@ 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:1036 data/Freeciv.in:3371
+#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
msgid "Pick Nation"
msgstr "Alegeţi naţiunea"
@@ -11292,7 +11395,7 @@ msgstr "_Hărţi"
msgid "_Advances"
msgstr "_Avansări"
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:910
+#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr "_OraÅŸe"
@@ -11398,20 +11501,20 @@ msgstr "Aleget unitatea"
msgid "Show _All Cities"
msgstr "_Aratâ toate oraşele"
-#: client/gui-gtk-2.0/gui_main.c:150
+#: client/gui-gtk-2.0/gui_main.c:162
msgid "Show Map Scrollbars"
msgstr "Afişează barele de derulare a hărţii"
-#: client/gui-gtk-2.0/gui_main.c:151
+#: client/gui-gtk-2.0/gui_main.c:163
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:155
+#: client/gui-gtk-2.0/gui_main.c:167
msgid "Keyboardless goto"
msgstr "Comanda „Du-te la†fără tastatură "
-#: client/gui-gtk-2.0/gui_main.c:156
+#: client/gui-gtk-2.0/gui_main.c:168
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 +11523,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:161
+#: client/gui-gtk-2.0/gui_main.c:173
msgid "Keep dialogs on top"
msgstr "Păstrează ferestrele de dialog deasupra"
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:174
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."
@@ -11433,11 +11536,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:166
+#: client/gui-gtk-2.0/gui_main.c:178
msgid "Show worklist task icons"
msgstr "Arată pictogramele sarcinilor în planul de lucru"
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:179
msgid ""
"Disabling this will turn off the unit and building icons in the worklist "
"dialog and the production tab of the city dialog."
@@ -11445,11 +11548,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:171
+#: client/gui-gtk-2.0/gui_main.c:183
msgid "Enable status report tabs"
msgstr "Activaţi filele de raport a stării"
-#: client/gui-gtk-2.0/gui_main.c:172
+#: client/gui-gtk-2.0/gui_main.c:184
msgid ""
"If this option is enabled then report dialogs will be shown as separate tabs "
"rather than in popup dialogs."
@@ -11457,11 +11560,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:177 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:189 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:178 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:190 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."
@@ -11470,50 +11573,119 @@ 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:277 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:195
+msgid "Show time for each chat message"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:196
+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
+msgid "Split bottom notebook area"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:202
+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
+msgid "New message events go to top of list"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:208
+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
+msgid "Show extra message window buttons"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:214
+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 "
+"is disabled, these buttons will not appear (you can still double-click with "
+"the left mouse button or right-click on a row to inspect or goto "
+"respectively). This option will only take effect once the message window is "
+"closed and reopened."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:224
+msgid "Metaserver tab first in network page"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:225
+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
+msgid "Plain chat messages are sent to allies only"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:231
+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 "
+"messages will be sent as public chat messages. To send a public chat message "
+"with this option enabled, prefix the message with a single colon ':'. This "
+"option can also be set using a toggle button beside the chat entry (only "
+"visible in multiplayer games)."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:340 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:723 client/gui-gtk-2.0/gui_main.c:1345
+#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
msgid "Freeciv"
msgstr "Freeciv"
-#: client/gui-gtk-2.0/gui_main.c:1088 client/gui-gtk-2.0/gui_main.c:1095
+#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
#: 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:1095 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1232 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:1127 client/gui-gtk-2.0/menu.c:770
-#: client/gui-gtk-2.0/menu.c:772 client/gui-gtk-2.0/menu.c:774
-#: client/gui-gtk-2.0/menu.c:776 client/gui-gtk-2.0/menu.c:778
-#: client/gui-gtk-2.0/menu.c:780 client/gui-gtk-2.0/menu.c:782
-#: client/gui-gtk-2.0/menu.c:784 client/gui-gtk-2.0/menu.c:786
-#: client/gui-gtk-2.0/menu.c:788 client/gui-gtk-2.0/menu.c:790
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-gtk-2.0/menu.c:804 client/gui-gtk-2.0/menu.c:806
-#: client/gui-gtk-2.0/menu.c:808 client/gui-gtk-2.0/menu.c:810
-#: client/gui-gtk-2.0/menu.c:812 client/gui-gtk-2.0/menu.c:814
-#: client/gui-gtk-2.0/menu.c:816 client/gui-gtk-2.0/menu.c:818
-#: client/gui-gtk-2.0/menu.c:820 client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/gui_main.c:1266 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
+#: client/gui-gtk-2.0/menu.c:811 client/gui-gtk-2.0/menu.c:813
+#: client/gui-gtk-2.0/menu.c:815 client/gui-gtk-2.0/menu.c:817
+#: client/gui-gtk-2.0/menu.c:819 client/gui-gtk-2.0/menu.c:821
+#: client/gui-gtk-2.0/menu.c:823 client/gui-gtk-2.0/menu.c:825
+#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
+#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
+#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
+#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
+#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
+#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
#: data/Freeciv.in:2028
msgid "View"
msgstr "Vizualizare"
-#: client/gui-gtk-2.0/gui_main.c:1208
+#: client/gui-gtk-2.0/gui_main.c:1359
msgid "Chat"
msgstr "Discuţie"
-#: client/gui-gtk-2.0/gui_main.c:1224 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1377 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"
@@ -11524,71 +11696,75 @@ 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:1491
+#: client/gui-gtk-2.0/gui_main.c:1392
+msgid "Allies Only"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:1657
msgid "Not _ready"
msgstr "Nepregătit"
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
+#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
msgid "_Ready"
msgstr "P_regătit"
-#: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2132
+#: 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
msgid "_Start"
msgstr "_Start"
-#: client/gui-gtk-2.0/gui_main.c:1520
+#: client/gui-gtk-2.0/gui_main.c:1686
#, fuzzy
msgid "_Take Player"
msgstr "Preluaţi acest jucător"
-#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
+#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
msgid "Pick _Nation"
msgstr "Alege _naţiunea"
-#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
+#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
msgid "_Observe"
msgstr "_Observă"
-#: client/gui-gtk-2.0/gui_main.c:1532
+#: client/gui-gtk-2.0/gui_main.c:1698
#, fuzzy
msgid "Do not _observe"
msgstr "Nu _observa"
-#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
msgid "<AI>"
msgstr "<AI>"
-#: client/gui-gtk-2.0/gui_main.c:1557
+#: client/gui-gtk-2.0/gui_main.c:1723
msgid "<Novice AI>"
msgstr "<AI novice>"
-#: client/gui-gtk-2.0/gui_main.c:1560
+#: client/gui-gtk-2.0/gui_main.c:1726
msgid "<Easy AI>"
msgstr "<AI uÅŸor>"
-#: client/gui-gtk-2.0/gui_main.c:1563
+#: client/gui-gtk-2.0/gui_main.c:1729
msgid "<Normal AI>"
msgstr "<AI normal>"
-#: client/gui-gtk-2.0/gui_main.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1732
msgid "<Hard AI>"
msgstr "<AI greu>"
-#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1742 client/gui-win32/dialogs.c:594
#: client/gui-xaw/pages.c:217
msgid "Random"
msgstr "Aleator"
-#: client/gui-gtk-2.0/gui_main.c:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
msgid "Observer"
msgstr " Observator"
-#: client/gui-gtk-2.0/gui_main.c:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
msgid "Detached"
msgstr "DeataÅŸat"
-#: client/gui-gtk-2.0/gui_main.c:1899
+#: client/gui-gtk-2.0/gui_main.c:2073
msgid "Are you sure you want to quit?"
msgstr "Sigur vrei să renunţi?"
@@ -11820,472 +11996,509 @@ msgstr "_Tehnologii"
msgid "Foreign Intelligence: %s Empire"
msgstr "Raport de spionaj: Imperiul %s"
-#: client/gui-gtk-2.0/mapctrl.c:195 client/gui-sdl/mapctrl.c:2565
+#: client/gui-gtk-2.0/mapctrl.c:179 client/gui-sdl/mapctrl.c:2565
#: client/gui-sdl/menu.c:839 client/gui-sdl/menu.c:1021
#: client/gui-win32/mapctrl.c:353
msgid "Build New City"
msgstr "ConstruieÅŸte un OraÅŸ Nou"
-#: client/gui-gtk-2.0/mapctrl.c:196 client/gui-sdl/mapctrl.c:2594
+#: client/gui-gtk-2.0/mapctrl.c:180 client/gui-sdl/mapctrl.c:2594
#: client/gui-win32/mapctrl.c:354 client/gui-xaw/mapctrl.c:89
msgid "What should we call our new city?"
msgstr "Cum să denumim noul nostru oraş?"
-#: client/gui-gtk-2.0/mapview.c:147
+#: client/gui-gtk-2.0/mapview.c:158
msgid "Shows your current luxury/science/tax rates;click to toggle them."
msgstr ""
"Afişează ratele curente pentru lux/ştiinţă/taxe; clic pentru a le schimba "
"starea."
-#: client/gui-gtk-2.0/mapview.c:692 client/gui-win32/canvas.c:275
+#: client/gui-gtk-2.0/mapview.c:702 client/gui-win32/canvas.c:275
msgid "Better fog will only work in truecolor. Disabling it"
msgstr ""
"Ceaţa de război mai bună merge doar în modul truecolor. Se dezactivează"
-#: client/gui-gtk-2.0/menu.c:250
+#: client/gui-gtk-2.0/menu.c:256
msgid "Leaving a local game will end it!"
msgstr "Dacă părăsiţi un joc local îl veţi încheia!"
-#: client/gui-gtk-2.0/menu.c:700 client/gui-win32/menu.c:303
+#: client/gui-gtk-2.0/menu.c:727 client/gui-win32/menu.c:303
msgid "_Game"
msgstr "_Joc"
-#: client/gui-gtk-2.0/menu.c:702 client/gui-gtk-2.0/menu.c:704
-#: client/gui-gtk-2.0/menu.c:706 client/gui-gtk-2.0/menu.c:708
-#: client/gui-gtk-2.0/menu.c:710 client/gui-gtk-2.0/menu.c:712
-#: client/gui-gtk-2.0/menu.c:714 client/gui-gtk-2.0/menu.c:717
-#: client/gui-gtk-2.0/menu.c:720 client/gui-gtk-2.0/menu.c:722
-#: client/gui-gtk-2.0/menu.c:724 client/gui-gtk-2.0/menu.c:726
-#: client/gui-gtk-2.0/menu.c:728 client/gui-gtk-2.0/menu.c:730
-#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:736
-#: client/gui-gtk-2.0/menu.c:738 client/gui-gtk-2.0/menu.c:740
+#: client/gui-gtk-2.0/menu.c:729 client/gui-gtk-2.0/menu.c:731
+#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:735
+#: client/gui-gtk-2.0/menu.c:737 client/gui-gtk-2.0/menu.c:739
+#: client/gui-gtk-2.0/menu.c:741 client/gui-gtk-2.0/menu.c:744
+#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
+#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
+#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
+#: client/gui-gtk-2.0/menu.c:760 client/gui-gtk-2.0/menu.c:763
+#: client/gui-gtk-2.0/menu.c:765 client/gui-gtk-2.0/menu.c:767
#: data/Freeciv.in:2026
msgid "Game"
msgstr "Joc"
-#: client/gui-gtk-2.0/menu.c:704 client/gui-gtk-2.0/menu.c:706
-#: client/gui-gtk-2.0/menu.c:708
+#: client/gui-gtk-2.0/menu.c:731 client/gui-gtk-2.0/menu.c:733
+#: client/gui-gtk-2.0/menu.c:735
msgid "_Chat"
msgstr "Dis_cuţie"
-#: client/gui-gtk-2.0/menu.c:706 client/gui-win32/menu.c:314
+#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:314
msgid "_Clear Log"
msgstr "_Curăţă Jurnalul"
-#: client/gui-gtk-2.0/menu.c:708 client/gui-win32/menu.c:313
+#: client/gui-gtk-2.0/menu.c:735 client/gui-win32/menu.c:313
#, fuzzy
msgid "_Write Log"
msgstr "E_xportă jurnalul"
-#: client/gui-gtk-2.0/menu.c:710 client/gui-win32/menu.c:304
+#: client/gui-gtk-2.0/menu.c:737 client/gui-win32/menu.c:304
msgid "Local _Options"
msgstr "_Opţiuni Locale"
-#: client/gui-gtk-2.0/menu.c:712 client/gui-win32/menu.c:305
+#: client/gui-gtk-2.0/menu.c:739 client/gui-win32/menu.c:305
msgid "_Message Options"
msgstr "Opţiuni _Mesaje"
-#: client/gui-gtk-2.0/menu.c:717
+#: client/gui-gtk-2.0/menu.c:744
msgid "_Reload Tileset"
msgstr "_Reîncarcă setul de forme"
-#: client/gui-gtk-2.0/menu.c:720
+#: client/gui-gtk-2.0/menu.c:747
msgid "Save Options on _Exit"
msgstr "Salvează opţiunile la i_eşire"
-#: client/gui-gtk-2.0/menu.c:722
+#: client/gui-gtk-2.0/menu.c:749
msgid "Sa_ve Options"
msgstr "Sal_vează opţiunile"
-#: client/gui-gtk-2.0/menu.c:726 client/gui-win32/menu.c:308
+#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:308
msgid "Server O_ptions"
msgstr "O_pţiunile server-ului"
-#: client/gui-gtk-2.0/menu.c:730 client/gui-win32/menu.c:310
+#: client/gui-gtk-2.0/menu.c:757 client/gui-win32/menu.c:310
msgid "_Save Game"
msgstr "_Salvează joc"
-#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:311
+#: client/gui-gtk-2.0/menu.c:760 client/gui-win32/menu.c:311
msgid "Save Game _As..."
msgstr "Salvează jocukl c_a"
-#: client/gui-gtk-2.0/menu.c:738
+#: client/gui-gtk-2.0/menu.c:765
msgid "_Leave"
msgstr "Părăseşte"
-#: client/gui-gtk-2.0/menu.c:740 client/gui-win32/menu.c:317
+#: client/gui-gtk-2.0/menu.c:767 client/gui-win32/menu.c:317
msgid "_Quit"
msgstr "_Termină"
-#: client/gui-gtk-2.0/menu.c:745 client/gui-win32/menu.c:321
+#: client/gui-gtk-2.0/menu.c:772 client/gui-win32/menu.c:321
msgid "Gov_ernment"
msgstr "Formă de guvernământ"
-#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
-#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
-#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:774 client/gui-gtk-2.0/menu.c:776
+#: client/gui-gtk-2.0/menu.c:778 client/gui-gtk-2.0/menu.c:780
+#: client/gui-gtk-2.0/menu.c:782 client/gui-gtk-2.0/menu.c:784
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
#: client/gui-xaw/menu.c:248 data/Freeciv.in:2027 data/helpdata.txt:1320
msgid "Government"
msgstr "Forme de guvernământ"
-#: client/gui-gtk-2.0/menu.c:749 client/gui-win32/menu.c:322
+#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:322
msgid "_Tax Rates"
msgstr "Rata de _Impozit"
-#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:324
+#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:324
msgid "_Find City"
msgstr "_Caută Oraşul"
-#: client/gui-gtk-2.0/menu.c:755 client/gui-win32/menu.c:325
+#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:325
msgid "_Worklists"
msgstr "Plan de lucru"
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
-#: client/gui-gtk-2.0/menu.c:764 client/gui-win32/menu.c:327
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
+#: client/gui-gtk-2.0/menu.c:791 client/gui-win32/menu.c:327
msgid "_Change Government"
msgstr "S_chimbă forma de guvernare"
-#: client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:788
msgid "_Revolution..."
msgstr "_Revoluţie..."
-#: client/gui-gtk-2.0/menu.c:764 client/gui-gtk-2.0/menu.c:970
+#: client/gui-gtk-2.0/menu.c:791 client/gui-gtk-2.0/menu.c:1013
#: client/gui-win32/menu.c:431
msgid "_Government"
msgstr "_Guverne"
-#: client/gui-gtk-2.0/menu.c:768 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:795 client/gui-gtk-2.0/menu.c:959
#: client/gui-win32/menu.c:334
msgid "_View"
msgstr "_Vizualizare"
-#: client/gui-gtk-2.0/menu.c:772
+#: client/gui-gtk-2.0/menu.c:799
msgid "City Outlines"
msgstr "Limitele oraÅŸului"
-#: client/gui-gtk-2.0/menu.c:774 client/gui-win32/menu.c:335
+#: client/gui-gtk-2.0/menu.c:801 client/gui-win32/menu.c:335
msgid "Map _Grid"
msgstr "_Grilă"
-#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:336
+#: client/gui-gtk-2.0/menu.c:803 client/gui-win32/menu.c:336
msgid "National _Borders"
msgstr "Graniţe naţionale"
-#: client/gui-gtk-2.0/menu.c:778 client/gui-win32/menu.c:337
+#: client/gui-gtk-2.0/menu.c:805 client/gui-win32/menu.c:337
msgid "City _Names"
msgstr "_Numele OraÅŸelor"
-#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:338
+#: client/gui-gtk-2.0/menu.c:807 client/gui-win32/menu.c:338
msgid "City G_rowth"
msgstr "C_reÅŸterea OraÅŸului"
-#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:339
+#: client/gui-gtk-2.0/menu.c:809 client/gui-win32/menu.c:339
msgid "City _Productions"
msgstr "_Producţia Oraşelor"
-#: client/gui-gtk-2.0/menu.c:784 client/gui-sdl/optiondlg.c:1719
+#: client/gui-gtk-2.0/menu.c:811
+#, fuzzy
+msgid "City Buy Cost"
+msgstr "Cost total: "
+
+#: client/gui-gtk-2.0/menu.c:813
+#, fuzzy
+msgid "City Traderoutes"
+msgstr "Rute comerciale : "
+
+#: client/gui-gtk-2.0/menu.c:815 client/gui-sdl/optiondlg.c:1719
msgid "Draw city worker map grid"
msgstr "Desenează harta de lucru a oraşului"
-#: client/gui-gtk-2.0/menu.c:788 client/gui-sdl/optiondlg.c:1635
+#: client/gui-gtk-2.0/menu.c:819 client/gui-sdl/optiondlg.c:1635
#: client/gui-win32/menu.c:340 client/gui-xaw/menu.c:148
#: client/gui-xaw/menu.c:246 manual/civmanual.c:220 data/helpdata.txt:1220
msgid "Terrain"
msgstr "Teren"
-#: client/gui-gtk-2.0/menu.c:790 client/gui-win32/menu.c:341
+#: client/gui-gtk-2.0/menu.c:821 client/gui-win32/menu.c:341
#: client/gui-xaw/menu.c:149
msgid "Coastline"
msgstr "Linie de Coastă"
-#: client/gui-gtk-2.0/menu.c:796 client/gui-win32/menu.c:343
+#: client/gui-gtk-2.0/menu.c:827 client/gui-win32/menu.c:343
msgid "Roads & Rails"
msgstr "Străzi şi Căi Ferate"
-#: client/gui-gtk-2.0/menu.c:800 client/gui-sdl/optiondlg.c:1933
+#: client/gui-gtk-2.0/menu.c:831 client/gui-sdl/optiondlg.c:1933
#: client/gui-win32/menu.c:345 client/gui-xaw/menu.c:152
msgid "Mines"
msgstr "Mine"
-#: client/gui-gtk-2.0/menu.c:802 client/gui-win32/menu.c:346
+#: client/gui-gtk-2.0/menu.c:833 client/gui-win32/menu.c:346
msgid "Fortress & Airbase"
msgstr "Fortăreţe & Piste de Aterizare"
-#: client/gui-gtk-2.0/menu.c:804 client/gui-win32/menu.c:348
+#: client/gui-gtk-2.0/menu.c:835 client/gui-win32/menu.c:348
#: client/gui-xaw/menu.c:154
msgid "Specials"
msgstr "Speciale"
-#: client/gui-gtk-2.0/menu.c:806 client/gui-win32/menu.c:349
+#: client/gui-gtk-2.0/menu.c:837 client/gui-win32/menu.c:349
#: client/gui-xaw/menu.c:155
msgid "Pollution & Fallout"
msgstr "Poluare & Contaminare Radioactivă"
-#: client/gui-gtk-2.0/menu.c:812 client/gui-win32/menu.c:352
+#: client/gui-gtk-2.0/menu.c:843 client/gui-win32/menu.c:352
#: client/gui-xaw/menu.c:158
msgid "Focus Unit"
msgstr "Focalizare unitate"
-#: client/gui-gtk-2.0/menu.c:814 client/gui-sdl/optiondlg.c:1854
+#: client/gui-gtk-2.0/menu.c:845 client/gui-sdl/optiondlg.c:1854
#: client/gui-win32/menu.c:353 client/gui-xaw/menu.c:159
msgid "Fog of War"
msgstr "Ceaţă de război"
-#: client/gui-gtk-2.0/menu.c:818
+#: client/gui-gtk-2.0/menu.c:849
msgid "_Full Screen"
msgstr "Mod pe tot ecranul"
-#: client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/menu.c:853
msgid "_Center View"
msgstr "_Centrează Vizualizarea"
-#: client/gui-gtk-2.0/menu.c:825 client/gui-win32/menu.c:358
+#: client/gui-gtk-2.0/menu.c:856 client/gui-win32/menu.c:358
msgid "_Orders"
msgstr "_Ordine"
-#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
-#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
-#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
-#: client/gui-gtk-2.0/menu.c:855 client/gui-gtk-2.0/menu.c:857
-#: client/gui-gtk-2.0/menu.c:859 client/gui-gtk-2.0/menu.c:861
-#: client/gui-gtk-2.0/menu.c:863 client/gui-gtk-2.0/menu.c:865
-#: client/gui-gtk-2.0/menu.c:867 client/gui-gtk-2.0/menu.c:869
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875 client/gui-gtk-2.0/menu.c:877
-#: client/gui-gtk-2.0/menu.c:879 client/gui-gtk-2.0/menu.c:881
-#: client/gui-gtk-2.0/menu.c:883 client/gui-gtk-2.0/menu.c:885
-#: client/gui-gtk-2.0/menu.c:887 client/gui-gtk-2.0/menu.c:889
-#: client/gui-gtk-2.0/menu.c:891 client/gui-gtk-2.0/menu.c:893
-#: client/gui-gtk-2.0/menu.c:895 client/gui-gtk-2.0/menu.c:897
-#: client/gui-gtk-2.0/menu.c:899 client/gui-gtk-2.0/menu.c:901
-#: client/gui-gtk-2.0/menu.c:903 data/Freeciv.in:2029
+#: client/gui-gtk-2.0/menu.c:858 client/gui-gtk-2.0/menu.c:860
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:864
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:868
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:872
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:876
+#: client/gui-gtk-2.0/menu.c:878 client/gui-gtk-2.0/menu.c:880
+#: client/gui-gtk-2.0/menu.c:882 client/gui-gtk-2.0/menu.c:884
+#: client/gui-gtk-2.0/menu.c:886 client/gui-gtk-2.0/menu.c:888
+#: client/gui-gtk-2.0/menu.c:890 client/gui-gtk-2.0/menu.c:892
+#: client/gui-gtk-2.0/menu.c:894 client/gui-gtk-2.0/menu.c:896
+#: client/gui-gtk-2.0/menu.c:898 client/gui-gtk-2.0/menu.c:900
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906 client/gui-gtk-2.0/menu.c:908
+#: client/gui-gtk-2.0/menu.c:910 client/gui-gtk-2.0/menu.c:912
+#: client/gui-gtk-2.0/menu.c:914 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:918 client/gui-gtk-2.0/menu.c:920
+#: client/gui-gtk-2.0/menu.c:922 client/gui-gtk-2.0/menu.c:924
+#: client/gui-gtk-2.0/menu.c:926 client/gui-gtk-2.0/menu.c:928
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
+#: client/gui-gtk-2.0/menu.c:946 data/Freeciv.in:2029
msgid "Orders"
msgstr "Ordine"
-#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:1444
+#: client/gui-gtk-2.0/menu.c:860 client/gui-gtk-2.0/menu.c:1489
#: client/gui-win32/menu.c:359
msgid "_Build City"
msgstr "_ConstruieÅŸte OraÅŸ"
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:1466
-#: client/gui-gtk-2.0/menu.c:1472 client/gui-win32/menu.c:360
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:1511
+#: client/gui-gtk-2.0/menu.c:1517 client/gui-win32/menu.c:360
msgid "Build _Road"
msgstr "ConstruieÅŸte D_rum"
-#: client/gui-gtk-2.0/menu.c:833 client/gui-gtk-2.0/menu.c:1360
+#: 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 "Construieşte _irigaţii"
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:1361
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:1406
#: client/gui-win32/menu.c:362
msgid "Build _Mine"
msgstr "Construieşte _mină"
-#: client/gui-gtk-2.0/menu.c:837 client/gui-gtk-2.0/menu.c:1362
+#: client/gui-gtk-2.0/menu.c:868 client/gui-gtk-2.0/menu.c:1407
msgid "Transf_orm Terrain"
msgstr "_Transformă Terenul"
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:1508
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:1553
#: client/gui-win32/menu.c:364
msgid "Build _Fortress"
msgstr "Construieşte _Fortificaţii"
-#: client/gui-gtk-2.0/menu.c:841 client/gui-win32/menu.c:365
+#: client/gui-gtk-2.0/menu.c:872 client/gui-win32/menu.c:365
msgid "Build Airbas_e"
msgstr "Construieşte Pistă de _aterizare"
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:1514
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:1559
#: client/gui-win32/menu.c:366
msgid "Clean _Pollution"
msgstr "Curăţa _Poluarea"
-#: client/gui-gtk-2.0/menu.c:845 client/gui-win32/menu.c:367
+#: client/gui-gtk-2.0/menu.c:876 client/gui-win32/menu.c:367
msgid "Clean _Nuclear Fallout"
msgstr "Îndepărteaza Contaminaţia _Radioactivă"
-#: client/gui-gtk-2.0/menu.c:849 client/gui-win32/menu.c:369
+#: client/gui-gtk-2.0/menu.c:880 client/gui-win32/menu.c:369
msgid "_Sentry"
msgstr "Pa_ză"
-#: client/gui-gtk-2.0/menu.c:855 client/gui-win32/menu.c:372
+#: client/gui-gtk-2.0/menu.c:886 client/gui-win32/menu.c:372
msgid "Make _Homecity"
msgstr "Nou oraÅŸ _natal"
-#: client/gui-gtk-2.0/menu.c:857 client/gui-win32/menu.c:373
+#: client/gui-gtk-2.0/menu.c:888 client/gui-win32/menu.c:373
msgid "_Load"
msgstr "Încarcă"
-#: client/gui-gtk-2.0/menu.c:859
+#: client/gui-gtk-2.0/menu.c:890
msgid "_Unload Transporter"
msgstr "Descarcă transportor"
-#: client/gui-gtk-2.0/menu.c:861 client/gui-win32/menu.c:374
+#: client/gui-gtk-2.0/menu.c:892 client/gui-win32/menu.c:374
msgid "_Unload"
msgstr "_Descarcă"
-#: client/gui-gtk-2.0/menu.c:863 client/gui-win32/menu.c:375
+#: client/gui-gtk-2.0/menu.c:894 client/gui-win32/menu.c:375
msgid "Wake up o_thers"
msgstr "_Trezeşte pe ceilalţi"
-#: client/gui-gtk-2.0/menu.c:867
+#: client/gui-gtk-2.0/menu.c:898
msgid "_Auto Settler"
msgstr "Colonist _Autonom"
-#: client/gui-gtk-2.0/menu.c:869 client/gui-win32/menu.c:378
+#: client/gui-gtk-2.0/menu.c:900 client/gui-win32/menu.c:378
msgid "Auto E_xplore"
msgstr "E_xplorează Autonom"
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906
msgid "_Connect"
msgstr "_Conectează"
-#: client/gui-gtk-2.0/menu.c:871 client/gui-win32/menu.c:380
+#: client/gui-gtk-2.0/menu.c:902 client/gui-win32/menu.c:380
msgid "_Road"
msgstr "D_rum"
-#: client/gui-gtk-2.0/menu.c:873 client/gui-win32/menu.c:381
+#: client/gui-gtk-2.0/menu.c:904 client/gui-win32/menu.c:381
msgid "Rai_l"
msgstr "Ca_le ferată"
-#: client/gui-gtk-2.0/menu.c:875 client/gui-win32/menu.c:382
+#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:382
msgid "_Irrigate"
msgstr "_irigaţie"
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
msgid "Go _to"
msgstr "Mergi la"
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
msgid "_Build city"
msgstr "ConstruieÅŸte OraÅŸ"
-#: client/gui-gtk-2.0/menu.c:879
+#: client/gui-gtk-2.0/menu.c:910
msgid "Patrol (_Q)"
msgstr "Patrulează (_Q)"
-#: client/gui-gtk-2.0/menu.c:881 client/gui-win32/menu.c:385
+#: client/gui-gtk-2.0/menu.c:912 client/gui-win32/menu.c:385
msgid "_Go to"
msgstr "Mer_gi la"
-#: client/gui-gtk-2.0/menu.c:883
+#: client/gui-gtk-2.0/menu.c:914
msgid "Go\\/Airlift to City"
msgstr "Mergi\\transportă aerian la oraşul"
-#: client/gui-gtk-2.0/menu.c:885 client/gui-sdl/menu.c:450
+#: client/gui-gtk-2.0/menu.c:916 client/gui-sdl/menu.c:450
#: client/gui-win32/menu.c:387 client/gui-xaw/menu.c:203
msgid "Return to nearest city"
msgstr "ÃŽnapoiere la cel mai apropiat oraÅŸ"
-#: client/gui-gtk-2.0/menu.c:889 client/gui-win32/menu.c:389
+#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:389
#: client/gui-xaw/menu.c:205
msgid "Disband Unit"
msgstr "Dizolvă unitatea"
-#: client/gui-gtk-2.0/menu.c:891 client/gui-sdl/citydlg.c:532
+#: client/gui-gtk-2.0/menu.c:922 client/gui-sdl/citydlg.c:532
#: data/Freeciv.in:1186
msgid "Upgrade unit"
msgstr "Modernizează unitatea"
-#: client/gui-gtk-2.0/menu.c:893
+#: client/gui-gtk-2.0/menu.c:924
msgid "Diplomat\\/Spy Actions"
msgstr "Acţiuni de Diplomat\\/Spion"
-#: client/gui-gtk-2.0/menu.c:895 client/gui-sdl/menu.c:399
+#: client/gui-gtk-2.0/menu.c:926 client/gui-sdl/menu.c:399
#: client/gui-win32/menu.c:391 client/gui-xaw/menu.c:209
msgid "Explode Nuclear"
msgstr "Explodează bomba atomică"
-#: client/gui-gtk-2.0/menu.c:899
-msgid "Select same type"
-msgstr "Alege acelaÅŸi tip"
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/cityrep.c:882
+msgid "Select"
+msgstr "Selectează"
-#: client/gui-gtk-2.0/menu.c:901 client/gui-win32/menu.c:393
+#: client/gui-gtk-2.0/menu.c:934
+#, fuzzy
+msgid "Single"
+msgstr "Junglă"
+
+#: client/gui-gtk-2.0/menu.c:936
+msgid "Same Type On Tile"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:938
+msgid "All On Tile"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:940
+msgid "Same Type On Continent"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:942
+msgid "Same Type Everywhere"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:393
msgid "_Wait"
msgstr "_Aşteaptă"
-#: client/gui-gtk-2.0/menu.c:903 client/gui-win32/menu.c:394
+#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:394
#: client/gui-xaw/menu.c:213
msgid "Done"
msgstr "Gata"
-#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:398
+#: client/gui-gtk-2.0/menu.c:949 client/gui-win32/menu.c:398
msgid "_Reports"
msgstr "_Raporturi"
-#: client/gui-gtk-2.0/menu.c:908 client/gui-gtk-2.0/menu.c:910
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:914
-#: client/gui-gtk-2.0/menu.c:916 client/gui-gtk-2.0/menu.c:918
-#: client/gui-gtk-2.0/menu.c:920 client/gui-gtk-2.0/menu.c:922
-#: client/gui-gtk-2.0/menu.c:924 client/gui-gtk-2.0/menu.c:926
-#: client/gui-gtk-2.0/menu.c:928 client/gui-gtk-2.0/menu.c:930
-#: client/gui-gtk-2.0/menu.c:932 data/Freeciv.in:2030
+#: client/gui-gtk-2.0/menu.c:951 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:957
+#: client/gui-gtk-2.0/menu.c:959 client/gui-gtk-2.0/menu.c:961
+#: client/gui-gtk-2.0/menu.c:963 client/gui-gtk-2.0/menu.c:965
+#: client/gui-gtk-2.0/menu.c:967 client/gui-gtk-2.0/menu.c:969
+#: client/gui-gtk-2.0/menu.c:971 client/gui-gtk-2.0/menu.c:973
+#: client/gui-gtk-2.0/menu.c:975 data/Freeciv.in:2030
msgid "Reports"
msgstr "Raporturi"
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:958
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:1001
#: client/gui-win32/menu.c:400 client/gui-win32/menu.c:425
msgid "_Units"
msgstr "_Unităţi"
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/menu.c:914 client/gui-win32/menu.c:402
+#: client/gui-gtk-2.0/menu.c:957 client/gui-win32/menu.c:402
#, fuzzy
msgid "_Nations"
msgstr "_Naţiuni"
-#: client/gui-gtk-2.0/menu.c:918 client/gui-win32/menu.c:403
+#: client/gui-gtk-2.0/menu.c:961 client/gui-win32/menu.c:403
msgid "_Economy"
msgstr "_Economia"
#. TRANS: Research report action
-#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:405
+#: client/gui-gtk-2.0/menu.c:963 client/gui-win32/menu.c:405
#, fuzzy
msgid "_Research"
msgstr "_Cercetează"
-#: client/gui-gtk-2.0/menu.c:924 client/gui-win32/menu.c:407
+#: client/gui-gtk-2.0/menu.c:967 client/gui-win32/menu.c:407
msgid "_Wonders of the World"
msgstr "_Minunile Lumi"
-#: client/gui-gtk-2.0/menu.c:926 client/gui-win32/menu.c:408
+#: client/gui-gtk-2.0/menu.c:969 client/gui-win32/menu.c:408
msgid "_Top Five Cities"
msgstr "_Cele 5 mari OraÅŸe"
-#: client/gui-gtk-2.0/menu.c:928 client/gui-win32/menu.c:409
+#: client/gui-gtk-2.0/menu.c:971 client/gui-win32/menu.c:409
msgid "_Messages"
msgstr "_Mesaje"
-#: client/gui-gtk-2.0/menu.c:930 client/gui-win32/menu.c:410
+#: client/gui-gtk-2.0/menu.c:973 client/gui-win32/menu.c:410
msgid "_Demographics"
msgstr "_Demografia"
-#: client/gui-gtk-2.0/menu.c:932 client/gui-gtk-2.0/plrdlg.c:471
+#: client/gui-gtk-2.0/menu.c:975 client/gui-gtk-2.0/plrdlg.c:354
#: client/gui-win32/menu.c:411
msgid "_Spaceship"
msgstr "_Navă spaţială"
-#: client/gui-gtk-2.0/menu.c:936 client/gui-win32/menu.c:415
+#: client/gui-gtk-2.0/menu.c:979 client/gui-win32/menu.c:415
msgid "_Help"
msgstr "_Ajutor"
-#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
-#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
-#: client/gui-gtk-2.0/menu.c:946 client/gui-gtk-2.0/menu.c:948
-#: client/gui-gtk-2.0/menu.c:950 client/gui-gtk-2.0/menu.c:952
-#: client/gui-gtk-2.0/menu.c:954 client/gui-gtk-2.0/menu.c:956
-#: client/gui-gtk-2.0/menu.c:958 client/gui-gtk-2.0/menu.c:960
-#: client/gui-gtk-2.0/menu.c:962 client/gui-gtk-2.0/menu.c:964
-#: client/gui-gtk-2.0/menu.c:966 client/gui-gtk-2.0/menu.c:968
-#: client/gui-gtk-2.0/menu.c:970 client/gui-gtk-2.0/menu.c:972
-#: client/gui-gtk-2.0/menu.c:974 client/gui-gtk-2.0/menu.c:976
-#: client/gui-gtk-2.0/menu.c:978 client/gui-gtk-2.0/menu.c:980
+#: client/gui-gtk-2.0/menu.c:981 client/gui-gtk-2.0/menu.c:983
+#: client/gui-gtk-2.0/menu.c:985 client/gui-gtk-2.0/menu.c:987
+#: client/gui-gtk-2.0/menu.c:989 client/gui-gtk-2.0/menu.c:991
+#: client/gui-gtk-2.0/menu.c:993 client/gui-gtk-2.0/menu.c:995
+#: client/gui-gtk-2.0/menu.c:997 client/gui-gtk-2.0/menu.c:999
+#: client/gui-gtk-2.0/menu.c:1001 client/gui-gtk-2.0/menu.c:1003
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-gtk-2.0/menu.c:1007
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-gtk-2.0/menu.c:1011
+#: client/gui-gtk-2.0/menu.c:1013 client/gui-gtk-2.0/menu.c:1015
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-gtk-2.0/menu.c:1019
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-gtk-2.0/menu.c:1023
#: client/gui-gtk-2.0/repodlgs.c:313 client/gui-win32/citydlg.c:1077
#: client/gui-win32/repodlgs.c:289 client/gui-win32/wldlg.c:846
#: data/Freeciv.in:1466 data/Freeciv.in:2031 data/Freeciv.in:2101
@@ -12293,119 +12506,119 @@ msgstr "_Ajutor"
msgid "Help"
msgstr "Ajutor"
-#: client/gui-gtk-2.0/menu.c:940 client/gui-win32/menu.c:416
+#: client/gui-gtk-2.0/menu.c:983 client/gui-win32/menu.c:416
msgid "Language_s"
msgstr "Limbaje"
-#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/menu.c:417
+#: client/gui-gtk-2.0/menu.c:985 client/gui-win32/menu.c:417
msgid "Co_nnecting"
msgstr "Se co_nectează"
-#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:418
+#: client/gui-gtk-2.0/menu.c:987 client/gui-win32/menu.c:418
msgid "C_ontrols"
msgstr "C_ontrols"
-#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:419
+#: client/gui-gtk-2.0/menu.c:989 client/gui-win32/menu.c:419
msgid "C_hatline"
msgstr "Linie de c_hat"
-#: client/gui-gtk-2.0/menu.c:948 client/gui-win32/menu.c:420
+#: client/gui-gtk-2.0/menu.c:991 client/gui-win32/menu.c:420
msgid "_Worklist Editor"
msgstr "Editor plan de lucru"
-#: client/gui-gtk-2.0/menu.c:950 client/gui-win32/menu.c:421
+#: client/gui-gtk-2.0/menu.c:993 client/gui-win32/menu.c:421
msgid "Citizen _Management"
msgstr "Ad_ministrarea cetăţenilor"
-#: client/gui-gtk-2.0/menu.c:952 client/gui-win32/menu.c:422
+#: client/gui-gtk-2.0/menu.c:995 client/gui-win32/menu.c:422
msgid "_Playing"
msgstr "în joc"
-#: client/gui-gtk-2.0/menu.c:956 client/gui-win32/menu.c:424
+#: client/gui-gtk-2.0/menu.c:999 client/gui-win32/menu.c:424
msgid "City _Improvements"
msgstr "Înbunătăţ_iri oraş"
-#: client/gui-gtk-2.0/menu.c:960 client/gui-win32/menu.c:426
+#: client/gui-gtk-2.0/menu.c:1003 client/gui-win32/menu.c:426
msgid "Com_bat"
msgstr "Luptă"
-#: client/gui-gtk-2.0/menu.c:962 client/gui-win32/menu.c:427
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-win32/menu.c:427
msgid "_ZOC"
msgstr "_ZDC"
-#: client/gui-gtk-2.0/menu.c:964 client/gui-win32/menu.c:428
+#: client/gui-gtk-2.0/menu.c:1007 client/gui-win32/menu.c:428
msgid "Techno_logy"
msgstr "Tehno_logie"
-#: client/gui-gtk-2.0/menu.c:966 client/gui-win32/menu.c:429
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-win32/menu.c:429
msgid "_Terrain"
msgstr "_Teren"
-#: client/gui-gtk-2.0/menu.c:968 client/gui-win32/menu.c:430
+#: client/gui-gtk-2.0/menu.c:1011 client/gui-win32/menu.c:430
msgid "Won_ders"
msgstr "_Minuni"
-#: client/gui-gtk-2.0/menu.c:972 client/gui-win32/menu.c:432
+#: client/gui-gtk-2.0/menu.c:1015 client/gui-win32/menu.c:432
msgid "Happin_ess"
msgstr "_Fericire"
-#: client/gui-gtk-2.0/menu.c:974 client/gui-win32/menu.c:433
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-win32/menu.c:433
msgid "Space _Race"
msgstr "_Cursa în Spaţiu"
-#: client/gui-gtk-2.0/menu.c:978 client/gui-win32/menu.c:435
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-win32/menu.c:435
msgid "_Copying"
msgstr "_copiez"
-#: client/gui-gtk-2.0/menu.c:980 client/gui-win32/menu.c:436
+#: client/gui-gtk-2.0/menu.c:1023 client/gui-win32/menu.c:436
msgid "_About"
msgstr "_Despre"
-#: client/gui-gtk-2.0/menu.c:1264
+#: client/gui-gtk-2.0/menu.c:1307
#, c-format
msgid "%s..."
msgstr "%s..."
-#: client/gui-gtk-2.0/menu.c:1352
+#: client/gui-gtk-2.0/menu.c:1397
#, c-format
msgid "Change to %s (_I)"
msgstr "Schimbă în %s (_I)"
-#: client/gui-gtk-2.0/menu.c:1353
+#: client/gui-gtk-2.0/menu.c:1398
#, c-format
msgid "Change to %s (_M)"
msgstr "Schimbă în %s (_M)"
-#: client/gui-gtk-2.0/menu.c:1354
+#: client/gui-gtk-2.0/menu.c:1399
#, c-format
msgid "Transf_orm to %s"
msgstr "Transf_ormează în %s"
-#: client/gui-gtk-2.0/menu.c:1427
+#: client/gui-gtk-2.0/menu.c:1472
msgid "Help _Build Wonder"
msgstr "Ajută la _Construcţia Minuni"
-#: client/gui-gtk-2.0/menu.c:1441
+#: client/gui-gtk-2.0/menu.c:1486
msgid "Add to City (_B)"
msgstr "Adaugă la oraş (_B)"
-#: client/gui-gtk-2.0/menu.c:1449
+#: client/gui-gtk-2.0/menu.c:1494
msgid "Make Trade _Route"
msgstr "Stabileşte rută comercială"
-#: client/gui-gtk-2.0/menu.c:1463
+#: client/gui-gtk-2.0/menu.c:1508
msgid "Build _Railroad"
msgstr "Crează cale fe_rată"
-#: client/gui-gtk-2.0/menu.c:1486
+#: client/gui-gtk-2.0/menu.c:1531
msgid "Bu_ild Farmland"
msgstr "Crează teren agricol"
-#: client/gui-gtk-2.0/menu.c:1506
+#: client/gui-gtk-2.0/menu.c:1551
msgid "_Fortify"
msgstr "_Fortifică"
-#: client/gui-gtk-2.0/menu.c:1512
+#: client/gui-gtk-2.0/menu.c:1557
msgid "_Paradrop"
msgstr "_Paraşutează"
@@ -12439,13 +12652,32 @@ msgstr "Mes"
msgid "Pop"
msgstr "Pop"
-#: client/gui-gtk-2.0/messagewin.c:155 client/gui-sdl/messagewin.c:247
+#: client/gui-gtk-2.0/messagewin.c:186 client/gui-sdl/messagewin.c:247
#: client/gui-win32/messagewin.c:132 client/gui-xaw/menu.c:228
#: data/Freeciv.in:3273 data/Freeciv.in:3274 data/Freeciv.in:3283
msgid "Messages"
msgstr "Mesaje"
-#: client/gui-gtk-2.0/plrdlg.c:330
+#: client/gui-gtk-2.0/plrdlg.c:317
+msgid "_Meet"
+msgstr "_Contactează"
+
+#: client/gui-gtk-2.0/plrdlg.c:323
+#, fuzzy
+msgid "Cancel _Treaty"
+msgstr "_Renunţă la Tratat"
+
+#: client/gui-gtk-2.0/plrdlg.c:329
+#, fuzzy
+msgid "_Withdraw Vision"
+msgstr "Retrage vedere"
+
+#: client/gui-gtk-2.0/plrdlg.c:348
+#, fuzzy
+msgid "_Report"
+msgstr "_Raporturi"
+
+#: client/gui-gtk-2.0/plrdlg.c:386
msgid "?show:Dead Players"
msgstr "?show:Jucători morţi"
@@ -12453,268 +12685,271 @@ msgstr "?show:Jucători morţi"
#. TRANS: Nations report action
#. TRANS: Nations report title
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/plrdlg.c:350 client/gui-sdl/mapctrl.c:1580
+#: client/gui-gtk-2.0/plrdlg.c:406 client/gui-sdl/mapctrl.c:1580
#: client/gui-sdl/plrdlg.c:608 client/gui-win32/plrdlg.c:344
#: client/gui-xaw/menu.c:221 data/Freeciv.in:3192 data/Freeciv.in:3193
msgid "Nations"
msgstr "Naţiuni"
-#: client/gui-gtk-2.0/plrdlg.c:443
-msgid "_Intelligence"
-msgstr "Sp_ionaj"
-
-#: client/gui-gtk-2.0/plrdlg.c:450
-msgid "_Meet"
-msgstr "_Contactează"
-
-#: client/gui-gtk-2.0/plrdlg.c:457
+#: client/gui-gtk-2.0/plrdlg.c:511
#, fuzzy
-msgid "Cancel _Treaty"
-msgstr "_Renunţă la Tratat"
+msgid "Di_plomacy"
+msgstr "Diplomaţie"
-#: client/gui-gtk-2.0/plrdlg.c:464
-msgid "_Withdraw vision"
-msgstr "Retrage vedere"
+#: client/gui-gtk-2.0/plrdlg.c:516
+msgid "_Intelligence"
+msgstr "Sp_ionaj"
-#: client/gui-gtk-2.0/plrdlg.c:495
+#: client/gui-gtk-2.0/plrdlg.c:526
msgid "_AI"
msgstr "_AI"
-#: client/gui-gtk-2.0/plrdlg.c:501
+#: client/gui-gtk-2.0/plrdlg.c:532
msgid "_Toggle AI Mode"
msgstr "Comu_tă în modul AI"
-#: client/gui-gtk-2.0/pages.c:208
+#: client/gui-gtk-2.0/pages.c:221
msgid "Start _New Game"
msgstr "ÃŽncepe un joc _nou"
-#: client/gui-gtk-2.0/pages.c:214
+#: client/gui-gtk-2.0/pages.c:227
msgid "Start _Scenario Game"
msgstr "ÃŽncepe un _scenariu de joc"
-#: client/gui-gtk-2.0/pages.c:220
+#: client/gui-gtk-2.0/pages.c:233
msgid "_Load Saved Game"
msgstr "Încarcă un joc salvat"
-#: client/gui-gtk-2.0/pages.c:229
+#: client/gui-gtk-2.0/pages.c:239
msgid "C_onnect to Network Game"
msgstr "C_onexiune la joc în reţea"
-#: client/gui-gtk-2.0/pages.c:236
+#: client/gui-gtk-2.0/pages.c:247
msgid "Connect to Gaming _Zone"
msgstr "Concetează-te la Gaming _Zone"
-#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:300
#: client/gui-xaw/connectdlg.c:326
msgid "Passwords don't match, enter password."
msgstr "Parolele diferă, introduceţi parola."
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:779 client/gui-gtk-2.0/pages.c:820
+#: client/gui-win32/connectdlg.c:916
msgid "Server Name"
msgstr "Nume Server"
-#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
+#: 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
+#: data/Freeciv.in:96
msgid "Port"
msgstr "Port"
-#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
+#: client/gui-win32/connectdlg.c:917
msgid "Version"
msgstr "Versiune"
-#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
-#: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
+#: 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
msgid "Status"
msgstr "Stare"
-#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
-#: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
+#: 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
msgid "Players"
msgstr "Jucători"
-#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
+#: client/gui-win32/connectdlg.c:918
msgid "Comment"
msgstr "Comentariu"
-#: client/gui-gtk-2.0/pages.c:747
+#: client/gui-gtk-2.0/pages.c:786
msgid "Local _Area Network"
msgstr "Reţea loc_ală"
-#: client/gui-gtk-2.0/pages.c:783
+#: client/gui-gtk-2.0/pages.c:827
msgid "Internet _Metaserver"
msgstr "Internet _Metaserver"
-#: client/gui-gtk-2.0/pages.c:817
+#: client/gui-gtk-2.0/pages.c:864
msgid "_Host:"
msgstr "_Gazdă:"
-#: client/gui-gtk-2.0/pages.c:834
+#: client/gui-gtk-2.0/pages.c:881
msgid "_Port:"
msgstr "_Port:"
-#: client/gui-gtk-2.0/pages.c:851
+#: client/gui-gtk-2.0/pages.c:898
msgid "_Login:"
msgstr "_Login:"
-#: client/gui-gtk-2.0/pages.c:869
+#: client/gui-gtk-2.0/pages.c:916
msgid "Pass_word:"
msgstr "Parola:"
-#: client/gui-gtk-2.0/pages.c:887
+#: client/gui-gtk-2.0/pages.c:934
msgid "Conf_irm Password:"
msgstr "Conf_irmaţi parola:"
-#: client/gui-gtk-2.0/pages.c:912
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: 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/wldlg.c:800 client/gui-win32/wldlg.c:806
+msgid "Type"
+msgstr "Tipul"
+
+#: client/gui-gtk-2.0/pages.c:952 client/gui-win32/plrdlg.c:337
+#: data/Freeciv.in:88
+msgid "Host"
+msgstr "Host"
+
+#: client/gui-gtk-2.0/pages.c:981
msgid "C_onnect"
msgstr "_Conectează"
-#: client/gui-gtk-2.0/pages.c:1142
+#: client/gui-gtk-2.0/pages.c:1211
#, c-format
msgid "Connection name: %s"
msgstr "Numele conexiunii: %s"
-#: client/gui-gtk-2.0/pages.c:1145
+#: client/gui-gtk-2.0/pages.c:1214
#, c-format
msgid "Player name: %s"
msgstr "Nume jucător: %s"
-#: client/gui-gtk-2.0/pages.c:1150
+#: client/gui-gtk-2.0/pages.c:1219
#, c-format
msgid "Host: %s"
msgstr "Gazdă: %s"
-#: client/gui-gtk-2.0/pages.c:1158
+#: client/gui-gtk-2.0/pages.c:1227
msgid "Player/conn info"
msgstr "Informaţii jucător/conexiune"
-#: client/gui-gtk-2.0/pages.c:1185
+#: client/gui-gtk-2.0/pages.c:1254
#, c-format
msgid "%s info"
msgstr "info %s "
-#: client/gui-gtk-2.0/pages.c:1196
+#: client/gui-gtk-2.0/pages.c:1265
msgid "Toggle player ready"
msgstr "Schimbă starea jucătorului"
-#: client/gui-gtk-2.0/pages.c:1204
+#: client/gui-gtk-2.0/pages.c:1273
msgid "Pick nation"
msgstr "Alege naţiunea"
-#: client/gui-gtk-2.0/pages.c:1214
+#: client/gui-gtk-2.0/pages.c:1283
msgid "Observe this player"
msgstr "Observă acest jucător"
-#: client/gui-gtk-2.0/pages.c:1221
+#: client/gui-gtk-2.0/pages.c:1290
msgid "Take this player"
msgstr "Preluaţi acest jucător"
-#: client/gui-gtk-2.0/pages.c:1238
+#: client/gui-gtk-2.0/pages.c:1307
msgid "Cut connection"
msgstr "Terminaţi conexiunea"
-#: client/gui-gtk-2.0/pages.c:1248
+#: client/gui-gtk-2.0/pages.c:1317
msgid "Aitoggle player"
msgstr "Schimbă modul AI pentru jucător"
-#: client/gui-gtk-2.0/pages.c:1257
+#: client/gui-gtk-2.0/pages.c:1326
msgid "Remove player"
msgstr "Îndepărtează jucătorul"
-#: client/gui-gtk-2.0/pages.c:1268
+#: client/gui-gtk-2.0/pages.c:1337
msgid "Give info access"
msgstr "Oferă acces info"
-#: client/gui-gtk-2.0/pages.c:1276
+#: client/gui-gtk-2.0/pages.c:1345
msgid "Give ctrl access"
msgstr "Oferiţi acces ctrl"
#. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1338
+#: client/gui-gtk-2.0/pages.c:1407
#, c-format
msgid "Put on %s"
msgstr "Pune în %s"
-#: client/gui-gtk-2.0/pages.c:1442
+#: client/gui-gtk-2.0/pages.c:1511
#, fuzzy
msgid "Number of _Players (including AI):"
msgstr "_Număr de jucători (inclusiv AI):"
-#: client/gui-gtk-2.0/pages.c:1465
+#: client/gui-gtk-2.0/pages.c:1534
#, fuzzy
msgid "AI Skill _Level:"
msgstr "Nivel de dificultate _AI:"
-#: client/gui-gtk-2.0/pages.c:1481
+#: client/gui-gtk-2.0/pages.c:1550
#, fuzzy
msgid "Ruleset _Version:"
msgstr "P_resetări:"
-#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
msgid "_More Game Options..."
msgstr "_Opţiuni suplimentare pentru joc..."
-#: client/gui-gtk-2.0/pages.c:1514
+#: client/gui-gtk-2.0/pages.c:1583
msgid "Record"
msgstr "ÃŽnregistrare"
-#: client/gui-gtk-2.0/pages.c:1519
+#: client/gui-gtk-2.0/pages.c:1588
msgid "Rating"
msgstr "Rating"
-#: client/gui-gtk-2.0/pages.c:1525
+#: client/gui-gtk-2.0/pages.c:1594
msgid "Ready"
msgstr "Gata"
-#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
-#: data/nation/slovakian.ruleset:26
-msgid "Leader"
-msgstr "Conducător"
+#: client/gui-gtk-2.0/pages.c:1601
+#, fuzzy
+msgid "?player:Leader"
+msgstr "?Player:Nume"
-#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1732 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:1752
+#: client/gui-gtk-2.0/pages.c:1824
msgid "Choose Saved Game to _Load:"
msgstr "Alegeţi jocu_l pentru încărcat"
-#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
-#: client/gui-gtk-2.0/pages.c:2375
+#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
+#: client/gui-gtk-2.0/pages.c:2451
msgid "_Browse..."
msgstr "Răsfoieşte..."
-#: client/gui-gtk-2.0/pages.c:1839
+#: client/gui-gtk-2.0/pages.c:1911
msgid "Choose a Scenario"
msgstr "Alegeţi un scenariu"
-#: client/gui-gtk-2.0/pages.c:1926
+#: client/gui-gtk-2.0/pages.c:1998
msgid "Choose a _Scenario:"
msgstr "Alegeţi un _scenariu:"
-#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
-#: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
-#: client/gui-win32/wldlg.c:806
-msgid "Type"
-msgstr "Tipul"
-
-#: client/gui-gtk-2.0/pages.c:2101
+#: client/gui-gtk-2.0/pages.c:2173
msgid "Choose a _nation to play:"
msgstr "Alegeţi o _naţiune cu care să jucaţi:"
-#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2363 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:2372 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2448 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr "Salvează joc"
-#: client/gui-gtk-2.0/pages.c:2413
+#: client/gui-gtk-2.0/pages.c:2489
msgid "Saved _Games:"
msgstr "Jocuri salvate:"
-#: client/gui-gtk-2.0/pages.c:2440
+#: client/gui-gtk-2.0/pages.c:2516
msgid "Save _Filename:"
msgstr "Nume fiÅŸier salvare:"
@@ -13065,7 +13300,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:1094
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
msgid "Back"
msgstr "ÃŽnapoi"
@@ -13074,7 +13309,7 @@ msgid "Start"
msgstr "PorneÅŸte"
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:775
+#: client/gui-win32/connectdlg.c:777
msgid "Load Game"
msgstr "Încarcă joc"
@@ -13115,12 +13350,12 @@ msgid "Make new homecity"
msgstr "Creaţi un nou oraş natal"
#: client/gui-sdl/citydlg.c:546 client/gui-sdl/citydlg.c:1418
-#: client/gui-sdl/connectdlg.c:307 client/gui-sdl/connectdlg.c:616
-#: client/gui-sdl/connectdlg.c:802 client/gui-sdl/connectdlg.c:984
+#: 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/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1039
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
#: 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 +13405,7 @@ msgstr "Cumparaţi?"
#: client/gui-sdl/diplodlg.c:1335 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:2427
+#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
#: client/gui-xaw/cityrep.c:666 client/gui-xaw/cma_fe.c:327
#: client/gui-xaw/cma_fe.c:511 client/gui-xaw/cma_fe.c:765
#: client/gui-xaw/messagedlg.c:72 client/gui-xaw/optiondlg.c:76
@@ -13186,7 +13421,7 @@ msgstr "Nu"
#: client/gui-sdl/diplodlg.c:1345 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:2427 client/gui-xaw/cityrep.c:666
+#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
#: client/gui-xaw/cma_fe.c:327 client/gui-xaw/cma_fe.c:511
#: client/gui-xaw/cma_fe.c:765 client/gui-xaw/messagedlg.c:72
#: client/gui-xaw/optiondlg.c:76 client/gui-xaw/optiondlg.c:304
@@ -13473,37 +13708,37 @@ msgstr "Aplică o singură dată"
msgid "Release city"
msgstr "Eliberează oraşul"
-#: client/gui-sdl/connectdlg.c:238
+#: client/gui-sdl/connectdlg.c:239
msgid "Creating Server List..."
msgstr "Se crează lista cu servere..."
-#: client/gui-sdl/connectdlg.c:279 client/gui-sdl/connectdlg.c:343
+#: client/gui-sdl/connectdlg.c:280 client/gui-sdl/connectdlg.c:344
#, fuzzy
msgid "No LAN servers found"
msgstr "Servere LAN"
-#: client/gui-sdl/connectdlg.c:281 client/gui-sdl/connectdlg.c:345
+#: client/gui-sdl/connectdlg.c:282 client/gui-sdl/connectdlg.c:346
msgid "No public servers found"
msgstr ""
-#: client/gui-sdl/connectdlg.c:555
+#: client/gui-sdl/connectdlg.c:556
msgid "Player Name :"
msgstr "Nume jucător :"
-#: client/gui-sdl/connectdlg.c:571
+#: client/gui-sdl/connectdlg.c:572
msgid "Freeciv Server :"
msgstr "Server Freeciv :"
-#: client/gui-sdl/connectdlg.c:588
+#: client/gui-sdl/connectdlg.c:589
msgid "Port :"
msgstr "Port :"
-#: client/gui-sdl/connectdlg.c:608 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr "Conectează"
-#: client/gui-sdl/connectdlg.c:794 client/gui-sdl/connectdlg.c:977
+#: client/gui-sdl/connectdlg.c:795 client/gui-sdl/connectdlg.c:978
#: client/gui-xaw/connectdlg.c:145
msgid "Next"
msgstr "Următorul"
@@ -13784,8 +14019,8 @@ msgid "Unable to initialize SDL library: %s"
msgstr "Nu s-a putut iniţializa biblioteca SDL: %s"
#: client/gui-sdl/graphics.c:1021
-#, c-format
-msgid "Unable to initialize SDL_ttf library: %s"
+#, fuzzy, c-format
+msgid "Unable to initialize SDL_ttf library: %s"
msgstr "Nu s-a putut iniţializa biblioteca SDL_ttf: %s"
#: client/gui-sdl/graphics.c:1058
@@ -13878,14 +14113,6 @@ msgstr "Se iniţializează clientul"
msgid "Waiting for the beginning of the game"
msgstr "Se aşteaptă începutul jocului"
-#: client/gui-sdl/gui_string.c:608
-msgid ""
-"Couldn't find stdfont.ttf file. Please link/copy/move anyunicode ttf font to "
-"data dir as stdfont.ttf"
-msgstr ""
-"Nu a fost găsit fişierul stdfont.ttf. Copiaţi/mutaţi/creaţi o legătură "
-"simbolică la orice font ttf unicode ca stdfont.ttf în directorul data"
-
#. TRANS: Future Technology
#: client/gui-sdl/gui_tilespec.c:506
msgid "FT"
@@ -14488,12 +14715,12 @@ msgid "Leave Game"
msgstr "Salvează joc"
#: client/gui-sdl/optiondlg.c:2302 client/gui-sdl/pages.c:255
-#: client/gui-win32/connectdlg.c:1098 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1100 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:963
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
msgid "Start New Game"
msgstr "PorneÅŸte joc nou"
@@ -14615,8 +14842,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:1081
-#: client/gui-win32/connectdlg.c:1089 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
+#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
msgid "Update"
msgstr "Actualizează"
@@ -15074,10 +15301,6 @@ msgstr "Schimbă Tot"
msgid "Refresh"
msgstr "Actualizează"
-#: client/gui-win32/cityrep.c:882
-msgid "Select"
-msgstr "Selectează"
-
#: client/gui-win32/cityrep.c:883
msgid "Configure"
msgstr "Configurează"
@@ -15127,55 +15350,55 @@ msgstr "Nu s-a putut încărca jocul salvat."
msgid "Verify Password"
msgstr "Verificare parolă"
-#: client/gui-win32/connectdlg.c:912 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr "Selectarea Serverului Freeciv"
-#: client/gui-win32/connectdlg.c:913
+#: client/gui-win32/connectdlg.c:915
msgid "Local Area Network"
msgstr "Reţea locală"
-#: client/gui-win32/connectdlg.c:947
+#: client/gui-win32/connectdlg.c:949
msgid "Welcome to Freeciv"
msgstr "Bun venit în Freeciv"
-#: client/gui-win32/connectdlg.c:965
+#: client/gui-win32/connectdlg.c:967
msgid "Load Saved Game"
msgstr "Încarcă joc salvat"
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
msgid "Connect To Network Game"
msgstr "Conectare la joc în reţea"
-#: client/gui-win32/connectdlg.c:977
+#: client/gui-win32/connectdlg.c:979
msgid "Choose a nation to play"
msgstr "Alegeţi o naţiune pentru a juca"
-#: client/gui-win32/connectdlg.c:1012
+#: client/gui-win32/connectdlg.c:1014
msgid "Number of players (Including AI):"
msgstr "Numărul de jucători (inclusiv AI)."
-#: client/gui-win32/connectdlg.c:1020
+#: client/gui-win32/connectdlg.c:1022
msgid "AI skill level:"
msgstr "Nivel de îndemânare AI:"
-#: client/gui-win32/connectdlg.c:1034 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
msgid "Game Options"
msgstr "Opţiuni joc"
-#: client/gui-win32/connectdlg.c:1038
+#: client/gui-win32/connectdlg.c:1040
msgid "Start Game"
msgstr "Pornesc jocul."
-#: client/gui-win32/connectdlg.c:1057
+#: client/gui-win32/connectdlg.c:1059
msgid "Login:"
msgstr "Autentificare:"
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
msgid "Host:"
msgstr "Gazdă:"
-#: client/gui-win32/connectdlg.c:1060
+#: client/gui-win32/connectdlg.c:1062
msgid "Port:"
msgstr "Port:"
@@ -15439,10 +15662,6 @@ msgid_plural "(idle %d turns)"
msgstr[0] "(inactiv %d rundă)"
msgstr[1] "(inactiv %d runde)"
-#: client/gui-win32/plrdlg.c:337 data/Freeciv.in:88
-msgid "Host"
-msgstr "Host"
-
#: client/gui-win32/plrdlg.c:355 data/Freeciv.in:3230
msgid "Intelligence"
msgstr "Informaţii"
@@ -16971,12 +17190,12 @@ msgstr ""
#: data/helpdata.txt:781
msgid ""
-" To have a diplomatic relationship with another player, you must fist "
-"establish first contact with that player. To establish first contact, you "
-"have to move one of your units next to a city or unit belonging to that "
-"player, or vice versa. Unless you establish an embassy with that player, you "
-"may again lose contact with them after a set number of turns without direct "
-"physical contact."
+" To have a diplomatic relationship with another player, you must first "
+"establish contact with that player. To establish contact, you have to move "
+"one of your units next to a city or unit belonging to that player, or vice "
+"versa. Unless you establish an embassy with that player, you may again lose "
+"contact with them after a set number of turns without direct physical "
+"contact."
msgstr ""
#: data/helpdata.txt:788
@@ -19353,7 +19572,7 @@ msgid "Communism"
msgstr "Comunismul"
#: data/default/governments.ruleset:121 data/civ2/governments.ruleset:118
-#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:26
+#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:27
msgid "Comrade"
msgstr "Tovarăşul"
@@ -20267,6 +20486,11 @@ msgstr ""
"deoarece excesul de muncă se pierde şi o grupă de Colonişti/Ingineri este o "
"ţintă vulnerabilă şi foarte tentantă."
+#: data/default/units.ruleset:238
+#, fuzzy
+msgid "?unit:Workers"
+msgstr "Lucrători"
+
#: data/default/units.ruleset:264
#, fuzzy
msgid ""
@@ -20894,6 +21118,11 @@ msgstr "Explorator"
msgid "Explorers are very useful for mapping unknown territory."
msgstr "Exploratori sunt de folos la descoperirea de teritoriu necunoscut."
+#: data/default/units.ruleset:1864
+#, fuzzy
+msgid "?unit:Leader"
+msgstr "Conducător"
+
#: data/default/units.ruleset:1892
msgid "This is you. If you lose this unit, you lose the game. So don't."
msgstr ""
@@ -21125,7 +21354,7 @@ msgid "Emir"
msgstr "Emir"
#: data/nation/afghani.ruleset:25 data/nation/slovakian.ruleset:30
-#: data/nation/soviet.ruleset:27
+#: data/nation/soviet.ruleset:28
msgid "General Secretary"
msgstr "Secretar general"
@@ -21240,7 +21469,7 @@ msgstr "?plural:armeni"
msgid ""
"According to legend, the Armenian people are the descendants of Haik - the "
"great-great-grandson of Noah. The modern Republic of Armenia gained "
-"independence from Soviet in 1991 AD"
+"independence from the Soviet Union in 1991."
msgstr ""
#: data/nation/assyrian.ruleset:3
@@ -22244,12 +22473,11 @@ msgstr "Italieni"
#: data/nation/illyrian.ruleset:6
msgid ""
-"Illyrians were Indo-European tribes who appeared in the western part of the "
-"Balkan Peninsula before 1000 BC, including the Dalmatians to the north, "
-"Corcyra island and Ambracia bay in prehistoric Epirus to the south, mixing "
-"with Thracians in Dardania to the east, and settling Messapia across the "
-"Adriatic Sea. Illyrian kingdoms were independent for centuries, until "
-"conquered by the Roman Republic."
+"Illyrians were Indo-European tribes who appeared in the western part of the "
+"Balkan Peninsula before 1000 BC, including Corcyra island and Ambracia bay "
+"in prehistoric Epirus to the south. They mixed with Thracians in Dardania to "
+"the east, and settled Messapia across the Adriatic Sea. Illyrian kingdoms "
+"were independent for centuries, until conquered by the Roman Republic."
msgstr ""
#: data/nation/inca.ruleset:3
@@ -22555,7 +22783,7 @@ msgid ""
"1953."
msgstr ""
-#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:28
+#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:29
#, fuzzy
msgid "Great Leader"
msgstr "Minune"
@@ -22721,9 +22949,9 @@ msgstr "Italieni"
msgid ""
"Sub-Saharan Africa has been a cultural and ethnical melting pot for "
"millennia. In medieval times, the region was home to a succession of empires "
-"called the Sahelian kingdoms. Of these, the Islamic Mali empire with it's "
+"called the Sahelian kingdoms. Of these, the Islamic Mali empire with its "
"capital in Timbuktu was the most influential. This empire reigned from the "
-"14th to the 17th century and was famed for it's wealth and benevolent kings. "
+"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 ""
@@ -22792,8 +23020,8 @@ msgstr "Italieni"
#: data/nation/mayan.ruleset:6
msgid ""
-"The Mayans were a Mesoamerican civilization. Famous for building great "
-"pyramids and palaces in the jungle."
+"The Mayans were a Mesoamerican civilization. They are famous for building "
+"great pyramids and palaces in the jungle."
msgstr ""
#: data/nation/mayan.ruleset:19
@@ -23298,6 +23526,16 @@ msgid ""
"Czechoslovakia, until 1918 it was part of the Austro-Hungarian Empire."
msgstr ""
+#: data/nation/slovakian.ruleset:26
+#, fuzzy
+msgid "?male:Leader"
+msgstr "Conducător"
+
+#: data/nation/slovakian.ruleset:26
+#, fuzzy
+msgid "?female:Leader"
+msgstr "Tovarăşul"
+
#: data/nation/slovakian.ruleset:29
msgid "Pope"
msgstr "Papă"
@@ -23338,11 +23576,12 @@ msgstr "Scoţieni"
#: data/nation/soviet.ruleset:6
msgid ""
-"Soviet Union's history starts in November 1917, when under Lenin's "
+"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 "
-"republics integrated into one country. Soviet Union became one of most "
-"powerful states in the 20th century. But by the end of 1991 due to many "
-"social shocks it disintegrated into fifteen independent countries"
+"republics integrated into one country. The Soviet Union became one of most "
+"powerful states in the 20th century, but by the end of 1991 it had "
+"disintegrated into fifteen independent countries due to social and economic "
+"problems."
msgstr ""
#: data/nation/spanish.ruleset:3
@@ -23718,8 +23957,8 @@ msgstr "Vestici"
#: data/nation/westphalian.ruleset:6
msgid ""
-"Westphalia, before becoming a Prussian province, was the western region the "
-"duchy of Saxony. Present-day it consists of the Northern part of the largest "
+"Westphalia, before becoming a Prussian province, was the western region of "
+"the duchy of Saxony. Today it makes up the northern part of the largest "
"German federal state, North Rhine-Westphalia."
msgstr ""
@@ -23864,7 +24103,7 @@ msgid ""
"The flag and background color indicate what civilization the city\n"
"belongs to (this will be useful when you meet other civilizations).\n"
"The top row of the bar also shows the name and size of the city, and\n"
-"will show one or more starts to indicate if there are units in the\n"
+"will show one or more stars to indicate if there are units in the\n"
"city. The bottom row shows what the city is building, and how long it\n"
"will take; it also shows how long the city will take to grow to the\n"
"next largest size."
@@ -23920,7 +24159,7 @@ msgid ""
"Now your city has grown to size five. As cities get larger unrest\n"
"becomes a problem. A city of this size will usually have one unhappy\n"
"citizen unless pacifying effects are used; meaning one entertainer\n"
-"specialist is required to keep your citzens content. This is basically\n"
+"specialist is required to keep your citizens content. This is basically\n"
"a wasted citizen.\n"
"\n"
"There are several things that can be done about this. One quick fix\n"
@@ -23992,7 +24231,7 @@ msgid ""
"existing cities. Generally when building new cities you want to make\n"
"sure that all tiles are covered by at least one city, but after that\n"
"it is best that your cities overlap as little as possible. Spreading\n"
-"out cities properly gives each city access to more resrouces, allowing\n"
+"out cities properly gives each city access to more resources, allowing\n"
"them to grow to larger sizes."
msgstr ""
@@ -24275,6 +24514,73 @@ msgstr "Echipa 30"
msgid "Team 31"
msgstr "Echipa 31"
+#, fuzzy
+#~ msgid "Auth config filename \"%s\" not allowed!"
+#~ msgstr "Numele acesta nu este permis."
+
+#~ msgid "The %s of the %s (%s)"
+#~ msgstr "%s al %slor (%s)"
+
+#, fuzzy
+#~ msgid ""
+#~ "Illegal alliance structure detected: %s alliance to %s reduced to peace "
+#~ "treaty."
+#~ msgstr ""
+#~ "S-a detectat o structură de alianţă ilegală: alianţa lui %s cu %s a fost "
+#~ "redusă la tratat de pace."
+
+#, fuzzy
+#~ msgid "And, became more experienced!"
+#~ msgstr " a devenit mai experimentat!"
+
+#~ msgid "We can't take control of server, attempting to kill it."
+#~ msgstr ""
+#~ "Nu se poate prelua controlul asupra serverului, se încearcă oprirea sa."
+
+#, fuzzy
+#~ msgid "%s territory"
+#~ msgstr "Teritoriul %slor"
+
+#~ msgid "%s territory (%d turn cease-fire)"
+#~ msgid_plural "%s territory (%d turn cease-fire)"
+#~ msgstr[0] "teritoriu %s (%d rundă de încetarea focului)"
+#~ msgstr[1] "teritoriu %s (%d runde de încetarea focului)"
+
+#, fuzzy
+#~ msgid "%s territory (%s)"
+#~ msgstr "teritoriul %s %s"
+
+#~ msgid "City: %s (%s)"
+#~ msgstr "OraÅŸ: %s(%s)"
+
+#, fuzzy
+#~ msgid "Unit: %s (%s)"
+#~ msgstr "Unitate: %s(%s)"
+
+#~ msgid "%s of the %s"
+#~ msgstr "%s al %s"
+
+#~ msgid "no maximum, "
+#~ msgstr "fără maxim, "
+
+#~ msgid "%d unit maximum, "
+#~ msgid_plural "%d units maximum, "
+#~ msgstr[0] "%d unitate maxim, "
+#~ msgstr[1] "%d unităţi maxim, "
+
+#~ msgid "%d per unit). "
+#~ msgstr "%d pe unitate). "
+
+#~ msgid "Select same type"
+#~ msgstr "Alege acelaÅŸi tip"
+
+#~ msgid ""
+#~ "Couldn't find stdfont.ttf file. Please link/copy/move anyunicode ttf font "
+#~ "to data dir as stdfont.ttf"
+#~ msgstr ""
+#~ "Nu a fost găsit fişierul stdfont.ttf. Copiaţi/mutaţi/creaţi o legătură "
+#~ "simbolică la orice font ttf unicode ca stdfont.ttf în directorul data"
+
#~ msgid "Units: "
#~ msgstr "Unităţi: "
@@ -24399,9 +24705,6 @@ msgstr "Echipa 31"
#~ msgid ", nation %s"
#~ msgstr ", naţiunea %s"
-#~ msgid ", team %s"
-#~ msgstr ", echipa %s"
-
#~ msgid "_Map"
#~ msgstr "_Hărtă"
diff --git a/po/ru.gmo b/po/ru.gmo
index b0313ba..c77f9ab 100644
Binary files a/po/ru.gmo and b/po/ru.gmo differ
diff --git a/po/ru.po b/po/ru.po
index 65a7523..1b3ed24 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Freeciv-2.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 07:45+0900\n"
+"POT-Creation-Date: 2009-03-29 21:13+0900\n"
"PO-Revision-Date: 2008-01-21 21:55+3400\n"
"Last-Translator: Egor Vyscrebentsov <evyscr at murom.net>\n"
"Language-Team: Russian <ru at li.org>\n"
@@ -649,7 +649,7 @@ msgid "Road"
msgstr "Дорога"
#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
-#: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
+#: client/gui-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"
@@ -666,7 +666,7 @@ msgid "Mine"
msgstr "Шахта"
#: common/terrain.c:396 common/unit.c:548 server/report.c:124
-#: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
+#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr "ЗагрÑзнение"
@@ -712,7 +712,7 @@ msgstr "Укреплен(ы)"
msgid "Sentry"
msgstr "Сторожить"
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:851 client/gui-sdl/menu.c:648
+#: common/unit.c:566 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 "Разрушать"
@@ -729,7 +729,7 @@ msgstr "ИÑÑледовать"
msgid "Transform"
msgstr "Преобразовать"
-#: common/unit.c:584 client/text.c:106 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:584 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 "ÐеизвеÑтно"
@@ -800,11 +800,11 @@ msgstr "ÐÑ‚Ð¾Ð¼Ð½Ð°Ñ Ñ€Ð°ÐºÐµÑ‚Ð°"
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1406
+#: common/unittype.c:349 client/helpdata.c:1404
msgid " and "
msgstr " и "
-#: common/unittype.c:355 client/helpdata.c:1392
+#: common/unittype.c:355 client/helpdata.c:1390
msgid "?and:, "
msgstr "?и:, "
@@ -1451,31 +1451,26 @@ msgstr ""
#: server/auth.c:281
#, c-format
-msgid "Auth config filename \"%s\" not allowed!"
-msgstr "Ð˜Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° конфигурации авторизации \"%s\" не разрешено!"
-
-#: server/auth.c:286
-#, c-format
msgid "Cannot load auth config file \"%s\"!"
msgstr "Ðевозможно загрузить файл конфигурации авторизации \"%s\"!"
-#: server/auth.c:397
+#: server/auth.c:392
#, c-format
msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
msgstr ""
"Предупреждение: Ð¸Ð¼Ñ Ð³Ð¾ÑÑ‚Ñ \"%s\" иÑпользуетÑÑ ÐºÐµÐ¼-то другим, переименовываем "
"в \"%s\"."
-#: server/auth.c:404
+#: server/auth.c:399
msgid "Guests are not allowed on this server. Sorry."
msgstr "ГоÑти не разрешены на Ñтом Ñервере. Извините."
-#: server/auth.c:406
+#: server/auth.c:401
#, c-format
msgid "%s was rejected: Guests not allowed."
msgstr "%s было отказано в подключении: гоÑтевые Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð½Ðµ разрешены."
-#: server/auth.c:425
+#: server/auth.c:420
#, c-format
msgid ""
"There was an error reading the user database, logging in as guest connection "
@@ -1484,7 +1479,7 @@ msgstr ""
"При чтении базы данных пользователей произошла ошибка, региÑтрируемÑÑ ÐºÐ°Ðº "
"гоÑтевое подключение '%s'."
-#: server/auth.c:431
+#: server/auth.c:426
msgid ""
"There was an error reading the user database and guest logins are not "
"allowed. Sorry"
@@ -1492,47 +1487,47 @@ msgstr ""
"При чтении базы данных пользователей произошла ошибка, а гоÑтевые "
"региÑтрации не разрешены. Извините"
-#: server/auth.c:434
+#: server/auth.c:429
#, c-format
msgid "%s was rejected: Database error and guests not allowed."
msgstr ""
"%s было отказано в подключении: ошибка базы данных и запрет гоÑтевых "
"подключений."
-#: server/auth.c:441
+#: server/auth.c:436
#, c-format
msgid "Enter password for %s:"
msgstr "Введите пароль Ð´Ð»Ñ %s:"
-#: server/auth.c:450
+#: server/auth.c:445
msgid "Enter a new password (and remember it)."
msgstr "Введите новый пароль (и запомните его)."
-#: server/auth.c:456
+#: server/auth.c:451
msgid "This server allows only preregistered users. Sorry."
msgstr ""
"Ðа Ñтом Ñервере разрешены только уже зарегиÑтрированные пользователи. "
"Извините."
-#: server/auth.c:459
+#: server/auth.c:454
#, c-format
msgid "%s was rejected: Only preregister users allowed."
msgstr ""
"%s было отказано в подключении: разрешены только уже зарегиÑтрированные "
"пользователи."
-#: server/auth.c:488 server/auth.c:547
+#: server/auth.c:483 server/auth.c:542
msgid "Sorry, too many wrong tries..."
msgstr "Извините, Ñлишком много неверных попыток..."
-#: server/auth.c:489
+#: server/auth.c:484
#, c-format
msgid "%s was rejected: Too many wrong password verifies for new user."
msgstr ""
"%s было отказано в подключении: Ñлишком много неверных подтверждений Ð¿Ð°Ñ€Ð¾Ð»Ñ "
"Ð´Ð»Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ пользователÑ."
-#: server/auth.c:505
+#: server/auth.c:500
msgid ""
"Warning: There was an error in saving to the database. Continuing, but your "
"stats will not be saved."
@@ -1540,32 +1535,32 @@ msgstr ""
"Предупреждение: При Ñохранении в базу данных произошла ошибка. Продолжаем, "
"но Ваша ÑтатиÑтика не будет Ñохранена."
-#: server/auth.c:549
+#: server/auth.c:544
#, c-format
msgid "%s was rejected: Too many wrong password tries."
msgstr "%s было отказано в подключении: Ñлишком много неверных паролей."
-#: server/auth.c:558
+#: server/auth.c:553
msgid "Your password is incorrect. Try again."
msgstr "Ваш пароль неверен. Попробуйте ещё раз."
-#: server/auth.c:569
+#: server/auth.c:564
msgid "Sorry, your connection timed out..."
msgstr ""
"Извините, Ваше подключение было отÑоединено вÑледÑтвие Ð¿Ñ€ÐµÐ²Ñ‹ÑˆÐµÐ½Ð¸Ñ Ñ‚Ð°Ð¹Ð¼Ð°ÑƒÑ‚Ð°..."
-#: server/auth.c:571
+#: server/auth.c:566
#, c-format
msgid "%s was rejected: Connection timeout waiting for password."
msgstr "%s было отказано в подключении: превышение таймаута Ð¾Ð¶Ð¸Ð´Ð°Ð½Ð¸Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ."
-#: server/auth.c:636
+#: server/auth.c:631
#, c-format
msgid "Your password is too short, the minimum length is %d. Try again."
msgstr ""
"Ваш пароль Ñлишком короткий, Ð¼Ð¸Ð½Ð¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ Ð´Ð»Ð¸Ð½Ð° - %d. Попробуйте ещё раз."
-#: server/auth.c:642
+#: server/auth.c:637
#, c-format
msgid ""
"The password must have at least %d capital letters, %d numbers, and be at "
@@ -2090,7 +2085,7 @@ msgstr "Ðто Ñервер Ð´Ð»Ñ %s"
msgid "You can learn a lot about Freeciv at %s"
msgstr "Вы можете узнать больше о Freeciv на %s"
-#: server/civserver.c:206 client/civclient.c:237 manual/civmanual.c:380
+#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
@@ -2122,14 +2117,14 @@ msgstr ""
msgid " -b --bind ADDR\tListen for clients on ADDR\n"
msgstr " -b --bind ADDR\tЖдать Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ ÐºÐ»Ð¸ÐµÐ½Ñ‚Ð¾Ð² по адреÑу ADDR\n"
-#: server/civserver.c:217 client/civclient.c:241
+#: server/civserver.c:217 client/civclient.c:242
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:245
+#: server/civserver.c:221 client/civclient.c:246
msgid " -d, --debug NUM\tSet debug log level (0 to 3)\n"
msgstr " -d, --debug NUM\tУÑтановить уровень журнала отладки (0 до 3)\n"
@@ -2137,7 +2132,7 @@ msgstr " -d, --debug NUM\tУÑтановить уровень журнала о
msgid " -f, --file FILE\tLoad saved game FILE\n"
msgstr " -f, --file FILE\tЗагрузить Ñохранённую игру FILE\n"
-#: server/civserver.c:225 client/civclient.c:248 manual/civmanual.c:382
+#: server/civserver.c:225 client/civclient.c:249 manual/civmanual.c:382
msgid " -h, --help\t\tPrint a summary of the options\n"
msgstr " -h, --help\t\tÐапечатать ÑпиÑок наÑтроек\n"
@@ -2187,11 +2182,11 @@ msgstr " -r, --read FILE\tПрочитать начальный Ñкрипт FI
msgid " -R, --Ranklog FILE\tUse FILE as ranking logfile\n"
msgstr " -R, --Ranklog FILE\tИÑпользовать FILE Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи рейтинга\n"
-#: server/civserver.c:247 client/civclient.c:267 manual/civmanual.c:383
+#: server/civserver.c:247 client/civclient.c:268 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:279
+#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, c-format
@@ -3451,7 +3446,7 @@ msgstr ""
"МорÑкие начальные ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð¿Ð¾ÐºÐ° ещё не поддерживаютÑÑ. Ðикто не получает %"
"s."
-#: server/gamehand.c:310 client/text.c:632
+#: server/gamehand.c:310 client/text.c:691
#, c-format
msgid "Year: %s"
msgstr "Год: %s"
@@ -3733,10 +3728,10 @@ msgid "Could not throw %s into civil war - no available nations"
msgstr "%s не могут начать гражданÑкой войны - Ñлишком много игроков"
#: server/plrhand.c:1686
-#, c-format
+#, fuzzy, c-format
msgid ""
-"Your nation is thrust into civil war, %s is declared the leader of the "
-"rebel states."
+"Your nation is thrust into civil war! %s is declared the leader of the rebel "
+"states."
msgstr ""
"Ð’ Вашей Ñтране началаÑÑŒ гражданÑÐºÐ°Ñ Ð²Ð¾Ð¹Ð½Ð°, %s объÑвлен лидером повÑтанцев."
@@ -3835,7 +3830,7 @@ msgstr "СкороÑÑ‚ÑŒ иÑÑледований"
msgid "Literacy"
msgstr "ГрамотноÑÑ‚ÑŒ"
-#: server/report.c:121 client/cityrepdata.c:526 client/cityrepdata.c:527
+#: server/report.c:121 client/cityrepdata.c:524 client/cityrepdata.c:525
#: client/gui-sdl/cityrep.c:174
msgid "Production"
msgstr "ПроизводÑтво"
@@ -3990,7 +3985,7 @@ msgstr ""
"Строка демографии Ñодержит неправильные Ñимволы. Попробуйте \"help demography"
"\"."
-#: server/report.c:743 server/report.c:766
+#: server/report.c:743 server/report.c:768
msgid "Demographics Report:"
msgstr "ДемографичеÑкий отчет:"
@@ -3998,10 +3993,12 @@ msgstr "ДемографичеÑкий отчет:"
msgid "Sorry, the Demographics report is unavailable."
msgstr "Извините, демографичеÑкий отчет недоÑтупен."
-#: server/report.c:748
-#, c-format
-msgid "The %s of the %s (%s)"
-msgstr "%s %s (%s)"
+#. TRANS: <nation adjective> <government name> (<year>).
+#. * E.g. "Polish Despotism (200 AD)".
+#: server/report.c:750
+#, fuzzy, c-format
+msgid "%s %s (%s)"
+msgstr "%s в %s (%s)\n"
#. TRANS: message about an installation error.
#: server/ruleset.c:163
@@ -4055,16 +4052,6 @@ msgstr ""
msgid "%s had invalid nation; changing to %s."
msgstr "У %s - недопуÑтимый народ; изменÑем на %s."
-#. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4073
-#, c-format
-msgid ""
-"Illegal alliance structure detected: %s alliance to %s reduced to peace "
-"treaty."
-msgstr ""
-"Обнаружена Ð½ÐµÐ²ÐµÑ€Ð½Ð°Ñ Ñтруктура альÑнÑа: Ñоюз между %s и %s Ñокращён до "
-"мирного договора."
-
#: server/settings.c:32
msgid "Geological"
msgstr "ГеологичеÑкие"
@@ -5304,9 +5291,10 @@ msgid "Auto-save name prefix"
msgstr "ÐŸÑ€ÐµÑ„Ð¸ÐºÑ Ð¸Ð¼Ñ‘Ð½ автоÑохранениÑ"
#: server/settings.c:1016
+#, fuzzy
msgid ""
-"Automatically saved games will have name \"<prefix><year>.sav\". This "
-"setting sets the <prefix> part."
+"Automatically saved games will have name \"<prefix>-T<turn>-Y<year>.sav\". "
+"This setting sets the <prefix> part."
msgstr ""
"ÐвтоматичеÑки Ñохранённые игры будут иметь Ð¸Ð¼Ñ \"<префикÑ><год>.sav\". Ðта "
"наÑтройка уÑтанваливает <префикÑ>."
@@ -5325,11 +5313,11 @@ msgstr ""
"log\" каждый ход. Ðта ÑтатиÑтика может быть иÑпользована Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ "
"графиков Ñилы поÑле игры."
-#: server/sernet.c:147
+#: server/sernet.c:150
msgid "Server cannot read standard input. Ignoring input."
msgstr "Сервер не может читать Ñо Ñтандартного ввода. Игнорируем ввод."
-#: server/sernet.c:922
+#: server/sernet.c:929
#, c-format
msgid "Server: bad address: [%s:%d]."
msgstr "Сервер: неправильный адреÑ: [%s:%d]."
@@ -5462,100 +5450,100 @@ msgstr ""
"Прекращение Ð¾Ð³Ð½Ñ Ð¼ÐµÐ¶Ð´Ñƒ %s и %s завершилоÑÑŒ. Они воюют между Ñобой. Ð’Ñ‹ "
"отменили Ñоюз Ñ Ð¾Ð±Ð¾Ð¸Ð¼Ð¸."
-#: server/srv_main.c:928
+#: server/srv_main.c:961
#, c-format
msgid "Failed saving game as %s"
msgstr "Ðе удалоÑÑŒ Ñохранить игру как %s"
-#: server/srv_main.c:930
+#: server/srv_main.c:963
#, c-format
msgid "Game saved as %s"
msgstr "Игра Ñохранена как %s"
-#: server/srv_main.c:962
+#: server/srv_main.c:994
msgid "The game is already running."
msgstr "Игра уже запущена."
-#: server/srv_main.c:970
+#: server/srv_main.c:1002
#, c-format
msgid "%s lost control cmdlevel on game start. Use voting from now on."
msgstr ""
"%s лишилÑÑ ÑƒÑ€Ð¾Ð²Ð½Ñ Ð´Ð¾Ñтупа cmdlevel. С Ñтих пор иÑпользуйте голоÑование."
-#: server/srv_main.c:977
+#: server/srv_main.c:1009
msgid "Starting game."
msgstr "ЗапуÑк игры."
-#: server/srv_main.c:1039
+#: server/srv_main.c:1071
#, c-format
msgid "request for unknown report (type %d)"
msgstr "запрошен неизвеÑтный отчёт (тип %d)"
-#: server/srv_main.c:1104
+#: server/srv_main.c:1136
#, c-format
msgid "Warning: rejecting old client %s"
msgstr "Внимание: отказываем Ñтарому клиенту (%s)"
-#: server/srv_main.c:1206
+#: server/srv_main.c:1238
#, c-format
msgid "Got a packet of type %d from a dead or observer player"
msgstr "Получен пакет типа %d от мёртвого игрока или наблюдателÑ"
-#: server/srv_main.c:1306
+#: server/srv_main.c:1338
msgid "Please choose a non-blank name."
msgstr "Выберите непуÑтое имÑ."
-#: server/srv_main.c:1322
+#: server/srv_main.c:1354
msgid "That nation is already in use."
msgstr "Ðтот народ уже иÑпользуетÑÑ."
-#: server/srv_main.c:1338
+#: server/srv_main.c:1370
#, c-format
msgid "Another player already has the name '%s'. Please choose another name."
msgstr ""
"Другой игрок, назвавший ÑÐµÐ±Ñ '%s', уже приÑоединилÑÑ Ðº игре. ПожалуйÑта, "
"выберите другое имÑ."
-#: server/srv_main.c:1359
+#: server/srv_main.c:1391
msgid "Please choose a name containing only ASCII characters."
msgstr "ПожалуйÑта, выберите имÑ, Ñодержащее только ASCII Ñимволы."
-#: server/srv_main.c:1458
+#: server/srv_main.c:1490
#, c-format
msgid "%s nation is not available in this scenario."
msgstr "Ðарод %s недоÑтупен в данном Ñценарии."
-#: server/srv_main.c:1464
+#: server/srv_main.c:1496
#, c-format
msgid "%s nation is already in use."
msgstr "Ðарод %s уже иÑпользуетÑÑ."
-#: server/srv_main.c:1482
+#: server/srv_main.c:1514
#, c-format
msgid "%s is the %s ruler %s."
msgstr "%s - %s правитель %s."
-#: server/srv_main.c:1538
+#: server/srv_main.c:1570
#, c-format
msgid "Waiting to start game: %d out of %d players are ready to start."
msgstr "Ждём начала игры: %d из %d игроков готовы начать."
-#: server/srv_main.c:1582 server/srv_main.c:1586
+#: server/srv_main.c:1614 server/srv_main.c:1618
#, c-format
msgid "%s has been added as %s level AI-controlled player."
msgstr "%s был добавлен как %s уровень игрока, управлÑемого компьютером."
-#: server/srv_main.c:1728
+#: server/srv_main.c:1760
#, c-format
msgid "Player %d"
msgstr "Игрок %d"
-#: server/srv_main.c:1739 server/srv_main.c:1745
+#: server/srv_main.c:1771 server/srv_main.c:1777
#, c-format
msgid "%s rules the %s."
msgstr "%s правит народом %s."
-#: server/srv_main.c:1910
+#: server/srv_main.c:1942
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
@@ -5563,16 +5551,16 @@ msgstr ""
"Ðта программа Ñервера freeciv поддерживает авторизацию пользователей, но "
"ÑÐµÐ¹Ñ‡Ð°Ñ Ð¾Ð½Ð° не иÑпользуетÑÑ."
-#: server/srv_main.c:1961
+#: server/srv_main.c:1993
#, c-format
msgid "Sending info to metaserver [%s]"
msgstr "ПоÑылаем информацию на метаÑервер [%s]"
-#: server/srv_main.c:1992
+#: server/srv_main.c:2024
msgid "The game is over..."
msgstr "Игра закончена..."
-#: server/srv_main.c:2205
+#: server/srv_main.c:2237
msgid "Now accepting new client connections."
msgstr "ПринимаютÑÑ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð½Ð¾Ð²Ñ‹Ñ… клиентов."
@@ -6400,24 +6388,24 @@ msgid "Barbarian"
msgstr "Варвары"
#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2030 client/gui-sdl/plrdlg.c:645
+#: client/gui-gtk-2.0/pages.c:2102 client/gui-sdl/plrdlg.c:645
#: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
msgid "AI"
msgstr "Компьютер"
#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
+#: client/gui-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
msgid "Human"
msgstr "Человек"
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
-#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
+#: 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
msgid "Alive"
msgstr "Живой"
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
#: client/gui-win32/connectdlg.c:200
msgid "Dead"
msgstr "Умер"
@@ -6685,9 +6673,9 @@ 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:242
-#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
-#: client/text.c:1201
+#: 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
#, c-format
msgid "?clistmore:, %s"
msgstr ", %s"
@@ -6941,7 +6929,7 @@ msgstr "Только %s может атаковать Ñ Ð¼Ð¾Ñ€Ñ."
msgid "Cannot attack from sea."
msgstr "Ðевозможно атаковать Ñ Ð¼Ð¾Ñ€Ñ."
-#: server/unithand.c:996 server/unittools.c:2103
+#: server/unithand.c:996 server/unittools.c:2137
msgid "Cannot attack unless you declare war first."
msgstr "Ðевозможно атаковать пока не объÑвлена война."
@@ -7046,101 +7034,102 @@ msgid "%s was upgraded for free to %s."
msgstr "%s беÑплатно модернизирован до %s."
#: server/unittools.c:297
-#, c-format
-msgid "Not enough gold. %s disbanded"
+#, fuzzy, c-format
+msgid "Not enough gold to pay upkeep for %s. Unit disbanded."
msgstr "ÐедоÑтаточно золота. %s раÑпущены."
-#: server/unittools.c:342
+#: server/unittools.c:343
#, c-format
msgid "Your %s has run out of hit points."
msgstr "Ваш %s потерÑл вÑе здоровье."
-#: server/unittools.c:358
+#: server/unittools.c:359
#, c-format
msgid "Your %s has been lost on the high seas."
msgstr "Ваша %s потерÑлаÑÑŒ в океане."
-#: server/unittools.c:365
+#: server/unittools.c:366
#, c-format
msgid "Your %s survived on the high seas and became more experienced!"
msgstr "Ваше Ñоединение %s выжило в бушующем море и Ñтало более опытным!"
-#: server/unittools.c:376
+#: server/unittools.c:377
#, c-format
msgid "Your %s has been lost on unsafe terrain."
msgstr "Ваша %s потерÑлаÑÑŒ в опаÑной меÑтноÑти."
-#: server/unittools.c:430
+#: server/unittools.c:431
#, c-format
msgid "Your %s has returned to refuel."
msgstr "Ваш %s вернулÑÑ Ð´Ð»Ñ Ð´Ð¾Ð·Ð°Ð¿Ñ€Ð°Ð²ÐºÐ¸."
-#: server/unittools.c:454
+#: server/unittools.c:455
#, c-format
msgid "Your %s has run out of fuel."
msgstr "Ваш %s оÑталÑÑ Ð±ÐµÐ· топлива."
-#. TRANS: And, <the unit> became ...
-#: server/unittools.c:616
-msgid "And, became more experienced!"
-msgstr " и Ñтали более опытными!"
-
#. TRANS: Your <unit> became ...
-#: server/unittools.c:620
+#: server/unittools.c:619
#, c-format
msgid "Your %s became more experienced!"
msgstr "Ваш %s Ñтал более опытным!"
-#: server/unittools.c:1011
+#: server/unittools.c:1009
#, c-format
msgid "Teleported your %s to %s."
msgstr "ПеренеÑено Ваш %s в %s."
-#: server/unittools.c:1041
+#. TRANS: A unit is moved to resolve stack conflicts.
+#: server/unittools.c:1065
+#, fuzzy, c-format
+msgid "Moved your %s."
+msgstr "Ваши %s раÑпущены."
+
+#: server/unittools.c:1076
#, c-format
msgid "Disbanded your %s."
msgstr "Ваши %s раÑпущены."
-#: server/unittools.c:1363
+#: server/unittools.c:1397
#, c-format
msgid "Unable to defend %s, %s has lost the game."
msgstr "Ðевозможно защитить %s, %s проиграл игру."
-#: server/unittools.c:1367
+#: server/unittools.c:1401
#, c-format
msgid "Losing %s meant losing the game! Be more careful next time!"
msgstr ""
"ÐŸÐ¾Ñ‚ÐµÑ€Ñ %s означает поражение в игре! Будьте более оÑторожны в Ñледующий раз!"
-#: server/unittools.c:1469
+#: server/unittools.c:1503
#, c-format
msgid "%s escaped the destruction of %s, and fled to %s."
msgstr "Ваш %s избежал гибели в %s, и убежал в %s."
-#: server/unittools.c:1478
+#: server/unittools.c:1512
#, c-format
msgid "%s lost when %s was lost."
msgstr "Ð’Ñ‹ потерÑли %s когда %s был потерÑн."
-#: server/unittools.c:1527
+#: server/unittools.c:1561
#, c-format
msgid "Barbarian leader captured, %d gold ransom paid."
msgstr "Лидер варваров пойман, выкуп %d золотых."
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unittools.c:1545
+#: server/unittools.c:1579
#, c-format
msgid "Your attacking %s succeeded against the %s %s!"
msgstr "Ваши атакующие %s победили %s %s!"
#. TRANS: "Cannon ... the Polish Destroyer."
-#: server/unittools.c:1554 server/unittools.c:1612
+#: server/unittools.c:1588 server/unittools.c:1646
#, c-format
msgid "%s lost to an attack by the %s %s."
msgstr "Ð’Ñ‹ потерÑли %s в результате атаки %s %s."
#. TRANS: "... Cannon ... the Polish Destroyer ...."
-#: server/unittools.c:1588
+#: server/unittools.c:1622
#, c-format
msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
msgid_plural ""
@@ -7151,14 +7140,14 @@ msgstr[2] "Ваши атакующие %s победили %s %s (и %d друг
#. TRANS: "Cannon lost when the Polish Destroyer
#. * attacked the German Musketeers."
-#: server/unittools.c:1621
+#: server/unittools.c:1655
#, 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:1636
+#: server/unittools.c:1670
#, c-format
msgid "%s (and %s) lost to an attack from the %s %s."
msgstr "%s (и %s) потерÑны в результате атаки %s %s."
@@ -7166,7 +7155,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:1646
+#: server/unittools.c:1680
#, 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."
@@ -7177,7 +7166,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:1660
+#: server/unittools.c:1694
#, 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."
@@ -7185,187 +7174,187 @@ msgstr[0] "%d Ñоединение потерÑно, когда %s %s атако
msgstr[1] "%d ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð¿Ð¾Ñ‚ÐµÑ€Ñны, когда %s %s атаковали %s %s."
msgstr[2] "%d Ñоединений потерÑно, когда %s %s атаковали %s %s."
-#: server/unittools.c:1928
+#: server/unittools.c:1962
#, c-format
msgid "Your %s was nuked by %s."
msgstr "Ваш %s был взорван атомной бомбой %s."
-#: server/unittools.c:1931 server/unittools.c:1947
+#: server/unittools.c:1965 server/unittools.c:1981
msgid "yourself"
msgstr "Ð’Ñ‹"
-#: server/unittools.c:1935
+#: server/unittools.c:1969
#, c-format
msgid "The %s %s was nuked."
msgstr "%s %s был взорван атомной бомбой."
-#: server/unittools.c:1944
+#: server/unittools.c:1978
#, c-format
msgid "%s was nuked by %s."
msgstr "%s был взорван атомной бомбой %s."
-#: server/unittools.c:1952
+#: server/unittools.c:1986
#, c-format
msgid "You nuked %s."
msgstr "Вы взорвали %s атомной бомбой."
-#: server/unittools.c:1993
+#: server/unittools.c:2027
#, c-format
msgid "The %s detonated a nuke!"
msgstr "%s взорвали атомную бомбу!"
-#: server/unittools.c:2017
+#: server/unittools.c:2051
#, c-format
msgid "%s transported successfully."
msgstr "%s перевезен уÑпешно."
-#: server/unittools.c:2069
+#: server/unittools.c:2103
msgid "This unit type can not be paradropped."
msgstr "Ðто Ñоединение не может быть Ñброшено на парашюте."
-#: server/unittools.c:2079
+#: server/unittools.c:2113
#, fuzzy
msgid "You cannot paradrop a unit that is transporting other units."
msgstr "Ð’Ñ‹ не можете деÑантировать транÑпортное Ñоединение."
-#: server/unittools.c:2085
+#: server/unittools.c:2119
msgid "The destination location is not known."
msgstr "Положение цели неизвеÑтно."
-#: server/unittools.c:2092
+#: server/unittools.c:2126
#, c-format
msgid "This unit cannot paradrop into %s."
msgstr "Ðевозможно ÑброÑить Ñто Ñоединение в %s."
-#: server/unittools.c:2112
+#: server/unittools.c:2146
#, c-format
msgid "The distance to the target (%i) is greater than the unit's range (%i)."
msgstr "РаÑÑтоÑние до цели (%i) больше чем возможноÑти ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ (%i)."
-#: server/unittools.c:2123
+#: server/unittools.c:2157
#, c-format
msgid "Your %s paradropped into the %s and was lost."
msgstr "Ваши %s были Ñброшены в %s и были потерÑны."
-#: server/unittools.c:2136
+#: server/unittools.c:2170
#, c-format
msgid "Your %s was killed by enemy units at the paradrop destination."
msgstr "Ваши %s были уничтожены врагами в точке парашютной выÑадки."
-#: server/unittools.c:2158
+#: server/unittools.c:2192
#, c-format
msgid "You found %d gold."
msgstr "Вы нашли %d золотых."
-#: server/unittools.c:2175
+#: server/unittools.c:2209
#, c-format
msgid "You found %s in ancient scrolls of wisdom."
msgstr "Ð’Ñ‹ нашли опиÑание науки \"%s\" в древней рукопиÑи."
-#: server/unittools.c:2182
+#: server/unittools.c:2216
#, c-format
msgid "The %s have acquired %s from ancient scrolls of wisdom."
msgstr "%s получили %s из древних мануÑкриптов."
-#: server/unittools.c:2196
+#: server/unittools.c:2230
msgid "A band of friendly mercenaries joins your cause."
msgstr "Группа дружеÑтвенных наемников приÑоединÑетÑÑ Ðº Вам."
-#: server/unittools.c:2214
+#: server/unittools.c:2248
msgid "An abandoned village is here."
msgstr "Ðта Ð´ÐµÑ€ÐµÐ²Ð½Ñ Ð¾Ñтавлена жителÑми."
-#: server/unittools.c:2224
+#: server/unittools.c:2258
msgid "You have unleashed a horde of barbarians!"
msgstr "Ваше Ñоединение вÑтретило орды варваров!"
-#: server/unittools.c:2227
+#: server/unittools.c:2261
#, c-format
msgid "Your %s has been killed by barbarians!"
msgstr "Ваши %s были уничтожены варварами."
-#: server/unittools.c:2243
+#: server/unittools.c:2277
msgid "You found a friendly city."
msgstr "Ð’Ñ‹ нашли дружеÑтвенный город."
-#: server/unittools.c:2257
+#: server/unittools.c:2291
msgid "Friendly nomads are impressed by you, and join you."
msgstr ""
"К Вам приÑоединилиÑÑŒ дружеÑтвенные кочевники, потрÑÑённые Вашим могущеÑтвом."
-#: server/unittools.c:2282
+#: server/unittools.c:2316
msgid "Your overflight frightens the tribe; they scatter in terror."
msgstr "Ваш перелёт пугает племÑ, оно разбегаетÑÑ Ð² ужаÑе."
-#: server/unittools.c:2540
+#: server/unittools.c:2574
#, c-format
msgid "Orders for %s aborted after enemy movement was spotted."
msgstr "Приказы Ð´Ð»Ñ %s отменены поÑле Ð¾Ð±Ð½Ð°Ñ€ÑƒÐ¶ÐµÐ½Ð¸Ñ Ð´Ð²Ð¸Ð¶ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¾Ñ‚Ð¸Ð²Ð½Ð¸ÐºÐ°."
-#: server/unittools.c:2989
+#: server/unittools.c:3023
#, c-format
msgid "Orders for %s aborted as there are units nearby."
msgstr "Приказы Ð´Ð»Ñ %s отменены, так как поблизоÑти обнаружены ÑоединениÑ."
-#: server/unittools.c:3041
+#: server/unittools.c:3075
#, c-format
msgid "Orders for %s aborted because building of city failed."
msgstr "Приказы Ð´Ð»Ñ %s отменены, поÑкольку ÑтроительÑтво города прервалоÑÑŒ."
-#: server/unittools.c:3054
+#: server/unittools.c:3088
#, c-format
msgid "Orders for %s aborted since they give an invalid activity."
msgstr "Приказ Ð´Ð»Ñ %s отменён, невозможно выполнить приказ."
-#: server/unittools.c:3068
+#: server/unittools.c:3102
#, c-format
msgid "Orders for %s aborted since they give an invalid location."
msgstr "Приказ Ð´Ð»Ñ %s отменён, поÑкольку было указано неверное направление."
-#: server/unittools.c:3078
+#: server/unittools.c:3112
#, c-format
msgid "Orders for %s aborted as there are units in the way."
msgstr "%s отменил команду ИДТИ К, Ñ‚.к. другие ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð½Ð°Ñ…Ð¾Ð´ÑÑ‚ÑÑ Ð½Ð° дороге."
-#: server/unittools.c:3104
+#: server/unittools.c:3138
#, c-format
msgid "Orders for %s aborted because of failed move."
msgstr "Приказ Ð´Ð»Ñ %s отменён потому что Ñоединение не может двигатьÑÑ."
-#: server/unittools.c:3145
+#: server/unittools.c:3179
#, c-format
msgid "Attempt to change homecity for %s failed."
msgstr "Попытка поменÑÑ‚ÑŒ домашний город на %s провалилаÑÑŒ."
-#: server/unittools.c:3156
+#: server/unittools.c:3190
#, c-format
msgid "Attempt to establish trade route for %s failed."
msgstr "Попытка уÑтановить торговый путь в %s провалилаÑÑŒ."
-#: server/unittools.c:3168
+#: server/unittools.c:3202
#, c-format
msgid "Attempt to build wonder for %s failed."
msgstr "Попытка поÑтроить чудо %s провалилаÑÑŒ."
-#: server/unittools.c:3177
+#: server/unittools.c:3211
#, c-format
msgid "Your %s has invalid orders."
msgstr "Ваш %s получил неверный приказ."
-#: server/generator/mapgen.c:1737
+#: server/generator/mapgen.c:1771
msgid "High landmass - this may take a few seconds."
msgstr "Ð’Ñ‹Ñокий процент земли - Ñто может занÑÑ‚ÑŒ неÑколько Ñекунд."
-#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
+#: server/generator/mapgen.c:1969 server/generator/mapgen.c:2039
#, c-format
msgid "Falling back to generator %d."
msgstr "ВозвращаемÑÑ Ðº иÑпользованию генератора %d."
-#: server/generator/mapgen.c:2025
+#: server/generator/mapgen.c:2059
msgid "Generator 3 didn't place all big islands."
msgstr "Генератор 3 не Ñоздал вÑех больших оÑтровов."
-#: server/generator/mapgen.c:2054
+#: server/generator/mapgen.c:2088
#, c-format
msgid "Generator 3 left %li landmass unplaced."
msgstr "Генератор 3 оÑтавил %li процентов земли неиÑпользованными."
@@ -7475,7 +7464,7 @@ msgstr[0] "%3d ход"
msgstr[1] "%3d хода"
msgstr[2] "%3d ходов"
-#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:631
#: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
@@ -7594,342 +7583,342 @@ msgstr "?горÑоÑÑ‚:ПорÑдок"
msgid "(worklist)"
msgstr "(ÑпиÑок работ)"
-#: client/cityrepdata.c:447
-msgid "Special"
-msgstr "ОÑобое"
+#: client/cityrepdata.c:446
+msgid "?city:Name"
+msgstr "?город:Ðазвание"
-#: client/cityrepdata.c:448
-msgid "?entertainers/scientists/taxmen:E/S/T"
-msgstr "?артиÑÑ‚Ñ‹/ученые/налогоÑборщики:Ð/У/Ð"
+#: client/cityrepdata.c:446 client/gui-sdl/cityrep.c:169
+msgid "City Name"
+msgstr "Ðазвание города"
-#: client/cityrepdata.c:449
-msgid "Entertainers, Scientists, Taxmen"
-msgstr "ÐртиÑÑ‚Ñ‹, Ученые, ÐалогоÑборщики"
+#: client/cityrepdata.c:448
+msgid "?size [short]:Sz"
+msgstr "Рзм"
-#: client/cityrepdata.c:452
-#, fuzzy
-msgid "Concise + Rapture, - Disorder"
-msgstr "Кратко + Бум, - БеÑпорÑдок"
+#: client/cityrepdata.c:448
+msgid "Size"
+msgstr "Размер"
-#: client/cityrepdata.c:454 client/plrdlg_common.c:261
+#: client/cityrepdata.c:450 client/plrdlg_common.c:261
#: client/gui-win32/plrdlg.c:337
msgid "State"
msgstr "СоÑтоÑние"
-#: client/cityrepdata.c:454
+#: client/cityrepdata.c:450
msgid "Rapture/Peace/Disorder"
msgstr "Бум/Мир/БеÑпорÑдки"
+#: client/cityrepdata.c:452
+#, fuzzy
+msgid "Concise *=Rapture, X=Disorder"
+msgstr "Кратко + Бум, - БеÑпорÑдок"
+
+#: client/cityrepdata.c:456
+msgid "Special"
+msgstr "ОÑобое"
+
#: client/cityrepdata.c:457
+msgid "?entertainers/scientists/taxmen:E/S/T"
+msgstr "?артиÑÑ‚Ñ‹/ученые/налогоÑборщики:Ð/У/Ð"
+
+#: client/cityrepdata.c:458
+msgid "Entertainers, Scientists, Taxmen"
+msgstr "ÐртиÑÑ‚Ñ‹, Ученые, ÐалогоÑборщики"
+
+#: client/cityrepdata.c:461
msgid "?Happy workers:H"
msgstr "?СчаÑтливые рабочие:С"
-#: client/cityrepdata.c:457
+#: client/cityrepdata.c:461
msgid "Workers: Happy"
msgstr "Рабочие: СчаÑтливые"
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
msgid "?Content workers:C"
msgstr "?Довольные рабочие:Д"
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
msgid "Workers: Content"
msgstr "Рабочие: Довольные"
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
msgid "?Unhappy workers:U"
msgstr "?ÐеÑчаÑтные рабочие:Ð"
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
msgid "Workers: Unhappy"
msgstr "Рабочие: ÐеÑчаÑтные"
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
msgid "?Angry workers:A"
msgstr "?Злые рабочие:З"
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
msgid "Workers: Angry"
msgstr "Рабочие: Злые"
-#: client/cityrepdata.c:465 client/gui-xaw/citydlg.c:2401
-#: data/default/units.ruleset:238
-msgid "Workers"
+#: client/cityrepdata.c:469 client/gui-xaw/citydlg.c:2402
+#, fuzzy
+msgid "?city:Workers"
msgstr "Рабочие"
-#: client/cityrepdata.c:466
+#: client/cityrepdata.c:470
msgid "?happy/content/unhappy/angry:H/C/U/A"
msgstr "?ÑчаÑтливые/довольные/неÑчаÑтные/злые:С/Д/Ð/З"
-#: client/cityrepdata.c:467
+#: client/cityrepdata.c:471
msgid "Workers: Happy, Content, Unhappy, Angry"
msgstr "Рабочие: СчаÑтливые, Довольные (нейтральные), ÐеÑчаÑтные, Злые"
-#: client/cityrepdata.c:470 client/cityrepdata.c:472
+#: client/cityrepdata.c:474 client/cityrepdata.c:476
msgid "Best"
msgstr "ЛучшаÑ"
-#: client/cityrepdata.c:470
+#: client/cityrepdata.c:474
msgid "attack"
msgstr "атака"
-#: client/cityrepdata.c:471
+#: client/cityrepdata.c:475
msgid "Best attacking units"
msgstr "Лучшие атакующие ÑоединениÑ"
-#: client/cityrepdata.c:472
+#: client/cityrepdata.c:476
msgid "defense"
msgstr "защита"
-#: client/cityrepdata.c:473
+#: client/cityrepdata.c:477
msgid "Best defending units"
msgstr "Лучшие защитные ÑоединениÑ"
-#: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
-#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
-#: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
-#: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
-#: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
-#: client/gui-win32/menu.c:351 client/gui-win32/repodlgs.c:616
-#: client/gui-win32/repodlgs.c:707 client/gui-win32/repodlgs.c:716
-#: client/gui-xaw/menu.c:157 client/gui-xaw/menu.c:219
-#: client/gui-xaw/menu.c:242 client/gui-xaw/repodlgs.c:881
-#: client/gui-xaw/repodlgs.c:1069 data/Freeciv.in:1895 data/helpdata.txt:909
+#: client/cityrepdata.c:478 client/cityrepdata.c:482
+#: client/gui-gtk-2.0/cityrep.c:1437 client/gui-gtk-2.0/cityrep.c:1456
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-gtk-2.0/cityrep.c:1494
+#: client/gui-gtk-2.0/cityrep.c:1514 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/repodlgs.c:960 client/gui-sdl/helpdlg.c:688
+#: client/gui-sdl/mapctrl.c:1605 client/gui-sdl/optiondlg.c:1827
+#: client/gui-sdl/repodlgs.c:356 client/gui-win32/menu.c:351
+#: client/gui-win32/repodlgs.c:616 client/gui-win32/repodlgs.c:707
+#: client/gui-win32/repodlgs.c:716 client/gui-xaw/menu.c:157
+#: client/gui-xaw/menu.c:219 client/gui-xaw/menu.c:242
+#: client/gui-xaw/repodlgs.c:881 client/gui-xaw/repodlgs.c:1069
+#: data/Freeciv.in:1895 data/helpdata.txt:909
msgid "Units"
msgstr "СоединениÑ"
#. TRANS: Header "Number of units inside city"
-#: client/cityrepdata.c:476
+#: client/cityrepdata.c:480
msgid "?Present (units):Here"
msgstr "?ПриÑутÑтвующие (ÑоединениÑ):ПрÑ"
-#: client/cityrepdata.c:477
+#: client/cityrepdata.c:481
msgid "Number of units present"
msgstr "ЧиÑло приÑутÑтвующих Ñоединений:"
#. TRANS: Header "Number of units supported by given city"
-#: client/cityrepdata.c:480
+#: client/cityrepdata.c:484
msgid "?Supported (units):Owned"
msgstr "Поддерж"
-#: client/cityrepdata.c:481
+#: client/cityrepdata.c:485
msgid "Number of units supported"
msgstr "ЧиÑло поддерживаемых Ñоединений"
#. TRANS: Header "It will take this many turns before city grows"
-#: client/cityrepdata.c:484
+#: client/cityrepdata.c:488
msgid "?food (population):Grow"
msgstr "РоÑÑ‚"
-#: client/cityrepdata.c:485 client/cityrepdata.c:530
+#: client/cityrepdata.c:489 client/cityrepdata.c:528
msgid "?Stock/Target:(Have/Need)"
msgstr "(ЕÑÑ‚ÑŒ/Ðадо)"
-#: client/cityrepdata.c:486
+#: client/cityrepdata.c:490
msgid "Turns until growth/famine"
msgstr "Ходов до роÑта/голода"
-#: client/cityrepdata.c:488
-msgid "?size [short]:Sz"
-msgstr "Рзм"
-
-#: client/cityrepdata.c:488
-msgid "Size"
-msgstr "Размер"
-
-#: client/cityrepdata.c:492
-msgid "?city:Name"
-msgstr "?город:Ðазвание"
-
-#: client/cityrepdata.c:492 client/gui-sdl/cityrep.c:169
-msgid "City Name"
-msgstr "Ðазвание города"
-
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
msgid "Surplus"
msgstr "Избыток"
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
msgid "?food/production/trade:F/P/T"
msgstr "?еда/произв/торг:Е/П/Т"
-#: client/cityrepdata.c:496
+#: client/cityrepdata.c:494
msgid "Surplus: Food, Production, Trade"
msgstr "Избыток: Еда, ПроизводÑтво, ТорговлÑ"
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
msgid "?Food surplus [short]:+F"
msgstr "+Е"
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
msgid "Surplus: Food"
msgstr "Избыток: Еда"
-#: client/cityrepdata.c:500
+#: client/cityrepdata.c:498
msgid "?Production surplus [short]:+P"
msgstr "+П"
-#: client/cityrepdata.c:501
+#: client/cityrepdata.c:499
msgid "Surplus: Production"
msgstr "Избыток: ПроизводÑтво"
-#: client/cityrepdata.c:502
+#: client/cityrepdata.c:500
msgid "?Production loss (waste) [short]:-P"
msgstr "-П"
-#: client/cityrepdata.c:503
+#: client/cityrepdata.c:501
msgid "Waste"
msgstr "РаÑтраты"
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
msgid "?Trade surplus [short]:+T"
msgstr "+Т"
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
msgid "Surplus: Trade"
msgstr "Избыток: ТорговлÑ"
-#: client/cityrepdata.c:506
+#: client/cityrepdata.c:504
msgid "?Trade loss (corruption) [short]:-T"
msgstr "-Т"
-#: client/cityrepdata.c:507
+#: client/cityrepdata.c:505
msgid "Corruption"
msgstr "КоррупциÑ"
-#: client/cityrepdata.c:509 client/gui-gtk-2.0/repodlgs.c:654
+#: client/cityrepdata.c:507 client/gui-gtk-2.0/repodlgs.c:654
#: client/gui-sdl/mapctrl.c:1400 client/gui-win32/repodlgs.c:334
#: client/gui-xaw/menu.c:222 client/gui-xaw/repodlgs.c:644
#: client/gui-xaw/repodlgs.c:773 data/Freeciv.in:1819
msgid "Economy"
msgstr "Ðкономика"
-#: client/cityrepdata.c:509
+#: client/cityrepdata.c:507
msgid "?gold/luxury/science:G/L/S"
msgstr "?зол/роÑк/наук:З/Ð /Ð"
-#: client/cityrepdata.c:510
+#: client/cityrepdata.c:508
msgid "Economy: Gold, Luxuries, Science"
msgstr "Ðкономика: Золото, РоÑкошь, Ðаука"
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
msgid "?Gold:G"
msgstr "?Золото:З"
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
msgid "Economy: Gold"
msgstr "Ðкономика: Золото"
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
msgid "?Luxury:L"
msgstr "?РоÑкошь:Ð "
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
msgid "Economy: Luxury"
msgstr "Ðкономика: РоÑкошь"
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
msgid "?Science:S"
msgstr "?Ðаука:Ð"
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
msgid "Economy: Science"
msgstr "Ðкономика: Ðаука"
-#: client/cityrepdata.c:518
+#: client/cityrepdata.c:516
#, fuzzy
msgid "?number_trade_routes:n"
msgstr "н"
-#: client/cityrepdata.c:518
+#: client/cityrepdata.c:516
#, fuzzy
msgid "?number_trade_routes:R"
msgstr "Т"
-#: client/cityrepdata.c:519
+#: client/cityrepdata.c:517
msgid "Number of Trade Routes"
msgstr "ЧиÑло торговых путей"
-#: client/cityrepdata.c:521
+#: client/cityrepdata.c:519
msgid "?pollution [short]:Pol"
msgstr "Загр"
-#: client/cityrepdata.c:523
+#: client/cityrepdata.c:521
msgid "?cma:Governor"
msgstr "Губернатор"
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
-#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
-#: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
-#: data/Freeciv.in:1459 data/helpdata.txt:820
+#: client/cityrepdata.c:521 client/gui-gtk-2.0/cityrep.c:1766
+#: client/gui-sdl/citydlg.c:3809 client/gui-sdl/cma_fe.c:858
+#: client/gui-win32/citydlg.c:726 data/Freeciv.in:1459 data/helpdata.txt:820
msgid "Citizen Governor"
msgstr "Губернатор"
-#: client/cityrepdata.c:526
+#: client/cityrepdata.c:524
msgid "Turns/Buy"
msgstr "Ходы/Купить"
-#: client/cityrepdata.c:529 client/cityrepdata.c:531
+#: client/cityrepdata.c:527 client/cityrepdata.c:529
msgid "Currently Building"
msgstr "Ð¡ÐµÐ¹Ñ‡Ð°Ñ Ñтроит"
-#: client/cityrepdata.c:575
+#: client/cityrepdata.c:573
msgid "?specialist:S"
msgstr "?ÑпециалиÑÑ‚:С"
-#: client/cityrepdata.c:578
+#: client/cityrepdata.c:576
msgid "Specialists"
msgstr "СпециалиÑÑ‚Ñ‹"
-#: client/civclient.c:239
+#: client/civclient.c:240
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr " -a, --autoconnect\tПропуÑтить диалог подключениÑ\n"
-#: client/civclient.c:249
+#: client/civclient.c:250
msgid " -l, --log FILE\tUse FILE as logfile (spawned server also uses this)\n"
msgstr ""
" -l, --log FILE\tИÑпользовать FILE Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи журнала (Ñервер также "
"иÑпользует Ñту команду)\n"
-#: client/civclient.c:251
+#: client/civclient.c:252
msgid " -m, --meta HOST\tConnect to the metaserver at HOST\n"
msgstr " -m, --meta HOST\tПодключитьÑÑ Ðº метаÑерверу HOST\n"
-#: client/civclient.c:253
+#: client/civclient.c:254
msgid " -n, --name NAME\tUse NAME as name\n"
msgstr " -n, --name NAME\tИÑпользовать NAME как имÑ\n"
-#: client/civclient.c:255
+#: client/civclient.c:256
msgid " -p, --port PORT\tConnect to server port PORT (usually with -a)\n"
msgstr ""
" -p, --port PORT\tПодключитьÑÑ Ðº порту PORT Ñервера (обычно вмеÑте Ñ -a)\n"
-#: client/civclient.c:257
+#: client/civclient.c:258
#, c-format
msgid " -P, --Plugin PLUGIN\tUse PLUGIN for sound output %s\n"
msgstr " -P, --Plugin PLUGIN\tИÑпользовать PLUGIN Ð´Ð»Ñ Ð·Ð²ÑƒÐºÐ¾Ð²Ð¾Ð³Ð¾ вывода %s\n"
-#: client/civclient.c:259
+#: client/civclient.c:260
msgid " -r, --read FILE\tRead startup script FILE (for spawned server only)\n"
msgstr ""
" -r, --read FILE\tПрочитать начальный Ñкрипт FILE (только Ð´Ð»Ñ Ñервера)\n"
-#: client/civclient.c:262
+#: client/civclient.c:263
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:264
+#: client/civclient.c:265
msgid " -S, --Sound FILE\tRead sound tags from FILE\n"
msgstr " -S, --Sound FILE\tПрочитать звуковую информацию из FILE\n"
-#: client/civclient.c:265
+#: client/civclient.c:266
msgid " -t, --tiles FILE\tUse data file FILE.tilespec for tiles\n"
msgstr ""
" -t, --tiles FILE\tИÑпользовать файл данных FILE.tilespec Ð´Ð»Ñ Ñчеек карты\n"
-#: client/civclient.c:268
+#: client/civclient.c:269
#, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -7940,144 +7929,154 @@ msgstr ""
"информациÑ.\n"
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:273
+#: client/civclient.c:274
#, fuzzy, c-format
msgid "Report bugs at %s\n"
msgstr "Сообщайте об ошибках по адреÑу %s.\n"
-#: client/civclient.c:297
+#: client/civclient.c:298
#, c-format
msgid "Invalid port \"%s\" specified with --port option.\n"
msgstr "Ðеверный порт \"%s\" указан наÑтройкой --port.\n"
-#: client/civclient.c:299 client/civclient.c:314
+#: client/civclient.c:300 client/civclient.c:315
msgid "Try using --help.\n"
msgstr "Попробуйте иÑпользовать --help.\n"
-#: client/civclient.c:312
+#: client/civclient.c:313
#, c-format
msgid "Invalid debug level \"%s\" specified with --debug option.\n"
msgstr "Ðеверный уровень наÑтройки \"%s\" указан наÑтройкой --debug.\n"
-#: client/civclient.c:325
+#: client/civclient.c:326
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr "ÐепонÑÑ‚Ð½Ð°Ñ Ð½Ð°Ñтройка: \"%s\"\n"
-#: client/civclient.c:539
+#: client/civclient.c:391
+#, fuzzy, c-format
+msgid "Updating old metaserver address \"%s\"."
+msgstr "metaserver <адреÑ>"
+
+#: client/civclient.c:394
+#, fuzzy, c-format
+msgid "Default metaserver has been set to \"%s\"."
+msgstr "ÐаÑтройка: %s уÑтановлена в \"%s\"."
+
+#: client/civclient.c:550
msgid "Game started."
msgstr "Игра началаÑÑŒ."
-#: client/civclient.c:577
+#: client/civclient.c:588
msgid "There was an error while auto connecting; aborting."
msgstr "Ошибка во Ð²Ñ€ÐµÐ¼Ñ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ, прерываем выполнение."
-#: client/climisc.c:176
+#: client/climisc.c:177
#, c-format
msgid "Changing production of every %s into %s."
msgstr "ИзменÑем производÑтво вÑех %s на %s."
-#: client/climisc.c:214
+#: client/climisc.c:215
msgid "?embassy:Both"
msgstr "?ПоÑольÑтво:Оба"
-#: client/climisc.c:216
+#: client/climisc.c:217
msgid "?embassy:Yes"
msgstr "?ПоÑольÑтво:Да"
-#: client/climisc.c:219
+#: client/climisc.c:220
msgid "?embassy:With Us"
msgstr "?ПоÑольÑтво:С нами"
-#: client/climisc.c:222
+#: client/climisc.c:223
msgid "?embassy:Contact"
msgstr "?ПоÑольÑтво:Контакт"
-#: client/climisc.c:224
+#: client/climisc.c:225
msgid "?embassy:No Contact"
msgstr "?ПоÑольÑтво:Ðе вÑтречал"
-#: client/climisc.c:236
+#: client/climisc.c:237
msgid "?vision:Both"
msgstr "?зрение:Оба:"
-#: client/climisc.c:238
+#: client/climisc.c:239
msgid "?vision:To Them"
msgstr "?зрение:К ним"
-#: client/climisc.c:241
+#: client/climisc.c:242
msgid "?vision:To Us"
msgstr "?зрение:К нам"
-#: client/climisc.c:257 client/climisc.c:264
+#: client/climisc.c:258 client/climisc.c:265
#, c-format
msgid "The %s give %s"
msgstr "%s дают %s"
-#: client/climisc.c:268
+#: client/climisc.c:269
#, c-format
msgid "The %s give unknown city."
msgstr "%s дают неизвеÑтный город."
-#: client/climisc.c:273
+#: client/climisc.c:274
#, c-format
msgid "The %s give %d gold"
msgstr "%s дают %d золотых"
-#: client/climisc.c:278
+#: client/climisc.c:279
#, c-format
msgid "The %s give their worldmap"
msgstr "%s дают Ñвою карту мира"
-#: client/climisc.c:282
+#: client/climisc.c:283
#, c-format
msgid "The %s give their seamap"
msgstr "%s дают Ñвою карту морей"
-#: client/climisc.c:286
+#: client/climisc.c:287
msgid "The parties agree on a cease-fire"
msgstr "Стороны договорилиÑÑŒ о прекращении огнÑ"
-#: client/climisc.c:289
+#: client/climisc.c:290
msgid "The parties agree on a peace"
msgstr "Стороны договорилиÑÑŒ о мире"
-#: client/climisc.c:292
+#: client/climisc.c:293
msgid "The parties create an alliance"
msgstr "Стороны договорилиÑÑŒ об альÑнÑе"
-#: client/climisc.c:295
+#: client/climisc.c:296
#, c-format
msgid "The %s give shared vision"
msgstr "%s делÑÑ‚ÑÑ Ñвоим зрением"
-#: client/climisc.c:299
+#: client/climisc.c:300
#, c-format
msgid "The %s give an embassy"
msgstr "%s дают поÑольÑтво"
-#: client/climisc.c:902
+#: client/climisc.c:906
msgid "Popup Request"
msgstr "Открыть запроÑ"
-#: client/climisc.c:932
+#: client/climisc.c:936
msgid "Exporting output window to civgame.log ..."
msgstr "ÐкÑпортируем окно вывода в civgame.log ..."
-#: client/climisc.c:936
+#: client/climisc.c:940
msgid "Export complete."
msgstr "ÐкÑпопрт закончен."
-#: client/climisc.c:938
+#: client/climisc.c:942
msgid "Export failed, couldn't write to file."
msgstr "ÐкÑпорт провалилÑÑ, не могу пиÑать в файл."
-#: client/climisc.c:1038
+#: client/climisc.c:1042
#, c-format
msgid "You don't buy %s in %s!"
msgstr "Вы не купили %s в %s!"
-#: client/climisc.c:1056
+#: client/climisc.c:1060
#, c-format
msgid "%s costs %d gold and you only have %d gold."
msgstr "%s Ñтоит %d золотых, а у Ð’Ð°Ñ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ %d золотых."
@@ -8127,19 +8126,19 @@ msgstr ""
"ÐвтоматичеÑки подключаемÑÑ Ðº Ñерверу \"%s\", порт %d, как \"%s\", каждые %f "
"Ñекунд, %d раз"
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1289
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
msgid "novice"
msgstr "новичок"
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1289
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1358
msgid "easy"
msgstr "лёгкий"
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1290
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
msgid "normal"
msgstr "нормальный"
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1290
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
msgid "hard"
msgstr "Ñ‚Ñжёлый"
@@ -8168,38 +8167,42 @@ msgid "We probably couldn't start it from here."
msgstr "Возможно, мы не Ñможем Ñтартовать отÑюда."
#: client/connectdlg_common.c:470
-msgid "We have control of the server (command access level hack)"
+#, fuzzy
+msgid ""
+"Established control over the server. You have command access level 'hack'."
msgstr "У Ð’Ð°Ñ ÐµÑÑ‚ÑŒ доÑтуп к наÑтройкам Ñервера (ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð°Ñ Ñтрока)"
#: client/connectdlg_common.c:475
-msgid "We can't take control of server, attempting to kill it."
-msgstr "У Ð’Ð°Ñ Ð½ÐµÑ‚ доÑтупа к наÑтройкам Ñервера, пробуем закрыть Ñервер."
+msgid ""
+"Failed to obtain the required access level to take control of the server. "
+"The server will now be shutdown."
+msgstr ""
-#: client/control.c:1104
+#: client/control.c:1123
msgid "Only transporter units can be unloaded."
msgstr "Ð’Ñ‹ можете разгрузить только транÑпортирующие ÑоединениÑ."
-#: client/control.c:1353
+#: client/control.c:1425
msgid "Only settler units can be put into auto mode."
msgstr "Только колониÑÑ‚Ñ‹ могут быть уÑтановлены в авто-режим."
-#: client/control.c:1444
+#: client/control.c:1516
msgid "Only nuclear units can do this."
msgstr "Только атомные ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð¼Ð¾Ð³ÑƒÑ‚ делать Ñто."
-#: client/control.c:1473
+#: client/control.c:1545
msgid "Only paratrooper units can do this."
msgstr "Только парашютиÑÑ‚Ñ‹ могут делать Ñто."
-#: client/control.c:1921
+#: client/control.c:2020
msgid "Too far for this unit."
msgstr "Слишком далеко Ð´Ð»Ñ Ñтого ÑоединениÑ."
-#: client/control.c:2131 client/control.c:2161 client/control.c:2177
+#: client/control.c:2230 client/control.c:2260 client/control.c:2276
msgid "Didn't find a route to the destination!"
msgstr "Ðе найден путь к цели!"
-#: client/control.c:2221
+#: client/control.c:2320
msgid "Oh my! You seem to have no capital!"
msgstr "Ой! Ру Ð’Ð°Ñ Ð²Ñ€Ð¾Ð´Ðµ бы нет Ñтолицы!"
@@ -8268,16 +8271,16 @@ msgid "Allows %s (with %s)."
msgstr "ПозволÑет %s (Ñ %s)."
#. TRANS: preserve single space at beginning
-#: client/helpdata.c:418
+#: client/helpdata.c:416
msgid " Rivers"
msgstr " Реки"
-#: client/helpdata.c:576
+#: client/helpdata.c:574
#, c-format
msgid "Sorry, no help topic for %s.\n"
msgstr "Извините, нет Ñправки Ð´Ð»Ñ %s.\n"
-#: client/helpdata.c:580
+#: client/helpdata.c:578
#, c-format
msgid ""
"Sorry, no help topic for %s.\n"
@@ -8288,7 +8291,7 @@ msgstr ""
"Ðта Ñтраница была Ñоздана автоматичеÑки.\n"
"\n"
-#: client/helpdata.c:670
+#: client/helpdata.c:668
msgid ""
"Requires: Nothing\n"
"\n"
@@ -8296,59 +8299,59 @@ msgstr ""
"ТребуетÑÑ: Ðичего\n"
"\n"
-#: client/helpdata.c:675
+#: client/helpdata.c:673
#, c-format
msgid "* The discovery of %s will make %s obsolete.\n"
msgstr "* Открытие %s упразднит %s.\n"
-#: client/helpdata.c:694
+#: client/helpdata.c:692
#, c-format
msgid "* Allows all players with knowledge of %s to build %s units.\n"
msgstr ""
"* ПозволÑет вÑем игрокам знающим технологию %s Ñтроить ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ %s.\n"
-#: client/helpdata.c:706
+#: client/helpdata.c:704
#, c-format
msgid "* Allows %s (with %s).\n"
msgstr "* Разрешает %s (Ñ %s).\n"
-#: client/helpdata.c:710
+#: client/helpdata.c:708
#, c-format
msgid "* Allows %s.\n"
msgstr "* Разрешает %s.\n"
-#: client/helpdata.c:780
+#: client/helpdata.c:778
#, c-format
msgid "* Can only be built if there is %s in the city.\n"
msgstr "* Может быть поÑтроено только еÑли в городе еÑÑ‚ÑŒ %s.\n"
-#: client/helpdata.c:786
+#: client/helpdata.c:784
#, c-format
msgid "* Can only be built with %s as government.\n"
msgstr "* Может быть поÑтроено только при форме Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ %s.\n"
-#: client/helpdata.c:791
+#: client/helpdata.c:789
msgid "* May not be built in cities.\n"
msgstr "* Ðе может быть поÑтроено в городах.\n"
-#: client/helpdata.c:794
+#: client/helpdata.c:792
msgid "* Never has a home city.\n"
msgstr "* Ðе может иметь домашнего города.\n"
-#: client/helpdata.c:797
+#: client/helpdata.c:795
msgid "* Losing this unit will lose you the game!\n"
msgstr "* ПотерÑв данное Ñоединение Ð’Ñ‹ проиграете в игре!\n"
-#: client/helpdata.c:801
+#: client/helpdata.c:799
msgid "* Each player may only have one of this type of unit.\n"
msgstr "* Каждый игрок может иметь только одно Ñоединение данного типа.\n"
-#: client/helpdata.c:805
+#: client/helpdata.c:803
#, c-format
msgid "* Requires %d population to build.\n"
msgstr "* Ðеобходимо %d жителей Ð´Ð»Ñ Ð¿Ð¾Ñтройки.\n"
-#: client/helpdata.c:811
+#: client/helpdata.c:809
#, c-format
msgid "* Can carry and refuel %d air unit.\n"
msgid_plural "* Can carry and refuel %d air units.\n"
@@ -8356,7 +8359,7 @@ msgstr[0] "* Может перевозить и дозаправлÑÑ‚ÑŒ %d во
msgstr[1] "* Может перевозить и дозаправлÑÑ‚ÑŒ %d воздушные ÑоединениÑ.\n"
msgstr[2] "* Может перевозить и дозаправлÑÑ‚ÑŒ %d воздушных Ñоединений.\n"
-#: client/helpdata.c:816
+#: client/helpdata.c:814
#, c-format
msgid "* Can carry and refuel %d missile unit.\n"
msgid_plural "* Can carry and refuel %d missile units.\n"
@@ -8364,7 +8367,7 @@ msgstr[0] "* Может перевозить и дозаправлÑÑ‚ÑŒ %d ра
msgstr[1] "* Может перевозить и дозаправлÑÑ‚ÑŒ %d ракетные ÑоединениÑ.\n"
msgstr[2] "* Может перевозить и дозаправлÑÑ‚ÑŒ %d ракетных Ñоединений.\n"
-#: client/helpdata.c:821
+#: client/helpdata.c:819
#, c-format
msgid "* Can carry %d ground unit across water.\n"
msgid_plural "* Can carry %d ground units across water.\n"
@@ -8372,7 +8375,7 @@ msgstr[0] "* Может перевозить %d наземное Ñоедине
msgstr[1] "* Может перевозить %d наземных Ñоединений по воде.\n"
msgstr[2] "* Может перевозить %d наземных Ñоединений по воде.\n"
-#: client/helpdata.c:830
+#: client/helpdata.c:828
msgid ""
"* Can establish trade routes (must travel to target city and must be at "
"least 9 tiles [in Manhattan distance] from this unit's home city).\n"
@@ -8381,127 +8384,127 @@ msgstr ""
"который ÑвлÑетÑÑ Ð²Ð°ÑˆÐµÐ¹ целью, на раÑÑтоÑнии не менее 9 квадратов [по "
"диагонали ÑчитаетÑÑ ÐºÐ°Ðº 2] от домашнего города вашего ÑоединениÑ).\n"
-#: client/helpdata.c:836
+#: client/helpdata.c:834
#, c-format
msgid "* Can help build wonders (adds %d production).\n"
msgstr "* Может помогать Ñтроить чудеÑа (добавлÑет %d единиц производÑтва).\n"
-#: client/helpdata.c:840
+#: client/helpdata.c:838
msgid "* May not be disbanded.\n"
msgstr "* ÐÐµÐ»ÑŒÐ·Ñ Ñ€Ð°ÑпуÑтить.\n"
-#: client/helpdata.c:842
+#: client/helpdata.c:840
#, c-format
msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
msgstr "* Может быть раÑпущен в городе Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸ÐµÐ¼ 50%% от ÑтоимоÑти.\n"
-#: client/helpdata.c:846
+#: client/helpdata.c:844
msgid "* Can build new cities.\n"
msgstr "* Может Ñтроить новые города.\n"
-#: client/helpdata.c:849
+#: client/helpdata.c:847
#, c-format
msgid "* Can add on %d population to cities of no more than size %d.\n"
msgstr "* Может добавить %d жителей к городам, размер которых не более %d.\n"
-#: client/helpdata.c:858
+#: client/helpdata.c:856
msgid "* Can build roads and railroads.\n"
msgstr "* Может Ñтроить дороги и железные дороги.\n"
-#: client/helpdata.c:859
+#: client/helpdata.c:857
msgid "* Can build mines on tiles.\n"
msgstr "* Может Ñтроить шахты.\n"
-#: client/helpdata.c:860
+#: client/helpdata.c:858
msgid "* Can build irrigation on tiles.\n"
msgstr "* Может Ñтроить орошение.\n"
-#: client/helpdata.c:865
+#: client/helpdata.c:863
msgid "* Can build farmland.\n"
msgstr "* Может Ñтроить ферму.\n"
-#: client/helpdata.c:869
+#: client/helpdata.c:867
#, c-format
msgid "* Can build farmland (if %s is known).\n"
msgstr "* Может Ñтроить ферму (еÑли извеÑтно %s).\n"
-#: client/helpdata.c:873
+#: client/helpdata.c:871
#, c-format
msgid "* Can build farmland (if any of the following are known: %s).\n"
msgstr "* Может Ñтроить ферму (еÑли что-либо из ÑпиÑка извеÑтно: %s).\n"
-#: client/helpdata.c:881
+#: client/helpdata.c:879
msgid "* Can build fortresses.\n"
msgstr "* Может Ñтроить крепоÑти.\n"
-#: client/helpdata.c:885
+#: client/helpdata.c:883
#, c-format
msgid "* Can build fortresses (if %s is known).\n"
msgstr "* Может Ñтроить крепоÑти (еÑли извеÑтно %s).\n"
-#: client/helpdata.c:889
+#: client/helpdata.c:887
#, c-format
msgid "* Can build fortresses (if any of the following are known: %s).\n"
msgstr "* Может Ñтроить крепоÑти (еÑли что-либо из ÑпиÑка извеÑтно: %s).\n"
-#: client/helpdata.c:895
+#: client/helpdata.c:893
msgid "* Can clean pollution from tiles.\n"
msgstr "* Может очищать загрÑзнениÑ.\n"
-#: client/helpdata.c:896
+#: client/helpdata.c:894
msgid "* Can clean nuclear fallout from tiles.\n"
msgstr "* Может очищать радиоактивные загрÑзнениÑ.\n"
-#: client/helpdata.c:899
+#: client/helpdata.c:897
msgid "* Can transform tiles.\n"
msgstr "* Может изменÑÑ‚ÑŒ ландшафт.\n"
-#: client/helpdata.c:902
+#: client/helpdata.c:900
msgid "* Can build airbases.\n"
msgstr "* Может Ñтроить аÑродромы.\n"
-#: client/helpdata.c:906
+#: client/helpdata.c:904
#, c-format
msgid "* May fortify, granting a 50%% defensive bonus.\n"
msgstr "* Может укреплÑÑ‚ÑŒÑÑ, что даёт 50%% защитную премию.\n"
-#: client/helpdata.c:909
+#: client/helpdata.c:907
msgid "* May pillage to destroy infrastructure from tiles.\n"
msgstr "* Может грабить и уничтожать инфраÑтруктуру.\n"
-#: client/helpdata.c:913
+#: client/helpdata.c:911
msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
msgstr ""
"* Может выполнÑÑ‚ÑŒ дипломатичеÑкие функции и обладает Ñпециальными шпионÑкими "
"ÑпоÑобноÑÑ‚Ñми.\n"
-#: client/helpdata.c:916
+#: client/helpdata.c:914
msgid "* Can perform diplomatic actions.\n"
msgstr "* Может выполнÑÑ‚ÑŒ дипломатичеÑкие функции.\n"
-#: client/helpdata.c:920
+#: client/helpdata.c:918
msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
msgstr "* Ðикогда не проигрывает в дипломатичеÑкой борьбе.\n"
-#: client/helpdata.c:923
+#: client/helpdata.c:921
msgid "* May not be bribed.\n"
msgstr "* Ðе может быть завербовано.\n"
-#: client/helpdata.c:926
+#: client/helpdata.c:924
msgid "* Can attack enemy air units.\n"
msgstr "* Может атаковать чужие воздушные ÑоединениÑ.\n"
-#: client/helpdata.c:930
+#: client/helpdata.c:928
msgid "* Is invisible except when next to an enemy unit or city.\n"
msgstr ""
"* Ðевидим, за иÑключением Ñлучаев, когда Ñ€Ñдом Ñ Ð²Ñ€Ð°Ð¶ÐµÑким Ñоединением или "
"городом.\n"
-#: client/helpdata.c:934
+#: client/helpdata.c:932
msgid "* Can only attack units on ocean squares (no land attacks).\n"
msgstr "* Может атаковать только войка в океане (нет береговых атак).\n"
-#: client/helpdata.c:938
+#: client/helpdata.c:936
msgid ""
"* Can attack from aboard sea units: against enemy cities and onto land "
"squares.\n"
@@ -8509,41 +8512,41 @@ msgstr ""
"* Может атаковать Ñ Ð¼Ð¾Ñ€Ñких Ñоединений: против вражеÑких городов и на земные "
"квадраты.\n"
-#: client/helpdata.c:943
+#: client/helpdata.c:941
#, c-format
msgid "* Can be paradropped from a friendly city (Range: %d).\n"
msgstr ""
"* Может быть Ñброшен на парашюте из дружеÑтвенного города (РаÑÑтоÑние: %d).\n"
-#: client/helpdata.c:949
+#: client/helpdata.c:947
msgid "* Gets double defense against units specified as 'mounted'.\n"
msgstr "* Имеет двойную защиту против 'конных' Ñоединений.\n"
-#: client/helpdata.c:953
+#: client/helpdata.c:951
msgid "* Counts as 'mounted' against certain defenders.\n"
msgstr "* СчитаетÑÑ 'конным' против определённых защитников.\n"
-#: client/helpdata.c:957
+#: client/helpdata.c:955
msgid "* A missile unit: gets used up in making an attack.\n"
msgstr "* Ракетное Ñоединение: иÑпользуетÑÑ Ð´Ð»Ñ Ð°Ñ‚Ð°ÐºÐ¸.\n"
-#: client/helpdata.c:960
+#: client/helpdata.c:958
msgid "* Making an attack ends this unit's turn.\n"
msgstr "* Ðтака заканчивает ход Ñтого ÑоединениÑ.\n"
-#: client/helpdata.c:964
+#: client/helpdata.c:962
msgid "* This unit's attack causes a nuclear explosion!\n"
msgstr "* Ðтака Ñтого ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð²Ñ‹Ð·Ñ‹Ð²Ð°ÐµÑ‚ Ñдерный взрыв!\n"
-#: client/helpdata.c:968
+#: client/helpdata.c:966
msgid "* Gets double firepower when attacking cities.\n"
msgstr "* Получает двойную огневую мощь при атаке городов.\n"
-#: client/helpdata.c:971
+#: client/helpdata.c:969
msgid "* Ignores the effects of city walls.\n"
msgstr "* Игнорирует Ñффект городÑких Ñтен.\n"
-#: client/helpdata.c:975
+#: client/helpdata.c:973
#, c-format
msgid ""
"* Does bombard attacks (%d per turn). These attacks will only damage (never "
@@ -8553,36 +8556,36 @@ msgstr ""
"наноÑит Ð¿Ð¾Ð²Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ñ Ð²Ñ€Ð°Ð³Ñƒ (никогда не убивает), но зато нападающий ничем не "
"риÑкует.\n"
-#: client/helpdata.c:982
+#: client/helpdata.c:980
msgid "* Gets quintuple defense against missiles and aircraft.\n"
msgstr "* Даёт пÑтикратную защиту против ракет и Ñамолётов.\n"
-#: client/helpdata.c:986
+#: client/helpdata.c:984
msgid "* Ignores terrain effects (treats all squares as roads).\n"
msgstr "* Игнорирует Ñффекты рельефа (воÑпринимает вÑе квадраты как дороги).\n"
-#: client/helpdata.c:989
+#: client/helpdata.c:987
msgid "* Ignores zones of control.\n"
msgstr "* Игнорирует зоны контролÑ.\n"
-#: client/helpdata.c:993
+#: client/helpdata.c:991
msgid "* A non-military unit (cannot attack; no martial law).\n"
msgstr ""
"* Ðе-военное Ñоединение (не может атаковать; нет военного положениÑ).\n"
-#: client/helpdata.c:997
+#: client/helpdata.c:995
msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
msgstr "* Полевое Ñоединение: одно неÑчаÑтье, даже еÑли не агреÑÑивен.\n"
-#: client/helpdata.c:1000
+#: client/helpdata.c:998
msgid "* Will never achieve veteran status.\n"
msgstr "* Ðикогда не доÑтигнет ÑтатуÑа ветерана.\n"
-#: client/helpdata.c:1002
+#: client/helpdata.c:1000
msgid "* May become veteran through training or combat.\n"
msgstr "* Может Ñтать ветераном в процеÑÑе Ð¾Ð±ÑƒÑ‡ÐµÐ½Ð¸Ñ Ð¸Ð»Ð¸ в бою.\n"
-#: client/helpdata.c:1008
+#: client/helpdata.c:1006
#, c-format
msgid ""
"* Must end turn in a city or next to land, or has a 50%% risk of being lost "
@@ -8591,12 +8594,12 @@ msgstr ""
"* Должен закончить ход в городе или Ñ€Ñдом Ñ Ð·ÐµÐ¼Ð»ÐµÐ¹, иначе 50%% риÑк "
"потерÑÑ‚ÑŒÑÑ Ð² море.\n"
-#: client/helpdata.c:1012
+#: client/helpdata.c:1010
#, c-format
msgid "* The discovery of %s reduces the risk to 25%%.\n"
msgstr "* Открытие технологии %s уменьшает риÑк до 25%%.\n"
-#: client/helpdata.c:1017
+#: client/helpdata.c:1015
#, c-format
msgid "* %s reduces the risk to 12%%.\n"
msgstr "* %s уменьшает риÑк до 12%%.\n"
@@ -8605,15 +8608,15 @@ msgstr "* %s уменьшает риÑк до 12%%.\n"
#. * last two elements
#. TRANS: List of possible output types has this between
#. * last two elements
-#: client/helpdata.c:1068 client/helpdata.c:1402
+#: client/helpdata.c:1066 client/helpdata.c:1400
msgid " or "
msgstr " или "
-#: client/helpdata.c:1070 client/helpdata.c:1390
+#: client/helpdata.c:1068 client/helpdata.c:1388
msgid "?or:, "
msgstr "?или:, "
-#: client/helpdata.c:1082
+#: 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"
@@ -8621,12 +8624,12 @@ msgstr[0] "Соединение должно быть в городе или н
msgstr[1] "Соединение должно быть в городе или на %s поÑле %d ходов.\n"
msgstr[2] "Соединение должно быть в городе или на %s поÑле %d ходов.\n"
-#: client/helpdata.c:1124
+#: client/helpdata.c:1122
#, c-format
msgid "If we would now start with %s we would need %d bulbs."
msgstr "ЕÑли мы начнем %s, нам потребуетÑÑ %d лампочек."
-#: client/helpdata.c:1129
+#: client/helpdata.c:1127
#, c-format
msgid ""
"To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8635,88 +8638,88 @@ msgstr ""
"Ð”Ð»Ñ Ñ‚Ð¾Ð³Ð¾, чтобы доÑтичь технологию %s, нам нужно приобреÑти еще %d "
"технологий. ВеÑÑŒ проект потребует %d лампочек Ð´Ð»Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ñ."
-#: client/helpdata.c:1137
+#: client/helpdata.c:1135
msgid "You cannot research this technology."
msgstr "Ð’Ñ‹ не можете иÑÑледовать Ñту технологию."
-#: client/helpdata.c:1141
+#: client/helpdata.c:1139
msgid " This number may vary depending on what other players will research.\n"
msgstr " Ðто чиÑло может завиÑеть от того, что изобретут другие игроки.\n"
-#: client/helpdata.c:1153
+#: client/helpdata.c:1151
#, c-format
msgid "* The first player to research %s gets an immediate advance.\n"
msgstr "* Первый игрок, открывший %s, получает немедленное открытие.\n"
-#: client/helpdata.c:1158
+#: client/helpdata.c:1156
#, c-format
msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
msgstr "* Уменьшает вероÑтноÑÑ‚ÑŒ утери кораблей в океане до 25%%.\n"
-#: client/helpdata.c:1161
+#: client/helpdata.c:1159
#, c-format
msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
msgstr "* Уменьшает вероÑтноÑÑ‚ÑŒ утери кораблей в океане до 12%%.\n"
-#: client/helpdata.c:1165
+#: client/helpdata.c:1163
msgid "* Increases the pollution generated by the population.\n"
msgstr "* Увеличивает загрÑзнениÑ, Ñоздаваемые наÑелением.\n"
-#: client/helpdata.c:1170
+#: client/helpdata.c:1168
#, c-format
msgid "* Allows %s to build roads on river squares.\n"
msgstr "* ПозволÑет Ñоединению %s Ñтроить дороги на речных квадратах.\n"
-#: client/helpdata.c:1177
+#: client/helpdata.c:1175
#, c-format
msgid "* Allows %s to build fortresses.\n"
msgstr "* ПозволÑет Ñоединению %s Ñтроить крепоÑти.\n"
-#: client/helpdata.c:1185
+#: client/helpdata.c:1183
#, c-format
msgid "* Allows %s to build airbases.\n"
msgstr "* ПозволÑет Ñоединению %s Ñтроить аÑродромы.\n"
-#: client/helpdata.c:1194
+#: client/helpdata.c:1192
#, c-format
msgid "* Allows %s to upgrade roads to railroads.\n"
msgstr "* ПозволÑет Ñоединению %s обновлÑÑ‚ÑŒ дороги до железных дорог.\n"
-#: client/helpdata.c:1202
+#: client/helpdata.c:1200
#, c-format
msgid "* Allows %s to upgrade irrigation to farmland.\n"
msgstr "* ПозволÑет Ñоединению %s обновлÑÑ‚ÑŒ Ð¾Ñ€Ð¾ÑˆÐµÐ½Ð¸Ñ Ð´Ð¾ ферм.\n"
-#: client/helpdata.c:1236
+#: client/helpdata.c:1234
msgid "* Pollution cannot be generated on this terrain."
msgstr "* ЗагрÑзнение не проиÑходит в Ñтом рельефе."
-#: client/helpdata.c:1241
+#: client/helpdata.c:1239
msgid "* You cannot build cities on this terrain."
msgstr "* Ð’Ñ‹ не можете Ñтроить города в Ñтом рельефе."
-#: client/helpdata.c:1247
+#: client/helpdata.c:1245
msgid "* The coastline of this terrain is unsafe."
msgstr "* Берег Ñтого рельефа опаÑен."
-#: client/helpdata.c:1252
+#: client/helpdata.c:1250
msgid "* This terrain is unsafe for units to travel on."
msgstr "* Ðтот рельеф опаÑен Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ´Ð²Ð¸Ð³Ð°ÑŽÑ‰Ð¸Ñ…ÑÑ Ñоединений."
-#: client/helpdata.c:1257
+#: client/helpdata.c:1255
msgid "* Land units cannot travel on oceanic terrains."
msgstr "* Ðаземеные ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð½Ðµ могут перемещатьÑÑ Ð¿Ð¾ морÑкому рельефу."
-#: client/helpdata.c:1307
+#: client/helpdata.c:1305
msgid "Features:\n"
msgstr "ОÑобенноÑти:\n"
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1413 client/helpdata.c:1414
+#: client/helpdata.c:1411 client/helpdata.c:1412
msgid "?outputlist: Nothing "
msgstr " Ðичего "
-#: client/helpdata.c:1421
+#: client/helpdata.c:1419
#, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
@@ -8734,7 +8737,7 @@ msgstr[2] ""
"* Военные ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð²Ð½Ðµ города и полевые ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ñделают %d жителей "
"недовольными.\n"
-#: client/helpdata.c:1431
+#: client/helpdata.c:1429
#, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8744,30 +8747,30 @@ msgstr ""
"вызвано ÑоединениÑми.\n"
#. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1439
+#: client/helpdata.c:1437
#, c-format
msgid "* You pay %d times normal %s upkeep for your units.\n"
msgstr "* Ð’Ñ‹ платите %d раз по %s за Ñодержание Ваших Ñоединений.\n"
-#: client/helpdata.c:1444
+#: client/helpdata.c:1442
#, 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:1449
+#: client/helpdata.c:1447
#, c-format
msgid "* You pay no %s upkeep for your units.\n"
msgstr "* Ð’Ñ‹ не платите %s за Ñодержание Ваших Ñоединений.\n"
-#: client/helpdata.c:1453
+#: client/helpdata.c:1451
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:1462
+#: client/helpdata.c:1460
#, c-format
msgid "* Each of your cities will avoid paying %d %s towards unit upkeep.\n"
msgstr ""
@@ -8775,13 +8778,13 @@ msgstr ""
#. TRANS: Amount is subtracted from upkeep cost
#. * for each upkeep type.
-#: client/helpdata.c:1470
+#: client/helpdata.c:1468
#, c-format
msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
msgstr ""
"* Каждый из Ваших городов избежит платы %d золота за Ñодержание Ñоединений.\n"
-#: client/helpdata.c:1477
+#: client/helpdata.c:1475
#, c-format
msgid "* Chance of civil war is %d%% if you lose your capital.\n"
msgstr ""
@@ -8789,7 +8792,7 @@ msgstr ""
"d%%.\n"
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1484
+#: client/helpdata.c:1482
#, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -8799,7 +8802,7 @@ msgstr ""
"поÑвитÑÑ, когда у Ð²Ð°Ñ Ð±ÑƒÐ´ÐµÑ‚ %d городов.\n"
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1491
+#: client/helpdata.c:1489
#, c-format
msgid ""
"* After the first unhappy citizen due to city size, for each %d additional "
@@ -8808,18 +8811,18 @@ msgstr ""
"* ПоÑле первого неÑчаÑтного Ð¶Ð¸Ñ‚ÐµÐ»Ñ Ð² ÑвÑзи Ñ Ñ€Ð°Ð·Ð¼ÐµÑ€Ð¾Ð¼ цивилизации, на каждые "
"%d дополнительных городов ещё один житель Ñтанет неÑчаÑтным.\n"
-#: client/helpdata.c:1499
+#: client/helpdata.c:1497
#, c-format
msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
msgstr ""
"МакÑимальный уровень, который Ð’Ñ‹ можете уÑтановить Ð´Ð»Ñ Ð½Ð°ÑƒÐºÐ¸, золота, "
"роÑкоши - %d%%.\n"
-#: client/helpdata.c:1504
+#: client/helpdata.c:1502
msgid "Has unlimited science/gold/luxuries rates.\n"
msgstr "Ðет ограничений на Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ ÑƒÑ€Ð¾Ð²Ð½Ñ Ð½Ð°ÑƒÐºÐ¸/золота/роÑкоши.\n"
-#: client/helpdata.c:1509
+#: client/helpdata.c:1507
#, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
@@ -8837,7 +8840,7 @@ msgstr[2] ""
"* Ð’Ñ‹ можете ввеÑти военное положение. Каждое военное Ñоединение в городе "
"Ñделает %d недовольных жителей нейтральными.\n"
-#: client/helpdata.c:1521
+#: client/helpdata.c:1519
#, 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"
@@ -8852,7 +8855,7 @@ msgstr[2] ""
"военного положениÑ.\n"
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1532
+#: client/helpdata.c:1530
#, c-format
msgid ""
"* You may grow your cities by means of celebrations. Your cities must be at "
@@ -8862,15 +8865,15 @@ msgstr ""
"должны иметь размер как минимум %d, прежде чем они Ñмогут увеличитьÑÑ Ð´Ð°Ð½Ð½Ñ‹Ð¼ "
"ÑпоÑобом.\n"
-#: client/helpdata.c:1538
+#: client/helpdata.c:1536
msgid "* Your units cannot be bribed.\n"
msgstr "* Ваши ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð½Ðµ могут быть завербованы противником.\n"
-#: client/helpdata.c:1541
+#: client/helpdata.c:1539
msgid "* Your cities cannot be incited.\n"
msgstr "* Ваши города Ð½ÐµÐ»ÑŒÐ·Ñ Ð¿Ð¾Ð´Ñтрекать к мÑтежу.\n"
-#: client/helpdata.c:1545
+#: client/helpdata.c:1543
msgid ""
"* Government will fall into anarchy if any city is in disorder for more than "
"two turns in a row.\n"
@@ -8878,15 +8881,15 @@ msgstr ""
"* Форма Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ñтанет анархией, еÑли в любом городе гражданÑкие "
"беÑпорÑдки продолжаютÑÑ Ð±Ð¾Ð»ÐµÐµ 2 ходов.\n"
-#: client/helpdata.c:1551
+#: client/helpdata.c:1549
msgid "* Has a senate that may prevent declaration of war.\n"
msgstr "* ИмеетÑÑ Ñенат, который может воÑпрепÑÑ‚Ñтвовать объÑвлению войны.\n"
-#: client/helpdata.c:1555
+#: client/helpdata.c:1553
msgid "* Allows partisans when cities are taken by the enemy.\n"
msgstr "* Партизаны поÑвлÑÑŽÑ‚ÑÑ, когда города захватываютÑÑ Ð¿Ñ€Ð¾Ñ‚Ð¸Ð²Ð½Ð¸ÐºÐ¾Ð¼.\n"
-#: client/helpdata.c:1559
+#: client/helpdata.c:1557
msgid ""
"* Buildings that normally confer bonuses against unhappiness will instead "
"give gold.\n"
@@ -8894,25 +8897,25 @@ msgstr ""
"* ЗданиÑ, которые обычно помогают против неÑчаÑтноÑти граждан, вмеÑто Ñтого "
"приноÑÑÑ‚ золото.\n"
-#: client/helpdata.c:1563
+#: client/helpdata.c:1561
msgid "* Pays no upkeep for fanatics.\n"
msgstr "* Ðе надо платить за Ñодержание фанатиков.\n"
-#: client/helpdata.c:1566
+#: client/helpdata.c:1564
msgid "* Has no unhappy citizens.\n"
msgstr "* Ðет неÑчаÑтных граждан.\n"
-#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
+#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
#, c-format
msgid "* Veteran %s units.\n"
msgstr "* Ð¡Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ %s ÑоздаютÑÑ Ð²ÐµÑ‚ÐµÑ€Ð°Ð½Ð°Ð¼Ð¸.\n"
-#: client/helpdata.c:1587
+#: client/helpdata.c:1585
msgid "* Veteran units.\n"
msgstr "* Ð¡Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ ÑоздаютÑÑ Ð²ÐµÑ‚ÐµÑ€Ð°Ð½Ð°Ð¼Ð¸.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1593
+#: client/helpdata.c:1591
#, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8922,7 +8925,7 @@ msgstr ""
"1 единицу, когда не празднуют.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1602
+#: client/helpdata.c:1600
#, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8932,115 +8935,115 @@ msgstr ""
"когда празднуют.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1610
+#: client/helpdata.c:1608
#, 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:1619
+#: client/helpdata.c:1617
#, 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:1627
+#: client/helpdata.c:1625
#, 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:1632
+#: client/helpdata.c:1630
#, 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:1637
+#: client/helpdata.c:1635
#, 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:1645
+#: client/helpdata.c:1643
#, 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:1651
+#: client/helpdata.c:1649
#, 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:1657
+#: client/helpdata.c:1655
#, c-format
msgid "* %s waste will increase slowly with distance from capital.\n"
msgstr "* РаÑтраты %s медленно раÑтут по мере ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ð¾Ñ‚ Ñтолицы.\n"
-#: client/helpdata.c:1674
+#: client/helpdata.c:1672
#, c-format
msgid "* Allows you to build %s.\n"
msgstr "* ПозволÑет Вам Ñтроить %s.\n"
#. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1701
+#: client/helpdata.c:1699
#, c-format
msgid "%s%d %s"
msgstr "%s%d %s"
-#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1700 client/helpdata.c:1708 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:1709
+#: client/helpdata.c:1707
#, c-format
msgid "%s%d unhappy"
msgstr "%s%d неÑчаÑÑ‚ÑŒÑ"
-#: client/mapctrl_common.c:382
+#: client/mapctrl_common.c:399
#, c-format
msgid "You don't know how to build %s!"
msgstr "Вы не знаете как делать %s!"
-#: client/mapctrl_common.c:392
+#: client/mapctrl_common.c:409
#, c-format
msgid "Copy %s to clipboard."
msgstr "Копируем %s в буфер обмена."
-#: client/mapctrl_common.c:408
+#: client/mapctrl_common.c:425
msgid "Clipboard is empty."
msgstr "Буфер обмена пуÑÑ‚."
-#: client/options.c:98
+#: client/options.c:102
msgid "Graphics"
msgstr "Графика"
-#: client/options.c:99
+#: client/options.c:103
msgid "Overview"
msgstr "Обзор"
-#: client/options.c:100
+#: client/options.c:104
msgid "Sound"
msgstr "Звуки"
-#: client/options.c:101
+#: client/options.c:105
msgid "Interface"
msgstr "ИнтерфейÑ"
-#: client/options.c:102
+#: client/options.c:106
msgid "Network"
msgstr "Сеть"
-#: client/options.c:107
+#: client/options.c:111
msgid "Login name"
msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
-#: client/options.c:108
+#: client/options.c:112
msgid ""
"This is the default login username that will be used in the connection "
"dialogs or with the -a command-line parameter."
@@ -9048,11 +9051,11 @@ msgstr ""
"Ðто Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¿Ð¾ умолчанию, которое будет иÑпользоватьÑÑ Ð² диалоге "
"Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð¸Ð»Ð¸ в командной Ñтроке Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¾Ð¼ -a"
-#: client/options.c:113
+#: client/options.c:117
msgid "Server"
msgstr "Сервер"
-#: client/options.c:114
+#: client/options.c:118
msgid ""
"This is the default server hostname that will be used in the connection "
"dialogs or with the -a command-line parameter."
@@ -9060,11 +9063,11 @@ msgstr ""
"Ðто Ñервер по умолчанию, который будет иÑпользоватьÑÑ Ð² диалоге Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ "
"или в командной Ñтроке Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¾Ð¼ -a"
-#: client/options.c:119
+#: client/options.c:123
msgid "Server port"
msgstr "Порт Ñервера"
-#: client/options.c:120
+#: client/options.c:124
msgid ""
"This is the default server port that will be used in the connection dialogs "
"or with the -a command-line parameter."
@@ -9072,11 +9075,11 @@ msgstr ""
"Ðто порт Ñервера по умолчанию, который будет иÑпользоватьÑÑ Ð² диалоге "
"Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð¸Ð»Ð¸ в командной Ñтроке Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¾Ð¼ -a"
-#: client/options.c:125 client/gui-win32/connectdlg.c:912 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
msgid "Metaserver"
msgstr "МетаÑервер"
-#: client/options.c:126
+#: client/options.c:130
msgid ""
"The metaserver is a host that the client contacts to find out about games on "
"the internet. Don't change this from its default value unless you know what "
@@ -9086,11 +9089,11 @@ msgstr ""
"играх, ведущихÑÑ Ð½Ð° Интернете. МенÑйте Ñто значение, только еÑли Ð’Ñ‹ знаете, "
"что делаете."
-#: client/options.c:132
+#: client/options.c:136
msgid "Soundset"
msgstr "Ðабор звуков"
-#: client/options.c:133
+#: client/options.c:137
msgid ""
"This is the soundset that will be used. Changing this is the same as using "
"the -S command-line parameter."
@@ -9098,11 +9101,11 @@ msgstr ""
"Ðто набор звуков, который будет иÑпользоватьÑÑ. ПоменÑÑ‚ÑŒ Ñту наÑтройку можно "
"и через командную Ñтроку, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€ -S."
-#: client/options.c:138
+#: client/options.c:142
msgid "Sound plugin"
msgstr "Звуковой модуль"
-#: client/options.c:139
+#: client/options.c:143
msgid ""
"If you have a problem with sound, try changing the sound plugin. The new "
"plugin won't take effect until you restart Freeciv. Changing this is the "
@@ -9112,19 +9115,19 @@ msgstr ""
"Ðовый модуль будет работать только поÑле реÑтарта Freeciv. ПоменÑÑ‚ÑŒ Ñту "
"наÑтройку можно и через командную Ñтроку, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€ -P."
-#: client/options.c:144 client/gui-sdl/gui_main.c:162
+#: client/options.c:148 client/gui-sdl/gui_main.c:162
msgid "Theme"
msgstr "Тема"
-#: client/options.c:145
+#: client/options.c:149
msgid "By changing this option you change the active theme."
msgstr "МенÑÑ Ð´Ð°Ð½Ð½ÑƒÑŽ наÑтройку, Ð’Ñ‹ менÑете активную тему."
-#: client/options.c:148
+#: client/options.c:152
msgid "Tileset"
msgstr "Ðабор рельефа"
-#: client/options.c:149
+#: client/options.c:153
msgid ""
"By changing this option you change the active tileset. This is the same as "
"using the -t command-line parameter."
@@ -9132,11 +9135,11 @@ msgstr ""
"МенÑÑ Ð´Ð°Ð½Ð½ÑƒÑŽ наÑтройку, Ð’Ñ‹ менÑете активный набор графики. ПоменÑÑ‚ÑŒ Ñту "
"наÑтройку можно и через командную Ñтроку, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€ -t."
-#: client/options.c:156
+#: client/options.c:160
msgid "Solid unit background color"
msgstr "Сплошной цвет фона ÑоединениÑ"
-#: client/options.c:157
+#: client/options.c:161
msgid ""
"Setting this option will cause units on the map view to be drawn with a "
"solid background color instead of the flag backdrop."
@@ -9144,11 +9147,11 @@ msgstr ""
"УÑтановить данную наÑтройку означает, что ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð½Ð° карте будут "
"нариÑованы Ñ Ñплошным цветом на заднем плане взамен флага за заднем плане."
-#: client/options.c:161 client/gui-sdl/optiondlg.c:960
+#: client/options.c:165 client/gui-sdl/optiondlg.c:960
msgid "Sound bell at new turn"
msgstr "Издавать звук при начале хода"
-#: client/options.c:162
+#: client/options.c:166
msgid ""
"Set this option to have a \"bell\" event be generated at the start of a new "
"turn. You can control the behavior of the \"bell\" event by editing the "
@@ -9158,11 +9161,11 @@ msgstr ""
"в начале каждого хода. Ð’Ñ‹ можете наÑтроить поведение \"звонка\" в наÑтройках "
"Ñообщений."
-#: client/options.c:168
+#: client/options.c:172
msgid "Unit movement animation time (milliseconds)"
msgstr "СкороÑÑ‚ÑŒ Ð¿ÐµÑ€ÐµÐ´Ð²Ð¸Ð¶ÐµÐ½Ð¸Ñ Ñоединений (миллиÑекунды)"
-#: client/options.c:169
+#: client/options.c:173
msgid ""
"This option controls how long unit \"animation\" takes when a unit moves on "
"the map view. Set it to 0 to disable animation entirely."
@@ -9170,11 +9173,11 @@ msgstr ""
"Ðта наÑтройка контролирует, Ñколько времени занимает Ð°Ð½Ð¸Ð¼Ð°Ñ†Ð¸Ñ Ð¿Ñ€Ð¸ движении "
"ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð½Ð° карте. ЕÑли значение равно 0, Ð°Ð½Ð¸Ð¼Ð°Ñ†Ð¸Ñ Ð±ÑƒÐ´ÐµÑ‚ ÑовÑем выключена."
-#: client/options.c:174
+#: client/options.c:178
msgid "Mapview recentering time (milliseconds)"
msgstr "СкороÑÑ‚ÑŒ Ð¿ÐµÑ€ÐµÐ´Ð²Ð¸Ð¶ÐµÐ½Ð¸Ñ Ð¿Ð¾ карте (миллиÑекунды)"
-#: client/options.c:175
+#: client/options.c:179
msgid ""
"When the map view is recentered, it will slide smoothly over the map to its "
"new position. This option controls how long this slide lasts. Set it to 0 "
@@ -9185,11 +9188,11 @@ msgstr ""
"процеÑÑа. ЕÑли значение равно 0, то центрирование будет проиÑходить без "
"прокрутки."
-#: client/options.c:180 client/gui-sdl/optiondlg.c:1014
+#: client/options.c:184 client/gui-sdl/optiondlg.c:1014
msgid "Show combat animation"
msgstr "Показывать анимацию битвы"
-#: client/options.c:181
+#: client/options.c:185
msgid ""
"Disabling this option will turn off combat animation between units on the "
"mapview."
@@ -9197,42 +9200,42 @@ msgstr ""
"ЕÑли Ñта наÑтройка выключена, Ð°Ð½Ð¸Ð¼Ð°Ñ†Ð¸Ñ Ð±Ð¸Ñ‚Ð²Ñ‹ между ÑоединениÑми будет "
"отключена."
-#: client/options.c:184
+#: client/options.c:188
msgid "Draw the citybar"
msgstr "РиÑовать полоÑку города"
-#: client/options.c:185
+#: client/options.c:189
msgid ""
"Setting this option will display a 'citybar' containing useful information "
"beneath each city. Disabling this option will display only the city's name "
"and optionally, production."
msgstr ""
-#: client/options.c:191
+#: client/options.c:195
msgid "Show icons in the technology tree"
msgstr "Показывать иконки в дереве технологий"
-#: client/options.c:192
+#: client/options.c:196
msgid ""
"Setting this option will display icons on the technology tree diagram. "
"Turning this option off makes the technology tree more compact."
msgstr ""
-#: client/options.c:197
+#: client/options.c:201
msgid "Draw shield graphics for units"
msgstr "РиÑовать изображение щит Ð´Ð»Ñ Ñоединений"
-#: client/options.c:198
+#: client/options.c:202
msgid ""
"Setting this option will draw a shield icon as the flags on units. If "
"unset, the full flag will be drawn."
msgstr ""
-#: client/options.c:202
+#: client/options.c:206
msgid "Manual Turn Done in AI Mode"
msgstr "Конец хода вручн. комп.реж."
-#: client/options.c:203
+#: client/options.c:207
msgid ""
"Disable this option if you do not want to press the Turn Done button "
"manually when watching an AI player."
@@ -9240,11 +9243,11 @@ msgstr ""
"ЕÑли Ð´Ð°Ð½Ð½Ð°Ñ Ð½Ð°Ñтройка выключена, тогда Вам не нужно вручную нажимать кнопку "
"'Ход Ñделан', когда Ð’Ñ‹ наблюдаете за компьютерным игроком."
-#: client/options.c:207 client/gui-sdl/optiondlg.c:1121
+#: client/options.c:211 client/gui-sdl/optiondlg.c:1121
msgid "Auto Center on Units"
msgstr "Ðвто-центрировать на Ñоединении"
-#: client/options.c:208
+#: client/options.c:212
msgid ""
"Set this option to have the active unit centered automatically when the unit "
"focus changes."
@@ -9252,11 +9255,11 @@ msgstr ""
"УÑтановите данную наÑтройку чтобы активное Ñоединение автоматичеÑки "
"центрировалоÑÑŒ когда Ñ„Ð¾ÐºÑƒÑ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð¼ÐµÐ½ÑетÑÑ."
-#: client/options.c:211 client/gui-sdl/optiondlg.c:1147
+#: client/options.c:215 client/gui-sdl/optiondlg.c:1147
msgid "Auto Center on Combat"
msgstr "Ðвто-центрировать на битве"
-#: client/options.c:212
+#: client/options.c:216
msgid ""
"Set this option to have any combat be centered automatically. Disabled this "
"will speed up the time between turns but may cause you to miss combat "
@@ -9266,21 +9269,21 @@ msgstr ""
"Выключение данной наÑтройки увеличит ÑкороÑÑ‚ÑŒ между ходами, но Ñто может "
"означать, что Ð’Ñ‹ полноÑтью пропуÑтите битву."
-#: client/options.c:217 client/gui-sdl/optiondlg.c:1174
+#: client/options.c:221 client/gui-sdl/optiondlg.c:1174
msgid "Focus on Awakened Units"
msgstr "Ð¤Ð¾ÐºÑƒÑ Ð½Ð° проÑнувшихÑÑ ÑоединениÑÑ…"
-#: client/options.c:218
+#: client/options.c:222
msgid "Set this option to have newly awoken units be focused automatically."
msgstr ""
"УÑтановите данную наÑтройку чтобы только что пробужденные ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ "
"автоматичеÑки фокуÑировалиÑÑŒ."
-#: client/options.c:221
+#: client/options.c:225
msgid "Allow goto into the unknown"
msgstr "Разрешить иÑпользование команды Идти к на неизвеÑтную территорию"
-#: client/options.c:222
+#: client/options.c:226
msgid ""
"Setting this option will make the game consider moving into unknown tiles. "
"If not, then goto routes will detour around or be blocked by unknown tiles."
@@ -9289,11 +9292,11 @@ msgstr ""
"неизвеÑтную территорию. Ð’ противном Ñлучае, маршруты будут обходить "
"неизвеÑтную территорию или блокироватьÑÑ ÐµÑŽ."
-#: client/options.c:226
+#: client/options.c:230
msgid "Center map when Popup city"
msgstr "Центр. карту когда Ñм город"
-#: client/options.c:227
+#: client/options.c:231
#, fuzzy
msgid ""
"Setting this option makes the mapview center on a city when its city dialog "
@@ -9302,11 +9305,11 @@ msgstr ""
"ЕÑли Ð´Ð°Ð½Ð½Ð°Ñ Ð½Ð°Ñтройка включена, то в только что Ñозданных городах "
"автоматичеÑки будет открыватьÑÑ Ð´Ð¸Ð°Ð»Ð¾Ð³ города."
-#: client/options.c:230
+#: client/options.c:234
msgid "Concise City Production"
msgstr "Кратко произв. в городе"
-#: client/options.c:231
+#: client/options.c:235
msgid ""
"Set this option to make the city production (as shown in the city dialog) to "
"be more compact."
@@ -9314,11 +9317,11 @@ msgstr ""
"УÑтановите данную наÑтройку чтобы Ñделать городÑкое производÑтво (которое "
"показываетÑÑ Ð² диалоге города) было более компактным."
-#: client/options.c:234 client/gui-sdl/optiondlg.c:1252
+#: client/options.c:238 client/gui-sdl/optiondlg.c:1252
msgid "End Turn when done moving"
msgstr "Закончить ход автоматичеÑки"
-#: client/options.c:235
+#: client/options.c:239
#, fuzzy
msgid ""
"Setting this option makes your turn end automatically when all your units "
@@ -9327,11 +9330,11 @@ msgstr ""
"УÑтановите данную наÑтройку чтобы активное Ñоединение автоматичеÑки "
"центрировалоÑÑŒ когда Ñ„Ð¾ÐºÑƒÑ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð¼ÐµÐ½ÑетÑÑ."
-#: client/options.c:238 client/gui-sdl/optiondlg.c:1226
+#: client/options.c:242 client/gui-sdl/optiondlg.c:1226
msgid "Prompt for city names"
msgstr "Запрашивать Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ñ Ð³Ð¾Ñ€Ð¾Ð´Ð¾Ð²"
-#: client/options.c:239
+#: client/options.c:243
#, fuzzy
msgid ""
"Disabling this option will make the names of newly founded cities chosen "
@@ -9340,11 +9343,11 @@ msgstr ""
"ЕÑли Ð´Ð°Ð½Ð½Ð°Ñ Ð½Ð°Ñтройка выключена, тогда имена городов будут автоматичеÑки "
"выбиратьÑÑ Ð´Ð»Ñ Ð’Ð°Ñ Ñервером."
-#: client/options.c:242 client/gui-sdl/optiondlg.c:1200
+#: client/options.c:246 client/gui-sdl/optiondlg.c:1200
msgid "Pop up city dialog for new cities"
msgstr "Открывать городÑкой диалог Ð´Ð»Ñ Ð½Ð¾Ð²Ñ‹Ñ… городов"
-#: client/options.c:243
+#: client/options.c:247
#, fuzzy
msgid ""
"Setting this option will pop up a newly-founded city's city dialog "
@@ -9353,74 +9356,122 @@ msgstr ""
"ЕÑли Ð´Ð°Ð½Ð½Ð°Ñ Ð½Ð°Ñтройка включена, то в только что Ñозданных городах "
"автоматичеÑки будет открыватьÑÑ Ð´Ð¸Ð°Ð»Ð¾Ð³ города."
-#: client/options.c:248
+#: client/options.c:250
+#, fuzzy
+msgid "Pop up caravan actions"
+msgstr "ДейÑÑ‚Ð²Ð¸Ñ ÐºÐ°Ñ€Ð°Ð²Ð°Ð½Ð°"
+
+#: client/options.c:251
+msgid ""
+"If this option is enabled, when caravans arrive at a city where they can "
+"establish a traderoute or help build a wonder, a window will popup asking "
+"which action should be performed. Disabling this option means you will have "
+"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 ""
+
+#: client/options.c:260
+#, fuzzy
+msgid "Enable cursor changing"
+msgstr "Включить альфа-Ñмешивание"
+
+#: client/options.c:261
+msgid ""
+"This option controls whether the client should try to change the mouse "
+"cursor depending on what is being pointed at, as well as to indicate changes "
+"in the client or server state."
+msgstr ""
+
+#: client/options.c:266
+msgid "Select cities before units"
+msgstr ""
+
+#: 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 ""
+
+#: client/options.c:272
+msgid "Clear unit orders on selection"
+msgstr ""
+
+#: client/options.c:273
+msgid ""
+"Enabling this option will cause unit orders to be cleared whenever one or "
+"more units are selected. If this option is disabled, selecting units will "
+"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 ""
+
+#: client/options.c:282
msgid "Background layer"
msgstr "Слой фона"
-#: client/options.c:249
+#: client/options.c:283
msgid "The background layer of the overview shows just ocean and land."
msgstr "Слой фона показывает на миникарте только океан и Ñушу."
-#: client/options.c:252
+#: client/options.c:286
msgid "Terrain relief map layer"
msgstr "Слой рельефа меÑтноÑти"
-#: client/options.c:253
+#: client/options.c:287
msgid "The relief layer shows all terrains on the map."
msgstr "Слой рельефа показывает тип меÑтноÑти Ð´Ð»Ñ Ð²Ñей карты."
-#: client/options.c:256
+#: client/options.c:290
msgid "Borders layer"
msgstr "Слой границы"
-#: client/options.c:257
+#: client/options.c:291
msgid ""
"The borders layer of the overview shows which tiles are owned by each player."
msgstr "Слой границ показывает, какому игроку принадлежит ÐºÐ°Ð¶Ð´Ð°Ñ Ñчейка."
-#: client/options.c:261
+#: client/options.c:295
msgid "Units layer"
msgstr "Слой Ñоединений"
-#: client/options.c:262
+#: client/options.c:296
msgid "Enabling this will draw units on the overview."
msgstr "ЕÑли включено, ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð±ÑƒÐ´ÑƒÑ‚ отображены на миникарте."
-#: client/options.c:265
+#: client/options.c:299
msgid "Cities layer"
msgstr "Слой городов"
-#: client/options.c:266
+#: client/options.c:300
msgid "Enabling this will draw cities on the overview."
msgstr "ЕÑли включено, города будут отображены на миникарте."
-#: client/options.c:269
+#: client/options.c:303
msgid "Overview fog of war"
msgstr "Дым войны в Обзоре"
-#: client/options.c:270
+#: client/options.c:304
msgid "Enabling this will show fog of war on the overview."
msgstr "ЕÑли включено, туман войны будет отображён на миникарте."
-#: client/options.c:488
+#: client/options.c:526
msgid "If you add a preset by hand, also update \"number_of_presets\""
msgstr ""
"ЕÑли Ð’Ñ‹ добавили пре-уÑтановку вручную, также измените \"number_of_presets\""
-#: client/options.c:516
+#: client/options.c:554
msgid "Cannot find your home directory"
msgstr "Ðевозможно найти Ваш домашний каталог"
-#: client/options.c:665 client/options.c:796
+#: client/options.c:703 client/options.c:834
msgid "Save failed, cannot find a filename."
msgstr "Сохранение не удалоÑÑŒ, не могу найти Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð°."
-#: client/options.c:678 client/options.c:859
+#: client/options.c:716 client/options.c:897
#, c-format
msgid "Save failed, cannot write to file %s"
msgstr "Сохранение не удалоÑÑŒ, невозможно запиÑать файл %s"
-#: client/options.c:680 client/options.c:862
+#: client/options.c:718 client/options.c:900
#, c-format
msgid "Saved settings to file %s"
msgstr "Сохранили наÑтройки в файл %s"
@@ -9444,16 +9495,16 @@ msgstr "Строка возможноÑтей Ñервера: %s"
msgid "Start of turn %d"
msgstr "Ðачало хода %d"
-#: client/packhand.c:1590
+#: client/packhand.c:1591
#, c-format
msgid "AI Mode is now %s."
msgstr "Компьютерный режим %s."
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "ON"
msgstr "ВКЛ"
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "OFF"
msgstr "ВЫКЛ"
@@ -9485,14 +9536,15 @@ msgid "Username"
msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
-#: client/gui-gtk-2.0/pages.c:2085
+#: client/gui-gtk-2.0/pages.c:2157
msgid "Flag"
msgstr "Флаг"
#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
-#: client/gui-gtk-2.0/pages.c:1536 client/gui-gtk-2.0/pages.c:2087
-#: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
-#: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
+#: 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/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr "Ðарод"
@@ -9504,7 +9556,7 @@ msgstr "Граница"
msgid "Score"
msgstr "Счет"
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
msgid "Team"
msgstr "Команда"
@@ -9575,230 +9627,256 @@ msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ñ€Ð°ÑпуÑтить %s."
msgid "Could not open temp file."
msgstr "Ðевозможно открыть временный файл."
-#: client/servers.c:407
+#: client/servers.c:410
msgid "Invalid $http_proxy or metaserver value, must start with 'http://'"
msgstr ""
"Ðеправильное значение $http_proxy или метаÑервера, должно начинатьÑÑ Ñ "
"'http://'"
-#: client/servers.c:413
+#: client/servers.c:416
msgid "Failed looking up metaserver's host"
msgstr "ХоÑÑ‚ не найден"
-#: client/text.c:85 client/text.c:86 client/text.c:91
+#. TRANS: "AI <player name>"
+#: client/text.c:94
+#, c-format
+msgid "AI %s"
+msgstr ""
+
+#. TRANS: "<nation adjective>, team <team name>"
+#: client/text.c:118
+#, fuzzy, c-format
+msgid "%s, team %s"
+msgstr ", команда %s"
+
+#: client/text.c:135 client/text.c:136 client/text.c:141
#: client/gui-sdl/mapview.c:752
msgid "?nation:Neutral"
msgstr "?nation:нейтральных"
-#: client/text.c:85 client/gui-sdl/mapview.c:752
+#: client/text.c:135 client/gui-sdl/mapview.c:752
msgid "?nation:Hostile"
msgstr "?nation:враждебных"
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Peaceful"
msgstr "?nation:мирных"
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Friendly"
msgstr "?nation:дружеÑтвенных"
-#: client/text.c:88 client/gui-sdl/mapview.c:755
+#: client/text.c:138 client/gui-sdl/mapview.c:755
msgid "?nation:Mysterious"
msgstr "?nation:таинÑтвенных"
-#: client/text.c:88
+#: client/text.c:138
msgid "?nation:Friendly(team)"
msgstr "?nation:ДружеÑтвеннаÑ(команда)"
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
msgid "?city:Neutral"
msgstr "?city:Ðейтральные"
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
msgid "?city:Hostile"
msgstr "?city:Враждебные"
-#: client/text.c:92 client/gui-sdl/mapview.c:786
+#: client/text.c:142 client/gui-sdl/mapview.c:786
msgid "?city:Peaceful"
msgstr "?city:Мирные"
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Friendly"
msgstr "?city:ДружеÑтвенные"
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Mysterious"
msgstr "?city:ТаинÑтвенные"
-#: client/text.c:93
+#: client/text.c:143
msgid "?city:Friendly(team)"
msgstr "?city:ДружеÑтвеннаÑ(команда)"
-#: client/text.c:100
+#: client/text.c:151
#, c-format
msgid "Location: (%d, %d) [%d]"
msgstr "МеÑто: (%d, %d) [%d]"
-#: client/text.c:109
+#: client/text.c:153
+#, c-format
+msgid "Native coordinates: (%d, %d)"
+msgstr ""
+
+#: client/text.c:160
#, c-format
msgid "Terrain: %s"
msgstr "Рельеф: %s"
-#: client/text.c:110
+#: client/text.c:161
#, c-format
msgid "Food/Prod/Trade: %s"
msgstr "Еда/Произв/Торг: %s"
-#: client/text.c:113
+#: client/text.c:164
msgid "Minor Tribe Village"
msgstr "Ð”ÐµÑ€ÐµÐ²Ð½Ñ Ð¼Ð°Ð»ÐµÐ½ÑŒÐºÐ¾Ð³Ð¾ племени"
-#: client/text.c:119
+#: client/text.c:173
msgid "Our territory"
msgstr "Ðаша территориÑ"
-#. TRANS: "Polish territory"
-#: client/text.c:122
-#, c-format
-msgid "%s territory"
-msgstr "Ð¢ÐµÑ€Ñ€Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ %s"
+#. TRANS: "Territory of <username> (<nation + team>)"
+#: client/text.c:176
+#, fuzzy, c-format
+msgid "Territory of %s (%s)"
+msgstr ""
+"\n"
+"Ð¢ÐµÑ€Ñ€Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ %s %s"
-#. TRANS: "Polish territory (5 turn cease-fire)"
-#: client/text.c:131
-#, c-format
-msgid "%s territory (%d turn cease-fire)"
-msgid_plural "%s territory (%d turn cease-fire)"
-msgstr[0] "%s (%d-ходовое прекращение огнÑ)"
-msgstr[1] "%s (%d-ходовое прекращение огнÑ)"
-msgstr[2] "%s (%d-ходовое прекращение огнÑ)"
+#: client/text.c:186
+#, fuzzy, c-format
+msgid "Territory of %s (%s) (%d turn cease-fire)"
+msgid_plural "Territory of %s (%s) (%d turn cease-fire)"
+msgstr[0] "Город: %s (%s, %d-ходовое прекращение огнÑ)"
+msgstr[1] "Город: %s (%s, %d-ходовое прекращение огнÑ)"
+msgstr[2] "Город: %s (%s, %d-ходовое прекращение огнÑ)"
-#. TRANS: "Polish territory (friendly)"
-#: client/text.c:140
-#, c-format
-msgid "%s territory (%s)"
-msgstr "Ð¢ÐµÑ€Ñ€Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ %s (%s)"
+#. TRANS: "Territory of <username>
+#. * (<nation + team> | <diplomatic state>)"
+#: client/text.c:195
+#, fuzzy, c-format
+msgid "Territory of %s (%s | %s)"
+msgstr ""
+"\n"
+"Ð¢ÐµÑ€Ñ€Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ %s %s"
-#: client/text.c:145
+#: client/text.c:200
msgid "Unclaimed territory"
msgstr "ÐезаÑÐ²Ð»ÐµÐ½Ð½Ð°Ñ Ñ‚ÐµÑ€Ñ€Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ"
-#. TRANS: "City: Warsaw (Polish)"
-#: client/text.c:156
-#, c-format
-msgid "City: %s (%s)"
-msgstr "Город: %s (%s)"
+#. TRANS: "City: <city name> | <username> (<nation + team>)"
+#: client/text.c:214
+#, fuzzy, c-format
+msgid "City: %s | %s (%s)"
+msgstr "Город: %s (%s, %s)"
-#. TRANS: "City: Warsaw (Polish, 5 turn cease-fire)"
-#: client/text.c:166
-#, c-format
-msgid "City: %s (%s, %d turn cease-fire)"
-msgid_plural "City: %s (%s, %d turn cease-fire)"
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <number> turn cease-fire)"
+#: client/text.c:224
+#, fuzzy, c-format
+msgid "City: %s | %s (%s, %d turn cease-fire)"
+msgid_plural "City: %s | %s (%s, %d turn cease-fire)"
msgstr[0] "Город: %s (%s, %d-ходовое прекращение огнÑ)"
msgstr[1] "Город: %s (%s, %d-ходовое прекращение огнÑ)"
msgstr[2] "Город: %s (%s, %d-ходовое прекращение огнÑ)"
-#. TRANS: "City: Warsaw (Polish,friendly)"
-#: client/text.c:174
-#, c-format
-msgid "City: %s (%s, %s)"
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <diplomatic state>)"
+#: client/text.c:231
+#, fuzzy, c-format
+msgid "City: %s | %s (%s, %s)"
msgstr "Город: %s (%s, %s)"
#. TRANS: previous lines gave other information about the city.
-#: client/text.c:189
+#: client/text.c:246
#, c-format
msgid "?clistbegin: with %s"
msgstr " Ñ %s"
#. TRANS: "Trade from Warsaw: 5"
-#: client/text.c:202
+#: client/text.c:259
#, c-format
msgid "Trade from %s: %d"
msgstr "Ð¢Ð¾Ñ€Ð³Ð¾Ð²Ð»Ñ Ñ %s: %d"
-#: client/text.c:210
+#: client/text.c:267
#, c-format
msgid "Infrastructure: %s"
msgstr "ИнфраÑтруктура: %s"
-#: client/text.c:215
+#: client/text.c:272
#, c-format
msgid "Activity: %s"
msgstr "ÐктивноÑÑ‚ÑŒ: %s"
-#. TRANS: "Unit: Musketeers (Polish, Warsaw)"
-#. TRANS: "Unit: Musketeers (Polish,friendly)"
-#: client/text.c:226 client/text.c:253
-#, c-format
-msgid "Unit: %s (%s, %s)"
+#. TRANS: "Unit: <unit type> | <username>
+#. * (<nation + team>, <homecity>)"
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <diplomatic state>)"
+#: client/text.c:287 client/text.c:313
+#, fuzzy, c-format
+msgid "Unit: %s | %s (%s, %s)"
msgstr "Соединение: %s (%s, %s)"
-#. TRANS: "Unit: Musketeers (Polish)"
-#: client/text.c:232
-#, c-format
-msgid "Unit: %s (%s)"
-msgstr "Соед: %s (%s)"
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>)"
+#: client/text.c:292
+#, fuzzy, c-format
+msgid "Unit: %s | %s (%s)"
+msgstr "Соединение: %s (%s, %s)"
-#. TRANS: "Unit: Musketeers (Polish, 5 turn cease-fire)"
-#: client/text.c:245
-#, c-format
-msgid "Unit: %s (%s, %d turn cease-fire)"
-msgid_plural "Unit: %s (%s, %d turn cease-fire)"
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <number> turn cease-fire)"
+#: client/text.c:305
+#, fuzzy, c-format
+msgid "Unit: %s | %s (%s, %d turn cease-fire)"
+msgid_plural "Unit: %s | %s (%s, %d turn cease-fire)"
msgstr[0] "Соединение: %s (%s, %d-ходовое прекращение огнÑ)"
msgstr[1] "Соединение: %s (%s, %d-ходовое прекращение огнÑ)"
msgstr[2] "Соединение: %s (%s, %d-ходовое прекращение огнÑ)"
#. TRANS: "Chance to win: A:95% D:46%"
-#: client/text.c:279
+#: client/text.c:338
#, c-format
msgid "Chance to win: A:%d%% D:%d%%"
msgstr "ВероÑтноÑÑ‚ÑŒ победы: Ð:%d%% З:%d%%"
#. TRANS: A is attack power, D is defense power, FP is firepower,
#. * HP is hitpoints (current and max).
-#: client/text.c:286
+#: client/text.c:345
#, c-format
msgid "A:%d D:%d FP:%d HP:%d/%d (%s)"
msgstr "Ð:%d З:%d Ог:%d Зд:%d/%d (%s)"
#. TRANS: "5 more" units on this tile
-#: client/text.c:295
+#: client/text.c:354
#, c-format
msgid " (%d more)"
msgstr " (еще %d)"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:364
+#: client/text.c:423
#, c-format
msgid "far from %s"
msgstr "далеко от %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:367
+#: client/text.c:426
#, c-format
msgid "near %s"
msgstr "возле %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:370
+#: client/text.c:429
#, c-format
msgid "in %s"
msgstr "в %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:403
+#: client/text.c:462
#, c-format
msgid "from %s"
msgstr "из %s"
-#: client/text.c:466
+#: client/text.c:525
msgid "Progress: no research"
msgstr "ПрогреÑÑ: нет иÑÑледований"
-#: client/text.c:470
+#: client/text.c:529
msgid "Progress: no research target"
msgstr "ПрогреÑÑ: нет цели иÑÑледований"
-#: client/text.c:475
+#: client/text.c:534
#, c-format
msgid "Progress: %d turn/advance"
msgid_plural "Progress: %d turns/advance"
@@ -9806,7 +9884,7 @@ msgstr[0] "ПрогреÑÑ: %d ход/открытие"
msgstr[1] "ПрогреÑÑ: %d хода/открытие"
msgstr[2] "ПрогреÑÑ: %d ходов/открытие"
-#: client/text.c:480
+#: client/text.c:539
#, c-format
msgid "%d bulb/turn"
msgid_plural "%d bulbs/turn"
@@ -9814,7 +9892,7 @@ msgstr[0] "%d лампочка/ход"
msgstr[1] "%d лампочки/хода"
msgstr[2] "%d лампочек/ходов"
-#: client/text.c:485
+#: client/text.c:544
#, c-format
msgid ", %d bulb/turn from team"
msgid_plural ", %d bulbs/turn from team"
@@ -9822,12 +9900,12 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: client/text.c:512
+#: client/text.c:571
#, c-format
msgid "%d/- (never)"
msgstr "%d/- (никогда)"
-#: client/text.c:524
+#: client/text.c:583
#, c-format
msgid "%d/%d (%d turn)"
msgid_plural "%d/%d (%d turns)"
@@ -9835,12 +9913,12 @@ msgstr[0] "%d/%d (%d ходов)"
msgstr[1] "%d/%d (%d ходов)"
msgstr[2] "%d/%d (%d ходов)"
-#: client/text.c:527
+#: client/text.c:586
#, c-format
msgid "%d/%d (never)"
msgstr "%d/%d (никогда)"
-#: client/text.c:564
+#: client/text.c:623
#, c-format
msgid "%d step"
msgid_plural "%d steps"
@@ -9848,7 +9926,7 @@ msgstr[0] "%d шаг"
msgstr[1] "%d шага"
msgstr[2] "%d шагов"
-#: client/text.c:566
+#: client/text.c:625
#, c-format
msgid "%d bulb"
msgid_plural "%d bulbs"
@@ -9856,7 +9934,7 @@ msgstr[0] "%d лампочка"
msgstr[1] "%d лампочки"
msgstr[2] "%d лампочек"
-#: client/text.c:570 client/agents/cma_fec.c:269 client/agents/cma_fec.c:313
+#: 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
#, c-format
msgid "%d turn"
@@ -9865,89 +9943,89 @@ msgstr[0] "%d ход"
msgstr[1] "%d хода"
msgstr[2] "%d ходов"
-#: client/text.c:592
+#: client/text.c:651
#, c-format
msgid "Population: %s"
msgstr "ÐаÑеление: %s"
-#: client/text.c:595
+#: client/text.c:654
#, c-format
msgid "Year: %s (T%d)"
msgstr "Год: %s (T%d)"
-#: client/text.c:598
+#: client/text.c:657
#, c-format
msgid "Gold: %d (%+d)"
msgstr "Золото: %d (%+d)"
-#: client/text.c:600
+#: client/text.c:659
#, c-format
msgid "Tax: %d Lux: %d Sci: %d"
msgstr " Ðал: %d РоÑ: %d Ðау: %d"
-#: client/text.c:607
+#: client/text.c:666
#, fuzzy
msgid "Moving: Nobody"
msgstr "ДвигаетÑÑ: %s"
-#: client/text.c:609
+#: client/text.c:668
#, c-format
msgid "Moving: %s"
msgstr "ДвигаетÑÑ: %s"
-#: client/text.c:613
+#: client/text.c:672
msgid "(Click for more info)"
msgstr "(Ðажмите Ð´Ð»Ñ Ð±Ð¾Ð»ÑŒÑˆÐµÐ¹ информации)"
-#: client/text.c:629
+#: client/text.c:688
#, c-format
msgid "%s People"
msgstr "Ðарод %s"
-#: client/text.c:633
+#: client/text.c:692
#, c-format
msgid "Turn: %d"
msgstr "Ход: %d"
-#: client/text.c:635 client/gui-win32/inteldlg.c:111
+#: client/text.c:694 client/gui-win32/inteldlg.c:111
#: client/gui-xaw/inteldlg.c:208
#, c-format
msgid "Gold: %d"
msgstr "Золото: %d"
-#: client/text.c:636
+#: client/text.c:695
#, c-format
msgid "Net Income: %d"
msgstr "Ожидаемый доход: %d"
#. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:639
+#: client/text.c:698
#, c-format
msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
msgstr "Ðалоги: Золото:%d%% РоÑкошь:%d%% Ðаука:%d%%"
-#: client/text.c:643
+#: client/text.c:702
#, c-format
msgid "Researching %s: %s"
msgstr "Изучаем %s: %s"
-#: client/text.c:650
+#: client/text.c:709
#, c-format
msgid "Global warming chance: %d%% (%+d%%/turn)"
msgstr "ВероÑтноÑÑ‚ÑŒ глобального потеплениÑ: %d%% (%+d%%/ход)"
-#: client/text.c:653
+#: client/text.c:712
#, c-format
msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
msgstr "ВероÑтноÑÑ‚ÑŒ Ñдерной зимы: %d%% (%+d%%/ход)"
-#: client/text.c:658 client/gui-win32/inteldlg.c:104
+#: client/text.c:717 client/gui-win32/inteldlg.c:104
#: client/gui-xaw/inteldlg.c:200
#, c-format
msgid "Government: %s"
msgstr "Форма правлениÑ: %s"
-#: client/text.c:682
+#: client/text.c:741
#, c-format
msgid "%d unit"
msgid_plural "%d units"
@@ -9956,21 +10034,21 @@ msgstr[1] "%d ÑоединениÑ"
msgstr[2] "%d Ñоединений"
#. TRANS: Impossible to reach goto target tile
-#: client/text.c:715 client/gui-sdl/mapview.c:566
+#: client/text.c:774 client/gui-sdl/mapview.c:566
msgid "?goto:Unreachable"
msgstr "ÐедоÑтупно"
-#: client/text.c:717 client/gui-sdl/mapview.c:568
+#: client/text.c:776 client/gui-sdl/mapview.c:568
#, c-format
msgid "Turns to target: %d"
msgstr "Ходов до цели: %d"
-#: client/text.c:719 client/gui-sdl/mapview.c:570
+#: client/text.c:778 client/gui-sdl/mapview.c:570
#, c-format
msgid "Turns to target: %d to %d"
msgstr "Ходов до цели: от %d до %d"
-#: client/text.c:725 client/gui-sdl/mapview.c:576
+#: client/text.c:784 client/gui-sdl/mapview.c:576
#, c-format
msgid "%d unit selected"
msgid_plural "%d units selected"
@@ -9978,34 +10056,34 @@ msgstr[0] "Выбрано %d Ñоединение"
msgstr[1] "Выбрано %d ÑоединениÑ"
msgstr[2] "Выбрано %d Ñоединений"
-#: client/text.c:730 client/gui-sdl/mapview.c:581
+#: client/text.c:789 client/gui-sdl/mapview.c:581
msgid "No units selected."
msgstr "Ðет выбранных Ñоединений."
-#: client/text.c:804 client/gui-sdl/mapview.c:654
+#: client/text.c:863 client/gui-sdl/mapview.c:654
#, c-format
msgid "Others: %d civil; %d military"
msgstr "Другие: %d гражданÑких; %d военных"
-#: client/text.c:806 client/gui-sdl/mapview.c:656
+#: client/text.c:865 client/gui-sdl/mapview.c:656
#, c-format
msgid "Others: %d civilian"
msgstr "Другие: %d гражданÑких"
-#: client/text.c:808 client/gui-sdl/mapview.c:658
+#: client/text.c:867 client/gui-sdl/mapview.c:658
#, c-format
msgid "Others: %d military"
msgstr "Другие: %d военных"
-#: client/text.c:839
+#: client/text.c:898
msgid "No units to upgrade!"
msgstr "Ðет Ñоединений Ð´Ð»Ñ Ð¼Ð¾Ð´ÐµÑ€Ð½Ð¸Ð·Ð°Ñ†Ð¸Ð¸!"
-#: client/text.c:864
+#: client/text.c:923
msgid "None of these units may be upgraded."
msgstr "Ðи одно из Ñтих Ñоединений не может быть модернизировано."
-#: client/text.c:870
+#: client/text.c:929
#, c-format
msgid ""
"Upgrade %d unit for %d gold?\n"
@@ -10023,72 +10101,72 @@ msgstr[2] ""
"Модернизировать %d Ñоединений за %d золота?\n"
"В казне %d золота."
-#: client/text.c:891
+#: client/text.c:950
msgid "Shows your progress in researching the current technology."
msgstr "Показывает прогреÑÑ Ð² изучении текущей технологии."
-#: client/text.c:897
+#: client/text.c:956
msgid "no research target."
msgstr "нет цели иÑÑледований"
#. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:900
+#: client/text.c:959
#, c-format
msgid "%s: %d/%d."
msgstr "%s: %d/%d."
-#: client/text.c:920
+#: client/text.c:979
msgid "Shows the progress of global warming:"
msgstr "Показывает прогреÑÑ Ð² глобальном потеплении:"
-#: client/text.c:921
+#: client/text.c:980
#, c-format
msgid "Pollution rate: %d%%"
msgstr "Уровень загрÑзнениÑ: %3d"
-#: client/text.c:923
+#: client/text.c:982
#, c-format
msgid "Chance of catastrophic warming each turn: %d%%"
msgstr "ВероÑтноÑÑ‚ÑŒ катаÑтрофичеÑкого Ð¿Ð¾Ñ‚ÐµÐ¿Ð»ÐµÐ½Ð¸Ñ ÐºÐ°Ð¶Ð´Ñ‹Ð¹ ход: %d%%"
-#: client/text.c:939
+#: client/text.c:998
msgid "Shows the progress of nuclear winter:"
msgstr "Показывает прогреÑÑ Ñдерной зимы:"
-#: client/text.c:940
+#: client/text.c:999
#, c-format
msgid "Fallout rate: %d%%"
msgstr "Уровень радиоактивного загрÑзнениÑ: %d%%"
-#: client/text.c:942
+#: client/text.c:1001
#, c-format
msgid "Chance of catastrophic winter each turn: %d%%"
msgstr "ВероÑтноÑÑ‚ÑŒ катаÑтрофичеÑкой зимы каждый ход: %d%%"
-#: client/text.c:957
+#: client/text.c:1016
msgid "Shows your current government:"
msgstr "Показывает Вашу нынешнюю форму правлениÑ:"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:981
+#: client/text.c:1040
#, c-format
msgid "Population: %5d"
msgstr "ÐаÑеление: %5d"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:1043
#, c-format
msgid "Support: %5d %%"
msgstr "Поддержка: %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:1047
#, c-format
msgid "Energy: %5d %%"
msgstr "ÐнергиÑ: %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:992
+#: client/text.c:1051
#, c-format
msgid "Mass: %5d ton"
msgid_plural "Mass: %5d tons"
@@ -10097,96 +10175,97 @@ msgstr[1] "МаÑÑа: %5d тонны"
msgstr[2] "МаÑÑа: %5d тонн"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1057
#, c-format
msgid "Travel time: %5.1f years"
msgstr "Ð’Ñ€ÐµÐ¼Ñ Ð¿ÑƒÑ‚ÐµÑˆÐµÑтвиÑ: %5.1f лет"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1061
msgid "Travel time: N/A "
msgstr "Ð’Ñ€ÐµÐ¼Ñ Ð¿ÑƒÑ‚ÐµÑˆÐµÑтвиÑ: Ðет данных "
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1065
#, c-format
msgid "Success prob.: %5d %%"
msgstr "ВероÑÑ‚. уÑпеха: %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1010
+#: client/text.c:1069
#, c-format
msgid "Year of arrival: %8s"
msgstr "Год прибытиÑ: %8s"
-#: client/text.c:1030
+#: client/text.c:1089
msgid "?timeout:off"
msgstr "?timeout:выкл"
-#: client/text.c:1054
+#: client/text.c:1113
#, c-format
msgid "?seconds:%02ds"
msgstr "?Ñекунды:%02dÑ"
-#: client/text.c:1056
+#: client/text.c:1115
#, c-format
msgid "?mins/secs:%02dm %02ds"
msgstr "?mins/secs:%02dм %02dÑ"
-#: client/text.c:1058
+#: client/text.c:1117
#, c-format
msgid "?hrs/mns:%02dh %02dm"
msgstr "?hrs/mns:%02dч %02dм"
-#: client/text.c:1060
+#: client/text.c:1119
#, c-format
msgid "?dys/hrs:%02dd %02dh"
msgstr "?dys/hrs:%02dд %02dч"
-#: client/text.c:1063
+#: client/text.c:1122
msgid "?duration:overflow"
msgstr "?duration:переполнение"
-#: client/text.c:1084
+#: client/text.c:1143
#, c-format
msgid "%6d.%02d ms"
msgstr "%6d.%02d мÑ"
-#. TRANS: "Republic of the Poles"
-#: client/text.c:1127
-#, c-format
-msgid "%s of the %s"
-msgstr "%s из %s"
+#. TRANS: <nation adjective> <government name>.
+#. * E.g. "Polish Republic".
+#: client/text.c:1188
+#, fuzzy, c-format
+msgid "?nationgovernment:%s %s"
+msgstr "Форма правлениÑ: %s"
#. TRANS: "Observer: 1985"
-#: client/text.c:1137
+#: client/text.c:1198
#, c-format
msgid "Observer: %s"
msgstr "Ðаблюдатель: %s"
-#: client/text.c:1155
+#: client/text.c:1216
msgid "Buildings: "
msgstr "ЗданиÑ: "
-#: client/text.c:1172 client/text.c:1211
+#: client/text.c:1233 client/text.c:1272
msgid "None. "
msgstr "Ðет. "
-#: client/text.c:1174 client/text.c:1213
+#: client/text.c:1235 client/text.c:1274
msgid "?clistend:."
msgstr "."
-#: client/text.c:1192
+#: client/text.c:1253
msgid "Wonders: "
msgstr "ЧудеÑа: "
-#: client/text.c:1247
+#: client/text.c:1308
#, 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:1251
+#: client/text.c:1312
#, c-format
msgid "%d content before penalty."
msgid_plural "%d content before penalty."
@@ -10195,7 +10274,7 @@ msgstr[1] "%d нейтральных до штрафа."
msgstr[2] "%d нейтральных до штрафа."
#. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1257
+#: client/text.c:1318
#, c-format
msgid "%d additional unhappy citizen."
msgid_plural "%d additional unhappy citizens."
@@ -10203,39 +10282,42 @@ msgstr[0] "%d дополнительный неÑчаÑтный граждани
msgstr[1] "%d дополнительных неÑчаÑтных граждан."
msgstr[2] "%d дополнительных неÑчаÑтных граждан."
-#. TRANS: Martial law opening parenthesis
-#: client/text.c:1279
-msgid "Martial law in effect ("
+#: client/text.c:1339
+#, fuzzy
+msgid "Unlimited martial law in effect."
msgstr "ДейÑтвует военное положение ("
-#. TRANS: no [unit] maximum
-#: client/text.c:1284
-msgid "no maximum, "
-msgstr "без макÑимума, "
-
-#: client/text.c:1287
-#, c-format
-msgid "%d unit maximum, "
-msgid_plural "%d units maximum, "
-msgstr[0] "%d Ñоединение макÑимум, "
-msgstr[1] "%d ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð¼Ð°ÐºÑимум, "
-msgstr[2] "%d Ñоединений макÑимум, "
+#: client/text.c:1341
+#, 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"
+msgstr[2] ""
+"* Ðе-военное Ñоединение (не может атаковать; нет военного положениÑ).\n"
-#. TRANS: Martial law closing parenthesis
-#: client/text.c:1294
-#, c-format
-msgid "%d per unit). "
-msgstr "%d на Ñоединение). "
+#: client/text.c:1345
+#, 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 неÑчаÑтных жителей города нейтральными."
+msgstr[1] ""
+"Развелкает жителей города, Ð´ÐµÐ»Ð°Ñ 3 неÑчаÑтных жителей города нейтральными."
+msgstr[2] ""
+"Развелкает жителей города, Ð´ÐµÐ»Ð°Ñ 3 неÑчаÑтных жителей города нейтральными."
-#: client/text.c:1298
+#: client/text.c:1352
msgid "Military units in the field may cause unhappiness. "
msgstr "Военные ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð²Ð½Ðµ городов могут вызвать недовольÑтво. "
-#: client/text.c:1301
+#: client/text.c:1355
msgid "Military units have no happiness effect. "
msgstr "Военные ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð½Ðµ имеют Ñффекта на ÑчаÑтье."
-#: client/text.c:1316
+#: client/text.c:1370
#, c-format
msgid "Luxury: %d total."
msgstr "РоÑкошь: %d вÑего."
@@ -10259,7 +10341,7 @@ msgstr ""
"Клиент не поддерживает набор полей Ñ Ð²Ð¸Ð´Ð¾Ð¼ Ñверху. ИÑпользуем Ñтандартный "
"набор."
-#: client/tilespec.c:3968
+#: client/tilespec.c:3966
#, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
@@ -10283,12 +10365,12 @@ msgid ""
"have a look."
msgstr "Губернатор запуталÑÑ, разбираÑÑÑŒ Ñ %s. ВзглÑните Ñами."
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
-#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:599
+#: client/gui-gtk-2.0/cityrep.c:624 client/gui-sdl/citydlg.c:2009
msgid "none"
msgstr "нет"
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:645
msgid "custom"
msgstr "Ñпециальный"
@@ -10595,7 +10677,7 @@ msgstr "УÑтановить торговый путь (_T)"
msgid "Enter Marketplace"
msgstr "Войти на рынок"
-#: client/gui-gtk-2.0/chatline.c:144 client/gui-win32/chatline.c:134
+#: client/gui-gtk-2.0/chatline.c:218 client/gui-win32/chatline.c:134
#: client/gui-xaw/chatline.c:120
msgid "Cleared output window."
msgstr "Окно вывода очищено."
@@ -10676,11 +10758,11 @@ msgid "%d/%d %d turns"
msgstr "%d/%d %d ходов"
#: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:821
+#: client/gui-gtk-2.0/cityrep.c:1027
msgid "_Buy"
msgstr "Купить (_B)"
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:869
msgid "_Production"
msgstr "ПроизводÑтво (_P)"
@@ -10701,12 +10783,12 @@ msgid "Entertainers"
msgstr "ÐртиÑÑ‚Ñ‹"
#: client/gui-gtk-2.0/citydlg.c:1029 client/gui-win32/citydlg.c:1989
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2403
msgid "Scientists"
msgstr "Ученые"
#: client/gui-gtk-2.0/citydlg.c:1030 client/gui-win32/citydlg.c:1991
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2404
msgid "Taxmen"
msgstr "ÐалогоÑборщики"
@@ -10799,7 +10881,7 @@ msgstr "Поддерживаемые войÑка: %d"
msgid "Present units %d"
msgstr "ПриÑутÑтвующие ÑоединениÑ: %d"
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:1019
msgid "Cen_ter"
msgstr "Центр (_t)"
@@ -10888,31 +10970,61 @@ msgstr "Переименовать город"
msgid "What should we rename the city to?"
msgstr "Как переименовать город?"
-#: client/gui-gtk-2.0/cityrep.c:699
+#: client/gui-gtk-2.0/cityrep.c:794
+#, fuzzy
+msgid "(no worklists defined)"
+msgstr "(ÑпиÑок работ)"
+
+#: client/gui-gtk-2.0/cityrep.c:876
msgid "Chan_ge"
msgstr "Изменить (_g)"
-#: client/gui-gtk-2.0/cityrep.c:703
+#: client/gui-gtk-2.0/cityrep.c:880
msgid "Add _First"
msgstr "Добавить первым (_F)"
-#: client/gui-gtk-2.0/cityrep.c:707
+#: client/gui-gtk-2.0/cityrep.c:884
msgid "Add _Next"
msgstr "Добавить Ñледующим (_N)"
-#: client/gui-gtk-2.0/cityrep.c:711
+#: client/gui-gtk-2.0/cityrep.c:888
+#, fuzzy
+msgid "Add _2nd Last"
+msgstr "Добавить поÑледним (_L)"
+
+#: client/gui-gtk-2.0/cityrep.c:892
msgid "Add _Last"
msgstr "Добавить поÑледним (_L)"
-#: client/gui-gtk-2.0/cityrep.c:715
+#: client/gui-gtk-2.0/cityrep.c:899
+#, fuzzy
+msgid "Set Worklist"
+msgstr "Рабочий ÑпиÑок"
+
+#: client/gui-gtk-2.0/cityrep.c:905
+#, fuzzy
+msgid "Append Worklist"
+msgstr "Переименовать ÑпиÑок работ"
+
+#: client/gui-gtk-2.0/cityrep.c:911
+#, fuzzy
+msgid "Clear _Worklist"
+msgstr "Текущий ÑпиÑок работ (_W):"
+
+#: client/gui-gtk-2.0/cityrep.c:916
+#, fuzzy
+msgid "Gover_nor"
+msgstr "Губернатор"
+
+#: client/gui-gtk-2.0/cityrep.c:921
msgid "_Select"
msgstr "Выбрать (_S)"
-#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
+#: client/gui-gtk-2.0/cityrep.c:925 client/gui-gtk-2.0/plrdlg.c:521
msgid "_Display"
msgstr "Показать (_D)"
-#: client/gui-gtk-2.0/cityrep.c:800 client/gui-gtk-2.0/menu.c:808
+#: 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-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
#: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -10922,100 +11034,100 @@ msgstr "Показать (_D)"
msgid "Cities"
msgstr "Города"
-#: client/gui-gtk-2.0/cityrep.c:817
+#: client/gui-gtk-2.0/cityrep.c:1023
msgid "_Inspect"
msgstr "ОÑмотреть (_I)"
-#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
-#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-sdl/helpdlg.c:297 client/gui-win32/menu.c:342
-#: client/gui-xaw/menu.c:241
+#: 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
+#: client/gui-gtk-2.0/cityrep.c:1518 client/gui-gtk-2.0/menu.c:823
+#: client/gui-gtk-2.0/menu.c:825 client/gui-gtk-2.0/menu.c:827
+#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:831
+#: client/gui-gtk-2.0/menu.c:833 client/gui-sdl/helpdlg.c:297
+#: client/gui-win32/menu.c:342 client/gui-xaw/menu.c:241
msgid "Improvements"
msgstr "ЗданиÑ"
-#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
-#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
-#: client/gui-xaw/menu.c:247
+#: client/gui-gtk-2.0/cityrep.c:1441 client/gui-gtk-2.0/cityrep.c:1460
+#: client/gui-gtk-2.0/cityrep.c:1479 client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1522 client/gui-xaw/menu.c:247
msgid "Wonders"
msgstr "ЧудеÑа"
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1662 client/gui-win32/cityrep.c:439
#: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
msgid "All Cities"
msgstr "Ð’Ñе города"
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1667 client/gui-win32/cityrep.c:440
msgid "No Cities"
msgstr "Ðет городов"
-#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1672 client/gui-win32/cityrep.c:441
msgid "Invert Selection"
msgstr "Обратить выделение"
-#: client/gui-gtk-2.0/cityrep.c:1420
+#: client/gui-gtk-2.0/cityrep.c:1682
msgid "Building Units"
msgstr "Строим ÑоединениÑ"
-#: client/gui-gtk-2.0/cityrep.c:1426
+#: client/gui-gtk-2.0/cityrep.c:1688
msgid "Building Improvements"
msgstr "Строим зданиÑ"
-#: client/gui-gtk-2.0/cityrep.c:1432
+#: client/gui-gtk-2.0/cityrep.c:1694
msgid "Building Wonders"
msgstr "Строим чудеÑа"
-#: client/gui-gtk-2.0/cityrep.c:1444
+#: client/gui-gtk-2.0/cityrep.c:1706
msgid "Building Unit"
msgstr "Строим Ñоединение"
-#: client/gui-gtk-2.0/cityrep.c:1448
+#: client/gui-gtk-2.0/cityrep.c:1710
msgid "Building Improvement"
msgstr "Строим здание"
-#: client/gui-gtk-2.0/cityrep.c:1452
+#: client/gui-gtk-2.0/cityrep.c:1714
msgid "Building Wonder"
msgstr "Строим чудо"
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1722 client/gui-win32/cityrep.c:443
msgid "Coastal Cities"
msgstr "ПриморÑкие города"
-#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1727 client/gui-win32/cityrep.c:444
msgid "Same Island"
msgstr "Тот же оÑтров"
-#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1737 client/gui-win32/cityrep.c:447
msgid "Supported Units"
msgstr "Поддерживаемые ÑоединениÑ"
-#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1740 client/gui-win32/cityrep.c:454
msgid "Units Present"
msgstr "ПриÑутÑтвующие ÑоединениÑ"
-#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1744 client/gui-win32/cityrep.c:469
msgid "Improvements in City"
msgstr "Ð£Ð»ÑƒÑ‡ÑˆÐµÐ½Ð¸Ñ Ð² городе"
-#: client/gui-gtk-2.0/cityrep.c:1486
+#: client/gui-gtk-2.0/cityrep.c:1748
msgid "Wonders in City"
msgstr "ЧудеÑа в городе"
-#: client/gui-gtk-2.0/cityrep.c:1495
+#: client/gui-gtk-2.0/cityrep.c:1757
msgid "Available Units"
msgstr "ДоÑтупные ÑоединениÑ"
-#: client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1760
msgid "Available Improvements"
msgstr "ДоÑтупные зданиÑ"
-#: client/gui-gtk-2.0/cityrep.c:1501
+#: client/gui-gtk-2.0/cityrep.c:1763
msgid "Available Wonders"
msgstr "ДоÑтупные чудеÑа"
-#: client/gui-gtk-2.0/cityrep.c:1625
+#: client/gui-gtk-2.0/cityrep.c:1882
#, fuzzy, c-format
msgid "Total Buy Cost: %d"
msgstr "ÐžÐ±Ñ‰Ð°Ñ ÑтоимоÑÑ‚ÑŒ: "
@@ -11085,11 +11197,11 @@ msgstr "Как назвать пре-уÑтановку?"
msgid "Remove this preset?"
msgstr "Удалить Ñту уÑтановку?"
-#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:186
+#: client/gui-gtk-2.0/dialogs.c:196 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:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
msgid "Inspect _City"
msgstr "ОÑмотреть город (_C)"
@@ -11117,10 +11229,10 @@ msgstr "Выберите, что разрушать:"
msgid "Unit"
msgstr "Соединение"
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
-#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
-#: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
-#: manual/civmanual.c:302 data/Freeciv.in:80
+#: 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-win32/plrdlg.c:335 manual/civmanual.c:302 data/Freeciv.in:80
msgid "Name"
msgstr "Ðазвание"
@@ -11145,7 +11257,7 @@ 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:1036 data/Freeciv.in:3371
+#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
msgid "Pick Nation"
msgstr "Выбрать народ"
@@ -11224,7 +11336,7 @@ msgstr "Карты (_M)"
msgid "_Advances"
msgstr "ÐžÑ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ (_A)"
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:910
+#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr "Города (_C)"
@@ -11329,19 +11441,19 @@ msgstr "Выбрать назначение"
msgid "Show _All Cities"
msgstr "Показать вÑе города (_A)"
-#: client/gui-gtk-2.0/gui_main.c:150
+#: client/gui-gtk-2.0/gui_main.c:162
msgid "Show Map Scrollbars"
msgstr "Показывать полоÑÑ‹ прокрутки на карте"
-#: client/gui-gtk-2.0/gui_main.c:151
+#: client/gui-gtk-2.0/gui_main.c:163
msgid "Disable this option to hide the scrollbars on the map view."
msgstr "Выключите Ñту наÑтройку, чтобы ÑпрÑтать полоÑÑ‹ прокрутки на карте."
-#: client/gui-gtk-2.0/gui_main.c:155
+#: client/gui-gtk-2.0/gui_main.c:167
msgid "Keyboardless goto"
msgstr "Команда \"Идти к\" без клавиатуры"
-#: client/gui-gtk-2.0/gui_main.c:156
+#: client/gui-gtk-2.0/gui_main.c:168
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."
@@ -11350,11 +11462,11 @@ msgstr ""
"нажатии левой кнопкой мыши и перетаÑкивании мышью (при нажатой кнопке) на "
"другой квадрат."
-#: client/gui-gtk-2.0/gui_main.c:161
+#: client/gui-gtk-2.0/gui_main.c:173
msgid "Keep dialogs on top"
msgstr "Показывать диалоги Ñверху"
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:174
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."
@@ -11363,11 +11475,11 @@ msgstr ""
"главным окном Freeciv. Выключение Ñтой наÑтройки не дейÑтвует в "
"полноÑкранном режиме."
-#: client/gui-gtk-2.0/gui_main.c:166
+#: client/gui-gtk-2.0/gui_main.c:178
msgid "Show worklist task icons"
msgstr "Показывать иконки в ÑпиÑке производÑтво"
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:179
msgid ""
"Disabling this will turn off the unit and building icons in the worklist "
"dialog and the production tab of the city dialog."
@@ -11375,11 +11487,11 @@ msgstr ""
"Выключение Ñтой наÑтройки выключит изображение иконок Ñоединений и зданий в "
"рабочем ÑпиÑке и вкладке \"производÑтво\" в городÑком диалоге."
-#: client/gui-gtk-2.0/gui_main.c:171
+#: client/gui-gtk-2.0/gui_main.c:183
msgid "Enable status report tabs"
msgstr "Включить панель доклада ÑоÑтоÑниÑ"
-#: client/gui-gtk-2.0/gui_main.c:172
+#: client/gui-gtk-2.0/gui_main.c:184
msgid ""
"If this option is enabled then report dialogs will be shown as separate tabs "
"rather than in popup dialogs."
@@ -11387,11 +11499,11 @@ msgstr ""
"ЕÑли Ð´Ð°Ð½Ð½Ð°Ñ Ð½Ð°Ñтройка включена, то отчёты будут открыватьÑÑ Ð² отдельных "
"вкладках, а не в поÑвлÑющихÑÑ Ð¾ÐºÐ½Ð°Ñ…."
-#: client/gui-gtk-2.0/gui_main.c:177 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:189 client/gui-win32/gui_main.c:110
msgid "Better fog-of-war drawing"
msgstr "Ð£Ð»ÑƒÑ‡ÑˆÐµÐ½Ð½Ð°Ñ Ð¿Ñ€Ð¾Ñ€Ð¸Ñовка дыма войны"
-#: client/gui-gtk-2.0/gui_main.c:178 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:190 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."
@@ -11399,7 +11511,76 @@ msgstr ""
"ЕÑли Ñта наÑтройка включена, тогда иÑпользуетÑÑ Ð»ÑƒÑ‡ÑˆÐ¸Ð¹ метод прориÑовки дыма "
"войны. Ðто не медленнее по ÑкороÑти, но раÑходуетÑÑ Ð² два раза больше памÑти."
-#: client/gui-gtk-2.0/gui_main.c:277 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:195
+msgid "Show time for each chat message"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:196
+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
+msgid "Split bottom notebook area"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:202
+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
+msgid "New message events go to top of list"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:208
+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
+msgid "Show extra message window buttons"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:214
+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 "
+"is disabled, these buttons will not appear (you can still double-click with "
+"the left mouse button or right-click on a row to inspect or goto "
+"respectively). This option will only take effect once the message window is "
+"closed and reopened."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:224
+#, fuzzy
+msgid "Metaserver tab first in network page"
+msgstr "Тема Ð´Ð»Ñ Ð¼ÐµÑ‚Ð°Ñервера уÑтановлена в '%s'."
+
+#: client/gui-gtk-2.0/gui_main.c:225
+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
+msgid "Plain chat messages are sent to allies only"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:231
+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 "
+"messages will be sent as public chat messages. To send a public chat message "
+"with this option enabled, prefix the message with a single colon ':'. This "
+"option can also be set using a toggle button beside the chat entry (only "
+"visible in multiplayer games)."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:340 client/gui-xaw/gui_main.c:245
msgid ""
"This client has no special command line options\n"
"\n"
@@ -11407,44 +11588,45 @@ msgstr ""
"У Ñтого клиента нет Ñпециальных опций командной Ñтроки\n"
"\n"
-#: client/gui-gtk-2.0/gui_main.c:723 client/gui-gtk-2.0/gui_main.c:1345
+#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
msgid "Freeciv"
msgstr "Freeciv"
-#: client/gui-gtk-2.0/gui_main.c:1088 client/gui-gtk-2.0/gui_main.c:1095
+#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
#: 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:1095 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1232 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:1127 client/gui-gtk-2.0/menu.c:770
-#: client/gui-gtk-2.0/menu.c:772 client/gui-gtk-2.0/menu.c:774
-#: client/gui-gtk-2.0/menu.c:776 client/gui-gtk-2.0/menu.c:778
-#: client/gui-gtk-2.0/menu.c:780 client/gui-gtk-2.0/menu.c:782
-#: client/gui-gtk-2.0/menu.c:784 client/gui-gtk-2.0/menu.c:786
-#: client/gui-gtk-2.0/menu.c:788 client/gui-gtk-2.0/menu.c:790
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-gtk-2.0/menu.c:804 client/gui-gtk-2.0/menu.c:806
-#: client/gui-gtk-2.0/menu.c:808 client/gui-gtk-2.0/menu.c:810
-#: client/gui-gtk-2.0/menu.c:812 client/gui-gtk-2.0/menu.c:814
-#: client/gui-gtk-2.0/menu.c:816 client/gui-gtk-2.0/menu.c:818
-#: client/gui-gtk-2.0/menu.c:820 client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/gui_main.c:1266 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
+#: client/gui-gtk-2.0/menu.c:811 client/gui-gtk-2.0/menu.c:813
+#: client/gui-gtk-2.0/menu.c:815 client/gui-gtk-2.0/menu.c:817
+#: client/gui-gtk-2.0/menu.c:819 client/gui-gtk-2.0/menu.c:821
+#: client/gui-gtk-2.0/menu.c:823 client/gui-gtk-2.0/menu.c:825
+#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
+#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
+#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
+#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
+#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
+#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
#: data/Freeciv.in:2028
msgid "View"
msgstr "Вид"
-#: client/gui-gtk-2.0/gui_main.c:1208
+#: client/gui-gtk-2.0/gui_main.c:1359
msgid "Chat"
msgstr "Общение"
-#: client/gui-gtk-2.0/gui_main.c:1224 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1377 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"
@@ -11456,70 +11638,74 @@ msgstr ""
"при определённых уÑловиÑÑ…; Ñмотрите пункт \"Копирование\" в меню Справка\n"
"Ртеперь... ПуÑÑ‚ÑŒ вÑем чертÑм Ñтанет тошно!"
-#: client/gui-gtk-2.0/gui_main.c:1491
+#: client/gui-gtk-2.0/gui_main.c:1392
+msgid "Allies Only"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:1657
msgid "Not _ready"
msgstr "Ðе готов (_r)"
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
+#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
msgid "_Ready"
msgstr "Готов (_R)"
-#: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2132
+#: 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
msgid "_Start"
msgstr "Ðачать (_S)"
-#: client/gui-gtk-2.0/gui_main.c:1520
+#: client/gui-gtk-2.0/gui_main.c:1686
#, fuzzy
msgid "_Take Player"
msgstr "УправлÑÑ‚ÑŒ Ñтим игроком"
-#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
+#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
msgid "Pick _Nation"
msgstr "Выбрать народ (_N)"
-#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
+#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
msgid "_Observe"
msgstr "Ðаблюдать (_O)"
-#: client/gui-gtk-2.0/gui_main.c:1532
+#: client/gui-gtk-2.0/gui_main.c:1698
msgid "Do not _observe"
msgstr "Ðе наблюдать (_o)"
-#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
msgid "<AI>"
msgstr "<Компьютер>"
-#: client/gui-gtk-2.0/gui_main.c:1557
+#: client/gui-gtk-2.0/gui_main.c:1723
msgid "<Novice AI>"
msgstr "<Компьютер новичок>"
-#: client/gui-gtk-2.0/gui_main.c:1560
+#: client/gui-gtk-2.0/gui_main.c:1726
msgid "<Easy AI>"
msgstr "<Компьютер лёгкий>"
-#: client/gui-gtk-2.0/gui_main.c:1563
+#: client/gui-gtk-2.0/gui_main.c:1729
msgid "<Normal AI>"
msgstr "<Компьютер нормальный>"
-#: client/gui-gtk-2.0/gui_main.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1732
msgid "<Hard AI>"
msgstr "<Компьютер Ñложный>"
-#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1742 client/gui-win32/dialogs.c:594
#: client/gui-xaw/pages.c:217
msgid "Random"
msgstr "Случайный"
-#: client/gui-gtk-2.0/gui_main.c:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
msgid "Observer"
msgstr "Ðаблюдатель"
-#: client/gui-gtk-2.0/gui_main.c:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
msgid "Detached"
msgstr "ОтÑоединён"
-#: client/gui-gtk-2.0/gui_main.c:1899
+#: client/gui-gtk-2.0/gui_main.c:2073
msgid "Are you sure you want to quit?"
msgstr "Ð’Ñ‹ дейÑтвительно хотите выйти?"
@@ -11751,470 +11937,507 @@ msgstr "_Технологии"
msgid "Foreign Intelligence: %s Empire"
msgstr "ИноÑÑ‚Ñ€Ð°Ð½Ð½Ð°Ñ Ñ€Ð°Ð·Ð²ÐµÐ´ÐºÐ°: %s ИмпериÑ"
-#: client/gui-gtk-2.0/mapctrl.c:195 client/gui-sdl/mapctrl.c:2565
+#: client/gui-gtk-2.0/mapctrl.c:179 client/gui-sdl/mapctrl.c:2565
#: client/gui-sdl/menu.c:839 client/gui-sdl/menu.c:1021
#: client/gui-win32/mapctrl.c:353
msgid "Build New City"
msgstr "ПоÑтроить новый город"
-#: client/gui-gtk-2.0/mapctrl.c:196 client/gui-sdl/mapctrl.c:2594
+#: client/gui-gtk-2.0/mapctrl.c:180 client/gui-sdl/mapctrl.c:2594
#: client/gui-win32/mapctrl.c:354 client/gui-xaw/mapctrl.c:89
msgid "What should we call our new city?"
msgstr "Как нам назвать новый город?"
-#: client/gui-gtk-2.0/mapview.c:147
+#: client/gui-gtk-2.0/mapview.c:158
msgid "Shows your current luxury/science/tax rates;click to toggle them."
msgstr ""
"Показывает Ваши нынешние уровни налогов/роÑкоши/науки; нажмите мышкой, чтобы "
"их переключить."
-#: client/gui-gtk-2.0/mapview.c:692 client/gui-win32/canvas.c:275
+#: client/gui-gtk-2.0/mapview.c:702 client/gui-win32/canvas.c:275
msgid "Better fog will only work in truecolor. Disabling it"
msgstr ""
"Ð£Ð»ÑƒÑ‡ÑˆÐµÐ½Ð½Ð°Ñ Ð¿Ñ€Ð¾Ñ€Ð¸Ñовка дыма войны работает только в режиме truecolor. "
"Отключаем"
-#: client/gui-gtk-2.0/menu.c:250
+#: client/gui-gtk-2.0/menu.c:256
msgid "Leaving a local game will end it!"
msgstr "Выход из локальной игры завершит её!"
-#: client/gui-gtk-2.0/menu.c:700 client/gui-win32/menu.c:303
+#: client/gui-gtk-2.0/menu.c:727 client/gui-win32/menu.c:303
msgid "_Game"
msgstr "Игра (_G)"
-#: client/gui-gtk-2.0/menu.c:702 client/gui-gtk-2.0/menu.c:704
-#: client/gui-gtk-2.0/menu.c:706 client/gui-gtk-2.0/menu.c:708
-#: client/gui-gtk-2.0/menu.c:710 client/gui-gtk-2.0/menu.c:712
-#: client/gui-gtk-2.0/menu.c:714 client/gui-gtk-2.0/menu.c:717
-#: client/gui-gtk-2.0/menu.c:720 client/gui-gtk-2.0/menu.c:722
-#: client/gui-gtk-2.0/menu.c:724 client/gui-gtk-2.0/menu.c:726
-#: client/gui-gtk-2.0/menu.c:728 client/gui-gtk-2.0/menu.c:730
-#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:736
-#: client/gui-gtk-2.0/menu.c:738 client/gui-gtk-2.0/menu.c:740
+#: client/gui-gtk-2.0/menu.c:729 client/gui-gtk-2.0/menu.c:731
+#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:735
+#: client/gui-gtk-2.0/menu.c:737 client/gui-gtk-2.0/menu.c:739
+#: client/gui-gtk-2.0/menu.c:741 client/gui-gtk-2.0/menu.c:744
+#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
+#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
+#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
+#: client/gui-gtk-2.0/menu.c:760 client/gui-gtk-2.0/menu.c:763
+#: client/gui-gtk-2.0/menu.c:765 client/gui-gtk-2.0/menu.c:767
#: data/Freeciv.in:2026
msgid "Game"
msgstr "Игра"
-#: client/gui-gtk-2.0/menu.c:704 client/gui-gtk-2.0/menu.c:706
-#: client/gui-gtk-2.0/menu.c:708
+#: client/gui-gtk-2.0/menu.c:731 client/gui-gtk-2.0/menu.c:733
+#: client/gui-gtk-2.0/menu.c:735
msgid "_Chat"
msgstr "Общение (_C)"
-#: client/gui-gtk-2.0/menu.c:706 client/gui-win32/menu.c:314
+#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:314
msgid "_Clear Log"
msgstr "ОчиÑтить журнал (_C)"
-#: client/gui-gtk-2.0/menu.c:708 client/gui-win32/menu.c:313
+#: client/gui-gtk-2.0/menu.c:735 client/gui-win32/menu.c:313
msgid "_Write Log"
msgstr "ЗапиÑать журнал (_W)"
-#: client/gui-gtk-2.0/menu.c:710 client/gui-win32/menu.c:304
+#: client/gui-gtk-2.0/menu.c:737 client/gui-win32/menu.c:304
msgid "Local _Options"
msgstr "Локальные наÑтройки (_O)"
-#: client/gui-gtk-2.0/menu.c:712 client/gui-win32/menu.c:305
+#: client/gui-gtk-2.0/menu.c:739 client/gui-win32/menu.c:305
msgid "_Message Options"
msgstr "ÐаÑтройки Ñообщений (_M)"
-#: client/gui-gtk-2.0/menu.c:717
+#: client/gui-gtk-2.0/menu.c:744
msgid "_Reload Tileset"
msgstr "Перезагрузить рельеф (_R)"
-#: client/gui-gtk-2.0/menu.c:720
+#: client/gui-gtk-2.0/menu.c:747
msgid "Save Options on _Exit"
msgstr "Сохранить наÑтройки при выходе (_E)"
-#: client/gui-gtk-2.0/menu.c:722
+#: client/gui-gtk-2.0/menu.c:749
msgid "Sa_ve Options"
msgstr "Сохранить наÑтройки (_v)"
-#: client/gui-gtk-2.0/menu.c:726 client/gui-win32/menu.c:308
+#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:308
msgid "Server O_ptions"
msgstr "ÐаÑтройки Ñервера (_p)"
-#: client/gui-gtk-2.0/menu.c:730 client/gui-win32/menu.c:310
+#: client/gui-gtk-2.0/menu.c:757 client/gui-win32/menu.c:310
msgid "_Save Game"
msgstr "Сохранить игру (_S)"
-#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:311
+#: client/gui-gtk-2.0/menu.c:760 client/gui-win32/menu.c:311
msgid "Save Game _As..."
msgstr "Сохранить игру как... (_A)"
-#: client/gui-gtk-2.0/menu.c:738
+#: client/gui-gtk-2.0/menu.c:765
msgid "_Leave"
msgstr "ОтключитьÑÑ (_L)"
-#: client/gui-gtk-2.0/menu.c:740 client/gui-win32/menu.c:317
+#: client/gui-gtk-2.0/menu.c:767 client/gui-win32/menu.c:317
msgid "_Quit"
msgstr "Выйти (_Q)"
-#: client/gui-gtk-2.0/menu.c:745 client/gui-win32/menu.c:321
+#: client/gui-gtk-2.0/menu.c:772 client/gui-win32/menu.c:321
msgid "Gov_ernment"
msgstr "Форма Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ (_e)"
-#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
-#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
-#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:774 client/gui-gtk-2.0/menu.c:776
+#: client/gui-gtk-2.0/menu.c:778 client/gui-gtk-2.0/menu.c:780
+#: client/gui-gtk-2.0/menu.c:782 client/gui-gtk-2.0/menu.c:784
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
#: client/gui-xaw/menu.c:248 data/Freeciv.in:2027 data/helpdata.txt:1320
msgid "Government"
msgstr "Форма правлениÑ"
-#: client/gui-gtk-2.0/menu.c:749 client/gui-win32/menu.c:322
+#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:322
msgid "_Tax Rates"
msgstr "Ðалоговые Ñтавки (_T)"
-#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:324
+#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:324
msgid "_Find City"
msgstr "Ðайти город (_F)"
-#: client/gui-gtk-2.0/menu.c:755 client/gui-win32/menu.c:325
+#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:325
msgid "_Worklists"
msgstr "Рабочие ÑпиÑки (_W)"
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
-#: client/gui-gtk-2.0/menu.c:764 client/gui-win32/menu.c:327
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
+#: client/gui-gtk-2.0/menu.c:791 client/gui-win32/menu.c:327
msgid "_Change Government"
msgstr "Сменить форму Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ (_C)"
-#: client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:788
msgid "_Revolution..."
msgstr "РеволюциÑ... (_R)"
-#: client/gui-gtk-2.0/menu.c:764 client/gui-gtk-2.0/menu.c:970
+#: client/gui-gtk-2.0/menu.c:791 client/gui-gtk-2.0/menu.c:1013
#: client/gui-win32/menu.c:431
msgid "_Government"
msgstr "Форма Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ (_G)"
-#: client/gui-gtk-2.0/menu.c:768 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:795 client/gui-gtk-2.0/menu.c:959
#: client/gui-win32/menu.c:334
msgid "_View"
msgstr "Вид (_V)"
-#: client/gui-gtk-2.0/menu.c:772
+#: client/gui-gtk-2.0/menu.c:799
msgid "City Outlines"
msgstr "Границы города"
-#: client/gui-gtk-2.0/menu.c:774 client/gui-win32/menu.c:335
+#: client/gui-gtk-2.0/menu.c:801 client/gui-win32/menu.c:335
msgid "Map _Grid"
msgstr "Сетка на карте (_G)"
-#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:336
+#: client/gui-gtk-2.0/menu.c:803 client/gui-win32/menu.c:336
msgid "National _Borders"
msgstr "ГоÑударÑтвенные границы (_B)"
-#: client/gui-gtk-2.0/menu.c:778 client/gui-win32/menu.c:337
+#: client/gui-gtk-2.0/menu.c:805 client/gui-win32/menu.c:337
msgid "City _Names"
msgstr "ÐÐ°Ð·Ð²Ð°Ð½Ð¸Ñ Ð³Ð¾Ñ€Ð¾Ð´Ð¾Ð² (_N)"
-#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:338
+#: client/gui-gtk-2.0/menu.c:807 client/gui-win32/menu.c:338
msgid "City G_rowth"
msgstr "РоÑÑ‚ города (_r)"
-#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:339
+#: client/gui-gtk-2.0/menu.c:809 client/gui-win32/menu.c:339
msgid "City _Productions"
msgstr "ГородÑкое производÑтво (_P)"
-#: client/gui-gtk-2.0/menu.c:784 client/gui-sdl/optiondlg.c:1719
+#: client/gui-gtk-2.0/menu.c:811
+#, fuzzy
+msgid "City Buy Cost"
+msgstr "ÐžÐ±Ñ‰Ð°Ñ ÑтоимоÑÑ‚ÑŒ: "
+
+#: client/gui-gtk-2.0/menu.c:813
+#, fuzzy
+msgid "City Traderoutes"
+msgstr "Торговые пути: "
+
+#: client/gui-gtk-2.0/menu.c:815 client/gui-sdl/optiondlg.c:1719
msgid "Draw city worker map grid"
msgstr "Отображать Ñетку карты рабочих города"
-#: client/gui-gtk-2.0/menu.c:788 client/gui-sdl/optiondlg.c:1635
+#: client/gui-gtk-2.0/menu.c:819 client/gui-sdl/optiondlg.c:1635
#: client/gui-win32/menu.c:340 client/gui-xaw/menu.c:148
#: client/gui-xaw/menu.c:246 manual/civmanual.c:220 data/helpdata.txt:1220
msgid "Terrain"
msgstr "Рельеф"
-#: client/gui-gtk-2.0/menu.c:790 client/gui-win32/menu.c:341
+#: client/gui-gtk-2.0/menu.c:821 client/gui-win32/menu.c:341
#: client/gui-xaw/menu.c:149
msgid "Coastline"
msgstr "Побережье"
-#: client/gui-gtk-2.0/menu.c:796 client/gui-win32/menu.c:343
+#: client/gui-gtk-2.0/menu.c:827 client/gui-win32/menu.c:343
msgid "Roads & Rails"
msgstr "Дороги и железные дороги"
-#: client/gui-gtk-2.0/menu.c:800 client/gui-sdl/optiondlg.c:1933
+#: client/gui-gtk-2.0/menu.c:831 client/gui-sdl/optiondlg.c:1933
#: client/gui-win32/menu.c:345 client/gui-xaw/menu.c:152
msgid "Mines"
msgstr "Шахты"
-#: client/gui-gtk-2.0/menu.c:802 client/gui-win32/menu.c:346
+#: client/gui-gtk-2.0/menu.c:833 client/gui-win32/menu.c:346
msgid "Fortress & Airbase"
msgstr "КрепоÑÑ‚ÑŒ и аÑродром"
-#: client/gui-gtk-2.0/menu.c:804 client/gui-win32/menu.c:348
+#: client/gui-gtk-2.0/menu.c:835 client/gui-win32/menu.c:348
#: client/gui-xaw/menu.c:154
msgid "Specials"
msgstr "ОÑобое"
-#: client/gui-gtk-2.0/menu.c:806 client/gui-win32/menu.c:349
+#: client/gui-gtk-2.0/menu.c:837 client/gui-win32/menu.c:349
#: client/gui-xaw/menu.c:155
msgid "Pollution & Fallout"
msgstr "ЗагрÑзнение и радиациÑ"
-#: client/gui-gtk-2.0/menu.c:812 client/gui-win32/menu.c:352
+#: client/gui-gtk-2.0/menu.c:843 client/gui-win32/menu.c:352
#: client/gui-xaw/menu.c:158
msgid "Focus Unit"
msgstr "Ð¤Ð¾ÐºÑƒÑ Ð½Ð° Ñоединении"
-#: client/gui-gtk-2.0/menu.c:814 client/gui-sdl/optiondlg.c:1854
+#: client/gui-gtk-2.0/menu.c:845 client/gui-sdl/optiondlg.c:1854
#: client/gui-win32/menu.c:353 client/gui-xaw/menu.c:159
msgid "Fog of War"
msgstr "Дым войны"
-#: client/gui-gtk-2.0/menu.c:818
+#: client/gui-gtk-2.0/menu.c:849
msgid "_Full Screen"
msgstr "ПолноÑкранный режим (_F)"
-#: client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/menu.c:853
msgid "_Center View"
msgstr "Центральный вид (_C)"
-#: client/gui-gtk-2.0/menu.c:825 client/gui-win32/menu.c:358
+#: client/gui-gtk-2.0/menu.c:856 client/gui-win32/menu.c:358
msgid "_Orders"
msgstr "Приказы (_O)"
-#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
-#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
-#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
-#: client/gui-gtk-2.0/menu.c:855 client/gui-gtk-2.0/menu.c:857
-#: client/gui-gtk-2.0/menu.c:859 client/gui-gtk-2.0/menu.c:861
-#: client/gui-gtk-2.0/menu.c:863 client/gui-gtk-2.0/menu.c:865
-#: client/gui-gtk-2.0/menu.c:867 client/gui-gtk-2.0/menu.c:869
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875 client/gui-gtk-2.0/menu.c:877
-#: client/gui-gtk-2.0/menu.c:879 client/gui-gtk-2.0/menu.c:881
-#: client/gui-gtk-2.0/menu.c:883 client/gui-gtk-2.0/menu.c:885
-#: client/gui-gtk-2.0/menu.c:887 client/gui-gtk-2.0/menu.c:889
-#: client/gui-gtk-2.0/menu.c:891 client/gui-gtk-2.0/menu.c:893
-#: client/gui-gtk-2.0/menu.c:895 client/gui-gtk-2.0/menu.c:897
-#: client/gui-gtk-2.0/menu.c:899 client/gui-gtk-2.0/menu.c:901
-#: client/gui-gtk-2.0/menu.c:903 data/Freeciv.in:2029
+#: client/gui-gtk-2.0/menu.c:858 client/gui-gtk-2.0/menu.c:860
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:864
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:868
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:872
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:876
+#: client/gui-gtk-2.0/menu.c:878 client/gui-gtk-2.0/menu.c:880
+#: client/gui-gtk-2.0/menu.c:882 client/gui-gtk-2.0/menu.c:884
+#: client/gui-gtk-2.0/menu.c:886 client/gui-gtk-2.0/menu.c:888
+#: client/gui-gtk-2.0/menu.c:890 client/gui-gtk-2.0/menu.c:892
+#: client/gui-gtk-2.0/menu.c:894 client/gui-gtk-2.0/menu.c:896
+#: client/gui-gtk-2.0/menu.c:898 client/gui-gtk-2.0/menu.c:900
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906 client/gui-gtk-2.0/menu.c:908
+#: client/gui-gtk-2.0/menu.c:910 client/gui-gtk-2.0/menu.c:912
+#: client/gui-gtk-2.0/menu.c:914 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:918 client/gui-gtk-2.0/menu.c:920
+#: client/gui-gtk-2.0/menu.c:922 client/gui-gtk-2.0/menu.c:924
+#: client/gui-gtk-2.0/menu.c:926 client/gui-gtk-2.0/menu.c:928
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
+#: client/gui-gtk-2.0/menu.c:946 data/Freeciv.in:2029
msgid "Orders"
msgstr "Приказы"
-#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:1444
+#: client/gui-gtk-2.0/menu.c:860 client/gui-gtk-2.0/menu.c:1489
#: client/gui-win32/menu.c:359
msgid "_Build City"
msgstr "ПоÑтроить город (_B)"
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:1466
-#: client/gui-gtk-2.0/menu.c:1472 client/gui-win32/menu.c:360
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:1511
+#: client/gui-gtk-2.0/menu.c:1517 client/gui-win32/menu.c:360
msgid "Build _Road"
msgstr "ПоÑтроить дорогу (_R)"
-#: client/gui-gtk-2.0/menu.c:833 client/gui-gtk-2.0/menu.c:1360
+#: 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 "ПоÑтроить орошение (_I)"
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:1361
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:1406
#: client/gui-win32/menu.c:362
msgid "Build _Mine"
msgstr "ПоÑтроить шахту (_M)"
-#: client/gui-gtk-2.0/menu.c:837 client/gui-gtk-2.0/menu.c:1362
+#: client/gui-gtk-2.0/menu.c:868 client/gui-gtk-2.0/menu.c:1407
msgid "Transf_orm Terrain"
msgstr "Преобразовать рельеф (_o)"
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:1508
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:1553
#: client/gui-win32/menu.c:364
msgid "Build _Fortress"
msgstr "ПоÑтроить крепоÑÑ‚ÑŒ (_F)"
-#: client/gui-gtk-2.0/menu.c:841 client/gui-win32/menu.c:365
+#: client/gui-gtk-2.0/menu.c:872 client/gui-win32/menu.c:365
msgid "Build Airbas_e"
msgstr "ПоÑтроить аÑродром (_e)"
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:1514
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:1559
#: client/gui-win32/menu.c:366
msgid "Clean _Pollution"
msgstr "ОчиÑтить загрÑзнение (_P)"
-#: client/gui-gtk-2.0/menu.c:845 client/gui-win32/menu.c:367
+#: client/gui-gtk-2.0/menu.c:876 client/gui-win32/menu.c:367
msgid "Clean _Nuclear Fallout"
msgstr "ОчиÑтить Ñдерные выброÑÑ‹ (_N)"
-#: client/gui-gtk-2.0/menu.c:849 client/gui-win32/menu.c:369
+#: client/gui-gtk-2.0/menu.c:880 client/gui-win32/menu.c:369
msgid "_Sentry"
msgstr "Сторожить (_S)"
-#: client/gui-gtk-2.0/menu.c:855 client/gui-win32/menu.c:372
+#: client/gui-gtk-2.0/menu.c:886 client/gui-win32/menu.c:372
msgid "Make _Homecity"
msgstr "Сделать домашним городом (_H)"
-#: client/gui-gtk-2.0/menu.c:857 client/gui-win32/menu.c:373
+#: client/gui-gtk-2.0/menu.c:888 client/gui-win32/menu.c:373
msgid "_Load"
msgstr "Погрузить (_L)"
-#: client/gui-gtk-2.0/menu.c:859
+#: client/gui-gtk-2.0/menu.c:890
msgid "_Unload Transporter"
msgstr "Разгрузить ТранÑпорт (_U)"
-#: client/gui-gtk-2.0/menu.c:861 client/gui-win32/menu.c:374
+#: client/gui-gtk-2.0/menu.c:892 client/gui-win32/menu.c:374
msgid "_Unload"
msgstr "Выгрузить (_U)"
-#: client/gui-gtk-2.0/menu.c:863 client/gui-win32/menu.c:375
+#: client/gui-gtk-2.0/menu.c:894 client/gui-win32/menu.c:375
msgid "Wake up o_thers"
msgstr "Разбудить других (_t)"
-#: client/gui-gtk-2.0/menu.c:867
+#: client/gui-gtk-2.0/menu.c:898
msgid "_Auto Settler"
msgstr "Ðвто КолониÑÑ‚Ñ‹ (_A)"
-#: client/gui-gtk-2.0/menu.c:869 client/gui-win32/menu.c:378
+#: client/gui-gtk-2.0/menu.c:900 client/gui-win32/menu.c:378
msgid "Auto E_xplore"
msgstr "Ðвто иÑÑледовать (_x)"
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906
msgid "_Connect"
msgstr "ПодключитьÑÑ (_C)"
-#: client/gui-gtk-2.0/menu.c:871 client/gui-win32/menu.c:380
+#: client/gui-gtk-2.0/menu.c:902 client/gui-win32/menu.c:380
msgid "_Road"
msgstr "Дорога (_R)"
-#: client/gui-gtk-2.0/menu.c:873 client/gui-win32/menu.c:381
+#: client/gui-gtk-2.0/menu.c:904 client/gui-win32/menu.c:381
msgid "Rai_l"
msgstr "Ð–ÐµÐ»ÐµÐ·Ð½Ð°Ñ Ð´Ð¾Ñ€Ð¾Ð³Ð° (_l)"
-#: client/gui-gtk-2.0/menu.c:875 client/gui-win32/menu.c:382
+#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:382
msgid "_Irrigate"
msgstr "Орошать (_I)"
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
msgid "Go _to"
msgstr "Идти к (_t)"
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
msgid "_Build city"
msgstr "ПоÑтроить город (_B)"
-#: client/gui-gtk-2.0/menu.c:879
+#: client/gui-gtk-2.0/menu.c:910
msgid "Patrol (_Q)"
msgstr "Патрулировать (_Q)"
-#: client/gui-gtk-2.0/menu.c:881 client/gui-win32/menu.c:385
+#: client/gui-gtk-2.0/menu.c:912 client/gui-win32/menu.c:385
msgid "_Go to"
msgstr "Идти к (_G)"
-#: client/gui-gtk-2.0/menu.c:883
+#: client/gui-gtk-2.0/menu.c:914
msgid "Go\\/Airlift to City"
msgstr "Идти\\/ПереброÑить к городу"
-#: client/gui-gtk-2.0/menu.c:885 client/gui-sdl/menu.c:450
+#: client/gui-gtk-2.0/menu.c:916 client/gui-sdl/menu.c:450
#: client/gui-win32/menu.c:387 client/gui-xaw/menu.c:203
msgid "Return to nearest city"
msgstr "ВернутьÑÑ Ðº ближайшему городу"
-#: client/gui-gtk-2.0/menu.c:889 client/gui-win32/menu.c:389
+#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:389
#: client/gui-xaw/menu.c:205
msgid "Disband Unit"
msgstr "РаÑпуÑтить отрÑд"
-#: client/gui-gtk-2.0/menu.c:891 client/gui-sdl/citydlg.c:532
+#: client/gui-gtk-2.0/menu.c:922 client/gui-sdl/citydlg.c:532
#: data/Freeciv.in:1186
msgid "Upgrade unit"
msgstr "Модернизировать Ñоединение"
-#: client/gui-gtk-2.0/menu.c:893
+#: client/gui-gtk-2.0/menu.c:924
msgid "Diplomat\\/Spy Actions"
msgstr "ДейÑÑ‚Ð²Ð¸Ñ Ð´Ð¸Ð¿Ð»Ð¾Ð¼Ð°Ñ‚Ð°\\/шпиона"
-#: client/gui-gtk-2.0/menu.c:895 client/gui-sdl/menu.c:399
+#: client/gui-gtk-2.0/menu.c:926 client/gui-sdl/menu.c:399
#: client/gui-win32/menu.c:391 client/gui-xaw/menu.c:209
msgid "Explode Nuclear"
msgstr "Взорвать атомную бомбу"
-#: client/gui-gtk-2.0/menu.c:899
-msgid "Select same type"
-msgstr "Выбрать тот же тип"
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/cityrep.c:882
+msgid "Select"
+msgstr "Выбрать"
+
+#: client/gui-gtk-2.0/menu.c:934
+#, fuzzy
+msgid "Single"
+msgstr "Джунгли"
+
+#: client/gui-gtk-2.0/menu.c:936
+msgid "Same Type On Tile"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:938
+msgid "All On Tile"
+msgstr ""
-#: client/gui-gtk-2.0/menu.c:901 client/gui-win32/menu.c:393
+#: client/gui-gtk-2.0/menu.c:940
+msgid "Same Type On Continent"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:942
+msgid "Same Type Everywhere"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:393
msgid "_Wait"
msgstr "Ждать (_W)"
-#: client/gui-gtk-2.0/menu.c:903 client/gui-win32/menu.c:394
+#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:394
#: client/gui-xaw/menu.c:213
msgid "Done"
msgstr "Сделано"
-#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:398
+#: client/gui-gtk-2.0/menu.c:949 client/gui-win32/menu.c:398
msgid "_Reports"
msgstr "Отчёты (_R)"
-#: client/gui-gtk-2.0/menu.c:908 client/gui-gtk-2.0/menu.c:910
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:914
-#: client/gui-gtk-2.0/menu.c:916 client/gui-gtk-2.0/menu.c:918
-#: client/gui-gtk-2.0/menu.c:920 client/gui-gtk-2.0/menu.c:922
-#: client/gui-gtk-2.0/menu.c:924 client/gui-gtk-2.0/menu.c:926
-#: client/gui-gtk-2.0/menu.c:928 client/gui-gtk-2.0/menu.c:930
-#: client/gui-gtk-2.0/menu.c:932 data/Freeciv.in:2030
+#: client/gui-gtk-2.0/menu.c:951 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:957
+#: client/gui-gtk-2.0/menu.c:959 client/gui-gtk-2.0/menu.c:961
+#: client/gui-gtk-2.0/menu.c:963 client/gui-gtk-2.0/menu.c:965
+#: client/gui-gtk-2.0/menu.c:967 client/gui-gtk-2.0/menu.c:969
+#: client/gui-gtk-2.0/menu.c:971 client/gui-gtk-2.0/menu.c:973
+#: client/gui-gtk-2.0/menu.c:975 data/Freeciv.in:2030
msgid "Reports"
msgstr "Отчёты"
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:958
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:1001
#: client/gui-win32/menu.c:400 client/gui-win32/menu.c:425
msgid "_Units"
msgstr "Ð¡Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ (_U)"
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/menu.c:914 client/gui-win32/menu.c:402
+#: client/gui-gtk-2.0/menu.c:957 client/gui-win32/menu.c:402
msgid "_Nations"
msgstr "Ðароды (_N)"
-#: client/gui-gtk-2.0/menu.c:918 client/gui-win32/menu.c:403
+#: client/gui-gtk-2.0/menu.c:961 client/gui-win32/menu.c:403
msgid "_Economy"
msgstr "Ðкономика (_E)"
#. TRANS: Research report action
-#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:405
+#: client/gui-gtk-2.0/menu.c:963 client/gui-win32/menu.c:405
msgid "_Research"
msgstr "ИÑÑÐ»ÐµÐ´Ð¾Ð²Ð°Ð½Ð¸Ñ (_R)"
-#: client/gui-gtk-2.0/menu.c:924 client/gui-win32/menu.c:407
+#: client/gui-gtk-2.0/menu.c:967 client/gui-win32/menu.c:407
msgid "_Wonders of the World"
msgstr "ЧудеÑа Света (_W)"
-#: client/gui-gtk-2.0/menu.c:926 client/gui-win32/menu.c:408
+#: client/gui-gtk-2.0/menu.c:969 client/gui-win32/menu.c:408
msgid "_Top Five Cities"
msgstr "Лучшие пÑÑ‚ÑŒ городов (_T)"
-#: client/gui-gtk-2.0/menu.c:928 client/gui-win32/menu.c:409
+#: client/gui-gtk-2.0/menu.c:971 client/gui-win32/menu.c:409
msgid "_Messages"
msgstr "Ð¡Ð¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ (_M)"
-#: client/gui-gtk-2.0/menu.c:930 client/gui-win32/menu.c:410
+#: client/gui-gtk-2.0/menu.c:973 client/gui-win32/menu.c:410
msgid "_Demographics"
msgstr "Ð”ÐµÐ¼Ð¾Ð³Ñ€Ð°Ñ„Ð¸Ñ (_D)"
-#: client/gui-gtk-2.0/menu.c:932 client/gui-gtk-2.0/plrdlg.c:471
+#: client/gui-gtk-2.0/menu.c:975 client/gui-gtk-2.0/plrdlg.c:354
#: client/gui-win32/menu.c:411
msgid "_Spaceship"
msgstr "КоÑмичеÑкий корабль (_S)"
-#: client/gui-gtk-2.0/menu.c:936 client/gui-win32/menu.c:415
+#: client/gui-gtk-2.0/menu.c:979 client/gui-win32/menu.c:415
msgid "_Help"
msgstr "Справка (_H)"
-#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
-#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
-#: client/gui-gtk-2.0/menu.c:946 client/gui-gtk-2.0/menu.c:948
-#: client/gui-gtk-2.0/menu.c:950 client/gui-gtk-2.0/menu.c:952
-#: client/gui-gtk-2.0/menu.c:954 client/gui-gtk-2.0/menu.c:956
-#: client/gui-gtk-2.0/menu.c:958 client/gui-gtk-2.0/menu.c:960
-#: client/gui-gtk-2.0/menu.c:962 client/gui-gtk-2.0/menu.c:964
-#: client/gui-gtk-2.0/menu.c:966 client/gui-gtk-2.0/menu.c:968
-#: client/gui-gtk-2.0/menu.c:970 client/gui-gtk-2.0/menu.c:972
-#: client/gui-gtk-2.0/menu.c:974 client/gui-gtk-2.0/menu.c:976
-#: client/gui-gtk-2.0/menu.c:978 client/gui-gtk-2.0/menu.c:980
+#: client/gui-gtk-2.0/menu.c:981 client/gui-gtk-2.0/menu.c:983
+#: client/gui-gtk-2.0/menu.c:985 client/gui-gtk-2.0/menu.c:987
+#: client/gui-gtk-2.0/menu.c:989 client/gui-gtk-2.0/menu.c:991
+#: client/gui-gtk-2.0/menu.c:993 client/gui-gtk-2.0/menu.c:995
+#: client/gui-gtk-2.0/menu.c:997 client/gui-gtk-2.0/menu.c:999
+#: client/gui-gtk-2.0/menu.c:1001 client/gui-gtk-2.0/menu.c:1003
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-gtk-2.0/menu.c:1007
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-gtk-2.0/menu.c:1011
+#: client/gui-gtk-2.0/menu.c:1013 client/gui-gtk-2.0/menu.c:1015
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-gtk-2.0/menu.c:1019
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-gtk-2.0/menu.c:1023
#: client/gui-gtk-2.0/repodlgs.c:313 client/gui-win32/citydlg.c:1077
#: client/gui-win32/repodlgs.c:289 client/gui-win32/wldlg.c:846
#: data/Freeciv.in:1466 data/Freeciv.in:2031 data/Freeciv.in:2101
@@ -12222,119 +12445,119 @@ msgstr "Справка (_H)"
msgid "Help"
msgstr "Справка"
-#: client/gui-gtk-2.0/menu.c:940 client/gui-win32/menu.c:416
+#: client/gui-gtk-2.0/menu.c:983 client/gui-win32/menu.c:416
msgid "Language_s"
msgstr "Языки (_s)"
-#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/menu.c:417
+#: client/gui-gtk-2.0/menu.c:985 client/gui-win32/menu.c:417
msgid "Co_nnecting"
msgstr "Подключение (_n)"
-#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:418
+#: client/gui-gtk-2.0/menu.c:987 client/gui-win32/menu.c:418
msgid "C_ontrols"
msgstr "Управление (_o)"
-#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:419
+#: client/gui-gtk-2.0/menu.c:989 client/gui-win32/menu.c:419
msgid "C_hatline"
msgstr "Общение (_h)"
-#: client/gui-gtk-2.0/menu.c:948 client/gui-win32/menu.c:420
+#: client/gui-gtk-2.0/menu.c:991 client/gui-win32/menu.c:420
msgid "_Worklist Editor"
msgstr "Редактор рабочих ÑпиÑков (_W)"
-#: client/gui-gtk-2.0/menu.c:950 client/gui-win32/menu.c:421
+#: client/gui-gtk-2.0/menu.c:993 client/gui-win32/menu.c:421
msgid "Citizen _Management"
msgstr "Управление гражданами (_M)"
-#: client/gui-gtk-2.0/menu.c:952 client/gui-win32/menu.c:422
+#: client/gui-gtk-2.0/menu.c:995 client/gui-win32/menu.c:422
msgid "_Playing"
msgstr "Игра (_P)"
-#: client/gui-gtk-2.0/menu.c:956 client/gui-win32/menu.c:424
+#: client/gui-gtk-2.0/menu.c:999 client/gui-win32/menu.c:424
msgid "City _Improvements"
msgstr "ГородÑкие Ð·Ð´Ð°Ð½Ð¸Ñ (_I)"
-#: client/gui-gtk-2.0/menu.c:960 client/gui-win32/menu.c:426
+#: client/gui-gtk-2.0/menu.c:1003 client/gui-win32/menu.c:426
msgid "Com_bat"
msgstr "Ð¡Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ (_b)"
-#: client/gui-gtk-2.0/menu.c:962 client/gui-win32/menu.c:427
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-win32/menu.c:427
msgid "_ZOC"
msgstr "Зоны ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»Ñ (_Z)"
-#: client/gui-gtk-2.0/menu.c:964 client/gui-win32/menu.c:428
+#: client/gui-gtk-2.0/menu.c:1007 client/gui-win32/menu.c:428
msgid "Techno_logy"
msgstr "Технологии (_l)"
-#: client/gui-gtk-2.0/menu.c:966 client/gui-win32/menu.c:429
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-win32/menu.c:429
msgid "_Terrain"
msgstr "Рельеф (_T)"
-#: client/gui-gtk-2.0/menu.c:968 client/gui-win32/menu.c:430
+#: client/gui-gtk-2.0/menu.c:1011 client/gui-win32/menu.c:430
msgid "Won_ders"
msgstr "ЧудеÑа (_d)"
-#: client/gui-gtk-2.0/menu.c:972 client/gui-win32/menu.c:432
+#: client/gui-gtk-2.0/menu.c:1015 client/gui-win32/menu.c:432
msgid "Happin_ess"
msgstr "СчаÑтье (_e)"
-#: client/gui-gtk-2.0/menu.c:974 client/gui-win32/menu.c:433
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-win32/menu.c:433
msgid "Space _Race"
msgstr "КоÑмичеÑÐºÐ°Ñ Ð³Ð¾Ð½ÐºÐ° (_R)"
-#: client/gui-gtk-2.0/menu.c:978 client/gui-win32/menu.c:435
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-win32/menu.c:435
msgid "_Copying"
msgstr "Копирование (_C)"
-#: client/gui-gtk-2.0/menu.c:980 client/gui-win32/menu.c:436
+#: client/gui-gtk-2.0/menu.c:1023 client/gui-win32/menu.c:436
msgid "_About"
msgstr "О программе (_A)"
-#: client/gui-gtk-2.0/menu.c:1264
+#: client/gui-gtk-2.0/menu.c:1307
#, c-format
msgid "%s..."
msgstr "%s..."
-#: client/gui-gtk-2.0/menu.c:1352
+#: client/gui-gtk-2.0/menu.c:1397
#, c-format
msgid "Change to %s (_I)"
msgstr "Изменить в %s (_I)"
-#: client/gui-gtk-2.0/menu.c:1353
+#: client/gui-gtk-2.0/menu.c:1398
#, c-format
msgid "Change to %s (_M)"
msgstr "Изменить в %s (_M)"
-#: client/gui-gtk-2.0/menu.c:1354
+#: client/gui-gtk-2.0/menu.c:1399
#, c-format
msgid "Transf_orm to %s"
msgstr "Преобразовать в %s (_o)"
-#: client/gui-gtk-2.0/menu.c:1427
+#: client/gui-gtk-2.0/menu.c:1472
msgid "Help _Build Wonder"
msgstr "Помочь поÑтроить чудо (_B)"
-#: client/gui-gtk-2.0/menu.c:1441
+#: client/gui-gtk-2.0/menu.c:1486
msgid "Add to City (_B)"
msgstr "Добавить к городу (_B)"
-#: client/gui-gtk-2.0/menu.c:1449
+#: client/gui-gtk-2.0/menu.c:1494
msgid "Make Trade _Route"
msgstr "УÑтановить торговый путь (_R)"
-#: client/gui-gtk-2.0/menu.c:1463
+#: client/gui-gtk-2.0/menu.c:1508
msgid "Build _Railroad"
msgstr "ПоÑтроить железную дорогу (_R)"
-#: client/gui-gtk-2.0/menu.c:1486
+#: client/gui-gtk-2.0/menu.c:1531
msgid "Bu_ild Farmland"
msgstr "ПоÑтроить ферму (_i)"
-#: client/gui-gtk-2.0/menu.c:1506
+#: client/gui-gtk-2.0/menu.c:1551
msgid "_Fortify"
msgstr "Укрепить (_F)"
-#: client/gui-gtk-2.0/menu.c:1512
+#: client/gui-gtk-2.0/menu.c:1557
msgid "_Paradrop"
msgstr "СброÑить Ñ Ð¿Ð°Ñ€Ð°ÑˆÑŽÑ‚Ð¾Ð¼ (_P)"
@@ -12369,13 +12592,31 @@ msgstr "Соо"
msgid "Pop"
msgstr "Отк"
-#: client/gui-gtk-2.0/messagewin.c:155 client/gui-sdl/messagewin.c:247
+#: client/gui-gtk-2.0/messagewin.c:186 client/gui-sdl/messagewin.c:247
#: client/gui-win32/messagewin.c:132 client/gui-xaw/menu.c:228
#: data/Freeciv.in:3273 data/Freeciv.in:3274 data/Freeciv.in:3283
msgid "Messages"
msgstr "СообщениÑ"
-#: client/gui-gtk-2.0/plrdlg.c:330
+#: client/gui-gtk-2.0/plrdlg.c:317
+msgid "_Meet"
+msgstr "Ð’Ñтретить (_M)"
+
+#: client/gui-gtk-2.0/plrdlg.c:323
+msgid "Cancel _Treaty"
+msgstr "Отмена договора (_T)"
+
+#: client/gui-gtk-2.0/plrdlg.c:329
+#, fuzzy
+msgid "_Withdraw Vision"
+msgstr "Убрать зрение (_W)"
+
+#: client/gui-gtk-2.0/plrdlg.c:348
+#, fuzzy
+msgid "_Report"
+msgstr "Отчёты (_R)"
+
+#: client/gui-gtk-2.0/plrdlg.c:386
msgid "?show:Dead Players"
msgstr "Умершие игроки"
@@ -12383,266 +12624,270 @@ msgstr "Умершие игроки"
#. TRANS: Nations report action
#. TRANS: Nations report title
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/plrdlg.c:350 client/gui-sdl/mapctrl.c:1580
+#: client/gui-gtk-2.0/plrdlg.c:406 client/gui-sdl/mapctrl.c:1580
#: client/gui-sdl/plrdlg.c:608 client/gui-win32/plrdlg.c:344
#: client/gui-xaw/menu.c:221 data/Freeciv.in:3192 data/Freeciv.in:3193
msgid "Nations"
msgstr "Ðароды"
-#: client/gui-gtk-2.0/plrdlg.c:443
+#: client/gui-gtk-2.0/plrdlg.c:511
+#, fuzzy
+msgid "Di_plomacy"
+msgstr "ДипломатиÑ"
+
+#: client/gui-gtk-2.0/plrdlg.c:516
msgid "_Intelligence"
msgstr "Разведка (_I)"
-#: client/gui-gtk-2.0/plrdlg.c:450
-msgid "_Meet"
-msgstr "Ð’Ñтретить (_M)"
-
-#: client/gui-gtk-2.0/plrdlg.c:457
-msgid "Cancel _Treaty"
-msgstr "Отмена договора (_T)"
-
-#: client/gui-gtk-2.0/plrdlg.c:464
-msgid "_Withdraw vision"
-msgstr "Убрать зрение (_W)"
-
-#: client/gui-gtk-2.0/plrdlg.c:495
+#: client/gui-gtk-2.0/plrdlg.c:526
msgid "_AI"
msgstr "Компьютер (_A)"
-#: client/gui-gtk-2.0/plrdlg.c:501
+#: client/gui-gtk-2.0/plrdlg.c:532
msgid "_Toggle AI Mode"
msgstr "Переключить компьютерный режим (_T)"
-#: client/gui-gtk-2.0/pages.c:208
+#: client/gui-gtk-2.0/pages.c:221
msgid "Start _New Game"
msgstr "Ðачать новую игру (_N)"
-#: client/gui-gtk-2.0/pages.c:214
+#: client/gui-gtk-2.0/pages.c:227
msgid "Start _Scenario Game"
msgstr "Ðачать игру по Ñценарию (_S)"
-#: client/gui-gtk-2.0/pages.c:220
+#: client/gui-gtk-2.0/pages.c:233
msgid "_Load Saved Game"
msgstr "Загрузить Ñохранённую игру (_L)"
-#: client/gui-gtk-2.0/pages.c:229
+#: client/gui-gtk-2.0/pages.c:239
msgid "C_onnect to Network Game"
msgstr "ПодключитьÑÑ Ðº Ñетевой игре (_o)"
-#: client/gui-gtk-2.0/pages.c:236
+#: client/gui-gtk-2.0/pages.c:247
msgid "Connect to Gaming _Zone"
msgstr "ПодключитьÑÑ Ðº Gaming Zone (_Z)"
-#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:300
#: client/gui-xaw/connectdlg.c:326
msgid "Passwords don't match, enter password."
msgstr "Пароли не Ñовпадают, введите пароль."
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:779 client/gui-gtk-2.0/pages.c:820
+#: client/gui-win32/connectdlg.c:916
msgid "Server Name"
msgstr "Ð˜Ð¼Ñ Ñервера"
-#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
+#: 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
+#: data/Freeciv.in:96
msgid "Port"
msgstr "Порт"
-#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
+#: client/gui-win32/connectdlg.c:917
msgid "Version"
msgstr "ВерÑиÑ"
-#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
-#: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
+#: 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
msgid "Status"
msgstr "СоÑтоÑние"
-#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
-#: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
+#: 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
msgid "Players"
msgstr "Игроки"
-#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
+#: client/gui-win32/connectdlg.c:918
msgid "Comment"
msgstr "Комментарий"
-#: client/gui-gtk-2.0/pages.c:747
+#: client/gui-gtk-2.0/pages.c:786
msgid "Local _Area Network"
msgstr "Ð›Ð¾ÐºÐ°Ð»ÑŒÐ½Ð°Ñ Ñеть (_A)"
-#: client/gui-gtk-2.0/pages.c:783
+#: client/gui-gtk-2.0/pages.c:827
msgid "Internet _Metaserver"
msgstr "Интернет МетаÑервер (_M)"
-#: client/gui-gtk-2.0/pages.c:817
+#: client/gui-gtk-2.0/pages.c:864
msgid "_Host:"
msgstr "Сервер (_H):"
-#: client/gui-gtk-2.0/pages.c:834
+#: client/gui-gtk-2.0/pages.c:881
msgid "_Port:"
msgstr "Порт (_P):"
-#: client/gui-gtk-2.0/pages.c:851
+#: client/gui-gtk-2.0/pages.c:898
msgid "_Login:"
msgstr "Логин (_L):"
-#: client/gui-gtk-2.0/pages.c:869
+#: client/gui-gtk-2.0/pages.c:916
msgid "Pass_word:"
msgstr "Пароль (_w):"
-#: client/gui-gtk-2.0/pages.c:887
+#: client/gui-gtk-2.0/pages.c:934
msgid "Conf_irm Password:"
msgstr "Повторите Пароль (_i):"
-#: client/gui-gtk-2.0/pages.c:912
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: 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/wldlg.c:800 client/gui-win32/wldlg.c:806
+msgid "Type"
+msgstr "Тип"
+
+#: client/gui-gtk-2.0/pages.c:952 client/gui-win32/plrdlg.c:337
+#: data/Freeciv.in:88
+msgid "Host"
+msgstr "Сервер"
+
+#: client/gui-gtk-2.0/pages.c:981
msgid "C_onnect"
msgstr "ПодключитьÑÑ (_o)"
-#: client/gui-gtk-2.0/pages.c:1142
+#: client/gui-gtk-2.0/pages.c:1211
#, c-format
msgid "Connection name: %s"
msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ: %s"
-#: client/gui-gtk-2.0/pages.c:1145
+#: client/gui-gtk-2.0/pages.c:1214
#, c-format
msgid "Player name: %s"
msgstr "Ð˜Ð¼Ñ Ð¸Ð³Ñ€Ð¾ÐºÐ°: %s"
-#: client/gui-gtk-2.0/pages.c:1150
+#: client/gui-gtk-2.0/pages.c:1219
#, c-format
msgid "Host: %s"
msgstr "ХоÑÑ‚: %s"
-#: client/gui-gtk-2.0/pages.c:1158
+#: client/gui-gtk-2.0/pages.c:1227
msgid "Player/conn info"
msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾Ð± игроке/подключении"
-#: client/gui-gtk-2.0/pages.c:1185
+#: client/gui-gtk-2.0/pages.c:1254
#, c-format
msgid "%s info"
msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ %s"
-#: client/gui-gtk-2.0/pages.c:1196
+#: client/gui-gtk-2.0/pages.c:1265
msgid "Toggle player ready"
msgstr "Изменить готовноÑÑ‚ÑŒ игрока"
-#: client/gui-gtk-2.0/pages.c:1204
+#: client/gui-gtk-2.0/pages.c:1273
msgid "Pick nation"
msgstr "Выбрать народ"
-#: client/gui-gtk-2.0/pages.c:1214
+#: client/gui-gtk-2.0/pages.c:1283
msgid "Observe this player"
msgstr "Ðаблюдать за Ñтим игроком"
-#: client/gui-gtk-2.0/pages.c:1221
+#: client/gui-gtk-2.0/pages.c:1290
msgid "Take this player"
msgstr "УправлÑÑ‚ÑŒ Ñтим игроком"
-#: client/gui-gtk-2.0/pages.c:1238
+#: client/gui-gtk-2.0/pages.c:1307
msgid "Cut connection"
msgstr "Прервать подключение"
-#: client/gui-gtk-2.0/pages.c:1248
+#: client/gui-gtk-2.0/pages.c:1317
msgid "Aitoggle player"
msgstr "Сменить ÑÑ‚Ð°Ñ‚ÑƒÑ ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€Ð½Ð¾Ð³Ð¾ управлениÑ"
-#: client/gui-gtk-2.0/pages.c:1257
+#: client/gui-gtk-2.0/pages.c:1326
msgid "Remove player"
msgstr "Удалить игрока"
-#: client/gui-gtk-2.0/pages.c:1268
+#: client/gui-gtk-2.0/pages.c:1337
msgid "Give info access"
msgstr "Дать уровень доÑтупа info"
-#: client/gui-gtk-2.0/pages.c:1276
+#: client/gui-gtk-2.0/pages.c:1345
msgid "Give ctrl access"
msgstr "Дать уровень доÑтупа ctrl"
#. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1338
+#: client/gui-gtk-2.0/pages.c:1407
#, c-format
msgid "Put on %s"
msgstr "Включить в %s"
-#: client/gui-gtk-2.0/pages.c:1442
+#: client/gui-gtk-2.0/pages.c:1511
msgid "Number of _Players (including AI):"
msgstr "ЧиÑло игроков (Ð’ÐºÐ»ÑŽÑ‡Ð°Ñ ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€Ð½Ñ‹Ñ… игроков) (_P):"
-#: client/gui-gtk-2.0/pages.c:1465
+#: client/gui-gtk-2.0/pages.c:1534
msgid "AI Skill _Level:"
msgstr "Уровень компьютерного противника (AI) (_L):"
-#: client/gui-gtk-2.0/pages.c:1481
+#: client/gui-gtk-2.0/pages.c:1550
#, fuzzy
msgid "Ruleset _Version:"
msgstr "_Правила:"
-#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
msgid "_More Game Options..."
msgstr "Доп. наÑтройки игры... (_M)"
-#: client/gui-gtk-2.0/pages.c:1514
+#: client/gui-gtk-2.0/pages.c:1583
#, fuzzy
msgid "Record"
msgstr "Рекорд"
-#: client/gui-gtk-2.0/pages.c:1519
+#: client/gui-gtk-2.0/pages.c:1588
msgid "Rating"
msgstr "Рейтинг"
-#: client/gui-gtk-2.0/pages.c:1525
+#: client/gui-gtk-2.0/pages.c:1594
msgid "Ready"
msgstr "Готов"
-#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
-#: data/nation/slovakian.ruleset:26
-msgid "Leader"
-msgstr "Лидер"
+#: client/gui-gtk-2.0/pages.c:1601
+#, fuzzy
+msgid "?player:Leader"
+msgstr "?Игрок:ИмÑ"
-#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1732 client/gui-sdl/chatline.c:185
msgid "Choose Saved Game to Load"
msgstr "Выберите Ñохранённую игру, которую Ð’Ñ‹ хотите загрузить"
-#: client/gui-gtk-2.0/pages.c:1752
+#: client/gui-gtk-2.0/pages.c:1824
msgid "Choose Saved Game to _Load:"
msgstr "Выберите игру, которую Вы хотите загрузить (_L):"
-#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
-#: client/gui-gtk-2.0/pages.c:2375
+#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
+#: client/gui-gtk-2.0/pages.c:2451
msgid "_Browse..."
msgstr "Обзор... (_B)"
-#: client/gui-gtk-2.0/pages.c:1839
+#: client/gui-gtk-2.0/pages.c:1911
msgid "Choose a Scenario"
msgstr "Выберите Ñценарий"
-#: client/gui-gtk-2.0/pages.c:1926
+#: client/gui-gtk-2.0/pages.c:1998
msgid "Choose a _Scenario:"
msgstr "Выберите Ñценарий (_S):"
-#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
-#: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
-#: client/gui-win32/wldlg.c:806
-msgid "Type"
-msgstr "Тип"
-
-#: client/gui-gtk-2.0/pages.c:2101
+#: client/gui-gtk-2.0/pages.c:2173
msgid "Choose a _nation to play:"
msgstr "Выберите народ, которым Вы будете играть (_n):"
-#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2363 client/gui-win32/menu.c:581
msgid "Select Location to Save"
msgstr "Выберите меÑто Ð´Ð»Ñ ÑохранениÑ"
-#: client/gui-gtk-2.0/pages.c:2372 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2448 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr "Сохранить игру"
-#: client/gui-gtk-2.0/pages.c:2413
+#: client/gui-gtk-2.0/pages.c:2489
msgid "Saved _Games:"
msgstr "Сохранённые игры (_G):"
-#: client/gui-gtk-2.0/pages.c:2440
+#: client/gui-gtk-2.0/pages.c:2516
msgid "Save _Filename:"
msgstr "Ð˜Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ (_F):"
@@ -12991,7 +13236,7 @@ msgstr "Закрыть диалог (Esc)"
msgid "Total users logged in : %d"
msgstr "Ð’Ñего вошедших пользователей: %d"
-#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1094
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
msgid "Back"
msgstr "Ðазад"
@@ -13000,7 +13245,7 @@ msgid "Start"
msgstr "Ðачать"
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:775
+#: client/gui-win32/connectdlg.c:777
msgid "Load Game"
msgstr "Загрузить игру"
@@ -13037,12 +13282,12 @@ msgid "Make new homecity"
msgstr "Сменить дом. город"
#: client/gui-sdl/citydlg.c:546 client/gui-sdl/citydlg.c:1418
-#: client/gui-sdl/connectdlg.c:307 client/gui-sdl/connectdlg.c:616
-#: client/gui-sdl/connectdlg.c:802 client/gui-sdl/connectdlg.c:984
+#: 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/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1039
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
#: 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
@@ -13089,7 +13334,7 @@ msgstr "Купить?"
#: client/gui-sdl/diplodlg.c:1335 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:2427
+#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
#: client/gui-xaw/cityrep.c:666 client/gui-xaw/cma_fe.c:327
#: client/gui-xaw/cma_fe.c:511 client/gui-xaw/cma_fe.c:765
#: client/gui-xaw/messagedlg.c:72 client/gui-xaw/optiondlg.c:76
@@ -13105,7 +13350,7 @@ msgstr "Ðет"
#: client/gui-sdl/diplodlg.c:1345 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:2427 client/gui-xaw/cityrep.c:666
+#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
#: client/gui-xaw/cma_fe.c:327 client/gui-xaw/cma_fe.c:511
#: client/gui-xaw/cma_fe.c:765 client/gui-xaw/messagedlg.c:72
#: client/gui-xaw/optiondlg.c:76 client/gui-xaw/optiondlg.c:304
@@ -13383,36 +13628,36 @@ msgstr "Применить однажды"
msgid "Release city"
msgstr "ОтпуÑтить город"
-#: client/gui-sdl/connectdlg.c:238
+#: client/gui-sdl/connectdlg.c:239
msgid "Creating Server List..."
msgstr "Создание ÑпиÑка Ñерверов..."
-#: client/gui-sdl/connectdlg.c:279 client/gui-sdl/connectdlg.c:343
+#: client/gui-sdl/connectdlg.c:280 client/gui-sdl/connectdlg.c:344
msgid "No LAN servers found"
msgstr "Сервер локальной Ñети не найден"
-#: client/gui-sdl/connectdlg.c:281 client/gui-sdl/connectdlg.c:345
+#: client/gui-sdl/connectdlg.c:282 client/gui-sdl/connectdlg.c:346
msgid "No public servers found"
msgstr "Ðе найдены публичные Ñервера"
-#: client/gui-sdl/connectdlg.c:555
+#: client/gui-sdl/connectdlg.c:556
msgid "Player Name :"
msgstr "Ð˜Ð¼Ñ Ð¸Ð³Ñ€Ð¾ÐºÐ° :"
-#: client/gui-sdl/connectdlg.c:571
+#: client/gui-sdl/connectdlg.c:572
msgid "Freeciv Server :"
msgstr "Сервер Freeciv :"
-#: client/gui-sdl/connectdlg.c:588
+#: client/gui-sdl/connectdlg.c:589
msgid "Port :"
msgstr "Порт :"
-#: client/gui-sdl/connectdlg.c:608 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr "ПодключитьÑÑ"
-#: client/gui-sdl/connectdlg.c:794 client/gui-sdl/connectdlg.c:977
+#: client/gui-sdl/connectdlg.c:795 client/gui-sdl/connectdlg.c:978
#: client/gui-xaw/connectdlg.c:145
msgid "Next"
msgstr "Далее"
@@ -13693,8 +13938,8 @@ msgid "Unable to initialize SDL library: %s"
msgstr "Ðевозможно инициализировать библиотеку SDL: %s"
#: client/gui-sdl/graphics.c:1021
-#, c-format
-msgid "Unable to initialize SDL_ttf library: %s"
+#, fuzzy, c-format
+msgid "Unable to initialize SDL_ttf library: %s"
msgstr "Ðевозможно инициализировать библиотеку SDL_ttf: %s"
#: client/gui-sdl/graphics.c:1058
@@ -13783,14 +14028,6 @@ msgstr "Ð˜Ð½Ð¸Ñ†Ð¸Ð°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ ÐºÐ»Ð¸ÐµÐ½Ñ‚Ð°"
msgid "Waiting for the beginning of the game"
msgstr "Ожидание начала игры"
-#: client/gui-sdl/gui_string.c:608
-msgid ""
-"Couldn't find stdfont.ttf file. Please link/copy/move anyunicode ttf font to "
-"data dir as stdfont.ttf"
-msgstr ""
-"Ðевозможно найти файл stdfont.ttf. ПожалуйÑта, Ñкопируйте/перемеÑтите/"
-"Ñделайте ÑÑылку на любой Unicode TTF шрифт в каталоге data как stdfont.ttf"
-
#. TRANS: Future Technology
#: client/gui-sdl/gui_tilespec.c:506
msgid "FT"
@@ -14388,12 +14625,12 @@ msgid "Leave Game"
msgstr "Покинуть игру"
#: client/gui-sdl/optiondlg.c:2302 client/gui-sdl/pages.c:255
-#: client/gui-win32/connectdlg.c:1098 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1100 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:963
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
msgid "Start New Game"
msgstr "Ðачать новую игру"
@@ -14506,8 +14743,8 @@ msgstr "Ожидаемый доход: "
msgid "%s max rate : %d%%"
msgstr "%s макÑимальный уровень: %d%%"
-#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1081
-#: client/gui-win32/connectdlg.c:1089 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
+#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
msgid "Update"
msgstr "Обновить"
@@ -14963,10 +15200,6 @@ msgstr "Изменить вÑе"
msgid "Refresh"
msgstr "Перегрузить"
-#: client/gui-win32/cityrep.c:882
-msgid "Select"
-msgstr "Выбрать"
-
#: client/gui-win32/cityrep.c:883
msgid "Configure"
msgstr "Конфиг."
@@ -15016,55 +15249,55 @@ msgstr "Ðевозможно загрузить Ñохранённую игру"
msgid "Verify Password"
msgstr "Подтвердите пароль"
-#: client/gui-win32/connectdlg.c:912 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr "Выбор Ñервера Freeciv"
-#: client/gui-win32/connectdlg.c:913
+#: client/gui-win32/connectdlg.c:915
msgid "Local Area Network"
msgstr "Ð›Ð¾ÐºÐ°Ð»ÑŒÐ½Ð°Ñ Ñеть"
-#: client/gui-win32/connectdlg.c:947
+#: client/gui-win32/connectdlg.c:949
msgid "Welcome to Freeciv"
msgstr "Добро пожаловать"
-#: client/gui-win32/connectdlg.c:965
+#: client/gui-win32/connectdlg.c:967
msgid "Load Saved Game"
msgstr "Загрузить Ñохранённую игру"
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
msgid "Connect To Network Game"
msgstr "ПодключитьÑÑ Ðº Ñетевой игре"
-#: client/gui-win32/connectdlg.c:977
+#: client/gui-win32/connectdlg.c:979
msgid "Choose a nation to play"
msgstr "Выберите _народ, которым Вы будете играть:"
-#: client/gui-win32/connectdlg.c:1012
+#: client/gui-win32/connectdlg.c:1014
msgid "Number of players (Including AI):"
msgstr "ЧиÑло игроков (Ð’ÐºÐ»ÑŽÑ‡Ð°Ñ ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€Ð½Ñ‹Ñ… игроков):"
-#: client/gui-win32/connectdlg.c:1020
+#: client/gui-win32/connectdlg.c:1022
msgid "AI skill level:"
msgstr "Уровень компьютерного противника (AI):"
-#: client/gui-win32/connectdlg.c:1034 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
msgid "Game Options"
msgstr "ÐаÑтройки игры"
-#: client/gui-win32/connectdlg.c:1038
+#: client/gui-win32/connectdlg.c:1040
msgid "Start Game"
msgstr "Ðачать игру"
-#: client/gui-win32/connectdlg.c:1057
+#: client/gui-win32/connectdlg.c:1059
msgid "Login:"
msgstr "Логин:"
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
msgid "Host:"
msgstr "ХоÑÑ‚:"
-#: client/gui-win32/connectdlg.c:1060
+#: client/gui-win32/connectdlg.c:1062
msgid "Port:"
msgstr "Порт:"
@@ -15328,10 +15561,6 @@ msgstr[0] "(бездел. %d ход)"
msgstr[1] "(бездел. %d хода)"
msgstr[2] "(бездел. %d ходов)"
-#: client/gui-win32/plrdlg.c:337 data/Freeciv.in:88
-msgid "Host"
-msgstr "Сервер"
-
#: client/gui-win32/plrdlg.c:355 data/Freeciv.in:3230
msgid "Intelligence"
msgstr "Разведка"
@@ -17127,12 +17356,12 @@ msgstr ""
#: data/helpdata.txt:781
msgid ""
-" To have a diplomatic relationship with another player, you must fist "
-"establish first contact with that player. To establish first contact, you "
-"have to move one of your units next to a city or unit belonging to that "
-"player, or vice versa. Unless you establish an embassy with that player, you "
-"may again lose contact with them after a set number of turns without direct "
-"physical contact."
+" To have a diplomatic relationship with another player, you must first "
+"establish contact with that player. To establish contact, you have to move "
+"one of your units next to a city or unit belonging to that player, or vice "
+"versa. Unless you establish an embassy with that player, you may again lose "
+"contact with them after a set number of turns without direct physical "
+"contact."
msgstr ""
#: data/helpdata.txt:788
@@ -19924,7 +20153,7 @@ msgid "Communism"
msgstr "Коммунизм"
#: data/default/governments.ruleset:121 data/civ2/governments.ruleset:118
-#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:26
+#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:27
msgid "Comrade"
msgstr "Товарищ"
@@ -20901,6 +21130,11 @@ msgstr ""
"работу двум работающим ÑоединениÑм. Кроме того, группа КолониÑтов и/или "
"Инженеров чаÑто подвергаетÑÑ Ð°Ñ‚Ð°ÐºÐ°Ð¼ противника."
+#: data/default/units.ruleset:238
+#, fuzzy
+msgid "?unit:Workers"
+msgstr "Рабочие"
+
#: data/default/units.ruleset:264
msgid ""
"Workers are one of the key units in the game. They can be used to irrigate "
@@ -21561,6 +21795,11 @@ msgstr "ИÑÑледователь"
msgid "Explorers are very useful for mapping unknown territory."
msgstr "ИÑÑледователи очень полезны Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ ÐºÐ°Ñ€Ñ‚ неизвеÑтных территорий."
+#: data/default/units.ruleset:1864
+#, fuzzy
+msgid "?unit:Leader"
+msgstr "Лидер"
+
#: data/default/units.ruleset:1892
msgid "This is you. If you lose this unit, you lose the game. So don't."
msgstr ""
@@ -21813,7 +22052,7 @@ msgid "Emir"
msgstr "Ðмир"
#: data/nation/afghani.ruleset:25 data/nation/slovakian.ruleset:30
-#: data/nation/soviet.ruleset:27
+#: data/nation/soviet.ruleset:28
msgid "General Secretary"
msgstr "Генеральный Секретарь"
@@ -21931,10 +22170,11 @@ msgid "?plural:Armenians"
msgstr "?plural:ÐрмÑне"
#: 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 "
-"independence from Soviet in 1991 AD"
+"independence from the Soviet Union in 1991."
msgstr ""
"СоглаÑно легенде, армÑне ÑвлÑÑŽÑ‚ÑÑ Ð¿Ð¾Ñ‚Ð¾Ð¼ÐºÐ°Ð¼Ð¸ Хайка - пра-правнука ÐоÑ. "
"Ð¡Ð¾Ð²Ñ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ Ð ÐµÑпублика ÐÑ€Ð¼ÐµÐ½Ð¸Ñ Ñтала незавиÑимой в результате раÑпада "
@@ -22962,12 +23202,11 @@ msgstr "?plural:Иллирийцы"
#: data/nation/illyrian.ruleset:6
msgid ""
-"Illyrians were Indo-European tribes who appeared in the western part of the "
-"Balkan Peninsula before 1000 BC, including the Dalmatians to the north, "
-"Corcyra island and Ambracia bay in prehistoric Epirus to the south, mixing "
-"with Thracians in Dardania to the east, and settling Messapia across the "
-"Adriatic Sea. Illyrian kingdoms were independent for centuries, until "
-"conquered by the Roman Republic."
+"Illyrians were Indo-European tribes who appeared in the western part of the "
+"Balkan Peninsula before 1000 BC, including Corcyra island and Ambracia bay "
+"in prehistoric Epirus to the south. They mixed with Thracians in Dardania to "
+"the east, and settled Messapia across the Adriatic Sea. Illyrian kingdoms "
+"were independent for centuries, until conquered by the Roman Republic."
msgstr ""
#: data/nation/inca.ruleset:3
@@ -23270,7 +23509,7 @@ msgid ""
"1953."
msgstr ""
-#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:28
+#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:29
#, fuzzy
msgid "Great Leader"
msgstr "Великий лидер"
@@ -23434,9 +23673,9 @@ msgstr "?plural:Малийцы"
msgid ""
"Sub-Saharan Africa has been a cultural and ethnical melting pot for "
"millennia. In medieval times, the region was home to a succession of empires "
-"called the Sahelian kingdoms. Of these, the Islamic Mali empire with it's "
+"called the Sahelian kingdoms. Of these, the Islamic Mali empire with its "
"capital in Timbuktu was the most influential. This empire reigned from the "
-"14th to the 17th century and was famed for it's wealth and benevolent kings. "
+"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 ""
@@ -23497,8 +23736,8 @@ msgstr "?plural:МайÑ"
#: data/nation/mayan.ruleset:6
msgid ""
-"The Mayans were a Mesoamerican civilization. Famous for building great "
-"pyramids and palaces in the jungle."
+"The Mayans were a Mesoamerican civilization. They are famous for building "
+"great pyramids and palaces in the jungle."
msgstr ""
#: data/nation/mayan.ruleset:19
@@ -24021,6 +24260,16 @@ msgstr ""
"Ð¡Ð»Ð¾Ð²Ð°ÐºÐ¸Ñ - Ñто Ñтрана в Ñердце Европы. Ð’ прошлом чаÑÑ‚ÑŒ ЧехоÑловакии, до 1918 "
"года была чаÑтью ÐвÑтро-ВенгрÑкой империи. "
+#: data/nation/slovakian.ruleset:26
+#, fuzzy
+msgid "?male:Leader"
+msgstr "Лидер"
+
+#: data/nation/slovakian.ruleset:26
+#, fuzzy
+msgid "?female:Leader"
+msgstr "?женÑк:Товарищ"
+
#: data/nation/slovakian.ruleset:29
msgid "Pope"
msgstr "Папа"
@@ -24060,12 +24309,14 @@ msgid "?plural:Soviets"
msgstr "?plural:СоветÑкие"
#: data/nation/soviet.ruleset:6
+#, fuzzy
msgid ""
-"Soviet Union's history starts in November 1917, when under Lenin's "
+"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 "
-"republics integrated into one country. Soviet Union became one of most "
-"powerful states in the 20th century. But by the end of 1991 due to many "
-"social shocks it disintegrated into fifteen independent countries"
+"republics integrated into one country. The Soviet Union became one of most "
+"powerful states in the 20th century, but by the end of 1991 it had "
+"disintegrated into fifteen independent countries due to social and economic "
+"problems."
msgstr ""
"ИÑÑ‚Ð¾Ñ€Ð¸Ñ Ð¡Ð¾Ð²ÐµÑ‚Ñкого Союза начинаетÑÑ Ñ Ð½Ð¾ÑÐ±Ñ€Ñ 1917, когда под руководÑтвом "
"Ленина ÑоÑтоÑлаÑÑŒ ОктÑбрьÑÐºÐ°Ñ Ñ€ÐµÐ²Ð¾Ð»ÑŽÑ†Ð¸Ñ. 31 Ð´ÐµÐºÐ°Ð±Ñ€Ñ 1922 года четыре "
@@ -24460,8 +24711,8 @@ msgstr "?plural:ВеÑтфальцы"
#: data/nation/westphalian.ruleset:6
msgid ""
-"Westphalia, before becoming a Prussian province, was the western region the "
-"duchy of Saxony. Present-day it consists of the Northern part of the largest "
+"Westphalia, before becoming a Prussian province, was the western region of "
+"the duchy of Saxony. Today it makes up the northern part of the largest "
"German federal state, North Rhine-Westphalia."
msgstr ""
@@ -24609,7 +24860,7 @@ msgid ""
"The flag and background color indicate what civilization the city\n"
"belongs to (this will be useful when you meet other civilizations).\n"
"The top row of the bar also shows the name and size of the city, and\n"
-"will show one or more starts to indicate if there are units in the\n"
+"will show one or more stars to indicate if there are units in the\n"
"city. The bottom row shows what the city is building, and how long it\n"
"will take; it also shows how long the city will take to grow to the\n"
"next largest size."
@@ -24665,7 +24916,7 @@ msgid ""
"Now your city has grown to size five. As cities get larger unrest\n"
"becomes a problem. A city of this size will usually have one unhappy\n"
"citizen unless pacifying effects are used; meaning one entertainer\n"
-"specialist is required to keep your citzens content. This is basically\n"
+"specialist is required to keep your citizens content. This is basically\n"
"a wasted citizen.\n"
"\n"
"There are several things that can be done about this. One quick fix\n"
@@ -24737,7 +24988,7 @@ msgid ""
"existing cities. Generally when building new cities you want to make\n"
"sure that all tiles are covered by at least one city, but after that\n"
"it is best that your cities overlap as little as possible. Spreading\n"
-"out cities properly gives each city access to more resrouces, allowing\n"
+"out cities properly gives each city access to more resources, allowing\n"
"them to grow to larger sizes."
msgstr ""
@@ -25020,6 +25271,68 @@ msgstr "Команда 30"
msgid "Team 31"
msgstr "Команда 31"
+#~ msgid "Auth config filename \"%s\" not allowed!"
+#~ msgstr "Ð˜Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° конфигурации авторизации \"%s\" не разрешено!"
+
+#~ msgid "The %s of the %s (%s)"
+#~ msgstr "%s %s (%s)"
+
+#~ msgid ""
+#~ "Illegal alliance structure detected: %s alliance to %s reduced to peace "
+#~ "treaty."
+#~ msgstr ""
+#~ "Обнаружена Ð½ÐµÐ²ÐµÑ€Ð½Ð°Ñ Ñтруктура альÑнÑа: Ñоюз между %s и %s Ñокращён до "
+#~ "мирного договора."
+
+#~ msgid "And, became more experienced!"
+#~ msgstr " и Ñтали более опытными!"
+
+#~ msgid "We can't take control of server, attempting to kill it."
+#~ msgstr "У Ð’Ð°Ñ Ð½ÐµÑ‚ доÑтупа к наÑтройкам Ñервера, пробуем закрыть Ñервер."
+
+#~ msgid "%s territory"
+#~ msgstr "Ð¢ÐµÑ€Ñ€Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ %s"
+
+#~ msgid "%s territory (%d turn cease-fire)"
+#~ msgid_plural "%s territory (%d turn cease-fire)"
+#~ msgstr[0] "%s (%d-ходовое прекращение огнÑ)"
+#~ msgstr[1] "%s (%d-ходовое прекращение огнÑ)"
+#~ msgstr[2] "%s (%d-ходовое прекращение огнÑ)"
+
+#~ msgid "%s territory (%s)"
+#~ msgstr "Ð¢ÐµÑ€Ñ€Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ %s (%s)"
+
+#~ msgid "City: %s (%s)"
+#~ msgstr "Город: %s (%s)"
+
+#~ msgid "Unit: %s (%s)"
+#~ msgstr "Соед: %s (%s)"
+
+#~ msgid "%s of the %s"
+#~ msgstr "%s из %s"
+
+#~ msgid "no maximum, "
+#~ msgstr "без макÑимума, "
+
+#~ msgid "%d unit maximum, "
+#~ msgid_plural "%d units maximum, "
+#~ msgstr[0] "%d Ñоединение макÑимум, "
+#~ msgstr[1] "%d ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð¼Ð°ÐºÑимум, "
+#~ msgstr[2] "%d Ñоединений макÑимум, "
+
+#~ msgid "%d per unit). "
+#~ msgstr "%d на Ñоединение). "
+
+#~ msgid "Select same type"
+#~ msgstr "Выбрать тот же тип"
+
+#~ msgid ""
+#~ "Couldn't find stdfont.ttf file. Please link/copy/move anyunicode ttf font "
+#~ "to data dir as stdfont.ttf"
+#~ msgstr ""
+#~ "Ðевозможно найти файл stdfont.ttf. ПожалуйÑта, Ñкопируйте/перемеÑтите/"
+#~ "Ñделайте ÑÑылку на любой Unicode TTF шрифт в каталоге data как stdfont.ttf"
+
#~ msgid "Units: "
#~ msgstr "СоединениÑ: "
@@ -25147,9 +25460,6 @@ msgstr "Команда 31"
#~ msgid ", nation %s"
#~ msgstr ", народ - %s"
-#~ msgid ", team %s"
-#~ msgstr ", команда %s"
-
#~ msgid "_Map"
#~ msgstr "_Карта"
@@ -27068,9 +27378,6 @@ msgstr "Команда 31"
#~ msgid "Nation %s (used by %s) isn't available."
#~ msgstr "Ðарод %s (управлÑемый %s) не доÑтупен."
-#~ msgid "Metaserver topic string set to '%s'."
-#~ msgstr "Тема Ð´Ð»Ñ Ð¼ÐµÑ‚Ð°Ñервера уÑтановлена в '%s'."
-
#~ msgid "Metaserver topic string set to '%s', not reporting to metaserver."
#~ msgstr "Тема Ð´Ð»Ñ Ð¼ÐµÑ‚Ð°Ñервера уÑтановлена в '%s', не ÑвÑзаны Ñ Ð¼ÐµÑ‚Ð°Ñервером."
diff --git a/po/sv.gmo b/po/sv.gmo
index f10e74a..00caa9f 100644
Binary files a/po/sv.gmo and b/po/sv.gmo differ
diff --git a/po/sv.po b/po/sv.po
index eecd402..c55d3e6 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -61,7 +61,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Freeciv 2.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 07:45+0900\n"
+"POT-Creation-Date: 2009-03-29 21:13+0900\n"
"PO-Revision-Date: 2008-04-05 00:14+0100\n"
"Last-Translator: Susanna Björverud <susanna.bjorverud at telia.com>\n"
"Language-Team: Swedish <freeciv.sv at freelists.org>\n"
@@ -693,7 +693,7 @@ msgid "Road"
msgstr "väg"
#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
-#: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
+#: client/gui-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"
@@ -710,7 +710,7 @@ msgid "Mine"
msgstr "gruva"
#: common/terrain.c:396 common/unit.c:548 server/report.c:124
-#: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
+#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr "utsläpp"
@@ -756,7 +756,7 @@ msgstr "Befäst"
msgid "Sentry"
msgstr "Stå vakt"
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:851 client/gui-sdl/menu.c:648
+#: common/unit.c:566 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"
@@ -773,7 +773,7 @@ msgstr "Utforska"
msgid "Transform"
msgstr "Förändra"
-#: common/unit.c:584 client/text.c:106 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:584 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"
@@ -842,11 +842,11 @@ msgstr "kärnvapen"
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1406
+#: common/unittype.c:349 client/helpdata.c:1404
msgid " and "
msgstr " och "
-#: common/unittype.c:355 client/helpdata.c:1392
+#: common/unittype.c:355 client/helpdata.c:1390
msgid "?and:, "
msgstr "?and:, "
@@ -1472,29 +1472,24 @@ msgstr ""
#: server/auth.c:281
#, c-format
-msgid "Auth config filename \"%s\" not allowed!"
-msgstr "Rättighetskonfigfilnamn \"%s\" ej tillåtet!"
-
-#: server/auth.c:286
-#, c-format
msgid "Cannot load auth config file \"%s\"!"
msgstr "Kan inte läsa in konfigfilen \"%s\"!"
-#: server/auth.c:397
+#: server/auth.c:392
#, c-format
msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
msgstr "Varning: Gästnamnet '%s' är upptaget. Namnet bytt till '%s'."
-#: server/auth.c:404
+#: server/auth.c:399
msgid "Guests are not allowed on this server. Sorry."
msgstr "Gäster är tyvärr inte välkomna på den här servern."
-#: server/auth.c:406
+#: server/auth.c:401
#, c-format
msgid "%s was rejected: Guests not allowed."
msgstr "%s avvisades: Gäster ej välkomna."
-#: server/auth.c:425
+#: server/auth.c:420
#, c-format
msgid ""
"There was an error reading the user database, logging in as guest connection "
@@ -1503,7 +1498,7 @@ msgstr ""
"Ett fel inträffade medan användardatabasen lästes in; loggar in som gäst '%"
"s'."
-#: server/auth.c:431
+#: server/auth.c:426
msgid ""
"There was an error reading the user database and guest logins are not "
"allowed. Sorry"
@@ -1511,39 +1506,39 @@ msgstr ""
"Ett fel inträffade medan användardatabasen lästes in och gäster är tyvärr "
"inte välkomna."
-#: server/auth.c:434
+#: server/auth.c:429
#, c-format
msgid "%s was rejected: Database error and guests not allowed."
msgstr "%s avvisades: databasfel samt gäster ej tillåtna"
-#: server/auth.c:441
+#: server/auth.c:436
#, c-format
msgid "Enter password for %s:"
msgstr "Mata in lösenord för %s:"
-#: server/auth.c:450
+#: server/auth.c:445
msgid "Enter a new password (and remember it)."
msgstr "Mata in ett nytt lösenord (och kom ihåg det)."
-#: server/auth.c:456
+#: server/auth.c:451
msgid "This server allows only preregistered users. Sorry."
msgstr "Denna server tillåter tyvärr endast föranmälda användare."
-#: server/auth.c:459
+#: server/auth.c:454
#, c-format
msgid "%s was rejected: Only preregister users allowed."
msgstr "%s avvisades: endast föranmälda användare välkomna."
-#: server/auth.c:488 server/auth.c:547
+#: server/auth.c:483 server/auth.c:542
msgid "Sorry, too many wrong tries..."
msgstr "Tyvärr: för många felaktiga försök..."
-#: server/auth.c:489
+#: server/auth.c:484
#, c-format
msgid "%s was rejected: Too many wrong password verifies for new user."
msgstr "%s avvisades: för många felaktiga lösenordsförsök för ny användare."
-#: server/auth.c:505
+#: server/auth.c:500
msgid ""
"Warning: There was an error in saving to the database. Continuing, but your "
"stats will not be saved."
@@ -1551,30 +1546,30 @@ msgstr ""
"Varning: Ett fel inträffade medan databasen sparades. Fortsätter, men din "
"statistik kommer inte sparas."
-#: server/auth.c:549
+#: server/auth.c:544
#, c-format
msgid "%s was rejected: Too many wrong password tries."
msgstr "%s avvisades: För många felaktiga lösenord."
-#: server/auth.c:558
+#: server/auth.c:553
msgid "Your password is incorrect. Try again."
msgstr "Ditt lösenord är felaktigt. Försök igen."
-#: server/auth.c:569
+#: server/auth.c:564
msgid "Sorry, your connection timed out..."
msgstr "Din anslutning tog tyvärr för lång tid..."
-#: server/auth.c:571
+#: server/auth.c:566
#, c-format
msgid "%s was rejected: Connection timeout waiting for password."
msgstr "%s avvisades: anslutningen tog för lång tid vändandes på lösenord."
-#: server/auth.c:636
+#: server/auth.c:631
#, c-format
msgid "Your password is too short, the minimum length is %d. Try again."
msgstr "Ditt lösenord är för kort; kortaste tillåtna längd är %d. Försök igen."
-#: server/auth.c:642
+#: server/auth.c:637
#, c-format
msgid ""
"The password must have at least %d capital letters, %d numbers, and be at "
@@ -2081,7 +2076,7 @@ msgstr "Detta är servern för %s."
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:237 manual/civmanual.c:380
+#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
@@ -2110,14 +2105,14 @@ msgstr ""
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:241
+#: server/civserver.c:217 client/civclient.c:242
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:245
+#: server/civserver.c:221 client/civclient.c:246
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"
@@ -2125,7 +2120,7 @@ msgstr " -d, --debug NUMMER\tSätt läge för debugloggning (0 till 3)\n"
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:248 manual/civmanual.c:382
+#: server/civserver.c:225 client/civclient.c:249 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"
@@ -2174,11 +2169,11 @@ msgstr " -r, --read FIL\tLäs FIL innehållande start-skript\n"
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:267 manual/civmanual.c:383
+#: server/civserver.c:247 client/civclient.c:268 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:279
+#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, c-format
@@ -3435,7 +3430,7 @@ msgstr "%s har orsakat en incident genom att anstifta ett uppror i %s."
msgid "Sea moving start units are not yet supported. Nobody gets %s."
msgstr "Marina enheter från starten stöds inte ännu. Ingen fick %s."
-#: server/gamehand.c:310 client/text.c:632
+#: server/gamehand.c:310 client/text.c:691
#, c-format
msgid "Year: %s"
msgstr "Ã…r: %s"
@@ -3721,10 +3716,10 @@ 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
-#, c-format
+#, fuzzy, c-format
msgid ""
-"Your nation is thrust into civil war, %s is declared the leader of the "
-"rebel states."
+"Your nation is thrust into civil war! %s is declared the leader of the rebel "
+"states."
msgstr ""
"Vår nation befinner sig i inbördeskrig; %s utropar sig till ledare över "
"upprorsmakarna."
@@ -3825,7 +3820,7 @@ msgstr "Forskningsfart"
msgid "Literacy"
msgstr "läskunnighet"
-#: server/report.c:121 client/cityrepdata.c:526 client/cityrepdata.c:527
+#: server/report.c:121 client/cityrepdata.c:524 client/cityrepdata.c:525
#: client/gui-sdl/cityrep.c:174
msgid "Production"
msgstr "Tillverkning"
@@ -3980,7 +3975,7 @@ msgstr ""
"Demografisträngen innehåller otillåtna tecken. Försök med \"help demography"
"\"."
-#: server/report.c:743 server/report.c:766
+#: server/report.c:743 server/report.c:768
msgid "Demographics Report:"
msgstr "Demografi"
@@ -3988,10 +3983,12 @@ msgstr "Demografi"
msgid "Sorry, the Demographics report is unavailable."
msgstr "Demografiredogörelsen är tyvärr ej tillgänglig."
-#: server/report.c:748
-#, c-format
-msgid "The %s of the %s (%s)"
-msgstr "%2$ss %1$s (%3$s)"
+#. TRANS: <nation adjective> <government name> (<year>).
+#. * E.g. "Polish Despotism (200 AD)".
+#: server/report.c:750
+#, fuzzy, c-format
+msgid "%s %s (%s)"
+msgstr "%s i %s (%s)\n"
#. TRANS: message about an installation error.
#: server/ruleset.c:163
@@ -4044,16 +4041,6 @@ msgstr ""
msgid "%s had invalid nation; changing to %s."
msgstr "%s har ogiltigt folkslag; byter till %s."
-#. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4073
-#, c-format
-msgid ""
-"Illegal alliance structure detected: %s alliance to %s reduced to peace "
-"treaty."
-msgstr ""
-"Otillåten förbundsstruktur påträffad: Det %s förbundet med %s ändrades till "
-"fredsavtal."
-
#: server/settings.c:32
msgid "Geological"
msgstr "Geologi"
@@ -5281,9 +5268,10 @@ msgid "Auto-save name prefix"
msgstr "Prefix vid autospar"
#: server/settings.c:1016
+#, fuzzy
msgid ""
-"Automatically saved games will have name \"<prefix><year>.sav\". This "
-"setting sets the <prefix> part."
+"Automatically saved games will have name \"<prefix>-T<turn>-Y<year>.sav\". "
+"This setting sets the <prefix> part."
msgstr ""
"Automatiskt sparade spel kommer att få namnet \"<prefix><år>.sav\".Denna "
"inställning bestämmer prefixet."
@@ -5301,11 +5289,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:147
+#: server/sernet.c:150
msgid "Server cannot read standard input. Ignoring input."
msgstr "Servern kan inte läsa standardinmatning. Bortser från inmatning."
-#: server/sernet.c:922
+#: server/sernet.c:929
#, c-format
msgid "Server: bad address: [%s:%d]."
msgstr "Server: felaktig adress: [%s:%d]."
@@ -5433,99 +5421,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:928
+#: server/srv_main.c:961
#, c-format
msgid "Failed saving game as %s"
msgstr "Misslyckades med att spara spel som %s"
-#: server/srv_main.c:930
+#: server/srv_main.c:963
#, c-format
msgid "Game saved as %s"
msgstr "Spelet har sparats som \"%s\"."
-#: server/srv_main.c:962
+#: server/srv_main.c:994
msgid "The game is already running."
msgstr "Spelet pågår redan."
-#: server/srv_main.c:970
+#: server/srv_main.c:1002
#, 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:977
+#: server/srv_main.c:1009
msgid "Starting game."
msgstr "Sätter i gång spelet."
-#: server/srv_main.c:1039
+#: server/srv_main.c:1071
#, c-format
msgid "request for unknown report (type %d)"
msgstr "Okänd redogörelse efterfrågades (slag %d)"
-#: server/srv_main.c:1104
+#: server/srv_main.c:1136
#, c-format
msgid "Warning: rejecting old client %s"
msgstr "Varning: avvisar föråldrad klient %s"
-#: server/srv_main.c:1206
+#: server/srv_main.c:1238
#, 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:1306
+#: server/srv_main.c:1338
msgid "Please choose a non-blank name."
msgstr "Var god välj ett ickeblankt namn."
-#: server/srv_main.c:1322
+#: server/srv_main.c:1354
msgid "That nation is already in use."
msgstr "Folkslaget är upptaget."
-#: server/srv_main.c:1338
+#: server/srv_main.c:1370
#, 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:1359
+#: server/srv_main.c:1391
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:1458
+#: server/srv_main.c:1490
#, c-format
msgid "%s nation is not available in this scenario."
msgstr "Folkslaget %s är inte tillgängligt i scenariot"
-#: server/srv_main.c:1464
+#: server/srv_main.c:1496
#, c-format
msgid "%s nation is already in use."
msgstr "Folkslaget %s är upptaget."
-#: server/srv_main.c:1482
+#: server/srv_main.c:1514
#, c-format
msgid "%s is the %s ruler %s."
msgstr "%1$s styr %3$s (%2$s)."
-#: server/srv_main.c:1538
+#: server/srv_main.c:1570
#, 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:1582 server/srv_main.c:1586
+#: server/srv_main.c:1614 server/srv_main.c:1618
#, 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:1728
+#: server/srv_main.c:1760
#, c-format
msgid "Player %d"
msgstr "Spelare %d"
-#: server/srv_main.c:1739 server/srv_main.c:1745
+#: server/srv_main.c:1771 server/srv_main.c:1777
#, c-format
msgid "%s rules the %s."
msgstr "%s regerar %s."
-#: server/srv_main.c:1910
+#: server/srv_main.c:1942
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
@@ -5533,16 +5521,16 @@ msgstr ""
"Detta civserverprogram har stöd för spelarautentisering, men den är f.n. "
"inte aktiverad."
-#: server/srv_main.c:1961
+#: server/srv_main.c:1993
#, c-format
msgid "Sending info to metaserver [%s]"
msgstr "Skickar upplysningar till metaservern [%s]"
-#: server/srv_main.c:1992
+#: server/srv_main.c:2024
msgid "The game is over..."
msgstr "Spelet är slut..."
-#: server/srv_main.c:2205
+#: server/srv_main.c:2237
msgid "Now accepting new client connections."
msgstr "Godtar nu nya klientanslutningar."
@@ -6348,24 +6336,24 @@ msgid "Barbarian"
msgstr "barbar"
#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2030 client/gui-sdl/plrdlg.c:645
+#: client/gui-gtk-2.0/pages.c:2102 client/gui-sdl/plrdlg.c:645
#: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
msgid "AI"
msgstr "datorstyrd"
#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
+#: 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
msgid "Human"
msgstr "mänsklig"
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
-#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
+#: 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
msgid "Alive"
msgstr "levande"
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
#: client/gui-win32/connectdlg.c:200
msgid "Dead"
msgstr "död"
@@ -6633,9 +6621,9 @@ 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:242
-#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
-#: client/text.c:1201
+#: 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
#, c-format
msgid "?clistmore:, %s"
msgstr ", %s"
@@ -6886,7 +6874,7 @@ msgstr "Endast %s kan angripa från sjön."
msgid "Cannot attack from sea."
msgstr "Kan inte angripa från sjön."
-#: server/unithand.c:996 server/unittools.c:2103
+#: server/unithand.c:996 server/unittools.c:2137
msgid "Cannot attack unless you declare war first."
msgstr "Kan inte angripa utan att förklara krig först."
@@ -6986,101 +6974,101 @@ msgid "%s was upgraded for free to %s."
msgstr "%s har utan kostnad ersatts med %s."
#: server/unittools.c:297
-#, c-format
-msgid "Not enough gold. %s disbanded"
+#, fuzzy, c-format
+msgid "Not enough gold to pay upkeep for %s. Unit disbanded."
msgstr "Ej tillräckligt med guld. %s upplöst"
-#: server/unittools.c:342
+#: server/unittools.c:343
#, c-format
msgid "Your %s has run out of hit points."
msgstr "Vår %s har fått slut på träffpunkter."
-#: server/unittools.c:358
+#: server/unittools.c:359
#, c-format
msgid "Your %s has been lost on the high seas."
msgstr "Vår %s har förlist på öppna havet."
-#: server/unittools.c:365
+#: server/unittools.c:366
#, c-format
msgid "Your %s survived on the high seas and became more experienced!"
msgstr "Vår %s överlevde på öppna havet och blev mer erfaren!"
-#: server/unittools.c:376
+#: server/unittools.c:377
#, c-format
msgid "Your %s has been lost on unsafe terrain."
msgstr "Vår %s har dukat under i svår terräng."
-#: server/unittools.c:430
+#: server/unittools.c:431
#, c-format
msgid "Your %s has returned to refuel."
msgstr "Vårt %s har återvänt för att tanka."
-#: server/unittools.c:454
+#: server/unittools.c:455
#, c-format
msgid "Your %s has run out of fuel."
msgstr "Vårt %s har fått slut på bränsle."
-# Var "Och blev mer erfaren", men så här kan man kanske undvika genus-problem?
-#. TRANS: And, <the unit> became ...
-#: server/unittools.c:616
-msgid "And, became more experienced!"
-msgstr "Och skaffade sig mer erfarenhet!"
-
#. TRANS: Your <unit> became ...
-#: server/unittools.c:620
+#: server/unittools.c:619
#, c-format
msgid "Your %s became more experienced!"
msgstr "VÃ¥r %s skaffade sig mer erfarenhet!"
-#: server/unittools.c:1011
+#: server/unittools.c:1009
#, c-format
msgid "Teleported your %s to %s."
msgstr "Vår %s har fjärrförflyttats till %s."
-#: server/unittools.c:1041
+#. TRANS: A unit is moved to resolve stack conflicts.
+#: server/unittools.c:1065
+#, fuzzy, c-format
+msgid "Moved your %s."
+msgstr "Vår %s har upplösts."
+
+#: server/unittools.c:1076
#, c-format
msgid "Disbanded your %s."
msgstr "Vår %s har upplösts."
-#: server/unittools.c:1363
+#: server/unittools.c:1397
#, 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:1367
+#: server/unittools.c:1401
#, 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:1469
+#: server/unittools.c:1503
#, 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:1478
+#: server/unittools.c:1512
#, c-format
msgid "%s lost when %s was lost."
msgstr "Vi förlorade %s när %s förlorades."
-#: server/unittools.c:1527
+#: server/unittools.c:1561
#, 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:1545
+#: server/unittools.c:1579
#, 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:1554 server/unittools.c:1612
+#: server/unittools.c:1588 server/unittools.c:1646
#, 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:1588
+#: server/unittools.c:1622
#, c-format
msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
msgid_plural ""
@@ -7094,14 +7082,14 @@ msgstr[1] ""
#. TRANS: "Cannon lost when the Polish Destroyer
#. * attacked the German Musketeers."
-#: server/unittools.c:1621
+#: server/unittools.c:1655
#, 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:1636
+#: server/unittools.c:1670
#, 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."
@@ -7109,7 +7097,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:1646
+#: server/unittools.c:1680
#, 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."
@@ -7123,7 +7111,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:1660
+#: server/unittools.c:1694
#, 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."
@@ -7132,190 +7120,190 @@ 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:1928
+#: server/unittools.c:1962
#, c-format
msgid "Your %s was nuked by %s."
msgstr "VÃ¥r %s atombombades av %s."
-#: server/unittools.c:1931 server/unittools.c:1947
+#: server/unittools.c:1965 server/unittools.c:1981
msgid "yourself"
msgstr "oss själva"
-#: server/unittools.c:1935
+#: server/unittools.c:1969
#, c-format
msgid "The %s %s was nuked."
msgstr "Den/det %s %s/n/t atombombades."
-#: server/unittools.c:1944
+#: server/unittools.c:1978
#, c-format
msgid "%s was nuked by %s."
msgstr "%s atombombades av %s."
-#: server/unittools.c:1952
+#: server/unittools.c:1986
#, c-format
msgid "You nuked %s."
msgstr "Vi atombombade %s."
-#: server/unittools.c:1993
+#: server/unittools.c:2027
#, c-format
msgid "The %s detonated a nuke!"
msgstr "%s utlöste en atombomb."
-#: server/unittools.c:2017
+#: server/unittools.c:2051
#, c-format
msgid "%s transported successfully."
msgstr "Frakten av %s genomfördes utan komplikationer."
-#: server/unittools.c:2069
+#: server/unittools.c:2103
msgid "This unit type can not be paradropped."
msgstr "Detta truppslag kan inte hoppa fallskärm."
-#: server/unittools.c:2079
+#: server/unittools.c:2113
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:2085
+#: server/unittools.c:2119
msgid "The destination location is not known."
msgstr "Målets läge är okänt."
-#: server/unittools.c:2092
+#: server/unittools.c:2126
#, c-format
msgid "This unit cannot paradrop into %s."
msgstr "Denna trupp kan inte hoppa fallskärm i %s."
-#: server/unittools.c:2112
+#: server/unittools.c:2146
#, 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:2123
+#: server/unittools.c:2157
#, 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:2136
+#: server/unittools.c:2170
#, 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:2158
+#: server/unittools.c:2192
#, c-format
msgid "You found %d gold."
msgstr "Vi fann %d guld."
# DM
-#: server/unittools.c:2175
+#: server/unittools.c:2209
#, c-format
msgid "You found %s in ancient scrolls of wisdom."
msgstr "Vi fann kunskapen om %s i uråldriga skriftrullar."
-#: server/unittools.c:2182
+#: server/unittools.c:2216
#, 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:2196
+#: server/unittools.c:2230
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:2214
+#: server/unittools.c:2248
msgid "An abandoned village is here."
msgstr "Här ligger en övergiven boplats."
-#: server/unittools.c:2224
+#: server/unittools.c:2258
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:2227
+#: server/unittools.c:2261
#, c-format
msgid "Your %s has been killed by barbarians!"
msgstr "Vår %s blev slaktad av infödingar!"
-#: server/unittools.c:2243
+#: server/unittools.c:2277
msgid "You found a friendly city."
msgstr "Vi fann en vänligt sinnad stad."
# DM> Utvecklade prosan här också...
-#: server/unittools.c:2257
+#: server/unittools.c:2291
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:2282
+#: server/unittools.c:2316
msgid "Your overflight frightens the tribe; they scatter in terror."
msgstr "Vår överflygning fick urbefolkningen att skingras i skräck."
-#: server/unittools.c:2540
+#: server/unittools.c:2574
#, 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:2989
+#: server/unittools.c:3023
#, 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:3041
+#: server/unittools.c:3075
#, 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:3054
+#: server/unittools.c:3088
#, 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:3068
+#: server/unittools.c:3102
#, 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:3078
+#: server/unittools.c:3112
#, 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:3104
+#: server/unittools.c:3138
#, 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:3145
+#: server/unittools.c:3179
#, c-format
msgid "Attempt to change homecity for %s failed."
msgstr "Misslyckades ändra hemstad för %s."
-#: server/unittools.c:3156
+#: server/unittools.c:3190
#, c-format
msgid "Attempt to establish trade route for %s failed."
msgstr "Misslyckades inrätta handelsled för %s."
-#: server/unittools.c:3168
+#: server/unittools.c:3202
#, c-format
msgid "Attempt to build wonder for %s failed."
msgstr "Misslyckades bygga underverk för %s."
-#: server/unittools.c:3177
+#: server/unittools.c:3211
#, c-format
msgid "Your %s has invalid orders."
msgstr "VÃ¥rt %s har ogiltliga order."
-#: server/generator/mapgen.c:1737
+#: server/generator/mapgen.c:1771
msgid "High landmass - this may take a few seconds."
msgstr "Hög landmassa - detta kan ta några sekunder."
-#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
+#: server/generator/mapgen.c:1969 server/generator/mapgen.c:2039
#, c-format
msgid "Falling back to generator %d."
msgstr "Faller tillbaka på skapare %d."
-#: server/generator/mapgen.c:2025
+#: server/generator/mapgen.c:2059
msgid "Generator 3 didn't place all big islands."
msgstr "Skapare 3 satte inte ut alla stora öar."
-#: server/generator/mapgen.c:2054
+#: server/generator/mapgen.c:2088
#, c-format
msgid "Generator 3 left %li landmass unplaced."
msgstr "Skapare 3 lämnade %li landmassa outsatt."
@@ -7424,7 +7412,7 @@ msgid_plural "%3d turns"
msgstr[0] "%3d omgång"
msgstr[1] "%3d omgångar"
-#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:631
#: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
@@ -7548,343 +7536,344 @@ msgstr "Frid"
msgid "(worklist)"
msgstr "(arbetslista)"
-#: client/cityrepdata.c:447
-msgid "Special"
-msgstr "Special"
+#: client/cityrepdata.c:446
+msgid "?city:Name"
+msgstr "Stadsnamn"
-#: client/cityrepdata.c:448
-msgid "?entertainers/scientists/taxmen:E/S/T"
-msgstr "?trubadurer/vetenskapsmän/skattmasar:T/V/S"
+#: client/cityrepdata.c:446 client/gui-sdl/cityrep.c:169
+msgid "City Name"
+msgstr "Stadsnamn"
-#: client/cityrepdata.c:449
-msgid "Entertainers, Scientists, Taxmen"
-msgstr "Trubadurer, Vetenskapsmän, Skattmasar"
+#: client/cityrepdata.c:448
+msgid "?size [short]:Sz"
+msgstr "St"
-# DM> FIME - osäker på om detta är korrekt
-#: client/cityrepdata.c:452
-msgid "Concise + Rapture, - Disorder"
-msgstr "Kortfattad + Hänryckning, - Upplopp"
+#: client/cityrepdata.c:448
+msgid "Size"
+msgstr "Storlek"
-#: client/cityrepdata.c:454 client/plrdlg_common.c:261
+#: client/cityrepdata.c:450 client/plrdlg_common.c:261
#: client/gui-win32/plrdlg.c:337
msgid "State"
msgstr "Tillstånd"
-#: client/cityrepdata.c:454
+#: client/cityrepdata.c:450
msgid "Rapture/Peace/Disorder"
msgstr "Hänryckning/Frid/Upplopp"
+# DM> FIME - osäker på om detta är korrekt
+#: client/cityrepdata.c:452
+#, fuzzy
+msgid "Concise *=Rapture, X=Disorder"
+msgstr "Kortfattad + Hänryckning, - Upplopp"
+
+#: client/cityrepdata.c:456
+msgid "Special"
+msgstr "Special"
+
#: client/cityrepdata.c:457
+msgid "?entertainers/scientists/taxmen:E/S/T"
+msgstr "?trubadurer/vetenskapsmän/skattmasar:T/V/S"
+
+#: client/cityrepdata.c:458
+msgid "Entertainers, Scientists, Taxmen"
+msgstr "Trubadurer, Vetenskapsmän, Skattmasar"
+
+#: client/cityrepdata.c:461
msgid "?Happy workers:H"
msgstr "L"
-#: client/cityrepdata.c:457
+#: client/cityrepdata.c:461
msgid "Workers: Happy"
msgstr "Arbetare: Lyckliga"
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
msgid "?Content workers:C"
msgstr "N"
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
msgid "Workers: Content"
msgstr "Arbetare: Nöjda"
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
msgid "?Unhappy workers:U"
msgstr "O"
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
msgid "Workers: Unhappy"
msgstr "Arbetare: Missnöjda"
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
msgid "?Angry workers:A"
msgstr "A"
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
msgid "Workers: Angry"
msgstr "Arbetare: Arga"
# DM> Ordet arbetare förekommer både i enhetsnamn och i kolumn i stadsrapport-
# fönstret. Detta är en kompromiss.
# SB>Det skulle alltså behövas en kontext-markör för att skilja på "city workers" och truppslaget "worker"
-#: client/cityrepdata.c:465 client/gui-xaw/citydlg.c:2401
-#: data/default/units.ruleset:238
-msgid "Workers"
+#: client/cityrepdata.c:469 client/gui-xaw/citydlg.c:2402
+#, fuzzy
+msgid "?city:Workers"
msgstr "Arbetare"
-#: client/cityrepdata.c:466
+#: client/cityrepdata.c:470
msgid "?happy/content/unhappy/angry:H/C/U/A"
msgstr "L/N/M/A"
-#: client/cityrepdata.c:467
+#: client/cityrepdata.c:471
msgid "Workers: Happy, Content, Unhappy, Angry"
msgstr "Arbetare: Lyckliga, Nöjda, Missnöjda, Arga"
-#: client/cityrepdata.c:470 client/cityrepdata.c:472
+#: client/cityrepdata.c:474 client/cityrepdata.c:476
msgid "Best"
msgstr "Bäst"
-#: client/cityrepdata.c:470
+#: client/cityrepdata.c:474
msgid "attack"
msgstr "anfall"
-#: client/cityrepdata.c:471
+#: client/cityrepdata.c:475
msgid "Best attacking units"
msgstr "Bästa anfallare"
-#: client/cityrepdata.c:472
+#: client/cityrepdata.c:476
msgid "defense"
msgstr "försvar"
-#: client/cityrepdata.c:473
+#: client/cityrepdata.c:477
msgid "Best defending units"
msgstr "Bästa försvarare"
-#: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
-#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
-#: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
-#: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
-#: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
-#: client/gui-win32/menu.c:351 client/gui-win32/repodlgs.c:616
-#: client/gui-win32/repodlgs.c:707 client/gui-win32/repodlgs.c:716
-#: client/gui-xaw/menu.c:157 client/gui-xaw/menu.c:219
-#: client/gui-xaw/menu.c:242 client/gui-xaw/repodlgs.c:881
-#: client/gui-xaw/repodlgs.c:1069 data/Freeciv.in:1895 data/helpdata.txt:909
+#: client/cityrepdata.c:478 client/cityrepdata.c:482
+#: client/gui-gtk-2.0/cityrep.c:1437 client/gui-gtk-2.0/cityrep.c:1456
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-gtk-2.0/cityrep.c:1494
+#: client/gui-gtk-2.0/cityrep.c:1514 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/repodlgs.c:960 client/gui-sdl/helpdlg.c:688
+#: client/gui-sdl/mapctrl.c:1605 client/gui-sdl/optiondlg.c:1827
+#: client/gui-sdl/repodlgs.c:356 client/gui-win32/menu.c:351
+#: client/gui-win32/repodlgs.c:616 client/gui-win32/repodlgs.c:707
+#: client/gui-win32/repodlgs.c:716 client/gui-xaw/menu.c:157
+#: client/gui-xaw/menu.c:219 client/gui-xaw/menu.c:242
+#: client/gui-xaw/repodlgs.c:881 client/gui-xaw/repodlgs.c:1069
+#: data/Freeciv.in:1895 data/helpdata.txt:909
msgid "Units"
msgstr "Trupper"
#. TRANS: Header "Number of units inside city"
-#: client/cityrepdata.c:476
+#: client/cityrepdata.c:480
msgid "?Present (units):Here"
msgstr "Här"
-#: client/cityrepdata.c:477
+#: client/cityrepdata.c:481
msgid "Number of units present"
msgstr "Antal närvarande trupper"
#. TRANS: Header "Number of units supported by given city"
-#: client/cityrepdata.c:480
+#: client/cityrepdata.c:484
msgid "?Supported (units):Owned"
msgstr "Understöd"
-#: client/cityrepdata.c:481
+#: client/cityrepdata.c:485
msgid "Number of units supported"
msgstr "Antal understödda trupper"
#. TRANS: Header "It will take this many turns before city grows"
-#: client/cityrepdata.c:484
+#: client/cityrepdata.c:488
msgid "?food (population):Grow"
msgstr "Växer"
-#: client/cityrepdata.c:485 client/cityrepdata.c:530
+#: client/cityrepdata.c:489 client/cityrepdata.c:528
msgid "?Stock/Target:(Have/Need)"
msgstr "(har/behöver)"
-#: client/cityrepdata.c:486
+#: client/cityrepdata.c:490
msgid "Turns until growth/famine"
msgstr "Omgångar till tillväxt/hungersnöd"
-#: client/cityrepdata.c:488
-msgid "?size [short]:Sz"
-msgstr "St"
-
-#: client/cityrepdata.c:488
-msgid "Size"
-msgstr "Storlek"
-
-#: client/cityrepdata.c:492
-msgid "?city:Name"
-msgstr "Stadsnamn"
-
-#: client/cityrepdata.c:492 client/gui-sdl/cityrep.c:169
-msgid "City Name"
-msgstr "Stadsnamn"
-
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
msgid "Surplus"
msgstr "Överskott"
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
msgid "?food/production/trade:F/P/T"
msgstr "M/S/H"
-#: client/cityrepdata.c:496
+#: client/cityrepdata.c:494
msgid "Surplus: Food, Production, Trade"
msgstr "Överskott: Mat, Sköldar, Handel"
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
msgid "?Food surplus [short]:+F"
msgstr "+M"
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
msgid "Surplus: Food"
msgstr "Överskott: Mat"
-#: client/cityrepdata.c:500
+#: client/cityrepdata.c:498
msgid "?Production surplus [short]:+P"
msgstr "+S"
-#: client/cityrepdata.c:501
+#: client/cityrepdata.c:499
msgid "Surplus: Production"
msgstr "Överskott: Sköldar"
-#: client/cityrepdata.c:502
+#: client/cityrepdata.c:500
msgid "?Production loss (waste) [short]:-P"
msgstr "-S"
-#: client/cityrepdata.c:503
+#: client/cityrepdata.c:501
msgid "Waste"
msgstr "Spill"
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
msgid "?Trade surplus [short]:+T"
msgstr "+H"
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
msgid "Surplus: Trade"
msgstr "Överskott: Handel"
-#: client/cityrepdata.c:506
+#: client/cityrepdata.c:504
msgid "?Trade loss (corruption) [short]:-T"
msgstr "-H"
-#: client/cityrepdata.c:507
+#: client/cityrepdata.c:505
msgid "Corruption"
msgstr "Korruption"
-#: client/cityrepdata.c:509 client/gui-gtk-2.0/repodlgs.c:654
+#: client/cityrepdata.c:507 client/gui-gtk-2.0/repodlgs.c:654
#: client/gui-sdl/mapctrl.c:1400 client/gui-win32/repodlgs.c:334
#: client/gui-xaw/menu.c:222 client/gui-xaw/repodlgs.c:644
#: client/gui-xaw/repodlgs.c:773 data/Freeciv.in:1819
msgid "Economy"
msgstr "Ekonomi"
-#: client/cityrepdata.c:509
+#: client/cityrepdata.c:507
msgid "?gold/luxury/science:G/L/S"
msgstr "?guld/välfärd/forskning:G/V/F"
-#: client/cityrepdata.c:510
+#: client/cityrepdata.c:508
msgid "Economy: Gold, Luxuries, Science"
msgstr "Ekonomi: Guld, Välfärd, Forskning"
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
msgid "?Gold:G"
msgstr "?guld:G"
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
msgid "Economy: Gold"
msgstr "Ekonomi: Guld"
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
msgid "?Luxury:L"
msgstr "?välfärd:V"
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
msgid "Economy: Luxury"
msgstr "Ekonomi: Välfärd"
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
msgid "?Science:S"
msgstr "?forskning:F"
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
msgid "Economy: Science"
msgstr "Ekonomi: Forskning"
-#: client/cityrepdata.c:518
+#: client/cityrepdata.c:516
msgid "?number_trade_routes:n"
msgstr "a"
-#: client/cityrepdata.c:518
+#: client/cityrepdata.c:516
msgid "?number_trade_routes:R"
msgstr "L"
# DM> tidigare "handelsvägar" även på andra ställen
-#: client/cityrepdata.c:519
+#: client/cityrepdata.c:517
msgid "Number of Trade Routes"
msgstr "Antal handelsleder"
-#: client/cityrepdata.c:521
+#: client/cityrepdata.c:519
msgid "?pollution [short]:Pol"
msgstr "?pollution [short]:Uts"
-#: client/cityrepdata.c:523
+#: client/cityrepdata.c:521
msgid "?cma:Governor"
msgstr "Förvaltare"
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
-#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
-#: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
-#: data/Freeciv.in:1459 data/helpdata.txt:820
+#: client/cityrepdata.c:521 client/gui-gtk-2.0/cityrep.c:1766
+#: client/gui-sdl/citydlg.c:3809 client/gui-sdl/cma_fe.c:858
+#: client/gui-win32/citydlg.c:726 data/Freeciv.in:1459 data/helpdata.txt:820
msgid "Citizen Governor"
msgstr "Stadsförvaltare"
# DM> FIXME - osäker på detta
-#: client/cityrepdata.c:526
+#: client/cityrepdata.c:524
msgid "Turns/Buy"
msgstr "omgångar/köp"
-#: client/cityrepdata.c:529 client/cityrepdata.c:531
+#: client/cityrepdata.c:527 client/cityrepdata.c:529
msgid "Currently Building"
msgstr "Bygger"
-#: client/cityrepdata.c:575
+#: client/cityrepdata.c:573
msgid "?specialist:S"
msgstr "S"
-#: client/cityrepdata.c:578
+#: client/cityrepdata.c:576
msgid "Specialists"
msgstr "Specialister"
-#: client/civclient.c:239
+#: client/civclient.c:240
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr " -a, --autoconnect\tVisa inte anslutningsdialog\n"
-#: client/civclient.c:249
+#: client/civclient.c:250
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:251
+#: client/civclient.c:252
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:253
+#: client/civclient.c:254
msgid " -n, --name NAME\tUse NAME as name\n"
msgstr " -n, --name NAMN\tAnvänd NAMN som namn\n"
-#: client/civclient.c:255
+#: client/civclient.c:256
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:257
+#: client/civclient.c:258
#, 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:259
+#: client/civclient.c:260
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:262
+#: client/civclient.c:263
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:264
+#: client/civclient.c:265
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:265
+#: client/civclient.c:266
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:268
+#: client/civclient.c:269
#, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -7894,144 +7883,154 @@ msgstr ""
"\t\t\tProva \"%s -- --help\" för mer.\n"
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:273
+#: client/civclient.c:274
#, c-format
msgid "Report bugs at %s\n"
msgstr "Anmäl buggar vid %s\n"
-#: client/civclient.c:297
+#: client/civclient.c:298
#, c-format
msgid "Invalid port \"%s\" specified with --port option.\n"
msgstr "Invalid port \"%s\" specified with --port option.\n"
-#: client/civclient.c:299 client/civclient.c:314
+#: client/civclient.c:300 client/civclient.c:315
msgid "Try using --help.\n"
msgstr "Try using --help.\n"
-#: client/civclient.c:312
+#: client/civclient.c:313
#, 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:325
+#: client/civclient.c:326
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr "Okänt tillval: \"%s\"\n"
-#: client/civclient.c:539
+#: client/civclient.c:391
+#, fuzzy, c-format
+msgid "Updating old metaserver address \"%s\"."
+msgstr "metaserver <adress>"
+
+#: client/civclient.c:394
+#, fuzzy, c-format
+msgid "Default metaserver has been set to \"%s\"."
+msgstr "Tillval: %s har satts till \"%s\"."
+
+#: client/civclient.c:550
msgid "Game started."
msgstr "Spelet är igång."
-#: client/civclient.c:577
+#: client/civclient.c:588
msgid "There was an error while auto connecting; aborting."
msgstr "Ett fel uppstod vid självständig anslutning; avbryter."
-#: client/climisc.c:176
+#: client/climisc.c:177
#, c-format
msgid "Changing production of every %s into %s."
msgstr "Ändrar bygget av varje %s till %s."
-#: client/climisc.c:214
+#: client/climisc.c:215
msgid "?embassy:Both"
msgstr "?embassy:Ömsesidig"
-#: client/climisc.c:216
+#: client/climisc.c:217
msgid "?embassy:Yes"
msgstr "?embassy:Ja"
-#: client/climisc.c:219
+#: client/climisc.c:220
msgid "?embassy:With Us"
msgstr "?embassy:Hos oss"
-#: client/climisc.c:222
+#: client/climisc.c:223
msgid "?embassy:Contact"
msgstr "?embassy:Kontakt"
-#: client/climisc.c:224
+#: client/climisc.c:225
msgid "?embassy:No Contact"
msgstr "?embassy:Ingen kontakt"
-#: client/climisc.c:236
+#: client/climisc.c:237
msgid "?vision:Both"
msgstr "?vision:Ömsesidig"
-#: client/climisc.c:238
+#: client/climisc.c:239
msgid "?vision:To Them"
msgstr "?vision:Ã…t dem"
-#: client/climisc.c:241
+#: client/climisc.c:242
msgid "?vision:To Us"
msgstr "?vision:Ã…t oss"
-#: client/climisc.c:257 client/climisc.c:264
+#: client/climisc.c:258 client/climisc.c:265
#, c-format
msgid "The %s give %s"
msgstr "%s ger %s"
-#: client/climisc.c:268
+#: client/climisc.c:269
#, c-format
msgid "The %s give unknown city."
msgstr "%s ger okänd stad."
-#: client/climisc.c:273
+#: client/climisc.c:274
#, c-format
msgid "The %s give %d gold"
msgstr "%s ger %d guld"
-#: client/climisc.c:278
+#: client/climisc.c:279
#, c-format
msgid "The %s give their worldmap"
msgstr "%s ger sin världskarta"
-#: client/climisc.c:282
+#: client/climisc.c:283
#, c-format
msgid "The %s give their seamap"
msgstr "%s ger sina sjökort"
-#: client/climisc.c:286
+#: client/climisc.c:287
msgid "The parties agree on a cease-fire"
msgstr "Parterna kommer överens om vapenstillestånd"
-#: client/climisc.c:289
+#: client/climisc.c:290
msgid "The parties agree on a peace"
msgstr "Parterna kommer överens om fred"
-#: client/climisc.c:292
+#: client/climisc.c:293
msgid "The parties create an alliance"
msgstr "Parterna skapar ett förbund"
-#: client/climisc.c:295
+#: client/climisc.c:296
#, c-format
msgid "The %s give shared vision"
msgstr "%s ger oss delad anblick"
-#: client/climisc.c:299
+#: client/climisc.c:300
#, c-format
msgid "The %s give an embassy"
msgstr "%s ger ambassad"
-#: client/climisc.c:902
+#: client/climisc.c:906
msgid "Popup Request"
msgstr "Meddelande"
-#: client/climisc.c:932
+#: client/climisc.c:936
msgid "Exporting output window to civgame.log ..."
msgstr "Exporterar utdatafönster till civgame.log ..."
-#: client/climisc.c:936
+#: client/climisc.c:940
msgid "Export complete."
msgstr "Export färdig."
-#: client/climisc.c:938
+#: client/climisc.c:942
msgid "Export failed, couldn't write to file."
msgstr "Export misslyckades, kunde inte skriva till fil."
-#: client/climisc.c:1038
+#: client/climisc.c:1042
#, c-format
msgid "You don't buy %s in %s!"
msgstr "Vi köpa ej %s i %s!"
-#: client/climisc.c:1056
+#: client/climisc.c:1060
#, c-format
msgid "%s costs %d gold and you only have %d gold."
msgstr "%s kostar %d guld och vi har bara %d guld."
@@ -8081,19 +8080,19 @@ msgstr ""
"Självständing anslutning till servern \"%s\" vid port %d som \"%s\" var %fte "
"sekund %d gånger"
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1289
+#: client/connectdlg_common.c:79 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:1289
+#: client/connectdlg_common.c:80 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:1290
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
msgid "normal"
msgstr "normal"
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1290
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
msgid "hard"
msgstr "svår"
@@ -8122,38 +8121,42 @@ 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
-msgid "We have control of the server (command access level hack)"
+#, 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
-msgid "We can't take control of server, attempting to kill it."
-msgstr "Vi kunde ej taga kontrol över server, försöker döda den."
+msgid ""
+"Failed to obtain the required access level to take control of the server. "
+"The server will now be shutdown."
+msgstr ""
-#: client/control.c:1104
+#: client/control.c:1123
msgid "Only transporter units can be unloaded."
msgstr "Endast frakttrupper kan lastas ur."
-#: client/control.c:1353
+#: client/control.c:1425
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:1444
+#: client/control.c:1516
msgid "Only nuclear units can do this."
msgstr "Endast kärnvapen kan göra detta."
-#: client/control.c:1473
+#: client/control.c:1545
msgid "Only paratrooper units can do this."
msgstr "Endast fallskärmsjägare kan göra detta."
-#: client/control.c:1921
+#: client/control.c:2020
msgid "Too far for this unit."
msgstr "För långt för denna trupp."
-#: client/control.c:2131 client/control.c:2161 client/control.c:2177
+#: client/control.c:2230 client/control.c:2260 client/control.c:2276
msgid "Didn't find a route to the destination!"
msgstr "Hittade ingen väg till målet!"
-#: client/control.c:2221
+#: client/control.c:2320
msgid "Oh my! You seem to have no capital!"
msgstr "Hoppsan! Vi tycks sakna huvudstad!"
@@ -8222,16 +8225,16 @@ msgid "Allows %s (with %s)."
msgstr "Möjliggör %s (med %s)."
#. TRANS: preserve single space at beginning
-#: client/helpdata.c:418
+#: client/helpdata.c:416
msgid " Rivers"
msgstr " floder"
-#: client/helpdata.c:576
+#: client/helpdata.c:574
#, c-format
msgid "Sorry, no help topic for %s.\n"
msgstr "Hjälpavsnitt saknas för %s.\n"
-#: client/helpdata.c:580
+#: client/helpdata.c:578
#, c-format
msgid ""
"Sorry, no help topic for %s.\n"
@@ -8242,7 +8245,7 @@ msgstr ""
"Denna sida har skapats automatiskt.\n"
"\n"
-#: client/helpdata.c:670
+#: client/helpdata.c:668
msgid ""
"Requires: Nothing\n"
"\n"
@@ -8250,79 +8253,79 @@ msgstr ""
"Kräver: Ingenting\n"
"\n"
-#: client/helpdata.c:675
+#: client/helpdata.c:673
#, c-format
msgid "* The discovery of %s will make %s obsolete.\n"
msgstr "* Upptäckten av %s gör %s föråldrad.\n"
-#: client/helpdata.c:694
+#: client/helpdata.c:692
#, c-format
msgid "* Allows all players with knowledge of %s to build %s units.\n"
msgstr "* Möjliggör för alla spelare med kunskap om %s att bygga %s-trupper.\n"
-#: client/helpdata.c:706
+#: client/helpdata.c:704
#, c-format
msgid "* Allows %s (with %s).\n"
msgstr "* Möjliggör %s (med %s).\n"
-#: client/helpdata.c:710
+#: client/helpdata.c:708
#, c-format
msgid "* Allows %s.\n"
msgstr "* Möjliggör %s.\n"
-#: client/helpdata.c:780
+#: client/helpdata.c:778
#, c-format
msgid "* Can only be built if there is %s in the city.\n"
msgstr "* Kan endast byggas om det finns %s i staden.\n"
-#: client/helpdata.c:786
+#: client/helpdata.c:784
#, c-format
msgid "* Can only be built with %s as government.\n"
msgstr "* Kan endast byggas under statsskicket %s.\n"
-#: client/helpdata.c:791
+#: client/helpdata.c:789
msgid "* May not be built in cities.\n"
msgstr "* Kan ej byggas i städer.\n"
-#: client/helpdata.c:794
+#: client/helpdata.c:792
msgid "* Never has a home city.\n"
msgstr "* Har aldrig hemstad.\n"
-#: client/helpdata.c:797
+#: client/helpdata.c:795
msgid "* Losing this unit will lose you the game!\n"
msgstr "* Förlust av denna trupp innebär förlust av spelet!\n"
-#: client/helpdata.c:801
+#: client/helpdata.c:799
msgid "* Each player may only have one of this type of unit.\n"
msgstr "* En spelare kan endast ha en av detta truppslag.\n"
-#: client/helpdata.c:805
+#: client/helpdata.c:803
#, c-format
msgid "* Requires %d population to build.\n"
msgstr "* Vid byggandet åtgår %d befolkning.\n"
-#: client/helpdata.c:811
+#: client/helpdata.c:809
#, c-format
msgid "* Can carry and refuel %d air unit.\n"
msgid_plural "* Can carry and refuel %d air units.\n"
msgstr[0] "* Kan frakta och tanka %d stridsflygplan.\n"
msgstr[1] "* Kan frakta och tanka %d stridsflygplan.\n"
-#: client/helpdata.c:816
+#: client/helpdata.c:814
#, c-format
msgid "* Can carry and refuel %d missile unit.\n"
msgid_plural "* Can carry and refuel %d missile units.\n"
msgstr[0] "* Kan frakta och tanka %d missilenhet.\n"
msgstr[1] "* Kan frakta och tanka %d missiler.\n"
-#: client/helpdata.c:821
+#: client/helpdata.c:819
#, c-format
msgid "* Can carry %d ground unit across water.\n"
msgid_plural "* Can carry %d ground units across water.\n"
msgstr[0] "* Kan frakta %d marktrupp över vatten.\n"
msgstr[1] "* Kan frakta %d marktrupper över vatten.\n"
-#: client/helpdata.c:830
+#: client/helpdata.c:828
msgid ""
"* Can establish trade routes (must travel to target city and must be at "
"least 9 tiles [in Manhattan distance] from this unit's home city).\n"
@@ -8330,125 +8333,125 @@ msgstr ""
"* Kan etablera handelsleder (måste resa till målstaden, som måste ligga nio "
"rutor [i Manhattanavstånd; dvs. inga diagonaler] bort från hemstaden).\n"
-#: client/helpdata.c:836
+#: client/helpdata.c:834
#, c-format
msgid "* Can help build wonders (adds %d production).\n"
msgstr "* Kan hjälpa till med underverksbyggen (lägger till %d sköldar).\n"
-#: client/helpdata.c:840
+#: client/helpdata.c:838
msgid "* May not be disbanded.\n"
msgstr "* Kan ej upplösas.\n"
-#: client/helpdata.c:842
+#: client/helpdata.c:840
#, c-format
msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
msgstr "* Kan upplösas i en stad mot 50%% av dess tillverkningskostnad.\n"
-#: client/helpdata.c:846
+#: client/helpdata.c:844
msgid "* Can build new cities.\n"
msgstr "* Kan grunda nya städer.\n"
-#: client/helpdata.c:849
+#: client/helpdata.c:847
#, c-format
msgid "* Can add on %d population to cities of no more than size %d.\n"
msgstr ""
"* Kan en öka en stads befolkning med %d i det fall staden är av storlek %d "
"eller mindre.\n"
-#: client/helpdata.c:858
+#: client/helpdata.c:856
msgid "* Can build roads and railroads.\n"
msgstr "* Kan bygga vägar och järnvägar.\n"
-#: client/helpdata.c:859
+#: client/helpdata.c:857
msgid "* Can build mines on tiles.\n"
msgstr "* Kan gräva gruvor.\n"
-#: client/helpdata.c:860
+#: client/helpdata.c:858
msgid "* Can build irrigation on tiles.\n"
msgstr "* Kan anlägga bevattning.\n"
-#: client/helpdata.c:865
+#: client/helpdata.c:863
msgid "* Can build farmland.\n"
msgstr "* Kan anlägga åker\n"
-#: client/helpdata.c:869
+#: client/helpdata.c:867
#, c-format
msgid "* Can build farmland (if %s is known).\n"
msgstr "* Kan anlägga åker (om vi forskat fram %s).\n"
-#: client/helpdata.c:873
+#: client/helpdata.c:871
#, c-format
msgid "* Can build farmland (if any of the following are known: %s).\n"
msgstr "* Kan anlägga åker (om vi forskat fram någon av: %s).\n"
-#: client/helpdata.c:881
+#: client/helpdata.c:879
msgid "* Can build fortresses.\n"
msgstr "* Kan bygga fästningar.\n"
-#: client/helpdata.c:885
+#: client/helpdata.c:883
#, c-format
msgid "* Can build fortresses (if %s is known).\n"
msgstr "* Kan bygga fästningar (om vi forskat fram %s).\n"
-#: client/helpdata.c:889
+#: client/helpdata.c:887
#, c-format
msgid "* Can build fortresses (if any of the following are known: %s).\n"
msgstr "* Kan bygga fästningar (om vi forskat fram någon av: %s).\n"
-#: client/helpdata.c:895
+#: client/helpdata.c:893
msgid "* Can clean pollution from tiles.\n"
msgstr "* Kan sanera utsläpp.\n"
-#: client/helpdata.c:896
+#: client/helpdata.c:894
msgid "* Can clean nuclear fallout from tiles.\n"
msgstr "* Kan sanera radioaktivt nedfall.\n"
-#: client/helpdata.c:899
+#: client/helpdata.c:897
msgid "* Can transform tiles.\n"
msgstr "* Kan omvandla landskapet.\n"
-#: client/helpdata.c:902
+#: client/helpdata.c:900
msgid "* Can build airbases.\n"
msgstr "* Kan bygga flygbaser.\n"
-#: client/helpdata.c:906
+#: client/helpdata.c:904
#, c-format
msgid "* May fortify, granting a 50%% defensive bonus.\n"
msgstr "* Kan befästa sig, vilket ger en försvarsbonus på 50%%.\n"
-#: client/helpdata.c:909
+#: client/helpdata.c:907
msgid "* May pillage to destroy infrastructure from tiles.\n"
msgstr "* Kan plundra och förstöra infrastruktur.\n"
-#: client/helpdata.c:913
+#: client/helpdata.c:911
msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
msgstr "* Kan utföra diplomathandlingar plus särskilda spionhandlingar.\n"
-#: client/helpdata.c:916
+#: client/helpdata.c:914
msgid "* Can perform diplomatic actions.\n"
msgstr "* Kan utföra diplomathandlingar.\n"
-#: client/helpdata.c:920
+#: client/helpdata.c:918
msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
msgstr "* Förlorar aldrig en strid mellan diplomater.\n"
-#: client/helpdata.c:923
+#: client/helpdata.c:921
msgid "* May not be bribed.\n"
msgstr "* Kan inte mutas.\n"
-#: client/helpdata.c:926
+#: client/helpdata.c:924
msgid "* Can attack enemy air units.\n"
msgstr "* Kan angripa fientligt stridsflyg.\n"
-#: client/helpdata.c:930
+#: client/helpdata.c:928
msgid "* Is invisible except when next to an enemy unit or city.\n"
msgstr "* Är osynlig utom intill fiendetrupper eller fiendestäder.\n"
-#: client/helpdata.c:934
+#: client/helpdata.c:932
msgid "* Can only attack units on ocean squares (no land attacks).\n"
msgstr "* Kan endast angripa trupper på havsrutor (inga landangrepp).\n"
-#: client/helpdata.c:938
+#: client/helpdata.c:936
msgid ""
"* Can attack from aboard sea units: against enemy cities and onto land "
"squares.\n"
@@ -8456,40 +8459,40 @@ msgstr ""
"* Kan angripa från ombord på marina enheter: mot fientliga städer och "
"landrutor.\n"
-#: client/helpdata.c:943
+#: client/helpdata.c:941
#, c-format
msgid "* Can be paradropped from a friendly city (Range: %d).\n"
msgstr "* Kan hoppa fallskärm från en vänlig stad (Räckvidd: %d).\n"
-#: client/helpdata.c:949
+#: client/helpdata.c:947
msgid "* Gets double defense against units specified as 'mounted'.\n"
msgstr "* Har dubbelt försvar mot trupper angivna som \"ridande\".\n"
-#: client/helpdata.c:953
+#: client/helpdata.c:951
msgid "* Counts as 'mounted' against certain defenders.\n"
msgstr "* Räknas som \"ridande\" mot vissa försvarare.\n"
-#: client/helpdata.c:957
+#: client/helpdata.c:955
msgid "* A missile unit: gets used up in making an attack.\n"
msgstr "* En missil: förbrukas vid angrepp.\n"
-#: client/helpdata.c:960
+#: client/helpdata.c:958
msgid "* Making an attack ends this unit's turn.\n"
msgstr "* Angrepp avslutar denna trupps omgång.\n"
-#: client/helpdata.c:964
+#: client/helpdata.c:962
msgid "* This unit's attack causes a nuclear explosion!\n"
msgstr "* Om denna trupp anfaller sker en kärnvapenexplosion!\n"
-#: client/helpdata.c:968
+#: client/helpdata.c:966
msgid "* Gets double firepower when attacking cities.\n"
msgstr "* Erhåller dubbel eldkraft vid attack mot städer.\n"
-#: client/helpdata.c:971
+#: client/helpdata.c:969
msgid "* Ignores the effects of city walls.\n"
msgstr "* Stadsmurar utgör inget skydd mot denna trupp.\n"
-#: client/helpdata.c:975
+#: client/helpdata.c:973
#, c-format
msgid ""
"* Does bombard attacks (%d per turn). These attacks will only damage (never "
@@ -8498,38 +8501,38 @@ msgstr ""
"* Utför bombardemang (%d per omgång). Dessa attacker har aldrig dödlig "
"utgång, men skadar försvararen och innebär ingen fara för angriparen.\n"
-#: client/helpdata.c:982
+#: client/helpdata.c:980
msgid "* Gets quintuple defense against missiles and aircraft.\n"
msgstr "* Har femfaldigt försvar mot missiler och flygplan.\n"
-#: client/helpdata.c:986
+#: client/helpdata.c:984
msgid "* Ignores terrain effects (treats all squares as roads).\n"
msgstr ""
"* Landskapet påverkar inte denna trupps rörlighet (behandlar alla rutor som "
"vägar).\n"
-#: client/helpdata.c:989
+#: client/helpdata.c:987
msgid "* Ignores zones of control.\n"
msgstr "* Påverkas ej av kontrollområden.\n"
-#: client/helpdata.c:993
+#: client/helpdata.c:991
msgid "* A non-military unit (cannot attack; no martial law).\n"
msgstr "* Icke-stridande enhet (kan inte anfalla; inget undantagstillstånd).\n"
-#: client/helpdata.c:997
+#: client/helpdata.c:995
msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
msgstr ""
"* En fälttrupp: gör 1 medborgare missnöjd även när truppen är fredlig.\n"
-#: client/helpdata.c:1000
+#: client/helpdata.c:998
msgid "* Will never achieve veteran status.\n"
msgstr "* Blir aldrig mer erfaren.\n"
-#: client/helpdata.c:1002
+#: client/helpdata.c:1000
msgid "* May become veteran through training or combat.\n"
msgstr "* Kan bli mer erfarna genom träning eller strid.\n"
-#: client/helpdata.c:1008
+#: client/helpdata.c:1006
#, c-format
msgid ""
"* Must end turn in a city or next to land, or has a 50%% risk of being lost "
@@ -8538,12 +8541,12 @@ msgstr ""
"* Måste avsluta sin omgång i en stad eller intill land. Löper annars 50%% "
"risk att gå förlorad till sjöss.\n"
-#: client/helpdata.c:1012
+#: client/helpdata.c:1010
#, c-format
msgid "* The discovery of %s reduces the risk to 25%%.\n"
msgstr "* Upptäckten av %s minskar risken till 25%%.\n"
-#: client/helpdata.c:1017
+#: client/helpdata.c:1015
#, c-format
msgid "* %s reduces the risk to 12%%.\n"
msgstr "* %s minskar risken till 12%%.\n"
@@ -8552,27 +8555,27 @@ msgstr "* %s minskar risken till 12%%.\n"
#. * last two elements
#. TRANS: List of possible output types has this between
#. * last two elements
-#: client/helpdata.c:1068 client/helpdata.c:1402
+#: client/helpdata.c:1066 client/helpdata.c:1400
msgid " or "
msgstr " eller "
-#: client/helpdata.c:1070 client/helpdata.c:1390
+#: client/helpdata.c:1068 client/helpdata.c:1388
msgid "?or:, "
msgstr "?or:, "
-#: client/helpdata.c:1082
+#: 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"
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:1124
+#: client/helpdata.c:1122
#, 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:1129
+#: client/helpdata.c:1127
#, c-format
msgid ""
"To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8581,90 +8584,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:1137
+#: client/helpdata.c:1135
msgid "You cannot research this technology."
msgstr "Vi kan inte forska fram denna teknologi."
-#: client/helpdata.c:1141
+#: client/helpdata.c:1139
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:1153
+#: client/helpdata.c:1151
#, 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:1158
+#: client/helpdata.c:1156
#, 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:1161
+#: client/helpdata.c:1159
#, 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:1165
+#: client/helpdata.c:1163
msgid "* Increases the pollution generated by the population.\n"
msgstr "* Ökar mängden utsläpp som orsakas av befolkning.\n"
-#: client/helpdata.c:1170
+#: client/helpdata.c:1168
#, 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:1177
+#: client/helpdata.c:1175
#, c-format
msgid "* Allows %s to build fortresses.\n"
msgstr "* Möjliggör %s att bygga fästningar.\n"
-#: client/helpdata.c:1185
+#: client/helpdata.c:1183
#, c-format
msgid "* Allows %s to build airbases.\n"
msgstr "* Möjliggör %s att bygga flygbaser.\n"
-#: client/helpdata.c:1194
+#: client/helpdata.c:1192
#, 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:1202
+#: client/helpdata.c:1200
#, 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:1236
+#: client/helpdata.c:1234
msgid "* Pollution cannot be generated on this terrain."
msgstr "* Utsläpp drabbar aldrig denna terräng."
-#: client/helpdata.c:1241
+#: client/helpdata.c:1239
msgid "* You cannot build cities on this terrain."
msgstr "* Det går inte att grunda nya städer här."
-#: client/helpdata.c:1247
+#: client/helpdata.c:1245
msgid "* The coastline of this terrain is unsafe."
msgstr "* Denna terrängs kust är riskabel."
-#: client/helpdata.c:1252
+#: client/helpdata.c:1250
msgid "* This terrain is unsafe for units to travel on."
msgstr "* Denna terräng är riskabel för trupper."
-#: client/helpdata.c:1257
+#: client/helpdata.c:1255
msgid "* Land units cannot travel on oceanic terrains."
msgstr "* Marktrupper kan ej färdas över havsrutor."
# ?
-#: client/helpdata.c:1307
+#: client/helpdata.c:1305
msgid "Features:\n"
msgstr "Innehåller:\n"
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1413 client/helpdata.c:1414
+#: client/helpdata.c:1411 client/helpdata.c:1412
msgid "?outputlist: Nothing "
msgstr " inget "
-#: client/helpdata.c:1421
+#: client/helpdata.c:1419
#, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
@@ -8679,7 +8682,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:1431
+#: client/helpdata.c:1429
#, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8688,48 +8691,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:1439
+#: client/helpdata.c:1437
#, 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:1444
+#: client/helpdata.c:1442
#, 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:1449
+#: client/helpdata.c:1447
#, 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:1453
+#: client/helpdata.c:1451
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:1462
+#: client/helpdata.c:1460
#, 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:1470
+#: client/helpdata.c:1468
#, 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:1477
+#: client/helpdata.c:1475
#, 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:1484
+#: client/helpdata.c:1482
#, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -8739,7 +8742,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:1491
+#: client/helpdata.c:1489
#, c-format
msgid ""
"* After the first unhappy citizen due to city size, for each %d additional "
@@ -8748,17 +8751,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:1499
+#: client/helpdata.c:1497
#, 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:1504
+#: client/helpdata.c:1502
msgid "Has unlimited science/gold/luxuries rates.\n"
msgstr "* Har obegränsade forsknings/skatte/välfärdssatser.\n"
-#: client/helpdata.c:1509
+#: client/helpdata.c:1507
#, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
@@ -8773,7 +8776,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:1521
+#: client/helpdata.c:1519
#, 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"
@@ -8782,7 +8785,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:1532
+#: client/helpdata.c:1530
#, c-format
msgid ""
"* You may grow your cities by means of celebrations. Your cities must be at "
@@ -8791,15 +8794,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:1538
+#: client/helpdata.c:1536
msgid "* Your units cannot be bribed.\n"
msgstr "* Dina trupper kan inte mutas.\n"
-#: client/helpdata.c:1541
+#: client/helpdata.c:1539
msgid "* Your cities cannot be incited.\n"
msgstr "* Dina städer kan inte försättas i revolt.\n"
-#: client/helpdata.c:1545
+#: client/helpdata.c:1543
msgid ""
"* Government will fall into anarchy if any city is in disorder for more than "
"two turns in a row.\n"
@@ -8807,39 +8810,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:1551
+#: client/helpdata.c:1549
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:1555
+#: client/helpdata.c:1553
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:1559
+#: client/helpdata.c:1557
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:1563
+#: client/helpdata.c:1561
msgid "* Pays no upkeep for fanatics.\n"
msgstr "* Betalar inget underhåll för fanatiker.\n"
-#: client/helpdata.c:1566
+#: client/helpdata.c:1564
msgid "* Has no unhappy citizens.\n"
msgstr "* Saknar missnöjda medborgare.\n"
-#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
+#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
#, c-format
msgid "* Veteran %s units.\n"
msgstr "* Erfarna %s-trupper.\n"
-#: client/helpdata.c:1587
+#: client/helpdata.c:1585
msgid "* Veteran units.\n"
msgstr "* Erfarna trupper.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1593
+#: client/helpdata.c:1591
#, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8849,7 +8852,7 @@ msgstr ""
"folket inte firar.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1602
+#: client/helpdata.c:1600
#, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8859,115 +8862,115 @@ msgstr ""
"folket firar.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1610
+#: client/helpdata.c:1608
#, 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:1619
+#: client/helpdata.c:1617
#, 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:1627
+#: client/helpdata.c:1625
#, 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:1632
+#: client/helpdata.c:1630
#, 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:1637
+#: client/helpdata.c:1635
#, 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:1645
+#: client/helpdata.c:1643
#, 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:1651
+#: client/helpdata.c:1649
#, 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:1657
+#: client/helpdata.c:1655
#, 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:1674
+#: client/helpdata.c:1672
#, 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:1701
+#: client/helpdata.c:1699
#, c-format
msgid "%s%d %s"
msgstr "%s%d %s"
-#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1700 client/helpdata.c:1708 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:1709
+#: client/helpdata.c:1707
#, c-format
msgid "%s%d unhappy"
msgstr "%s%d missnöjda"
-#: client/mapctrl_common.c:382
+#: client/mapctrl_common.c:399
#, c-format
msgid "You don't know how to build %s!"
msgstr "Vi veta ej hur man bygger %s!"
-#: client/mapctrl_common.c:392
+#: client/mapctrl_common.c:409
#, c-format
msgid "Copy %s to clipboard."
msgstr "Kopiera %s till klippbord."
-#: client/mapctrl_common.c:408
+#: client/mapctrl_common.c:425
msgid "Clipboard is empty."
msgstr "Klippbordet är tomt."
-#: client/options.c:98
+#: client/options.c:102
msgid "Graphics"
msgstr "Bild"
-#: client/options.c:99
+#: client/options.c:103
msgid "Overview"
msgstr "Översiktskarta"
-#: client/options.c:100
+#: client/options.c:104
msgid "Sound"
msgstr "Ljud"
-#: client/options.c:101
+#: client/options.c:105
msgid "Interface"
msgstr "Gränssnitt"
-#: client/options.c:102
+#: client/options.c:106
msgid "Network"
msgstr "Nätverk"
-#: client/options.c:107
+#: client/options.c:111
msgid "Login name"
msgstr "Inloggningsnamn"
-#: client/options.c:108
+#: client/options.c:112
msgid ""
"This is the default login username that will be used in the connection "
"dialogs or with the -a command-line parameter."
@@ -8975,11 +8978,11 @@ msgstr ""
"Detta är det användarnamn som normalt kommer användas när du loggar in samt "
"med kommandoradsparametern -a."
-#: client/options.c:113
+#: client/options.c:117
msgid "Server"
msgstr "Server"
-#: client/options.c:114
+#: client/options.c:118
msgid ""
"This is the default server hostname that will be used in the connection "
"dialogs or with the -a command-line parameter."
@@ -8987,11 +8990,11 @@ msgstr ""
"Detta är det förvalda servervärdsnamnet som kommer användas i "
"anslutningsdialoger samt med kommandoradsparametern -a."
-#: client/options.c:119
+#: client/options.c:123
msgid "Server port"
msgstr "Serverport"
-#: client/options.c:120
+#: client/options.c:124
msgid ""
"This is the default server port that will be used in the connection dialogs "
"or with the -a command-line parameter."
@@ -8999,11 +9002,11 @@ msgstr ""
"Detta är den förvalda serverporten som kommer användas i anslutningsdialoger "
"samt med kommandoradsparametern -a."
-#: client/options.c:125 client/gui-win32/connectdlg.c:912 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
msgid "Metaserver"
msgstr "Metaserver"
-#: client/options.c:126
+#: client/options.c:130
msgid ""
"The metaserver is a host that the client contacts to find out about games on "
"the internet. Don't change this from its default value unless you know what "
@@ -9013,11 +9016,11 @@ msgstr ""
"tillgängliga på Internet. Ändra inte värdet här om du inte är helt säker på "
"din sak."
-#: client/options.c:132
+#: client/options.c:136
msgid "Soundset"
msgstr "Ljuduppsättning"
-#: client/options.c:133
+#: client/options.c:137
msgid ""
"This is the soundset that will be used. Changing this is the same as using "
"the -S command-line parameter."
@@ -9025,11 +9028,11 @@ msgstr ""
"Detta är den ljuduppsättning som kommer användas. Detta motsvarar "
"kommandoradsparametern -S."
-#: client/options.c:138
+#: client/options.c:142
msgid "Sound plugin"
msgstr "Insticksprogram för ljud"
-#: client/options.c:139
+#: client/options.c:143
msgid ""
"If you have a problem with sound, try changing the sound plugin. The new "
"plugin won't take effect until you restart Freeciv. Changing this is the "
@@ -9039,19 +9042,19 @@ msgstr ""
"måste starta om klienten för att använda det nya insticksprogrammet. Detta "
"motsvarar kommandoradsparametern -P."
-#: client/options.c:144 client/gui-sdl/gui_main.c:162
+#: client/options.c:148 client/gui-sdl/gui_main.c:162
msgid "Theme"
msgstr "Tema"
-#: client/options.c:145
+#: client/options.c:149
msgid "By changing this option you change the active theme."
msgstr "Här kan du byta aktivt tema."
-#: client/options.c:148
+#: client/options.c:152
msgid "Tileset"
msgstr "Rutbildsuppsättning"
-#: client/options.c:149
+#: client/options.c:153
msgid ""
"By changing this option you change the active tileset. This is the same as "
"using the -t command-line parameter."
@@ -9059,11 +9062,11 @@ msgstr ""
"Här kan du byta rutbildsuppsättning. Detta motsvarar kommandoradsparametern -"
"t."
-#: client/options.c:156
+#: client/options.c:160
msgid "Solid unit background color"
msgstr "Enkel bakgrundsfärg för trupper"
-#: client/options.c:157
+#: client/options.c:161
msgid ""
"Setting this option will cause units on the map view to be drawn with a "
"solid background color instead of the flag backdrop."
@@ -9071,11 +9074,11 @@ msgstr ""
"Är detta påslaget visas trupper på kartan med enkel bakgrundsfärg istället "
"för en flagga eller sköld."
-#: client/options.c:161 client/gui-sdl/optiondlg.c:960
+#: client/options.c:165 client/gui-sdl/optiondlg.c:960
msgid "Sound bell at new turn"
msgstr "Ring i klocka vid ny omgång"
-#: client/options.c:162
+#: client/options.c:166
msgid ""
"Set this option to have a \"bell\" event be generated at the start of a new "
"turn. You can control the behavior of the \"bell\" event by editing the "
@@ -9084,11 +9087,11 @@ msgstr ""
"Är detta påslaget genereras en \"bell\"-händelse i början av varje omgång. "
"Du kan ändra \"bell\"-händelsens funktion i meddelandetillval."
-#: client/options.c:168
+#: client/options.c:172
msgid "Unit movement animation time (milliseconds)"
msgstr "Animationstid vid truppförflyttning (ms)"
-#: client/options.c:169
+#: client/options.c:173
msgid ""
"This option controls how long unit \"animation\" takes when a unit moves on "
"the map view. Set it to 0 to disable animation entirely."
@@ -9096,11 +9099,11 @@ msgstr ""
"Detta påverkar hur lång tid animationen av trupper tar när de rör sig på "
"kartan. Sätt det till 0 för att avaktivera animationen."
-#: client/options.c:174
+#: client/options.c:178
msgid "Mapview recentering time (milliseconds)"
msgstr "Återfokuseringstid för kartvyn (ms)"
-#: client/options.c:175
+#: client/options.c:179
msgid ""
"When the map view is recentered, it will slide smoothly over the map to its "
"new position. This option controls how long this slide lasts. Set it to 0 "
@@ -9110,21 +9113,21 @@ msgstr ""
"Detta tillval påverkar hur lång tid denna glidning får ta. Sätt det till 0 "
"för att avaktivera effekten."
-#: client/options.c:180 client/gui-sdl/optiondlg.c:1014
+#: client/options.c:184 client/gui-sdl/optiondlg.c:1014
msgid "Show combat animation"
msgstr "Visa stridsanimationer"
-#: client/options.c:181
+#: client/options.c:185
msgid ""
"Disabling this option will turn off combat animation between units on the "
"mapview."
msgstr "Detta avgör om strid mellan trupper på kartan är animerad eller inte."
-#: client/options.c:184
+#: client/options.c:188
msgid "Draw the citybar"
msgstr "Visa stadsfältet"
-#: client/options.c:185
+#: client/options.c:189
msgid ""
"Setting this option will display a 'citybar' containing useful information "
"beneath each city. Disabling this option will display only the city's name "
@@ -9133,11 +9136,11 @@ msgstr ""
"Är detta påslaget visas ett s.k. stadsfält under varje stad som innehåller "
"en smärre mängd data om denna."
-#: client/options.c:191
+#: client/options.c:195
msgid "Show icons in the technology tree"
msgstr "Visa ikoner i teknologiträdet."
-#: client/options.c:192
+#: client/options.c:196
msgid ""
"Setting this option will display icons on the technology tree diagram. "
"Turning this option off makes the technology tree more compact."
@@ -9145,11 +9148,11 @@ msgstr ""
"Är detta påslaget visas ikoner i teknologiträdet. Utan detta blir "
"teknologiträdet kompaktare."
-#: client/options.c:197
+#: client/options.c:201
msgid "Draw shield graphics for units"
msgstr "Visa sköldgrafik för trupper"
-#: client/options.c:198
+#: client/options.c:202
msgid ""
"Setting this option will draw a shield icon as the flags on units. If "
"unset, the full flag will be drawn."
@@ -9157,11 +9160,11 @@ msgstr ""
"Är detta påslaget visas sköldikoner vid varje trupp istället för flaggor. Om "
"ej påslaget, så visas kompletta flaggor."
-#: client/options.c:202
+#: client/options.c:206
msgid "Manual Turn Done in AI Mode"
msgstr "Manuell avsluta omgång i datorstyrt läge"
-#: client/options.c:203
+#: client/options.c:207
msgid ""
"Disable this option if you do not want to press the Turn Done button "
"manually when watching an AI player."
@@ -9169,21 +9172,21 @@ msgstr ""
"Med detta avslaget behöver du inte trycka på avsluta omgång-knappen när du "
"är betraktare av en datorspelare."
-#: client/options.c:207 client/gui-sdl/optiondlg.c:1121
+#: client/options.c:211 client/gui-sdl/optiondlg.c:1121
msgid "Auto Center on Units"
msgstr "Automatisk centrering på trupper"
-#: client/options.c:208
+#: client/options.c:212
msgid ""
"Set this option to have the active unit centered automatically when the unit "
"focus changes."
msgstr "Med detta påslaget centreras vyn automatiskt på trupp som fått fokus."
-#: client/options.c:211 client/gui-sdl/optiondlg.c:1147
+#: client/options.c:215 client/gui-sdl/optiondlg.c:1147
msgid "Auto Center on Combat"
msgstr "Självcentrering på strid"
-#: client/options.c:212
+#: client/options.c:216
msgid ""
"Set this option to have any combat be centered automatically. Disabled this "
"will speed up the time between turns but may cause you to miss combat "
@@ -9192,19 +9195,19 @@ msgstr ""
"Med detta påslaget fokuseras vyn på strid automatiskt. Är det inte påslaget "
"snabbas en omgång upp, men du riskerar gå miste om striderna."
-#: client/options.c:217 client/gui-sdl/optiondlg.c:1174
+#: client/options.c:221 client/gui-sdl/optiondlg.c:1174
msgid "Focus on Awakened Units"
msgstr "Fokus på väckta trupper"
-#: client/options.c:218
+#: client/options.c:222
msgid "Set this option to have newly awoken units be focused automatically."
msgstr "Slå på detta val så sätts fokus på nyligen väckta enheter automatiskt."
-#: client/options.c:221
+#: client/options.c:225
msgid "Allow goto into the unknown"
msgstr "Tillåt gå-till genom okänt land"
-#: client/options.c:222
+#: client/options.c:226
msgid ""
"Setting this option will make the game consider moving into unknown tiles. "
"If not, then goto routes will detour around or be blocked by unknown tiles."
@@ -9212,22 +9215,22 @@ msgstr ""
"Är detta påslaget kan man utfärda gå-tillbefallningar genom okänt land. Är "
"det avslaget väljs rutten runt okänt land, eller t.o.m. blockeras av det."
-#: client/options.c:226
+#: client/options.c:230
msgid "Center map when Popup city"
msgstr "Centrera kartan vid öppning av stadsfönster"
-#: client/options.c:227
+#: client/options.c:231
msgid ""
"Setting this option makes the mapview center on a city when its city dialog "
"is popped up."
msgstr ""
"Är detta påslaget, centreras vyn på en stad när dess stadsdialog öppnas."
-#: client/options.c:230
+#: client/options.c:234
msgid "Concise City Production"
msgstr "Kortfattad visning av vad städer bygger"
-#: client/options.c:231
+#: client/options.c:235
msgid ""
"Set this option to make the city production (as shown in the city dialog) to "
"be more compact."
@@ -9235,11 +9238,11 @@ msgstr ""
"Är detta påslaget visas i stadsdialogen en sammandragen version av vad "
"staden bygger."
-#: client/options.c:234 client/gui-sdl/optiondlg.c:1252
+#: client/options.c:238 client/gui-sdl/optiondlg.c:1252
msgid "End Turn when done moving"
msgstr "Avsluta omgången när allas drag har slutförts"
-#: client/options.c:235
+#: client/options.c:239
msgid ""
"Setting this option makes your turn end automatically when all your units "
"are done moving."
@@ -9247,95 +9250,143 @@ msgstr ""
"Är detta påslaget avslutas omgången i samma ögonblick du flyttat färdigt din "
"sista trupp."
-#: client/options.c:238 client/gui-sdl/optiondlg.c:1226
+#: client/options.c:242 client/gui-sdl/optiondlg.c:1226
msgid "Prompt for city names"
msgstr "Fråga efter stadsnamn"
-#: client/options.c:239
+#: client/options.c:243
msgid ""
"Disabling this option will make the names of newly founded cities chosen "
"automatically by the server."
msgstr "Är detta avslaget väljs stadsnamn åt dig."
-#: client/options.c:242 client/gui-sdl/optiondlg.c:1200
+#: client/options.c:246 client/gui-sdl/optiondlg.c:1200
msgid "Pop up city dialog for new cities"
msgstr "Öppna stadsdialog för nya städer"
-#: client/options.c:243
+#: client/options.c:247
msgid ""
"Setting this option will pop up a newly-founded city's city dialog "
"automatically."
msgstr "Är detta påslaget visas en nygrundad stads stadsdialog direkt."
-#: client/options.c:248
+#: client/options.c:250
+#, fuzzy
+msgid "Pop up caravan actions"
+msgstr "Karavanhandlingar"
+
+#: client/options.c:251
+msgid ""
+"If this option is enabled, when caravans arrive at a city where they can "
+"establish a traderoute or help build a wonder, a window will popup asking "
+"which action should be performed. Disabling this option means you will have "
+"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 ""
+
+#: client/options.c:260
+#, fuzzy
+msgid "Enable cursor changing"
+msgstr "Aktivera alpha blending"
+
+#: client/options.c:261
+msgid ""
+"This option controls whether the client should try to change the mouse "
+"cursor depending on what is being pointed at, as well as to indicate changes "
+"in the client or server state."
+msgstr ""
+
+#: client/options.c:266
+msgid "Select cities before units"
+msgstr ""
+
+#: 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 ""
+
+#: client/options.c:272
+msgid "Clear unit orders on selection"
+msgstr ""
+
+#: client/options.c:273
+msgid ""
+"Enabling this option will cause unit orders to be cleared whenever one or "
+"more units are selected. If this option is disabled, selecting units will "
+"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 ""
+
+#: client/options.c:282
msgid "Background layer"
msgstr "Bakgrund"
-#: client/options.c:249
+#: client/options.c:283
msgid "The background layer of the overview shows just ocean and land."
msgstr "Visar vad som är hav och land på översiktskartan."
-#: client/options.c:252
+#: client/options.c:286
msgid "Terrain relief map layer"
msgstr "Landskap"
-#: client/options.c:253
+#: client/options.c:287
msgid "The relief layer shows all terrains on the map."
msgstr "Visar allt landskap på översiktskartan."
-#: client/options.c:256
+#: client/options.c:290
msgid "Borders layer"
msgstr "Gränser"
-#: client/options.c:257
+#: client/options.c:291
msgid ""
"The borders layer of the overview shows which tiles are owned by each player."
msgstr "Visar varje rutas ägare på översiktskartan."
-#: client/options.c:261
+#: client/options.c:295
msgid "Units layer"
msgstr "Trupper"
-#: client/options.c:262
+#: client/options.c:296
msgid "Enabling this will draw units on the overview."
msgstr "Visar trupper på översiktskartan."
-#: client/options.c:265
+#: client/options.c:299
msgid "Cities layer"
msgstr "Städer"
-#: client/options.c:266
+#: client/options.c:300
msgid "Enabling this will draw cities on the overview."
msgstr "Visar städer på översiktskartan."
-#: client/options.c:269
+#: client/options.c:303
msgid "Overview fog of war"
msgstr "Krigsdimma"
-#: client/options.c:270
+#: client/options.c:304
msgid "Enabling this will show fog of war on the overview."
msgstr "Visar krigsdimma på översiktskartan"
-#: client/options.c:488
+#: client/options.c:526
msgid "If you add a preset by hand, also update \"number_of_presets\""
msgstr ""
"Om man lägger till ett förvalt värde för hand bör man även uppdatera "
"\"number_of_presets\""
-#: client/options.c:516
+#: client/options.c:554
msgid "Cannot find your home directory"
msgstr "Kan inte finna din hemkatalog"
-#: client/options.c:665 client/options.c:796
+#: client/options.c:703 client/options.c:834
msgid "Save failed, cannot find a filename."
msgstr "Sparning misslyckades, kan inte hitta ett filnamn."
-#: client/options.c:678 client/options.c:859
+#: client/options.c:716 client/options.c:897
#, c-format
msgid "Save failed, cannot write to file %s"
msgstr "Sparning misslyckades, kan inte skriva till fil %s"
-#: client/options.c:680 client/options.c:862
+#: client/options.c:718 client/options.c:900
#, c-format
msgid "Saved settings to file %s"
msgstr "Sparade inställningar i filen %s"
@@ -9359,16 +9410,16 @@ msgstr "Serverförmåga-sträng: %s"
msgid "Start of turn %d"
msgstr "Början av omgång %d"
-#: client/packhand.c:1590
+#: client/packhand.c:1591
#, c-format
msgid "AI Mode is now %s."
msgstr "Datorstyrt läge är nu %s."
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "ON"
msgstr "PÃ…"
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "OFF"
msgstr "AV"
@@ -9401,14 +9452,15 @@ 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:2085
+#: client/gui-gtk-2.0/pages.c:2157
msgid "Flag"
msgstr "Flagga"
#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
-#: client/gui-gtk-2.0/pages.c:1536 client/gui-gtk-2.0/pages.c:2087
-#: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
-#: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
+#: 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/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr "Folkslag"
@@ -9420,7 +9472,7 @@ msgstr "Gräns"
msgid "Score"
msgstr "Poäng"
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
msgid "Team"
msgstr "Lag"
@@ -9491,279 +9543,305 @@ msgstr "Inga %s kunde upplösas."
msgid "Could not open temp file."
msgstr "Kunde inte öppna tempfilen."
-#: client/servers.c:407
+#: client/servers.c:410
msgid "Invalid $http_proxy or metaserver value, must start with 'http://'"
msgstr "Ogiltigt $http_proxy- eller metaservervärde, måste börja med 'http://'"
-#: client/servers.c:413
+#: client/servers.c:416
msgid "Failed looking up metaserver's host"
msgstr "Misslyckades få kontakt med metaserverns värd."
-#: client/text.c:85 client/text.c:86 client/text.c:91
+#. TRANS: "AI <player name>"
+#: client/text.c:94
+#, c-format
+msgid "AI %s"
+msgstr ""
+
+#. TRANS: "<nation adjective>, team <team name>"
+#: client/text.c:118
+#, fuzzy, c-format
+msgid "%s, team %s"
+msgstr "%ss %s"
+
+#: client/text.c:135 client/text.c:136 client/text.c:141
#: client/gui-sdl/mapview.c:752
msgid "?nation:Neutral"
msgstr "?nation:neutrala"
-#: client/text.c:85 client/gui-sdl/mapview.c:752
+#: client/text.c:135 client/gui-sdl/mapview.c:752
msgid "?nation:Hostile"
msgstr "?nation:fientliga"
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Peaceful"
msgstr "?nation:fredliga"
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Friendly"
msgstr "?nation:vänliga"
-#: client/text.c:88 client/gui-sdl/mapview.c:755
+#: client/text.c:138 client/gui-sdl/mapview.c:755
msgid "?nation:Mysterious"
msgstr "?nation:mystiska"
-#: client/text.c:88
+#: client/text.c:138
msgid "?nation:Friendly(team)"
msgstr "?nation:vänliga(lag)"
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
msgid "?city:Neutral"
msgstr "?city:neutral"
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
msgid "?city:Hostile"
msgstr "?city:fientlig"
-#: client/text.c:92 client/gui-sdl/mapview.c:786
+#: client/text.c:142 client/gui-sdl/mapview.c:786
msgid "?city:Peaceful"
msgstr "?city:fredlig"
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Friendly"
msgstr "?city:vänlig"
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Mysterious"
msgstr "?city:mystisk"
-#: client/text.c:93
+#: client/text.c:143
msgid "?city:Friendly(team)"
msgstr "?city:vänlig(lag)"
-#: client/text.c:100
+#: client/text.c:151
#, c-format
msgid "Location: (%d, %d) [%d]"
msgstr "Plats: (%d, %d) [%d]"
-#: client/text.c:109
+#: client/text.c:153
+#, c-format
+msgid "Native coordinates: (%d, %d)"
+msgstr ""
+
+#: client/text.c:160
#, c-format
msgid "Terrain: %s"
msgstr "Landskap: %s"
-#: client/text.c:110
+#: client/text.c:161
#, c-format
msgid "Food/Prod/Trade: %s"
msgstr "Mat/Tillv/Handel: %s"
-#: client/text.c:113
+#: client/text.c:164
msgid "Minor Tribe Village"
msgstr "Mindre stamby"
-#: client/text.c:119
+#: client/text.c:173
msgid "Our territory"
msgstr "VÃ¥rt land"
-#. TRANS: "Polish territory"
-#: client/text.c:122
-#, c-format
-msgid "%s territory"
-msgstr "Det %s landet"
+#. TRANS: "Territory of <username> (<nation + team>)"
+#: client/text.c:176
+#, fuzzy, c-format
+msgid "Territory of %s (%s)"
+msgstr ""
+"\n"
+"De %s %ss land"
-#. TRANS: "Polish territory (5 turn cease-fire)"
-#: client/text.c:131
-#, c-format
-msgid "%s territory (%d turn cease-fire)"
-msgid_plural "%s territory (%d turn cease-fire)"
-msgstr[0] "(%s, %d omgång vapenstillestånd)"
-msgstr[1] "(%s, %d omgångar vapenstillestånd)"
+#: client/text.c:186
+#, fuzzy, c-format
+msgid "Territory of %s (%s) (%d turn cease-fire)"
+msgid_plural "Territory of %s (%s) (%d turn cease-fire)"
+msgstr[0] "Stad: %s (%s, %d omgång vapenstillestånd)"
+msgstr[1] "Stad: %s (%s, %d omgångar vapenstillestånd)"
-#. TRANS: "Polish territory (friendly)"
-#: client/text.c:140
-#, c-format
-msgid "%s territory (%s)"
-msgstr "Det %s landet (%s)"
+#. TRANS: "Territory of <username>
+#. * (<nation + team> | <diplomatic state>)"
+#: client/text.c:195
+#, fuzzy, c-format
+msgid "Territory of %s (%s | %s)"
+msgstr ""
+"\n"
+"De %s %ss land"
-#: client/text.c:145
+#: client/text.c:200
msgid "Unclaimed territory"
msgstr "Land utan anspråk"
-#. TRANS: "City: Warsaw (Polish)"
-#: client/text.c:156
-#, c-format
-msgid "City: %s (%s)"
-msgstr "Stad: %s (%s)"
+#. TRANS: "City: <city name> | <username> (<nation + team>)"
+#: client/text.c:214
+#, fuzzy, c-format
+msgid "City: %s | %s (%s)"
+msgstr "Stad: %s (%s, %s)"
-#. TRANS: "City: Warsaw (Polish, 5 turn cease-fire)"
-#: client/text.c:166
-#, c-format
-msgid "City: %s (%s, %d turn cease-fire)"
-msgid_plural "City: %s (%s, %d turn cease-fire)"
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <number> turn cease-fire)"
+#: client/text.c:224
+#, fuzzy, c-format
+msgid "City: %s | %s (%s, %d turn cease-fire)"
+msgid_plural "City: %s | %s (%s, %d turn cease-fire)"
msgstr[0] "Stad: %s (%s, %d omgång vapenstillestånd)"
msgstr[1] "Stad: %s (%s, %d omgångar vapenstillestånd)"
-#. TRANS: "City: Warsaw (Polish,friendly)"
-#: client/text.c:174
-#, c-format
-msgid "City: %s (%s, %s)"
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <diplomatic state>)"
+#: client/text.c:231
+#, fuzzy, c-format
+msgid "City: %s | %s (%s, %s)"
msgstr "Stad: %s (%s, %s)"
#. TRANS: previous lines gave other information about the city.
-#: client/text.c:189
+#: client/text.c:246
#, c-format
msgid "?clistbegin: with %s"
msgstr " med %s"
#. TRANS: "Trade from Warsaw: 5"
-#: client/text.c:202
+#: client/text.c:259
#, c-format
msgid "Trade from %s: %d"
msgstr "Handel från %s: %d"
-#: client/text.c:210
+#: client/text.c:267
#, c-format
msgid "Infrastructure: %s"
msgstr "Infrastruktur: %s"
# SB>Detta verkar syfta till vad arbetare m m sysslar med på en terrängruta, och då är väl Uppgift bättre än Verksamhet?
-#: client/text.c:215
+#: client/text.c:272
#, c-format
msgid "Activity: %s"
msgstr "Uppgift: %s"
-#. TRANS: "Unit: Musketeers (Polish, Warsaw)"
-#. TRANS: "Unit: Musketeers (Polish,friendly)"
-#: client/text.c:226 client/text.c:253
-#, c-format
-msgid "Unit: %s (%s, %s)"
+#. TRANS: "Unit: <unit type> | <username>
+#. * (<nation + team>, <homecity>)"
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <diplomatic state>)"
+#: client/text.c:287 client/text.c:313
+#, fuzzy, c-format
+msgid "Unit: %s | %s (%s, %s)"
msgstr "Trupp: %s (%s, %s)"
-#. TRANS: "Unit: Musketeers (Polish)"
-#: client/text.c:232
-#, c-format
-msgid "Unit: %s (%s)"
-msgstr "Trupp: %s (%s)"
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>)"
+#: client/text.c:292
+#, fuzzy, c-format
+msgid "Unit: %s | %s (%s)"
+msgstr "Trupp: %s (%s, %s)"
-#. TRANS: "Unit: Musketeers (Polish, 5 turn cease-fire)"
-#: client/text.c:245
-#, c-format
-msgid "Unit: %s (%s, %d turn cease-fire)"
-msgid_plural "Unit: %s (%s, %d turn cease-fire)"
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <number> turn cease-fire)"
+#: client/text.c:305
+#, fuzzy, c-format
+msgid "Unit: %s | %s (%s, %d turn cease-fire)"
+msgid_plural "Unit: %s | %s (%s, %d turn cease-fire)"
msgstr[0] "Trupp: %s (%s, %d omgång vapenstillestånd)"
msgstr[1] "Trupp: %s (%s, %d omgångar vapenstillestånd)"
#. TRANS: "Chance to win: A:95% D:46%"
-#: client/text.c:279
+#: client/text.c:338
#, c-format
msgid "Chance to win: A:%d%% D:%d%%"
msgstr "Sannolikhet att segra: A:%d%% F:%d%%"
#. TRANS: A is attack power, D is defense power, FP is firepower,
#. * HP is hitpoints (current and max).
-#: client/text.c:286
+#: client/text.c:345
#, c-format
msgid "A:%d D:%d FP:%d HP:%d/%d (%s)"
msgstr "A:%d F:%d EK:%d TP:%d/%d (%s)"
# SB>Låt oss utnyttja att svenskan skiljer på mer och fler!
#. TRANS: "5 more" units on this tile
-#: client/text.c:295
+#: client/text.c:354
#, c-format
msgid " (%d more)"
msgstr " (%d fler)"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:364
+#: client/text.c:423
#, c-format
msgid "far from %s"
msgstr "långt från %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:367
+#: client/text.c:426
#, c-format
msgid "near %s"
msgstr "nära %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:370
+#: client/text.c:429
#, c-format
msgid "in %s"
msgstr "i %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:403
+#: client/text.c:462
#, c-format
msgid "from %s"
msgstr "från %s"
-#: client/text.c:466
+#: client/text.c:525
msgid "Progress: no research"
msgstr "Framsteg: ingen forskning"
-#: client/text.c:470
+#: client/text.c:529
msgid "Progress: no research target"
msgstr "Framsteg: inget forskningsmål"
-#: client/text.c:475
+#: client/text.c:534
#, c-format
msgid "Progress: %d turn/advance"
msgid_plural "Progress: %d turns/advance"
msgstr[0] "Framsteg: %d runda/framsteg"
msgstr[1] "Framsteg: %d rundor/framsteg"
-#: client/text.c:480
+#: client/text.c:539
#, c-format
msgid "%d bulb/turn"
msgid_plural "%d bulbs/turn"
msgstr[0] "%d glödlampa/omgång"
msgstr[1] "%d glödlampor/omgång"
-#: client/text.c:485
+#: client/text.c:544
#, c-format
msgid ", %d bulb/turn from team"
msgid_plural ", %d bulbs/turn from team"
msgstr[0] ", %d glödlampa/omgång från laget"
msgstr[1] ", %d glödlampor/omgång från laget"
-#: client/text.c:512
+#: client/text.c:571
#, c-format
msgid "%d/- (never)"
msgstr "%d/- (aldrig)"
-#: client/text.c:524
+#: client/text.c:583
#, c-format
msgid "%d/%d (%d turn)"
msgid_plural "%d/%d (%d turns)"
msgstr[0] "%d/%d (%d omgång)"
msgstr[1] "%d/%d (%d omgångar)"
-#: client/text.c:527
+#: client/text.c:586
#, c-format
msgid "%d/%d (never)"
msgstr "%d/%d (aldrig)"
-#: client/text.c:564
+#: client/text.c:623
#, c-format
msgid "%d step"
msgid_plural "%d steps"
msgstr[0] "%d steg"
msgstr[1] "%d steg"
-#: client/text.c:566
+#: client/text.c:625
#, c-format
msgid "%d bulb"
msgid_plural "%d bulbs"
msgstr[0] "%d glödlampa"
msgstr[1] "%d glödlampor"
-#: client/text.c:570 client/agents/cma_fec.c:269 client/agents/cma_fec.c:313
+#: 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
#, c-format
msgid "%d turn"
@@ -9771,93 +9849,93 @@ msgid_plural "%d turns"
msgstr[0] "%d omg"
msgstr[1] "%d omg"
-#: client/text.c:592
+#: client/text.c:651
#, c-format
msgid "Population: %s"
msgstr "Folkmängd: %s"
-#: client/text.c:595
+#: client/text.c:654
#, c-format
msgid "Year: %s (T%d)"
msgstr "Ã…r %s (O%d)"
-#: client/text.c:598
+#: client/text.c:657
#, c-format
msgid "Gold: %d (%+d)"
msgstr "Guld: %d (%+d)"
-#: client/text.c:600
+#: client/text.c:659
#, c-format
msgid "Tax: %d Lux: %d Sci: %d"
msgstr "Skt: %d Väl: %d For: %d"
# Blir detta rätt?
-#: client/text.c:607
+#: client/text.c:666
#, fuzzy
msgid "Moving: Nobody"
msgstr "Flyttar: %s"
# Blir detta rätt?
-#: client/text.c:609
+#: client/text.c:668
#, c-format
msgid "Moving: %s"
msgstr "Flyttar: %s"
-#: client/text.c:613
+#: client/text.c:672
msgid "(Click for more info)"
msgstr "(Klicka här för detaljer)"
# DM> Tyckte det ser bättre ut så här
-#: client/text.c:629
+#: client/text.c:688
#, c-format
msgid "%s People"
msgstr "Folkmängd: %s"
# DM> Här också..
-#: client/text.c:633
+#: client/text.c:692
#, c-format
msgid "Turn: %d"
msgstr "Omgång %d"
-#: client/text.c:635 client/gui-win32/inteldlg.c:111
+#: client/text.c:694 client/gui-win32/inteldlg.c:111
#: client/gui-xaw/inteldlg.c:208
#, c-format
msgid "Gold: %d"
msgstr "Guld: %d"
-#: client/text.c:636
+#: client/text.c:695
#, c-format
msgid "Net Income: %d"
msgstr "Nettoinkomst: %d"
#. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:639
+#: client/text.c:698
#, c-format
msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
msgstr "Skattesatser: Guld:%d%% Välfärd:%d%% Forskning:%d%%"
-#: client/text.c:643
+#: client/text.c:702
#, c-format
msgid "Researching %s: %s"
msgstr "Forskar fram %s: %s"
-#: client/text.c:650
+#: client/text.c:709
#, c-format
msgid "Global warming chance: %d%% (%+d%%/turn)"
msgstr "Risk för global uppvärmning: %d%% (%+d%%/omg)"
-#: client/text.c:653
+#: client/text.c:712
#, c-format
msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
msgstr "Risk för atomvinter: %d%% (%+d%%/omg)"
-#: client/text.c:658 client/gui-win32/inteldlg.c:104
+#: client/text.c:717 client/gui-win32/inteldlg.c:104
#: client/gui-xaw/inteldlg.c:200
#, c-format
msgid "Government: %s"
msgstr "Statsskick: %s"
-#: client/text.c:682
+#: client/text.c:741
#, c-format
msgid "%d unit"
msgid_plural "%d units"
@@ -9865,55 +9943,55 @@ msgstr[0] "%d trupp"
msgstr[1] "%d trupper"
#. TRANS: Impossible to reach goto target tile
-#: client/text.c:715 client/gui-sdl/mapview.c:566
+#: client/text.c:774 client/gui-sdl/mapview.c:566
msgid "?goto:Unreachable"
msgstr "Otillgänglig"
-#: client/text.c:717 client/gui-sdl/mapview.c:568
+#: client/text.c:776 client/gui-sdl/mapview.c:568
#, c-format
msgid "Turns to target: %d"
msgstr "Omgångar till målet: %d"
-#: client/text.c:719 client/gui-sdl/mapview.c:570
+#: client/text.c:778 client/gui-sdl/mapview.c:570
#, c-format
msgid "Turns to target: %d to %d"
msgstr "Omgångar till målet: %d to %d"
-#: client/text.c:725 client/gui-sdl/mapview.c:576
+#: client/text.c:784 client/gui-sdl/mapview.c:576
#, c-format
msgid "%d unit selected"
msgid_plural "%d units selected"
msgstr[0] "%d trupp markerad"
msgstr[1] "%d trupper markerade"
-#: client/text.c:730 client/gui-sdl/mapview.c:581
+#: client/text.c:789 client/gui-sdl/mapview.c:581
msgid "No units selected."
msgstr "Inga trupper valda."
-#: client/text.c:804 client/gui-sdl/mapview.c:654
+#: client/text.c:863 client/gui-sdl/mapview.c:654
#, c-format
msgid "Others: %d civil; %d military"
msgstr "Övriga: %d civila; %d militära"
-#: client/text.c:806 client/gui-sdl/mapview.c:656
+#: client/text.c:865 client/gui-sdl/mapview.c:656
#, c-format
msgid "Others: %d civilian"
msgstr "Övriga: %d civila"
-#: client/text.c:808 client/gui-sdl/mapview.c:658
+#: client/text.c:867 client/gui-sdl/mapview.c:658
#, c-format
msgid "Others: %d military"
msgstr "Övriga: %d militära"
-#: client/text.c:839
+#: client/text.c:898
msgid "No units to upgrade!"
msgstr "Inga trupper att uppgradera!"
-#: client/text.c:864
+#: client/text.c:923
msgid "None of these units may be upgraded."
msgstr "Inga av dessa trupper kan uppgraderas."
-#: client/text.c:870
+#: client/text.c:929
#, c-format
msgid ""
"Upgrade %d unit for %d gold?\n"
@@ -9928,72 +10006,72 @@ msgstr[1] ""
"Uppgradera %d trupper för %d guld?\n"
"Skattkammaren innehåller %d guld."
-#: client/text.c:891
+#: client/text.c:950
msgid "Shows your progress in researching the current technology."
msgstr "Visar hur långt utforskandet av nuvarande teknologi har kommit."
-#: client/text.c:897
+#: client/text.c:956
msgid "no research target."
msgstr "inget forskningsmål."
#. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:900
+#: client/text.c:959
#, c-format
msgid "%s: %d/%d."
msgstr "%s: %d/%d."
-#: client/text.c:920
+#: client/text.c:979
msgid "Shows the progress of global warming:"
msgstr "Visar hur långt framskriden den globala uppvärmningen är:"
-#: client/text.c:921
+#: client/text.c:980
#, c-format
msgid "Pollution rate: %d%%"
msgstr "Utsläpp: %d%%"
-#: client/text.c:923
+#: client/text.c:982
#, c-format
msgid "Chance of catastrophic warming each turn: %d%%"
msgstr "Risken för katastrofal uppvärmning varje omgång: %d%%"
-#: client/text.c:939
+#: client/text.c:998
msgid "Shows the progress of nuclear winter:"
msgstr "Visar hur långt framskriden atomvintern är:"
-#: client/text.c:940
+#: client/text.c:999
#, c-format
msgid "Fallout rate: %d%%"
msgstr "Nedfall: %d%%"
-#: client/text.c:942
+#: client/text.c:1001
#, c-format
msgid "Chance of catastrophic winter each turn: %d%%"
msgstr "Risken för katastrofal nedkylning varje omgång: %d%%"
-#: client/text.c:957
+#: client/text.c:1016
msgid "Shows your current government:"
msgstr "Visar vårt nuvarande statsskick:"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:981
+#: client/text.c:1040
#, c-format
msgid "Population: %5d"
msgstr "Folkmängd: %5d"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:1043
#, c-format
msgid "Support: %5d %%"
msgstr "Underhåll: %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:1047
#, c-format
msgid "Energy: %5d %%"
msgstr "Energi: %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:992
+#: client/text.c:1051
#, c-format
msgid "Mass: %5d ton"
msgid_plural "Mass: %5d tons"
@@ -10001,97 +10079,98 @@ msgstr[0] "Massa: %5d ton"
msgstr[1] "Massa: %5d ton"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1057
#, c-format
msgid "Travel time: %5.1f years"
msgstr "Restid: %5.1f år"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1061
msgid "Travel time: N/A "
msgstr "Restid: E/A "
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1065
#, c-format
msgid "Success prob.: %5d %%"
msgstr "Sannolikh.lyck.: %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1010
+#: client/text.c:1069
#, c-format
msgid "Year of arrival: %8s"
msgstr "Ankomstår: %8s"
-#: client/text.c:1030
+#: client/text.c:1089
msgid "?timeout:off"
msgstr "av"
-#: client/text.c:1054
+#: client/text.c:1113
#, c-format
msgid "?seconds:%02ds"
msgstr "%02ds"
-#: client/text.c:1056
+#: client/text.c:1115
#, c-format
msgid "?mins/secs:%02dm %02ds"
msgstr "%02dm %02ds"
-#: client/text.c:1058
+#: client/text.c:1117
#, c-format
msgid "?hrs/mns:%02dh %02dm"
msgstr "%02dtim %02d'"
-#: client/text.c:1060
+#: client/text.c:1119
#, c-format
msgid "?dys/hrs:%02dd %02dh"
msgstr "%02dd %02dtim"
# DM> FIXME
-#: client/text.c:1063
+#: client/text.c:1122
msgid "?duration:overflow"
msgstr "överflöde"
-#: client/text.c:1084
+#: client/text.c:1143
#, c-format
msgid "%6d.%02d ms"
msgstr "%6d.%02d ms"
-#. TRANS: "Republic of the Poles"
-#: client/text.c:1127
-#, c-format
-msgid "%s of the %s"
-msgstr "%ss %s"
+#. TRANS: <nation adjective> <government name>.
+#. * E.g. "Polish Republic".
+#: client/text.c:1188
+#, fuzzy, c-format
+msgid "?nationgovernment:%s %s"
+msgstr "Statsskick: %s"
#. TRANS: "Observer: 1985"
-#: client/text.c:1137
+#: client/text.c:1198
#, c-format
msgid "Observer: %s"
msgstr "Iakttagare: %s"
-#: client/text.c:1155
+#: client/text.c:1216
msgid "Buildings: "
msgstr "Byggnader: "
-#: client/text.c:1172 client/text.c:1211
+#: client/text.c:1233 client/text.c:1272
msgid "None. "
msgstr "Inga. "
-#: client/text.c:1174 client/text.c:1213
+#: client/text.c:1235 client/text.c:1274
msgid "?clistend:."
msgstr "."
-#: client/text.c:1192
+#: client/text.c:1253
msgid "Wonders: "
msgstr "Underverk: "
-#: client/text.c:1247
+#: client/text.c:1308
#, 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:1251
+#: client/text.c:1312
#, c-format
msgid "%d content before penalty."
msgid_plural "%d content before penalty."
@@ -10099,45 +10178,43 @@ 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:1257
+#: client/text.c:1318
#, 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."
-#. TRANS: Martial law opening parenthesis
-#: client/text.c:1279
-msgid "Martial law in effect ("
+#: client/text.c:1339
+#, fuzzy
+msgid "Unlimited martial law in effect."
msgstr "Undantagstillstånd råder ("
-#. TRANS: no [unit] maximum
-#: client/text.c:1284
-msgid "no maximum, "
-msgstr "inget högsta värde, "
-
-#: client/text.c:1287
-#, c-format
-msgid "%d unit maximum, "
-msgid_plural "%d units maximum, "
-msgstr[0] "högst %d trupp"
-msgstr[1] "högst %d trupper"
+#: client/text.c:1341
+#, fuzzy, c-format
+msgid "%d military unit may impose martial law."
+msgid_plural "Up to %d military units may impose martial law."
+msgstr[0] ""
+"* Icke-stridande enhet (kan inte anfalla; inget undantagstillstånd).\n"
+msgstr[1] ""
+"* Icke-stridande enhet (kan inte anfalla; inget undantagstillstånd).\n"
-#. TRANS: Martial law closing parenthesis
-#: client/text.c:1294
-#, c-format
-msgid "%d per unit). "
-msgstr "%d per trupp). "
+#: client/text.c:1345
+#, 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:1298
+#: client/text.c:1352
msgid "Military units in the field may cause unhappiness. "
msgstr "Stridande enheter i fält kan orsaka missnöje. "
-#: client/text.c:1301
+#: client/text.c:1355
msgid "Military units have no happiness effect. "
msgstr "Stridande enheter påverkar inte belåtenhet."
-#: client/text.c:1316
+#: client/text.c:1370
#, c-format
msgid "Luxury: %d total."
msgstr "Välfärd: %d sammanlagt."
@@ -10161,7 +10238,7 @@ msgstr ""
"Klienten klarar inte av att visa rätvinkliga rutbilder. Använder "
"standardrutbilder i stället."
-#: client/tilespec.c:3968
+#: client/tilespec.c:3966
#, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
@@ -10187,12 +10264,12 @@ msgstr ""
"Stadsförvaltaren är osäker på att han skött sitt uppdrag i %s och ber att vi "
"tar oss en titt."
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
-#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:599
+#: client/gui-gtk-2.0/cityrep.c:624 client/gui-sdl/citydlg.c:2009
msgid "none"
msgstr "ingen"
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:645
msgid "custom"
msgstr "valfritt"
@@ -10500,7 +10577,7 @@ msgstr "Inrä_tta handelsled"
msgid "Enter Marketplace"
msgstr "Beträd marknadsplats"
-#: client/gui-gtk-2.0/chatline.c:144 client/gui-win32/chatline.c:134
+#: client/gui-gtk-2.0/chatline.c:218 client/gui-win32/chatline.c:134
#: client/gui-xaw/chatline.c:120
msgid "Cleared output window."
msgstr "Rensade utdatafönstret."
@@ -10583,11 +10660,11 @@ msgid "%d/%d %d turns"
msgstr "%d/%d %d omgångar"
#: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:821
+#: client/gui-gtk-2.0/cityrep.c:1027
msgid "_Buy"
msgstr "_Köp"
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:869
msgid "_Production"
msgstr "T_illverkning"
@@ -10608,12 +10685,12 @@ msgid "Entertainers"
msgstr "Trubadurer"
#: client/gui-gtk-2.0/citydlg.c:1029 client/gui-win32/citydlg.c:1989
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2403
msgid "Scientists"
msgstr "Vetenskapsmän"
#: client/gui-gtk-2.0/citydlg.c:1030 client/gui-win32/citydlg.c:1991
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2404
msgid "Taxmen"
msgstr "Skattmasar"
@@ -10707,7 +10784,7 @@ msgstr "Understödda trupper %d"
msgid "Present units %d"
msgstr "Närvarande trupper %d"
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:1019
msgid "Cen_ter"
msgstr "Cen_trera"
@@ -10796,31 +10873,61 @@ msgstr "Byt namn på staden"
msgid "What should we rename the city to?"
msgstr "Vad ska vi kalla staden?"
-#: client/gui-gtk-2.0/cityrep.c:699
+#: client/gui-gtk-2.0/cityrep.c:794
+#, fuzzy
+msgid "(no worklists defined)"
+msgstr "(arbetslista)"
+
+#: client/gui-gtk-2.0/cityrep.c:876
msgid "Chan_ge"
msgstr "_Ändra"
-#: client/gui-gtk-2.0/cityrep.c:703
+#: client/gui-gtk-2.0/cityrep.c:880
msgid "Add _First"
msgstr "Lägg till _först"
-#: client/gui-gtk-2.0/cityrep.c:707
+#: client/gui-gtk-2.0/cityrep.c:884
msgid "Add _Next"
msgstr "Lägg till som _nästa"
-#: client/gui-gtk-2.0/cityrep.c:711
+#: client/gui-gtk-2.0/cityrep.c:888
+#, fuzzy
+msgid "Add _2nd Last"
+msgstr "_Lägg till sist"
+
+#: client/gui-gtk-2.0/cityrep.c:892
msgid "Add _Last"
msgstr "_Lägg till sist"
-#: client/gui-gtk-2.0/cityrep.c:715
+#: client/gui-gtk-2.0/cityrep.c:899
+#, fuzzy
+msgid "Set Worklist"
+msgstr "Arbetslista"
+
+#: client/gui-gtk-2.0/cityrep.c:905
+#, fuzzy
+msgid "Append Worklist"
+msgstr "Byt namn på arbetslista"
+
+#: client/gui-gtk-2.0/cityrep.c:911
+#, fuzzy
+msgid "Clear _Worklist"
+msgstr "Arbets_lista:"
+
+#: client/gui-gtk-2.0/cityrep.c:916
+#, fuzzy
+msgid "Gover_nor"
+msgstr "guvernör"
+
+#: client/gui-gtk-2.0/cityrep.c:921
msgid "_Select"
msgstr "_Välj"
-#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
+#: client/gui-gtk-2.0/cityrep.c:925 client/gui-gtk-2.0/plrdlg.c:521
msgid "_Display"
msgstr "Vi_sa"
-#: client/gui-gtk-2.0/cityrep.c:800 client/gui-gtk-2.0/menu.c:808
+#: 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-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
#: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -10830,100 +10937,100 @@ msgstr "Vi_sa"
msgid "Cities"
msgstr "Städer"
-#: client/gui-gtk-2.0/cityrep.c:817
+#: client/gui-gtk-2.0/cityrep.c:1023
msgid "_Inspect"
msgstr "_Inspektera"
-#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
-#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-sdl/helpdlg.c:297 client/gui-win32/menu.c:342
-#: client/gui-xaw/menu.c:241
+#: 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
+#: client/gui-gtk-2.0/cityrep.c:1518 client/gui-gtk-2.0/menu.c:823
+#: client/gui-gtk-2.0/menu.c:825 client/gui-gtk-2.0/menu.c:827
+#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:831
+#: client/gui-gtk-2.0/menu.c:833 client/gui-sdl/helpdlg.c:297
+#: client/gui-win32/menu.c:342 client/gui-xaw/menu.c:241
msgid "Improvements"
msgstr "Förbättringar"
-#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
-#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
-#: client/gui-xaw/menu.c:247
+#: client/gui-gtk-2.0/cityrep.c:1441 client/gui-gtk-2.0/cityrep.c:1460
+#: client/gui-gtk-2.0/cityrep.c:1479 client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1522 client/gui-xaw/menu.c:247
msgid "Wonders"
msgstr "Underverk"
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1662 client/gui-win32/cityrep.c:439
#: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
msgid "All Cities"
msgstr "Alla städer"
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1667 client/gui-win32/cityrep.c:440
msgid "No Cities"
msgstr "Inga städer"
-#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1672 client/gui-win32/cityrep.c:441
msgid "Invert Selection"
msgstr "Invertera val"
-#: client/gui-gtk-2.0/cityrep.c:1420
+#: client/gui-gtk-2.0/cityrep.c:1682
msgid "Building Units"
msgstr "Bygger trupper"
-#: client/gui-gtk-2.0/cityrep.c:1426
+#: client/gui-gtk-2.0/cityrep.c:1688
msgid "Building Improvements"
msgstr "Bygger stadsförbättringar"
-#: client/gui-gtk-2.0/cityrep.c:1432
+#: client/gui-gtk-2.0/cityrep.c:1694
msgid "Building Wonders"
msgstr "Bygger underverk"
-#: client/gui-gtk-2.0/cityrep.c:1444
+#: client/gui-gtk-2.0/cityrep.c:1706
msgid "Building Unit"
msgstr "Bygger trupp"
-#: client/gui-gtk-2.0/cityrep.c:1448
+#: client/gui-gtk-2.0/cityrep.c:1710
msgid "Building Improvement"
msgstr "Bygger stadsförbättring"
-#: client/gui-gtk-2.0/cityrep.c:1452
+#: client/gui-gtk-2.0/cityrep.c:1714
msgid "Building Wonder"
msgstr "Bygger underverk"
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1722 client/gui-win32/cityrep.c:443
msgid "Coastal Cities"
msgstr "Kuststäder"
-#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1727 client/gui-win32/cityrep.c:444
msgid "Same Island"
msgstr "Samma ö"
-#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1737 client/gui-win32/cityrep.c:447
msgid "Supported Units"
msgstr "Understödda trupper"
-#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1740 client/gui-win32/cityrep.c:454
msgid "Units Present"
msgstr "Närvarande trupper"
-#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1744 client/gui-win32/cityrep.c:469
msgid "Improvements in City"
msgstr "Förbättringar i stad"
-#: client/gui-gtk-2.0/cityrep.c:1486
+#: client/gui-gtk-2.0/cityrep.c:1748
msgid "Wonders in City"
msgstr "Underverk i stad"
-#: client/gui-gtk-2.0/cityrep.c:1495
+#: client/gui-gtk-2.0/cityrep.c:1757
msgid "Available Units"
msgstr "Tillgängliga trupper"
-#: client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1760
msgid "Available Improvements"
msgstr "Tillgängliga stadsförbättringar"
-#: client/gui-gtk-2.0/cityrep.c:1501
+#: client/gui-gtk-2.0/cityrep.c:1763
msgid "Available Wonders"
msgstr "Tillgängliga underverk"
-#: client/gui-gtk-2.0/cityrep.c:1625
+#: client/gui-gtk-2.0/cityrep.c:1882
#, fuzzy, c-format
msgid "Total Buy Cost: %d"
msgstr "Sammanlagd kostnad: "
@@ -10993,11 +11100,11 @@ 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:186
+#: client/gui-gtk-2.0/dialogs.c:196 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:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
msgid "Inspect _City"
msgstr "Inspektera _stad"
@@ -11025,10 +11132,10 @@ msgstr "Välj något att plundra:"
msgid "Unit"
msgstr "Trupp"
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
-#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
-#: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
-#: manual/civmanual.c:302 data/Freeciv.in:80
+#: 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-win32/plrdlg.c:335 manual/civmanual.c:302 data/Freeciv.in:80
msgid "Name"
msgstr "Namn"
@@ -11053,7 +11160,7 @@ 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:1036 data/Freeciv.in:3371
+#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
msgid "Pick Nation"
msgstr "Välj folkslag"
@@ -11132,7 +11239,7 @@ msgstr "_Kartor"
msgid "_Advances"
msgstr "Fr_amsteg"
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:910
+#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr "Städe_r"
@@ -11237,19 +11344,19 @@ msgstr "Välj mål"
msgid "Show _All Cities"
msgstr "_Alla städer"
-#: client/gui-gtk-2.0/gui_main.c:150
+#: client/gui-gtk-2.0/gui_main.c:162
msgid "Show Map Scrollbars"
msgstr "Visa rullningslister för karta"
-#: client/gui-gtk-2.0/gui_main.c:151
+#: client/gui-gtk-2.0/gui_main.c:163
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:155
+#: client/gui-gtk-2.0/gui_main.c:167
msgid "Keyboardless goto"
msgstr "Tangentbordslöst gå-till"
-#: client/gui-gtk-2.0/gui_main.c:156
+#: client/gui-gtk-2.0/gui_main.c:168
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."
@@ -11257,11 +11364,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:161
+#: client/gui-gtk-2.0/gui_main.c:173
msgid "Keep dialogs on top"
msgstr "Behåll dialoger överst"
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:174
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."
@@ -11269,11 +11376,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:166
+#: client/gui-gtk-2.0/gui_main.c:178
msgid "Show worklist task icons"
msgstr "Visa arbetslistsikoner"
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:179
msgid ""
"Disabling this will turn off the unit and building icons in the worklist "
"dialog and the production tab of the city dialog."
@@ -11281,11 +11388,11 @@ msgstr ""
"Genom att avaktivera detta göms trupp- och byggnadsikoner i arbetslistor och "
"stadsdialoger."
-#: client/gui-gtk-2.0/gui_main.c:171
+#: client/gui-gtk-2.0/gui_main.c:183
msgid "Enable status report tabs"
msgstr "Aktivera statusrapportsflikar"
-#: client/gui-gtk-2.0/gui_main.c:172
+#: client/gui-gtk-2.0/gui_main.c:184
msgid ""
"If this option is enabled then report dialogs will be shown as separate tabs "
"rather than in popup dialogs."
@@ -11293,11 +11400,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:177 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:189 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:178 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:190 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."
@@ -11305,7 +11412,75 @@ 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:277 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:195
+msgid "Show time for each chat message"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:196
+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
+msgid "Split bottom notebook area"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:202
+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
+msgid "New message events go to top of list"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:208
+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
+msgid "Show extra message window buttons"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:214
+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 "
+"is disabled, these buttons will not appear (you can still double-click with "
+"the left mouse button or right-click on a row to inspect or goto "
+"respectively). This option will only take effect once the message window is "
+"closed and reopened."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:224
+msgid "Metaserver tab first in network page"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:225
+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
+msgid "Plain chat messages are sent to allies only"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:231
+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 "
+"messages will be sent as public chat messages. To send a public chat message "
+"with this option enabled, prefix the message with a single colon ':'. This "
+"option can also be set using a toggle button beside the chat entry (only "
+"visible in multiplayer games)."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:340 client/gui-xaw/gui_main.c:245
msgid ""
"This client has no special command line options\n"
"\n"
@@ -11313,44 +11488,45 @@ msgstr ""
"Denna klient har inga speciella kommandoradstillval.\n"
"\n"
-#: client/gui-gtk-2.0/gui_main.c:723 client/gui-gtk-2.0/gui_main.c:1345
+#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
msgid "Freeciv"
msgstr "Freeciv"
-#: client/gui-gtk-2.0/gui_main.c:1088 client/gui-gtk-2.0/gui_main.c:1095
+#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
#: 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:1095 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1232 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:1127 client/gui-gtk-2.0/menu.c:770
-#: client/gui-gtk-2.0/menu.c:772 client/gui-gtk-2.0/menu.c:774
-#: client/gui-gtk-2.0/menu.c:776 client/gui-gtk-2.0/menu.c:778
-#: client/gui-gtk-2.0/menu.c:780 client/gui-gtk-2.0/menu.c:782
-#: client/gui-gtk-2.0/menu.c:784 client/gui-gtk-2.0/menu.c:786
-#: client/gui-gtk-2.0/menu.c:788 client/gui-gtk-2.0/menu.c:790
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-gtk-2.0/menu.c:804 client/gui-gtk-2.0/menu.c:806
-#: client/gui-gtk-2.0/menu.c:808 client/gui-gtk-2.0/menu.c:810
-#: client/gui-gtk-2.0/menu.c:812 client/gui-gtk-2.0/menu.c:814
-#: client/gui-gtk-2.0/menu.c:816 client/gui-gtk-2.0/menu.c:818
-#: client/gui-gtk-2.0/menu.c:820 client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/gui_main.c:1266 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
+#: client/gui-gtk-2.0/menu.c:811 client/gui-gtk-2.0/menu.c:813
+#: client/gui-gtk-2.0/menu.c:815 client/gui-gtk-2.0/menu.c:817
+#: client/gui-gtk-2.0/menu.c:819 client/gui-gtk-2.0/menu.c:821
+#: client/gui-gtk-2.0/menu.c:823 client/gui-gtk-2.0/menu.c:825
+#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
+#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
+#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
+#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
+#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
+#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
#: data/Freeciv.in:2028
msgid "View"
msgstr "Visa"
-#: client/gui-gtk-2.0/gui_main.c:1208
+#: client/gui-gtk-2.0/gui_main.c:1359
msgid "Chat"
msgstr "Kommunikation"
-#: client/gui-gtk-2.0/gui_main.c:1224 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1377 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"
@@ -11361,70 +11537,74 @@ 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:1491
+#: client/gui-gtk-2.0/gui_main.c:1392
+msgid "Allies Only"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:1657
msgid "Not _ready"
msgstr "Inte _redo"
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
+#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
msgid "_Ready"
msgstr "_Redo"
-#: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2132
+#: 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
msgid "_Start"
msgstr "_Sätt igång"
-#: client/gui-gtk-2.0/gui_main.c:1520
+#: client/gui-gtk-2.0/gui_main.c:1686
#, fuzzy
msgid "_Take Player"
msgstr "Ta spelaren"
-#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
+#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
msgid "Pick _Nation"
msgstr "Välj ditt _folk"
-#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
+#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
msgid "_Observe"
msgstr "_Iakttag"
-#: client/gui-gtk-2.0/gui_main.c:1532
+#: client/gui-gtk-2.0/gui_main.c:1698
msgid "Do not _observe"
msgstr "_Iakttag ej"
-#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
msgid "<AI>"
msgstr "<Datorstyrd>"
-#: client/gui-gtk-2.0/gui_main.c:1557
+#: client/gui-gtk-2.0/gui_main.c:1723
msgid "<Novice AI>"
msgstr "<nybörjar-dator>"
-#: client/gui-gtk-2.0/gui_main.c:1560
+#: client/gui-gtk-2.0/gui_main.c:1726
msgid "<Easy AI>"
msgstr "<lätt dator>"
-#: client/gui-gtk-2.0/gui_main.c:1563
+#: client/gui-gtk-2.0/gui_main.c:1729
msgid "<Normal AI>"
msgstr "<normal dator>"
-#: client/gui-gtk-2.0/gui_main.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1732
msgid "<Hard AI>"
msgstr "<svår dator>"
-#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1742 client/gui-win32/dialogs.c:594
#: client/gui-xaw/pages.c:217
msgid "Random"
msgstr "Slumpvald"
-#: client/gui-gtk-2.0/gui_main.c:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
msgid "Observer"
msgstr "Iakttagare"
-#: client/gui-gtk-2.0/gui_main.c:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
msgid "Detached"
msgstr "Frånkopplad"
-#: client/gui-gtk-2.0/gui_main.c:1899
+#: client/gui-gtk-2.0/gui_main.c:2073
msgid "Are you sure you want to quit?"
msgstr "Vill du verkligen avsluta?"
@@ -11656,470 +11836,507 @@ msgstr "_Teknologi"
msgid "Foreign Intelligence: %s Empire"
msgstr "Underrättelser - %s"
-#: client/gui-gtk-2.0/mapctrl.c:195 client/gui-sdl/mapctrl.c:2565
+#: client/gui-gtk-2.0/mapctrl.c:179 client/gui-sdl/mapctrl.c:2565
#: client/gui-sdl/menu.c:839 client/gui-sdl/menu.c:1021
#: client/gui-win32/mapctrl.c:353
msgid "Build New City"
msgstr "Grunda stad"
-#: client/gui-gtk-2.0/mapctrl.c:196 client/gui-sdl/mapctrl.c:2594
+#: client/gui-gtk-2.0/mapctrl.c:180 client/gui-sdl/mapctrl.c:2594
#: client/gui-win32/mapctrl.c:354 client/gui-xaw/mapctrl.c:89
msgid "What should we call our new city?"
msgstr "Vad ska vi kalla vår nya stad?"
-#: client/gui-gtk-2.0/mapview.c:147
+#: client/gui-gtk-2.0/mapview.c:158
msgid "Shows your current luxury/science/tax rates;click to toggle them."
msgstr ""
"Visar de nuvarande välfärds-/forsknings-/skattesatserna. Klicka för att "
"växla mellan dem."
-#: client/gui-gtk-2.0/mapview.c:692 client/gui-win32/canvas.c:275
+#: client/gui-gtk-2.0/mapview.c:702 client/gui-win32/canvas.c:275
msgid "Better fog will only work in truecolor. Disabling it"
msgstr "Bättre krigsdimma fungerar endast under truecolor. Avaktiverar den"
-#: client/gui-gtk-2.0/menu.c:250
+#: client/gui-gtk-2.0/menu.c:256
msgid "Leaving a local game will end it!"
msgstr "Att hoppa av ett lokalt spel innebär att det upphör!"
-#: client/gui-gtk-2.0/menu.c:700 client/gui-win32/menu.c:303
+#: client/gui-gtk-2.0/menu.c:727 client/gui-win32/menu.c:303
msgid "_Game"
msgstr "_Spel"
-#: client/gui-gtk-2.0/menu.c:702 client/gui-gtk-2.0/menu.c:704
-#: client/gui-gtk-2.0/menu.c:706 client/gui-gtk-2.0/menu.c:708
-#: client/gui-gtk-2.0/menu.c:710 client/gui-gtk-2.0/menu.c:712
-#: client/gui-gtk-2.0/menu.c:714 client/gui-gtk-2.0/menu.c:717
-#: client/gui-gtk-2.0/menu.c:720 client/gui-gtk-2.0/menu.c:722
-#: client/gui-gtk-2.0/menu.c:724 client/gui-gtk-2.0/menu.c:726
-#: client/gui-gtk-2.0/menu.c:728 client/gui-gtk-2.0/menu.c:730
-#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:736
-#: client/gui-gtk-2.0/menu.c:738 client/gui-gtk-2.0/menu.c:740
+#: client/gui-gtk-2.0/menu.c:729 client/gui-gtk-2.0/menu.c:731
+#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:735
+#: client/gui-gtk-2.0/menu.c:737 client/gui-gtk-2.0/menu.c:739
+#: client/gui-gtk-2.0/menu.c:741 client/gui-gtk-2.0/menu.c:744
+#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
+#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
+#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
+#: client/gui-gtk-2.0/menu.c:760 client/gui-gtk-2.0/menu.c:763
+#: client/gui-gtk-2.0/menu.c:765 client/gui-gtk-2.0/menu.c:767
#: data/Freeciv.in:2026
msgid "Game"
msgstr "Spel"
# DM> tidigare "_Tjatt" - Onödig försvenskning!
-#: client/gui-gtk-2.0/menu.c:704 client/gui-gtk-2.0/menu.c:706
-#: client/gui-gtk-2.0/menu.c:708
+#: client/gui-gtk-2.0/menu.c:731 client/gui-gtk-2.0/menu.c:733
+#: client/gui-gtk-2.0/menu.c:735
msgid "_Chat"
msgstr "_Kommunikation"
-#: client/gui-gtk-2.0/menu.c:706 client/gui-win32/menu.c:314
+#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:314
msgid "_Clear Log"
msgstr "_Rensa logg"
-#: client/gui-gtk-2.0/menu.c:708 client/gui-win32/menu.c:313
+#: client/gui-gtk-2.0/menu.c:735 client/gui-win32/menu.c:313
msgid "_Write Log"
msgstr "E_xportera logg"
-#: client/gui-gtk-2.0/menu.c:710 client/gui-win32/menu.c:304
+#: client/gui-gtk-2.0/menu.c:737 client/gui-win32/menu.c:304
msgid "Local _Options"
msgstr "L_okala tillval"
-#: client/gui-gtk-2.0/menu.c:712 client/gui-win32/menu.c:305
+#: client/gui-gtk-2.0/menu.c:739 client/gui-win32/menu.c:305
msgid "_Message Options"
msgstr "_Meddelandetillval"
-#: client/gui-gtk-2.0/menu.c:717
+#: client/gui-gtk-2.0/menu.c:744
msgid "_Reload Tileset"
msgstr "Ladda om _rutbildsuppsättning"
-#: client/gui-gtk-2.0/menu.c:720
+#: client/gui-gtk-2.0/menu.c:747
msgid "Save Options on _Exit"
msgstr "Spara val vid avsl_ut"
-#: client/gui-gtk-2.0/menu.c:722
+#: client/gui-gtk-2.0/menu.c:749
msgid "Sa_ve Options"
msgstr "Spara till_val"
-#: client/gui-gtk-2.0/menu.c:726 client/gui-win32/menu.c:308
+#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:308
msgid "Server O_ptions"
msgstr "_Servertillval"
-#: client/gui-gtk-2.0/menu.c:730 client/gui-win32/menu.c:310
+#: client/gui-gtk-2.0/menu.c:757 client/gui-win32/menu.c:310
msgid "_Save Game"
msgstr "_Spara spel"
-#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:311
+#: client/gui-gtk-2.0/menu.c:760 client/gui-win32/menu.c:311
msgid "Save Game _As..."
msgstr "Spara spel s_om..."
-#: client/gui-gtk-2.0/menu.c:738
+#: client/gui-gtk-2.0/menu.c:765
msgid "_Leave"
msgstr "_Hoppa av"
-#: client/gui-gtk-2.0/menu.c:740 client/gui-win32/menu.c:317
+#: client/gui-gtk-2.0/menu.c:767 client/gui-win32/menu.c:317
msgid "_Quit"
msgstr "_Avsluta"
-#: client/gui-gtk-2.0/menu.c:745 client/gui-win32/menu.c:321
+#: client/gui-gtk-2.0/menu.c:772 client/gui-win32/menu.c:321
msgid "Gov_ernment"
msgstr "R_egering"
-#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
-#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
-#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:774 client/gui-gtk-2.0/menu.c:776
+#: client/gui-gtk-2.0/menu.c:778 client/gui-gtk-2.0/menu.c:780
+#: client/gui-gtk-2.0/menu.c:782 client/gui-gtk-2.0/menu.c:784
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
#: client/gui-xaw/menu.c:248 data/Freeciv.in:2027 data/helpdata.txt:1320
msgid "Government"
msgstr "Statsskick"
-#: client/gui-gtk-2.0/menu.c:749 client/gui-win32/menu.c:322
+#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:322
msgid "_Tax Rates"
msgstr "Ska_ttesatser"
-#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:324
+#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:324
msgid "_Find City"
msgstr "_Finn stad"
-#: client/gui-gtk-2.0/menu.c:755 client/gui-win32/menu.c:325
+#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:325
msgid "_Worklists"
msgstr "Ar_betslistor"
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
-#: client/gui-gtk-2.0/menu.c:764 client/gui-win32/menu.c:327
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
+#: client/gui-gtk-2.0/menu.c:791 client/gui-win32/menu.c:327
msgid "_Change Government"
msgstr "_Byt statsskick"
-#: client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:788
msgid "_Revolution..."
msgstr "_Revolution..."
-#: client/gui-gtk-2.0/menu.c:764 client/gui-gtk-2.0/menu.c:970
+#: client/gui-gtk-2.0/menu.c:791 client/gui-gtk-2.0/menu.c:1013
#: client/gui-win32/menu.c:431
msgid "_Government"
msgstr "S_tatsskick"
-#: client/gui-gtk-2.0/menu.c:768 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:795 client/gui-gtk-2.0/menu.c:959
#: client/gui-win32/menu.c:334
msgid "_View"
msgstr "_Visa"
-#: client/gui-gtk-2.0/menu.c:772
+#: client/gui-gtk-2.0/menu.c:799
msgid "City Outlines"
msgstr "Stadsomfång"
-#: client/gui-gtk-2.0/menu.c:774 client/gui-win32/menu.c:335
+#: client/gui-gtk-2.0/menu.c:801 client/gui-win32/menu.c:335
msgid "Map _Grid"
msgstr "Kart_rutnät"
-#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:336
+#: client/gui-gtk-2.0/menu.c:803 client/gui-win32/menu.c:336
msgid "National _Borders"
msgstr "Nationsgr_änser"
-#: client/gui-gtk-2.0/menu.c:778 client/gui-win32/menu.c:337
+#: client/gui-gtk-2.0/menu.c:805 client/gui-win32/menu.c:337
msgid "City _Names"
msgstr "Stads_namn"
-#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:338
+#: client/gui-gtk-2.0/menu.c:807 client/gui-win32/menu.c:338
msgid "City G_rowth"
msgstr "Stadstillvä_xt"
-#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:339
+#: client/gui-gtk-2.0/menu.c:809 client/gui-win32/menu.c:339
msgid "City _Productions"
msgstr "Stads_tillverkning"
+#: client/gui-gtk-2.0/menu.c:811
+#, fuzzy
+msgid "City Buy Cost"
+msgstr "Sammanlagd kostnad: "
+
+#: client/gui-gtk-2.0/menu.c:813
+#, fuzzy
+msgid "City Traderoutes"
+msgstr "Handelsleder: "
+
# DM> FIXME
-#: client/gui-gtk-2.0/menu.c:784 client/gui-sdl/optiondlg.c:1719
+#: client/gui-gtk-2.0/menu.c:815 client/gui-sdl/optiondlg.c:1719
msgid "Draw city worker map grid"
msgstr "Visa stadsarbetares rutnät"
-#: client/gui-gtk-2.0/menu.c:788 client/gui-sdl/optiondlg.c:1635
+#: client/gui-gtk-2.0/menu.c:819 client/gui-sdl/optiondlg.c:1635
#: client/gui-win32/menu.c:340 client/gui-xaw/menu.c:148
#: client/gui-xaw/menu.c:246 manual/civmanual.c:220 data/helpdata.txt:1220
msgid "Terrain"
msgstr "Landskap"
-#: client/gui-gtk-2.0/menu.c:790 client/gui-win32/menu.c:341
+#: client/gui-gtk-2.0/menu.c:821 client/gui-win32/menu.c:341
#: client/gui-xaw/menu.c:149
msgid "Coastline"
msgstr "Kustlinje"
-#: client/gui-gtk-2.0/menu.c:796 client/gui-win32/menu.c:343
+#: client/gui-gtk-2.0/menu.c:827 client/gui-win32/menu.c:343
msgid "Roads & Rails"
msgstr "Vägar & järnvägar"
-#: client/gui-gtk-2.0/menu.c:800 client/gui-sdl/optiondlg.c:1933
+#: client/gui-gtk-2.0/menu.c:831 client/gui-sdl/optiondlg.c:1933
#: client/gui-win32/menu.c:345 client/gui-xaw/menu.c:152
msgid "Mines"
msgstr "Gruvor"
-#: client/gui-gtk-2.0/menu.c:802 client/gui-win32/menu.c:346
+#: client/gui-gtk-2.0/menu.c:833 client/gui-win32/menu.c:346
msgid "Fortress & Airbase"
msgstr "Fästning & flygbas"
-#: client/gui-gtk-2.0/menu.c:804 client/gui-win32/menu.c:348
+#: client/gui-gtk-2.0/menu.c:835 client/gui-win32/menu.c:348
#: client/gui-xaw/menu.c:154
msgid "Specials"
msgstr "Specialresurser"
-#: client/gui-gtk-2.0/menu.c:806 client/gui-win32/menu.c:349
+#: client/gui-gtk-2.0/menu.c:837 client/gui-win32/menu.c:349
#: client/gui-xaw/menu.c:155
msgid "Pollution & Fallout"
msgstr "Utsläpp & nedfall"
-#: client/gui-gtk-2.0/menu.c:812 client/gui-win32/menu.c:352
+#: client/gui-gtk-2.0/menu.c:843 client/gui-win32/menu.c:352
#: client/gui-xaw/menu.c:158
msgid "Focus Unit"
msgstr "Trupp i fokus"
-#: client/gui-gtk-2.0/menu.c:814 client/gui-sdl/optiondlg.c:1854
+#: client/gui-gtk-2.0/menu.c:845 client/gui-sdl/optiondlg.c:1854
#: client/gui-win32/menu.c:353 client/gui-xaw/menu.c:159
msgid "Fog of War"
msgstr "Krigsdimma"
-#: client/gui-gtk-2.0/menu.c:818
+#: client/gui-gtk-2.0/menu.c:849
msgid "_Full Screen"
msgstr "_Fullskärmsläge"
-#: client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/menu.c:853
msgid "_Center View"
msgstr "_Centrera vy"
-#: client/gui-gtk-2.0/menu.c:825 client/gui-win32/menu.c:358
+#: client/gui-gtk-2.0/menu.c:856 client/gui-win32/menu.c:358
msgid "_Orders"
msgstr "_Befallningar"
-#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
-#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
-#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
-#: client/gui-gtk-2.0/menu.c:855 client/gui-gtk-2.0/menu.c:857
-#: client/gui-gtk-2.0/menu.c:859 client/gui-gtk-2.0/menu.c:861
-#: client/gui-gtk-2.0/menu.c:863 client/gui-gtk-2.0/menu.c:865
-#: client/gui-gtk-2.0/menu.c:867 client/gui-gtk-2.0/menu.c:869
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875 client/gui-gtk-2.0/menu.c:877
-#: client/gui-gtk-2.0/menu.c:879 client/gui-gtk-2.0/menu.c:881
-#: client/gui-gtk-2.0/menu.c:883 client/gui-gtk-2.0/menu.c:885
-#: client/gui-gtk-2.0/menu.c:887 client/gui-gtk-2.0/menu.c:889
-#: client/gui-gtk-2.0/menu.c:891 client/gui-gtk-2.0/menu.c:893
-#: client/gui-gtk-2.0/menu.c:895 client/gui-gtk-2.0/menu.c:897
-#: client/gui-gtk-2.0/menu.c:899 client/gui-gtk-2.0/menu.c:901
-#: client/gui-gtk-2.0/menu.c:903 data/Freeciv.in:2029
+#: client/gui-gtk-2.0/menu.c:858 client/gui-gtk-2.0/menu.c:860
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:864
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:868
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:872
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:876
+#: client/gui-gtk-2.0/menu.c:878 client/gui-gtk-2.0/menu.c:880
+#: client/gui-gtk-2.0/menu.c:882 client/gui-gtk-2.0/menu.c:884
+#: client/gui-gtk-2.0/menu.c:886 client/gui-gtk-2.0/menu.c:888
+#: client/gui-gtk-2.0/menu.c:890 client/gui-gtk-2.0/menu.c:892
+#: client/gui-gtk-2.0/menu.c:894 client/gui-gtk-2.0/menu.c:896
+#: client/gui-gtk-2.0/menu.c:898 client/gui-gtk-2.0/menu.c:900
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906 client/gui-gtk-2.0/menu.c:908
+#: client/gui-gtk-2.0/menu.c:910 client/gui-gtk-2.0/menu.c:912
+#: client/gui-gtk-2.0/menu.c:914 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:918 client/gui-gtk-2.0/menu.c:920
+#: client/gui-gtk-2.0/menu.c:922 client/gui-gtk-2.0/menu.c:924
+#: client/gui-gtk-2.0/menu.c:926 client/gui-gtk-2.0/menu.c:928
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
+#: client/gui-gtk-2.0/menu.c:946 data/Freeciv.in:2029
msgid "Orders"
msgstr "Befallningar"
-#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:1444
+#: client/gui-gtk-2.0/menu.c:860 client/gui-gtk-2.0/menu.c:1489
#: client/gui-win32/menu.c:359
msgid "_Build City"
msgstr "_Bygg stad"
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:1466
-#: client/gui-gtk-2.0/menu.c:1472 client/gui-win32/menu.c:360
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:1511
+#: client/gui-gtk-2.0/menu.c:1517 client/gui-win32/menu.c:360
msgid "Build _Road"
msgstr "Bygg väg (_R)"
-#: client/gui-gtk-2.0/menu.c:833 client/gui-gtk-2.0/menu.c:1360
+#: 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 "Anlägg bevattn_ing"
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:1361
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:1406
#: client/gui-win32/menu.c:362
msgid "Build _Mine"
msgstr "Gräv gruva (_M)"
-#: client/gui-gtk-2.0/menu.c:837 client/gui-gtk-2.0/menu.c:1362
+#: client/gui-gtk-2.0/menu.c:868 client/gui-gtk-2.0/menu.c:1407
msgid "Transf_orm Terrain"
msgstr "_Omvandla landskap"
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:1508
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:1553
#: client/gui-win32/menu.c:364
msgid "Build _Fortress"
msgstr "Bygg _fästning"
-#: client/gui-gtk-2.0/menu.c:841 client/gui-win32/menu.c:365
+#: client/gui-gtk-2.0/menu.c:872 client/gui-win32/menu.c:365
msgid "Build Airbas_e"
msgstr "Bygg flygbas (_E)"
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:1514
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:1559
#: client/gui-win32/menu.c:366
msgid "Clean _Pollution"
msgstr "Rensa utslä_pp"
-#: client/gui-gtk-2.0/menu.c:845 client/gui-win32/menu.c:367
+#: client/gui-gtk-2.0/menu.c:876 client/gui-win32/menu.c:367
msgid "Clean _Nuclear Fallout"
msgstr "Rensa radioaktivt _nedfall"
-#: client/gui-gtk-2.0/menu.c:849 client/gui-win32/menu.c:369
+#: client/gui-gtk-2.0/menu.c:880 client/gui-win32/menu.c:369
msgid "_Sentry"
msgstr "_Stå vakt"
-#: client/gui-gtk-2.0/menu.c:855 client/gui-win32/menu.c:372
+#: client/gui-gtk-2.0/menu.c:886 client/gui-win32/menu.c:372
msgid "Make _Homecity"
msgstr "Gör till _hemstad"
-#: client/gui-gtk-2.0/menu.c:857 client/gui-win32/menu.c:373
+#: client/gui-gtk-2.0/menu.c:888 client/gui-win32/menu.c:373
msgid "_Load"
msgstr "_Lasta på"
-#: client/gui-gtk-2.0/menu.c:859
+#: client/gui-gtk-2.0/menu.c:890
msgid "_Unload Transporter"
msgstr "Lasta av från fraktskepp"
-#: client/gui-gtk-2.0/menu.c:861 client/gui-win32/menu.c:374
+#: client/gui-gtk-2.0/menu.c:892 client/gui-win32/menu.c:374
msgid "_Unload"
msgstr "Lasta _ur"
-#: client/gui-gtk-2.0/menu.c:863 client/gui-win32/menu.c:375
+#: client/gui-gtk-2.0/menu.c:894 client/gui-win32/menu.c:375
msgid "Wake up o_thers"
msgstr "_Väck övriga"
-#: client/gui-gtk-2.0/menu.c:867
+#: client/gui-gtk-2.0/menu.c:898
msgid "_Auto Settler"
msgstr "Förbättr_a landskap självständigt"
-#: client/gui-gtk-2.0/menu.c:869 client/gui-win32/menu.c:378
+#: client/gui-gtk-2.0/menu.c:900 client/gui-win32/menu.c:378
msgid "Auto E_xplore"
msgstr "Utforska självständigt (_X)"
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906
msgid "_Connect"
msgstr "Anslut (_C)"
-#: client/gui-gtk-2.0/menu.c:871 client/gui-win32/menu.c:380
+#: client/gui-gtk-2.0/menu.c:902 client/gui-win32/menu.c:380
msgid "_Road"
msgstr "_Väg"
-#: client/gui-gtk-2.0/menu.c:873 client/gui-win32/menu.c:381
+#: client/gui-gtk-2.0/menu.c:904 client/gui-win32/menu.c:381
msgid "Rai_l"
msgstr "_Järnväg"
-#: client/gui-gtk-2.0/menu.c:875 client/gui-win32/menu.c:382
+#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:382
msgid "_Irrigate"
msgstr "_Bevattning"
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
msgid "Go _to"
msgstr "GÃ¥ _till"
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
msgid "_Build city"
msgstr "_Bygg stad"
-#: client/gui-gtk-2.0/menu.c:879
+#: client/gui-gtk-2.0/menu.c:910
msgid "Patrol (_Q)"
msgstr "GÃ¥ vaktrunda (_Q)"
-#: client/gui-gtk-2.0/menu.c:881 client/gui-win32/menu.c:385
+#: client/gui-gtk-2.0/menu.c:912 client/gui-win32/menu.c:385
msgid "_Go to"
msgstr "_GÃ¥ till"
-#: client/gui-gtk-2.0/menu.c:883
+#: client/gui-gtk-2.0/menu.c:914
msgid "Go\\/Airlift to City"
msgstr "GÃ¥\\/Flyg till stad"
-#: client/gui-gtk-2.0/menu.c:885 client/gui-sdl/menu.c:450
+#: client/gui-gtk-2.0/menu.c:916 client/gui-sdl/menu.c:450
#: client/gui-win32/menu.c:387 client/gui-xaw/menu.c:203
msgid "Return to nearest city"
msgstr "Återvänd till närmaste stad"
-#: client/gui-gtk-2.0/menu.c:889 client/gui-win32/menu.c:389
+#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:389
#: client/gui-xaw/menu.c:205
msgid "Disband Unit"
msgstr "Upplös trupp"
-#: client/gui-gtk-2.0/menu.c:891 client/gui-sdl/citydlg.c:532
+#: client/gui-gtk-2.0/menu.c:922 client/gui-sdl/citydlg.c:532
#: data/Freeciv.in:1186
msgid "Upgrade unit"
msgstr "Uppgradera trupp"
-#: client/gui-gtk-2.0/menu.c:893
+#: client/gui-gtk-2.0/menu.c:924
msgid "Diplomat\\/Spy Actions"
msgstr "_Diplomat\\/spionhandlingar"
-#: client/gui-gtk-2.0/menu.c:895 client/gui-sdl/menu.c:399
+#: client/gui-gtk-2.0/menu.c:926 client/gui-sdl/menu.c:399
#: client/gui-win32/menu.c:391 client/gui-xaw/menu.c:209
msgid "Explode Nuclear"
msgstr "Utlös _kärnvapen"
-#: client/gui-gtk-2.0/menu.c:899
-msgid "Select same type"
-msgstr "Välj samma typ"
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/cityrep.c:882
+msgid "Select"
+msgstr "Välj"
+
+#: client/gui-gtk-2.0/menu.c:934
+#, fuzzy
+msgid "Single"
+msgstr "djungel"
+
+#: client/gui-gtk-2.0/menu.c:936
+msgid "Same Type On Tile"
+msgstr ""
-#: client/gui-gtk-2.0/menu.c:901 client/gui-win32/menu.c:393
+#: client/gui-gtk-2.0/menu.c:938
+msgid "All On Tile"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:940
+msgid "Same Type On Continent"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:942
+msgid "Same Type Everywhere"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:393
msgid "_Wait"
msgstr "Vänta (_W)"
-#: client/gui-gtk-2.0/menu.c:903 client/gui-win32/menu.c:394
+#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:394
#: client/gui-xaw/menu.c:213
msgid "Done"
msgstr "Färdig"
-#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:398
+#: client/gui-gtk-2.0/menu.c:949 client/gui-win32/menu.c:398
msgid "_Reports"
msgstr "_Redogörelser"
-#: client/gui-gtk-2.0/menu.c:908 client/gui-gtk-2.0/menu.c:910
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:914
-#: client/gui-gtk-2.0/menu.c:916 client/gui-gtk-2.0/menu.c:918
-#: client/gui-gtk-2.0/menu.c:920 client/gui-gtk-2.0/menu.c:922
-#: client/gui-gtk-2.0/menu.c:924 client/gui-gtk-2.0/menu.c:926
-#: client/gui-gtk-2.0/menu.c:928 client/gui-gtk-2.0/menu.c:930
-#: client/gui-gtk-2.0/menu.c:932 data/Freeciv.in:2030
+#: client/gui-gtk-2.0/menu.c:951 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:957
+#: client/gui-gtk-2.0/menu.c:959 client/gui-gtk-2.0/menu.c:961
+#: client/gui-gtk-2.0/menu.c:963 client/gui-gtk-2.0/menu.c:965
+#: client/gui-gtk-2.0/menu.c:967 client/gui-gtk-2.0/menu.c:969
+#: client/gui-gtk-2.0/menu.c:971 client/gui-gtk-2.0/menu.c:973
+#: client/gui-gtk-2.0/menu.c:975 data/Freeciv.in:2030
msgid "Reports"
msgstr "Redogörelser"
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:958
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:1001
#: client/gui-win32/menu.c:400 client/gui-win32/menu.c:425
msgid "_Units"
msgstr "Trupper (_U)"
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/menu.c:914 client/gui-win32/menu.c:402
+#: client/gui-gtk-2.0/menu.c:957 client/gui-win32/menu.c:402
msgid "_Nations"
msgstr "Folksta_mmar"
-#: client/gui-gtk-2.0/menu.c:918 client/gui-win32/menu.c:403
+#: client/gui-gtk-2.0/menu.c:961 client/gui-win32/menu.c:403
msgid "_Economy"
msgstr "_Ekonomi"
#. TRANS: Research report action
-#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:405
+#: client/gui-gtk-2.0/menu.c:963 client/gui-win32/menu.c:405
msgid "_Research"
msgstr "Fo_rskning"
-#: client/gui-gtk-2.0/menu.c:924 client/gui-win32/menu.c:407
+#: client/gui-gtk-2.0/menu.c:967 client/gui-win32/menu.c:407
msgid "_Wonders of the World"
msgstr "_Världens underverk"
-#: client/gui-gtk-2.0/menu.c:926 client/gui-win32/menu.c:408
+#: client/gui-gtk-2.0/menu.c:969 client/gui-win32/menu.c:408
msgid "_Top Five Cities"
msgstr "De fem bäs_ta städerna"
-#: client/gui-gtk-2.0/menu.c:928 client/gui-win32/menu.c:409
+#: client/gui-gtk-2.0/menu.c:971 client/gui-win32/menu.c:409
msgid "_Messages"
msgstr "_Meddelanden"
-#: client/gui-gtk-2.0/menu.c:930 client/gui-win32/menu.c:410
+#: client/gui-gtk-2.0/menu.c:973 client/gui-win32/menu.c:410
msgid "_Demographics"
msgstr "_Demografi"
-#: client/gui-gtk-2.0/menu.c:932 client/gui-gtk-2.0/plrdlg.c:471
+#: client/gui-gtk-2.0/menu.c:975 client/gui-gtk-2.0/plrdlg.c:354
#: client/gui-win32/menu.c:411
msgid "_Spaceship"
msgstr "Rymd_skepp"
-#: client/gui-gtk-2.0/menu.c:936 client/gui-win32/menu.c:415
+#: client/gui-gtk-2.0/menu.c:979 client/gui-win32/menu.c:415
msgid "_Help"
msgstr "_Hjälp"
-#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
-#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
-#: client/gui-gtk-2.0/menu.c:946 client/gui-gtk-2.0/menu.c:948
-#: client/gui-gtk-2.0/menu.c:950 client/gui-gtk-2.0/menu.c:952
-#: client/gui-gtk-2.0/menu.c:954 client/gui-gtk-2.0/menu.c:956
-#: client/gui-gtk-2.0/menu.c:958 client/gui-gtk-2.0/menu.c:960
-#: client/gui-gtk-2.0/menu.c:962 client/gui-gtk-2.0/menu.c:964
-#: client/gui-gtk-2.0/menu.c:966 client/gui-gtk-2.0/menu.c:968
-#: client/gui-gtk-2.0/menu.c:970 client/gui-gtk-2.0/menu.c:972
-#: client/gui-gtk-2.0/menu.c:974 client/gui-gtk-2.0/menu.c:976
-#: client/gui-gtk-2.0/menu.c:978 client/gui-gtk-2.0/menu.c:980
+#: client/gui-gtk-2.0/menu.c:981 client/gui-gtk-2.0/menu.c:983
+#: client/gui-gtk-2.0/menu.c:985 client/gui-gtk-2.0/menu.c:987
+#: client/gui-gtk-2.0/menu.c:989 client/gui-gtk-2.0/menu.c:991
+#: client/gui-gtk-2.0/menu.c:993 client/gui-gtk-2.0/menu.c:995
+#: client/gui-gtk-2.0/menu.c:997 client/gui-gtk-2.0/menu.c:999
+#: client/gui-gtk-2.0/menu.c:1001 client/gui-gtk-2.0/menu.c:1003
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-gtk-2.0/menu.c:1007
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-gtk-2.0/menu.c:1011
+#: client/gui-gtk-2.0/menu.c:1013 client/gui-gtk-2.0/menu.c:1015
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-gtk-2.0/menu.c:1019
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-gtk-2.0/menu.c:1023
#: client/gui-gtk-2.0/repodlgs.c:313 client/gui-win32/citydlg.c:1077
#: client/gui-win32/repodlgs.c:289 client/gui-win32/wldlg.c:846
#: data/Freeciv.in:1466 data/Freeciv.in:2031 data/Freeciv.in:2101
@@ -12127,119 +12344,119 @@ msgstr "_Hjälp"
msgid "Help"
msgstr "Hjälp"
-#: client/gui-gtk-2.0/menu.c:940 client/gui-win32/menu.c:416
+#: client/gui-gtk-2.0/menu.c:983 client/gui-win32/menu.c:416
msgid "Language_s"
msgstr "_Språk"
-#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/menu.c:417
+#: client/gui-gtk-2.0/menu.c:985 client/gui-win32/menu.c:417
msgid "Co_nnecting"
msgstr "A_nsluta"
-#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:418
+#: client/gui-gtk-2.0/menu.c:987 client/gui-win32/menu.c:418
msgid "C_ontrols"
msgstr "St_yrning"
-#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:419
+#: client/gui-gtk-2.0/menu.c:989 client/gui-win32/menu.c:419
msgid "C_hatline"
msgstr "C_hatrad"
-#: client/gui-gtk-2.0/menu.c:948 client/gui-win32/menu.c:420
+#: client/gui-gtk-2.0/menu.c:991 client/gui-win32/menu.c:420
msgid "_Worklist Editor"
msgstr "Arbetslisteredigerare"
-#: client/gui-gtk-2.0/menu.c:950 client/gui-win32/menu.c:421
+#: client/gui-gtk-2.0/menu.c:993 client/gui-win32/menu.c:421
msgid "Citizen _Management"
msgstr "Stadsförvalt_ning"
-#: client/gui-gtk-2.0/menu.c:952 client/gui-win32/menu.c:422
+#: client/gui-gtk-2.0/menu.c:995 client/gui-win32/menu.c:422
msgid "_Playing"
msgstr "Hur man s_pelar"
-#: client/gui-gtk-2.0/menu.c:956 client/gui-win32/menu.c:424
+#: client/gui-gtk-2.0/menu.c:999 client/gui-win32/menu.c:424
msgid "City _Improvements"
msgstr "Stadsförbättr_ingar"
-#: client/gui-gtk-2.0/menu.c:960 client/gui-win32/menu.c:426
+#: client/gui-gtk-2.0/menu.c:1003 client/gui-win32/menu.c:426
msgid "Com_bat"
msgstr "Ka_mp"
-#: client/gui-gtk-2.0/menu.c:962 client/gui-win32/menu.c:427
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-win32/menu.c:427
msgid "_ZOC"
msgstr "Kontroll_område"
-#: client/gui-gtk-2.0/menu.c:964 client/gui-win32/menu.c:428
+#: client/gui-gtk-2.0/menu.c:1007 client/gui-win32/menu.c:428
msgid "Techno_logy"
msgstr "Tekno_logi"
-#: client/gui-gtk-2.0/menu.c:966 client/gui-win32/menu.c:429
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-win32/menu.c:429
msgid "_Terrain"
msgstr "L_andskap"
-#: client/gui-gtk-2.0/menu.c:968 client/gui-win32/menu.c:430
+#: client/gui-gtk-2.0/menu.c:1011 client/gui-win32/menu.c:430
msgid "Won_ders"
msgstr "Värl_dsunder"
-#: client/gui-gtk-2.0/menu.c:972 client/gui-win32/menu.c:432
+#: client/gui-gtk-2.0/menu.c:1015 client/gui-win32/menu.c:432
msgid "Happin_ess"
msgstr "Lyckligh_et"
-#: client/gui-gtk-2.0/menu.c:974 client/gui-win32/menu.c:433
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-win32/menu.c:433
msgid "Space _Race"
msgstr "_Rymdkapplöpning"
-#: client/gui-gtk-2.0/menu.c:978 client/gui-win32/menu.c:435
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-win32/menu.c:435
msgid "_Copying"
msgstr "_Kopiering"
-#: client/gui-gtk-2.0/menu.c:980 client/gui-win32/menu.c:436
+#: client/gui-gtk-2.0/menu.c:1023 client/gui-win32/menu.c:436
msgid "_About"
msgstr "_Om"
-#: client/gui-gtk-2.0/menu.c:1264
+#: client/gui-gtk-2.0/menu.c:1307
#, c-format
msgid "%s..."
msgstr "%s..."
-#: client/gui-gtk-2.0/menu.c:1352
+#: client/gui-gtk-2.0/menu.c:1397
#, c-format
msgid "Change to %s (_I)"
msgstr "Ändra till %s (_I)"
-#: client/gui-gtk-2.0/menu.c:1353
+#: client/gui-gtk-2.0/menu.c:1398
#, c-format
msgid "Change to %s (_M)"
msgstr "Ändra till %s (_M)"
-#: client/gui-gtk-2.0/menu.c:1354
+#: client/gui-gtk-2.0/menu.c:1399
#, c-format
msgid "Transf_orm to %s"
msgstr "_Omvandla till %s"
-#: client/gui-gtk-2.0/menu.c:1427
+#: client/gui-gtk-2.0/menu.c:1472
msgid "Help _Build Wonder"
msgstr "Hjälp till att _bygga underverk"
-#: client/gui-gtk-2.0/menu.c:1441
+#: client/gui-gtk-2.0/menu.c:1486
msgid "Add to City (_B)"
msgstr "Utöka stad (_B)"
-#: client/gui-gtk-2.0/menu.c:1449
+#: client/gui-gtk-2.0/menu.c:1494
msgid "Make Trade _Route"
msgstr "In_rätta handelsled"
-#: client/gui-gtk-2.0/menu.c:1463
+#: client/gui-gtk-2.0/menu.c:1508
msgid "Build _Railroad"
msgstr "Bygg jä_rnväg"
-#: client/gui-gtk-2.0/menu.c:1486
+#: client/gui-gtk-2.0/menu.c:1531
msgid "Bu_ild Farmland"
msgstr "Gör t_ill åker"
-#: client/gui-gtk-2.0/menu.c:1506
+#: client/gui-gtk-2.0/menu.c:1551
msgid "_Fortify"
msgstr "Be_fäst"
-#: client/gui-gtk-2.0/menu.c:1512
+#: client/gui-gtk-2.0/menu.c:1557
msgid "_Paradrop"
msgstr "Ho_ppa fallskärm"
@@ -12273,13 +12490,31 @@ msgstr "Med"
msgid "Pop"
msgstr "Öpp"
-#: client/gui-gtk-2.0/messagewin.c:155 client/gui-sdl/messagewin.c:247
+#: client/gui-gtk-2.0/messagewin.c:186 client/gui-sdl/messagewin.c:247
#: client/gui-win32/messagewin.c:132 client/gui-xaw/menu.c:228
#: data/Freeciv.in:3273 data/Freeciv.in:3274 data/Freeciv.in:3283
msgid "Messages"
msgstr "Meddelanden"
-#: client/gui-gtk-2.0/plrdlg.c:330
+#: client/gui-gtk-2.0/plrdlg.c:317
+msgid "_Meet"
+msgstr "_Möt"
+
+#: client/gui-gtk-2.0/plrdlg.c:323
+msgid "Cancel _Treaty"
+msgstr "_Avbryt avtal"
+
+#: client/gui-gtk-2.0/plrdlg.c:329
+#, fuzzy
+msgid "_Withdraw Vision"
+msgstr "_Ã…terkalla anblick"
+
+#: client/gui-gtk-2.0/plrdlg.c:348
+#, fuzzy
+msgid "_Report"
+msgstr "_Redogörelser"
+
+#: client/gui-gtk-2.0/plrdlg.c:386
msgid "?show:Dead Players"
msgstr "?show:Besegrade spelare"
@@ -12287,265 +12522,269 @@ msgstr "?show:Besegrade spelare"
#. TRANS: Nations report action
#. TRANS: Nations report title
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/plrdlg.c:350 client/gui-sdl/mapctrl.c:1580
+#: client/gui-gtk-2.0/plrdlg.c:406 client/gui-sdl/mapctrl.c:1580
#: client/gui-sdl/plrdlg.c:608 client/gui-win32/plrdlg.c:344
#: client/gui-xaw/menu.c:221 data/Freeciv.in:3192 data/Freeciv.in:3193
msgid "Nations"
msgstr "Folkslag"
-#: client/gui-gtk-2.0/plrdlg.c:443
+#: client/gui-gtk-2.0/plrdlg.c:511
+#, fuzzy
+msgid "Di_plomacy"
+msgstr "Diplomati"
+
+#: client/gui-gtk-2.0/plrdlg.c:516
msgid "_Intelligence"
msgstr "_Underrättelser"
-#: client/gui-gtk-2.0/plrdlg.c:450
-msgid "_Meet"
-msgstr "_Möt"
-
-#: client/gui-gtk-2.0/plrdlg.c:457
-msgid "Cancel _Treaty"
-msgstr "_Avbryt avtal"
-
-#: client/gui-gtk-2.0/plrdlg.c:464
-msgid "_Withdraw vision"
-msgstr "_Ã…terkalla anblick"
-
-#: client/gui-gtk-2.0/plrdlg.c:495
+#: client/gui-gtk-2.0/plrdlg.c:526
msgid "_AI"
msgstr "_Datorstyrning"
-#: client/gui-gtk-2.0/plrdlg.c:501
+#: client/gui-gtk-2.0/plrdlg.c:532
msgid "_Toggle AI Mode"
msgstr "Växla datorstyrning"
-#: client/gui-gtk-2.0/pages.c:208
+#: client/gui-gtk-2.0/pages.c:221
msgid "Start _New Game"
msgstr "Påbörja _nytt spel"
-#: client/gui-gtk-2.0/pages.c:214
+#: client/gui-gtk-2.0/pages.c:227
msgid "Start _Scenario Game"
msgstr "Påbörja _scenariospel"
-#: client/gui-gtk-2.0/pages.c:220
+#: client/gui-gtk-2.0/pages.c:233
msgid "_Load Saved Game"
msgstr "_Ã…teruppta sparat spel"
-#: client/gui-gtk-2.0/pages.c:229
+#: client/gui-gtk-2.0/pages.c:239
msgid "C_onnect to Network Game"
msgstr "Delta i _nätverksspel"
-#: client/gui-gtk-2.0/pages.c:236
+#: client/gui-gtk-2.0/pages.c:247
msgid "Connect to Gaming _Zone"
msgstr "Delta i nätverksspel (Gaming _Zone)"
-#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:300
#: client/gui-xaw/connectdlg.c:326
msgid "Passwords don't match, enter password."
msgstr "Lösenorden är olika, ange lösenord."
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:779 client/gui-gtk-2.0/pages.c:820
+#: client/gui-win32/connectdlg.c:916
msgid "Server Name"
msgstr "Servernamn"
-#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
+#: 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
+#: data/Freeciv.in:96
msgid "Port"
msgstr "Port"
-#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
+#: client/gui-win32/connectdlg.c:917
msgid "Version"
msgstr "Version"
-#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
-#: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
+#: 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
msgid "Status"
msgstr "Status"
-#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
-#: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
+#: 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
msgid "Players"
msgstr "Spelare"
-#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
+#: client/gui-win32/connectdlg.c:918
msgid "Comment"
msgstr "Anmärkning"
-#: client/gui-gtk-2.0/pages.c:747
+#: client/gui-gtk-2.0/pages.c:786
msgid "Local _Area Network"
msgstr "Lokalt _nätverk"
-#: client/gui-gtk-2.0/pages.c:783
+#: client/gui-gtk-2.0/pages.c:827
msgid "Internet _Metaserver"
msgstr "Internet _metaserver"
-#: client/gui-gtk-2.0/pages.c:817
+#: client/gui-gtk-2.0/pages.c:864
msgid "_Host:"
msgstr "_Värd:"
-#: client/gui-gtk-2.0/pages.c:834
+#: client/gui-gtk-2.0/pages.c:881
msgid "_Port:"
msgstr "_Port:"
-#: client/gui-gtk-2.0/pages.c:851
+#: client/gui-gtk-2.0/pages.c:898
msgid "_Login:"
msgstr "_Logga in som:"
-#: client/gui-gtk-2.0/pages.c:869
+#: client/gui-gtk-2.0/pages.c:916
msgid "Pass_word:"
msgstr "L_ösenord:"
-#: client/gui-gtk-2.0/pages.c:887
+#: client/gui-gtk-2.0/pages.c:934
msgid "Conf_irm Password:"
msgstr "_Bekräfta lösenord:"
-#: client/gui-gtk-2.0/pages.c:912
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: 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/wldlg.c:800 client/gui-win32/wldlg.c:806
+msgid "Type"
+msgstr "Typ"
+
+#: client/gui-gtk-2.0/pages.c:952 client/gui-win32/plrdlg.c:337
+#: data/Freeciv.in:88
+msgid "Host"
+msgstr "Värd"
+
+#: client/gui-gtk-2.0/pages.c:981
msgid "C_onnect"
msgstr "An_slut hit"
-#: client/gui-gtk-2.0/pages.c:1142
+#: client/gui-gtk-2.0/pages.c:1211
#, c-format
msgid "Connection name: %s"
msgstr "Anslutningsnamn: %s."
-#: client/gui-gtk-2.0/pages.c:1145
+#: client/gui-gtk-2.0/pages.c:1214
#, c-format
msgid "Player name: %s"
msgstr "Spelarnamn: %s"
-#: client/gui-gtk-2.0/pages.c:1150
+#: client/gui-gtk-2.0/pages.c:1219
#, c-format
msgid "Host: %s"
msgstr "Värd: %s"
-#: client/gui-gtk-2.0/pages.c:1158
+#: client/gui-gtk-2.0/pages.c:1227
msgid "Player/conn info"
msgstr "Spelar/anslutn. info"
-#: client/gui-gtk-2.0/pages.c:1185
+#: client/gui-gtk-2.0/pages.c:1254
#, c-format
msgid "%s info"
msgstr "%s info"
-#: client/gui-gtk-2.0/pages.c:1196
+#: client/gui-gtk-2.0/pages.c:1265
msgid "Toggle player ready"
msgstr "Växla redoläge för spelare"
-#: client/gui-gtk-2.0/pages.c:1204
+#: client/gui-gtk-2.0/pages.c:1273
msgid "Pick nation"
msgstr "Välj folkslag"
-#: client/gui-gtk-2.0/pages.c:1214
+#: client/gui-gtk-2.0/pages.c:1283
msgid "Observe this player"
msgstr "Iakttag spelareen"
-#: client/gui-gtk-2.0/pages.c:1221
+#: client/gui-gtk-2.0/pages.c:1290
msgid "Take this player"
msgstr "Ta spelaren"
-#: client/gui-gtk-2.0/pages.c:1238
+#: client/gui-gtk-2.0/pages.c:1307
msgid "Cut connection"
msgstr "Bryt anslutningen"
-#: client/gui-gtk-2.0/pages.c:1248
+#: client/gui-gtk-2.0/pages.c:1317
msgid "Aitoggle player"
msgstr "Slå av/på datorstyrning"
-#: client/gui-gtk-2.0/pages.c:1257
+#: client/gui-gtk-2.0/pages.c:1326
msgid "Remove player"
msgstr "Avlägsna spelaren"
-#: client/gui-gtk-2.0/pages.c:1268
+#: client/gui-gtk-2.0/pages.c:1337
msgid "Give info access"
msgstr "Ge info access"
-#: client/gui-gtk-2.0/pages.c:1276
+#: client/gui-gtk-2.0/pages.c:1345
msgid "Give ctrl access"
msgstr "Ge ctrl access"
#. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1338
+#: client/gui-gtk-2.0/pages.c:1407
#, c-format
msgid "Put on %s"
msgstr "Gör till medlem i %s"
-#: client/gui-gtk-2.0/pages.c:1442
+#: client/gui-gtk-2.0/pages.c:1511
msgid "Number of _Players (including AI):"
msgstr "A_ntal spelare (inklusive datorstyrda):"
-#: client/gui-gtk-2.0/pages.c:1465
+#: client/gui-gtk-2.0/pages.c:1534
msgid "AI Skill _Level:"
msgstr "Datorspe_larens färdighetsnivå"
-#: client/gui-gtk-2.0/pages.c:1481
+#: client/gui-gtk-2.0/pages.c:1550
msgid "Ruleset _Version:"
msgstr "_Regler:"
-#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
msgid "_More Game Options..."
msgstr "_Fler spelinställningar..."
# ? FIXME
-#: client/gui-gtk-2.0/pages.c:1514
+#: client/gui-gtk-2.0/pages.c:1583
msgid "Record"
msgstr "Rekord"
-#: client/gui-gtk-2.0/pages.c:1519
+#: client/gui-gtk-2.0/pages.c:1588
msgid "Rating"
msgstr "Grad"
-#: client/gui-gtk-2.0/pages.c:1525
+#: client/gui-gtk-2.0/pages.c:1594
msgid "Ready"
msgstr "Redo"
-#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
-#: data/nation/slovakian.ruleset:26
-msgid "Leader"
-msgstr "ledare"
+#: client/gui-gtk-2.0/pages.c:1601
+#, fuzzy
+msgid "?player:Leader"
+msgstr "Namn"
-#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1732 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:1752
+#: client/gui-gtk-2.0/pages.c:1824
msgid "Choose Saved Game to _Load:"
msgstr "Välj sparat spel att _läsa in:"
-#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
-#: client/gui-gtk-2.0/pages.c:2375
+#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
+#: client/gui-gtk-2.0/pages.c:2451
msgid "_Browse..."
msgstr "_Bläddra..."
-#: client/gui-gtk-2.0/pages.c:1839
+#: client/gui-gtk-2.0/pages.c:1911
msgid "Choose a Scenario"
msgstr "Öppna scenario"
-#: client/gui-gtk-2.0/pages.c:1926
+#: client/gui-gtk-2.0/pages.c:1998
msgid "Choose a _Scenario:"
msgstr "Öppna _scenario:"
-#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
-#: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
-#: client/gui-win32/wldlg.c:806
-msgid "Type"
-msgstr "Typ"
-
-#: client/gui-gtk-2.0/pages.c:2101
+#: client/gui-gtk-2.0/pages.c:2173
msgid "Choose a _nation to play:"
msgstr "Välj ett _folkslag att spela:"
-#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2363 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:2372 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2448 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr "Spara spel"
-#: client/gui-gtk-2.0/pages.c:2413
+#: client/gui-gtk-2.0/pages.c:2489
msgid "Saved _Games:"
msgstr "Sparade spel:"
-#: client/gui-gtk-2.0/pages.c:2440
+#: client/gui-gtk-2.0/pages.c:2516
msgid "Save _Filename:"
msgstr "Filnamn:"
@@ -12898,7 +13137,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:1094
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
msgid "Back"
msgstr "Bakåt"
@@ -12907,7 +13146,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:775
+#: client/gui-win32/connectdlg.c:777
msgid "Load Game"
msgstr "Öppna sparat spel"
@@ -12944,12 +13183,12 @@ msgid "Make new homecity"
msgstr "Gör till ny hemstad"
#: client/gui-sdl/citydlg.c:546 client/gui-sdl/citydlg.c:1418
-#: client/gui-sdl/connectdlg.c:307 client/gui-sdl/connectdlg.c:616
-#: client/gui-sdl/connectdlg.c:802 client/gui-sdl/connectdlg.c:984
+#: 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/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1039
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
#: 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
@@ -12996,7 +13235,7 @@ msgstr "Köp den?"
#: client/gui-sdl/diplodlg.c:1335 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:2427
+#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
#: client/gui-xaw/cityrep.c:666 client/gui-xaw/cma_fe.c:327
#: client/gui-xaw/cma_fe.c:511 client/gui-xaw/cma_fe.c:765
#: client/gui-xaw/messagedlg.c:72 client/gui-xaw/optiondlg.c:76
@@ -13012,7 +13251,7 @@ msgstr "Nej"
#: client/gui-sdl/diplodlg.c:1345 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:2427 client/gui-xaw/cityrep.c:666
+#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
#: client/gui-xaw/cma_fe.c:327 client/gui-xaw/cma_fe.c:511
#: client/gui-xaw/cma_fe.c:765 client/gui-xaw/messagedlg.c:72
#: client/gui-xaw/optiondlg.c:76 client/gui-xaw/optiondlg.c:304
@@ -13289,36 +13528,36 @@ msgstr "Använd en gång"
msgid "Release city"
msgstr "Släpp stad"
-#: client/gui-sdl/connectdlg.c:238
+#: client/gui-sdl/connectdlg.c:239
msgid "Creating Server List..."
msgstr "Skapar en lista över servrar..."
-#: client/gui-sdl/connectdlg.c:279 client/gui-sdl/connectdlg.c:343
+#: client/gui-sdl/connectdlg.c:280 client/gui-sdl/connectdlg.c:344
msgid "No LAN servers found"
msgstr "Inga lokala servrar kunde hittas"
-#: client/gui-sdl/connectdlg.c:281 client/gui-sdl/connectdlg.c:345
+#: client/gui-sdl/connectdlg.c:282 client/gui-sdl/connectdlg.c:346
msgid "No public servers found"
msgstr "Inga allmänna servrar kunde hittas"
-#: client/gui-sdl/connectdlg.c:555
+#: client/gui-sdl/connectdlg.c:556
msgid "Player Name :"
msgstr "Spelarens namn :"
-#: client/gui-sdl/connectdlg.c:571
+#: client/gui-sdl/connectdlg.c:572
msgid "Freeciv Server :"
msgstr "Server :"
-#: client/gui-sdl/connectdlg.c:588
+#: client/gui-sdl/connectdlg.c:589
msgid "Port :"
msgstr "Port :"
-#: client/gui-sdl/connectdlg.c:608 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr "Anslut"
-#: client/gui-sdl/connectdlg.c:794 client/gui-sdl/connectdlg.c:977
+#: client/gui-sdl/connectdlg.c:795 client/gui-sdl/connectdlg.c:978
#: client/gui-xaw/connectdlg.c:145
msgid "Next"
msgstr "Nästa"
@@ -13599,8 +13838,8 @@ msgid "Unable to initialize SDL library: %s"
msgstr "Kunde inte initialisera biblioteket SDL: %s"
#: client/gui-sdl/graphics.c:1021
-#, c-format
-msgid "Unable to initialize SDL_ttf library: %s"
+#, fuzzy, c-format
+msgid "Unable to initialize SDL_ttf library: %s"
msgstr "Kunde inte initialisera biblioteket SDL_ttf: %s"
#: client/gui-sdl/graphics.c:1058
@@ -13688,14 +13927,6 @@ msgstr "Startar klienten"
msgid "Waiting for the beginning of the game"
msgstr "Väntar på att spelet ska börja"
-#: client/gui-sdl/gui_string.c:608
-msgid ""
-"Couldn't find stdfont.ttf file. Please link/copy/move anyunicode ttf font to "
-"data dir as stdfont.ttf"
-msgstr ""
-"Couldn't find stdfont.ttf file. Please link/copy/move anyunicode ttf font to "
-"data dir as stdfont.ttf"
-
#. TRANS: Future Technology
#: client/gui-sdl/gui_tilespec.c:506
msgid "FT"
@@ -14292,12 +14523,12 @@ msgid "Leave Game"
msgstr "Hoppa av"
#: client/gui-sdl/optiondlg.c:2302 client/gui-sdl/pages.c:255
-#: client/gui-win32/connectdlg.c:1098 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1100 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:963
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
msgid "Start New Game"
msgstr "Påbörja nytt spel"
@@ -14417,8 +14648,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:1081
-#: client/gui-win32/connectdlg.c:1089 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
+#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
msgid "Update"
msgstr "Uppdatera"
@@ -14876,10 +15107,6 @@ msgstr "Ändra alla"
msgid "Refresh"
msgstr "Uppdatera"
-#: client/gui-win32/cityrep.c:882
-msgid "Select"
-msgstr "Välj"
-
#: client/gui-win32/cityrep.c:883
msgid "Configure"
msgstr "Ställ in"
@@ -14929,56 +15156,56 @@ msgstr "Kunde inte läsa in sparfil"
msgid "Verify Password"
msgstr "Bekräfta lösenord"
-#: client/gui-win32/connectdlg.c:912 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr "Serverval"
-#: client/gui-win32/connectdlg.c:913
+#: client/gui-win32/connectdlg.c:915
msgid "Local Area Network"
msgstr "lokalt nätverk"
-#: client/gui-win32/connectdlg.c:947
+#: client/gui-win32/connectdlg.c:949
msgid "Welcome to Freeciv"
msgstr "Välkommen till Freeciv"
-#: client/gui-win32/connectdlg.c:965
+#: client/gui-win32/connectdlg.c:967
msgid "Load Saved Game"
msgstr "Ã…teruppta sparat spel"
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
msgid "Connect To Network Game"
msgstr "Delta i nätverksspel"
-#: client/gui-win32/connectdlg.c:977
+#: client/gui-win32/connectdlg.c:979
msgid "Choose a nation to play"
msgstr "Välj ett folkslag att spela"
-#: client/gui-win32/connectdlg.c:1012
+#: client/gui-win32/connectdlg.c:1014
msgid "Number of players (Including AI):"
msgstr "Antal spelare (inklusive datorstyrda):"
-#: client/gui-win32/connectdlg.c:1020
+#: client/gui-win32/connectdlg.c:1022
msgid "AI skill level:"
msgstr "Datorspelarens färdighetsnivå:"
-#: client/gui-win32/connectdlg.c:1034 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
msgid "Game Options"
msgstr "Spelinställningar"
# ? Stämmer detta?
-#: client/gui-win32/connectdlg.c:1038
+#: client/gui-win32/connectdlg.c:1040
msgid "Start Game"
msgstr "Sätt igång"
-#: client/gui-win32/connectdlg.c:1057
+#: client/gui-win32/connectdlg.c:1059
msgid "Login:"
msgstr "Logga in som:"
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
msgid "Host:"
msgstr "Värd:"
-#: client/gui-win32/connectdlg.c:1060
+#: client/gui-win32/connectdlg.c:1062
msgid "Port:"
msgstr "Port:"
@@ -15239,10 +15466,6 @@ msgid_plural "(idle %d turns)"
msgstr[0] "(overksam %d omgång)"
msgstr[1] "(overksam %d omgångar)"
-#: client/gui-win32/plrdlg.c:337 data/Freeciv.in:88
-msgid "Host"
-msgstr "Värd"
-
#: client/gui-win32/plrdlg.c:355 data/Freeciv.in:3230
msgid "Intelligence"
msgstr "Underrättelse"
@@ -17075,13 +17298,14 @@ msgstr ""
"uppnås genom att skriva under diplomatiska avtal."
#: data/helpdata.txt:781
+#, fuzzy
msgid ""
-" To have a diplomatic relationship with another player, you must fist "
-"establish first contact with that player. To establish first contact, you "
-"have to move one of your units next to a city or unit belonging to that "
-"player, or vice versa. Unless you establish an embassy with that player, you "
-"may again lose contact with them after a set number of turns without direct "
-"physical contact."
+" To have a diplomatic relationship with another player, you must first "
+"establish contact with that player. To establish contact, you have to move "
+"one of your units next to a city or unit belonging to that player, or vice "
+"versa. Unless you establish an embassy with that player, you may again lose "
+"contact with them after a set number of turns without direct physical "
+"contact."
msgstr ""
" För att ha ett diplomatiskt förhållande med en annan spelare, måste du "
"först etablera kontakt med spelaren. Du etablerar kontakt om du flyttar en "
@@ -19886,7 +20110,7 @@ msgid "Communism"
msgstr "kommunism"
#: data/default/governments.ruleset:121 data/civ2/governments.ruleset:118
-#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:26
+#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:27
msgid "Comrade"
msgstr "kamrat"
@@ -20420,7 +20644,7 @@ msgid ""
"Great philosophers from all the world join your civilization: you get an "
"immediate advance."
msgstr ""
-"Stora filosofer från hela världen ansluta sig till vår civilisation: vi få "
+"Stora filosofer från hela världen ansluter sig till vår civilisation: vi får "
"genast 1 framsteg."
#: data/default/techs.ruleset:541 data/civ2/techs.ruleset:526
@@ -20865,6 +21089,14 @@ msgstr ""
"förlorat. Dessutom är grupper av nybyggare och/eller ingenjörer mycket "
"sårbara för fientliga angrepp."
+# DM> Ordet arbetare förekommer både i enhetsnamn och i kolumn i stadsrapport-
+# fönstret. Detta är en kompromiss.
+# SB>Det skulle alltså behövas en kontext-markör för att skilja på "city workers" och truppslaget "worker"
+#: data/default/units.ruleset:238
+#, fuzzy
+msgid "?unit:Workers"
+msgstr "Arbetare"
+
#: data/default/units.ruleset:264
msgid ""
"Workers are one of the key units in the game. They can be used to irrigate "
@@ -21590,6 +21822,11 @@ msgid "Explorers are very useful for mapping unknown territory."
msgstr ""
"Upptäcksresanden är mycket användbara för att kartlägga okända områden."
+#: data/default/units.ruleset:1864
+#, fuzzy
+msgid "?unit:Leader"
+msgstr "ledare"
+
#: data/default/units.ruleset:1892
msgid "This is you. If you lose this unit, you lose the game. So don't."
msgstr ""
@@ -21870,7 +22107,7 @@ msgid "Emir"
msgstr "emir"
#: data/nation/afghani.ruleset:25 data/nation/slovakian.ruleset:30
-#: data/nation/soviet.ruleset:27
+#: data/nation/soviet.ruleset:28
msgid "General Secretary"
msgstr "generalsekreterare"
@@ -21986,10 +22223,11 @@ msgid "?plural:Armenians"
msgstr "armenierna"
#: 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 "
-"independence from Soviet in 1991 AD"
+"independence from the Soviet Union in 1991."
msgstr ""
"Armenierna är enligt sagan ättlingarna till Haik, Noaks barnbarnsbarn. "
"Dagens armenska republik blev självständig från Sovietunionen 1991."
@@ -23083,13 +23321,13 @@ msgid "?plural:Illyrians"
msgstr "illyrerna"
#: 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 the Dalmatians to the north, "
-"Corcyra island and Ambracia bay in prehistoric Epirus to the south, mixing "
-"with Thracians in Dardania to the east, and settling Messapia across the "
-"Adriatic Sea. Illyrian kingdoms were independent for centuries, until "
-"conquered by the Roman Republic."
+"Illyrians were Indo-European tribes who appeared in the western part of the "
+"Balkan Peninsula before 1000 BC, including Corcyra island and Ambracia bay "
+"in prehistoric Epirus to the south. They mixed with Thracians in Dardania to "
+"the east, and settled Messapia across the Adriatic Sea. Illyrian kingdoms "
+"were independent for centuries, until conquered by the Roman Republic."
msgstr ""
"Illyrer kallades en grupp indoeuropeiska stammar som bosatte västra Balkan "
"före 1000-talet f.Kr. Illyrernas riken var länge självständiga innan de "
@@ -23415,7 +23653,7 @@ msgstr ""
"Det första koreanska riket grundades enligt legenden av Tangun år 2333 f.Kr. "
"Landet enades 668 e.Kr. av kung Munmu."
-#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:28
+#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:29
msgid "Great Leader"
msgstr "storledare"
@@ -23595,12 +23833,13 @@ msgid "?plural:Malians"
msgstr "malierna"
#: 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 "
-"called the Sahelian kingdoms. Of these, the Islamic Mali empire with it's "
+"called the Sahelian kingdoms. Of these, the Islamic Mali empire with its "
"capital in Timbuktu was the most influential. This empire reigned from the "
-"14th to the 17th century and was famed for it's wealth and benevolent kings. "
+"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 ""
"Mali var ett muslimskt storvälde söder om Sahara som blomstrade tack vare "
@@ -23666,9 +23905,10 @@ msgid "?plural:Mayas"
msgstr "mayanerna"
#: data/nation/mayan.ruleset:6
+#, fuzzy
msgid ""
-"The Mayans were a Mesoamerican civilization. Famous for building great "
-"pyramids and palaces in the jungle."
+"The Mayans were a Mesoamerican civilization. They are famous for building "
+"great pyramids and palaces in the jungle."
msgstr ""
"Mayariket var en mellanamerikansk civilisation som uppförde många storslagna "
"byggnadsverk som står än idag."
@@ -24232,6 +24472,16 @@ msgstr ""
"i förbundsrepubliken Tjeckoslovakien, samt innan dess en del av kejsardömet "
"Österrike-Ungern."
+#: data/nation/slovakian.ruleset:26
+#, fuzzy
+msgid "?male:Leader"
+msgstr "ledare"
+
+#: data/nation/slovakian.ruleset:26
+#, fuzzy
+msgid "?female:Leader"
+msgstr "kamrat"
+
#: data/nation/slovakian.ruleset:29
msgid "Pope"
msgstr "påve"
@@ -24277,12 +24527,14 @@ msgid "?plural:Soviets"
msgstr "sovjeterna"
#: data/nation/soviet.ruleset:6
+#, fuzzy
msgid ""
-"Soviet Union's history starts in November 1917, when under Lenin's "
+"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 "
-"republics integrated into one country. Soviet Union became one of most "
-"powerful states in the 20th century. But by the end of 1991 due to many "
-"social shocks it disintegrated into fifteen independent countries"
+"republics integrated into one country. The Soviet Union became one of most "
+"powerful states in the 20th century, but by the end of 1991 it had "
+"disintegrated into fifteen independent countries due to social and economic "
+"problems."
msgstr ""
"Sovjetunionens historia börjar i november 1917, då det kommunistiska "
"Bolsjevikpartiet grep makten efter det ryska tsardömets fall. I december "
@@ -24728,9 +24980,10 @@ msgid "?plural:Westphalians"
msgstr "västfalerna"
#: data/nation/westphalian.ruleset:6
+#, fuzzy
msgid ""
-"Westphalia, before becoming a Prussian province, was the western region the "
-"duchy of Saxony. Present-day it consists of the Northern part of the largest "
+"Westphalia, before becoming a Prussian province, was the western region of "
+"the duchy of Saxony. Today it makes up the northern part of the largest "
"German federal state, North Rhine-Westphalia."
msgstr ""
"Västfalen utgjorde den västra delen av hertigdömet Sachsen, innan det föll "
@@ -24911,6 +25164,7 @@ msgstr ""
"produktionen av denna trupp."
#: data/scenario/tutorial.sav:83
+#, fuzzy
msgid ""
"Another city! You are really getting the hang of this. You\n"
"probably have a pretty good idea what to do with new cities by\n"
@@ -24919,7 +25173,7 @@ msgid ""
"The flag and background color indicate what civilization the city\n"
"belongs to (this will be useful when you meet other civilizations).\n"
"The top row of the bar also shows the name and size of the city, and\n"
-"will show one or more starts to indicate if there are units in the\n"
+"will show one or more stars to indicate if there are units in the\n"
"city. The bottom row shows what the city is building, and how long it\n"
"will take; it also shows how long the city will take to grow to the\n"
"next largest size."
@@ -25013,12 +25267,12 @@ msgstr ""
"vilket inte är användbart förrän senare."
#: data/scenario/tutorial.sav:145
-#, c-format
+#, fuzzy, c-format
msgid ""
"Now your city has grown to size five. As cities get larger unrest\n"
"becomes a problem. A city of this size will usually have one unhappy\n"
"citizen unless pacifying effects are used; meaning one entertainer\n"
-"specialist is required to keep your citzens content. This is basically\n"
+"specialist is required to keep your citizens content. This is basically\n"
"a wasted citizen.\n"
"\n"
"There are several things that can be done about this. One quick fix\n"
@@ -25127,6 +25381,7 @@ msgstr ""
"landskap."
#: data/scenario/tutorial.sav:222
+#, fuzzy
msgid ""
"Your second Settlers should also be used to build a new city.\n"
"Notice how when you move the Settlers away from your existing cities\n"
@@ -25136,7 +25391,7 @@ msgid ""
"existing cities. Generally when building new cities you want to make\n"
"sure that all tiles are covered by at least one city, but after that\n"
"it is best that your cities overlap as little as possible. Spreading\n"
-"out cities properly gives each city access to more resrouces, allowing\n"
+"out cities properly gives each city access to more resources, allowing\n"
"them to grow to larger sizes."
msgstr ""
"Din andra nybyggare bör också användas till att bygga en ny stad.\n"
@@ -25502,3 +25757,61 @@ msgstr "Lag 30"
#: data/default/game.ruleset:160
msgid "Team 31"
msgstr "Lag 31"
+
+#~ msgid "Auth config filename \"%s\" not allowed!"
+#~ msgstr "Rättighetskonfigfilnamn \"%s\" ej tillåtet!"
+
+#~ msgid "The %s of the %s (%s)"
+#~ msgstr "%2$ss %1$s (%3$s)"
+
+#~ msgid ""
+#~ "Illegal alliance structure detected: %s alliance to %s reduced to peace "
+#~ "treaty."
+#~ msgstr ""
+#~ "Otillåten förbundsstruktur påträffad: Det %s förbundet med %s ändrades "
+#~ "till fredsavtal."
+
+# Var "Och blev mer erfaren", men så här kan man kanske undvika genus-problem?
+#~ msgid "And, became more experienced!"
+#~ msgstr "Och skaffade sig mer erfarenhet!"
+
+#~ msgid "We can't take control of server, attempting to kill it."
+#~ msgstr "Vi kunde ej taga kontrol över server, försöker döda den."
+
+#~ msgid "%s territory"
+#~ msgstr "Det %s landet"
+
+#~ msgid "%s territory (%d turn cease-fire)"
+#~ msgid_plural "%s territory (%d turn cease-fire)"
+#~ msgstr[0] "(%s, %d omgång vapenstillestånd)"
+#~ msgstr[1] "(%s, %d omgångar vapenstillestånd)"
+
+#~ msgid "%s territory (%s)"
+#~ msgstr "Det %s landet (%s)"
+
+#~ msgid "City: %s (%s)"
+#~ msgstr "Stad: %s (%s)"
+
+#~ msgid "Unit: %s (%s)"
+#~ msgstr "Trupp: %s (%s)"
+
+#~ msgid "no maximum, "
+#~ msgstr "inget högsta värde, "
+
+#~ msgid "%d unit maximum, "
+#~ msgid_plural "%d units maximum, "
+#~ msgstr[0] "högst %d trupp"
+#~ msgstr[1] "högst %d trupper"
+
+#~ msgid "%d per unit). "
+#~ msgstr "%d per trupp). "
+
+#~ msgid "Select same type"
+#~ msgstr "Välj samma typ"
+
+#~ msgid ""
+#~ "Couldn't find stdfont.ttf file. Please link/copy/move anyunicode ttf font "
+#~ "to data dir as stdfont.ttf"
+#~ msgstr ""
+#~ "Couldn't find stdfont.ttf file. Please link/copy/move anyunicode ttf font "
+#~ "to data dir as stdfont.ttf"
diff --git a/po/tr.gmo b/po/tr.gmo
index 9d932d5..1caa0f2 100644
Binary files a/po/tr.gmo and b/po/tr.gmo differ
diff --git a/po/tr.po b/po/tr.po
index 89cdace..8dac11d 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 07:45+0900\n"
+"POT-Creation-Date: 2009-03-29 21:13+0900\n"
"PO-Revision-Date: 2008-06-01 16:36+0300\n"
"Last-Translator: Uğur Çetin <jnmbk at users.sourceforge.net>\n"
"Language-Team: Turkish <yerellestirme at kde.org.tr>\n"
@@ -640,7 +640,7 @@ msgid "Road"
msgstr "Yol"
#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
-#: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
+#: client/gui-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"
@@ -657,7 +657,7 @@ msgid "Mine"
msgstr "Mayın"
#: common/terrain.c:396 common/unit.c:548 server/report.c:124
-#: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
+#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr "Kirlilik"
@@ -703,7 +703,7 @@ msgstr "Savunmada"
msgid "Sentry"
msgstr "Nöbet Tut"
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:851 client/gui-sdl/menu.c:648
+#: common/unit.c:566 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"
@@ -720,7 +720,7 @@ msgstr "Keşfe Çık"
msgid "Transform"
msgstr "Dönüştür"
-#: common/unit.c:584 client/text.c:106 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:584 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"
@@ -790,11 +790,11 @@ msgstr "Atom bombası"
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1406
+#: common/unittype.c:349 client/helpdata.c:1404
msgid " and "
msgstr " ve "
-#: common/unittype.c:355 client/helpdata.c:1392
+#: common/unittype.c:355 client/helpdata.c:1390
msgid "?and:, "
msgstr ", "
@@ -1375,30 +1375,25 @@ msgstr ""
#: server/auth.c:281
#, c-format
-msgid "Auth config filename \"%s\" not allowed!"
-msgstr "Kimlik ayarı için dosya adı \"%s\" olamaz!"
-
-#: server/auth.c:286
-#, c-format
msgid "Cannot load auth config file \"%s\"!"
msgstr "Kimlik ayarı dosyası \"%s\" açılamadı!"
-#: server/auth.c:397
+#: server/auth.c:392
#, c-format
msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
msgstr ""
"Uyarı: '%s' adını başkası kullanıyor, isminiz '%s' olarak değiştirildi."
-#: server/auth.c:404
+#: server/auth.c:399
msgid "Guests are not allowed on this server. Sorry."
msgstr "Üzgünüm, bu sunucuya misafir olarak girilmez."
-#: server/auth.c:406
+#: server/auth.c:401
#, c-format
msgid "%s was rejected: Guests not allowed."
msgstr "%s reddedildi: Misafir kabul edilmiyor."
-#: server/auth.c:425
+#: server/auth.c:420
#, c-format
msgid ""
"There was an error reading the user database, logging in as guest connection "
@@ -1407,7 +1402,7 @@ msgstr ""
"Kullanıcı veritabanı okunurken bir hata oluştu. Misafir olarak giriliyor: '%"
"s'."
-#: server/auth.c:431
+#: server/auth.c:426
msgid ""
"There was an error reading the user database and guest logins are not "
"allowed. Sorry"
@@ -1415,39 +1410,39 @@ msgstr ""
"Üzgünüm, kullanıcı veritabanı okunurken bir hata oluştu ve misafir girişlere "
"izin verilmiyor."
-#: server/auth.c:434
+#: server/auth.c:429
#, c-format
msgid "%s was rejected: Database error and guests not allowed."
msgstr "%s reddedildi: Veritabanı hatası ve misafirlere izin verilmiyor."
-#: server/auth.c:441
+#: server/auth.c:436
#, c-format
msgid "Enter password for %s:"
msgstr "%s için parolayı girin:"
-#: server/auth.c:450
+#: server/auth.c:445
msgid "Enter a new password (and remember it)."
msgstr "Yeni bir parola girin (ve unutmayın)."
-#: server/auth.c:456
+#: server/auth.c:451
msgid "This server allows only preregistered users. Sorry."
msgstr "Üzgünüm, bu sunucuya sade önceden kayıt yaptıranlar girebilir."
-#: server/auth.c:459
+#: server/auth.c:454
#, c-format
msgid "%s was rejected: Only preregister users allowed."
msgstr "%s reddedildi: Sadece önceden kayıt yaptıranlar izinli."
-#: server/auth.c:488 server/auth.c:547
+#: server/auth.c:483 server/auth.c:542
msgid "Sorry, too many wrong tries..."
msgstr "Üzgünüm, çok fazla hatalı deneme..."
-#: server/auth.c:489
+#: server/auth.c:484
#, c-format
msgid "%s was rejected: Too many wrong password verifies for new user."
msgstr "%s reddedildi: Yeni bir kullanıcı için çok fazla yanlış parola."
-#: server/auth.c:505
+#: server/auth.c:500
msgid ""
"Warning: There was an error in saving to the database. Continuing, but your "
"stats will not be saved."
@@ -1455,31 +1450,31 @@ msgstr ""
"Uyarı: Veritabanına kaydederken bir hata oluştu. Devam ediliyor fakat "
"istatistikler kaydedilmeyecek."
-#: server/auth.c:549
+#: server/auth.c:544
#, c-format
msgid "%s was rejected: Too many wrong password tries."
msgstr "%s reddedildi: Çok fazla hatalı parola denemesi."
-#: server/auth.c:558
+#: server/auth.c:553
msgid "Your password is incorrect. Try again."
msgstr "Parola yanlış, bir daha deneyin."
-#: server/auth.c:569
+#: server/auth.c:564
msgid "Sorry, your connection timed out..."
msgstr "Üzgünüm, bağlantınız zaman aşımına uğradı..."
-#: server/auth.c:571
+#: server/auth.c:566
#, c-format
msgid "%s was rejected: Connection timeout waiting for password."
msgstr "%s reddedildi: Parola beklerken bağlantı zaman aşımına uğradı."
-#: server/auth.c:636
+#: server/auth.c:631
#, c-format
msgid "Your password is too short, the minimum length is %d. Try again."
msgstr ""
"Parolanız çok kısa. En az %d harf ve/veya rakam içermeli. Tekrar deneyin."
-#: server/auth.c:642
+#: server/auth.c:637
#, c-format
msgid ""
"The password must have at least %d capital letters, %d numbers, and be at "
@@ -1989,7 +1984,7 @@ msgstr "Bu sunucu %s içindir"
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:237 manual/civmanual.c:380
+#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
@@ -2022,14 +2017,14 @@ msgstr ""
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:241
+#: server/civserver.c:217 client/civclient.c:242
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:245
+#: server/civserver.c:221 client/civclient.c:246
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"
@@ -2038,7 +2033,7 @@ msgstr ""
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:248 manual/civmanual.c:382
+#: server/civserver.c:225 client/civclient.c:249 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"
@@ -2087,11 +2082,11 @@ msgstr " -r, --read DOSYA\tBaşlama betiği olarak DOSYA'yı oku\n"
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:267 manual/civmanual.c:383
+#: server/civserver.c:247 client/civclient.c:268 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:279
+#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, c-format
@@ -3339,7 +3334,7 @@ msgid "Sea moving start units are not yet supported. Nobody gets %s."
msgstr ""
"Denizde gidebilen başlangıç birimleri henüz desteklenmiyor. Kimse %s alamaz."
-#: server/gamehand.c:310 client/text.c:632
+#: server/gamehand.c:310 client/text.c:691
#, c-format
msgid "Year: %s"
msgstr "Yıl: %s"
@@ -3616,10 +3611,10 @@ 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
-#, c-format
+#, fuzzy, c-format
msgid ""
-"Your nation is thrust into civil war, %s is declared the leader of the "
-"rebel states."
+"Your nation is thrust into civil war! %s is declared the leader of the rebel "
+"states."
msgstr ""
"Ulusunuzda bir iç savaş yaşandı, %s şehri bölünen tarafın başkenti ilan "
"edildi."
@@ -3719,7 +3714,7 @@ msgstr "Araştırma Hızı"
msgid "Literacy"
msgstr "Okur Yazarlık"
-#: server/report.c:121 client/cityrepdata.c:526 client/cityrepdata.c:527
+#: server/report.c:121 client/cityrepdata.c:524 client/cityrepdata.c:525
#: client/gui-sdl/cityrep.c:174
msgid "Production"
msgstr "Ãœretim"
@@ -3868,7 +3863,7 @@ msgstr ""
"İstatistik dizgesi geçersiz karakterler içeriyor. \"help demography\" "
"komutunu deneyin."
-#: server/report.c:743 server/report.c:766
+#: server/report.c:743 server/report.c:768
msgid "Demographics Report:"
msgstr "Ä°statistikler:"
@@ -3876,10 +3871,12 @@ msgstr "Ä°statistikler:"
msgid "Sorry, the Demographics report is unavailable."
msgstr "Üzgünüm, istatistik çıkaramıyoruz."
-#: server/report.c:748
-#, c-format
-msgid "The %s of the %s (%s)"
-msgstr "%s yönetimindeki %s (%s)"
+#. TRANS: <nation adjective> <government name> (<year>).
+#. * E.g. "Polish Despotism (200 AD)".
+#: server/report.c:750
+#, fuzzy, c-format
+msgid "%s %s (%s)"
+msgstr "%s %s ÅŸehrinde (%s)\n"
#. TRANS: message about an installation error.
#: server/ruleset.c:163
@@ -3933,16 +3930,6 @@ msgstr ""
msgid "%s had invalid nation; changing to %s."
msgstr "%s geçersiz bir millete sahip; %s olarak değiştiriliyor."
-#. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4073
-#, c-format
-msgid ""
-"Illegal alliance structure detected: %s alliance to %s reduced to peace "
-"treaty."
-msgstr ""
-"İttifaka uymayan bir yapı görüldü: %s ile %s arasındaki ittifak barış "
-"antlaşması olarak değiştirildi."
-
#: server/settings.c:32
msgid "Geological"
msgstr "Jeolojik"
@@ -5101,9 +5088,10 @@ msgid "Auto-save name prefix"
msgstr "Oto-kayıt isim öneki"
#: server/settings.c:1016
+#, fuzzy
msgid ""
-"Automatically saved games will have name \"<prefix><year>.sav\". This "
-"setting sets the <prefix> part."
+"Automatically saved games will have name \"<prefix>-T<turn>-Y<year>.sav\". "
+"This setting sets the <prefix> part."
msgstr ""
"Kendiliğinden kaydolan oyunların adları \"<önek><yıl>.sav\" şeklinde olur. "
"Bu ayar <önek> kısmı içindir."
@@ -5122,11 +5110,11 @@ msgstr ""
"\"civscore.log\" dosyasına eklenecektir. Bu istatistikler oyundan sonra güç "
"grafiğini oluşturmak için kullanılabilir."
-#: server/sernet.c:147
+#: server/sernet.c:150
msgid "Server cannot read standard input. Ignoring input."
msgstr "Sunucu standart girdileri okuyamaz. Girdileri deÄŸerlendirmiyor."
-#: server/sernet.c:922
+#: server/sernet.c:929
#, c-format
msgid "Server: bad address: [%s:%d]."
msgstr "Sunucu: geçersiz adres: [%s:%d]."
@@ -5251,112 +5239,112 @@ msgstr ""
"%s ve %s arasındaki ateşkes bitti. Artık savaştalar. İkisiyle olan "
"ittifakınız iptal edildi."
-#: server/srv_main.c:928
+#: server/srv_main.c:961
#, c-format
msgid "Failed saving game as %s"
msgstr "Oyun %s olarak kaydedilemedi"
-#: server/srv_main.c:930
+#: server/srv_main.c:963
#, c-format
msgid "Game saved as %s"
msgstr "Oyun %s olarak kaydedildi"
-#: server/srv_main.c:962
+#: server/srv_main.c:994
msgid "The game is already running."
msgstr "Oyun zaten başladı."
-#: server/srv_main.c:970
+#: server/srv_main.c:1002
#, c-format
msgid "%s lost control cmdlevel on game start. Use voting from now on."
msgstr ""
-#: server/srv_main.c:977
+#: server/srv_main.c:1009
msgid "Starting game."
msgstr "Oyun başlıyor."
-#: server/srv_main.c:1039
+#: server/srv_main.c:1071
#, c-format
msgid "request for unknown report (type %d)"
msgstr ""
-#: server/srv_main.c:1104
+#: server/srv_main.c:1136
#, c-format
msgid "Warning: rejecting old client %s"
msgstr "Uyarı: eski istemci %s reddedildi"
-#: server/srv_main.c:1206
+#: server/srv_main.c:1238
#, c-format
msgid "Got a packet of type %d from a dead or observer player"
msgstr ""
-#: server/srv_main.c:1306
+#: server/srv_main.c:1338
msgid "Please choose a non-blank name."
msgstr "Lütfen boş olmayan bir isim seçin."
-#: server/srv_main.c:1322
+#: server/srv_main.c:1354
msgid "That nation is already in use."
msgstr "Bu ulusu başkası almış."
-#: server/srv_main.c:1338
+#: server/srv_main.c:1370
#, 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:1359
+#: server/srv_main.c:1391
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:1458
+#: server/srv_main.c:1490
#, c-format
msgid "%s nation is not available in this scenario."
msgstr "Bu senaryoda %s ulusu yok."
-#: server/srv_main.c:1464
+#: server/srv_main.c:1496
#, c-format
msgid "%s nation is already in use."
msgstr "%s ulusunu başkası almış."
-#: server/srv_main.c:1482
+#: server/srv_main.c:1514
#, c-format
msgid "%s is the %s ruler %s."
msgstr "%s, %s ulusunun önderi %s."
-#: server/srv_main.c:1538
+#: server/srv_main.c:1570
#, 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:1582 server/srv_main.c:1586
+#: server/srv_main.c:1614 server/srv_main.c:1618
#, 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:1728
+#: server/srv_main.c:1760
#, c-format
msgid "Player %d"
msgstr "Oyuncu %d"
-#: server/srv_main.c:1739 server/srv_main.c:1745
+#: server/srv_main.c:1771 server/srv_main.c:1777
#, c-format
msgid "%s rules the %s."
msgstr "%2$s tarafına %1$s hükmediyor."
-#: server/srv_main.c:1910
+#: server/srv_main.c:1942
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
msgstr ""
-#: server/srv_main.c:1961
+#: server/srv_main.c:1993
#, c-format
msgid "Sending info to metaserver [%s]"
msgstr "Bilgiler metasunucuya gönderiliyor [%s]"
-#: server/srv_main.c:1992
+#: server/srv_main.c:2024
msgid "The game is over..."
msgstr "Oyun bitti..."
-#: server/srv_main.c:2205
+#: server/srv_main.c:2237
msgid "Now accepting new client connections."
msgstr "Yeni istemcilerin bağlantıları kabul ediliyor."
@@ -6151,24 +6139,24 @@ msgid "Barbarian"
msgstr "Barbar"
#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2030 client/gui-sdl/plrdlg.c:645
+#: client/gui-gtk-2.0/pages.c:2102 client/gui-sdl/plrdlg.c:645
#: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
msgid "AI"
msgstr "YZ"
#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
+#: 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
msgid "Human"
msgstr "Ä°nsan"
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
-#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
+#: 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
msgid "Alive"
msgstr "Canlı"
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
#: client/gui-win32/connectdlg.c:200
msgid "Dead"
msgstr "Ölü"
@@ -6435,9 +6423,9 @@ 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:242
-#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
-#: client/text.c:1201
+#: 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
#, c-format
msgid "?clistmore:, %s"
msgstr ", %s"
@@ -6694,7 +6682,7 @@ msgstr "Sadece %s birimi denizden saldırabilir."
msgid "Cannot attack from sea."
msgstr "Denizden saldırılamaz."
-#: server/unithand.c:996 server/unittools.c:2103
+#: server/unithand.c:996 server/unittools.c:2137
msgid "Cannot attack unless you declare war first."
msgstr "Savaş ilan etmeden saldırılamaz."
@@ -6795,102 +6783,103 @@ msgid "%s was upgraded for free to %s."
msgstr "%s ücretsiz olarak %s birimine yükseltildi."
#: server/unittools.c:297
-#, c-format
-msgid "Not enough gold. %s disbanded"
+#, fuzzy, c-format
+msgid "Not enough gold to pay upkeep for %s. Unit disbanded."
msgstr "Altın yetersiz. %s terhis edildi"
-#: server/unittools.c:342
+#: server/unittools.c:343
#, c-format
msgid "Your %s has run out of hit points."
msgstr "%s biriminizin sağlığı kalmadı."
-#: server/unittools.c:358
+#: server/unittools.c:359
#, c-format
msgid "Your %s has been lost on the high seas."
msgstr "%s açık denizde battı."
-#: server/unittools.c:365
+#: server/unittools.c:366
#, c-format
msgid "Your %s survived on the high seas and became more experienced!"
msgstr "%s biriminiz açık denizde hayatta kalabildi ve kıdemi arttı!"
-#: server/unittools.c:376
+#: server/unittools.c:377
#, c-format
msgid "Your %s has been lost on unsafe terrain."
msgstr "%s biriminiz güvenli olmayan arazide kayboldu."
-#: server/unittools.c:430
+#: server/unittools.c:431
#, c-format
msgid "Your %s has returned to refuel."
msgstr "%s biriminiz yakıt doldurmak için geri döndü."
-#: server/unittools.c:454
+#: server/unittools.c:455
#, c-format
msgid "Your %s has run out of fuel."
msgstr "%s biriminizin yakıtı bitti."
-#. TRANS: And, <the unit> became ...
-#: server/unittools.c:616
-msgid "And, became more experienced!"
-msgstr "Ve kıdemi arttı!"
-
#. TRANS: Your <unit> became ...
-#: server/unittools.c:620
+#: server/unittools.c:619
#, c-format
msgid "Your %s became more experienced!"
msgstr "%s biriminizin kıdemi arttı!"
-#: server/unittools.c:1011
+#: server/unittools.c:1009
#, c-format
msgid "Teleported your %s to %s."
msgstr "%s biriminiz %s şehrine taşındı."
-#: server/unittools.c:1041
+#. TRANS: A unit is moved to resolve stack conflicts.
+#: server/unittools.c:1065
+#, fuzzy, c-format
+msgid "Moved your %s."
+msgstr "%s biriminiz terhis edildi."
+
+#: server/unittools.c:1076
#, c-format
msgid "Disbanded your %s."
msgstr "%s biriminiz terhis edildi."
-#: server/unittools.c:1363
+#: server/unittools.c:1397
#, 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:1367
+#: server/unittools.c:1401
#, 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:1469
+#: server/unittools.c:1503
#, 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:1478
+#: server/unittools.c:1512
#, c-format
msgid "%s lost when %s was lost."
msgstr "%s, %s ile birlikte kaybedildi."
-#: server/unittools.c:1527
+#: server/unittools.c:1561
#, 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:1545
+#: server/unittools.c:1579
#, 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:1554 server/unittools.c:1612
+#: server/unittools.c:1588 server/unittools.c:1646
#, 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:1588
+#: server/unittools.c:1622
#, c-format
msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
msgid_plural ""
@@ -6899,7 +6888,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:1621
+#: server/unittools.c:1655
#, c-format
msgid "%s lost when the %s %s attacked the %s %s."
msgstr ""
@@ -6907,7 +6896,7 @@ msgstr ""
#. TRANS: "Musketeers (and Cannon) lost to an
#. * attack from the Polish Destroyer."
-#: server/unittools.c:1636
+#: server/unittools.c:1670
#, c-format
msgid "%s (and %s) lost to an attack from the %s %s."
msgstr "%s (ve %s), %s %s birimine yenildi."
@@ -6915,7 +6904,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:1646
+#: server/unittools.c:1680
#, 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."
@@ -6924,7 +6913,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:1660
+#: server/unittools.c:1694
#, 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."
@@ -6932,187 +6921,187 @@ msgstr[0] ""
"%2$s %3$s biriminin %4$s %5$s birimine saldırması sonucu %1$d birim "
"kaybedildi."
-#: server/unittools.c:1928
+#: server/unittools.c:1962
#, c-format
msgid "Your %s was nuked by %s."
msgstr "%s biriminiz %s tarafından bombalandı."
-#: server/unittools.c:1931 server/unittools.c:1947
+#: server/unittools.c:1965 server/unittools.c:1981
msgid "yourself"
msgstr "kendiniz"
-#: server/unittools.c:1935
+#: server/unittools.c:1969
#, c-format
msgid "The %s %s was nuked."
msgstr "%s tarafındaki %s nükleer bomba ile vuruldu."
-#: server/unittools.c:1944
+#: server/unittools.c:1978
#, c-format
msgid "%s was nuked by %s."
msgstr "%s, %s tarafından bombalandı."
-#: server/unittools.c:1952
+#: server/unittools.c:1986
#, c-format
msgid "You nuked %s."
msgstr "%s şehrini bombaladınız."
-#: server/unittools.c:1993
+#: server/unittools.c:2027
#, c-format
msgid "The %s detonated a nuke!"
msgstr "%s nükleer bomba patlattı!"
-#: server/unittools.c:2017
+#: server/unittools.c:2051
#, c-format
msgid "%s transported successfully."
msgstr "%s başarıyla taşındı."
-#: server/unittools.c:2069
+#: server/unittools.c:2103
msgid "This unit type can not be paradropped."
msgstr "Bu tür birimler paraşütle inemez."
-#: server/unittools.c:2079
+#: server/unittools.c:2113
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:2085
+#: server/unittools.c:2119
msgid "The destination location is not known."
msgstr "Hedef bölge bilinmiyor."
-#: server/unittools.c:2092
+#: server/unittools.c:2126
#, c-format
msgid "This unit cannot paradrop into %s."
msgstr "Bu birin %s içine atlayış yapamaz."
-#: server/unittools.c:2112
+#: server/unittools.c:2146
#, 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:2123
+#: server/unittools.c:2157
#, 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:2136
+#: server/unittools.c:2170
#, 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:2158
+#: server/unittools.c:2192
#, c-format
msgid "You found %d gold."
msgstr "Hazine buldunuz (%d altın)."
-#: server/unittools.c:2175
+#: server/unittools.c:2209
#, c-format
msgid "You found %s in ancient scrolls of wisdom."
msgstr "Antik yazıtlardan %s teknolojisini öğrendiniz."
-#: server/unittools.c:2182
+#: server/unittools.c:2216
#, c-format
msgid "The %s have acquired %s from ancient scrolls of wisdom."
msgstr "%s antik yazıtlardan %s öğrenmişler."
-#: server/unittools.c:2196
+#: server/unittools.c:2230
msgid "A band of friendly mercenaries joins your cause."
msgstr "Paralı askerler size katıldı."
-#: server/unittools.c:2214
+#: server/unittools.c:2248
msgid "An abandoned village is here."
msgstr "Terk edinmiÅŸ bir ÅŸehir buldunuz."
-#: server/unittools.c:2224
+#: server/unittools.c:2258
msgid "You have unleashed a horde of barbarians!"
msgstr "Barbarların yuvasını buldunuz!"
-#: server/unittools.c:2227
+#: server/unittools.c:2261
#, c-format
msgid "Your %s has been killed by barbarians!"
msgstr "%s biriminiz barbarlar tarafından öldürüldü!"
-#: server/unittools.c:2243
+#: server/unittools.c:2277
msgid "You found a friendly city."
msgstr "KardeÅŸ ÅŸehir buldunuz."
-#: server/unittools.c:2257
+#: server/unittools.c:2291
msgid "Friendly nomads are impressed by you, and join you."
msgstr "Dost canlısı göçebeler size katıldılar."
-#: server/unittools.c:2282
+#: server/unittools.c:2316
msgid "Your overflight frightens the tribe; they scatter in terror."
msgstr "Uçaktan korkan kabile korku içinde saklanacak yer aradı."
-#: server/unittools.c:2540
+#: server/unittools.c:2574
#, 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:2989
+#: server/unittools.c:3023
#, 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:3041
+#: server/unittools.c:3075
#, 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:3054
+#: server/unittools.c:3088
#, 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:3068
+#: server/unittools.c:3102
#, 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:3078
+#: server/unittools.c:3112
#, 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:3104
+#: server/unittools.c:3138
#, 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:3145
+#: server/unittools.c:3179
#, c-format
msgid "Attempt to change homecity for %s failed."
msgstr "%s biriminin memleketi deÄŸiÅŸtirilemedi."
-#: server/unittools.c:3156
+#: server/unittools.c:3190
#, c-format
msgid "Attempt to establish trade route for %s failed."
msgstr "%s şehriyle ticaret yolu yapılamadı."
-#: server/unittools.c:3168
+#: server/unittools.c:3202
#, c-format
msgid "Attempt to build wonder for %s failed."
msgstr "%s şehrinde harika yapımı başarısız oldu."
-#: server/unittools.c:3177
+#: server/unittools.c:3211
#, c-format
msgid "Your %s has invalid orders."
msgstr "%s biriminiz geçersiz emirler almış."
-#: server/generator/mapgen.c:1737
+#: server/generator/mapgen.c:1771
msgid "High landmass - this may take a few seconds."
msgstr "Yüksek kara parçası - bu birkaç saniye alabilir."
-#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
+#: server/generator/mapgen.c:1969 server/generator/mapgen.c:2039
#, c-format
msgid "Falling back to generator %d."
msgstr "Üretici %d kullanılıyor."
-#: server/generator/mapgen.c:2025
+#: server/generator/mapgen.c:2059
msgid "Generator 3 didn't place all big islands."
msgstr "Üretici 3 bütün büyük adaları yerleştirmedi."
-#: server/generator/mapgen.c:2054
+#: server/generator/mapgen.c:2088
#, c-format
msgid "Generator 3 left %li landmass unplaced."
msgstr "Üretici 3 %li kara parçasını yapamadı."
@@ -7214,7 +7203,7 @@ msgid "%3d turn"
msgid_plural "%3d turns"
msgstr[0] "%3d sıra"
-#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:631
#: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
@@ -7331,335 +7320,336 @@ msgstr "?city_state:Barış"
msgid "(worklist)"
msgstr "(iÅŸ listesi)"
-#: client/cityrepdata.c:447
-msgid "Special"
-msgstr "Spesiyal"
+#: client/cityrepdata.c:446
+msgid "?city:Name"
+msgstr "Adı"
-#: client/cityrepdata.c:448
-msgid "?entertainers/scientists/taxmen:E/S/T"
-msgstr "?işçiler/bilim adamları/mültezimler:İ/B/M"
+#: client/cityrepdata.c:446 client/gui-sdl/cityrep.c:169
+msgid "City Name"
+msgstr "Şehir Adı"
-#: client/cityrepdata.c:449
-msgid "Entertainers, Scientists, Taxmen"
-msgstr "İşçiler, Bilim adamları, Mültezimler"
+#: client/cityrepdata.c:448
+msgid "?size [short]:Sz"
+msgstr "?boyut [kısa]:By."
-#: client/cityrepdata.c:452
-msgid "Concise + Rapture, - Disorder"
-msgstr "Özlü + Coşkun, - Kargaşa"
+#: client/cityrepdata.c:448
+msgid "Size"
+msgstr "Boyut"
-#: client/cityrepdata.c:454 client/plrdlg_common.c:261
+#: client/cityrepdata.c:450 client/plrdlg_common.c:261
#: client/gui-win32/plrdlg.c:337
msgid "State"
msgstr "Durum"
-#: client/cityrepdata.c:454
+#: client/cityrepdata.c:450
msgid "Rapture/Peace/Disorder"
msgstr "Coşkun/Barış/Kargaşa"
+#: client/cityrepdata.c:452
+#, fuzzy
+msgid "Concise *=Rapture, X=Disorder"
+msgstr "Özlü + Coşkun, - Kargaşa"
+
+#: client/cityrepdata.c:456
+msgid "Special"
+msgstr "Spesiyal"
+
#: client/cityrepdata.c:457
+msgid "?entertainers/scientists/taxmen:E/S/T"
+msgstr "?işçiler/bilim adamları/mültezimler:İ/B/M"
+
+#: client/cityrepdata.c:458
+msgid "Entertainers, Scientists, Taxmen"
+msgstr "İşçiler, Bilim adamları, Mültezimler"
+
+#: client/cityrepdata.c:461
msgid "?Happy workers:H"
msgstr "?Mutlu İşçiler:H"
-#: client/cityrepdata.c:457
+#: client/cityrepdata.c:461
msgid "Workers: Happy"
msgstr "İşçiler: Mutlu"
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
msgid "?Content workers:C"
msgstr "?memnun İşçiler:C"
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
msgid "Workers: Content"
msgstr "İşçiler: Memnun"
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
msgid "?Unhappy workers:U"
msgstr "?Mutsuz İşçiler:U"
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
msgid "Workers: Unhappy"
msgstr "İşçiler: Mutsuz"
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
msgid "?Angry workers:A"
msgstr "?Öfkeli İşçiler:A"
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
msgid "Workers: Angry"
msgstr "İşçiler: Öfkeli"
-#: client/cityrepdata.c:465 client/gui-xaw/citydlg.c:2401
-#: data/default/units.ruleset:238
-msgid "Workers"
+#: client/cityrepdata.c:469 client/gui-xaw/citydlg.c:2402
+#, fuzzy
+msgid "?city:Workers"
msgstr "İşçiler"
-#: client/cityrepdata.c:466
+#: client/cityrepdata.c:470
msgid "?happy/content/unhappy/angry:H/C/U/A"
msgstr "?mutlu/memnun/mutsuz/öfkeli:H/C/U/A"
-#: client/cityrepdata.c:467
+#: client/cityrepdata.c:471
msgid "Workers: Happy, Content, Unhappy, Angry"
msgstr "İşçiler: Mutlu, Memnun, Mutsuz, Öfkeli"
-#: client/cityrepdata.c:470 client/cityrepdata.c:472
+#: client/cityrepdata.c:474 client/cityrepdata.c:476
msgid "Best"
msgstr "En Ä°yi"
-#: client/cityrepdata.c:470
+#: client/cityrepdata.c:474
msgid "attack"
msgstr "saldırı"
-#: client/cityrepdata.c:471
+#: client/cityrepdata.c:475
msgid "Best attacking units"
msgstr "En İyi Saldırabilen Birimler"
-#: client/cityrepdata.c:472
+#: client/cityrepdata.c:476
msgid "defense"
msgstr "savunma"
-#: client/cityrepdata.c:473
+#: client/cityrepdata.c:477
msgid "Best defending units"
msgstr "En Ä°yi Savunabilen Birimler"
-#: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
-#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
-#: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
-#: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
-#: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
-#: client/gui-win32/menu.c:351 client/gui-win32/repodlgs.c:616
-#: client/gui-win32/repodlgs.c:707 client/gui-win32/repodlgs.c:716
-#: client/gui-xaw/menu.c:157 client/gui-xaw/menu.c:219
-#: client/gui-xaw/menu.c:242 client/gui-xaw/repodlgs.c:881
-#: client/gui-xaw/repodlgs.c:1069 data/Freeciv.in:1895 data/helpdata.txt:909
+#: client/cityrepdata.c:478 client/cityrepdata.c:482
+#: client/gui-gtk-2.0/cityrep.c:1437 client/gui-gtk-2.0/cityrep.c:1456
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-gtk-2.0/cityrep.c:1494
+#: client/gui-gtk-2.0/cityrep.c:1514 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/repodlgs.c:960 client/gui-sdl/helpdlg.c:688
+#: client/gui-sdl/mapctrl.c:1605 client/gui-sdl/optiondlg.c:1827
+#: client/gui-sdl/repodlgs.c:356 client/gui-win32/menu.c:351
+#: client/gui-win32/repodlgs.c:616 client/gui-win32/repodlgs.c:707
+#: client/gui-win32/repodlgs.c:716 client/gui-xaw/menu.c:157
+#: client/gui-xaw/menu.c:219 client/gui-xaw/menu.c:242
+#: client/gui-xaw/repodlgs.c:881 client/gui-xaw/repodlgs.c:1069
+#: data/Freeciv.in:1895 data/helpdata.txt:909
msgid "Units"
msgstr "Birimler"
#. TRANS: Header "Number of units inside city"
-#: client/cityrepdata.c:476
+#: client/cityrepdata.c:480
msgid "?Present (units):Here"
msgstr "?Present (units):Burada"
-#: client/cityrepdata.c:477
+#: client/cityrepdata.c:481
msgid "Number of units present"
msgstr "Toplam Birim Sayısı"
#. TRANS: Header "Number of units supported by given city"
-#: client/cityrepdata.c:480
+#: client/cityrepdata.c:484
msgid "?Supported (units):Owned"
msgstr "?Supported (units):Kendi Birimler"
-#: client/cityrepdata.c:481
+#: client/cityrepdata.c:485
msgid "Number of units supported"
msgstr "Desteklenen birlim sayısı"
#. TRANS: Header "It will take this many turns before city grows"
-#: client/cityrepdata.c:484
+#: client/cityrepdata.c:488
msgid "?food (population):Grow"
msgstr "?gıda (nüfus):Büyüme"
-#: client/cityrepdata.c:485 client/cityrepdata.c:530
+#: client/cityrepdata.c:489 client/cityrepdata.c:528
msgid "?Stock/Target:(Have/Need)"
msgstr "?Stok/Hedef:(Varlık/İhtiyaç)"
-#: client/cityrepdata.c:486
+#: client/cityrepdata.c:490
msgid "Turns until growth/famine"
msgstr "Büyüme/Kıtlık sırası"
-#: client/cityrepdata.c:488
-msgid "?size [short]:Sz"
-msgstr "?boyut [kısa]:By."
-
-#: client/cityrepdata.c:488
-msgid "Size"
-msgstr "Boyut"
-
-#: client/cityrepdata.c:492
-msgid "?city:Name"
-msgstr "Adı"
-
-#: client/cityrepdata.c:492 client/gui-sdl/cityrep.c:169
-msgid "City Name"
-msgstr "Şehir Adı"
-
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
msgid "Surplus"
msgstr "Bakiye"
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
msgid "?food/production/trade:F/P/T"
msgstr "?gıda/üretim/ticaret:G/Ü/T"
-#: client/cityrepdata.c:496
+#: client/cityrepdata.c:494
msgid "Surplus: Food, Production, Trade"
msgstr "Bakiye: Gıda, Üretim, Ticaret"
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
msgid "?Food surplus [short]:+F"
msgstr "?Gıda Bakiye [kısa]:+G"
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
msgid "Surplus: Food"
msgstr "Bakiye: Gıda"
-#: client/cityrepdata.c:500
+#: client/cityrepdata.c:498
msgid "?Production surplus [short]:+P"
msgstr "?Üretim Bakiye [kısa]:+Ü"
-#: client/cityrepdata.c:501
+#: client/cityrepdata.c:499
msgid "Surplus: Production"
msgstr "Bakiye: Ãœretim"
-#: client/cityrepdata.c:502
+#: client/cityrepdata.c:500
msgid "?Production loss (waste) [short]:-P"
msgstr "?Üretim kayıbı (atık) [kisa]:-K"
-#: client/cityrepdata.c:503
+#: client/cityrepdata.c:501
msgid "Waste"
msgstr "Bakiye: Atık"
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
msgid "?Trade surplus [short]:+T"
msgstr "?Ticaret Bakiye [kısa]:+T"
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
msgid "Surplus: Trade"
msgstr "Bakiye: Ticaret"
-#: client/cityrepdata.c:506
+#: client/cityrepdata.c:504
msgid "?Trade loss (corruption) [short]:-T"
msgstr "?Trade loss (corruption) [short]:-A"
-#: client/cityrepdata.c:507
+#: client/cityrepdata.c:505
msgid "Corruption"
msgstr "Yolsuzluk"
-#: client/cityrepdata.c:509 client/gui-gtk-2.0/repodlgs.c:654
+#: client/cityrepdata.c:507 client/gui-gtk-2.0/repodlgs.c:654
#: client/gui-sdl/mapctrl.c:1400 client/gui-win32/repodlgs.c:334
#: client/gui-xaw/menu.c:222 client/gui-xaw/repodlgs.c:644
#: client/gui-xaw/repodlgs.c:773 data/Freeciv.in:1819
msgid "Economy"
msgstr "Ekonomi"
-#: client/cityrepdata.c:509
+#: client/cityrepdata.c:507
msgid "?gold/luxury/science:G/L/S"
msgstr "?altın/lüks/bilim:A/L/B"
-#: client/cityrepdata.c:510
+#: client/cityrepdata.c:508
msgid "Economy: Gold, Luxuries, Science"
msgstr "Ekonomi: Altın, Lüks, Bilim"
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
msgid "?Gold:G"
msgstr "?Altın:A"
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
msgid "Economy: Gold"
msgstr "Ekonomi: Altın"
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
msgid "?Luxury:L"
msgstr "?Lüks:L"
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
msgid "Economy: Luxury"
msgstr "Ekonomi: Lüks"
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
msgid "?Science:S"
msgstr "?Bilim:B"
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
msgid "Economy: Science"
msgstr "Ekonomi: Bilim"
-#: client/cityrepdata.c:518
+#: client/cityrepdata.c:516
msgid "?number_trade_routes:n"
msgstr "?number_trade_routes:y"
-#: client/cityrepdata.c:518
+#: client/cityrepdata.c:516
msgid "?number_trade_routes:R"
msgstr "?number_trade_routes:Y"
-#: client/cityrepdata.c:519
+#: client/cityrepdata.c:517
msgid "Number of Trade Routes"
msgstr "Ticaret Yolu Sayısı"
-#: client/cityrepdata.c:521
+#: client/cityrepdata.c:519
msgid "?pollution [short]:Pol"
msgstr "?pollution [short]:Kırl."
-#: client/cityrepdata.c:523
+#: client/cityrepdata.c:521
msgid "?cma:Governor"
msgstr "?cma:Vali"
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
-#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
-#: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
-#: data/Freeciv.in:1459 data/helpdata.txt:820
+#: client/cityrepdata.c:521 client/gui-gtk-2.0/cityrep.c:1766
+#: client/gui-sdl/citydlg.c:3809 client/gui-sdl/cma_fe.c:858
+#: client/gui-win32/citydlg.c:726 data/Freeciv.in:1459 data/helpdata.txt:820
msgid "Citizen Governor"
msgstr "Vali"
-#: client/cityrepdata.c:526
+#: client/cityrepdata.c:524
msgid "Turns/Buy"
msgstr "Sıra/Satın Alma"
-#: client/cityrepdata.c:529 client/cityrepdata.c:531
+#: client/cityrepdata.c:527 client/cityrepdata.c:529
msgid "Currently Building"
msgstr "Yapılmakta"
-#: client/cityrepdata.c:575
+#: client/cityrepdata.c:573
msgid "?specialist:S"
msgstr "?Uzman:U"
-#: client/cityrepdata.c:578
+#: client/cityrepdata.c:576
msgid "Specialists"
msgstr "Uzmanlar"
-#: client/civclient.c:239
+#: client/civclient.c:240
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr " -a, --autoconnect\tBağlantı penceresini atla\n"
-#: client/civclient.c:249
+#: client/civclient.c:250
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:251
+#: client/civclient.c:252
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:253
+#: client/civclient.c:254
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:255
+#: client/civclient.c:256
msgid " -p, --port PORT\tConnect to server port PORT (usually with -a)\n"
msgstr ""
-#: client/civclient.c:257
+#: client/civclient.c:258
#, c-format
msgid " -P, --Plugin PLUGIN\tUse PLUGIN for sound output %s\n"
msgstr ""
-#: client/civclient.c:259
+#: client/civclient.c:260
msgid " -r, --read FILE\tRead startup script FILE (for spawned server only)\n"
msgstr ""
-#: client/civclient.c:262
+#: client/civclient.c:263
msgid " -s, --server HOST\tConnect to the server at HOST (usually with -a)\n"
msgstr ""
-#: client/civclient.c:264
+#: client/civclient.c:265
msgid " -S, --Sound FILE\tRead sound tags from FILE\n"
msgstr ""
-#: client/civclient.c:265
+#: client/civclient.c:266
msgid " -t, --tiles FILE\tUse data file FILE.tilespec for tiles\n"
msgstr ""
-#: client/civclient.c:268
+#: client/civclient.c:269
#, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -7667,144 +7657,154 @@ msgid ""
msgstr ""
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:273
+#: client/civclient.c:274
#, c-format
msgid "Report bugs at %s\n"
msgstr "Hataları %s adresine bildiriniz\n"
-#: client/civclient.c:297
+#: client/civclient.c:298
#, c-format
msgid "Invalid port \"%s\" specified with --port option.\n"
msgstr ""
-#: client/civclient.c:299 client/civclient.c:314
+#: client/civclient.c:300 client/civclient.c:315
msgid "Try using --help.\n"
msgstr "-- help kullanmaya bir dene\n"
-#: client/civclient.c:312
+#: client/civclient.c:313
#, c-format
msgid "Invalid debug level \"%s\" specified with --debug option.\n"
msgstr ""
-#: client/civclient.c:325
+#: client/civclient.c:326
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr "Tanınmayan ayar: \"%s\"\n"
-#: client/civclient.c:539
+#: client/civclient.c:391
+#, fuzzy, c-format
+msgid "Updating old metaserver address \"%s\"."
+msgstr "metaserver <adres>"
+
+#: client/civclient.c:394
+#, fuzzy, c-format
+msgid "Default metaserver has been set to \"%s\"."
+msgstr "Ayar: %s ayarı \"%s\" olarak değiştirildi."
+
+#: client/civclient.c:550
msgid "Game started."
msgstr "Oyun başladı."
-#: client/civclient.c:577
+#: client/civclient.c:588
msgid "There was an error while auto connecting; aborting."
msgstr "Otomatik bağlanırken bir hata oluştu, iptal ediliyor."
-#: client/climisc.c:176
+#: client/climisc.c:177
#, c-format
msgid "Changing production of every %s into %s."
msgstr "Her %s üretimi %s olarak değiştirildi."
-#: client/climisc.c:214
+#: client/climisc.c:215
msgid "?embassy:Both"
msgstr "Ä°kimizde de"
-#: client/climisc.c:216
+#: client/climisc.c:217
msgid "?embassy:Yes"
msgstr "Onlarda"
-#: client/climisc.c:219
+#: client/climisc.c:220
msgid "?embassy:With Us"
msgstr "Bizim tarafta"
-#: client/climisc.c:222
+#: client/climisc.c:223
msgid "?embassy:Contact"
msgstr "Karşılaştık"
-#: client/climisc.c:224
+#: client/climisc.c:225
msgid "?embassy:No Contact"
msgstr "?embassy:Karşılaşmadık"
-#: client/climisc.c:236
+#: client/climisc.c:237
msgid "?vision:Both"
msgstr "Ä°kimizde de"
-#: client/climisc.c:238
+#: client/climisc.c:239
msgid "?vision:To Them"
msgstr "Onlara"
-#: client/climisc.c:241
+#: client/climisc.c:242
msgid "?vision:To Us"
msgstr "Bize"
-#: client/climisc.c:257 client/climisc.c:264
+#: client/climisc.c:258 client/climisc.c:265
#, c-format
msgid "The %s give %s"
msgstr "%s %s veriyorlar"
-#: client/climisc.c:268
+#: client/climisc.c:269
#, c-format
msgid "The %s give unknown city."
msgstr "%s bilinmeyen bir ÅŸehir verecek."
-#: client/climisc.c:273
+#: client/climisc.c:274
#, c-format
msgid "The %s give %d gold"
msgstr "%s, %d altın verecek"
-#: client/climisc.c:278
+#: client/climisc.c:279
#, c-format
msgid "The %s give their worldmap"
msgstr "%s dünya haritasını verecek"
-#: client/climisc.c:282
+#: client/climisc.c:283
#, c-format
msgid "The %s give their seamap"
msgstr "%s deniz haritasını verecek"
-#: client/climisc.c:286
+#: client/climisc.c:287
msgid "The parties agree on a cease-fire"
msgstr "Ä°ki taraf da ateÅŸkes yapacak"
-#: client/climisc.c:289
+#: client/climisc.c:290
msgid "The parties agree on a peace"
msgstr "İki taraf arasında barış olacak"
-#: client/climisc.c:292
+#: client/climisc.c:293
msgid "The parties create an alliance"
msgstr "İki taraf birbirinin müttefiki olacak"
-#: client/climisc.c:295
+#: client/climisc.c:296
#, c-format
msgid "The %s give shared vision"
msgstr "%s görüş sahasını paylaşıyor"
-#: client/climisc.c:299
+#: client/climisc.c:300
#, c-format
msgid "The %s give an embassy"
msgstr "%s büyükelçilik veriyorlar."
-#: client/climisc.c:902
+#: client/climisc.c:906
msgid "Popup Request"
msgstr "Açılır İstek"
-#: client/climisc.c:932
+#: client/climisc.c:936
msgid "Exporting output window to civgame.log ..."
msgstr "Çıktı penceresini civgame.log'a aktarıyor ..."
-#: client/climisc.c:936
+#: client/climisc.c:940
msgid "Export complete."
msgstr "Kaydı tamam."
-#: client/climisc.c:938
+#: client/climisc.c:942
msgid "Export failed, couldn't write to file."
msgstr "Kaydı olmadı: dosya yaratılamadı."
-#: client/climisc.c:1038
+#: client/climisc.c:1042
#, c-format
msgid "You don't buy %s in %s!"
msgstr "%2$s şehrinde %1$s satın almadınız!"
-#: client/climisc.c:1056
+#: client/climisc.c:1060
#, c-format
msgid "%s costs %d gold and you only have %d gold."
msgstr "%s size %d altına mal olacak ama sizin %d altınınız var."
@@ -7848,19 +7848,19 @@ msgid ""
"%d times"
msgstr ""
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1289
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
msgid "novice"
msgstr "acemi"
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1289
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1358
msgid "easy"
msgstr "kolay"
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1290
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
msgid "normal"
msgstr "normal"
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1290
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
msgid "hard"
msgstr "zor"
@@ -7889,38 +7889,42 @@ msgid "We probably couldn't start it from here."
msgstr "Galiba buradan başlatamadık."
#: client/connectdlg_common.c:470
-msgid "We have control of the server (command access level hack)"
+#, 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
-msgid "We can't take control of server, attempting to kill it."
-msgstr "Sunucunun kontrolünü ele geçiremedik, öldürmeye çalışıyor."
+msgid ""
+"Failed to obtain the required access level to take control of the server. "
+"The server will now be shutdown."
+msgstr ""
-#: client/control.c:1104
+#: client/control.c:1123
msgid "Only transporter units can be unloaded."
msgstr "Sadece taşıyıcı birimler boşaltabilir."
-#: client/control.c:1353
+#: client/control.c:1425
msgid "Only settler units can be put into auto mode."
msgstr "Sadece göçmen birimleri otomatik moda alınabilir."
-#: client/control.c:1444
+#: client/control.c:1516
msgid "Only nuclear units can do this."
msgstr "Sadece nükleer birimler bunu yapabilir."
-#: client/control.c:1473
+#: client/control.c:1545
msgid "Only paratrooper units can do this."
msgstr "Sadece paraşütçü birimler bunu yapabilir."
-#: client/control.c:1921
+#: client/control.c:2020
msgid "Too far for this unit."
msgstr "Bu birim için fazla uzak."
-#: client/control.c:2131 client/control.c:2161 client/control.c:2177
+#: client/control.c:2230 client/control.c:2260 client/control.c:2276
msgid "Didn't find a route to the destination!"
msgstr "Hedefe giden yol bulunamadı!"
-#: client/control.c:2221
+#: client/control.c:2320
msgid "Oh my! You seem to have no capital!"
msgstr "Allah Allah! BaÅŸkentin yokmuÅŸ!"
@@ -7988,16 +7992,16 @@ msgid "Allows %s (with %s)."
msgstr "%s yapma imkanı sağlar (%s ile)."
#. TRANS: preserve single space at beginning
-#: client/helpdata.c:418
+#: client/helpdata.c:416
msgid " Rivers"
msgstr " Nehir"
-#: client/helpdata.c:576
+#: client/helpdata.c:574
#, c-format
msgid "Sorry, no help topic for %s.\n"
msgstr "Üzgünüm, %s için yardım yok.\n"
-#: client/helpdata.c:580
+#: client/helpdata.c:578
#, c-format
msgid ""
"Sorry, no help topic for %s.\n"
@@ -8008,7 +8012,7 @@ msgstr ""
"Bu sayfa otomatik üretildi.\n"
"\n"
-#: client/helpdata.c:670
+#: client/helpdata.c:668
msgid ""
"Requires: Nothing\n"
"\n"
@@ -8016,78 +8020,78 @@ msgstr ""
"Hiçbirşey gerektirmez\n"
"\n"
-#: client/helpdata.c:675
+#: client/helpdata.c:673
#, c-format
msgid "* The discovery of %s will make %s obsolete.\n"
msgstr "* %s teknolojisi %s yapısını geçersiz kılar.\n"
-#: client/helpdata.c:694
+#: client/helpdata.c:692
#, c-format
msgid "* Allows all players with knowledge of %s to build %s units.\n"
msgstr ""
"* %s teknolojisisi bilen bütün oyuncuların %s birimleri yapabilmesini "
"saÄŸlar.\n"
-#: client/helpdata.c:706
+#: client/helpdata.c:704
#, c-format
msgid "* Allows %s (with %s).\n"
msgstr "* %s saÄŸlar (%s ile).\n"
-#: client/helpdata.c:710
+#: client/helpdata.c:708
#, c-format
msgid "* Allows %s.\n"
msgstr "* %s saÄŸlar.\n"
-#: client/helpdata.c:780
+#: client/helpdata.c:778
#, c-format
msgid "* Can only be built if there is %s in the city.\n"
msgstr "* Sadece %s olan şehirlerde yapılabilir.\n"
-#: client/helpdata.c:786
+#: client/helpdata.c:784
#, c-format
msgid "* Can only be built with %s as government.\n"
msgstr "* Sadece yönetim biçimi %s iken yapılabilir.\n"
-#: client/helpdata.c:791
+#: client/helpdata.c:789
msgid "* May not be built in cities.\n"
msgstr "* Şehirlerde yapılamaz.\n"
-#: client/helpdata.c:794
+#: client/helpdata.c:792
msgid "* Never has a home city.\n"
msgstr "* Memleketi yoktur.\n"
-#: client/helpdata.c:797
+#: client/helpdata.c:795
msgid "* Losing this unit will lose you the game!\n"
msgstr "* Bunu kaybederseniz oyunu da kaybedersiniz!\n"
-#: client/helpdata.c:801
+#: client/helpdata.c:799
msgid "* Each player may only have one of this type of unit.\n"
msgstr "* Bütün oyuncularda bu birimden sadece bir tane olabilir.\n"
-#: client/helpdata.c:805
+#: client/helpdata.c:803
#, c-format
msgid "* Requires %d population to build.\n"
msgstr "* Yapılması için %d nüfus gerekir.\n"
-#: client/helpdata.c:811
+#: client/helpdata.c:809
#, c-format
msgid "* Can carry and refuel %d air unit.\n"
msgid_plural "* Can carry and refuel %d air units.\n"
msgstr[0] "* %d hava birimini taşıyıp yakıt verebilir.\n"
-#: client/helpdata.c:816
+#: client/helpdata.c:814
#, c-format
msgid "* Can carry and refuel %d missile unit.\n"
msgid_plural "* Can carry and refuel %d missile units.\n"
msgstr[0] "* %d füzeyi taşıyıp yakıt verebilir.\n"
-#: client/helpdata.c:821
+#: client/helpdata.c:819
#, c-format
msgid "* Can carry %d ground unit across water.\n"
msgid_plural "* Can carry %d ground units across water.\n"
msgstr[0] "* %d kara birimini denizde taşıyabilir.\n"
-#: client/helpdata.c:830
+#: client/helpdata.c:828
msgid ""
"* Can establish trade routes (must travel to target city and must be at "
"least 9 tiles [in Manhattan distance] from this unit's home city).\n"
@@ -8095,164 +8099,164 @@ msgstr ""
"* Ticaret yolları yapabilir (memleketinden asgari 9 kare [manhattan "
"ölçeğiyle] uzaktaki bir şehre gitmelidir).\n"
-#: client/helpdata.c:836
+#: client/helpdata.c:834
#, c-format
msgid "* Can help build wonders (adds %d production).\n"
msgstr "* Harika yapımına yardım edebilir (%d üretim ekler).\n"
-#: client/helpdata.c:840
+#: client/helpdata.c:838
msgid "* May not be disbanded.\n"
msgstr "* Terhis edilemez.\n"
-#: client/helpdata.c:842
+#: client/helpdata.c:840
#, c-format
msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
msgstr ""
"* Bir şehirde terhis edilerek üretiminin %%50'sini geri kazandırabilir.\n"
-#: client/helpdata.c:846
+#: client/helpdata.c:844
msgid "* Can build new cities.\n"
msgstr "* Yeni ÅŸehir kurabilir.\n"
-#: client/helpdata.c:849
+#: client/helpdata.c:847
#, c-format
msgid "* Can add on %d population to cities of no more than size %d.\n"
msgstr "* Şehre %d nüfus ekleyebilir (%d büyüklüğünden az yerlerde).\n"
-#: client/helpdata.c:858
+#: client/helpdata.c:856
msgid "* Can build roads and railroads.\n"
msgstr "* Yol ve ray yapabilir.\n"
-#: client/helpdata.c:859
+#: client/helpdata.c:857
msgid "* Can build mines on tiles.\n"
msgstr "* Maden yapabilir.\n"
-#: client/helpdata.c:860
+#: client/helpdata.c:858
msgid "* Can build irrigation on tiles.\n"
msgstr "* Sulama yapabilir.\n"
-#: client/helpdata.c:865
+#: client/helpdata.c:863
msgid "* Can build farmland.\n"
msgstr "* Tarla yapabilir.\n"
-#: client/helpdata.c:869
+#: client/helpdata.c:867
#, c-format
msgid "* Can build farmland (if %s is known).\n"
msgstr "* Tarla yapabilir (%s biliniyorsa).\n"
-#: client/helpdata.c:873
+#: client/helpdata.c:871
#, c-format
msgid "* Can build farmland (if any of the following are known: %s).\n"
msgstr "* Tarla yapabilir (ÅŸunlardan biri biliniyorsa: %s).\n"
-#: client/helpdata.c:881
+#: client/helpdata.c:879
msgid "* Can build fortresses.\n"
msgstr "* Kale yapabilir.\n"
-#: client/helpdata.c:885
+#: client/helpdata.c:883
#, c-format
msgid "* Can build fortresses (if %s is known).\n"
msgstr "* Kale yapabilir (%s biliniyorsa).\n"
-#: client/helpdata.c:889
+#: client/helpdata.c:887
#, c-format
msgid "* Can build fortresses (if any of the following are known: %s).\n"
msgstr "* Kale yapabilir (ÅŸunlardan biri biliniyorsa: %s).\n"
-#: client/helpdata.c:895
+#: client/helpdata.c:893
msgid "* Can clean pollution from tiles.\n"
msgstr "* KirliliÄŸi temizleyebilir.\n"
-#: client/helpdata.c:896
+#: client/helpdata.c:894
msgid "* Can clean nuclear fallout from tiles.\n"
msgstr "* Nükleer serpintiyi temizleyebilir.\n"
-#: client/helpdata.c:899
+#: client/helpdata.c:897
msgid "* Can transform tiles.\n"
msgstr "* Araziyi dönüştürebilir.\n"
-#: client/helpdata.c:902
+#: client/helpdata.c:900
msgid "* Can build airbases.\n"
msgstr "* Hava üsleri yapabilir.\n"
-#: client/helpdata.c:906
+#: client/helpdata.c:904
#, c-format
msgid "* May fortify, granting a 50%% defensive bonus.\n"
msgstr "* Kendini güçlendirip savunma puanını, %%50 arttırabilir.\n"
-#: client/helpdata.c:909
+#: client/helpdata.c:907
msgid "* May pillage to destroy infrastructure from tiles.\n"
msgstr "* Araziyi yağmalayıp geliştirmeleri yok edebilir.\n"
-#: client/helpdata.c:913
+#: client/helpdata.c:911
msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
msgstr "* Diplomatik iÅŸleri ve casus iÅŸlerini yapabilir.\n"
-#: client/helpdata.c:916
+#: client/helpdata.c:914
msgid "* Can perform diplomatic actions.\n"
msgstr "* Diplomatik iÅŸler yapabilir.\n"
-#: client/helpdata.c:920
+#: client/helpdata.c:918
msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
msgstr "* Diplomatla yapılan bir savaşı asla kaybetmez.\n"
-#: client/helpdata.c:923
+#: client/helpdata.c:921
msgid "* May not be bribed.\n"
msgstr "* Rüşvet kabul etmez.\n"
-#: client/helpdata.c:926
+#: client/helpdata.c:924
msgid "* Can attack enemy air units.\n"
msgstr "* Düşman hava birimlerine saldırabilir.\n"
-#: client/helpdata.c:930
+#: client/helpdata.c:928
msgid "* Is invisible except when next to an enemy unit or city.\n"
msgstr "* Düşman şehri veya birimi yanında olmadıkça görülemez.\n"
-#: client/helpdata.c:934
+#: client/helpdata.c:932
msgid "* Can only attack units on ocean squares (no land attacks).\n"
msgstr "* Sadece denizdeki birimlere saldırabilir (kara saldırısı yok).\n"
-#: client/helpdata.c:938
+#: client/helpdata.c:936
msgid ""
"* Can attack from aboard sea units: against enemy cities and onto land "
"squares.\n"
msgstr ""
"* Denizdeki birimlerden düşman şehirlerine veya topraklarına saldırabilir.\n"
-#: client/helpdata.c:943
+#: client/helpdata.c:941
#, c-format
msgid "* Can be paradropped from a friendly city (Range: %d).\n"
msgstr "* Dost şehirlerden paraşütle atlatılabilir (Menzil: %d).\n"
-#: client/helpdata.c:949
+#: client/helpdata.c:947
msgid "* Gets double defense against units specified as 'mounted'.\n"
msgstr "* 'atlı' sınıfındaki birimlere karşı savunmasını ikiye katlar.\n"
-#: client/helpdata.c:953
+#: client/helpdata.c:951
msgid "* Counts as 'mounted' against certain defenders.\n"
msgstr "* Bazı savunuculara karşı 'atlı' olarak sayılır.\n"
-#: client/helpdata.c:957
+#: client/helpdata.c:955
msgid "* A missile unit: gets used up in making an attack.\n"
msgstr "* Füze birimi: saldırdıktan sonra kaybolur.\n"
-#: client/helpdata.c:960
+#: client/helpdata.c:958
msgid "* Making an attack ends this unit's turn.\n"
msgstr "* Saldırı yapınca sırası geçer.\n"
-#: client/helpdata.c:964
+#: client/helpdata.c:962
msgid "* This unit's attack causes a nuclear explosion!\n"
msgstr "* Bu birimin saldırısı nükleer patlamaya yol açar!\n"
-#: client/helpdata.c:968
+#: client/helpdata.c:966
msgid "* Gets double firepower when attacking cities.\n"
msgstr "* Şehirlere saldırırken gücü ikiye katlanır.\n"
-#: client/helpdata.c:971
+#: client/helpdata.c:969
msgid "* Ignores the effects of city walls.\n"
msgstr "* Surlardan etkilenmez.\n"
-#: client/helpdata.c:975
+#: client/helpdata.c:973
#, c-format
msgid ""
"* Does bombard attacks (%d per turn). These attacks will only damage (never "
@@ -8261,35 +8265,35 @@ msgstr ""
"* Bombalama saldırısı yapar (her sıra %d tane). Bu saldırılar sadece "
"savunan tarafı etkiler ve asla öldürmez.\n"
-#: client/helpdata.c:982
+#: client/helpdata.c:980
msgid "* Gets quintuple defense against missiles and aircraft.\n"
msgstr "* Füze ve uçaklara karşı savunmayı beş kat arttırır.\n"
-#: client/helpdata.c:986
+#: client/helpdata.c:984
msgid "* Ignores terrain effects (treats all squares as roads).\n"
msgstr "* Arazi etkilerinden muaftır (bütün karelere yol gibi davranır).\n"
-#: client/helpdata.c:989
+#: client/helpdata.c:987
msgid "* Ignores zones of control.\n"
msgstr "* Kontrol bölgeleri kuralına uymaz.\n"
-#: client/helpdata.c:993
+#: client/helpdata.c:991
msgid "* A non-military unit (cannot attack; no martial law).\n"
msgstr "* Sivil bir birimdir (saldırı yapamaz; sıkıyönetimi etkilemez).\n"
-#: client/helpdata.c:997
+#: client/helpdata.c:995
msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
msgstr "* Alan birimi: saldırgan değilken bile bir mutsuzluk oluşturur.\n"
-#: client/helpdata.c:1000
+#: client/helpdata.c:998
msgid "* Will never achieve veteran status.\n"
msgstr "* Kıdemli olamaz.\n"
-#: client/helpdata.c:1002
+#: client/helpdata.c:1000
msgid "* May become veteran through training or combat.\n"
msgstr "* Eğitimle veya savaşla kıdemli olabilir.\n"
-#: client/helpdata.c:1008
+#: client/helpdata.c:1006
#, c-format
msgid ""
"* Must end turn in a city or next to land, or has a 50%% risk of being lost "
@@ -8298,12 +8302,12 @@ msgstr ""
"* Sıranın sonunda bir şehirde veya kıyıda olmalıdır, yoksa %%50 ihtimalle "
"kaybolur.\n"
-#: client/helpdata.c:1012
+#: client/helpdata.c:1010
#, c-format
msgid "* The discovery of %s reduces the risk to 25%%.\n"
msgstr "* %s keşfi riski %%25 azaltır.\n"
-#: client/helpdata.c:1017
+#: client/helpdata.c:1015
#, c-format
msgid "* %s reduces the risk to 12%%.\n"
msgstr "* %s riski %%12'ye düşürür.\n"
@@ -8312,27 +8316,27 @@ msgstr "* %s riski %%12'ye düşürür.\n"
#. * last two elements
#. TRANS: List of possible output types has this between
#. * last two elements
-#: client/helpdata.c:1068 client/helpdata.c:1402
+#: client/helpdata.c:1066 client/helpdata.c:1400
msgid " or "
msgstr " veya "
-#: client/helpdata.c:1070 client/helpdata.c:1390
+#: client/helpdata.c:1068 client/helpdata.c:1388
msgid "?or:, "
msgstr ", "
-#: client/helpdata.c:1082
+#: 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"
msgstr[0] ""
"* Birim %2$d sıra sonunda bir şehir veya %1$s karesinde olmalıdır.\n"
-#: client/helpdata.c:1124
+#: client/helpdata.c:1122
#, 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:1129
+#: client/helpdata.c:1127
#, c-format
msgid ""
"To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8341,90 +8345,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:1137
+#: client/helpdata.c:1135
msgid "You cannot research this technology."
msgstr "Bu teknolojiyi araştıramazsınız."
-#: client/helpdata.c:1141
+#: client/helpdata.c:1139
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:1153
+#: client/helpdata.c:1151
#, 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:1158
+#: client/helpdata.c:1156
#, 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:1161
+#: client/helpdata.c:1159
#, 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:1165
+#: client/helpdata.c:1163
msgid "* Increases the pollution generated by the population.\n"
msgstr "* Nüfustan doğan kirliliği arttırır.\n"
-#: client/helpdata.c:1170
+#: client/helpdata.c:1168
#, 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:1177
+#: client/helpdata.c:1175
#, c-format
msgid "* Allows %s to build fortresses.\n"
msgstr "* %s biriminin kale yapmasına imkân sağlar.\n"
-#: client/helpdata.c:1185
+#: client/helpdata.c:1183
#, c-format
msgid "* Allows %s to build airbases.\n"
msgstr "* %s biriminin hava üssü yapmasına imkân sağlar.\n"
-#: client/helpdata.c:1194
+#: client/helpdata.c:1192
#, c-format
msgid "* Allows %s to upgrade roads to railroads.\n"
msgstr "* %s biriminin yolları raya çevirmesine izin verir.\n"
-#: client/helpdata.c:1202
+#: client/helpdata.c:1200
#, 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:1236
+#: client/helpdata.c:1234
msgid "* Pollution cannot be generated on this terrain."
msgstr "* Bu arazide kirlilik oluÅŸturulamaz."
-#: client/helpdata.c:1241
+#: client/helpdata.c:1239
msgid "* You cannot build cities on this terrain."
msgstr "* Bu arazide şehir yapılamaz."
-#: client/helpdata.c:1247
+#: client/helpdata.c:1245
msgid "* The coastline of this terrain is unsafe."
msgstr "* Bu arazinin sahili güvenli değildir."
-#: client/helpdata.c:1252
+#: client/helpdata.c:1250
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:1257
+#: client/helpdata.c:1255
msgid "* Land units cannot travel on oceanic terrains."
msgstr "* Kara birimleri denizde gidemezler."
-#: client/helpdata.c:1307
+#: client/helpdata.c:1305
msgid "Features:\n"
msgstr "Özellik:\n"
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1413 client/helpdata.c:1414
+#: client/helpdata.c:1411 client/helpdata.c:1412
msgid "?outputlist: Nothing "
msgstr " Hiç "
-#: client/helpdata.c:1421
+#: client/helpdata.c:1419
#, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
@@ -8435,7 +8439,7 @@ msgid_plural ""
msgstr[0] ""
"* Sınır dışında bulunan veya savaşan her birim %d vatandaşı mutsuz eder.\n"
-#: client/helpdata.c:1431
+#: client/helpdata.c:1429
#, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8444,49 +8448,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:1439
+#: client/helpdata.c:1437
#, 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:1444
+#: client/helpdata.c:1442
#, 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:1449
+#: client/helpdata.c:1447
#, 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:1453
+#: client/helpdata.c:1451
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:1462
+#: client/helpdata.c:1460
#, 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:1470
+#: client/helpdata.c:1468
#, 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:1477
+#: client/helpdata.c:1475
#, 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:1484
+#: client/helpdata.c:1482
#, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -8496,7 +8500,7 @@ msgstr ""
"çıkmaya başlayacaktır.\n"
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1491
+#: client/helpdata.c:1489
#, c-format
msgid ""
"* After the first unhappy citizen due to city size, for each %d additional "
@@ -8505,17 +8509,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:1499
+#: client/helpdata.c:1497
#, 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:1504
+#: client/helpdata.c:1502
msgid "Has unlimited science/gold/luxuries rates.\n"
msgstr "bilim/vergi/lüks oranlarında sınır yoktur.\n"
-#: client/helpdata.c:1509
+#: client/helpdata.c:1507
#, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
@@ -8527,14 +8531,14 @@ msgstr[0] ""
"* Birimleriniz sıkıyönetim yapabilir. Bir şehirdeki her askeri birim %d "
"mutsuz vatandaşı memnun edecektir.\n"
-#: client/helpdata.c:1521
+#: client/helpdata.c:1519
#, 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:1532
+#: client/helpdata.c:1530
#, c-format
msgid ""
"* You may grow your cities by means of celebrations. Your cities must be at "
@@ -8543,15 +8547,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:1538
+#: client/helpdata.c:1536
msgid "* Your units cannot be bribed.\n"
msgstr "* Birimleriniz rüşvet kabul etmezler.\n"
-#: client/helpdata.c:1541
+#: client/helpdata.c:1539
msgid "* Your cities cannot be incited.\n"
msgstr "* Şehirlerinizde ayaklanma çıkartılamaz.\n"
-#: client/helpdata.c:1545
+#: client/helpdata.c:1543
msgid ""
"* Government will fall into anarchy if any city is in disorder for more than "
"two turns in a row.\n"
@@ -8559,39 +8563,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:1551
+#: client/helpdata.c:1549
msgid "* Has a senate that may prevent declaration of war.\n"
msgstr "* Senato, savaş kararını veto edebilir.\n"
-#: client/helpdata.c:1555
+#: client/helpdata.c:1553
msgid "* Allows partisans when cities are taken by the enemy.\n"
msgstr "* Şehri düşmanlar alınca partizan oluşturur.\n"
-#: client/helpdata.c:1559
+#: client/helpdata.c:1557
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:1563
+#: client/helpdata.c:1561
msgid "* Pays no upkeep for fanatics.\n"
msgstr "* Müfritler için bakım ücreti ödenmez.\n"
-#: client/helpdata.c:1566
+#: client/helpdata.c:1564
msgid "* Has no unhappy citizens.\n"
msgstr "* Hiç mutsuz vatandaşı yok.\n"
-#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
+#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
#, c-format
msgid "* Veteran %s units.\n"
msgstr "* Kıdemli %s birimleri.\n"
-#: client/helpdata.c:1587
+#: client/helpdata.c:1585
msgid "* Veteran units.\n"
msgstr "* Kıdemli birimler.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1593
+#: client/helpdata.c:1591
#, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8601,7 +8605,7 @@ msgstr ""
"her arazinin geliri 1 azalır.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1602
+#: client/helpdata.c:1600
#, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8611,7 +8615,7 @@ msgstr ""
"yapıldığı zaman %d daha fazla gelir sağlar.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1610
+#: client/helpdata.c:1608
#, c-format
msgid "* Each worked tile with at least 1 %s will yield %d more of it.\n"
msgstr ""
@@ -8619,432 +8623,480 @@ msgstr ""
"gelir saÄŸlar.\n"
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1619
+#: client/helpdata.c:1617
#, 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:1627
+#: client/helpdata.c:1625
#, 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:1632
+#: client/helpdata.c:1630
#, 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:1637
+#: client/helpdata.c:1635
#, 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:1645
+#: client/helpdata.c:1643
#, 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:1651
+#: client/helpdata.c:1649
#, 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:1657
+#: client/helpdata.c:1655
#, 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:1674
+#: client/helpdata.c:1672
#, 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:1701
+#: client/helpdata.c:1699
#, c-format
msgid "%s%d %s"
msgstr "%s%d %s"
-#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1700 client/helpdata.c:1708 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:1709
+#: client/helpdata.c:1707
#, c-format
msgid "%s%d unhappy"
msgstr "%s%d mutsuz"
-#: client/mapctrl_common.c:382
+#: client/mapctrl_common.c:399
#, c-format
msgid "You don't know how to build %s!"
msgstr "%s inÅŸa etmesini bilmiyorsunuz!"
-#: client/mapctrl_common.c:392
+#: client/mapctrl_common.c:409
#, c-format
msgid "Copy %s to clipboard."
msgstr "%s panoya kopyala."
-#: client/mapctrl_common.c:408
+#: client/mapctrl_common.c:425
msgid "Clipboard is empty."
msgstr "Pano boÅŸ."
-#: client/options.c:98
+#: client/options.c:102
msgid "Graphics"
msgstr "Görüntü"
-#: client/options.c:99
+#: client/options.c:103
msgid "Overview"
msgstr "Genel"
-#: client/options.c:100
+#: client/options.c:104
msgid "Sound"
msgstr "Ses"
-#: client/options.c:101
+#: client/options.c:105
msgid "Interface"
msgstr "Arayüz"
-#: client/options.c:102
+#: client/options.c:106
msgid "Network"
msgstr "AÄŸ"
-#: client/options.c:107
+#: client/options.c:111
msgid "Login name"
msgstr "Giriş adı"
-#: client/options.c:108
+#: client/options.c:112
msgid ""
"This is the default login username that will be used in the connection "
"dialogs or with the -a command-line parameter."
msgstr ""
-#: client/options.c:113
+#: client/options.c:117
msgid "Server"
msgstr "Sunucu"
-#: client/options.c:114
+#: client/options.c:118
msgid ""
"This is the default server hostname that will be used in the connection "
"dialogs or with the -a command-line parameter."
msgstr ""
-#: client/options.c:119
+#: client/options.c:123
msgid "Server port"
msgstr "Sunucu portu"
-#: client/options.c:120
+#: client/options.c:124
msgid ""
"This is the default server port that will be used in the connection dialogs "
"or with the -a command-line parameter."
msgstr ""
-#: client/options.c:125 client/gui-win32/connectdlg.c:912 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
msgid "Metaserver"
msgstr "Metasunucu"
-#: client/options.c:126
+#: client/options.c:130
msgid ""
"The metaserver is a host that the client contacts to find out about games on "
"the internet. Don't change this from its default value unless you know what "
"you're doing."
msgstr ""
-#: client/options.c:132
+#: client/options.c:136
msgid "Soundset"
msgstr "Ses seti"
-#: client/options.c:133
+#: client/options.c:137
msgid ""
"This is the soundset that will be used. Changing this is the same as using "
"the -S command-line parameter."
msgstr ""
-#: client/options.c:138
+#: client/options.c:142
msgid "Sound plugin"
msgstr "Ses eklentisi"
-#: client/options.c:139
+#: client/options.c:143
msgid ""
"If you have a problem with sound, try changing the sound plugin. The new "
"plugin won't take effect until you restart Freeciv. Changing this is the "
"same as using the -P command-line option."
msgstr ""
-#: client/options.c:144 client/gui-sdl/gui_main.c:162
+#: client/options.c:148 client/gui-sdl/gui_main.c:162
msgid "Theme"
msgstr "Tema"
-#: client/options.c:145
+#: client/options.c:149
msgid "By changing this option you change the active theme."
msgstr "Bu ayarla geçerli temayı değiştirebilirsiniz."
-#: client/options.c:148
+#: client/options.c:152
msgid "Tileset"
msgstr "Arazi seti"
-#: client/options.c:149
+#: client/options.c:153
msgid ""
"By changing this option you change the active tileset. This is the same as "
"using the -t command-line parameter."
msgstr ""
-#: client/options.c:156
+#: client/options.c:160
msgid "Solid unit background color"
msgstr "Mat birim arkaplanı"
-#: client/options.c:157
+#: client/options.c:161
msgid ""
"Setting this option will cause units on the map view to be drawn with a "
"solid background color instead of the flag backdrop."
msgstr ""
-#: client/options.c:161 client/gui-sdl/optiondlg.c:960
+#: client/options.c:165 client/gui-sdl/optiondlg.c:960
msgid "Sound bell at new turn"
msgstr "Sıra gelince zil çal"
-#: client/options.c:162
+#: client/options.c:166
msgid ""
"Set this option to have a \"bell\" event be generated at the start of a new "
"turn. You can control the behavior of the \"bell\" event by editing the "
"message options."
msgstr ""
-#: client/options.c:168
+#: client/options.c:172
msgid "Unit movement animation time (milliseconds)"
msgstr "Birim hareketinin süresi (milisaniye)"
-#: client/options.c:169
+#: client/options.c:173
msgid ""
"This option controls how long unit \"animation\" takes when a unit moves on "
"the map view. Set it to 0 to disable animation entirely."
msgstr ""
-#: client/options.c:174
+#: client/options.c:178
msgid "Mapview recentering time (milliseconds)"
msgstr "Harita ortalama süresi (milisaniye)"
-#: client/options.c:175
+#: client/options.c:179
msgid ""
"When the map view is recentered, it will slide smoothly over the map to its "
"new position. This option controls how long this slide lasts. Set it to 0 "
"to disable mapview sliding entirely."
msgstr ""
-#: client/options.c:180 client/gui-sdl/optiondlg.c:1014
+#: client/options.c:184 client/gui-sdl/optiondlg.c:1014
msgid "Show combat animation"
msgstr "Savaş hareketlerini göster"
-#: client/options.c:181
+#: client/options.c:185
msgid ""
"Disabling this option will turn off combat animation between units on the "
"mapview."
msgstr ""
-#: client/options.c:184
+#: client/options.c:188
msgid "Draw the citybar"
msgstr "Şehir çubuğunu çiz"
-#: client/options.c:185
+#: client/options.c:189
msgid ""
"Setting this option will display a 'citybar' containing useful information "
"beneath each city. Disabling this option will display only the city's name "
"and optionally, production."
msgstr ""
-#: client/options.c:191
+#: client/options.c:195
msgid "Show icons in the technology tree"
msgstr "Teknoloji ağacında simgeler göster"
-#: client/options.c:192
+#: client/options.c:196
msgid ""
"Setting this option will display icons on the technology tree diagram. "
"Turning this option off makes the technology tree more compact."
msgstr ""
-#: client/options.c:197
+#: client/options.c:201
msgid "Draw shield graphics for units"
msgstr "Birimler için kalkan resmini çiz"
-#: client/options.c:198
+#: client/options.c:202
msgid ""
"Setting this option will draw a shield icon as the flags on units. If "
"unset, the full flag will be drawn."
msgstr ""
-#: client/options.c:202
+#: client/options.c:206
msgid "Manual Turn Done in AI Mode"
msgstr "YZ Modundayken Sırayı Elle Geçir"
-#: client/options.c:203
+#: client/options.c:207
msgid ""
"Disable this option if you do not want to press the Turn Done button "
"manually when watching an AI player."
msgstr ""
-#: client/options.c:207 client/gui-sdl/optiondlg.c:1121
+#: client/options.c:211 client/gui-sdl/optiondlg.c:1121
msgid "Auto Center on Units"
msgstr "Birimleri Otomatik Ortala"
-#: client/options.c:208
+#: client/options.c:212
msgid ""
"Set this option to have the active unit centered automatically when the unit "
"focus changes."
msgstr ""
-#: client/options.c:211 client/gui-sdl/optiondlg.c:1147
+#: client/options.c:215 client/gui-sdl/optiondlg.c:1147
msgid "Auto Center on Combat"
msgstr "Savaşı Otomatik Ortala"
-#: client/options.c:212
+#: client/options.c:216
msgid ""
"Set this option to have any combat be centered automatically. Disabled this "
"will speed up the time between turns but may cause you to miss combat "
"entirely."
msgstr ""
-#: client/options.c:217 client/gui-sdl/optiondlg.c:1174
+#: client/options.c:221 client/gui-sdl/optiondlg.c:1174
msgid "Focus on Awakened Units"
msgstr "Uyanmış Birimlere Odaklan"
-#: client/options.c:218
+#: client/options.c:222
msgid "Set this option to have newly awoken units be focused automatically."
msgstr ""
-#: client/options.c:221
+#: client/options.c:225
msgid "Allow goto into the unknown"
msgstr "Bilinmeyen bölgelere git komutu verilebilsin"
-#: client/options.c:222
+#: client/options.c:226
msgid ""
"Setting this option will make the game consider moving into unknown tiles. "
"If not, then goto routes will detour around or be blocked by unknown tiles."
msgstr ""
-#: client/options.c:226
+#: client/options.c:230
msgid "Center map when Popup city"
msgstr "Şehir penceresi açılınca haritayı ortala"
-#: client/options.c:227
+#: client/options.c:231
msgid ""
"Setting this option makes the mapview center on a city when its city dialog "
"is popped up."
msgstr ""
-#: client/options.c:230
+#: client/options.c:234
msgid "Concise City Production"
msgstr "Şehir Üretimini Özetle Göster"
-#: client/options.c:231
+#: client/options.c:235
msgid ""
"Set this option to make the city production (as shown in the city dialog) to "
"be more compact."
msgstr ""
-#: client/options.c:234 client/gui-sdl/optiondlg.c:1252
+#: client/options.c:238 client/gui-sdl/optiondlg.c:1252
msgid "End Turn when done moving"
msgstr "Yapılacak hareket kalmayınca sırayı geçir"
-#: client/options.c:235
+#: client/options.c:239
msgid ""
"Setting this option makes your turn end automatically when all your units "
"are done moving."
msgstr ""
-#: client/options.c:238 client/gui-sdl/optiondlg.c:1226
+#: client/options.c:242 client/gui-sdl/optiondlg.c:1226
msgid "Prompt for city names"
msgstr "Åžehir kurarken isim sor"
-#: client/options.c:239
+#: client/options.c:243
msgid ""
"Disabling this option will make the names of newly founded cities chosen "
"automatically by the server."
msgstr ""
-#: client/options.c:242 client/gui-sdl/optiondlg.c:1200
+#: client/options.c:246 client/gui-sdl/optiondlg.c:1200
msgid "Pop up city dialog for new cities"
msgstr "Yeni şehir kurulunca şehir penceresini göster"
-#: client/options.c:243
+#: client/options.c:247
msgid ""
"Setting this option will pop up a newly-founded city's city dialog "
"automatically."
msgstr ""
-#: client/options.c:248
+#: client/options.c:250
+#, fuzzy
+msgid "Pop up caravan actions"
+msgstr "Kervan iÅŸlemleri"
+
+#: client/options.c:251
+msgid ""
+"If this option is enabled, when caravans arrive at a city where they can "
+"establish a traderoute or help build a wonder, a window will popup asking "
+"which action should be performed. Disabling this option means you will have "
+"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 ""
+
+#: client/options.c:260
+#, fuzzy
+msgid "Enable cursor changing"
+msgstr "Saydamlık karıştırmayı etkinleştir"
+
+#: client/options.c:261
+msgid ""
+"This option controls whether the client should try to change the mouse "
+"cursor depending on what is being pointed at, as well as to indicate changes "
+"in the client or server state."
+msgstr ""
+
+#: client/options.c:266
+msgid "Select cities before units"
+msgstr ""
+
+#: 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 ""
+
+#: client/options.c:272
+msgid "Clear unit orders on selection"
+msgstr ""
+
+#: client/options.c:273
+msgid ""
+"Enabling this option will cause unit orders to be cleared whenever one or "
+"more units are selected. If this option is disabled, selecting units will "
+"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 ""
+
+#: client/options.c:282
msgid "Background layer"
msgstr "Arka plan katmanı"
-#: client/options.c:249
+#: client/options.c:283
msgid "The background layer of the overview shows just ocean and land."
msgstr ""
-#: client/options.c:252
+#: client/options.c:286
msgid "Terrain relief map layer"
msgstr "Arazi türü katmanı"
-#: client/options.c:253
+#: client/options.c:287
msgid "The relief layer shows all terrains on the map."
msgstr ""
-#: client/options.c:256
+#: client/options.c:290
msgid "Borders layer"
msgstr "Sınırlar katmanı"
-#: client/options.c:257
+#: client/options.c:291
msgid ""
"The borders layer of the overview shows which tiles are owned by each player."
msgstr ""
-#: client/options.c:261
+#: client/options.c:295
msgid "Units layer"
msgstr "Birimler katmanı"
-#: client/options.c:262
+#: client/options.c:296
msgid "Enabling this will draw units on the overview."
msgstr ""
-#: client/options.c:265
+#: client/options.c:299
msgid "Cities layer"
msgstr "Şehirler katmanı"
-#: client/options.c:266
+#: client/options.c:300
msgid "Enabling this will draw cities on the overview."
msgstr ""
-#: client/options.c:269
+#: client/options.c:303
msgid "Overview fog of war"
msgstr "Savaş sisi genel görünümde olsun"
-#: client/options.c:270
+#: client/options.c:304
msgid "Enabling this will show fog of war on the overview."
msgstr ""
-#: client/options.c:488
+#: client/options.c:526
msgid "If you add a preset by hand, also update \"number_of_presets\""
msgstr ""
-#: client/options.c:516
+#: client/options.c:554
msgid "Cannot find your home directory"
msgstr "Ev dizininiz bulunamadı"
-#: client/options.c:665 client/options.c:796
+#: client/options.c:703 client/options.c:834
msgid "Save failed, cannot find a filename."
msgstr "Kayıt başarısız, dosya adı bulunamadı."
-#: client/options.c:678 client/options.c:859
+#: client/options.c:716 client/options.c:897
#, c-format
msgid "Save failed, cannot write to file %s"
msgstr ""
-#: client/options.c:680 client/options.c:862
+#: client/options.c:718 client/options.c:900
#, c-format
msgid "Saved settings to file %s"
msgstr "Ayarlar %s dosyasına yazıldı"
@@ -9068,16 +9120,16 @@ msgstr ""
msgid "Start of turn %d"
msgstr "%d. sıranın başlangıcı"
-#: client/packhand.c:1590
+#: client/packhand.c:1591
#, c-format
msgid "AI Mode is now %s."
msgstr "YZ Modu ÅŸimdi %s."
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "ON"
msgstr "AÇIK"
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "OFF"
msgstr "KAPALI"
@@ -9109,14 +9161,15 @@ 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:2085
+#: client/gui-gtk-2.0/pages.c:2157
msgid "Flag"
msgstr "Bayrak"
#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
-#: client/gui-gtk-2.0/pages.c:1536 client/gui-gtk-2.0/pages.c:2087
-#: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
-#: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
+#: 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/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr "Millet"
@@ -9128,7 +9181,7 @@ msgstr "Sınır"
msgid "Score"
msgstr "Puan"
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
msgid "Team"
msgstr "Takım"
@@ -9199,411 +9252,437 @@ msgstr "Hiçbir %s terhis edilemedi."
msgid "Could not open temp file."
msgstr "Geçici dosya açılamadı."
-#: client/servers.c:407
+#: client/servers.c:410
msgid "Invalid $http_proxy or metaserver value, must start with 'http://'"
msgstr ""
-#: client/servers.c:413
+#: client/servers.c:416
msgid "Failed looking up metaserver's host"
msgstr ""
-#: client/text.c:85 client/text.c:86 client/text.c:91
+#. TRANS: "AI <player name>"
+#: client/text.c:94
+#, c-format
+msgid "AI %s"
+msgstr ""
+
+#. TRANS: "<nation adjective>, team <team name>"
+#: client/text.c:118
+#, fuzzy, c-format
+msgid "%s, team %s"
+msgstr "%s yönetimindeki %s"
+
+#: client/text.c:135 client/text.c:136 client/text.c:141
#: client/gui-sdl/mapview.c:752
msgid "?nation:Neutral"
msgstr "Tarafsız"
-#: client/text.c:85 client/gui-sdl/mapview.c:752
+#: client/text.c:135 client/gui-sdl/mapview.c:752
msgid "?nation:Hostile"
msgstr "Düşmanca"
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Peaceful"
msgstr "Barışçıl"
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Friendly"
msgstr "Arkadaşça"
-#: client/text.c:88 client/gui-sdl/mapview.c:755
+#: client/text.c:138 client/gui-sdl/mapview.c:755
msgid "?nation:Mysterious"
msgstr "Gizemli"
-#: client/text.c:88
+#: client/text.c:138
msgid "?nation:Friendly(team)"
msgstr "Arkadaşça(takım)"
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
msgid "?city:Neutral"
msgstr "Tarafsız"
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
msgid "?city:Hostile"
msgstr "Düşmanca"
-#: client/text.c:92 client/gui-sdl/mapview.c:786
+#: client/text.c:142 client/gui-sdl/mapview.c:786
msgid "?city:Peaceful"
msgstr "Barışçıl"
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Friendly"
msgstr "Arkadaşça"
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Mysterious"
msgstr "Gizemli"
-#: client/text.c:93
+#: client/text.c:143
msgid "?city:Friendly(team)"
msgstr "Arkadaşça(takım)"
-#: client/text.c:100
+#: client/text.c:151
#, c-format
msgid "Location: (%d, %d) [%d]"
msgstr "Yer: (%d, %d) [%d]"
-#: client/text.c:109
+#: client/text.c:153
+#, c-format
+msgid "Native coordinates: (%d, %d)"
+msgstr ""
+
+#: client/text.c:160
#, c-format
msgid "Terrain: %s"
msgstr "Arazi: %s"
-#: client/text.c:110
+#: client/text.c:161
#, c-format
msgid "Food/Prod/Trade: %s"
msgstr "Gıda/Üretim/Ticaret: %s"
-#: client/text.c:113
+#: client/text.c:164
msgid "Minor Tribe Village"
msgstr "Ufak Yerli Köy"
-#: client/text.c:119
+#: client/text.c:173
msgid "Our territory"
msgstr "Bizim topraklarımız"
-#. TRANS: "Polish territory"
-#: client/text.c:122
-#, c-format
-msgid "%s territory"
-msgstr "%s tarafının toprakları"
+#. TRANS: "Territory of <username> (<nation + team>)"
+#: client/text.c:176
+#, fuzzy, c-format
+msgid "Territory of %s (%s)"
+msgstr ""
+"\n"
+"%s (%s) tarafının toprakları"
-#. TRANS: "Polish territory (5 turn cease-fire)"
-#: client/text.c:131
-#, c-format
-msgid "%s territory (%d turn cease-fire)"
-msgid_plural "%s territory (%d turn cease-fire)"
-msgstr[0] "%s 'nin toprakları (%d sıra ateşkes)"
+#: client/text.c:186
+#, fuzzy, c-format
+msgid "Territory of %s (%s) (%d turn cease-fire)"
+msgid_plural "Territory of %s (%s) (%d turn cease-fire)"
+msgstr[0] "Şehir: %s (%s, %d sıra ateşkes)"
-#. TRANS: "Polish territory (friendly)"
-#: client/text.c:140
-#, c-format
-msgid "%s territory (%s)"
-msgstr "%s toprakları (%s)"
+#. TRANS: "Territory of <username>
+#. * (<nation + team> | <diplomatic state>)"
+#: client/text.c:195
+#, fuzzy, c-format
+msgid "Territory of %s (%s | %s)"
+msgstr ""
+"\n"
+"%s (%s) tarafının toprakları"
-#: client/text.c:145
+#: client/text.c:200
msgid "Unclaimed territory"
msgstr "Sahipsiz bölge"
-#. TRANS: "City: Warsaw (Polish)"
-#: client/text.c:156
-#, c-format
-msgid "City: %s (%s)"
-msgstr "Åžehir: %s (%s)"
+#. TRANS: "City: <city name> | <username> (<nation + team>)"
+#: client/text.c:214
+#, fuzzy, c-format
+msgid "City: %s | %s (%s)"
+msgstr "Åžehir: %s (%s, %s)"
-#. TRANS: "City: Warsaw (Polish, 5 turn cease-fire)"
-#: client/text.c:166
-#, c-format
-msgid "City: %s (%s, %d turn cease-fire)"
-msgid_plural "City: %s (%s, %d turn cease-fire)"
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <number> turn cease-fire)"
+#: client/text.c:224
+#, fuzzy, c-format
+msgid "City: %s | %s (%s, %d turn cease-fire)"
+msgid_plural "City: %s | %s (%s, %d turn cease-fire)"
msgstr[0] "Şehir: %s (%s, %d sıra ateşkes)"
-#. TRANS: "City: Warsaw (Polish,friendly)"
-#: client/text.c:174
-#, c-format
-msgid "City: %s (%s, %s)"
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <diplomatic state>)"
+#: client/text.c:231
+#, fuzzy, c-format
+msgid "City: %s | %s (%s, %s)"
msgstr "Åžehir: %s (%s, %s)"
#. TRANS: previous lines gave other information about the city.
-#: client/text.c:189
+#: client/text.c:246
#, c-format
msgid "?clistbegin: with %s"
msgstr " %s ile birlikte"
#. TRANS: "Trade from Warsaw: 5"
-#: client/text.c:202
+#: client/text.c:259
#, c-format
msgid "Trade from %s: %d"
msgstr "%s ile ticaret: %d"
-#: client/text.c:210
+#: client/text.c:267
#, c-format
msgid "Infrastructure: %s"
msgstr "Altyapı: %s"
-#: client/text.c:215
+#: client/text.c:272
#, c-format
msgid "Activity: %s"
msgstr "Etkinlik: %s"
-#. TRANS: "Unit: Musketeers (Polish, Warsaw)"
-#. TRANS: "Unit: Musketeers (Polish,friendly)"
-#: client/text.c:226 client/text.c:253
-#, c-format
-msgid "Unit: %s (%s, %s)"
+#. TRANS: "Unit: <unit type> | <username>
+#. * (<nation + team>, <homecity>)"
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <diplomatic state>)"
+#: client/text.c:287 client/text.c:313
+#, fuzzy, c-format
+msgid "Unit: %s | %s (%s, %s)"
msgstr "Birim: %s (%s, %s)"
-#. TRANS: "Unit: Musketeers (Polish)"
-#: client/text.c:232
-#, c-format
-msgid "Unit: %s (%s)"
-msgstr "Birim: %s (%s)"
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>)"
+#: client/text.c:292
+#, fuzzy, c-format
+msgid "Unit: %s | %s (%s)"
+msgstr "Birim: %s (%s, %s)"
-#. TRANS: "Unit: Musketeers (Polish, 5 turn cease-fire)"
-#: client/text.c:245
-#, c-format
-msgid "Unit: %s (%s, %d turn cease-fire)"
-msgid_plural "Unit: %s (%s, %d turn cease-fire)"
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <number> turn cease-fire)"
+#: client/text.c:305
+#, fuzzy, c-format
+msgid "Unit: %s | %s (%s, %d turn cease-fire)"
+msgid_plural "Unit: %s | %s (%s, %d turn cease-fire)"
msgstr[0] "Birim: %s (%s, %d sıra ateşkes)"
#. TRANS: "Chance to win: A:95% D:46%"
-#: client/text.c:279
+#: client/text.c:338
#, c-format
msgid "Chance to win: A:%d%% D:%d%%"
msgstr "Kazanma olasılığı: A:%%%d D:%%%d"
#. TRANS: A is attack power, D is defense power, FP is firepower,
#. * HP is hitpoints (current and max).
-#: client/text.c:286
+#: client/text.c:345
#, c-format
msgid "A:%d D:%d FP:%d HP:%d/%d (%s)"
msgstr "A:%d D:%d FP:%d HP:%d/%d (%s)"
#. TRANS: "5 more" units on this tile
-#: client/text.c:295
+#: client/text.c:354
#, c-format
msgid " (%d more)"
msgstr " (%d fazla)"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:364
+#: client/text.c:423
#, c-format
msgid "far from %s"
msgstr "%s şehri açıklarında"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:367
+#: client/text.c:426
#, c-format
msgid "near %s"
msgstr "%s yakınlarında"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:370
+#: client/text.c:429
#, c-format
msgid "in %s"
msgstr "%s ÅŸehrinde"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:403
+#: client/text.c:462
#, c-format
msgid "from %s"
msgstr "memleket %s"
-#: client/text.c:466
+#: client/text.c:525
msgid "Progress: no research"
msgstr "İlerleme: araştırma yok"
-#: client/text.c:470
+#: client/text.c:529
msgid "Progress: no research target"
msgstr "Ä°lerleme: hedeflenmiÅŸ bir teknoloji yok"
-#: client/text.c:475
+#: client/text.c:534
#, c-format
msgid "Progress: %d turn/advance"
msgid_plural "Progress: %d turns/advance"
msgstr[0] "İlerleme: %d sıra/gelişim"
-#: client/text.c:480
+#: client/text.c:539
#, c-format
msgid "%d bulb/turn"
msgid_plural "%d bulbs/turn"
msgstr[0] "%d ampül/sıra"
-#: client/text.c:485
+#: client/text.c:544
#, c-format
msgid ", %d bulb/turn from team"
msgid_plural ", %d bulbs/turn from team"
msgstr[0] ", takımdan %d ampül/sıra"
-#: client/text.c:512
+#: client/text.c:571
#, c-format
msgid "%d/- (never)"
msgstr "%d/- (asla)"
-#: client/text.c:524
+#: client/text.c:583
#, c-format
msgid "%d/%d (%d turn)"
msgid_plural "%d/%d (%d turns)"
msgstr[0] "%d/%d (%d sıra)"
-#: client/text.c:527
+#: client/text.c:586
#, c-format
msgid "%d/%d (never)"
msgstr "%d/%d (asla)"
-#: client/text.c:564
+#: client/text.c:623
#, c-format
msgid "%d step"
msgid_plural "%d steps"
msgstr[0] "%d adım"
-#: client/text.c:566
+#: client/text.c:625
#, c-format
msgid "%d bulb"
msgid_plural "%d bulbs"
msgstr[0] "%d ampül"
-#: client/text.c:570 client/agents/cma_fec.c:269 client/agents/cma_fec.c:313
+#: 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
#, c-format
msgid "%d turn"
msgid_plural "%d turns"
msgstr[0] "%d sıra"
-#: client/text.c:592
+#: client/text.c:651
#, c-format
msgid "Population: %s"
msgstr "Nüfus: %s"
-#: client/text.c:595
+#: client/text.c:654
#, c-format
msgid "Year: %s (T%d)"
msgstr "Yıl: %s (%d. S)"
-#: client/text.c:598
+#: client/text.c:657
#, c-format
msgid "Gold: %d (%+d)"
msgstr "Altın: %d (%+d)"
-#: client/text.c:600
+#: client/text.c:659
#, c-format
msgid "Tax: %d Lux: %d Sci: %d"
msgstr "Vergi: %d Lüks: %d Bilim: %d"
-#: client/text.c:607
+#: client/text.c:666
#, fuzzy
msgid "Moving: Nobody"
msgstr "Hareket ediyor: %s"
-#: client/text.c:609
+#: client/text.c:668
#, c-format
msgid "Moving: %s"
msgstr "Hareket ediyor: %s"
-#: client/text.c:613
+#: client/text.c:672
msgid "(Click for more info)"
msgstr "(Ayrıntılı bilgi için tıklayın)"
-#: client/text.c:629
+#: client/text.c:688
#, c-format
msgid "%s People"
msgstr "%s Ä°nsan"
-#: client/text.c:633
+#: client/text.c:692
#, c-format
msgid "Turn: %d"
msgstr "Sıra: %d"
-#: client/text.c:635 client/gui-win32/inteldlg.c:111
+#: client/text.c:694 client/gui-win32/inteldlg.c:111
#: client/gui-xaw/inteldlg.c:208
#, c-format
msgid "Gold: %d"
msgstr "Altın: %d"
-#: client/text.c:636
+#: client/text.c:695
#, c-format
msgid "Net Income: %d"
msgstr "Net Gelir: %d"
#. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:639
+#: client/text.c:698
#, c-format
msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
msgstr "Vergi oranları: Altın:%%%d Lüks:%%%d Bilim:%%%d"
-#: client/text.c:643
+#: client/text.c:702
#, c-format
msgid "Researching %s: %s"
msgstr "%s araştırılıyor: %s"
-#: client/text.c:650
+#: client/text.c:709
#, c-format
msgid "Global warming chance: %d%% (%+d%%/turn)"
msgstr "Küresel ısınma olasılığı: %%%d (%%%+d/sıra)"
-#: client/text.c:653
+#: client/text.c:712
#, c-format
msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
msgstr "Nükleer kış olasılığı: %%%d (%%%+d/sıra)"
-#: client/text.c:658 client/gui-win32/inteldlg.c:104
+#: client/text.c:717 client/gui-win32/inteldlg.c:104
#: client/gui-xaw/inteldlg.c:200
#, c-format
msgid "Government: %s"
msgstr "Yönetim biçimi: %s"
-#: client/text.c:682
+#: client/text.c:741
#, c-format
msgid "%d unit"
msgid_plural "%d units"
msgstr[0] "%d birim"
#. TRANS: Impossible to reach goto target tile
-#: client/text.c:715 client/gui-sdl/mapview.c:566
+#: client/text.c:774 client/gui-sdl/mapview.c:566
msgid "?goto:Unreachable"
msgstr "Gidilemez"
-#: client/text.c:717 client/gui-sdl/mapview.c:568
+#: client/text.c:776 client/gui-sdl/mapview.c:568
#, c-format
msgid "Turns to target: %d"
msgstr "Hedefe %d sıra kaldı"
-#: client/text.c:719 client/gui-sdl/mapview.c:570
+#: client/text.c:778 client/gui-sdl/mapview.c:570
#, c-format
msgid "Turns to target: %d to %d"
msgstr "Hedefe %d - %d sıra kaldı"
-#: client/text.c:725 client/gui-sdl/mapview.c:576
+#: client/text.c:784 client/gui-sdl/mapview.c:576
#, c-format
msgid "%d unit selected"
msgid_plural "%d units selected"
msgstr[0] "%d birim seçildi"
-#: client/text.c:730 client/gui-sdl/mapview.c:581
+#: client/text.c:789 client/gui-sdl/mapview.c:581
msgid "No units selected."
msgstr "Seçilmiş birim yok."
-#: client/text.c:804 client/gui-sdl/mapview.c:654
+#: client/text.c:863 client/gui-sdl/mapview.c:654
#, c-format
msgid "Others: %d civil; %d military"
msgstr "DiÄŸer: %d sivil; %d askeri"
-#: client/text.c:806 client/gui-sdl/mapview.c:656
+#: client/text.c:865 client/gui-sdl/mapview.c:656
#, c-format
msgid "Others: %d civilian"
msgstr "DiÄŸer: %d sivil"
-#: client/text.c:808 client/gui-sdl/mapview.c:658
+#: client/text.c:867 client/gui-sdl/mapview.c:658
#, c-format
msgid "Others: %d military"
msgstr "DiÄŸer: %d askeri"
-#: client/text.c:839
+#: client/text.c:898
msgid "No units to upgrade!"
msgstr "Yükseltilecek birim yok!"
-#: client/text.c:864
+#: client/text.c:923
msgid "None of these units may be upgraded."
msgstr "Bu birimlerin hiçbiri yükseltilemez."
-#: client/text.c:870
+#: client/text.c:929
#, c-format
msgid ""
"Upgrade %d unit for %d gold?\n"
@@ -9615,211 +9694,207 @@ msgstr[0] ""
"%d birim, %d altın karşılığında yükseltilsin mi?\n"
"Hazinede %d altın var."
-#: client/text.c:891
+#: client/text.c:950
msgid "Shows your progress in researching the current technology."
msgstr "Sıradaki teknolojinin araştırma durumunu gösterir."
-#: client/text.c:897
+#: client/text.c:956
msgid "no research target."
msgstr "teknoloji hedefi yok."
#. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:900
+#: client/text.c:959
#, c-format
msgid "%s: %d/%d."
msgstr "%s: %d/%d."
-#: client/text.c:920
+#: client/text.c:979
msgid "Shows the progress of global warming:"
msgstr "Küresel ısınmanın durumunu gösterir:"
-#: client/text.c:921
+#: client/text.c:980
#, c-format
msgid "Pollution rate: %d%%"
msgstr "Kirlilik oranı: %%%d"
-#: client/text.c:923
+#: client/text.c:982
#, c-format
msgid "Chance of catastrophic warming each turn: %d%%"
msgstr "Her tur için küresel ısınma olasılığı: %%%d"
-#: client/text.c:939
+#: client/text.c:998
msgid "Shows the progress of nuclear winter:"
msgstr "Nükleer kışın durumunu gösterir:"
-#: client/text.c:940
+#: client/text.c:999
#, c-format
msgid "Fallout rate: %d%%"
msgstr "Serpinti oranı: %%%d"
-#: client/text.c:942
+#: client/text.c:1001
#, c-format
msgid "Chance of catastrophic winter each turn: %d%%"
msgstr "Her tur için nükleer kış olasılığı: %%%d"
-#: client/text.c:957
+#: client/text.c:1016
msgid "Shows your current government:"
msgstr "Şu anki yönetim biçiminizi gösterir:"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:981
+#: client/text.c:1040
#, c-format
msgid "Population: %5d"
msgstr "Nüfüs: %5d"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:1043
#, c-format
msgid "Support: %5d %%"
msgstr "Destek: %% %5d"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:1047
#, c-format
msgid "Energy: %5d %%"
msgstr "Enerji: %% %5d"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:992
+#: client/text.c:1051
#, c-format
msgid "Mass: %5d ton"
msgid_plural "Mass: %5d tons"
msgstr[0] "Yük: %5d ton"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1057
#, c-format
msgid "Travel time: %5.1f years"
msgstr "Seyahat süresi: %5.1f yıl"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1061
msgid "Travel time: N/A "
msgstr "Seyahat süresi: YOK "
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1065
#, c-format
msgid "Success prob.: %5d %%"
msgstr "Başarı olasılığı: %% %5d"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1010
+#: client/text.c:1069
#, c-format
msgid "Year of arrival: %8s"
msgstr "Varış yılı: %8s"
-#: client/text.c:1030
+#: client/text.c:1089
msgid "?timeout:off"
msgstr "sınırsız süre"
-#: client/text.c:1054
+#: client/text.c:1113
#, c-format
msgid "?seconds:%02ds"
msgstr "%02ds"
-#: client/text.c:1056
+#: client/text.c:1115
#, c-format
msgid "?mins/secs:%02dm %02ds"
msgstr "%02dd %02ds"
-#: client/text.c:1058
+#: client/text.c:1117
#, c-format
msgid "?hrs/mns:%02dh %02dm"
msgstr "%02ds %02dd"
-#: client/text.c:1060
+#: client/text.c:1119
#, c-format
msgid "?dys/hrs:%02dd %02dh"
msgstr "%02dg %02ds"
-#: client/text.c:1063
+#: client/text.c:1122
msgid "?duration:overflow"
msgstr "zaman aşımı"
-#: client/text.c:1084
+#: client/text.c:1143
#, c-format
msgid "%6d.%02d ms"
msgstr "%6d.%02d ms"
-#. TRANS: "Republic of the Poles"
-#: client/text.c:1127
-#, c-format
-msgid "%s of the %s"
-msgstr "%s yönetimindeki %s"
+#. TRANS: <nation adjective> <government name>.
+#. * E.g. "Polish Republic".
+#: client/text.c:1188
+#, fuzzy, c-format
+msgid "?nationgovernment:%s %s"
+msgstr "Yönetim biçimi: %s"
#. TRANS: "Observer: 1985"
-#: client/text.c:1137
+#: client/text.c:1198
#, c-format
msgid "Observer: %s"
msgstr "Seyirci: %s"
-#: client/text.c:1155
+#: client/text.c:1216
msgid "Buildings: "
msgstr "Yapılar: "
-#: client/text.c:1172 client/text.c:1211
+#: client/text.c:1233 client/text.c:1272
msgid "None. "
msgstr "Hiç. "
-#: client/text.c:1174 client/text.c:1213
+#: client/text.c:1235 client/text.c:1274
msgid "?clistend:."
msgstr "."
-#: client/text.c:1192
+#: client/text.c:1253
msgid "Wonders: "
msgstr "Harikalar: "
-#: client/text.c:1247
+#: client/text.c:1308
#, 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:1251
+#: client/text.c:1312
#, 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:1257
+#: client/text.c:1318
#, c-format
msgid "%d additional unhappy citizen."
msgid_plural "%d additional unhappy citizens."
msgstr[0] "%d fazladan mutsuz vatandaÅŸ."
-#. TRANS: Martial law opening parenthesis
-#: client/text.c:1279
-msgid "Martial law in effect ("
+#: client/text.c:1339
+#, fuzzy
+msgid "Unlimited martial law in effect."
msgstr "Sıkıyönetim var ("
-#. TRANS: no [unit] maximum
-#: client/text.c:1284
-msgid "no maximum, "
-msgstr "azami yok, "
-
-#: client/text.c:1287
-#, c-format
-msgid "%d unit maximum, "
-msgid_plural "%d units maximum, "
-msgstr[0] "azami %d birim, "
+#: client/text.c:1341
+#, 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"
-#. TRANS: Martial law closing parenthesis
-#: client/text.c:1294
-#, c-format
-msgid "%d per unit). "
-msgstr "birim başına %d). "
+#: client/text.c:1345
+#, 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:1298
+#: client/text.c:1352
msgid "Military units in the field may cause unhappiness. "
msgstr "Arazideki askeri birimler mutsuzluÄŸa neden olabilir. "
-#: client/text.c:1301
+#: client/text.c:1355
msgid "Military units have no happiness effect. "
msgstr "Askeri birimlerin mutsuzluÄŸa etkisi yok. "
-#: client/text.c:1316
+#: client/text.c:1370
#, c-format
msgid "Luxury: %d total."
msgstr "Lüks: toplam %d."
@@ -9843,7 +9918,7 @@ msgstr ""
"İstemci kuş bakışı arazi setlerini desteklemiyor. Öntanımlı arazi seti "
"kullanılıyor."
-#: client/tilespec.c:3968
+#: client/tilespec.c:3966
#, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
@@ -9866,12 +9941,12 @@ msgid ""
"have a look."
msgstr "%s valisi işini yapamıyor. Bir bakın isterseniz."
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
-#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:599
+#: client/gui-gtk-2.0/cityrep.c:624 client/gui-sdl/citydlg.c:2009
msgid "none"
msgstr "hiç"
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:645
msgid "custom"
msgstr "özel"
@@ -10178,7 +10253,7 @@ msgstr "_Ticaret Yolu Yap"
msgid "Enter Marketplace"
msgstr "Markete Gir"
-#: client/gui-gtk-2.0/chatline.c:144 client/gui-win32/chatline.c:134
+#: client/gui-gtk-2.0/chatline.c:218 client/gui-win32/chatline.c:134
#: client/gui-xaw/chatline.c:120
msgid "Cleared output window."
msgstr "Çıktı penceresi temizlendi."
@@ -10259,11 +10334,11 @@ msgid "%d/%d %d turns"
msgstr "%d/%d %d sıra"
#: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:821
+#: client/gui-gtk-2.0/cityrep.c:1027
msgid "_Buy"
msgstr "_Satın Al"
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:869
msgid "_Production"
msgstr "Ãœreti_m"
@@ -10284,12 +10359,12 @@ msgid "Entertainers"
msgstr "Sanatçı"
#: client/gui-gtk-2.0/citydlg.c:1029 client/gui-win32/citydlg.c:1989
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2403
msgid "Scientists"
msgstr "Bilim adamı"
#: client/gui-gtk-2.0/citydlg.c:1030 client/gui-win32/citydlg.c:1991
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2404
msgid "Taxmen"
msgstr "Maliyeci"
@@ -10382,7 +10457,7 @@ msgstr "Desteklenen birimler: %d"
msgid "Present units %d"
msgstr "Mevcut birimler: %d"
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:1019
msgid "Cen_ter"
msgstr "_Ortala"
@@ -10471,31 +10546,61 @@ msgstr "Şehri Yeniden Adlandır"
msgid "What should we rename the city to?"
msgstr "Şehrin yeni adı ne olsun?"
-#: client/gui-gtk-2.0/cityrep.c:699
+#: client/gui-gtk-2.0/cityrep.c:794
+#, fuzzy
+msgid "(no worklists defined)"
+msgstr "(iÅŸ listesi)"
+
+#: client/gui-gtk-2.0/cityrep.c:876
msgid "Chan_ge"
msgstr "_DeÄŸiÅŸtir"
-#: client/gui-gtk-2.0/cityrep.c:703
+#: client/gui-gtk-2.0/cityrep.c:880
msgid "Add _First"
msgstr "Ö_ncellikle ekle"
-#: client/gui-gtk-2.0/cityrep.c:707
+#: client/gui-gtk-2.0/cityrep.c:884
msgid "Add _Next"
msgstr "_Sonrakine ekle"
-#: client/gui-gtk-2.0/cityrep.c:711
+#: client/gui-gtk-2.0/cityrep.c:888
+#, fuzzy
+msgid "Add _2nd Last"
+msgstr "_En sona ekle"
+
+#: client/gui-gtk-2.0/cityrep.c:892
msgid "Add _Last"
msgstr "_En sona ekle"
-#: client/gui-gtk-2.0/cityrep.c:715
+#: client/gui-gtk-2.0/cityrep.c:899
+#, fuzzy
+msgid "Set Worklist"
+msgstr "Ä°ÅŸ Listesi"
+
+#: client/gui-gtk-2.0/cityrep.c:905
+#, fuzzy
+msgid "Append Worklist"
+msgstr "İş Listesini Yeniden Adlandır"
+
+#: client/gui-gtk-2.0/cityrep.c:911
+#, fuzzy
+msgid "Clear _Worklist"
+msgstr "H_edeflenen Ä°ÅŸ Listesi:"
+
+#: client/gui-gtk-2.0/cityrep.c:916
+#, fuzzy
+msgid "Gover_nor"
+msgstr "Vali"
+
+#: client/gui-gtk-2.0/cityrep.c:921
msgid "_Select"
msgstr "_Seç"
-#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
+#: client/gui-gtk-2.0/cityrep.c:925 client/gui-gtk-2.0/plrdlg.c:521
msgid "_Display"
msgstr "Gös_ter"
-#: client/gui-gtk-2.0/cityrep.c:800 client/gui-gtk-2.0/menu.c:808
+#: 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-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
#: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -10505,100 +10610,100 @@ msgstr "Gös_ter"
msgid "Cities"
msgstr "Åžehirler"
-#: client/gui-gtk-2.0/cityrep.c:817
+#: client/gui-gtk-2.0/cityrep.c:1023
msgid "_Inspect"
msgstr "_Odaklan"
-#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
-#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-sdl/helpdlg.c:297 client/gui-win32/menu.c:342
-#: client/gui-xaw/menu.c:241
+#: 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
+#: client/gui-gtk-2.0/cityrep.c:1518 client/gui-gtk-2.0/menu.c:823
+#: client/gui-gtk-2.0/menu.c:825 client/gui-gtk-2.0/menu.c:827
+#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:831
+#: client/gui-gtk-2.0/menu.c:833 client/gui-sdl/helpdlg.c:297
+#: client/gui-win32/menu.c:342 client/gui-xaw/menu.c:241
msgid "Improvements"
msgstr "Yapılar"
-#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
-#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
-#: client/gui-xaw/menu.c:247
+#: client/gui-gtk-2.0/cityrep.c:1441 client/gui-gtk-2.0/cityrep.c:1460
+#: client/gui-gtk-2.0/cityrep.c:1479 client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1522 client/gui-xaw/menu.c:247
msgid "Wonders"
msgstr "Harikalar"
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1662 client/gui-win32/cityrep.c:439
#: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
msgid "All Cities"
msgstr "Bütün Şehirler"
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1667 client/gui-win32/cityrep.c:440
msgid "No Cities"
msgstr "Hiçbir Şehir"
-#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1672 client/gui-win32/cityrep.c:441
msgid "Invert Selection"
msgstr "Seçimi Tersine Çevir"
-#: client/gui-gtk-2.0/cityrep.c:1420
+#: client/gui-gtk-2.0/cityrep.c:1682
msgid "Building Units"
msgstr "Ãœretilen Birimler"
-#: client/gui-gtk-2.0/cityrep.c:1426
+#: client/gui-gtk-2.0/cityrep.c:1688
msgid "Building Improvements"
msgstr "İnşa Halindeki Yapılar"
-#: client/gui-gtk-2.0/cityrep.c:1432
+#: client/gui-gtk-2.0/cityrep.c:1694
msgid "Building Wonders"
msgstr "Ä°nÅŸa Halindeki Harikalar"
-#: client/gui-gtk-2.0/cityrep.c:1444
+#: client/gui-gtk-2.0/cityrep.c:1706
msgid "Building Unit"
msgstr "Ãœretilen Birim"
-#: client/gui-gtk-2.0/cityrep.c:1448
+#: client/gui-gtk-2.0/cityrep.c:1710
msgid "Building Improvement"
msgstr "İnşa Edilen Yapı"
-#: client/gui-gtk-2.0/cityrep.c:1452
+#: client/gui-gtk-2.0/cityrep.c:1714
msgid "Building Wonder"
msgstr "Ä°nÅŸa Edilen Harika"
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1722 client/gui-win32/cityrep.c:443
msgid "Coastal Cities"
msgstr "Sahil Åžehirleri"
-#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1727 client/gui-win32/cityrep.c:444
msgid "Same Island"
msgstr "Aynı Adadakiler"
-#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1737 client/gui-win32/cityrep.c:447
msgid "Supported Units"
msgstr "Desteklenen Birimler"
-#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1740 client/gui-win32/cityrep.c:454
msgid "Units Present"
msgstr "Mevcut Birimler"
-#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1744 client/gui-win32/cityrep.c:469
msgid "Improvements in City"
msgstr "Şehirdeki Yapılar"
-#: client/gui-gtk-2.0/cityrep.c:1486
+#: client/gui-gtk-2.0/cityrep.c:1748
msgid "Wonders in City"
msgstr "Åžehirdeki Harikalar"
-#: client/gui-gtk-2.0/cityrep.c:1495
+#: client/gui-gtk-2.0/cityrep.c:1757
msgid "Available Units"
msgstr "Mümkün Olan Birimler"
-#: client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1760
msgid "Available Improvements"
msgstr "Mümkün Olan Yapılar"
-#: client/gui-gtk-2.0/cityrep.c:1501
+#: client/gui-gtk-2.0/cityrep.c:1763
msgid "Available Wonders"
msgstr "Mümkün Olan Harikalar"
-#: client/gui-gtk-2.0/cityrep.c:1625
+#: client/gui-gtk-2.0/cityrep.c:1882
#, fuzzy, c-format
msgid "Total Buy Cost: %d"
msgstr "Toplam Gider: "
@@ -10668,11 +10773,11 @@ 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:186
+#: client/gui-gtk-2.0/dialogs.c:196 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:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
msgid "Inspect _City"
msgstr "_Åžehre Odaklan"
@@ -10700,10 +10805,10 @@ msgstr "Neyin yağmalanacağını seçin:"
msgid "Unit"
msgstr "Birim"
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
-#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
-#: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
-#: manual/civmanual.c:302 data/Freeciv.in:80
+#: 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-win32/plrdlg.c:335 manual/civmanual.c:302 data/Freeciv.in:80
msgid "Name"
msgstr "Ad"
@@ -10728,7 +10833,7 @@ 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:1036 data/Freeciv.in:3371
+#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
msgid "Pick Nation"
msgstr "Ulus Seçimi"
@@ -10807,7 +10912,7 @@ msgstr "_Haritalar"
msgid "_Advances"
msgstr "_Teknolojiler"
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:910
+#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr "Åže_hirler"
@@ -10912,65 +11017,133 @@ msgstr "Gidilecek yeri seç"
msgid "Show _All Cities"
msgstr "_Bütün Şehirleri Göster"
-#: client/gui-gtk-2.0/gui_main.c:150
+#: client/gui-gtk-2.0/gui_main.c:162
msgid "Show Map Scrollbars"
msgstr "Harita Kaydırma Çubuklarını Göster"
-#: client/gui-gtk-2.0/gui_main.c:151
+#: client/gui-gtk-2.0/gui_main.c:163
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:155
+#: client/gui-gtk-2.0/gui_main.c:167
msgid "Keyboardless goto"
msgstr "Klavyesiz git komutu"
-#: client/gui-gtk-2.0/gui_main.c:156
+#: client/gui-gtk-2.0/gui_main.c:168
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:161
+#: client/gui-gtk-2.0/gui_main.c:173
msgid "Keep dialogs on top"
msgstr "Pencereleri üstte tut"
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:174
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:166
+#: client/gui-gtk-2.0/gui_main.c:178
msgid "Show worklist task icons"
msgstr "İş listesinde görev simgelerini çiz"
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:179
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:171
+#: client/gui-gtk-2.0/gui_main.c:183
msgid "Enable status report tabs"
msgstr "Durum raporu sekmeleri etkin"
-#: client/gui-gtk-2.0/gui_main.c:172
+#: client/gui-gtk-2.0/gui_main.c:184
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:177 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:189 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:178 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:190 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:277 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:195
+msgid "Show time for each chat message"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:196
+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
+msgid "Split bottom notebook area"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:202
+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
+msgid "New message events go to top of list"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:208
+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
+msgid "Show extra message window buttons"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:214
+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 "
+"is disabled, these buttons will not appear (you can still double-click with "
+"the left mouse button or right-click on a row to inspect or goto "
+"respectively). This option will only take effect once the message window is "
+"closed and reopened."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:224
+msgid "Metaserver tab first in network page"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:225
+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
+msgid "Plain chat messages are sent to allies only"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:231
+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 "
+"messages will be sent as public chat messages. To send a public chat message "
+"with this option enabled, prefix the message with a single colon ':'. This "
+"option can also be set using a toggle button beside the chat entry (only "
+"visible in multiplayer games)."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:340 client/gui-xaw/gui_main.c:245
msgid ""
"This client has no special command line options\n"
"\n"
@@ -10978,44 +11151,45 @@ msgstr ""
"Bu istemcinin hiç özel komut satırı ayarı yok\n"
"\n"
-#: client/gui-gtk-2.0/gui_main.c:723 client/gui-gtk-2.0/gui_main.c:1345
+#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
msgid "Freeciv"
msgstr "Freeciv"
-#: client/gui-gtk-2.0/gui_main.c:1088 client/gui-gtk-2.0/gui_main.c:1095
+#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
#: 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:1095 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1232 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:1127 client/gui-gtk-2.0/menu.c:770
-#: client/gui-gtk-2.0/menu.c:772 client/gui-gtk-2.0/menu.c:774
-#: client/gui-gtk-2.0/menu.c:776 client/gui-gtk-2.0/menu.c:778
-#: client/gui-gtk-2.0/menu.c:780 client/gui-gtk-2.0/menu.c:782
-#: client/gui-gtk-2.0/menu.c:784 client/gui-gtk-2.0/menu.c:786
-#: client/gui-gtk-2.0/menu.c:788 client/gui-gtk-2.0/menu.c:790
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-gtk-2.0/menu.c:804 client/gui-gtk-2.0/menu.c:806
-#: client/gui-gtk-2.0/menu.c:808 client/gui-gtk-2.0/menu.c:810
-#: client/gui-gtk-2.0/menu.c:812 client/gui-gtk-2.0/menu.c:814
-#: client/gui-gtk-2.0/menu.c:816 client/gui-gtk-2.0/menu.c:818
-#: client/gui-gtk-2.0/menu.c:820 client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/gui_main.c:1266 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
+#: client/gui-gtk-2.0/menu.c:811 client/gui-gtk-2.0/menu.c:813
+#: client/gui-gtk-2.0/menu.c:815 client/gui-gtk-2.0/menu.c:817
+#: client/gui-gtk-2.0/menu.c:819 client/gui-gtk-2.0/menu.c:821
+#: client/gui-gtk-2.0/menu.c:823 client/gui-gtk-2.0/menu.c:825
+#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
+#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
+#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
+#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
+#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
+#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
#: data/Freeciv.in:2028
msgid "View"
msgstr "Görünüm"
-#: client/gui-gtk-2.0/gui_main.c:1208
+#: client/gui-gtk-2.0/gui_main.c:1359
msgid "Chat"
msgstr "Sohbet"
-#: client/gui-gtk-2.0/gui_main.c:1224 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1377 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"
@@ -11027,70 +11201,74 @@ msgstr ""
"bölümüne bakınız.\n"
"Kolay Gelsin!"
-#: client/gui-gtk-2.0/gui_main.c:1491
+#: client/gui-gtk-2.0/gui_main.c:1392
+msgid "Allies Only"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:1657
msgid "Not _ready"
msgstr "Hazır _Değil"
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
+#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
msgid "_Ready"
msgstr "_Hazır"
-#: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2132
+#: 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
msgid "_Start"
msgstr "_BaÅŸlat"
-#: client/gui-gtk-2.0/gui_main.c:1520
+#: client/gui-gtk-2.0/gui_main.c:1686
#, fuzzy
msgid "_Take Player"
msgstr "Bu oyuncu al"
-#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
+#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
msgid "Pick _Nation"
msgstr "Ulus _Seç"
-#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
+#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
msgid "_Observe"
msgstr "Ä°_zle"
-#: client/gui-gtk-2.0/gui_main.c:1532
+#: client/gui-gtk-2.0/gui_main.c:1698
msgid "Do not _observe"
msgstr "Ä°_zleme"
-#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
msgid "<AI>"
msgstr "<YZ>"
-#: client/gui-gtk-2.0/gui_main.c:1557
+#: client/gui-gtk-2.0/gui_main.c:1723
msgid "<Novice AI>"
msgstr "<Acemi YZ>"
-#: client/gui-gtk-2.0/gui_main.c:1560
+#: client/gui-gtk-2.0/gui_main.c:1726
msgid "<Easy AI>"
msgstr "<Kolay YZ>"
-#: client/gui-gtk-2.0/gui_main.c:1563
+#: client/gui-gtk-2.0/gui_main.c:1729
msgid "<Normal AI>"
msgstr "<Normal YZ>"
-#: client/gui-gtk-2.0/gui_main.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1732
msgid "<Hard AI>"
msgstr "<Zor YZ>"
-#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1742 client/gui-win32/dialogs.c:594
#: client/gui-xaw/pages.c:217
msgid "Random"
msgstr "Rastgele"
-#: client/gui-gtk-2.0/gui_main.c:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
msgid "Observer"
msgstr "Gözleyici"
-#: client/gui-gtk-2.0/gui_main.c:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
msgid "Detached"
msgstr "Serbest"
-#: client/gui-gtk-2.0/gui_main.c:1899
+#: client/gui-gtk-2.0/gui_main.c:2073
msgid "Are you sure you want to quit?"
msgstr "Çıkmak istediğinizden emin misiniz?"
@@ -11322,467 +11500,504 @@ msgstr "_Teknolojiler"
msgid "Foreign Intelligence: %s Empire"
msgstr "Ä°stihbarat: %s Ä°mparatorluÄŸu"
-#: client/gui-gtk-2.0/mapctrl.c:195 client/gui-sdl/mapctrl.c:2565
+#: client/gui-gtk-2.0/mapctrl.c:179 client/gui-sdl/mapctrl.c:2565
#: client/gui-sdl/menu.c:839 client/gui-sdl/menu.c:1021
#: client/gui-win32/mapctrl.c:353
msgid "Build New City"
msgstr "Yeni Åžehir Ä°nÅŸa Et"
-#: client/gui-gtk-2.0/mapctrl.c:196 client/gui-sdl/mapctrl.c:2594
+#: client/gui-gtk-2.0/mapctrl.c:180 client/gui-sdl/mapctrl.c:2594
#: client/gui-win32/mapctrl.c:354 client/gui-xaw/mapctrl.c:89
msgid "What should we call our new city?"
msgstr "Yeni şehrimizin adı ne olsun?"
-#: client/gui-gtk-2.0/mapview.c:147
+#: client/gui-gtk-2.0/mapview.c:158
msgid "Shows your current luxury/science/tax rates;click to toggle them."
msgstr ""
"Şimdiki lüks/bilim/vergi oranlarını gösterir; geçiş yapmak için tıklayın."
-#: client/gui-gtk-2.0/mapview.c:692 client/gui-win32/canvas.c:275
+#: client/gui-gtk-2.0/mapview.c:702 client/gui-win32/canvas.c:275
msgid "Better fog will only work in truecolor. Disabling it"
msgstr "Daha iyi sis sadece gerçek renkte çalışır. Kapatılıyor"
-#: client/gui-gtk-2.0/menu.c:250
+#: client/gui-gtk-2.0/menu.c:256
msgid "Leaving a local game will end it!"
msgstr "Yerel bir oyundan çıkarsanız oyun bitecektir!"
-#: client/gui-gtk-2.0/menu.c:700 client/gui-win32/menu.c:303
+#: client/gui-gtk-2.0/menu.c:727 client/gui-win32/menu.c:303
msgid "_Game"
msgstr "_Oyun"
-#: client/gui-gtk-2.0/menu.c:702 client/gui-gtk-2.0/menu.c:704
-#: client/gui-gtk-2.0/menu.c:706 client/gui-gtk-2.0/menu.c:708
-#: client/gui-gtk-2.0/menu.c:710 client/gui-gtk-2.0/menu.c:712
-#: client/gui-gtk-2.0/menu.c:714 client/gui-gtk-2.0/menu.c:717
-#: client/gui-gtk-2.0/menu.c:720 client/gui-gtk-2.0/menu.c:722
-#: client/gui-gtk-2.0/menu.c:724 client/gui-gtk-2.0/menu.c:726
-#: client/gui-gtk-2.0/menu.c:728 client/gui-gtk-2.0/menu.c:730
-#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:736
-#: client/gui-gtk-2.0/menu.c:738 client/gui-gtk-2.0/menu.c:740
+#: client/gui-gtk-2.0/menu.c:729 client/gui-gtk-2.0/menu.c:731
+#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:735
+#: client/gui-gtk-2.0/menu.c:737 client/gui-gtk-2.0/menu.c:739
+#: client/gui-gtk-2.0/menu.c:741 client/gui-gtk-2.0/menu.c:744
+#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
+#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
+#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
+#: client/gui-gtk-2.0/menu.c:760 client/gui-gtk-2.0/menu.c:763
+#: client/gui-gtk-2.0/menu.c:765 client/gui-gtk-2.0/menu.c:767
#: data/Freeciv.in:2026
msgid "Game"
msgstr "Oyun"
-#: client/gui-gtk-2.0/menu.c:704 client/gui-gtk-2.0/menu.c:706
-#: client/gui-gtk-2.0/menu.c:708
+#: client/gui-gtk-2.0/menu.c:731 client/gui-gtk-2.0/menu.c:733
+#: client/gui-gtk-2.0/menu.c:735
msgid "_Chat"
msgstr "_Sohbet"
-#: client/gui-gtk-2.0/menu.c:706 client/gui-win32/menu.c:314
+#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:314
msgid "_Clear Log"
msgstr "Kütüğü Si_l"
-#: client/gui-gtk-2.0/menu.c:708 client/gui-win32/menu.c:313
+#: client/gui-gtk-2.0/menu.c:735 client/gui-win32/menu.c:313
msgid "_Write Log"
msgstr "Kütüğü _Yaz"
-#: client/gui-gtk-2.0/menu.c:710 client/gui-win32/menu.c:304
+#: client/gui-gtk-2.0/menu.c:737 client/gui-win32/menu.c:304
msgid "Local _Options"
msgstr "_Yerel Ayarlar"
-#: client/gui-gtk-2.0/menu.c:712 client/gui-win32/menu.c:305
+#: client/gui-gtk-2.0/menu.c:739 client/gui-win32/menu.c:305
msgid "_Message Options"
msgstr "_Mesaj Ayarları"
-#: client/gui-gtk-2.0/menu.c:717
+#: client/gui-gtk-2.0/menu.c:744
msgid "_Reload Tileset"
msgstr "Arazi Setini _Yeniden Yükle"
-#: client/gui-gtk-2.0/menu.c:720
+#: client/gui-gtk-2.0/menu.c:747
msgid "Save Options on _Exit"
msgstr "Çıkışta Aya_rları Kaydet"
-#: client/gui-gtk-2.0/menu.c:722
+#: client/gui-gtk-2.0/menu.c:749
msgid "Sa_ve Options"
msgstr "_Ayarları Kaydet"
-#: client/gui-gtk-2.0/menu.c:726 client/gui-win32/menu.c:308
+#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:308
msgid "Server O_ptions"
msgstr "S_unucu Ayarları"
-#: client/gui-gtk-2.0/menu.c:730 client/gui-win32/menu.c:310
+#: client/gui-gtk-2.0/menu.c:757 client/gui-win32/menu.c:310
msgid "_Save Game"
msgstr "_Oyunu Kaydet"
-#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:311
+#: client/gui-gtk-2.0/menu.c:760 client/gui-win32/menu.c:311
msgid "Save Game _As..."
msgstr "Oyunu _Farklı Kaydet"
-#: client/gui-gtk-2.0/menu.c:738
+#: client/gui-gtk-2.0/menu.c:765
msgid "_Leave"
msgstr "Ka_pat"
-#: client/gui-gtk-2.0/menu.c:740 client/gui-win32/menu.c:317
+#: client/gui-gtk-2.0/menu.c:767 client/gui-win32/menu.c:317
msgid "_Quit"
msgstr "Çı_k"
-#: client/gui-gtk-2.0/menu.c:745 client/gui-win32/menu.c:321
+#: client/gui-gtk-2.0/menu.c:772 client/gui-win32/menu.c:321
msgid "Gov_ernment"
msgstr "_Hükümet"
-#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
-#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
-#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:774 client/gui-gtk-2.0/menu.c:776
+#: client/gui-gtk-2.0/menu.c:778 client/gui-gtk-2.0/menu.c:780
+#: client/gui-gtk-2.0/menu.c:782 client/gui-gtk-2.0/menu.c:784
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
#: client/gui-xaw/menu.c:248 data/Freeciv.in:2027 data/helpdata.txt:1320
msgid "Government"
msgstr "Hükümet"
-#: client/gui-gtk-2.0/menu.c:749 client/gui-win32/menu.c:322
+#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:322
msgid "_Tax Rates"
msgstr "_Vergi Oranları"
-#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:324
+#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:324
msgid "_Find City"
msgstr "Åž_ehir Bul"
-#: client/gui-gtk-2.0/menu.c:755 client/gui-win32/menu.c:325
+#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:325
msgid "_Worklists"
msgstr "Ä°ÅŸ _Listeleri"
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
-#: client/gui-gtk-2.0/menu.c:764 client/gui-win32/menu.c:327
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
+#: client/gui-gtk-2.0/menu.c:791 client/gui-win32/menu.c:327
msgid "_Change Government"
msgstr "Yönetimi _Değiştir"
-#: client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:788
msgid "_Revolution..."
msgstr "De_vrim..."
-#: client/gui-gtk-2.0/menu.c:764 client/gui-gtk-2.0/menu.c:970
+#: client/gui-gtk-2.0/menu.c:791 client/gui-gtk-2.0/menu.c:1013
#: client/gui-win32/menu.c:431
msgid "_Government"
msgstr "_Hükümet"
-#: client/gui-gtk-2.0/menu.c:768 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:795 client/gui-gtk-2.0/menu.c:959
#: client/gui-win32/menu.c:334
msgid "_View"
msgstr "_Görünüm"
-#: client/gui-gtk-2.0/menu.c:772
+#: client/gui-gtk-2.0/menu.c:799
msgid "City Outlines"
msgstr "Şehir Sınır_ları"
-#: client/gui-gtk-2.0/menu.c:774 client/gui-win32/menu.c:335
+#: client/gui-gtk-2.0/menu.c:801 client/gui-win32/menu.c:335
msgid "Map _Grid"
msgstr "_Harita Izgarası"
-#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:336
+#: client/gui-gtk-2.0/menu.c:803 client/gui-win32/menu.c:336
msgid "National _Borders"
msgstr "_Milli Sınırlar"
-#: client/gui-gtk-2.0/menu.c:778 client/gui-win32/menu.c:337
+#: client/gui-gtk-2.0/menu.c:805 client/gui-win32/menu.c:337
msgid "City _Names"
msgstr "Şehir _Adları"
-#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:338
+#: client/gui-gtk-2.0/menu.c:807 client/gui-win32/menu.c:338
msgid "City G_rowth"
msgstr "Şehir _Büyüme"
-#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:339
+#: client/gui-gtk-2.0/menu.c:809 client/gui-win32/menu.c:339
msgid "City _Productions"
msgstr "Åže_hir Ãœretimi"
-#: client/gui-gtk-2.0/menu.c:784 client/gui-sdl/optiondlg.c:1719
+#: client/gui-gtk-2.0/menu.c:811
+#, fuzzy
+msgid "City Buy Cost"
+msgstr "Toplam Gider: "
+
+#: client/gui-gtk-2.0/menu.c:813
+#, fuzzy
+msgid "City Traderoutes"
+msgstr "Ticaret yolları: "
+
+#: client/gui-gtk-2.0/menu.c:815 client/gui-sdl/optiondlg.c:1719
msgid "Draw city worker map grid"
msgstr "Şehir çalışanlarını harita ızgarasında göster"
-#: client/gui-gtk-2.0/menu.c:788 client/gui-sdl/optiondlg.c:1635
+#: client/gui-gtk-2.0/menu.c:819 client/gui-sdl/optiondlg.c:1635
#: client/gui-win32/menu.c:340 client/gui-xaw/menu.c:148
#: client/gui-xaw/menu.c:246 manual/civmanual.c:220 data/helpdata.txt:1220
msgid "Terrain"
msgstr "Arazi"
-#: client/gui-gtk-2.0/menu.c:790 client/gui-win32/menu.c:341
+#: client/gui-gtk-2.0/menu.c:821 client/gui-win32/menu.c:341
#: client/gui-xaw/menu.c:149
msgid "Coastline"
msgstr "Sahil"
-#: client/gui-gtk-2.0/menu.c:796 client/gui-win32/menu.c:343
+#: client/gui-gtk-2.0/menu.c:827 client/gui-win32/menu.c:343
msgid "Roads & Rails"
msgstr "Yol & Ray"
-#: client/gui-gtk-2.0/menu.c:800 client/gui-sdl/optiondlg.c:1933
+#: client/gui-gtk-2.0/menu.c:831 client/gui-sdl/optiondlg.c:1933
#: client/gui-win32/menu.c:345 client/gui-xaw/menu.c:152
msgid "Mines"
msgstr "Mayınlar"
-#: client/gui-gtk-2.0/menu.c:802 client/gui-win32/menu.c:346
+#: client/gui-gtk-2.0/menu.c:833 client/gui-win32/menu.c:346
msgid "Fortress & Airbase"
msgstr "Kale & Hava Üssü"
-#: client/gui-gtk-2.0/menu.c:804 client/gui-win32/menu.c:348
+#: client/gui-gtk-2.0/menu.c:835 client/gui-win32/menu.c:348
#: client/gui-xaw/menu.c:154
msgid "Specials"
msgstr "Özellikler"
-#: client/gui-gtk-2.0/menu.c:806 client/gui-win32/menu.c:349
+#: client/gui-gtk-2.0/menu.c:837 client/gui-win32/menu.c:349
#: client/gui-xaw/menu.c:155
msgid "Pollution & Fallout"
msgstr "Kirlilik & Nükleer Serpinti"
-#: client/gui-gtk-2.0/menu.c:812 client/gui-win32/menu.c:352
+#: client/gui-gtk-2.0/menu.c:843 client/gui-win32/menu.c:352
#: client/gui-xaw/menu.c:158
msgid "Focus Unit"
msgstr "_Birime Odaklan"
-#: client/gui-gtk-2.0/menu.c:814 client/gui-sdl/optiondlg.c:1854
+#: client/gui-gtk-2.0/menu.c:845 client/gui-sdl/optiondlg.c:1854
#: client/gui-win32/menu.c:353 client/gui-xaw/menu.c:159
msgid "Fog of War"
msgstr "Savaşın Dumanı"
-#: client/gui-gtk-2.0/menu.c:818
+#: client/gui-gtk-2.0/menu.c:849
msgid "_Full Screen"
msgstr "_Tam Ekran"
-#: client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/menu.c:853
msgid "_Center View"
msgstr "Görüntüyü _Ortala"
-#: client/gui-gtk-2.0/menu.c:825 client/gui-win32/menu.c:358
+#: client/gui-gtk-2.0/menu.c:856 client/gui-win32/menu.c:358
msgid "_Orders"
msgstr "_Komutlar"
-#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
-#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
-#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
-#: client/gui-gtk-2.0/menu.c:855 client/gui-gtk-2.0/menu.c:857
-#: client/gui-gtk-2.0/menu.c:859 client/gui-gtk-2.0/menu.c:861
-#: client/gui-gtk-2.0/menu.c:863 client/gui-gtk-2.0/menu.c:865
-#: client/gui-gtk-2.0/menu.c:867 client/gui-gtk-2.0/menu.c:869
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875 client/gui-gtk-2.0/menu.c:877
-#: client/gui-gtk-2.0/menu.c:879 client/gui-gtk-2.0/menu.c:881
-#: client/gui-gtk-2.0/menu.c:883 client/gui-gtk-2.0/menu.c:885
-#: client/gui-gtk-2.0/menu.c:887 client/gui-gtk-2.0/menu.c:889
-#: client/gui-gtk-2.0/menu.c:891 client/gui-gtk-2.0/menu.c:893
-#: client/gui-gtk-2.0/menu.c:895 client/gui-gtk-2.0/menu.c:897
-#: client/gui-gtk-2.0/menu.c:899 client/gui-gtk-2.0/menu.c:901
-#: client/gui-gtk-2.0/menu.c:903 data/Freeciv.in:2029
+#: client/gui-gtk-2.0/menu.c:858 client/gui-gtk-2.0/menu.c:860
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:864
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:868
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:872
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:876
+#: client/gui-gtk-2.0/menu.c:878 client/gui-gtk-2.0/menu.c:880
+#: client/gui-gtk-2.0/menu.c:882 client/gui-gtk-2.0/menu.c:884
+#: client/gui-gtk-2.0/menu.c:886 client/gui-gtk-2.0/menu.c:888
+#: client/gui-gtk-2.0/menu.c:890 client/gui-gtk-2.0/menu.c:892
+#: client/gui-gtk-2.0/menu.c:894 client/gui-gtk-2.0/menu.c:896
+#: client/gui-gtk-2.0/menu.c:898 client/gui-gtk-2.0/menu.c:900
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906 client/gui-gtk-2.0/menu.c:908
+#: client/gui-gtk-2.0/menu.c:910 client/gui-gtk-2.0/menu.c:912
+#: client/gui-gtk-2.0/menu.c:914 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:918 client/gui-gtk-2.0/menu.c:920
+#: client/gui-gtk-2.0/menu.c:922 client/gui-gtk-2.0/menu.c:924
+#: client/gui-gtk-2.0/menu.c:926 client/gui-gtk-2.0/menu.c:928
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
+#: client/gui-gtk-2.0/menu.c:946 data/Freeciv.in:2029
msgid "Orders"
msgstr "Komutlar"
-#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:1444
+#: client/gui-gtk-2.0/menu.c:860 client/gui-gtk-2.0/menu.c:1489
#: client/gui-win32/menu.c:359
msgid "_Build City"
msgstr "Åžehir Ä°nÅŸa _Et"
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:1466
-#: client/gui-gtk-2.0/menu.c:1472 client/gui-win32/menu.c:360
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:1511
+#: client/gui-gtk-2.0/menu.c:1517 client/gui-win32/menu.c:360
msgid "Build _Road"
msgstr "_Yol Yap"
-#: client/gui-gtk-2.0/menu.c:833 client/gui-gtk-2.0/menu.c:1360
+#: 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 "_Sulama Yap"
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:1361
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:1406
#: client/gui-win32/menu.c:362
msgid "Build _Mine"
msgstr "_Maden Yap"
-#: client/gui-gtk-2.0/menu.c:837 client/gui-gtk-2.0/menu.c:1362
+#: client/gui-gtk-2.0/menu.c:868 client/gui-gtk-2.0/menu.c:1407
msgid "Transf_orm Terrain"
msgstr "Araziyi _Dönüştür"
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:1508
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:1553
#: client/gui-win32/menu.c:364
msgid "Build _Fortress"
msgstr "_Kale Yap"
-#: client/gui-gtk-2.0/menu.c:841 client/gui-win32/menu.c:365
+#: client/gui-gtk-2.0/menu.c:872 client/gui-win32/menu.c:365
msgid "Build Airbas_e"
msgstr "_Hava Üssü Yap"
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:1514
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:1559
#: client/gui-win32/menu.c:366
msgid "Clean _Pollution"
msgstr "KirliliÄŸi _Temizle"
-#: client/gui-gtk-2.0/menu.c:845 client/gui-win32/menu.c:367
+#: client/gui-gtk-2.0/menu.c:876 client/gui-win32/menu.c:367
msgid "Clean _Nuclear Fallout"
msgstr "_Nükleer Serpintiyi Temizle"
-#: client/gui-gtk-2.0/menu.c:849 client/gui-win32/menu.c:369
+#: client/gui-gtk-2.0/menu.c:880 client/gui-win32/menu.c:369
msgid "_Sentry"
msgstr "_Nöbet Tut"
-#: client/gui-gtk-2.0/menu.c:855 client/gui-win32/menu.c:372
+#: client/gui-gtk-2.0/menu.c:886 client/gui-win32/menu.c:372
msgid "Make _Homecity"
msgstr "Memleketi Ya_p"
-#: client/gui-gtk-2.0/menu.c:857 client/gui-win32/menu.c:373
+#: client/gui-gtk-2.0/menu.c:888 client/gui-win32/menu.c:373
msgid "_Load"
msgstr "Araca _Bindir"
-#: client/gui-gtk-2.0/menu.c:859
+#: client/gui-gtk-2.0/menu.c:890
msgid "_Unload Transporter"
msgstr "_Araçtan İndir"
-#: client/gui-gtk-2.0/menu.c:861 client/gui-win32/menu.c:374
+#: client/gui-gtk-2.0/menu.c:892 client/gui-win32/menu.c:374
msgid "_Unload"
msgstr "B_oÅŸalt"
-#: client/gui-gtk-2.0/menu.c:863 client/gui-win32/menu.c:375
+#: client/gui-gtk-2.0/menu.c:894 client/gui-win32/menu.c:375
msgid "Wake up o_thers"
msgstr "_Diğerlerini Uyandır"
-#: client/gui-gtk-2.0/menu.c:867
+#: client/gui-gtk-2.0/menu.c:898
msgid "_Auto Settler"
msgstr "Oto-Göç_men"
-#: client/gui-gtk-2.0/menu.c:869 client/gui-win32/menu.c:378
+#: client/gui-gtk-2.0/menu.c:900 client/gui-win32/menu.c:378
msgid "Auto E_xplore"
msgstr "Otomatik _KeÅŸif"
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906
msgid "_Connect"
msgstr "_BaÄŸla"
-#: client/gui-gtk-2.0/menu.c:871 client/gui-win32/menu.c:380
+#: client/gui-gtk-2.0/menu.c:902 client/gui-win32/menu.c:380
msgid "_Road"
msgstr "_Yol Ä°le"
-#: client/gui-gtk-2.0/menu.c:873 client/gui-win32/menu.c:381
+#: client/gui-gtk-2.0/menu.c:904 client/gui-win32/menu.c:381
msgid "Rai_l"
msgstr "_Ray Ä°le"
-#: client/gui-gtk-2.0/menu.c:875 client/gui-win32/menu.c:382
+#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:382
msgid "_Irrigate"
msgstr "_Sulama Ä°le"
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
msgid "Go _to"
msgstr "_Git"
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
msgid "_Build city"
msgstr "Åžehir inÅŸa _et"
-#: client/gui-gtk-2.0/menu.c:879
+#: client/gui-gtk-2.0/menu.c:910
msgid "Patrol (_Q)"
msgstr "Devriye gez (_Q)"
-#: client/gui-gtk-2.0/menu.c:881 client/gui-win32/menu.c:385
+#: client/gui-gtk-2.0/menu.c:912 client/gui-win32/menu.c:385
msgid "_Go to"
msgstr "Gi_t"
-#: client/gui-gtk-2.0/menu.c:883
+#: client/gui-gtk-2.0/menu.c:914
msgid "Go\\/Airlift to City"
msgstr "Git\\/Havayolu taşıması"
-#: client/gui-gtk-2.0/menu.c:885 client/gui-sdl/menu.c:450
+#: client/gui-gtk-2.0/menu.c:916 client/gui-sdl/menu.c:450
#: client/gui-win32/menu.c:387 client/gui-xaw/menu.c:203
msgid "Return to nearest city"
msgstr "En yakın şehre dön"
-#: client/gui-gtk-2.0/menu.c:889 client/gui-win32/menu.c:389
+#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:389
#: client/gui-xaw/menu.c:205
msgid "Disband Unit"
msgstr "Birimi Terhis Et"
-#: client/gui-gtk-2.0/menu.c:891 client/gui-sdl/citydlg.c:532
+#: client/gui-gtk-2.0/menu.c:922 client/gui-sdl/citydlg.c:532
#: data/Freeciv.in:1186
msgid "Upgrade unit"
msgstr "Birimi yükselt"
-#: client/gui-gtk-2.0/menu.c:893
+#: client/gui-gtk-2.0/menu.c:924
msgid "Diplomat\\/Spy Actions"
msgstr "Diplomat\\/Casus Hareketleri"
-#: client/gui-gtk-2.0/menu.c:895 client/gui-sdl/menu.c:399
+#: client/gui-gtk-2.0/menu.c:926 client/gui-sdl/menu.c:399
#: client/gui-win32/menu.c:391 client/gui-xaw/menu.c:209
msgid "Explode Nuclear"
msgstr "Atom Bombasını patlat"
-#: client/gui-gtk-2.0/menu.c:899
-msgid "Select same type"
-msgstr "Aynı türdekileri seç"
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/cityrep.c:882
+msgid "Select"
+msgstr "Seç"
+
+#: client/gui-gtk-2.0/menu.c:934
+#, fuzzy
+msgid "Single"
+msgstr "Sık Orman"
+
+#: client/gui-gtk-2.0/menu.c:936
+msgid "Same Type On Tile"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:938
+msgid "All On Tile"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:940
+msgid "Same Type On Continent"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:942
+msgid "Same Type Everywhere"
+msgstr ""
-#: client/gui-gtk-2.0/menu.c:901 client/gui-win32/menu.c:393
+#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:393
msgid "_Wait"
msgstr "_Bekle"
-#: client/gui-gtk-2.0/menu.c:903 client/gui-win32/menu.c:394
+#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:394
#: client/gui-xaw/menu.c:213
msgid "Done"
msgstr "Bitti"
-#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:398
+#: client/gui-gtk-2.0/menu.c:949 client/gui-win32/menu.c:398
msgid "_Reports"
msgstr "_Raporlar"
-#: client/gui-gtk-2.0/menu.c:908 client/gui-gtk-2.0/menu.c:910
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:914
-#: client/gui-gtk-2.0/menu.c:916 client/gui-gtk-2.0/menu.c:918
-#: client/gui-gtk-2.0/menu.c:920 client/gui-gtk-2.0/menu.c:922
-#: client/gui-gtk-2.0/menu.c:924 client/gui-gtk-2.0/menu.c:926
-#: client/gui-gtk-2.0/menu.c:928 client/gui-gtk-2.0/menu.c:930
-#: client/gui-gtk-2.0/menu.c:932 data/Freeciv.in:2030
+#: client/gui-gtk-2.0/menu.c:951 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:957
+#: client/gui-gtk-2.0/menu.c:959 client/gui-gtk-2.0/menu.c:961
+#: client/gui-gtk-2.0/menu.c:963 client/gui-gtk-2.0/menu.c:965
+#: client/gui-gtk-2.0/menu.c:967 client/gui-gtk-2.0/menu.c:969
+#: client/gui-gtk-2.0/menu.c:971 client/gui-gtk-2.0/menu.c:973
+#: client/gui-gtk-2.0/menu.c:975 data/Freeciv.in:2030
msgid "Reports"
msgstr "Raporlar"
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:958
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:1001
#: client/gui-win32/menu.c:400 client/gui-win32/menu.c:425
msgid "_Units"
msgstr "_Birimler"
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/menu.c:914 client/gui-win32/menu.c:402
+#: client/gui-gtk-2.0/menu.c:957 client/gui-win32/menu.c:402
msgid "_Nations"
msgstr "_Uluslar"
-#: client/gui-gtk-2.0/menu.c:918 client/gui-win32/menu.c:403
+#: client/gui-gtk-2.0/menu.c:961 client/gui-win32/menu.c:403
msgid "_Economy"
msgstr "_Ekonomi"
#. TRANS: Research report action
-#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:405
+#: client/gui-gtk-2.0/menu.c:963 client/gui-win32/menu.c:405
msgid "_Research"
msgstr "_Araştırma"
-#: client/gui-gtk-2.0/menu.c:924 client/gui-win32/menu.c:407
+#: client/gui-gtk-2.0/menu.c:967 client/gui-win32/menu.c:407
msgid "_Wonders of the World"
msgstr "_Dünyanın Harikaları"
-#: client/gui-gtk-2.0/menu.c:926 client/gui-win32/menu.c:408
+#: client/gui-gtk-2.0/menu.c:969 client/gui-win32/menu.c:408
msgid "_Top Five Cities"
msgstr "E_n Ä°yi 5 Åžehir"
-#: client/gui-gtk-2.0/menu.c:928 client/gui-win32/menu.c:409
+#: client/gui-gtk-2.0/menu.c:971 client/gui-win32/menu.c:409
msgid "_Messages"
msgstr "_Mesajlar"
-#: client/gui-gtk-2.0/menu.c:930 client/gui-win32/menu.c:410
+#: client/gui-gtk-2.0/menu.c:973 client/gui-win32/menu.c:410
msgid "_Demographics"
msgstr "Ä°_statistikler"
-#: client/gui-gtk-2.0/menu.c:932 client/gui-gtk-2.0/plrdlg.c:471
+#: client/gui-gtk-2.0/menu.c:975 client/gui-gtk-2.0/plrdlg.c:354
#: client/gui-win32/menu.c:411
msgid "_Spaceship"
msgstr "_Uzay Gemisi"
-#: client/gui-gtk-2.0/menu.c:936 client/gui-win32/menu.c:415
+#: client/gui-gtk-2.0/menu.c:979 client/gui-win32/menu.c:415
msgid "_Help"
msgstr "_Yardım"
-#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
-#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
-#: client/gui-gtk-2.0/menu.c:946 client/gui-gtk-2.0/menu.c:948
-#: client/gui-gtk-2.0/menu.c:950 client/gui-gtk-2.0/menu.c:952
-#: client/gui-gtk-2.0/menu.c:954 client/gui-gtk-2.0/menu.c:956
-#: client/gui-gtk-2.0/menu.c:958 client/gui-gtk-2.0/menu.c:960
-#: client/gui-gtk-2.0/menu.c:962 client/gui-gtk-2.0/menu.c:964
-#: client/gui-gtk-2.0/menu.c:966 client/gui-gtk-2.0/menu.c:968
-#: client/gui-gtk-2.0/menu.c:970 client/gui-gtk-2.0/menu.c:972
-#: client/gui-gtk-2.0/menu.c:974 client/gui-gtk-2.0/menu.c:976
-#: client/gui-gtk-2.0/menu.c:978 client/gui-gtk-2.0/menu.c:980
+#: client/gui-gtk-2.0/menu.c:981 client/gui-gtk-2.0/menu.c:983
+#: client/gui-gtk-2.0/menu.c:985 client/gui-gtk-2.0/menu.c:987
+#: client/gui-gtk-2.0/menu.c:989 client/gui-gtk-2.0/menu.c:991
+#: client/gui-gtk-2.0/menu.c:993 client/gui-gtk-2.0/menu.c:995
+#: client/gui-gtk-2.0/menu.c:997 client/gui-gtk-2.0/menu.c:999
+#: client/gui-gtk-2.0/menu.c:1001 client/gui-gtk-2.0/menu.c:1003
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-gtk-2.0/menu.c:1007
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-gtk-2.0/menu.c:1011
+#: client/gui-gtk-2.0/menu.c:1013 client/gui-gtk-2.0/menu.c:1015
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-gtk-2.0/menu.c:1019
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-gtk-2.0/menu.c:1023
#: client/gui-gtk-2.0/repodlgs.c:313 client/gui-win32/citydlg.c:1077
#: client/gui-win32/repodlgs.c:289 client/gui-win32/wldlg.c:846
#: data/Freeciv.in:1466 data/Freeciv.in:2031 data/Freeciv.in:2101
@@ -11790,119 +12005,119 @@ msgstr "_Yardım"
msgid "Help"
msgstr "Yardım"
-#: client/gui-gtk-2.0/menu.c:940 client/gui-win32/menu.c:416
+#: client/gui-gtk-2.0/menu.c:983 client/gui-win32/menu.c:416
msgid "Language_s"
msgstr "_Diller"
-#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/menu.c:417
+#: client/gui-gtk-2.0/menu.c:985 client/gui-win32/menu.c:417
msgid "Co_nnecting"
msgstr "_Bağlantı"
-#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:418
+#: client/gui-gtk-2.0/menu.c:987 client/gui-win32/menu.c:418
msgid "C_ontrols"
msgstr "TuÅŸla_r"
-#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:419
+#: client/gui-gtk-2.0/menu.c:989 client/gui-win32/menu.c:419
msgid "C_hatline"
msgstr "So_hbet Satırı"
-#: client/gui-gtk-2.0/menu.c:948 client/gui-win32/menu.c:420
+#: client/gui-gtk-2.0/menu.c:991 client/gui-win32/menu.c:420
msgid "_Worklist Editor"
msgstr "İş Listesi _Düzenleyicisi"
-#: client/gui-gtk-2.0/menu.c:950 client/gui-win32/menu.c:421
+#: client/gui-gtk-2.0/menu.c:993 client/gui-win32/menu.c:421
msgid "Citizen _Management"
msgstr "_Vatandaş Yönetimi"
-#: client/gui-gtk-2.0/menu.c:952 client/gui-win32/menu.c:422
+#: client/gui-gtk-2.0/menu.c:995 client/gui-win32/menu.c:422
msgid "_Playing"
msgstr "_Oynanış"
-#: client/gui-gtk-2.0/menu.c:956 client/gui-win32/menu.c:424
+#: client/gui-gtk-2.0/menu.c:999 client/gui-win32/menu.c:424
msgid "City _Improvements"
msgstr "Şehir _Yapıları"
-#: client/gui-gtk-2.0/menu.c:960 client/gui-win32/menu.c:426
+#: client/gui-gtk-2.0/menu.c:1003 client/gui-win32/menu.c:426
msgid "Com_bat"
msgstr "_SavaÅŸ"
-#: client/gui-gtk-2.0/menu.c:962 client/gui-win32/menu.c:427
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-win32/menu.c:427
msgid "_ZOC"
msgstr "_KOB"
-#: client/gui-gtk-2.0/menu.c:964 client/gui-win32/menu.c:428
+#: client/gui-gtk-2.0/menu.c:1007 client/gui-win32/menu.c:428
msgid "Techno_logy"
msgstr "_Teknoloji"
-#: client/gui-gtk-2.0/menu.c:966 client/gui-win32/menu.c:429
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-win32/menu.c:429
msgid "_Terrain"
msgstr "_Arazi"
-#: client/gui-gtk-2.0/menu.c:968 client/gui-win32/menu.c:430
+#: client/gui-gtk-2.0/menu.c:1011 client/gui-win32/menu.c:430
msgid "Won_ders"
msgstr "_Harikalar"
-#: client/gui-gtk-2.0/menu.c:972 client/gui-win32/menu.c:432
+#: client/gui-gtk-2.0/menu.c:1015 client/gui-win32/menu.c:432
msgid "Happin_ess"
msgstr "_Mutluluk"
-#: client/gui-gtk-2.0/menu.c:974 client/gui-win32/menu.c:433
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-win32/menu.c:433
msgid "Space _Race"
msgstr "_Uzay Yarışı"
-#: client/gui-gtk-2.0/menu.c:978 client/gui-win32/menu.c:435
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-win32/menu.c:435
msgid "_Copying"
msgstr "_Lisans"
-#: client/gui-gtk-2.0/menu.c:980 client/gui-win32/menu.c:436
+#: client/gui-gtk-2.0/menu.c:1023 client/gui-win32/menu.c:436
msgid "_About"
msgstr "_Hakkında"
-#: client/gui-gtk-2.0/menu.c:1264
+#: client/gui-gtk-2.0/menu.c:1307
#, c-format
msgid "%s..."
msgstr "%s..."
-#: client/gui-gtk-2.0/menu.c:1352
+#: client/gui-gtk-2.0/menu.c:1397
#, c-format
msgid "Change to %s (_I)"
msgstr "%s ile DeÄŸiÅŸtir (_I)"
-#: client/gui-gtk-2.0/menu.c:1353
+#: client/gui-gtk-2.0/menu.c:1398
#, c-format
msgid "Change to %s (_M)"
msgstr "%s ile DeÄŸiÅŸtir (_M)"
-#: client/gui-gtk-2.0/menu.c:1354
+#: client/gui-gtk-2.0/menu.c:1399
#, c-format
msgid "Transf_orm to %s"
msgstr "%s ile _DeÄŸiÅŸtir"
-#: client/gui-gtk-2.0/menu.c:1427
+#: client/gui-gtk-2.0/menu.c:1472
msgid "Help _Build Wonder"
msgstr "Harika _Yapımına Yardım Et"
-#: client/gui-gtk-2.0/menu.c:1441
+#: client/gui-gtk-2.0/menu.c:1486
msgid "Add to City (_B)"
msgstr "Åžehire Ekle (_B)"
-#: client/gui-gtk-2.0/menu.c:1449
+#: client/gui-gtk-2.0/menu.c:1494
msgid "Make Trade _Route"
msgstr "_Ticaret Yolu Yap"
-#: client/gui-gtk-2.0/menu.c:1463
+#: client/gui-gtk-2.0/menu.c:1508
msgid "Build _Railroad"
msgstr "Demiry_olu yap"
-#: client/gui-gtk-2.0/menu.c:1486
+#: client/gui-gtk-2.0/menu.c:1531
msgid "Bu_ild Farmland"
msgstr "Otlak Alan Yap"
-#: client/gui-gtk-2.0/menu.c:1506
+#: client/gui-gtk-2.0/menu.c:1551
msgid "_Fortify"
msgstr "_Güçlendir"
-#: client/gui-gtk-2.0/menu.c:1512
+#: client/gui-gtk-2.0/menu.c:1557
msgid "_Paradrop"
msgstr "_Paraşütle İn"
@@ -11937,13 +12152,31 @@ msgstr "Mes"
msgid "Pop"
msgstr "Açıl"
-#: client/gui-gtk-2.0/messagewin.c:155 client/gui-sdl/messagewin.c:247
+#: client/gui-gtk-2.0/messagewin.c:186 client/gui-sdl/messagewin.c:247
#: client/gui-win32/messagewin.c:132 client/gui-xaw/menu.c:228
#: data/Freeciv.in:3273 data/Freeciv.in:3274 data/Freeciv.in:3283
msgid "Messages"
msgstr "Mesajlar"
-#: client/gui-gtk-2.0/plrdlg.c:330
+#: client/gui-gtk-2.0/plrdlg.c:317
+msgid "_Meet"
+msgstr "_BuluÅŸma"
+
+#: client/gui-gtk-2.0/plrdlg.c:323
+msgid "Cancel _Treaty"
+msgstr "_Antlaşmayı Boz"
+
+#: client/gui-gtk-2.0/plrdlg.c:329
+#, fuzzy
+msgid "_Withdraw Vision"
+msgstr "_Görüşleri geri çek"
+
+#: client/gui-gtk-2.0/plrdlg.c:348
+#, fuzzy
+msgid "_Report"
+msgstr "_Raporlar"
+
+#: client/gui-gtk-2.0/plrdlg.c:386
msgid "?show:Dead Players"
msgstr "?show:Ölü Oyuncular"
@@ -11951,264 +12184,268 @@ msgstr "?show:Ölü Oyuncular"
#. TRANS: Nations report action
#. TRANS: Nations report title
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/plrdlg.c:350 client/gui-sdl/mapctrl.c:1580
+#: client/gui-gtk-2.0/plrdlg.c:406 client/gui-sdl/mapctrl.c:1580
#: client/gui-sdl/plrdlg.c:608 client/gui-win32/plrdlg.c:344
#: client/gui-xaw/menu.c:221 data/Freeciv.in:3192 data/Freeciv.in:3193
msgid "Nations"
msgstr "Uluslar"
-#: client/gui-gtk-2.0/plrdlg.c:443
+#: client/gui-gtk-2.0/plrdlg.c:511
+#, fuzzy
+msgid "Di_plomacy"
+msgstr "Diplomasi"
+
+#: client/gui-gtk-2.0/plrdlg.c:516
msgid "_Intelligence"
msgstr "Ä°st_ihbarat"
-#: client/gui-gtk-2.0/plrdlg.c:450
-msgid "_Meet"
-msgstr "_BuluÅŸma"
-
-#: client/gui-gtk-2.0/plrdlg.c:457
-msgid "Cancel _Treaty"
-msgstr "_Antlaşmayı Boz"
-
-#: client/gui-gtk-2.0/plrdlg.c:464
-msgid "_Withdraw vision"
-msgstr "_Görüşleri geri çek"
-
-#: client/gui-gtk-2.0/plrdlg.c:495
+#: client/gui-gtk-2.0/plrdlg.c:526
msgid "_AI"
msgstr "_YZ"
-#: client/gui-gtk-2.0/plrdlg.c:501
+#: client/gui-gtk-2.0/plrdlg.c:532
msgid "_Toggle AI Mode"
msgstr "_YZ Modunu DeÄŸiÅŸtir"
-#: client/gui-gtk-2.0/pages.c:208
+#: client/gui-gtk-2.0/pages.c:221
msgid "Start _New Game"
msgstr "_Yeni Oyun BaÅŸlat"
-#: client/gui-gtk-2.0/pages.c:214
+#: client/gui-gtk-2.0/pages.c:227
msgid "Start _Scenario Game"
msgstr "_Senaryo Oyunu BaÅŸlat"
-#: client/gui-gtk-2.0/pages.c:220
+#: client/gui-gtk-2.0/pages.c:233
msgid "_Load Saved Game"
msgstr "_Kayıtlı Oyunu Yükle"
-#: client/gui-gtk-2.0/pages.c:229
+#: client/gui-gtk-2.0/pages.c:239
msgid "C_onnect to Network Game"
msgstr "Ağ Oyununa Katıl"
-#: client/gui-gtk-2.0/pages.c:236
+#: client/gui-gtk-2.0/pages.c:247
msgid "Connect to Gaming _Zone"
msgstr "Bir Oyun Sitesine Katıl"
-#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:300
#: client/gui-xaw/connectdlg.c:326
msgid "Passwords don't match, enter password."
msgstr "Parolalar uyuşmuyor, parolanızı girin."
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:779 client/gui-gtk-2.0/pages.c:820
+#: client/gui-win32/connectdlg.c:916
msgid "Server Name"
msgstr "Sunucu Adı"
-#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
+#: 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
+#: data/Freeciv.in:96
msgid "Port"
msgstr "Port"
-#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
+#: client/gui-win32/connectdlg.c:917
msgid "Version"
msgstr "Sürüm"
-#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
-#: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
+#: 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
msgid "Status"
msgstr "Durum"
-#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
-#: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
+#: 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
msgid "Players"
msgstr "Oyuncular"
-#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
+#: client/gui-win32/connectdlg.c:918
msgid "Comment"
msgstr "Yorum"
-#: client/gui-gtk-2.0/pages.c:747
+#: client/gui-gtk-2.0/pages.c:786
msgid "Local _Area Network"
msgstr "_Yerel AÄŸ (LAN)"
-#: client/gui-gtk-2.0/pages.c:783
+#: client/gui-gtk-2.0/pages.c:827
msgid "Internet _Metaserver"
msgstr "Internet _Metaserver"
-#: client/gui-gtk-2.0/pages.c:817
+#: client/gui-gtk-2.0/pages.c:864
msgid "_Host:"
msgstr "_Host:"
-#: client/gui-gtk-2.0/pages.c:834
+#: client/gui-gtk-2.0/pages.c:881
msgid "_Port:"
msgstr "_Port:"
-#: client/gui-gtk-2.0/pages.c:851
+#: client/gui-gtk-2.0/pages.c:898
msgid "_Login:"
msgstr "_GiriÅŸ"
-#: client/gui-gtk-2.0/pages.c:869
+#: client/gui-gtk-2.0/pages.c:916
msgid "Pass_word:"
msgstr "_Parola:"
-#: client/gui-gtk-2.0/pages.c:887
+#: client/gui-gtk-2.0/pages.c:934
msgid "Conf_irm Password:"
msgstr "Parolayı _Doğrula:"
-#: client/gui-gtk-2.0/pages.c:912
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: 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/wldlg.c:800 client/gui-win32/wldlg.c:806
+msgid "Type"
+msgstr "Tür"
+
+#: client/gui-gtk-2.0/pages.c:952 client/gui-win32/plrdlg.c:337
+#: data/Freeciv.in:88
+msgid "Host"
+msgstr "Sunucu"
+
+#: client/gui-gtk-2.0/pages.c:981
msgid "C_onnect"
msgstr "_BaÄŸlan"
-#: client/gui-gtk-2.0/pages.c:1142
+#: client/gui-gtk-2.0/pages.c:1211
#, c-format
msgid "Connection name: %s"
msgstr "Bağlantı Adı: %s"
-#: client/gui-gtk-2.0/pages.c:1145
+#: client/gui-gtk-2.0/pages.c:1214
#, c-format
msgid "Player name: %s"
msgstr "Oyuncu Adı: %s"
-#: client/gui-gtk-2.0/pages.c:1150
+#: client/gui-gtk-2.0/pages.c:1219
#, c-format
msgid "Host: %s"
msgstr "Host: %s"
-#: client/gui-gtk-2.0/pages.c:1158
+#: client/gui-gtk-2.0/pages.c:1227
msgid "Player/conn info"
msgstr "Ounucu/baÄŸ. info"
-#: client/gui-gtk-2.0/pages.c:1185
+#: client/gui-gtk-2.0/pages.c:1254
#, c-format
msgid "%s info"
msgstr "%s info"
-#: client/gui-gtk-2.0/pages.c:1196
+#: client/gui-gtk-2.0/pages.c:1265
msgid "Toggle player ready"
msgstr "Oyuncu hazır/hayır değil değiştirir"
-#: client/gui-gtk-2.0/pages.c:1204
+#: client/gui-gtk-2.0/pages.c:1273
msgid "Pick nation"
msgstr "Ulus seçimi"
-#: client/gui-gtk-2.0/pages.c:1214
+#: client/gui-gtk-2.0/pages.c:1283
msgid "Observe this player"
msgstr "Bu oyuncu izle"
-#: client/gui-gtk-2.0/pages.c:1221
+#: client/gui-gtk-2.0/pages.c:1290
msgid "Take this player"
msgstr "Bu oyuncu al"
-#: client/gui-gtk-2.0/pages.c:1238
+#: client/gui-gtk-2.0/pages.c:1307
msgid "Cut connection"
msgstr "Bağlantıyı kes"
-#: client/gui-gtk-2.0/pages.c:1248
+#: client/gui-gtk-2.0/pages.c:1317
msgid "Aitoggle player"
msgstr "Oyuncuyu YZ yap/yapma"
-#: client/gui-gtk-2.0/pages.c:1257
+#: client/gui-gtk-2.0/pages.c:1326
msgid "Remove player"
msgstr "Oyuncuyu sil"
-#: client/gui-gtk-2.0/pages.c:1268
+#: client/gui-gtk-2.0/pages.c:1337
msgid "Give info access"
msgstr "Bilgi eriÅŸimi ver"
-#: client/gui-gtk-2.0/pages.c:1276
+#: client/gui-gtk-2.0/pages.c:1345
msgid "Give ctrl access"
msgstr "Kontrol eriÅŸimi ver"
#. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1338
+#: client/gui-gtk-2.0/pages.c:1407
#, c-format
msgid "Put on %s"
msgstr "%s takımına ekle"
-#: client/gui-gtk-2.0/pages.c:1442
+#: client/gui-gtk-2.0/pages.c:1511
msgid "Number of _Players (including AI):"
msgstr "_Oyuncu Sayısı (YZ dahil):"
-#: client/gui-gtk-2.0/pages.c:1465
+#: client/gui-gtk-2.0/pages.c:1534
msgid "AI Skill _Level:"
msgstr "YZ Beceri _Derecesi:"
-#: client/gui-gtk-2.0/pages.c:1481
+#: client/gui-gtk-2.0/pages.c:1550
msgid "Ruleset _Version:"
msgstr "_Kural Seti Sürümü:"
-#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
msgid "_More Game Options..."
msgstr "Diğ_er Oyun Ayarları..."
-#: client/gui-gtk-2.0/pages.c:1514
+#: client/gui-gtk-2.0/pages.c:1583
msgid "Record"
msgstr "Rekor"
-#: client/gui-gtk-2.0/pages.c:1519
+#: client/gui-gtk-2.0/pages.c:1588
msgid "Rating"
msgstr "Sıralama"
-#: client/gui-gtk-2.0/pages.c:1525
+#: client/gui-gtk-2.0/pages.c:1594
msgid "Ready"
msgstr "Hazır"
-#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
-#: data/nation/slovakian.ruleset:26
-msgid "Leader"
-msgstr "Önder"
+#: client/gui-gtk-2.0/pages.c:1601
+#, fuzzy
+msgid "?player:Leader"
+msgstr "Ä°sim"
-#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1732 client/gui-sdl/chatline.c:185
msgid "Choose Saved Game to Load"
msgstr "Kayıtlı Oyunu Seç"
-#: client/gui-gtk-2.0/pages.c:1752
+#: client/gui-gtk-2.0/pages.c:1824
msgid "Choose Saved Game to _Load:"
msgstr "Kayıtlı Oyunu _Seç:"
-#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
-#: client/gui-gtk-2.0/pages.c:2375
+#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
+#: client/gui-gtk-2.0/pages.c:2451
msgid "_Browse..."
msgstr "_Gözat..."
-#: client/gui-gtk-2.0/pages.c:1839
+#: client/gui-gtk-2.0/pages.c:1911
msgid "Choose a Scenario"
msgstr "Senaryo Seç"
-#: client/gui-gtk-2.0/pages.c:1926
+#: client/gui-gtk-2.0/pages.c:1998
msgid "Choose a _Scenario:"
msgstr "Senaryo _Seç:"
-#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
-#: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
-#: client/gui-win32/wldlg.c:806
-msgid "Type"
-msgstr "Tür"
-
-#: client/gui-gtk-2.0/pages.c:2101
+#: client/gui-gtk-2.0/pages.c:2173
msgid "Choose a _nation to play:"
msgstr "Bir _ulus seç:"
-#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2363 client/gui-win32/menu.c:581
msgid "Select Location to Save"
msgstr "Kaydedilecek Yeri Seç"
-#: client/gui-gtk-2.0/pages.c:2372 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2448 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr "Oyunu Kaydet"
-#: client/gui-gtk-2.0/pages.c:2413
+#: client/gui-gtk-2.0/pages.c:2489
msgid "Saved _Games:"
msgstr "Kayıtlı _Oyunları:"
-#: client/gui-gtk-2.0/pages.c:2440
+#: client/gui-gtk-2.0/pages.c:2516
msgid "Save _Filename:"
msgstr "_Dosya Adı:"
@@ -12560,7 +12797,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:1094
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
msgid "Back"
msgstr "Geri"
@@ -12569,7 +12806,7 @@ msgid "Start"
msgstr "BaÅŸlat"
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:775
+#: client/gui-win32/connectdlg.c:777
msgid "Load Game"
msgstr "Oyun Aç"
@@ -12606,12 +12843,12 @@ msgid "Make new homecity"
msgstr "Memleketi Yap"
#: client/gui-sdl/citydlg.c:546 client/gui-sdl/citydlg.c:1418
-#: client/gui-sdl/connectdlg.c:307 client/gui-sdl/connectdlg.c:616
-#: client/gui-sdl/connectdlg.c:802 client/gui-sdl/connectdlg.c:984
+#: 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/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1039
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
#: 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
@@ -12658,7 +12895,7 @@ msgstr "Satın alınsın mı?"
#: client/gui-sdl/diplodlg.c:1335 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:2427
+#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
#: client/gui-xaw/cityrep.c:666 client/gui-xaw/cma_fe.c:327
#: client/gui-xaw/cma_fe.c:511 client/gui-xaw/cma_fe.c:765
#: client/gui-xaw/messagedlg.c:72 client/gui-xaw/optiondlg.c:76
@@ -12674,7 +12911,7 @@ msgstr "Hayır"
#: client/gui-sdl/diplodlg.c:1345 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:2427 client/gui-xaw/cityrep.c:666
+#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
#: client/gui-xaw/cma_fe.c:327 client/gui-xaw/cma_fe.c:511
#: client/gui-xaw/cma_fe.c:765 client/gui-xaw/messagedlg.c:72
#: client/gui-xaw/optiondlg.c:76 client/gui-xaw/optiondlg.c:304
@@ -12950,36 +13187,36 @@ msgstr "Bir kere uygula"
msgid "Release city"
msgstr "Şehri bırak"
-#: client/gui-sdl/connectdlg.c:238
+#: client/gui-sdl/connectdlg.c:239
msgid "Creating Server List..."
msgstr "Sunucu Listesi Yapılıyor..."
-#: client/gui-sdl/connectdlg.c:279 client/gui-sdl/connectdlg.c:343
+#: client/gui-sdl/connectdlg.c:280 client/gui-sdl/connectdlg.c:344
msgid "No LAN servers found"
msgstr "Yerel ağ (LAN) sunucuları bulunmadı"
-#: client/gui-sdl/connectdlg.c:281 client/gui-sdl/connectdlg.c:345
+#: client/gui-sdl/connectdlg.c:282 client/gui-sdl/connectdlg.c:346
msgid "No public servers found"
msgstr "Halka açık sunucu bulunamadı"
-#: client/gui-sdl/connectdlg.c:555
+#: client/gui-sdl/connectdlg.c:556
msgid "Player Name :"
msgstr "Oyuncu Adı :"
-#: client/gui-sdl/connectdlg.c:571
+#: client/gui-sdl/connectdlg.c:572
msgid "Freeciv Server :"
msgstr "Freeciv Sunucusu :"
-#: client/gui-sdl/connectdlg.c:588
+#: client/gui-sdl/connectdlg.c:589
msgid "Port :"
msgstr "Port :"
-#: client/gui-sdl/connectdlg.c:608 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr "BaÄŸlan"
-#: client/gui-sdl/connectdlg.c:794 client/gui-sdl/connectdlg.c:977
+#: client/gui-sdl/connectdlg.c:795 client/gui-sdl/connectdlg.c:978
#: client/gui-xaw/connectdlg.c:145
msgid "Next"
msgstr "Sonraki"
@@ -13257,8 +13494,8 @@ msgid "Unable to initialize SDL library: %s"
msgstr "SDL kitaplığı hazırlanamadı: %s"
#: client/gui-sdl/graphics.c:1021
-#, c-format
-msgid "Unable to initialize SDL_ttf library: %s"
+#, fuzzy, c-format
+msgid "Unable to initialize SDL_ttf library: %s"
msgstr "SDL_ttf kitaplığı hazırlanamadı: %s"
#: client/gui-sdl/graphics.c:1058
@@ -13347,12 +13584,6 @@ msgstr "İstemci hazırlanıyor"
msgid "Waiting for the beginning of the game"
msgstr "Oyunun başlaması bekleniyor"
-#: client/gui-sdl/gui_string.c:608
-msgid ""
-"Couldn't find stdfont.ttf file. Please link/copy/move anyunicode ttf font to "
-"data dir as stdfont.ttf"
-msgstr ""
-
#. TRANS: Future Technology
#: client/gui-sdl/gui_tilespec.c:506
msgid "FT"
@@ -13936,12 +14167,12 @@ msgid "Leave Game"
msgstr "Oyunu Terket"
#: client/gui-sdl/optiondlg.c:2302 client/gui-sdl/pages.c:255
-#: client/gui-win32/connectdlg.c:1098 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1100 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:963
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
msgid "Start New Game"
msgstr "Yeni Oyuna BaÅŸlat"
@@ -14058,8 +14289,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:1081
-#: client/gui-win32/connectdlg.c:1089 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
+#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
msgid "Update"
msgstr "Güncelle"
@@ -14513,10 +14744,6 @@ msgstr "Hepsini DeÄŸiÅŸtir"
msgid "Refresh"
msgstr "Güncelle"
-#: client/gui-win32/cityrep.c:882
-msgid "Select"
-msgstr "Seç"
-
#: client/gui-win32/cityrep.c:883
msgid "Configure"
msgstr "Ayarla"
@@ -14566,55 +14793,55 @@ msgstr "Kayıtlı oyun açılamadı"
msgid "Verify Password"
msgstr "Parolayı Doğrula"
-#: client/gui-win32/connectdlg.c:912 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr "Freeciv Sunucusu Seçimi"
-#: client/gui-win32/connectdlg.c:913
+#: client/gui-win32/connectdlg.c:915
msgid "Local Area Network"
msgstr "Yerel AÄŸ (LAN)"
-#: client/gui-win32/connectdlg.c:947
+#: client/gui-win32/connectdlg.c:949
msgid "Welcome to Freeciv"
msgstr "Freeciv'e HoÅŸ Geldiniz"
-#: client/gui-win32/connectdlg.c:965
+#: client/gui-win32/connectdlg.c:967
msgid "Load Saved Game"
msgstr "Kayıtlı Oyun Aç"
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
msgid "Connect To Network Game"
msgstr "AÄŸ Oyununa BaÄŸlan"
-#: client/gui-win32/connectdlg.c:977
+#: client/gui-win32/connectdlg.c:979
msgid "Choose a nation to play"
msgstr "Bir ulus seçin"
-#: client/gui-win32/connectdlg.c:1012
+#: client/gui-win32/connectdlg.c:1014
msgid "Number of players (Including AI):"
msgstr "Oyuncu sayısı (YZ dahil):"
-#: client/gui-win32/connectdlg.c:1020
+#: client/gui-win32/connectdlg.c:1022
msgid "AI skill level:"
msgstr "YZ ustalık derecesi:"
-#: client/gui-win32/connectdlg.c:1034 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
msgid "Game Options"
msgstr "Oyun Ayarları"
-#: client/gui-win32/connectdlg.c:1038
+#: client/gui-win32/connectdlg.c:1040
msgid "Start Game"
msgstr "Oyunu BaÅŸlat"
-#: client/gui-win32/connectdlg.c:1057
+#: client/gui-win32/connectdlg.c:1059
msgid "Login:"
msgstr "GiriÅŸ:"
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
msgid "Host:"
msgstr "Host:"
-#: client/gui-win32/connectdlg.c:1060
+#: client/gui-win32/connectdlg.c:1062
msgid "Port:"
msgstr "Port:"
@@ -14872,10 +15099,6 @@ msgid "(idle %d turn)"
msgid_plural "(idle %d turns)"
msgstr[0] "(%d sıra boşta)"
-#: client/gui-win32/plrdlg.c:337 data/Freeciv.in:88
-msgid "Host"
-msgstr "Sunucu"
-
#: client/gui-win32/plrdlg.c:355 data/Freeciv.in:3230
msgid "Intelligence"
msgstr "Ä°stihbarat"
@@ -16662,13 +16885,14 @@ msgstr ""
"diplomatik antlaÅŸmalarla saÄŸlanabilir."
#: data/helpdata.txt:781
+#, fuzzy
msgid ""
-" To have a diplomatic relationship with another player, you must fist "
-"establish first contact with that player. To establish first contact, you "
-"have to move one of your units next to a city or unit belonging to that "
-"player, or vice versa. Unless you establish an embassy with that player, you "
-"may again lose contact with them after a set number of turns without direct "
-"physical contact."
+" To have a diplomatic relationship with another player, you must first "
+"establish contact with that player. To establish contact, you have to move "
+"one of your units next to a city or unit belonging to that player, or vice "
+"versa. Unless you establish an embassy with that player, you may again lose "
+"contact with them after a set number of turns without direct physical "
+"contact."
msgstr ""
" Diğer oyuncularla diplomatik görüşme yapmak için öncelikle bu oyuncuyla "
"bağlantı kurmalısınız. Bunu da bir biriminizi o oyuncunun birimlerinin veya "
@@ -19228,7 +19452,7 @@ msgid "Communism"
msgstr "Komünizm"
#: data/default/governments.ruleset:121 data/civ2/governments.ruleset:118
-#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:26
+#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:27
msgid "Comrade"
msgstr "YoldaÅŸ"
@@ -20190,6 +20414,11 @@ msgstr ""
"boşa gitmemesine dikkat edin. Grup halindeki işçiler düşman saldırılarına "
"karşı oldukça savunmasızdırlar."
+#: data/default/units.ruleset:238
+#, fuzzy
+msgid "?unit:Workers"
+msgstr "İşçiler"
+
#: data/default/units.ruleset:264
msgid ""
"Workers are one of the key units in the game. They can be used to irrigate "
@@ -20841,6 +21070,11 @@ msgstr "Kâşif"
msgid "Explorers are very useful for mapping unknown territory."
msgstr "Kâşifler bilinmeyen bölgeleri keşfetmede oldukça kullanışlıdırlar."
+#: data/default/units.ruleset:1864
+#, fuzzy
+msgid "?unit:Leader"
+msgstr "Önder"
+
#: data/default/units.ruleset:1892
msgid "This is you. If you lose this unit, you lose the game. So don't."
msgstr ""
@@ -21087,7 +21321,7 @@ msgid "Emir"
msgstr "Emir"
#: data/nation/afghani.ruleset:25 data/nation/slovakian.ruleset:30
-#: data/nation/soviet.ruleset:27
+#: data/nation/soviet.ruleset:28
msgid "General Secretary"
msgstr "General Sekreter"
@@ -21199,11 +21433,12 @@ msgid "?plural:Armenians"
msgstr "Ermeniler"
#: 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 "
-"independence from Soviet in 1991 AD"
-msgstr ""
+"independence from the Soviet Union in 1991."
+msgstr "Efsaneye göre Aramlar Nuh'un torunlarıdırlar."
#: data/nation/assyrian.ruleset:3
msgid "Assyrian"
@@ -22174,12 +22409,11 @@ msgstr "İlliryalılar"
#: data/nation/illyrian.ruleset:6
msgid ""
-"Illyrians were Indo-European tribes who appeared in the western part of the "
-"Balkan Peninsula before 1000 BC, including the Dalmatians to the north, "
-"Corcyra island and Ambracia bay in prehistoric Epirus to the south, mixing "
-"with Thracians in Dardania to the east, and settling Messapia across the "
-"Adriatic Sea. Illyrian kingdoms were independent for centuries, until "
-"conquered by the Roman Republic."
+"Illyrians were Indo-European tribes who appeared in the western part of the "
+"Balkan Peninsula before 1000 BC, including Corcyra island and Ambracia bay "
+"in prehistoric Epirus to the south. They mixed with Thracians in Dardania to "
+"the east, and settled Messapia across the Adriatic Sea. Illyrian kingdoms "
+"were independent for centuries, until conquered by the Roman Republic."
msgstr ""
#: data/nation/inca.ruleset:3
@@ -22468,7 +22702,7 @@ msgid ""
"1953."
msgstr ""
-#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:28
+#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:29
msgid "Great Leader"
msgstr "Büyük Önder"
@@ -22625,9 +22859,9 @@ msgstr "Malililer"
msgid ""
"Sub-Saharan Africa has been a cultural and ethnical melting pot for "
"millennia. In medieval times, the region was home to a succession of empires "
-"called the Sahelian kingdoms. Of these, the Islamic Mali empire with it's "
+"called the Sahelian kingdoms. Of these, the Islamic Mali empire with its "
"capital in Timbuktu was the most influential. This empire reigned from the "
-"14th to the 17th century and was famed for it's wealth and benevolent kings. "
+"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 ""
@@ -22687,8 +22921,8 @@ msgstr "Mayalar"
#: data/nation/mayan.ruleset:6
msgid ""
-"The Mayans were a Mesoamerican civilization. Famous for building great "
-"pyramids and palaces in the jungle."
+"The Mayans were a Mesoamerican civilization. They are famous for building "
+"great pyramids and palaces in the jungle."
msgstr ""
#: data/nation/mayan.ruleset:19
@@ -23174,6 +23408,16 @@ msgid ""
"Czechoslovakia, until 1918 it was part of the Austro-Hungarian Empire."
msgstr ""
+#: data/nation/slovakian.ruleset:26
+#, fuzzy
+msgid "?male:Leader"
+msgstr "Önder"
+
+#: data/nation/slovakian.ruleset:26
+#, fuzzy
+msgid "?female:Leader"
+msgstr "YoldaÅŸ"
+
#: data/nation/slovakian.ruleset:29
msgid "Pope"
msgstr "Papa"
@@ -23212,11 +23456,12 @@ msgstr "Sovyetler"
#: data/nation/soviet.ruleset:6
msgid ""
-"Soviet Union's history starts in November 1917, when under Lenin's "
+"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 "
-"republics integrated into one country. Soviet Union became one of most "
-"powerful states in the 20th century. But by the end of 1991 due to many "
-"social shocks it disintegrated into fifteen independent countries"
+"republics integrated into one country. The Soviet Union became one of most "
+"powerful states in the 20th century, but by the end of 1991 it had "
+"disintegrated into fifteen independent countries due to social and economic "
+"problems."
msgstr ""
#: data/nation/spanish.ruleset:3
@@ -23590,8 +23835,8 @@ msgstr "Vestfalyalılar"
#: data/nation/westphalian.ruleset:6
msgid ""
-"Westphalia, before becoming a Prussian province, was the western region the "
-"duchy of Saxony. Present-day it consists of the Northern part of the largest "
+"Westphalia, before becoming a Prussian province, was the western region of "
+"the duchy of Saxony. Today it makes up the northern part of the largest "
"German federal state, North Rhine-Westphalia."
msgstr ""
@@ -23765,6 +24010,7 @@ msgstr ""
"asker üretimine başlanacaktır."
#: data/scenario/tutorial.sav:83
+#, fuzzy
msgid ""
"Another city! You are really getting the hang of this. You\n"
"probably have a pretty good idea what to do with new cities by\n"
@@ -23773,7 +24019,7 @@ msgid ""
"The flag and background color indicate what civilization the city\n"
"belongs to (this will be useful when you meet other civilizations).\n"
"The top row of the bar also shows the name and size of the city, and\n"
-"will show one or more starts to indicate if there are units in the\n"
+"will show one or more stars to indicate if there are units in the\n"
"city. The bottom row shows what the city is building, and how long it\n"
"will take; it also shows how long the city will take to grow to the\n"
"next largest size."
@@ -23865,12 +24111,12 @@ msgstr ""
"buna ihtiyacınız olmayacak)."
#: data/scenario/tutorial.sav:145
-#, c-format
+#, fuzzy, c-format
msgid ""
"Now your city has grown to size five. As cities get larger unrest\n"
"becomes a problem. A city of this size will usually have one unhappy\n"
"citizen unless pacifying effects are used; meaning one entertainer\n"
-"specialist is required to keep your citzens content. This is basically\n"
+"specialist is required to keep your citizens content. This is basically\n"
"a wasted citizen.\n"
"\n"
"There are several things that can be done about this. One quick fix\n"
@@ -23975,6 +24221,7 @@ msgstr ""
"Araziler hakkında daha geniş bilgi için yardımın ilgili bölümüne bakınız."
#: data/scenario/tutorial.sav:222
+#, fuzzy
msgid ""
"Your second Settlers should also be used to build a new city.\n"
"Notice how when you move the Settlers away from your existing cities\n"
@@ -23984,7 +24231,7 @@ msgid ""
"existing cities. Generally when building new cities you want to make\n"
"sure that all tiles are covered by at least one city, but after that\n"
"it is best that your cities overlap as little as possible. Spreading\n"
-"out cities properly gives each city access to more resrouces, allowing\n"
+"out cities properly gives each city access to more resources, allowing\n"
"them to grow to larger sizes."
msgstr ""
"İkinci Göçmeniniz de bir şehir kurmak için kullanılmalıdır. Göçmeninizi\n"
@@ -24350,3 +24597,51 @@ msgstr "Takım 30"
#: data/default/game.ruleset:160
msgid "Team 31"
msgstr "Takım 31"
+
+#~ msgid "Auth config filename \"%s\" not allowed!"
+#~ msgstr "Kimlik ayarı için dosya adı \"%s\" olamaz!"
+
+#~ msgid "The %s of the %s (%s)"
+#~ msgstr "%s yönetimindeki %s (%s)"
+
+#~ msgid ""
+#~ "Illegal alliance structure detected: %s alliance to %s reduced to peace "
+#~ "treaty."
+#~ msgstr ""
+#~ "İttifaka uymayan bir yapı görüldü: %s ile %s arasındaki ittifak barış "
+#~ "antlaşması olarak değiştirildi."
+
+#~ msgid "And, became more experienced!"
+#~ msgstr "Ve kıdemi arttı!"
+
+#~ msgid "We can't take control of server, attempting to kill it."
+#~ msgstr "Sunucunun kontrolünü ele geçiremedik, öldürmeye çalışıyor."
+
+#~ msgid "%s territory"
+#~ msgstr "%s tarafının toprakları"
+
+#~ msgid "%s territory (%d turn cease-fire)"
+#~ msgid_plural "%s territory (%d turn cease-fire)"
+#~ msgstr[0] "%s 'nin toprakları (%d sıra ateşkes)"
+
+#~ msgid "%s territory (%s)"
+#~ msgstr "%s toprakları (%s)"
+
+#~ msgid "City: %s (%s)"
+#~ msgstr "Åžehir: %s (%s)"
+
+#~ msgid "Unit: %s (%s)"
+#~ msgstr "Birim: %s (%s)"
+
+#~ msgid "no maximum, "
+#~ msgstr "azami yok, "
+
+#~ msgid "%d unit maximum, "
+#~ msgid_plural "%d units maximum, "
+#~ msgstr[0] "azami %d birim, "
+
+#~ msgid "%d per unit). "
+#~ msgstr "birim başına %d). "
+
+#~ msgid "Select same type"
+#~ msgstr "Aynı türdekileri seç"
diff --git a/po/uk.gmo b/po/uk.gmo
index 074a8c0..948ddcc 100644
Binary files a/po/uk.gmo and b/po/uk.gmo differ
diff --git a/po/uk.po b/po/uk.po
index e6bde3e..ad4fbe6 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: freeciv 1.14.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 07:45+0900\n"
+"POT-Creation-Date: 2009-03-29 21:13+0900\n"
"PO-Revision-Date: 2007-09-05 04:24+0300\n"
"Last-Translator: Roman Festchook <roma at polesye.net>\n"
"Language-Team: Ukrainian <uk at li.org>\n"
@@ -649,7 +649,7 @@ msgid "Road"
msgstr "ûÌÑÈ"
#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
-#: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
+#: client/gui-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"
@@ -666,7 +666,7 @@ msgid "Mine"
msgstr "ûÁÈÔÁ"
#: common/terrain.c:396 common/unit.c:548 server/report.c:124
-#: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
+#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr "úÁÂÒÕÄÎÅÎÎÑ"
@@ -712,7 +712,7 @@ msgstr "
msgid "Sentry"
msgstr "ïÈÏÒÏÎѤ"
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:851 client/gui-sdl/menu.c:648
+#: common/unit.c:566 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 "òÕÊÎÕ¤"
@@ -729,7 +729,7 @@ msgstr "
msgid "Transform"
msgstr "ðÅÒÅÔ×ÏÒÉÔÉ"
-#: common/unit.c:584 client/text.c:106 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:584 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 "îÅצÄÏÍÉÊ"
@@ -802,11 +802,11 @@ msgstr "
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1406
+#: common/unittype.c:349 client/helpdata.c:1404
msgid " and "
msgstr " ÔÁ "
-#: common/unittype.c:355 client/helpdata.c:1392
+#: common/unittype.c:355 client/helpdata.c:1390
msgid "?and:, "
msgstr "?ÔÁ:, "
@@ -1368,105 +1368,100 @@ msgstr ""
#: server/auth.c:281
#, fuzzy, c-format
-msgid "Auth config filename \"%s\" not allowed!"
-msgstr "ñ˦ Ú'¤ÄÎÁÎÎÑ ÄÏÚ×ÏÌÅΦ."
-
-#: server/auth.c:286
-#, fuzzy, c-format
msgid "Cannot load auth config file \"%s\"!"
msgstr "îÅ ÚÎÁÊÄÅÎÏ ÁÕÄ¦Ï ÆÁÊÌ %s"
-#: server/auth.c:397
+#: server/auth.c:392
#, c-format
msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
msgstr ""
-#: server/auth.c:404
+#: server/auth.c:399
#, fuzzy
msgid "Guests are not allowed on this server. Sorry."
msgstr "÷ÉÂÁÞÔÅ ÁÌÅ ÷ÁÍ ÎÅ ÄÏÚ×ÏÌÅÎÏ ×ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ËÏÍÁÎÄÉ ÓÅÒ×ÅÒÁ."
-#: server/auth.c:406
+#: server/auth.c:401
#, fuzzy, c-format
msgid "%s was rejected: Guests not allowed."
msgstr "÷¦ÄËÉÎÕÔÏ %s: ÎÅÓЦ×ÐÁÄÁÀÔØ ÍÏÖÌÉ×ÏÓÔ¦."
-#: server/auth.c:425
+#: server/auth.c:420
#, c-format
msgid ""
"There was an error reading the user database, logging in as guest connection "
"'%s'."
msgstr ""
-#: server/auth.c:431
+#: server/auth.c:426
msgid ""
"There was an error reading the user database and guest logins are not "
"allowed. Sorry"
msgstr ""
-#: server/auth.c:434
+#: server/auth.c:429
#, c-format
msgid "%s was rejected: Database error and guests not allowed."
msgstr ""
-#: server/auth.c:441
+#: server/auth.c:436
#, c-format
msgid "Enter password for %s:"
msgstr ""
-#: server/auth.c:450
+#: server/auth.c:445
msgid "Enter a new password (and remember it)."
msgstr ""
-#: server/auth.c:456
+#: server/auth.c:451
msgid "This server allows only preregistered users. Sorry."
msgstr ""
-#: server/auth.c:459
+#: server/auth.c:454
#, c-format
msgid "%s was rejected: Only preregister users allowed."
msgstr ""
-#: server/auth.c:488 server/auth.c:547
+#: server/auth.c:483 server/auth.c:542
msgid "Sorry, too many wrong tries..."
msgstr ""
-#: server/auth.c:489
+#: server/auth.c:484
#, c-format
msgid "%s was rejected: Too many wrong password verifies for new user."
msgstr ""
-#: server/auth.c:505
+#: server/auth.c:500
msgid ""
"Warning: There was an error in saving to the database. Continuing, but your "
"stats will not be saved."
msgstr ""
-#: server/auth.c:549
+#: server/auth.c:544
#, fuzzy, c-format
msgid "%s was rejected: Too many wrong password tries."
msgstr "÷¦ÄËÉÎÕÔÏ %s: ÎÅÓЦ×ÐÁÄÁÀÔØ ÍÏÖÌÉ×ÏÓÔ¦."
-#: server/auth.c:558
+#: server/auth.c:553
msgid "Your password is incorrect. Try again."
msgstr ""
-#: server/auth.c:569
+#: server/auth.c:564
#, fuzzy
msgid "Sorry, your connection timed out..."
msgstr "÷ÉÂÁÞÔÅ, ÐÁÔÒÕÌÕ×ÁÎÎÑ ÐÏצÔÒÑÎÉÍÉ Ð¦ÄÒÏÚĦÌÁÍÉ ÝÅ ÎÅ ÒÅÁ̦ÚÏ×ÁÎÅ."
-#: server/auth.c:571
+#: server/auth.c:566
#, c-format
msgid "%s was rejected: Connection timeout waiting for password."
msgstr ""
-#: server/auth.c:636
+#: server/auth.c:631
#, c-format
msgid "Your password is too short, the minimum length is %d. Try again."
msgstr ""
-#: server/auth.c:642
+#: server/auth.c:637
#, c-format
msgid ""
"The password must have at least %d capital letters, %d numbers, and be at "
@@ -1978,7 +1973,7 @@ msgstr "
msgid "You can learn a lot about Freeciv at %s"
msgstr "÷É ÍÏÖÅÔÅ ÂÁÇÁÔÏ Ä¦ÚÎÁÔÉÓÑ ÐÒÏ Freeciv ÎÁ %s"
-#: server/civserver.c:206 client/civclient.c:237 manual/civmanual.c:380
+#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
@@ -2006,14 +2001,14 @@ msgstr ""
msgid " -b --bind ADDR\tListen for clients on ADDR\n"
msgstr " -p, --port ðïòô\tïÞÉËÕ×ÁÔÉ ÎÁ Ú'¤ÄÎÁÎÎÑ ÎÁ ÐÏÒÔÕ ðïòô\n"
-#: server/civserver.c:217 client/civclient.c:241
+#: server/civserver.c:217 client/civclient.c:242
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:245
+#: server/civserver.c:221 client/civclient.c:246
msgid " -d, --debug NUM\tSet debug log level (0 to 3)\n"
msgstr " -d, --debug îïíåò\t÷ÓÔÁÎÏ×ÉÔÉ Ò¦×ÅÎØ ×¦ÄÌÁÄËÉ (Ú 0 ÐÏ 3)\n"
@@ -2021,7 +2016,7 @@ msgstr " -d, --debug
msgid " -f, --file FILE\tLoad saved game FILE\n"
msgstr " -f, --file æáêì\túÁ×ÁÎÔÁÖÉÔÉ ÇÒÕ ÚÂÅÒÅÖÅÎÕ Õ æáêì\n"
-#: server/civserver.c:225 client/civclient.c:248 manual/civmanual.c:382
+#: server/civserver.c:225 client/civclient.c:249 manual/civmanual.c:382
msgid " -h, --help\t\tPrint a summary of the options\n"
msgstr " -h, --help\t\t÷É×ÅÓÔÉ Ð¦ÄËÁÚËÕ ÐÏ ÏÐæÑÍ\n"
@@ -2072,11 +2067,11 @@ msgstr " -r, --read
msgid " -R, --Ranklog FILE\tUse FILE as ranking logfile\n"
msgstr " -l, --log æáêì\t÷ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ æáêì ÑË ÖÕÒÎÁÌ\n"
-#: server/civserver.c:247 client/civclient.c:267 manual/civmanual.c:383
+#: server/civserver.c:247 client/civclient.c:268 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:279
+#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, fuzzy, c-format
@@ -3325,7 +3320,7 @@ msgstr "%s
msgid "Sea moving start units are not yet supported. Nobody gets %s."
msgstr ""
-#: server/gamehand.c:310 client/text.c:632
+#: server/gamehand.c:310 client/text.c:691
#, c-format
msgid "Year: %s"
msgstr "ò¦Ë: %s"
@@ -3599,10 +3594,10 @@ msgid "Could not throw %s into civil war - no available nations"
msgstr ""
#: server/plrhand.c:1686
-#, c-format
+#, fuzzy, c-format
msgid ""
-"Your nation is thrust into civil war, %s is declared the leader of the "
-"rebel states."
+"Your nation is thrust into civil war! %s is declared the leader of the rebel "
+"states."
msgstr ""
"÷ÁÛÁ ÎÁÃ¦Ñ ×ÐÁÌÁ Õ ÇÒÏÍÁÄÑÎÓØËÕ ×¦ÊÎÕ, %s ÚÁÑ×É×, ÝÏ ×¦Î ¤ ̦ÄÅÒÏÍ ÂÕÎÔ¦×ÎÉÈ "
"ÏÂÌÁÓÔÅÊ."
@@ -3702,7 +3697,7 @@ msgstr "
msgid "Literacy"
msgstr "ì¦ÔÅÒÁÔÕÒÁ"
-#: server/report.c:121 client/cityrepdata.c:526 client/cityrepdata.c:527
+#: server/report.c:121 client/cityrepdata.c:524 client/cityrepdata.c:525
#: client/gui-sdl/cityrep.c:174
msgid "Production"
msgstr "÷ÉÒÏÂÎÉÃÔ×Ï"
@@ -3856,7 +3851,7 @@ msgid "Demography string contains invalid characters. Try \"help demography\"."
msgstr ""
"äÅÍÏÇÒÁƦÞÎÁ ÓÔÒÏËÁ ͦÓÔÉÔØ ÎÅצÒΦ ÓÉÍ×ÏÌÉ. óÐÒÏÂÕÊÔÅ \"help demography\"."
-#: server/report.c:743 server/report.c:766
+#: server/report.c:743 server/report.c:768
msgid "Demographics Report:"
msgstr "äÅÍÏÇÒÁƦÞÎÉÊ ÚצÔ:"
@@ -3864,10 +3859,12 @@ msgstr "
msgid "Sorry, the Demographics report is unavailable."
msgstr "÷ÉÂÁÞÔÅ, ÁÌÅ ÄÅÍÏÇÒÁƦÞÎÉÊ Ú×¦Ô ÎÅÄÏÓÔÕÐÎÉÊ."
-#: server/report.c:748
+#. TRANS: <nation adjective> <government name> (<year>).
+#. * E.g. "Polish Despotism (200 AD)".
+#: server/report.c:750
#, fuzzy, c-format
-msgid "The %s of the %s (%s)"
-msgstr "%s Ú %s"
+msgid "%s %s (%s)"
+msgstr "%s Õ %s (%s)\n"
#. TRANS: message about an installation error.
#: server/ruleset.c:163
@@ -3923,14 +3920,6 @@ msgstr ""
msgid "%s had invalid nation; changing to %s."
msgstr ""
-#. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4073
-#, c-format
-msgid ""
-"Illegal alliance structure detected: %s alliance to %s reduced to peace "
-"treaty."
-msgstr ""
-
#: server/settings.c:32
msgid "Geological"
msgstr ""
@@ -5077,8 +5066,8 @@ msgstr "
#: server/settings.c:1016
#, fuzzy
msgid ""
-"Automatically saved games will have name \"<prefix><year>.sav\". This "
-"setting sets the <prefix> part."
+"Automatically saved games will have name \"<prefix>-T<turn>-Y<year>.sav\". "
+"This setting sets the <prefix> part."
msgstr ""
"á×ÔÏÍÁÔÉÞÎÏ ÚÂÅÒÅÖÅΦ ¦ÇÒÉ ÍÁÀÔØ ÎÁÚ×Õ '<ÐÒÅƦËÓ><Ò¦Ë>.sav'.\n"
"ãÑ ÏÐÃ¦Ñ ÚÁÄÁ¤ ÚÎÁÞÅÎÎÑ <ÐÒÅƦËÓ>."
@@ -5097,11 +5086,11 @@ msgstr ""
"ñËÝÏ 1, ÓÔÁÔÉÓÔÉËÁ ÇÒÁ×ÃÑ ÄÏÄÁ¤ÔØÓÑ ÄÏ ÆÁÊÌÕ 'civscore.log' ËÏÖÎÏÇÏ ÈÏÄÕ. ãÑ "
"ÓÔÁÔÉÓÔÉËÁ ÍÏÖÅ ÂÕÔÉ ×ÉËÏÒÉÓÔÁÎÁ ÄÌÑ ÓÔ×ÏÒÅÎÎÑ ÇÒÁÆ¦Ë¦× Ð¦ÓÌÑ ÇÒÉ."
-#: server/sernet.c:147
+#: server/sernet.c:150
msgid "Server cannot read standard input. Ignoring input."
msgstr "óÅÒ×ÅÒ ÎÅ ÍÏÖÅ ÐÒÏÞÉÔÁÔÉ ÓÔÁÎÄÁÒÔÎÉÊ ×צÄ. ¶ÇÎÏÒÕÀ ÊÏÇÏ."
-#: server/sernet.c:922
+#: server/sernet.c:929
#, fuzzy, c-format
msgid "Server: bad address: [%s:%d]."
msgstr "íÅÔÁÓÅÒ×ÅÒ: ÐÏÇÁÎÁ ÁÄÒÅÓÁ: [%s:%d]."
@@ -5227,114 +5216,114 @@ msgid ""
"alliance with both."
msgstr "úÁÍÉÒÅÎÎÑ Ú %s ÚÁ×ÅÒÛÅÎÏ. ôÅÐÅÒ ÷É ÎÅÊÔÒÁÌØΦ Ú %s."
-#: server/srv_main.c:928
+#: server/srv_main.c:961
#, c-format
msgid "Failed saving game as %s"
msgstr "ðÏÍÉÌËÁ ÚÂÅÒÅÖÅÎÎÑ ÇÒÉ Õ %s"
-#: server/srv_main.c:930
+#: server/srv_main.c:963
#, c-format
msgid "Game saved as %s"
msgstr "çÒÕ ÚÂÅÒÅÖÅÎÏ Õ %s"
-#: server/srv_main.c:962
+#: server/srv_main.c:994
msgid "The game is already running."
msgstr "çÒÁ ×ÖÅ ÚÁÐÕÝÅÎÁ."
-#: server/srv_main.c:970
+#: server/srv_main.c:1002
#, c-format
msgid "%s lost control cmdlevel on game start. Use voting from now on."
msgstr ""
-#: server/srv_main.c:977
+#: server/srv_main.c:1009
msgid "Starting game."
msgstr "óÔÁÒÔÕÀ ÇÒÕ."
-#: server/srv_main.c:1039
+#: server/srv_main.c:1071
#, c-format
msgid "request for unknown report (type %d)"
msgstr "ÚÁÐÉÔ ÎÁ ÎÅצÄÏÍÉÊ Ú×¦Ô (ÔÉÐ %d)"
-#: server/srv_main.c:1104
+#: server/srv_main.c:1136
#, fuzzy, c-format
msgid "Warning: rejecting old client %s"
msgstr "õ×ÁÇÁ: õ %s ÏÞÉËÕÀÔØ ÇÏÌÏÄÏÍÏÒ."
-#: server/srv_main.c:1206
+#: server/srv_main.c:1238
#, c-format
msgid "Got a packet of type %d from a dead or observer player"
msgstr "ïÔÒÉÍÁÎÏ ÐÁËÅÔ ÔÉÐÕ %d ×¦Ä ÍÅÒÔ×ÏÇÏ ÇÒÁ×ÃÑ ÁÂÏ ÎÁÇÌÑÄÁÞÁ"
-#: server/srv_main.c:1306
+#: server/srv_main.c:1338
msgid "Please choose a non-blank name."
msgstr "ïÂÅÒ¦ÔØ ÎÅ ÐÕÓÔÅ ¦Í'Ñ."
-#: server/srv_main.c:1322
+#: server/srv_main.c:1354
#, fuzzy
msgid "That nation is already in use."
msgstr "çÒÁ ×ÖÅ ÚÁÐÕÝÅÎÁ."
-#: server/srv_main.c:1338
+#: server/srv_main.c:1370
#, c-format
msgid "Another player already has the name '%s'. Please choose another name."
msgstr "¶ÎÛ¦Ê ÇÒÁ×ÅÃØ ×ÖÅ ÏÂÒÁ× ¦Í'Ñ '%s'. ïÂÅÒ¦ÔØ ¦ÎÛÅ."
-#: server/srv_main.c:1359
+#: server/srv_main.c:1391
#, fuzzy
msgid "Please choose a name containing only ASCII characters."
msgstr "ïÂÅÒ¦ÔØ ÎÅ ÐÕÓÔÅ ¦Í'Ñ."
-#: server/srv_main.c:1458
+#: server/srv_main.c:1490
#, c-format
msgid "%s nation is not available in this scenario."
msgstr ""
-#: server/srv_main.c:1464
+#: server/srv_main.c:1496
#, fuzzy, c-format
msgid "%s nation is already in use."
msgstr "çÒÁ ×ÖÅ ÚÁÐÕÝÅÎÁ."
-#: server/srv_main.c:1482
+#: server/srv_main.c:1514
#, c-format
msgid "%s is the %s ruler %s."
msgstr "%s ¤ ̦ÄÅÒÏÍ ÎÁæ§ %s - %s."
-#: server/srv_main.c:1538
+#: server/srv_main.c:1570
#, fuzzy, c-format
msgid "Waiting to start game: %d out of %d players are ready to start."
msgstr "îÅ ÍÏÖÕ ÓÔÁÒÔÕ×ÁÔÉ ÇÒÕ: §§ ×ÖÅ ÚÁÐÕÝÅÎÏ."
-#: server/srv_main.c:1582 server/srv_main.c:1586
+#: server/srv_main.c:1614 server/srv_main.c:1618
#, fuzzy, c-format
msgid "%s has been added as %s level AI-controlled player."
msgstr "%s ÄÏÄÁÎÏ ÑË ËÏÍÐ'ÀÔÅÒÎÏÇÏ ÇÒÁ×ÃÑ."
-#: server/srv_main.c:1728
+#: server/srv_main.c:1760
#, c-format
msgid "Player %d"
msgstr "çÒÁ×ÅÃØ %d"
-#: server/srv_main.c:1739 server/srv_main.c:1745
+#: server/srv_main.c:1771 server/srv_main.c:1777
#, c-format
msgid "%s rules the %s."
msgstr "%s ÇÏÌÏ×Õ¤ ÎÁÄ %s."
-#: server/srv_main.c:1910
+#: server/srv_main.c:1942
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
msgstr ""
-#: server/srv_main.c:1961
+#: server/srv_main.c:1993
#, c-format
msgid "Sending info to metaserver [%s]"
msgstr "÷¦ÄÐÒÁ×ÌÑÀ ¦ÎÆÏ ÎÁ ÍÅÔÁÓÅÒ×ÅÒ [%s]"
-#: server/srv_main.c:1992
+#: server/srv_main.c:2024
msgid "The game is over..."
msgstr "çÒÕ ÚÁ˦ÎÞÅÎÏ..."
-#: server/srv_main.c:2205
+#: server/srv_main.c:2237
msgid "Now accepting new client connections."
msgstr "ôÅÐÅÒ ÐÒÉÊÍÁ¤ÍÏ ÎÏצ Ú'¤ÄÎÁÎÎÑ."
@@ -6162,25 +6151,25 @@ msgid "Barbarian"
msgstr "äÉËÕÎ"
#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2030 client/gui-sdl/plrdlg.c:645
+#: client/gui-gtk-2.0/pages.c:2102 client/gui-sdl/plrdlg.c:645
#: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
msgid "AI"
msgstr "ëÏÍÐ'ÀÔÅÒ"
#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
+#: client/gui-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
msgid "Human"
msgstr "ìÀÄÉÎÁ"
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
-#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
+#: 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
#, fuzzy
msgid "Alive"
msgstr "áËÔÉצÚÕ×ÁÔÉ"
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
#: client/gui-win32/connectdlg.c:200
#, fuzzy
msgid "Dead"
@@ -6455,9 +6444,9 @@ 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:242
-#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
-#: client/text.c:1201
+#: 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
#, c-format
msgid "?clistmore:, %s"
msgstr ", %s"
@@ -6713,7 +6702,7 @@ msgstr "
msgid "Cannot attack from sea."
msgstr "îÅ ÍÏÖÕ ÁÔÁËÕ×ÁÔÉ Ú ÍÏÒÑ."
-#: server/unithand.c:996 server/unittools.c:2103
+#: server/unithand.c:996 server/unittools.c:2137
msgid "Cannot attack unless you declare war first."
msgstr "îÅ ÍÏÖÕ ÁÔÁËÕ×ÁÔÉ ÄÏËÉ ÷É ÎÅ ÐÒÏÇÏÌÏÓÉÔŠצÊÎÕ."
@@ -6811,101 +6800,101 @@ msgid "%s was upgraded for free to %s."
msgstr "%s ÍÏÄÅÒΦÚÕ×Á× ÄÏ %s."
#: server/unittools.c:297
-#, c-format
-msgid "Not enough gold. %s disbanded"
-msgstr ""
+#, fuzzy, c-format
+msgid "Not enough gold to pay upkeep for %s. Unit disbanded."
+msgstr "%s ÎÅ ÍÏÖÅ ÕÔÒÉÍÕ×ÁÔÉ %s, ЦÄÒÏÚÄ¦Ì ÒÁÚÆÏÒÍÏ×ÁÎÏ."
-#: server/unittools.c:342
+#: server/unittools.c:343
#, c-format
msgid "Your %s has run out of hit points."
msgstr "÷ÁÛ Ð¦ÄÒÏÚÄ¦Ì %s ×ÔÒÁÔÉ× ÕÓÅ ÚÄÏÒÏ×'Ñ."
-#: server/unittools.c:358
+#: server/unittools.c:359
#, c-format
msgid "Your %s has been lost on the high seas."
msgstr "÷ÁÛ Ð¦ÄÒÏÚÄ¦Ì %s ÂÕ× ×ÔÒÁÞÅÎÉÊ Õ ÏËÅÁΦ."
-#: server/unittools.c:365
+#: server/unittools.c:366
#, c-format
msgid "Your %s survived on the high seas and became more experienced!"
msgstr ""
-#: server/unittools.c:376
+#: server/unittools.c:377
#, fuzzy, c-format
msgid "Your %s has been lost on unsafe terrain."
msgstr "÷ÁÛ Ð¦ÄÒÏÚÄ¦Ì %s ÂÕ× ×ÔÒÁÞÅÎÉÊ Õ ÏËÅÁΦ."
-#: server/unittools.c:430
+#: server/unittools.c:431
#, c-format
msgid "Your %s has returned to refuel."
msgstr "÷ÁÛ Ð¦ÄÒÏÚÄ¦Ì %s ÐÏ×ÅÒÎÕ×ÓÑ ÄÌÑ ÚÁÐÒÁ×ËÉ."
-#: server/unittools.c:454
+#: server/unittools.c:455
#, c-format
msgid "Your %s has run out of fuel."
msgstr "÷ÁÛÏÍÕ %s ÎÅ ×ÉÓÔÁÞÉÌÏ ÐÁÌÉ×Á."
-#. TRANS: And, <the unit> became ...
-#: server/unittools.c:616
-#, fuzzy
-msgid "And, became more experienced!"
-msgstr " ×ÄÁÌÁÓÑ!"
-
#. TRANS: Your <unit> became ...
-#: server/unittools.c:620
+#: server/unittools.c:619
#, c-format
msgid "Your %s became more experienced!"
msgstr ""
-#: server/unittools.c:1011
+#: server/unittools.c:1009
#, fuzzy, c-format
msgid "Teleported your %s to %s."
msgstr "ôÅÌÅÐÏÒÔÏ×ÁÎÏ ÷ÁÛ %s Ú (%d, %d) ÄÏ %s."
-#: server/unittools.c:1041
+#. TRANS: A unit is moved to resolve stack conflicts.
+#: server/unittools.c:1065
+#, fuzzy, c-format
+msgid "Moved your %s."
+msgstr "òÏÚÐÕÝÅÎÏ ÷ÁÛ %s Õ (%d, %d)."
+
+#: server/unittools.c:1076
#, fuzzy, c-format
msgid "Disbanded your %s."
msgstr "òÏÚÐÕÝÅÎÏ ÷ÁÛ %s Õ (%d, %d)."
-#: server/unittools.c:1363
+#: server/unittools.c:1397
#, c-format
msgid "Unable to defend %s, %s has lost the game."
msgstr ""
-#: server/unittools.c:1367
+#: server/unittools.c:1401
#, c-format
msgid "Losing %s meant losing the game! Be more careful next time!"
msgstr ""
-#: server/unittools.c:1469
+#: server/unittools.c:1503
#, c-format
msgid "%s escaped the destruction of %s, and fled to %s."
msgstr ""
-#: server/unittools.c:1478
+#: server/unittools.c:1512
#, c-format
msgid "%s lost when %s was lost."
msgstr "÷ÓÔÒÁÞÅÎÏ %s ЦÓÌÑ ×ÔÒÁÔÉ %s."
-#: server/unittools.c:1527
+#: server/unittools.c:1561
#, c-format
msgid "Barbarian leader captured, %d gold ransom paid."
msgstr "çÏÌÏ×Õ ÄÉËÕÎ¦× ÓÈÏÐÌÅÎÏ, %d ÇÒÉ×ÅÎØ ÏÔÒÉÍÁÎÏ."
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unittools.c:1545
+#: server/unittools.c:1579
#, fuzzy, c-format
msgid "Your attacking %s succeeded against the %s %s!"
msgstr "÷ÁÛÁ ÁÔÁËÁ %s ÐÒÏÔÉ %s %s ×ÄÁÌÁÓÑ!"
#. TRANS: "Cannon ... the Polish Destroyer."
-#: server/unittools.c:1554 server/unittools.c:1612
+#: server/unittools.c:1588 server/unittools.c:1646
#, 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:1588
+#: server/unittools.c:1622
#, fuzzy, c-format
msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
msgid_plural ""
@@ -6916,14 +6905,14 @@ msgstr[2] "
#. TRANS: "Cannon lost when the Polish Destroyer
#. * attacked the German Musketeers."
-#: server/unittools.c:1621
+#: server/unittools.c:1655
#, 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:1636
+#: server/unittools.c:1670
#, fuzzy, c-format
msgid "%s (and %s) lost to an attack from the %s %s."
msgstr "%s (%s) ×ÔÒÁÞÅÎÏ Õ ÁÔÁæ ×¦Ä %s %s."
@@ -6931,7 +6920,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:1646
+#: server/unittools.c:1680
#, 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."
@@ -6942,7 +6931,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:1660
+#: server/unittools.c:1694
#, 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."
@@ -6950,186 +6939,186 @@ msgstr[0] "%d
msgstr[1] "%d á×ÔÏ-áÔÁËÁ: %s %s ÁÔÁËÕ×Á× %s %s"
msgstr[2] "%d á×ÔÏ-áÔÁËÁ: %s %s ÁÔÁËÕ×Á× %s %s"
-#: server/unittools.c:1928
+#: server/unittools.c:1962
#, c-format
msgid "Your %s was nuked by %s."
msgstr "÷ÁÛ %s ÁÔÁËÏ×ÁÎÏ ÁÔÏÍÎÏÀ ÂÏÍÂÏÀ %s."
-#: server/unittools.c:1931 server/unittools.c:1947
+#: server/unittools.c:1965 server/unittools.c:1981
msgid "yourself"
msgstr "×ÌÁÓÎÏÒÕÞ"
-#: server/unittools.c:1935
+#: server/unittools.c:1969
#, fuzzy, c-format
msgid "The %s %s was nuked."
msgstr "%s %s ÁÔÁËÏ×ÁÎÏ ÁÔÏÍÎÏÀ ÂÏÍÂÏÀ."
-#: server/unittools.c:1944
+#: server/unittools.c:1978
#, c-format
msgid "%s was nuked by %s."
msgstr "%s ÁÔÁËÏ×ÁÎÏ ÁÔÏÍÎÏÀ ÂÏÍÂÏÀ %s."
-#: server/unittools.c:1952
+#: server/unittools.c:1986
#, c-format
msgid "You nuked %s."
msgstr "÷ÁÍÉ ÁÔÁËÏ×ÁÎÏ ÁÔÏÍÎÏÀ ÂÏÍÂÏÀ %s."
-#: server/unittools.c:1993
+#: server/unittools.c:2027
#, fuzzy, c-format
msgid "The %s detonated a nuke!"
msgstr "%s ÁÔÁËÕ×Á× ÁÔÏÍÎÏÀ ÂÏÍÂÏÀ!"
-#: server/unittools.c:2017
+#: server/unittools.c:2051
#, c-format
msgid "%s transported successfully."
msgstr "%s ×ÄÁÌÏ ÔÒÁÎÓÐÏÒÔÏ×ÁÎÏ."
-#: server/unittools.c:2069
+#: server/unittools.c:2103
msgid "This unit type can not be paradropped."
msgstr "ãÅÊ Ð¦ÄÒÏÚÄ¦Ì ÎÅ ÍÏÖÅ ÂÕÔÉ ÐÁÒÁÛÕÔÏ×ÁÎÉÊ."
-#: server/unittools.c:2079
+#: server/unittools.c:2113
#, fuzzy
msgid "You cannot paradrop a unit that is transporting other units."
msgstr "îÅ ÍÏÖÕ ÐÁÒÁÛÕÔÕ×ÁÔÉ × ÏËÅÁÎ."
-#: server/unittools.c:2085
+#: server/unittools.c:2119
msgid "The destination location is not known."
msgstr "òÏÚͦÝÅÎÎÑ ÐÕÎËÔÕ ÐÒÉÚÎÁÞÅÎÎÑ ÎŠצÄÏÍÏ."
-#: server/unittools.c:2092
+#: server/unittools.c:2126
#, fuzzy, c-format
msgid "This unit cannot paradrop into %s."
msgstr "îÅ ÍÏÖÕ ÐÁÒÁÛÕÔÕ×ÁÔÉ × ÏËÅÁÎ."
-#: server/unittools.c:2112
+#: server/unittools.c:2146
#, c-format
msgid "The distance to the target (%i) is greater than the unit's range (%i)."
msgstr "÷¦ÄÓÔÁÎØ ÄÏ Ã¦Ì¦ (%i) ¦ÌØÛÁ Î¦Ö ÄÁÌØΦÓÔØ Ð¦ÄÒÏÚĦÌÕ (%i)."
-#: server/unittools.c:2123
+#: server/unittools.c:2157
#, fuzzy, c-format
msgid "Your %s paradropped into the %s and was lost."
msgstr "÷ÁÛÉÈ %s ÐÁÒÁÛÕÔÏ×ÁÎÏ Õ ÏËÅÁÎ ÔÁ ×ÔÒÁÞÅÎÏ."
-#: server/unittools.c:2136
+#: server/unittools.c:2170
#, c-format
msgid "Your %s was killed by enemy units at the paradrop destination."
msgstr "÷ÁÛÉÈ %s ×ÂÉÔÏ ×ÏÒÏÇÁÍÉ Õ ÔÏÞæ ÐÁÒÁÛÕÔÕ×ÁÎÎÑ."
-#: server/unittools.c:2158
+#: server/unittools.c:2192
#, c-format
msgid "You found %d gold."
msgstr "÷É ÚÎÁÊÛÌÉ %d ÇÒÉ×ÅÎØ."
-#: server/unittools.c:2175
+#: server/unittools.c:2209
#, c-format
msgid "You found %s in ancient scrolls of wisdom."
msgstr "÷É ÚÎÁÊÛÌÉ ÚÎÁÎÎÑ ÐÒÏ %s Õ ÚÁÇÁÄËÏ×¦Ê ÓÈÏ×ÁÎæ ÚÎÉËÌϧ ÃÉצ̦ÚÁæ§."
-#: server/unittools.c:2182
+#: server/unittools.c:2216
#, c-format
msgid "The %s have acquired %s from ancient scrolls of wisdom."
msgstr "%s ĦÚÎÁ×ÓÑ ÐÒÏ %s Õ ÚÁÇÁÄËÏ×¦Ê ÓÈÏ×ÁÎæ ÚÎÉËÌϧ ÃÉצ̦ÚÁæ§."
-#: server/unittools.c:2196
+#: server/unittools.c:2230
msgid "A band of friendly mercenaries joins your cause."
msgstr "çÒÕÐÁ ÄÒÕÖÎ¦È ÎÁÊÍÁÎÃ¦× ÐÒɤÄÎÁÌÁÓÑ ÄÏ ÷ÁÓ."
-#: server/unittools.c:2214
+#: server/unittools.c:2248
msgid "An abandoned village is here."
msgstr "ðÕÓÔÉÊ ÈÕÔ¦Ò."
-#: server/unittools.c:2224
+#: server/unittools.c:2258
msgid "You have unleashed a horde of barbarians!"
msgstr "÷É ÚÎÁÊÛÌÉ ÁÒͦÀ ÄÉËÕΦ×!"
-#: server/unittools.c:2227
+#: server/unittools.c:2261
#, c-format
msgid "Your %s has been killed by barbarians!"
msgstr "÷ÁÛ ÚÁǦΠ%s ÚÎÉÝÅÎÏ ÄÉËÕÎÉ!"
-#: server/unittools.c:2243
+#: server/unittools.c:2277
msgid "You found a friendly city."
msgstr "÷É ÚÎÁÊÛÌÉ ÄÒÕÖΤ ͦÓÔÏ."
-#: server/unittools.c:2257
+#: server/unittools.c:2291
msgid "Friendly nomads are impressed by you, and join you."
msgstr "äÒÕÖΦ ËÏÞ¦×ÎÉËÉ ÐÒɤÄÎÕÀÔØÓÑ ÄÏ ÷ÁÓ."
-#: server/unittools.c:2282
+#: server/unittools.c:2316
msgid "Your overflight frightens the tribe; they scatter in terror."
msgstr "÷ÁÛ Ì¦ÔÁË ÎÁ×¦× ÖÁÈÕ ÎÁ ÔÕ¦ÌØæ×; ×ÏÎÉ ÒÏÚ¦ÇÌÉÓÑ."
-#: server/unittools.c:2540
+#: server/unittools.c:2574
#, fuzzy, c-format
msgid "Orders for %s aborted after enemy movement was spotted."
msgstr "%s ÐÅÒÅÒ×Á× ÐÅÒÅͦÝÅÎÎÑ Ú ÐÒÉÞÉÎÉ ÎÁÑ×ÎÏÓÔ¦ ЦÄÒÏÚÄ¦Ì¦× ÎÁ ÛÌÑÈÕ."
-#: server/unittools.c:2989
+#: server/unittools.c:3023
#, fuzzy, c-format
msgid "Orders for %s aborted as there are units nearby."
msgstr "%s ÐÅÒÅÒ×Á× ÐÅÒÅͦÝÅÎÎÑ Ú ÐÒÉÞÉÎÉ ÎÁÑ×ÎÏÓÔ¦ ЦÄÒÏÚÄ¦Ì¦× ÎÁ ÛÌÑÈÕ."
-#: server/unittools.c:3041
+#: server/unittools.c:3075
#, fuzzy, c-format
msgid "Orders for %s aborted because building of city failed."
msgstr "%s ÐÅÒÅÒ×Á× ÐÅÒÅͦÝÅÎÎÑ Ú ÐÒÉÞÉÎÉ ÎÁÑ×ÎÏÓÔ¦ ЦÄÒÏÚÄ¦Ì¦× ÎÁ ÛÌÑÈÕ."
-#: server/unittools.c:3054
+#: server/unittools.c:3088
#, c-format
msgid "Orders for %s aborted since they give an invalid activity."
msgstr ""
-#: server/unittools.c:3068
+#: server/unittools.c:3102
#, c-format
msgid "Orders for %s aborted since they give an invalid location."
msgstr ""
-#: server/unittools.c:3078
+#: server/unittools.c:3112
#, fuzzy, c-format
msgid "Orders for %s aborted as there are units in the way."
msgstr "%s ÐÅÒÅÒ×Á× ÐÅÒÅͦÝÅÎÎÑ Ú ÐÒÉÞÉÎÉ ÎÁÑ×ÎÏÓÔ¦ ЦÄÒÏÚÄ¦Ì¦× ÎÁ ÛÌÑÈÕ."
-#: server/unittools.c:3104
+#: server/unittools.c:3138
#, c-format
msgid "Orders for %s aborted because of failed move."
msgstr ""
-#: server/unittools.c:3145
+#: server/unittools.c:3179
#, fuzzy, c-format
msgid "Attempt to change homecity for %s failed."
msgstr "úͦÎÅÎÏ ÄÏͦ×ËÕ ÄÌÑ %s Õ %s."
-#: server/unittools.c:3156
+#: server/unittools.c:3190
#, fuzzy, c-format
msgid "Attempt to establish trade route for %s failed."
msgstr "* íÏÖÕÔØ ×ÓÔÁÎÏ×ÌÀ×ÁÔÉ ÔÏÒÇÏצ ÛÌÑÈÉ.\n"
-#: server/unittools.c:3168
+#: server/unittools.c:3202
#, c-format
msgid "Attempt to build wonder for %s failed."
msgstr ""
-#: server/unittools.c:3177
+#: server/unittools.c:3211
#, fuzzy, c-format
msgid "Your %s has invalid orders."
msgstr "÷ÁÛ Ð¦ÄÒÏÚÄ¦Ì %s ÐÏ×ÅÒÎÕ×ÓÑ ÄÌÑ ÚÁÐÒÁ×ËÉ."
-#: server/generator/mapgen.c:1737
+#: server/generator/mapgen.c:1771
msgid "High landmass - this may take a few seconds."
msgstr "âÁÇÁÔÏ ÚÅÍ̦ - ÃÅ ÚÁÊÍÅ ÄÅ˦ÌØËÁ ÓÅËÕÎÄ."
-#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
+#: server/generator/mapgen.c:1969 server/generator/mapgen.c:2039
#, fuzzy, c-format
msgid "Falling back to generator %d."
msgstr "ðÏ×ÅÒÔÁÀÓØ ÄÏ ÇÅÎÅÒÁÔÏÒ 2"
-#: server/generator/mapgen.c:2025
+#: server/generator/mapgen.c:2059
msgid "Generator 3 didn't place all big islands."
msgstr "çÅÎÅÒÁÔÏÒ 3 ÎÅ ÍÏÖÅ ÒÏÚÔÁÛÕ×ÁÔÉ ÕÓ¦ ×ÅÌÉ˦ ÏÓÔÒÏ×É."
-#: server/generator/mapgen.c:2054
+#: server/generator/mapgen.c:2088
#, c-format
msgid "Generator 3 left %li landmass unplaced."
msgstr "çÅÎÅÒÁÔÏÒ 3 ÚÁÌÉÛÉ× ÎÅÒÏÚͦÝÅÎÉÍÉ %li ÚÅÍÅÌØ."
@@ -7234,7 +7223,7 @@ msgstr[0] "%3d Ȧ
msgstr[1] "%3d ÈÏÄÉ"
msgstr[2] "%3d ÈÏĦ×"
-#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:631
#: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
@@ -7355,355 +7344,355 @@ msgstr "?
msgid "(worklist)"
msgstr "(ÐÌÁÎ ÂÕĦ×ÎÉÃÔ×Á)"
-#: client/cityrepdata.c:447
-msgid "Special"
-msgstr "óÐÅæÁÌØÎÅ"
-
-#: client/cityrepdata.c:448
-msgid "?entertainers/scientists/taxmen:E/S/T"
-msgstr "?ÛÏÕÍÅÎÉ/ÎÁÕËÏ×æ/ÐÏÄÁÔ˦×æ:û/î/ð"
+#: client/cityrepdata.c:446
+msgid "?city:Name"
+msgstr "?ͦÓÔÏ:îÁÚ×Á"
-#: client/cityrepdata.c:449
-msgid "Entertainers, Scientists, Taxmen"
-msgstr "ûÏÕÍÅÎÉ, îÁÕËÏ×æ, ðÏÄÁÔ˦×æ"
+#: client/cityrepdata.c:446 client/gui-sdl/cityrep.c:169
+msgid "City Name"
+msgstr "îÁÚ×Á ͦÓÔÁ"
-#: client/cityrepdata.c:452
+#: client/cityrepdata.c:448
#, fuzzy
-msgid "Concise + Rapture, - Disorder"
-msgstr "óÔÉÓÌÏ + úÁÈÏÐÌÅÎÎÑ, - úÁ×ÏÒÕÛÅÎÎÑ"
+msgid "?size [short]:Sz"
+msgstr "?ÒÏÚͦÒ:òÏÚ"
-#: client/cityrepdata.c:454 client/plrdlg_common.c:261
+#: client/cityrepdata.c:448
+msgid "Size"
+msgstr "òÏÚͦÒ"
+
+#: client/cityrepdata.c:450 client/plrdlg_common.c:261
#: client/gui-win32/plrdlg.c:337
msgid "State"
msgstr "óÔÁÎ"
-#: client/cityrepdata.c:454
+#: client/cityrepdata.c:450
msgid "Rapture/Peace/Disorder"
msgstr "úÁÈÏÐÌÎÅÎÎÑ/óÐÏ˦Ê/úÁ×ÏÒÕÛÅÎÎÑ"
+#: client/cityrepdata.c:452
+#, fuzzy
+msgid "Concise *=Rapture, X=Disorder"
+msgstr "óÔÉÓÌÏ + úÁÈÏÐÌÅÎÎÑ, - úÁ×ÏÒÕÛÅÎÎÑ"
+
+#: client/cityrepdata.c:456
+msgid "Special"
+msgstr "óÐÅæÁÌØÎÅ"
+
#: client/cityrepdata.c:457
+msgid "?entertainers/scientists/taxmen:E/S/T"
+msgstr "?ÛÏÕÍÅÎÉ/ÎÁÕËÏ×æ/ÐÏÄÁÔ˦×æ:û/î/ð"
+
+#: client/cityrepdata.c:458
+msgid "Entertainers, Scientists, Taxmen"
+msgstr "ûÏÕÍÅÎÉ, îÁÕËÏ×æ, ðÏÄÁÔ˦×æ"
+
+#: client/cityrepdata.c:461
msgid "?Happy workers:H"
msgstr "?ýÁÓÌÉצ ÐÒÁæ×ÎÉËÉ:ý"
-#: client/cityrepdata.c:457
+#: client/cityrepdata.c:461
msgid "Workers: Happy"
msgstr "ðÒÁæ×ÎÉËÉ: ýÁÓÌÉצ"
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
msgid "?Content workers:C"
msgstr "?îÅÊÔÒÁÌØΦ ÐÒÁæ×ÎÉËÉ:ê"
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
msgid "Workers: Content"
msgstr "ðÒÁæ×ÎÉËÉ: îÅÊÔÒÁÌØΦ"
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
msgid "?Unhappy workers:U"
msgstr "?îÅÝÁÓΦ ÐÒÁæ×ÎÉËÉ:î"
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
msgid "Workers: Unhappy"
msgstr "ðÒÁæ×ÎÉËÉ: îÅÝÁÓΦ"
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
msgid "?Angry workers:A"
msgstr "?ú̦ ÐÒÁæ×ÎÉËÉ:ú"
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
msgid "Workers: Angry"
msgstr "ðÒÁæ×ÎÉËÉ: ú̦"
-#: client/cityrepdata.c:465 client/gui-xaw/citydlg.c:2401
-#: data/default/units.ruleset:238
-msgid "Workers"
+#: client/cityrepdata.c:469 client/gui-xaw/citydlg.c:2402
+#, fuzzy
+msgid "?city:Workers"
msgstr "ðÒÁæ×ÎÉËÉ"
-#: client/cityrepdata.c:466
+#: client/cityrepdata.c:470
msgid "?happy/content/unhappy/angry:H/C/U/A"
msgstr "?ÝÁÓÌÉצ/ÎÅÊÔÒÁÌØΦ/ÎÅÝÁÓΦ/Ú̦:ý/ê/î/ú"
-#: client/cityrepdata.c:467
+#: client/cityrepdata.c:471
msgid "Workers: Happy, Content, Unhappy, Angry"
msgstr "ðÒÁæ×ÎÉËÉ: ýÁÓÌÉצ, îÅÊÔÒÁÌØΦ, îÅÝÁÓΦ, ú̦"
-#: client/cityrepdata.c:470 client/cityrepdata.c:472
+#: client/cityrepdata.c:474 client/cityrepdata.c:476
msgid "Best"
msgstr "îÁÊËÒÁÝÉÊ"
-#: client/cityrepdata.c:470
+#: client/cityrepdata.c:474
msgid "attack"
msgstr "ÁÔÁËÁ"
-#: client/cityrepdata.c:471
+#: client/cityrepdata.c:475
msgid "Best attacking units"
msgstr "îÁÊËÒÁݦ ÁÔÁËÕÀÞ¦ ÚÁÇÏÎÉ"
-#: client/cityrepdata.c:472
+#: client/cityrepdata.c:476
msgid "defense"
msgstr "ÚÁÈÉÓÔ"
-#: client/cityrepdata.c:473
+#: client/cityrepdata.c:477
msgid "Best defending units"
msgstr "îÁÊËÒÁݦ ÚÁÈÉÓΦ ÚÁÇÏÎÉ"
-#: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
-#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
-#: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
-#: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
-#: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
-#: client/gui-win32/menu.c:351 client/gui-win32/repodlgs.c:616
-#: client/gui-win32/repodlgs.c:707 client/gui-win32/repodlgs.c:716
-#: client/gui-xaw/menu.c:157 client/gui-xaw/menu.c:219
-#: client/gui-xaw/menu.c:242 client/gui-xaw/repodlgs.c:881
-#: client/gui-xaw/repodlgs.c:1069 data/Freeciv.in:1895 data/helpdata.txt:909
+#: client/cityrepdata.c:478 client/cityrepdata.c:482
+#: client/gui-gtk-2.0/cityrep.c:1437 client/gui-gtk-2.0/cityrep.c:1456
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-gtk-2.0/cityrep.c:1494
+#: client/gui-gtk-2.0/cityrep.c:1514 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/repodlgs.c:960 client/gui-sdl/helpdlg.c:688
+#: client/gui-sdl/mapctrl.c:1605 client/gui-sdl/optiondlg.c:1827
+#: client/gui-sdl/repodlgs.c:356 client/gui-win32/menu.c:351
+#: client/gui-win32/repodlgs.c:616 client/gui-win32/repodlgs.c:707
+#: client/gui-win32/repodlgs.c:716 client/gui-xaw/menu.c:157
+#: client/gui-xaw/menu.c:219 client/gui-xaw/menu.c:242
+#: client/gui-xaw/repodlgs.c:881 client/gui-xaw/repodlgs.c:1069
+#: data/Freeciv.in:1895 data/helpdata.txt:909
msgid "Units"
msgstr "ð¦ÄÒÏÚĦÌÉ"
#. TRANS: Header "Number of units inside city"
-#: client/cityrepdata.c:476
+#: client/cityrepdata.c:480
#, fuzzy
msgid "?Present (units):Here"
msgstr "?ðÒÉÓÕÔΦ (ЦÄÒÏÚĦÌÉ): ðÒÉ"
-#: client/cityrepdata.c:477
+#: client/cityrepdata.c:481
msgid "Number of units present"
msgstr "ë¦ÌØ˦ÓÔØ ÐÒÉÓÕÔÎ¦È Ð¦ÄÒÏÚĦ̦×"
#. TRANS: Header "Number of units supported by given city"
-#: client/cityrepdata.c:480
+#: client/cityrepdata.c:484
#, fuzzy
msgid "?Supported (units):Owned"
msgstr "?ð¦ÄÔÒÉÍÕ×ÁΦ (ЦÄÒÏÚĦÌÉ): ð¦Ä"
-#: client/cityrepdata.c:481
+#: client/cityrepdata.c:485
msgid "Number of units supported"
msgstr "ë¦ÌØ˦ÓÔØ Ð¦ÄÔÒÉÍÕ×ÁÎÉÈ Ð¦ÄÒÏÚĦ̦×"
#. TRANS: Header "It will take this many turns before city grows"
-#: client/cityrepdata.c:484
+#: client/cityrepdata.c:488
#, fuzzy
msgid "?food (population):Grow"
msgstr "úÒ¦ÓÔ"
-#: client/cityrepdata.c:485 client/cityrepdata.c:530
+#: client/cityrepdata.c:489 client/cityrepdata.c:528
#, fuzzy
msgid "?Stock/Target:(Have/Need)"
msgstr "(úÁÐÁÓ/ã¦ÌØ)"
-#: client/cityrepdata.c:486
+#: client/cityrepdata.c:490
msgid "Turns until growth/famine"
msgstr "èÏÄ¦× ÄÏ ÚÒÏÓÔÕ/ÇÏÌÏÄÕ"
-#: client/cityrepdata.c:488
-#, fuzzy
-msgid "?size [short]:Sz"
-msgstr "?ÒÏÚͦÒ:òÏÚ"
-
-#: client/cityrepdata.c:488
-msgid "Size"
-msgstr "òÏÚͦÒ"
-
-#: client/cityrepdata.c:492
-msgid "?city:Name"
-msgstr "?ͦÓÔÏ:îÁÚ×Á"
-
-#: client/cityrepdata.c:492 client/gui-sdl/cityrep.c:169
-msgid "City Name"
-msgstr "îÁÚ×Á ͦÓÔÁ"
-
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
msgid "Surplus"
msgstr "îÁÄÌÉÛÏË"
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
msgid "?food/production/trade:F/P/T"
msgstr "?§ÖÁ/×ÉÒÏÂÎÉÃÔ×Ï/ÔÏÒǦ×ÌÑ:·/÷/ô"
-#: client/cityrepdata.c:496
+#: client/cityrepdata.c:494
msgid "Surplus: Food, Production, Trade"
msgstr "îÁÄÌÉÛÏË: ·ÖÁ, ÷ÉÒÏÂÎÉÃÔ×Ï, ôÏÒǦ×ÌÑ"
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
#, fuzzy
msgid "?Food surplus [short]:+F"
msgstr "?îÁÄÌÉÛÏË §Ö¦:+·"
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
msgid "Surplus: Food"
msgstr "îÁÄÌÉÛÏË: ·ÖÁ"
-#: client/cityrepdata.c:500
+#: client/cityrepdata.c:498
#, fuzzy
msgid "?Production surplus [short]:+P"
msgstr "?îÁÄÌÉÛÏË ×ÉÒÏÂÎÉÃÔ×Á:+÷"
-#: client/cityrepdata.c:501
+#: client/cityrepdata.c:499
msgid "Surplus: Production"
msgstr "îÁÄÌÉÛÏË: ÷ÉÒÏÂÎÉÃÔ×Ï"
-#: client/cityrepdata.c:502
+#: client/cityrepdata.c:500
#, fuzzy
msgid "?Production loss (waste) [short]:-P"
msgstr "-÷"
-#: client/cityrepdata.c:503
+#: client/cityrepdata.c:501
msgid "Waste"
msgstr "÷ÔÒÁÔÉ"
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
#, fuzzy
msgid "?Trade surplus [short]:+T"
msgstr "?îÁÄÌÉÛÏË ÔÏÒǦ×ÌÑ:+ô"
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
msgid "Surplus: Trade"
msgstr "îÁÄÌÉÛÏË: ôÏÒǦ×ÌÑ"
-#: client/cityrepdata.c:506
+#: client/cityrepdata.c:504
#, fuzzy
msgid "?Trade loss (corruption) [short]:-T"
msgstr "-ô"
-#: client/cityrepdata.c:507
+#: client/cityrepdata.c:505
msgid "Corruption"
msgstr "ëÏÒÕÍÐÏ×ÁΦÓÔØ"
-#: client/cityrepdata.c:509 client/gui-gtk-2.0/repodlgs.c:654
+#: client/cityrepdata.c:507 client/gui-gtk-2.0/repodlgs.c:654
#: client/gui-sdl/mapctrl.c:1400 client/gui-win32/repodlgs.c:334
#: client/gui-xaw/menu.c:222 client/gui-xaw/repodlgs.c:644
#: client/gui-xaw/repodlgs.c:773 data/Freeciv.in:1819
msgid "Economy"
msgstr "åËÏÎÏͦËÁ"
-#: client/cityrepdata.c:509
+#: client/cityrepdata.c:507
msgid "?gold/luxury/science:G/L/S"
msgstr "?ÇÒÉ×Φ/ÒÏÚ˦Û/ÎÁÕËÁ:ç/ò/î"
-#: client/cityrepdata.c:510
+#: client/cityrepdata.c:508
msgid "Economy: Gold, Luxuries, Science"
msgstr "åËÏÎÏͦËÁ: çÒÉ×Φ, òÏÚ˦Û, îÁÕËÁ"
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
msgid "?Gold:G"
msgstr "?çÒÉ×ÅÎØ:ç"
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
msgid "Economy: Gold"
msgstr "åËÏÎÏͦËÁ: çÒÉ×ÅÎØ"
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
msgid "?Luxury:L"
msgstr "?òÏÚ˦Û:ò"
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
msgid "Economy: Luxury"
msgstr "åËÏÎÏͦËÁ:òÏÚ˦Û"
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
msgid "?Science:S"
msgstr "?îÁÕËÁ:î"
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
msgid "Economy: Science"
msgstr "åËÏÎÏͦËÁ: îÁÕËÁ"
-#: client/cityrepdata.c:518
+#: client/cityrepdata.c:516
#, fuzzy
msgid "?number_trade_routes:n"
msgstr "?ÔÏÒÇÏצ_ÛÌÑÈÉ:n"
-#: client/cityrepdata.c:518
+#: client/cityrepdata.c:516
#, fuzzy
msgid "?number_trade_routes:R"
msgstr "?ÔÏÒÇÏצ_ÛÌÑÈÉ:ô"
-#: client/cityrepdata.c:519
+#: client/cityrepdata.c:517
msgid "Number of Trade Routes"
msgstr "ë¦ÌØ˦ÓÔØ ÔÏÒÇÏ×ÉÈ ÛÌÑȦ×"
-#: client/cityrepdata.c:521
+#: client/cityrepdata.c:519
#, fuzzy
msgid "?pollution [short]:Pol"
msgstr "?ÚÁÂÒÕÄÎÅÎÎÑ:âÒÕÄ"
-#: client/cityrepdata.c:523
+#: client/cityrepdata.c:521
msgid "?cma:Governor"
msgstr ""
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
-#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
-#: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
-#: data/Freeciv.in:1459 data/helpdata.txt:820
+#: client/cityrepdata.c:521 client/gui-gtk-2.0/cityrep.c:1766
+#: client/gui-sdl/citydlg.c:3809 client/gui-sdl/cma_fe.c:858
+#: client/gui-win32/citydlg.c:726 data/Freeciv.in:1459 data/helpdata.txt:820
msgid "Citizen Governor"
msgstr ""
-#: client/cityrepdata.c:526
+#: client/cityrepdata.c:524
#, fuzzy
msgid "Turns/Buy"
msgstr "èÏĦ×/ëÕÐÉÔÉ"
-#: client/cityrepdata.c:529 client/cityrepdata.c:531
+#: client/cityrepdata.c:527 client/cityrepdata.c:529
msgid "Currently Building"
msgstr "îÁÒÁÚ¦ ÂÕÄÕ¤ÔØÓÑ"
-#: client/cityrepdata.c:575
+#: client/cityrepdata.c:573
#, fuzzy
msgid "?specialist:S"
msgstr "ó"
-#: client/cityrepdata.c:578
+#: client/cityrepdata.c:576
#, fuzzy
msgid "Specialists"
msgstr "óÐÅæÁÌØÎÅ"
-#: client/civclient.c:239
+#: client/civclient.c:240
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr " -a, --autoconnect\tðÒÏÐÕÓÔÉÔÉ Ä¦ÁÌÏÇ Ú'¤ÄÎÁÎÎÑ\n"
-#: client/civclient.c:249
+#: client/civclient.c:250
#, fuzzy
msgid " -l, --log FILE\tUse FILE as logfile (spawned server also uses this)\n"
msgstr " -l, --log æáêì\t÷ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ æáêì ÑË ÖÕÒÎÁÌ\n"
-#: client/civclient.c:251
+#: client/civclient.c:252
msgid " -m, --meta HOST\tConnect to the metaserver at HOST\n"
msgstr " -m, --meta áäòåóá\tðÒɤÄÎÁÔÉÓÑ ÄÏ ÍÅÔÁÓÅÒ×ÅÒÁ ÎÁ áäòåóá\n"
-#: client/civclient.c:253
+#: client/civclient.c:254
msgid " -n, --name NAME\tUse NAME as name\n"
msgstr " -n, --name ¶í'ñ\t÷ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ¶í'ñ ÑË ¦Í'Ñ\n"
-#: client/civclient.c:255
+#: client/civclient.c:256
#, fuzzy
msgid " -p, --port PORT\tConnect to server port PORT (usually with -a)\n"
msgstr " -p, --port ðïòô\tðÒɤÄÎÁÔÉÓÑ ÄÏ ÓÅÒ×ÅÒÁ ÎÁ ÐÏÒÔÕ ðïòô\n"
-#: client/civclient.c:257
+#: client/civclient.c:258
#, c-format
msgid " -P, --Plugin PLUGIN\tUse PLUGIN for sound output %s\n"
msgstr " -P, --Plugin äïäáôïë\t÷ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ äïäáôïë ÄÌÑ ×É×ÏÄÕ Ú×ÕËÕ %s\n"
-#: client/civclient.c:259
+#: client/civclient.c:260
#, fuzzy
msgid " -r, --read FILE\tRead startup script FILE (for spawned server only)\n"
msgstr " -r, --read æáêì\tþÉÔÁÔÉ æáêì ÓÔÁÒÔÏ×ÏÇÏ ÓËÒÉÐÔÁ\n"
-#: client/civclient.c:262
+#: client/civclient.c:263
#, fuzzy
msgid " -s, --server HOST\tConnect to the server at HOST (usually with -a)\n"
msgstr " -s, --server áäòåóá\tðÒɤÄÎÁÔÉÓÑ ÄÏ ÓÅÒ×ÅÒÁ ÎÁ áäòåóá\n"
-#: client/civclient.c:264
+#: client/civclient.c:265
msgid " -S, --Sound FILE\tRead sound tags from FILE\n"
msgstr " -S, --Sound æáêì\tþÉÔÁÔÉ Ú×ÕË Ú ÆÁÊÌÕ æáêì\n"
-#: client/civclient.c:265
+#: client/civclient.c:266
msgid " -t, --tiles FILE\tUse data file FILE.tilespec for tiles\n"
msgstr ""
" -t, --tiles æáêì\t÷ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ÄÁÎΦ Ú ÆÁÊÌÕ æáêì.tilespec ÄÌÑ ÆÏΦ×\n"
-#: client/civclient.c:268
+#: client/civclient.c:269
#, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -7713,145 +7702,155 @@ msgstr ""
"\t\t\tóÐÒÏÂÕÊÔÅ \"%s -- --help\" ÄÌÑ ÄÏÐÏÍÏÇÉ.\n"
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:273
+#: client/civclient.c:274
#, fuzzy, c-format
msgid "Report bugs at %s\n"
msgstr "ðÒÏ ÐÏÍÉÌËÉ ÐÏצÄÏÍÌÑÊÔÅ <%s>.\n"
-#: client/civclient.c:297
+#: client/civclient.c:298
#, c-format
msgid "Invalid port \"%s\" specified with --port option.\n"
msgstr ""
-#: client/civclient.c:299 client/civclient.c:314
+#: client/civclient.c:300 client/civclient.c:315
msgid "Try using --help.\n"
msgstr ""
-#: client/civclient.c:312
+#: client/civclient.c:313
#, c-format
msgid "Invalid debug level \"%s\" specified with --debug option.\n"
msgstr ""
-#: client/civclient.c:325
+#: client/civclient.c:326
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr "îÅצÄÏÍÁ ÏÐæÑ: '%s'\n"
-#: client/civclient.c:539
+#: client/civclient.c:391
+#, fuzzy, c-format
+msgid "Updating old metaserver address \"%s\"."
+msgstr "metaserver <ÁÄÒÅÓÁ>"
+
+#: client/civclient.c:394
+#, fuzzy, c-format
+msgid "Default metaserver has been set to \"%s\"."
+msgstr "ïÐæÑ: %s ×ÓÔÁÎÏ×ÌÅÎÁ Õ \"%s\"."
+
+#: client/civclient.c:550
msgid "Game started."
msgstr "çÒÕ ÓÔÁÒÔÏ×ÁÎÏ."
-#: client/civclient.c:577
+#: client/civclient.c:588
msgid "There was an error while auto connecting; aborting."
msgstr "ðÏÍÉÌËÁ ÓÔÁÌÁÓØ ÐÒÉ ÓÐÒϦ Á×ÔÏËÏÎÅËÔÕ; ÐÅÒÅÒÉ×ÁÀÓÑ."
-#: client/climisc.c:176
+#: client/climisc.c:177
#, c-format
msgid "Changing production of every %s into %s."
msgstr "úͦÎÀ¤ÍÏ ×ÉÒÏÂÎÉÃÔ×Ï Õ ËÏÖÎÏÍÕ %s ÎÁ %s."
-#: client/climisc.c:214
+#: client/climisc.c:215
msgid "?embassy:Both"
msgstr "?ÁÍÂÁÓÁÄÁ:ïÂÉÄ×Á"
-#: client/climisc.c:216
+#: client/climisc.c:217
msgid "?embassy:Yes"
msgstr "?ÁÍÂÁÓÁÄÁ:ôÁË"
-#: client/climisc.c:219
+#: client/climisc.c:220
msgid "?embassy:With Us"
msgstr "?ÁÍÂÁÓÁÄÁ:ú ÎÁÍÉ"
-#: client/climisc.c:222
+#: client/climisc.c:223
msgid "?embassy:Contact"
msgstr "?ÁÍÂÁÓÁÄÁ:ëÏÎÔÁËÔ"
-#: client/climisc.c:224
+#: client/climisc.c:225
#, fuzzy
msgid "?embassy:No Contact"
msgstr "?ÁÍÂÁÓÁÄÁ:ëÏÎÔÁËÔ"
-#: client/climisc.c:236
+#: client/climisc.c:237
msgid "?vision:Both"
msgstr "?ÂÁÞÅÎÎÑ:ïÂÉÄ×Á"
-#: client/climisc.c:238
+#: client/climisc.c:239
msgid "?vision:To Them"
msgstr "?ÂÁÞÅÎΦ:·Í"
-#: client/climisc.c:241
+#: client/climisc.c:242
msgid "?vision:To Us"
msgstr "?ÂÁÞÅÎÎÑ:îÁÍ"
-#: client/climisc.c:257 client/climisc.c:264
+#: client/climisc.c:258 client/climisc.c:265
#, c-format
msgid "The %s give %s"
msgstr "%s ÄÁ¤ %s"
-#: client/climisc.c:268
+#: client/climisc.c:269
#, c-format
msgid "The %s give unknown city."
msgstr "%s ÄÁ¤ ÎÅצÄÏÍŠͦÓÔÏ."
-#: client/climisc.c:273
+#: client/climisc.c:274
#, c-format
msgid "The %s give %d gold"
msgstr "%s ÄÁ¤ %d ÇÒÉ×ÅÎØ"
-#: client/climisc.c:278
+#: client/climisc.c:279
#, c-format
msgid "The %s give their worldmap"
msgstr "%s ÄÁ¤ Ó×ÏÀ ÍÁÐÕ ÓצÔÕ"
-#: client/climisc.c:282
+#: client/climisc.c:283
#, c-format
msgid "The %s give their seamap"
msgstr "%s ÄÁ¤ Ó×ÏÀ ÍÁÐÕ ÍÏÒ¦×"
-#: client/climisc.c:286
+#: client/climisc.c:287
msgid "The parties agree on a cease-fire"
msgstr "óÔÏÒÏÎÉ ÐÒÉÊÛÌÉ ÄÏ ÚÁÍÉÒÅÎÎÑ"
-#: client/climisc.c:289
+#: client/climisc.c:290
msgid "The parties agree on a peace"
msgstr "óÔÏÒÏÎÉ ÚÇÏÄÉÌÉÓÑ Õ ÍÉÒ¦"
-#: client/climisc.c:292
+#: client/climisc.c:293
msgid "The parties create an alliance"
msgstr "óÔÏÒÏÎÉ ÓÔ×ÏÒÉÌÉ ÁÌØÑÎÓ"
-#: client/climisc.c:295
+#: client/climisc.c:296
#, c-format
msgid "The %s give shared vision"
msgstr "%s ÄÁ¤ ÓЦÌØÎÅ ÂÁÞÅÎÎÑ"
-#: client/climisc.c:299
+#: client/climisc.c:300
#, fuzzy, c-format
msgid "The %s give an embassy"
msgstr "%s ÄÁ¤ %s"
-#: client/climisc.c:902
+#: client/climisc.c:906
msgid "Popup Request"
msgstr "úÁÐÉÔ ÎÁ ÄÅÍÏÎÓÔÒÁæÀ ÐÏצÄÏÍÌÅÎÎÑ"
-#: client/climisc.c:932
+#: client/climisc.c:936
msgid "Exporting output window to civgame.log ..."
msgstr "åËÓÐÏÒÔÕÀ צËÎÏ ×É×ÏÄÕ ÄÏ civgame.log ..."
-#: client/climisc.c:936
+#: client/climisc.c:940
msgid "Export complete."
msgstr "åËÓÐÏÒÔ ÚÁ×ÅÒÛÅÎÏ."
-#: client/climisc.c:938
+#: client/climisc.c:942
msgid "Export failed, couldn't write to file."
msgstr "åËÓÐÏÒÔ ÎÅ×ÄÁ×ÓÑ, ÎÅ ÍÏÖÕ ÚÁÐÉÓÁÔÉ Õ ÆÁÊÌ."
-#: client/climisc.c:1038
+#: client/climisc.c:1042
#, c-format
msgid "You don't buy %s in %s!"
msgstr "÷É ÎÅ ËÕÐÉÌÉ %s Õ %s!"
-#: client/climisc.c:1056
+#: client/climisc.c:1060
#, c-format
msgid "%s costs %d gold and you only have %d gold."
msgstr "%s ËÏÛÔÕ¤ %d ÇÒÉ×ÅÎØ, Á ÷É ÍÁ¤ÔÅ ÌÉÛÅ %d ÇÒÉ×ÅÎØ."
@@ -7902,21 +7901,21 @@ msgstr ""
"á×ÔÏÍÁÔÉÞÎÏ Ú'¤ÄÎÕ×ÁÔÉÓØ Ú ÓÅÒ×ÅÒÏÍ \"%s\" ÎÁ ÐÏÒÔÕ %d ÑË \"%s\" ËÏÖΦ %d.%d "
"ÓÅËÕÎÄ ÎÁÐÒÏÔÑÚ¦ %d ÒÁÚ¦×"
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1289
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
#, fuzzy
msgid "novice"
msgstr "ÎÅÍÁ¤"
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1289
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1358
msgid "easy"
msgstr "ÌÅÇËÁ"
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1290
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
#, fuzzy
msgid "normal"
msgstr "îÅÐÏÇÁÎÁ"
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1290
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
msgid "hard"
msgstr "×ÁÖËÁ"
@@ -7949,41 +7948,44 @@ msgstr ""
#: client/connectdlg_common.c:470
#, fuzzy
-msgid "We have control of the server (command access level hack)"
+msgid ""
+"Established control over the server. You have command access level 'hack'."
msgstr "÷É×ÏÄÉÔØ ÁÂÏ ×ÓÔÁÎÏ×ÌÀ¤ Ò¦×ÅÎØ ÄÏÓÔÕÐÕ ÄÏ ËÏÍÁÎÄ."
#: client/connectdlg_common.c:475
-msgid "We can't take control of server, attempting to kill it."
+msgid ""
+"Failed to obtain the required access level to take control of the server. "
+"The server will now be shutdown."
msgstr ""
-#: client/control.c:1104
+#: client/control.c:1123
msgid "Only transporter units can be unloaded."
msgstr "ìÉÛÅ ÔÒÁÎÓÐÏÒÔÏ×ÁΦ ЦÄÒÏÚĦÌÉ ÍÏÖÕÔØ ÂÕÔÉ ×É×ÁÎÔÁÖÅΦ."
-#: client/control.c:1353
+#: client/control.c:1425
#, fuzzy
msgid "Only settler units can be put into auto mode."
msgstr ""
"çÒÁ ÌÉÛÅ ëÏÌÏΦÓÔÉ ÔÁ צÊÓØËÏצ ÚÁÇÏÎÉ Õ Í¦ÓÔÁÈ ÍÏÖÕÔØ ÂÕÔÉ ÐÏÓÔÁ×ÌÅΦ Õ "
"Á×ÔÏÒÅÖÉÍ."
-#: client/control.c:1444
+#: client/control.c:1516
msgid "Only nuclear units can do this."
msgstr "ìÉÛÅ ÁÔÏÍΦ ÐÁÄÒÏÚĦÌÉ ÍÏÖÕÔØ ÚÒÏÂÉÔÉ ÃÅ."
-#: client/control.c:1473
+#: client/control.c:1545
msgid "Only paratrooper units can do this."
msgstr "ìÉÛÅ ÐÁÒÁÛÕÔ¦ÓÔÉ ÍÏÖÕÔØ ÒÏÂÉÔÉ ÃÅ."
-#: client/control.c:1921
+#: client/control.c:2020
msgid "Too far for this unit."
msgstr "úÁÄÁÌÅËÏ ÄÌÑ ÃØÏÇÏ Ð¦ÄÒÏÚĦÌÕ."
-#: client/control.c:2131 client/control.c:2161 client/control.c:2177
+#: client/control.c:2230 client/control.c:2260 client/control.c:2276
msgid "Didn't find a route to the destination!"
msgstr "îÅ ÚÎÁÊÄÅÎÏ ÛÌÑÈÕ ÄÏ Ã¦Ì¦!"
-#: client/control.c:2221
+#: client/control.c:2320
msgid "Oh my! You seem to have no capital!"
msgstr "ïÊ ×¤Ê! úÄÁ¤ÔØÓÑ Õ ÷ÁÓ ÎÅ ÍÁ¤ ÓÔÏÌÉæ!"
@@ -8053,17 +8055,17 @@ msgid "Allows %s (with %s)."
msgstr "äÏÚ×ÏÌѤ %s (Ú %s).\n"
#. TRANS: preserve single space at beginning
-#: client/helpdata.c:418
+#: client/helpdata.c:416
#, fuzzy
msgid " Rivers"
msgstr " ò¦ÞËÉ"
-#: client/helpdata.c:576
+#: client/helpdata.c:574
#, c-format
msgid "Sorry, no help topic for %s.\n"
msgstr "÷ÉÂÁÞÔÅ, ÎÅ ÍÁ¤ ÄÏÐÏÍÏÇÉ ÐÏ %s.\n"
-#: client/helpdata.c:580
+#: client/helpdata.c:578
#, c-format
msgid ""
"Sorry, no help topic for %s.\n"
@@ -8074,13 +8076,13 @@ msgstr ""
"ãÀ ÓÔÏÒ¦ÎËÕ ÓÇÅÎÅÒÏ×ÁÎÏ Á×ÔÏÍÁÔÉÞÎÏ.\n"
"\n"
-#: client/helpdata.c:670
+#: client/helpdata.c:668
msgid ""
"Requires: Nothing\n"
"\n"
msgstr ""
-#: client/helpdata.c:675
+#: client/helpdata.c:673
#, fuzzy, c-format
msgid "* The discovery of %s will make %s obsolete.\n"
msgstr ""
@@ -8088,54 +8090,54 @@ msgstr ""
"\n"
"÷¦ÄËÒÉÔÔÑ %s ÒÏÂÉÔØ ÚÁÓÔÁÒ¦ÌÉÍ %s. "
-#: client/helpdata.c:694
+#: client/helpdata.c:692
#, fuzzy, c-format
msgid "* Allows all players with knowledge of %s to build %s units.\n"
msgstr "äÏÚ×ÏÌѤ ÕÓ¦Í ÇÒÁ×ÃÑÍ ÝÏ ×¦ÄËÒÉÌÉ %s ÂÕÄÕ×ÁÔÉ Ð¦ÄÒÏÚĦÌÉ %s. "
-#: client/helpdata.c:706
+#: client/helpdata.c:704
#, fuzzy, c-format
msgid "* Allows %s (with %s).\n"
msgstr "äÏÚ×ÏÌѤ %s (Ú %s).\n"
-#: client/helpdata.c:710
+#: client/helpdata.c:708
#, fuzzy, c-format
msgid "* Allows %s.\n"
msgstr "äÏÚ×ÏÌѤ %s.\n"
-#: client/helpdata.c:780
+#: client/helpdata.c:778
#, c-format
msgid "* Can only be built if there is %s in the city.\n"
msgstr ""
-#: client/helpdata.c:786
+#: client/helpdata.c:784
#, c-format
msgid "* Can only be built with %s as government.\n"
msgstr ""
-#: client/helpdata.c:791
+#: client/helpdata.c:789
#, fuzzy
msgid "* May not be built in cities.\n"
msgstr "* íÏÖÕÔØ ÚÁÓÎÏ×Õ×ÁÔÉ Í¦ÓÔÁ.\n"
-#: client/helpdata.c:794
+#: client/helpdata.c:792
msgid "* Never has a home city.\n"
msgstr ""
-#: client/helpdata.c:797
+#: client/helpdata.c:795
msgid "* Losing this unit will lose you the game!\n"
msgstr ""
-#: client/helpdata.c:801
+#: client/helpdata.c:799
msgid "* Each player may only have one of this type of unit.\n"
msgstr ""
-#: client/helpdata.c:805
+#: client/helpdata.c:803
#, c-format
msgid "* Requires %d population to build.\n"
msgstr ""
-#: client/helpdata.c:811
+#: client/helpdata.c:809
#, c-format
msgid "* Can carry and refuel %d air unit.\n"
msgid_plural "* Can carry and refuel %d air units.\n"
@@ -8143,7 +8145,7 @@ msgstr[0] "*
msgstr[1] "* íÏÖÅ ÎÅÓÔÉ ÔÁ ÚÁÐÒÁ×ÌÑÔÉ %d ÁצÁÚÁÇÏÎÉ.\n"
msgstr[2] "* íÏÖÅ ÎÅÓÔÉ ÔÁ ÚÁÐÒÁ×ÌÑÔÉ %d ÁצÁÚÁÇÏΦ×.\n"
-#: client/helpdata.c:816
+#: client/helpdata.c:814
#, c-format
msgid "* Can carry and refuel %d missile unit.\n"
msgid_plural "* Can carry and refuel %d missile units.\n"
@@ -8151,7 +8153,7 @@ msgstr[0] "*
msgstr[1] "* íÏÖÅ ÎÅÓÔÉ ÔÁ ÚÁÐÒÁ×ÌÑÔÉ %d ÒÁËÅÔΦ ЦÄÒÏÚĦÌÉ.\n"
msgstr[2] "* íÏÖÅ ÎÅÓÔÉ ÔÁ ÚÁÐÒÁ×ÌÑÔÉ %d ÒÁËÅÔÎÉÈ Ð¦ÄÒÏÚĦ̦×.\n"
-#: client/helpdata.c:821
+#: client/helpdata.c:819
#, c-format
msgid "* Can carry %d ground unit across water.\n"
msgid_plural "* Can carry %d ground units across water.\n"
@@ -8159,140 +8161,140 @@ msgstr[0] "*
msgstr[1] "* íÏÖÅ ÐÅÒÅ×ÅÚÔÉ %d ÎÁÚÅÍΦ ЦÄÒÏÚĦÌÉ ÐÏ ×ÏĦ.\n"
msgstr[2] "* íÏÖÅ ÐÅÒÅ×ÅÚÔÉ %d ÎÁÚÅÍÎÉÈ Ð¦ÄÒÏÚÄ¦Ì¦× ÐÏ ×ÏĦ.\n"
-#: client/helpdata.c:830
+#: client/helpdata.c:828
msgid ""
"* Can establish trade routes (must travel to target city and must be at "
"least 9 tiles [in Manhattan distance] from this unit's home city).\n"
msgstr ""
-#: client/helpdata.c:836
+#: client/helpdata.c:834
#, fuzzy, c-format
msgid "* Can help build wonders (adds %d production).\n"
msgstr "* äÏÐÏÍÏÇÁÀÔØ ÂÕÄÕ×ÁÔÉ ÄÉ×Á.\n"
-#: client/helpdata.c:840
+#: client/helpdata.c:838
msgid "* May not be disbanded.\n"
msgstr ""
-#: client/helpdata.c:842
+#: client/helpdata.c:840
#, c-format
msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
msgstr ""
-#: client/helpdata.c:846
+#: client/helpdata.c:844
msgid "* Can build new cities.\n"
msgstr "* íÏÖÕÔØ ÚÁÓÎÏ×Õ×ÁÔÉ Í¦ÓÔÁ.\n"
-#: client/helpdata.c:849
+#: client/helpdata.c:847
#, c-format
msgid "* Can add on %d population to cities of no more than size %d.\n"
msgstr ""
-#: client/helpdata.c:858
+#: client/helpdata.c:856
#, fuzzy
msgid "* Can build roads and railroads.\n"
msgstr "* äÏÐÏÍÏÇÁÀÔØ ÂÕÄÕ×ÁÔÉ ÄÉ×Á.\n"
-#: client/helpdata.c:859
+#: client/helpdata.c:857
#, fuzzy
msgid "* Can build mines on tiles.\n"
msgstr "* íÏÖÕÔØ ÚÁÓÎÏ×Õ×ÁÔÉ Í¦ÓÔÁ.\n"
-#: client/helpdata.c:860
+#: client/helpdata.c:858
#, fuzzy
msgid "* Can build irrigation on tiles.\n"
msgstr "* íÏÖÕÔØ ÚÁÓÎÏ×Õ×ÁÔÉ Í¦ÓÔÁ.\n"
-#: client/helpdata.c:865
+#: client/helpdata.c:863
#, fuzzy
msgid "* Can build farmland.\n"
msgstr "âÕÄÕ×ÁÔÉ ÆÅÒÍÕ"
-#: client/helpdata.c:869
+#: client/helpdata.c:867
#, fuzzy, c-format
msgid "* Can build farmland (if %s is known).\n"
msgstr "* íÏÖÕÔØ ÚÁÓÎÏ×Õ×ÁÔÉ Í¦ÓÔÁ.\n"
-#: client/helpdata.c:873
+#: client/helpdata.c:871
#, c-format
msgid "* Can build farmland (if any of the following are known: %s).\n"
msgstr ""
-#: client/helpdata.c:881
+#: client/helpdata.c:879
#, fuzzy
msgid "* Can build fortresses.\n"
msgstr "äÏÚ×ÏÌѤ %s ÂÕÄÕ×ÁÔÉ ÕËÒ¦ÐÌÅÎÎÑ.\n"
-#: client/helpdata.c:885
+#: client/helpdata.c:883
#, c-format
msgid "* Can build fortresses (if %s is known).\n"
msgstr ""
-#: client/helpdata.c:889
+#: client/helpdata.c:887
#, c-format
msgid "* Can build fortresses (if any of the following are known: %s).\n"
msgstr ""
-#: client/helpdata.c:895
+#: client/helpdata.c:893
msgid "* Can clean pollution from tiles.\n"
msgstr ""
-#: client/helpdata.c:896
+#: client/helpdata.c:894
#, fuzzy
msgid "* Can clean nuclear fallout from tiles.\n"
msgstr "ïÞÉÓÔÉÔÉ ÒÁĦÁæÀ"
-#: client/helpdata.c:899
+#: client/helpdata.c:897
#, fuzzy
msgid "* Can transform tiles.\n"
msgstr "* íÏÖÕÔØ ×ÉËÏÎÕ×ÁÔÉ Ä¦§ ËÏÌÏΦÓÔ¦×.\n"
-#: client/helpdata.c:902
+#: client/helpdata.c:900
#, fuzzy
msgid "* Can build airbases.\n"
msgstr "* íÏÖÕÔØ ÚÁÓÎÏ×Õ×ÁÔÉ Í¦ÓÔÁ.\n"
-#: client/helpdata.c:906
+#: client/helpdata.c:904
#, c-format
msgid "* May fortify, granting a 50%% defensive bonus.\n"
msgstr ""
-#: client/helpdata.c:909
+#: client/helpdata.c:907
msgid "* May pillage to destroy infrastructure from tiles.\n"
msgstr ""
-#: client/helpdata.c:913
+#: client/helpdata.c:911
msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
msgstr ""
"* íÏÖÕÔØ ×ÉËÏÎÕ×ÁÔÉ Ä¦ÐÌÏÍÁÔÉÞΦ Ħ§, Á ÔÁËÏÖ ÄÅÑ˦ ÍÁÀÔØ ÛÐÉÇÕÎÓØ˦ "
"ÍÏÖÌÉ×ÏÓÔ¦.\n"
-#: client/helpdata.c:916
+#: client/helpdata.c:914
msgid "* Can perform diplomatic actions.\n"
msgstr "* íÏÖÕÔØ ×ÉËÏÎÕ×ÁÔÉ Ä¦ÐÌÏÍÁÔÉÞΦ Ħ§.\n"
-#: client/helpdata.c:920
+#: client/helpdata.c:918
msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
msgstr ""
-#: client/helpdata.c:923
+#: client/helpdata.c:921
msgid "* May not be bribed.\n"
msgstr ""
-#: client/helpdata.c:926
+#: client/helpdata.c:924
msgid "* Can attack enemy air units.\n"
msgstr "* íÏÖÕÔØ ÁÔÁËÕ×ÁÔÉ ×ÏÒÏÖ¦ ÐÏצÔÒÑΦ ЦÄÒÏÚĦÌÉ.\n"
-#: client/helpdata.c:930
+#: client/helpdata.c:928
msgid "* Is invisible except when next to an enemy unit or city.\n"
msgstr ""
"* îÅ×ÉÄÉÍÉÊ ÑËÝÏ Õ ÓÕÓ¦ÄÎ¦Ê Ë̦ÔÉÎæ ÎÅ ÍÁ¤ ×ÏÒÏÖÏÇÏ Ð¦ÄÒÏÚĦÌÕ ÁÂÏ Í¦ÓÔÁ.\n"
-#: client/helpdata.c:934
+#: client/helpdata.c:932
msgid "* Can only attack units on ocean squares (no land attacks).\n"
msgstr "* íÏÖÕÔØ ÁÔÁËÕ×ÁÔÉ ÌÉÛÅ Õ ÏËÅÁΦ (ÎÅ ÎÁ ÓÕÛ¦)\n"
-#: client/helpdata.c:938
+#: client/helpdata.c:936
#, fuzzy
msgid ""
"* Can attack from aboard sea units: against enemy cities and onto land "
@@ -8301,76 +8303,76 @@ msgstr ""
"* íÏÖ¤ ÁÔÁËÕ×ÁÔÉ Ú ×ÏÄÎÉÈ Ð¦ÄÒÏÚÄ¦Ì¦× ×ÏÒÏÖ¦ ͦÓÔÁ ÁÂÏ Ð¦ÄÒÏÚĦÌÉ ÎÁ "
"ÓÕÈÏÐÕÔÎÉÈ ÔÅÒÉÔÏÒ¦ÑÈ."
-#: client/helpdata.c:943
+#: client/helpdata.c:941
#, fuzzy, c-format
msgid "* Can be paradropped from a friendly city (Range: %d).\n"
msgstr "* íÏÖÅ ÂÕÄÉ ÐÁÒÁÛÕÔÏ×ÁÎÏ Ú ÄÒÕÖÎØÏÇÏ Í¦ÓÔÁ (÷¦ÄÓÔÁÎØ: %d)."
-#: client/helpdata.c:949
+#: client/helpdata.c:947
msgid "* Gets double defense against units specified as 'mounted'.\n"
msgstr "* íÁ¤ ÐÏÄצÊÎÉÊ ÚÁÈÉÓÔ ×¦Ä '˦ÎÎÉÈ' ЦÄÒÏÚĦ̦×.\n"
-#: client/helpdata.c:953
+#: client/helpdata.c:951
msgid "* Counts as 'mounted' against certain defenders.\n"
msgstr "* òÁÈÕ¤ÔØÓÑ ÑË '˦ÎÎÉÊ' ÐÒÏÔÉ ÄÅÑËÉÈ ÚÁÈÉÓÎÉ˦×.\n"
-#: client/helpdata.c:957
+#: client/helpdata.c:955
msgid "* A missile unit: gets used up in making an attack.\n"
msgstr "* òÁËÅÔÎÉÊ Ð¦ÄÒÏÚĦÌ: ×ÔÒÁÞÁ¤ÔØÓÑ Ð¦ÓÌÑ ×ÉËÏÎÁÎϧ ÁÔÁËÉ.\n"
-#: client/helpdata.c:960
+#: client/helpdata.c:958
msgid "* Making an attack ends this unit's turn.\n"
msgstr "* áÔÁËÁ ÚÁ˦ÎÞÕ¤ È¦Ä ÃØÏÇÏ Ð¦ÄÒÏÚĦÌÁ.\n"
-#: client/helpdata.c:964
+#: client/helpdata.c:962
msgid "* This unit's attack causes a nuclear explosion!\n"
msgstr "* áÔÁËÁ ÃÉÍ Ð¦ÄÒÏÚĦÌÏÍ ÓÐÒÉÞÉÎѤ ÒÁĦÁæÊÎÅ ÚÁÂÒÕÄÎÅÎÎÑ!\n"
-#: client/helpdata.c:968
+#: client/helpdata.c:966
msgid "* Gets double firepower when attacking cities.\n"
msgstr ""
-#: client/helpdata.c:971
+#: client/helpdata.c:969
msgid "* Ignores the effects of city walls.\n"
msgstr "* ¶ÇÎÏÒÕ¤ óÔ¦ÎÉ Í¦ÓÔÁ.\n"
-#: client/helpdata.c:975
+#: client/helpdata.c:973
#, c-format
msgid ""
"* Does bombard attacks (%d per turn). These attacks will only damage (never "
"kill) the defender, but have no risk for the attacker.\n"
msgstr ""
-#: client/helpdata.c:982
+#: client/helpdata.c:980
msgid "* Gets quintuple defense against missiles and aircraft.\n"
msgstr "* îÁÄÁ¤ Ð'ÑÔÉËÒÁÔÎÉÊ ÚÁÈÉÓÔ ÐÒÏÔÉ ÒÁËÅÔ ÔÁ ̦ÔÁ˦×.\n"
-#: client/helpdata.c:986
+#: client/helpdata.c:984
msgid "* Ignores terrain effects (treats all squares as roads).\n"
msgstr "* ¶ÇÎÏÒÕ¤ ÌÁÎÛÁÆÔ (ÔÒÁËÔÕ¤ ÕÓÀ ÓÕÛÕ ÑË ÄÏÒÏÇÉ).\n"
-#: client/helpdata.c:989
+#: client/helpdata.c:987
msgid "* Ignores zones of control.\n"
msgstr "* ¶ÇÎÏÒÕ¤ ÚÏÎÉ ËÏÎÔÒÏÌÀ.\n"
-#: client/helpdata.c:993
+#: client/helpdata.c:991
msgid "* A non-military unit (cannot attack; no martial law).\n"
msgstr ""
"* îŠצÊÓØËÏ×ÉÊ Ð¦ÄÒÏÚÄ¦Ì (ÎÅÍÏÖÅ ÁÔÁËÕ×ÁÔÉ; ÎÅÍÁ¤ צÊÓØËÏ×ÏÇÏ ÐÏÌÏÖÅÎÎÑ).\n"
-#: client/helpdata.c:997
+#: client/helpdata.c:995
msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
msgstr "* ðÏÌØÏ×ÉÊ Ð¦ÄÒÏÚĦÌ: ÏÄÉÎ ÎÅÝÁÓÎÉÊ ÎÁצÔØ ÑËÝÏ Ê ÎÅÁÇÒÅÓÉ×ÎÉÊ.\n"
-#: client/helpdata.c:1000
+#: client/helpdata.c:998
msgid "* Will never achieve veteran status.\n"
msgstr ""
-#: client/helpdata.c:1002
+#: client/helpdata.c:1000
msgid "* May become veteran through training or combat.\n"
msgstr ""
-#: client/helpdata.c:1008
+#: client/helpdata.c:1006
#, fuzzy, c-format
msgid ""
"* Must end turn in a city or next to land, or has a 50%% risk of being lost "
@@ -8379,12 +8381,12 @@ msgstr ""
"* ðÏ×ÉÎÅÎ ÚÁ×ÅÒÛÉÔÉ È¦Ä Õ Í¦ÓÔ¦ ÁÂÏ ÐÏÂÌÉÚÕ ×¦Ä ÚÅÍ̦, ¦ÎÁËÛÅ ÍÁ¤ 50%% "
"צÒÏǦÄΦÓÔØ ÂÕÔÉ ×ÔÒÁÞÅÎÉÍ Õ ÍÏÒ¦."
-#: client/helpdata.c:1012
+#: client/helpdata.c:1010
#, c-format
msgid "* The discovery of %s reduces the risk to 25%%.\n"
msgstr ""
-#: client/helpdata.c:1017
+#: client/helpdata.c:1015
#, c-format
msgid "* %s reduces the risk to 12%%.\n"
msgstr ""
@@ -8393,15 +8395,15 @@ msgstr ""
#. * last two elements
#. TRANS: List of possible output types has this between
#. * last two elements
-#: client/helpdata.c:1068 client/helpdata.c:1402
+#: client/helpdata.c:1066 client/helpdata.c:1400
msgid " or "
msgstr " ÁÂÏ "
-#: client/helpdata.c:1070 client/helpdata.c:1390
+#: client/helpdata.c:1068 client/helpdata.c:1388
msgid "?or:, "
msgstr "?ÁÂÏ:, "
-#: client/helpdata.c:1082
+#: 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"
@@ -8409,12 +8411,12 @@ msgstr[0] "*
msgstr[1] "* ð¦ÄÒÏÚÄ¦Ì ÍÁ¤ ÂÕÔÉ Õ Í¦ÓÔ¦ ÁÂÏ ÎÁ ЦÄÒÏÚĦ̦ %s ЦÓÌÑ %d ÈÏĦ×.\n"
msgstr[2] "* ð¦ÄÒÏÚÄ¦Ì ÍÁ¤ ÂÕÔÉ Õ Í¦ÓÔ¦ ÁÂÏ ÎÁ ЦÄÒÏÚĦ̦ %s ЦÓÌÑ %d ÈÏĦ×.\n"
-#: client/helpdata.c:1124
+#: client/helpdata.c:1122
#, c-format
msgid "If we would now start with %s we would need %d bulbs."
msgstr "ñËÝÏ ÒÏÚÐÏÞÎÅÍÏ Ú %s ÔÏ ÂÕÄÅÍÏ ÐÏÔÒÅÂÕ×ÁÔÉ %d ÂÁ̦×."
-#: client/helpdata.c:1129
+#: client/helpdata.c:1127
#, c-format
msgid ""
"To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8423,90 +8425,90 @@ msgstr ""
"áÂÉ ÄÏÓ̦ÄÉÔÉ %s ÎÁÍ ÓÐÅÒÛÕ ÐÏÔÒ¦ÂÎÏ ÏÔÒÉÍÁÔÉ %d ¦ÎÛÉÈ ÔÅÈÎÏÌÏǦÊ. ÷æÌÏÍÕ "
"ÎÁÍ ÚÎÁÄÏÂÉÔØÓÑ %d ÂÁÌ¦× ÄÌÑ ÚÁ×ÅÒÛÅÎÎÑ."
-#: client/helpdata.c:1137
+#: client/helpdata.c:1135
msgid "You cannot research this technology."
msgstr ""
-#: client/helpdata.c:1141
+#: client/helpdata.c:1139
msgid " This number may vary depending on what other players will research.\n"
msgstr " ãÅ ÞÉÓÌÏ ÂÁÇÁÔÏ × ÞÏÍÕ ÚÁÌÅÖÉÔØ ×¦Ä ÔÏÇÏ, ÝÏ ×¦ÄËÒÉÀÔØ ¦ÎÛ¦ ÇÒÁ×æ.\n"
-#: client/helpdata.c:1153
+#: client/helpdata.c:1151
#, fuzzy, c-format
msgid "* The first player to research %s gets an immediate advance.\n"
msgstr "ðÅÒÛÉÊ ÇÒÁ×ÅÃØ ÝÏ ÄÏÓ̦ÄÉÔØ %s ÏÔÒÉÍÕ¤ ÎÅÇÁÊÎÅ ÚÎÁÎÎÑ.\n"
-#: client/helpdata.c:1158
+#: client/helpdata.c:1156
#, c-format
msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
msgstr ""
-#: client/helpdata.c:1161
+#: client/helpdata.c:1159
#, c-format
msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
msgstr ""
-#: client/helpdata.c:1165
+#: client/helpdata.c:1163
#, fuzzy
msgid "* Increases the pollution generated by the population.\n"
msgstr "ð¦Ä×ÉÝÕ¤ ÚÁÂÒÕÄÎÅÎÎÑ ÝÏ ÓÐÒÉÞÉÎÅÎÏ ÎÁÓÅÌÅÎÎÑÍ.\n"
-#: client/helpdata.c:1170
+#: client/helpdata.c:1168
#, fuzzy, c-format
msgid "* Allows %s to build roads on river squares.\n"
msgstr "%s - ÄÏÚ×ÏÌѤ ÂÕÄÕ×ÁÔÉ ÛÌÑÈÉ ÞÅÒÅÚ Ò¦ËÉ.\n"
-#: client/helpdata.c:1177
+#: client/helpdata.c:1175
#, fuzzy, c-format
msgid "* Allows %s to build fortresses.\n"
msgstr "äÏÚ×ÏÌѤ %s ÂÕÄÕ×ÁÔÉ ÕËÒ¦ÐÌÅÎÎÑ.\n"
-#: client/helpdata.c:1185
+#: client/helpdata.c:1183
#, fuzzy, c-format
msgid "* Allows %s to build airbases.\n"
msgstr "äÏÚ×ÏÌѤ %s ÂÕÄÕ×ÁÔÉ ÁצÁÂÁÚÉ.\n"
-#: client/helpdata.c:1194
+#: client/helpdata.c:1192
#, fuzzy, c-format
msgid "* Allows %s to upgrade roads to railroads.\n"
msgstr "äÏÚ×ÏÌѤ %s ÍÏÄÅÒΦÚÕ×ÁÔÉ ûÌÑÈÉ ÄÏ úÁ̦ÚÎÉÃØ.\n"
-#: client/helpdata.c:1202
+#: client/helpdata.c:1200
#, fuzzy, c-format
msgid "* Allows %s to upgrade irrigation to farmland.\n"
msgstr "äÏÚ×ÏÌѤ %s ÐÅÒÅÔ×ÏÒÀ×ÁÔÉ ÚÒÏÛÅÎÎÑ ÎÁ ÆÅÒÍÉ.\n"
-#: client/helpdata.c:1236
+#: client/helpdata.c:1234
msgid "* Pollution cannot be generated on this terrain."
msgstr ""
-#: client/helpdata.c:1241
+#: client/helpdata.c:1239
#, fuzzy
msgid "* You cannot build cities on this terrain."
msgstr "÷É ÎÅ ÍÏÖÅÔÅ ÐÅÒÅÔÑÇÎÕÔÉ ÎÁ Ó×¦Ê Â¦Ë Ð¦ÄÒÏÚÄ¦Ì Ã¦¤§ ÎÁæ§."
-#: client/helpdata.c:1247
+#: client/helpdata.c:1245
msgid "* The coastline of this terrain is unsafe."
msgstr ""
-#: client/helpdata.c:1252
+#: client/helpdata.c:1250
msgid "* This terrain is unsafe for units to travel on."
msgstr ""
-#: client/helpdata.c:1257
+#: client/helpdata.c:1255
msgid "* Land units cannot travel on oceanic terrains."
msgstr ""
-#: client/helpdata.c:1307
+#: client/helpdata.c:1305
msgid "Features:\n"
msgstr ""
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1413 client/helpdata.c:1414
+#: client/helpdata.c:1411 client/helpdata.c:1412
msgid "?outputlist: Nothing "
msgstr ""
-#: client/helpdata.c:1421
+#: client/helpdata.c:1419
#, fuzzy, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
@@ -8518,7 +8520,7 @@ msgstr[0] "
msgstr[1] "÷¦ÊÓØËÏצ ЦÄÒÏÚĦÌÉ Õ ÐÏ̦ ÍÏÖÕÔØ ÓÐÒÉÞÉÎÉÔÉ ÎÅÝÁÓÔÑ."
msgstr[2] "÷¦ÊÓØËÏצ ЦÄÒÏÚĦÌÉ Õ ÐÏ̦ ÍÏÖÕÔØ ÓÐÒÉÞÉÎÉÔÉ ÎÅÝÁÓÔÑ."
-#: client/helpdata.c:1431
+#: client/helpdata.c:1429
#, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8526,48 +8528,48 @@ msgid ""
msgstr ""
#. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1439
+#: client/helpdata.c:1437
#, c-format
msgid "* You pay %d times normal %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1444
+#: client/helpdata.c:1442
#, 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:1449
+#: client/helpdata.c:1447
#, c-format
msgid "* You pay no %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1453
+#: client/helpdata.c:1451
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:1462
+#: client/helpdata.c:1460
#, 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:1470
+#: client/helpdata.c:1468
#, c-format
msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
msgstr ""
-#: client/helpdata.c:1477
+#: client/helpdata.c:1475
#, 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:1484
+#: client/helpdata.c:1482
#, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -8575,23 +8577,23 @@ msgid ""
msgstr ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1491
+#: client/helpdata.c:1489
#, 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:1499
+#: client/helpdata.c:1497
#, c-format
msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
msgstr ""
-#: client/helpdata.c:1504
+#: client/helpdata.c:1502
msgid "Has unlimited science/gold/luxuries rates.\n"
msgstr ""
-#: client/helpdata.c:1509
+#: client/helpdata.c:1507
#, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
@@ -8603,7 +8605,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: client/helpdata.c:1521
+#: client/helpdata.c:1519
#, 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"
@@ -8612,64 +8614,64 @@ msgstr[1] ""
msgstr[2] ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1532
+#: client/helpdata.c:1530
#, 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:1538
+#: client/helpdata.c:1536
#, fuzzy
msgid "* Your units cannot be bribed.\n"
msgstr "ãÅÊ Ð¦ÄÒÏÚÄ¦Ì ÎÅ ÍÏÖÅ ÂÕÔÉ ÐÁÒÁÛÕÔÏ×ÁÎÉÊ."
-#: client/helpdata.c:1541
+#: client/helpdata.c:1539
#, fuzzy
msgid "* Your cities cannot be incited.\n"
msgstr "í¦ÓÔÏ ÎÅ ÍÏÖÅ ÂÕÔÉ Ð¦ÄÂÕÒÅÎÏ!"
-#: client/helpdata.c:1545
+#: client/helpdata.c:1543
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:1551
+#: client/helpdata.c:1549
msgid "* Has a senate that may prevent declaration of war.\n"
msgstr ""
-#: client/helpdata.c:1555
+#: client/helpdata.c:1553
msgid "* Allows partisans when cities are taken by the enemy.\n"
msgstr ""
-#: client/helpdata.c:1559
+#: client/helpdata.c:1557
msgid ""
"* Buildings that normally confer bonuses against unhappiness will instead "
"give gold.\n"
msgstr ""
-#: client/helpdata.c:1563
+#: client/helpdata.c:1561
msgid "* Pays no upkeep for fanatics.\n"
msgstr ""
-#: client/helpdata.c:1566
+#: client/helpdata.c:1564
#, fuzzy
msgid "* Has no unhappy citizens.\n"
msgstr "%d ÄÏÄÁÔËÏ×ÉÈ ÎÅÝÁÓÎÉÈ ÇÏÒÏÄÑÎ."
-#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
+#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
#, c-format
msgid "* Veteran %s units.\n"
msgstr ""
-#: client/helpdata.c:1587
+#: client/helpdata.c:1585
#, fuzzy
msgid "* Veteran units.\n"
msgstr "íÏÒÓØ˦ ЦÄÒÏÚĦÌÉ"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1593
+#: client/helpdata.c:1591
#, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8677,7 +8679,7 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1602
+#: client/helpdata.c:1600
#, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8685,462 +8687,509 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1610
+#: client/helpdata.c:1608
#, 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:1619
+#: client/helpdata.c:1617
#, c-format
msgid "* %s production is increased %d%%.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1627
+#: client/helpdata.c:1625
#, c-format
msgid "* %s production will suffer massive waste.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1632
+#: client/helpdata.c:1630
#, c-format
msgid "* %s production will suffer some waste.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1637
+#: client/helpdata.c:1635
#, 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:1645
+#: client/helpdata.c:1643
#, 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:1651
+#: client/helpdata.c:1649
#, 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:1657
+#: client/helpdata.c:1655
#, c-format
msgid "* %s waste will increase slowly with distance from capital.\n"
msgstr ""
-#: client/helpdata.c:1674
+#: client/helpdata.c:1672
#, fuzzy, c-format
msgid "* Allows you to build %s.\n"
msgstr "äÏÚ×ÏÌѤ %s ÂÕÄÕ×ÁÔÉ ÁצÁÂÁÚÉ.\n"
#. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1701
+#: client/helpdata.c:1699
#, fuzzy, c-format
msgid "%s%d %s"
msgstr "%3d/%3d %s"
-#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1700 client/helpdata.c:1708 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:1709
+#: client/helpdata.c:1707
#, c-format
msgid "%s%d unhappy"
msgstr "%s%d ÎÅÝÁÓÌÉצ"
-#: client/mapctrl_common.c:382
+#: client/mapctrl_common.c:399
#, fuzzy, c-format
msgid "You don't know how to build %s!"
msgstr "÷É ÎÅ ËÕÐÉÌÉ %s!"
-#: client/mapctrl_common.c:392
+#: client/mapctrl_common.c:409
#, c-format
msgid "Copy %s to clipboard."
msgstr ""
-#: client/mapctrl_common.c:408
+#: client/mapctrl_common.c:425
msgid "Clipboard is empty."
msgstr ""
-#: client/options.c:98
+#: client/options.c:102
#, fuzzy
msgid "Graphics"
msgstr "äÅÍÏÇÒÁƦÑ"
-#: client/options.c:99
+#: client/options.c:103
#, fuzzy
msgid "Overview"
msgstr "ïÇÌÑÄ"
-#: client/options.c:100
+#: client/options.c:104
#, fuzzy
msgid "Sound"
msgstr "òÁÕÎÄÉ"
-#: client/options.c:101
+#: client/options.c:105
msgid "Interface"
msgstr ""
-#: client/options.c:102
+#: client/options.c:106
msgid "Network"
msgstr ""
-#: client/options.c:107
+#: client/options.c:111
#, fuzzy
msgid "Login name"
msgstr "ðÒɤ'ÄÎÁÔÉÓÑ ÄÏ ÇÒÉ"
-#: client/options.c:108
+#: client/options.c:112
msgid ""
"This is the default login username that will be used in the connection "
"dialogs or with the -a command-line parameter."
msgstr ""
-#: client/options.c:113
+#: client/options.c:117
#, fuzzy
msgid "Server"
msgstr "ΦËÏÌÉ"
-#: client/options.c:114
+#: client/options.c:118
msgid ""
"This is the default server hostname that will be used in the connection "
"dialogs or with the -a command-line parameter."
msgstr ""
-#: client/options.c:119
+#: client/options.c:123
#, fuzzy
msgid "Server port"
msgstr "(ÓÅÒ×ÅÒ)"
-#: client/options.c:120
+#: client/options.c:124
msgid ""
"This is the default server port that will be used in the connection dialogs "
"or with the -a command-line parameter."
msgstr ""
-#: client/options.c:125 client/gui-win32/connectdlg.c:912 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
msgid "Metaserver"
msgstr "íÅÔÁÓÅÒ×ÅÒÉ"
-#: client/options.c:126
+#: client/options.c:130
msgid ""
"The metaserver is a host that the client contacts to find out about games on "
"the internet. Don't change this from its default value unless you know what "
"you're doing."
msgstr ""
-#: client/options.c:132
+#: client/options.c:136
#, fuzzy
msgid "Soundset"
msgstr "òÁÕÎÄÉ"
-#: client/options.c:133
+#: client/options.c:137
msgid ""
"This is the soundset that will be used. Changing this is the same as using "
"the -S command-line parameter."
msgstr ""
-#: client/options.c:138
+#: client/options.c:142
#, fuzzy
msgid "Sound plugin"
msgstr "ú×ÕËÏ×ÉÊ ÄÏÄÁÔÏË ÐÏ ÚÁÍÏ×ÞÕ×ÁÎÎÀ"
-#: client/options.c:139
+#: client/options.c:143
msgid ""
"If you have a problem with sound, try changing the sound plugin. The new "
"plugin won't take effect until you restart Freeciv. Changing this is the "
"same as using the -P command-line option."
msgstr ""
-#: client/options.c:144 client/gui-sdl/gui_main.c:162
+#: client/options.c:148 client/gui-sdl/gui_main.c:162
#, fuzzy
msgid "Theme"
msgstr "ãÅÒË×Á"
-#: client/options.c:145
+#: client/options.c:149
msgid "By changing this option you change the active theme."
msgstr ""
-#: client/options.c:148
+#: client/options.c:152
#, fuzzy
msgid "Tileset"
msgstr "æÏÎ %s"
-#: client/options.c:149
+#: client/options.c:153
msgid ""
"By changing this option you change the active tileset. This is the same as "
"using the -t command-line parameter."
msgstr ""
-#: client/options.c:156
+#: client/options.c:160
msgid "Solid unit background color"
msgstr "úÁÐÏ×ÎÅÎÎÑ ÆÏÎÕ Ú'¤ÄÎÁÎÎÑ"
-#: client/options.c:157
+#: client/options.c:161
msgid ""
"Setting this option will cause units on the map view to be drawn with a "
"solid background color instead of the flag backdrop."
msgstr ""
-#: client/options.c:161 client/gui-sdl/optiondlg.c:960
+#: client/options.c:165 client/gui-sdl/optiondlg.c:960
msgid "Sound bell at new turn"
msgstr "ú×ÕË ÎÁ ÐÏÞÁÔËÕ ÈÏÄÕ"
-#: client/options.c:162
+#: client/options.c:166
msgid ""
"Set this option to have a \"bell\" event be generated at the start of a new "
"turn. You can control the behavior of the \"bell\" event by editing the "
"message options."
msgstr ""
-#: client/options.c:168
+#: client/options.c:172
msgid "Unit movement animation time (milliseconds)"
msgstr ""
-#: client/options.c:169
+#: client/options.c:173
msgid ""
"This option controls how long unit \"animation\" takes when a unit moves on "
"the map view. Set it to 0 to disable animation entirely."
msgstr ""
-#: client/options.c:174
+#: client/options.c:178
msgid "Mapview recentering time (milliseconds)"
msgstr ""
-#: client/options.c:175
+#: client/options.c:179
msgid ""
"When the map view is recentered, it will slide smoothly over the map to its "
"new position. This option controls how long this slide lasts. Set it to 0 "
"to disable mapview sliding entirely."
msgstr ""
-#: client/options.c:180 client/gui-sdl/optiondlg.c:1014
+#: client/options.c:184 client/gui-sdl/optiondlg.c:1014
msgid "Show combat animation"
msgstr "ðÏËÁÚÕ×ÁÔÉ ÁΦÍÁæÀ ÂÉÔ×."
-#: client/options.c:181
+#: client/options.c:185
msgid ""
"Disabling this option will turn off combat animation between units on the "
"mapview."
msgstr ""
-#: client/options.c:184
+#: client/options.c:188
msgid "Draw the citybar"
msgstr ""
-#: client/options.c:185
+#: client/options.c:189
msgid ""
"Setting this option will display a 'citybar' containing useful information "
"beneath each city. Disabling this option will display only the city's name "
"and optionally, production."
msgstr ""
-#: client/options.c:191
+#: client/options.c:195
msgid "Show icons in the technology tree"
msgstr ""
-#: client/options.c:192
+#: client/options.c:196
msgid ""
"Setting this option will display icons on the technology tree diagram. "
"Turning this option off makes the technology tree more compact."
msgstr ""
-#: client/options.c:197
+#: client/options.c:201
msgid "Draw shield graphics for units"
msgstr ""
-#: client/options.c:198
+#: client/options.c:202
msgid ""
"Setting this option will draw a shield icon as the flags on units. If "
"unset, the full flag will be drawn."
msgstr ""
-#: client/options.c:202
+#: client/options.c:206
msgid "Manual Turn Done in AI Mode"
msgstr "úÁ˦ÎÞÕ×ÁÔÉ È¦Ä ×ÒÕÞÎÕ Õ ËÏÍÐ'ÀÔÅÒÎÏÍÕ ÒÅÖÉͦ"
-#: client/options.c:203
+#: client/options.c:207
msgid ""
"Disable this option if you do not want to press the Turn Done button "
"manually when watching an AI player."
msgstr ""
-#: client/options.c:207 client/gui-sdl/optiondlg.c:1121
+#: client/options.c:211 client/gui-sdl/optiondlg.c:1121
msgid "Auto Center on Units"
msgstr "á×ÔÏÍÁÔÉÞÎÏ ÃÅÎÔÒÕ×ÁÔÉ Ð¦ÄÒÏÚĦÌÉ"
-#: client/options.c:208
+#: client/options.c:212
msgid ""
"Set this option to have the active unit centered automatically when the unit "
"focus changes."
msgstr ""
-#: client/options.c:211 client/gui-sdl/optiondlg.c:1147
+#: client/options.c:215 client/gui-sdl/optiondlg.c:1147
msgid "Auto Center on Combat"
msgstr "á×ÔÏÍÁÔÉÞÎÏ ÃÅÎÔÒÕ×ÁÔÉ ÂÉÔ×É"
-#: client/options.c:212
+#: client/options.c:216
msgid ""
"Set this option to have any combat be centered automatically. Disabled this "
"will speed up the time between turns but may cause you to miss combat "
"entirely."
msgstr ""
-#: client/options.c:217 client/gui-sdl/optiondlg.c:1174
+#: client/options.c:221 client/gui-sdl/optiondlg.c:1174
msgid "Focus on Awakened Units"
msgstr "æÏËÕÓÕ×ÁÔÉ ÎÁ ÁËÔÉ×Ï×ÁÎÉÈ Ð¦ÄÒÏÚĦÌÁÈ"
-#: client/options.c:218
+#: client/options.c:222
msgid "Set this option to have newly awoken units be focused automatically."
msgstr ""
-#: client/options.c:221
+#: client/options.c:225
msgid "Allow goto into the unknown"
msgstr ""
-#: client/options.c:222
+#: client/options.c:226
msgid ""
"Setting this option will make the game consider moving into unknown tiles. "
"If not, then goto routes will detour around or be blocked by unknown tiles."
msgstr ""
-#: client/options.c:226
+#: client/options.c:230
msgid "Center map when Popup city"
msgstr "ãÅÎÔÒÕ×ÁÔÉ ÍÁÐÕ ÐÒÉ ×¦ÄËÒÉÔÔ¦ ͦÓÔÁ"
-#: client/options.c:227
+#: client/options.c:231
msgid ""
"Setting this option makes the mapview center on a city when its city dialog "
"is popped up."
msgstr ""
-#: client/options.c:230
+#: client/options.c:234
msgid "Concise City Production"
msgstr "ú×¦Ô ÐÏ ×ÉÒÏÂÎÉÃÔ×Õ Õ Í¦ÓÔ¦"
-#: client/options.c:231
+#: client/options.c:235
msgid ""
"Set this option to make the city production (as shown in the city dialog) to "
"be more compact."
msgstr ""
-#: client/options.c:234 client/gui-sdl/optiondlg.c:1252
+#: client/options.c:238 client/gui-sdl/optiondlg.c:1252
msgid "End Turn when done moving"
msgstr "úÁ˦ÎÞÕ×ÁÔÉ È¦Ä ËÏÌÉ ÎÅÍÁ¤ ËÉÍ ÒÕÈÁÔÉÓØ"
-#: client/options.c:235
+#: client/options.c:239
msgid ""
"Setting this option makes your turn end automatically when all your units "
"are done moving."
msgstr ""
-#: client/options.c:238 client/gui-sdl/optiondlg.c:1226
+#: client/options.c:242 client/gui-sdl/optiondlg.c:1226
msgid "Prompt for city names"
msgstr "úÁÐÒÏÛÅÎÎÑ ÄÌÑ ÎÁÚ×É Í¦ÓÔÁ"
-#: client/options.c:239
+#: client/options.c:243
msgid ""
"Disabling this option will make the names of newly founded cities chosen "
"automatically by the server."
msgstr ""
-#: client/options.c:242 client/gui-sdl/optiondlg.c:1200
+#: client/options.c:246 client/gui-sdl/optiondlg.c:1200
msgid "Pop up city dialog for new cities"
msgstr "÷¦ÄËÒÉÔÉ ×¦ËÎÏ Í¦ÓÔÁ ÄÌÑ ÎÏ×ÏÇÏ Í¦ÓÔÁ"
-#: client/options.c:243
+#: client/options.c:247
msgid ""
"Setting this option will pop up a newly-founded city's city dialog "
"automatically."
msgstr ""
-#: client/options.c:248
+#: client/options.c:250
+#, fuzzy
+msgid "Pop up caravan actions"
+msgstr "ëÁÒÁ×ÁÎ"
+
+#: client/options.c:251
+msgid ""
+"If this option is enabled, when caravans arrive at a city where they can "
+"establish a traderoute or help build a wonder, a window will popup asking "
+"which action should be performed. Disabling this option means you will have "
+"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 ""
+
+#: client/options.c:260
+msgid "Enable cursor changing"
+msgstr ""
+
+#: client/options.c:261
+msgid ""
+"This option controls whether the client should try to change the mouse "
+"cursor depending on what is being pointed at, as well as to indicate changes "
+"in the client or server state."
+msgstr ""
+
+#: client/options.c:266
+msgid "Select cities before units"
+msgstr ""
+
+#: 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 ""
+
+#: client/options.c:272
+msgid "Clear unit orders on selection"
+msgstr ""
+
+#: client/options.c:273
+msgid ""
+"Enabling this option will cause unit orders to be cleared whenever one or "
+"more units are selected. If this option is disabled, selecting units will "
+"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 ""
+
+#: client/options.c:282
msgid "Background layer"
msgstr ""
-#: client/options.c:249
+#: client/options.c:283
msgid "The background layer of the overview shows just ocean and land."
msgstr ""
-#: client/options.c:252
+#: client/options.c:286
msgid "Terrain relief map layer"
msgstr ""
-#: client/options.c:253
+#: client/options.c:287
msgid "The relief layer shows all terrains on the map."
msgstr ""
-#: client/options.c:256
+#: client/options.c:290
#, fuzzy
msgid "Borders layer"
msgstr "âÏÅÒ"
-#: client/options.c:257
+#: client/options.c:291
msgid ""
"The borders layer of the overview shows which tiles are owned by each player."
msgstr ""
-#: client/options.c:261
+#: client/options.c:295
#, fuzzy
msgid "Units layer"
msgstr "óÔÏÒ¦ÎËÁ ЦÄÒÏÚĦ̦×"
-#: client/options.c:262
+#: client/options.c:296
#, fuzzy
msgid "Enabling this will draw units on the overview."
msgstr ""
"ñËÝÏ ÁËÔÉ×Ï×ÁÎÏ, ÎÁÚ×Á ͦÓÔÁ ÐÏ ÚÁÍÏ×ÞÕ×ÁÎÎÀ ÂÕÄÅ ÂÕÄÅ ×ÉÚÎÁÞÁÔÉÓÑ "
"צÄÐÏצÄÎÏ ÄÏ ÐÒÉÌÅÇÌÉÈ ÚÅÍÅÌØ."
-#: client/options.c:265
+#: client/options.c:299
#, fuzzy
msgid "Cities layer"
msgstr "í¦ÓÔÁ"
-#: client/options.c:266
+#: client/options.c:300
#, fuzzy
msgid "Enabling this will draw cities on the overview."
msgstr ""
"ñËÝÏ ÁËÔÉ×Ï×ÁÎÏ, ÎÁÚ×Á ͦÓÔÁ ÐÏ ÚÁÍÏ×ÞÕ×ÁÎÎÀ ÂÕÄÅ ÂÕÄÅ ×ÉÚÎÁÞÁÔÉÓÑ "
"צÄÐÏצÄÎÏ ÄÏ ÐÒÉÌÅÇÌÉÈ ÚÅÍÅÌØ."
-#: client/options.c:269
+#: client/options.c:303
#, fuzzy
msgid "Overview fog of war"
msgstr "óÔÏÒ¦ÎËÁ ÏÇÌÑÄÕ Í¦ÓÔÁ"
-#: client/options.c:270
+#: client/options.c:304
#, fuzzy
msgid "Enabling this will show fog of war on the overview."
msgstr ""
"ñËÝÏ ÁËÔÉ×Ï×ÁÎÏ, ÎÁÚ×Á ͦÓÔÁ ÐÏ ÚÁÍÏ×ÞÕ×ÁÎÎÀ ÂÕÄÅ ÂÕÄÅ ×ÉÚÎÁÞÁÔÉÓÑ "
"צÄÐÏצÄÎÏ ÄÏ ÐÒÉÌÅÇÌÉÈ ÚÅÍÅÌØ."
-#: client/options.c:488
+#: client/options.c:526
msgid "If you add a preset by hand, also update \"number_of_presets\""
msgstr ""
"ñËÝÏ ×É ÚͦÎÉÌÉ ÐÒÅÄÕÓÔÁÎÏ×ËÕ ×ÒÕÞÎÕ, ÔÁËÏÊ ÚͦÎÉÔØ 'number_of_presets'"
-#: client/options.c:516
+#: client/options.c:554
msgid "Cannot find your home directory"
msgstr "îÅ ÍÏÖÕ ÚÎÁÊÔÉ ÷ÁÛ ÄÏÍÁÛÎ¦Ê ËÁÔÁÌÏÇ"
-#: client/options.c:665 client/options.c:796
+#: client/options.c:703 client/options.c:834
msgid "Save failed, cannot find a filename."
msgstr "úÂÅÒÅÖÅÎÎÑ ÎÅ ×ÄÁÌÏÓÑ: ÎÅ ÍÏÖÕ ÚÎÁÊÔÉ ¦Í'Ñ ÆÁÊÌÕ"
-#: client/options.c:678 client/options.c:859
+#: client/options.c:716 client/options.c:897
#, c-format
msgid "Save failed, cannot write to file %s"
msgstr "úÂÅÒÅÖÅÎÎÑ ÎÅ ×ÄÁÌÏÓÑ: ÎÅ ÍÏÖÕ ÐÉÓÁÔÉ Õ ÆÁÊÌ %s"
-#: client/options.c:680 client/options.c:862
+#: client/options.c:718 client/options.c:900
#, c-format
msgid "Saved settings to file %s"
msgstr "úÂÅÒÅÖÅÎÏ ÏÐæ§ Õ ÆÁÊÌ %s"
@@ -9165,16 +9214,16 @@ msgstr "
msgid "Start of turn %d"
msgstr "ðÏÞÁÔÏË ÈÏÄÕ %d"
-#: client/packhand.c:1590
+#: client/packhand.c:1591
#, c-format
msgid "AI Mode is now %s."
msgstr "ëÏÍÐ'ÀÔÅÒΦ ÇÒÁ×æ ÔÅÐÅÒ %s."
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "ON"
msgstr "ôáë"
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "OFF"
msgstr "î¶"
@@ -9209,14 +9258,15 @@ msgid "Username"
msgstr "ðÅÒÅÊÍÅÎÕ×ÁÔÉ"
#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
-#: client/gui-gtk-2.0/pages.c:2085
+#: client/gui-gtk-2.0/pages.c:2157
msgid "Flag"
msgstr "æÌÁÇ"
#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
-#: client/gui-gtk-2.0/pages.c:1536 client/gui-gtk-2.0/pages.c:2087
-#: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
-#: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
+#: 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/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr "îÁæÑ"
@@ -9230,7 +9280,7 @@ msgstr "
msgid "Score"
msgstr "ïÔÒÉÍÁÔÉ ÒÁÈÕÎËÉ"
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
msgid "Team"
msgstr "ëÏÍÁÎÄÁ"
@@ -9305,237 +9355,259 @@ msgstr "
msgid "Could not open temp file."
msgstr "îÅ ÍÏÖÕ ×¦ÄËÒÉÔÉ \"%s\"."
-#: client/servers.c:407
+#: client/servers.c:410
#, fuzzy
msgid "Invalid $http_proxy or metaserver value, must start with 'http://'"
msgstr "ðÏÇÁÎÅ ÚÎÁÞÅÎÎÑ $http_proxy, ÐÏ×ÉÎÏ ÐÏÞÉÎÁÔÉÓÑ Ú 'http://'"
-#: client/servers.c:413
+#: client/servers.c:416
#, fuzzy
msgid "Failed looking up metaserver's host"
msgstr "îÅ ÍÏÖÕ ×ÉÚÎÁÞÉÔÉ ÈÏÓÔ."
-#: client/text.c:85 client/text.c:86 client/text.c:91
+#. TRANS: "AI <player name>"
+#: client/text.c:94
+#, c-format
+msgid "AI %s"
+msgstr ""
+
+#. TRANS: "<nation adjective>, team <team name>"
+#: client/text.c:118
+#, fuzzy, c-format
+msgid "%s, team %s"
+msgstr " ¦ÌÑ %s"
+
+#: client/text.c:135 client/text.c:136 client/text.c:141
#: client/gui-sdl/mapview.c:752
#, fuzzy
msgid "?nation:Neutral"
msgstr "?ÔÒÉ×Á̦ÓÔØ:ΦËÏÌÉ"
-#: client/text.c:85 client/gui-sdl/mapview.c:752
+#: client/text.c:135 client/gui-sdl/mapview.c:752
msgid "?nation:Hostile"
msgstr ""
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Peaceful"
msgstr ""
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Friendly"
msgstr ""
-#: client/text.c:88 client/gui-sdl/mapview.c:755
+#: client/text.c:138 client/gui-sdl/mapview.c:755
msgid "?nation:Mysterious"
msgstr ""
-#: client/text.c:88
+#: client/text.c:138
msgid "?nation:Friendly(team)"
msgstr ""
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
#, fuzzy
msgid "?city:Neutral"
msgstr "?ͦÓÔÏ:îÁÚ×Á"
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
#, fuzzy
msgid "?city:Hostile"
msgstr "?ͦÓÔÏ:îÁÚ×Á"
-#: client/text.c:92 client/gui-sdl/mapview.c:786
+#: client/text.c:142 client/gui-sdl/mapview.c:786
#, fuzzy
msgid "?city:Peaceful"
msgstr "?ÓÔÁÎ_ͦÓÔÁ:óÐÏ˦Ê"
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Friendly"
msgstr ""
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Mysterious"
msgstr ""
-#: client/text.c:93
+#: client/text.c:143
msgid "?city:Friendly(team)"
msgstr ""
-#: client/text.c:100
+#: client/text.c:151
#, c-format
msgid "Location: (%d, %d) [%d]"
msgstr "òÏÚͦÝÅÎÎÑ: (%d, %d) [%d]"
-#: client/text.c:109
+#: client/text.c:153
+#, fuzzy, c-format
+msgid "Native coordinates: (%d, %d)"
+msgstr "òÏÚͦÝÅÎÎÑ: (%d, %d)"
+
+#: client/text.c:160
#, c-format
msgid "Terrain: %s"
msgstr "ôÅÒÉÔÏÒ¦Ñ: %s"
-#: client/text.c:110
+#: client/text.c:161
#, c-format
msgid "Food/Prod/Trade: %s"
msgstr "·ÖÁ/÷ÉÒÏÂÎÉÃÔ×Ï/ðÒÉÂÕÔÏË: %s"
-#: client/text.c:113
+#: client/text.c:164
msgid "Minor Tribe Village"
msgstr "èÕÔ¦Ò ÍÁÌÅÎØËÏÇÏ ÒÏÄÕ"
-#: client/text.c:119
+#: client/text.c:173
#, fuzzy
msgid "Our territory"
msgstr "%s"
-#. TRANS: "Polish territory"
-#: client/text.c:122
+#. TRANS: "Territory of <username> (<nation + team>)"
+#: client/text.c:176
#, fuzzy, c-format
-msgid "%s territory"
-msgstr "%s"
+msgid "Territory of %s (%s)"
+msgstr "%s Ú %s"
-#. TRANS: "Polish territory (5 turn cease-fire)"
-#: client/text.c:131
+#: client/text.c:186
#, fuzzy, c-format
-msgid "%s territory (%d turn cease-fire)"
-msgid_plural "%s territory (%d turn cease-fire)"
+msgid "Territory of %s (%s) (%d turn cease-fire)"
+msgid_plural "Territory of %s (%s) (%d turn cease-fire)"
msgstr[0] "ð¦ÄÒÏÚĦÌ: %s(%s%s)"
msgstr[1] "ð¦ÄÒÏÚĦÌ: %s(%s%s)"
msgstr[2] "ð¦ÄÒÏÚĦÌ: %s(%s%s)"
-#. TRANS: "Polish territory (friendly)"
-#: client/text.c:140
+#. TRANS: "Territory of <username>
+#. * (<nation + team> | <diplomatic state>)"
+#: client/text.c:195
#, fuzzy, c-format
-msgid "%s territory (%s)"
+msgid "Territory of %s (%s | %s)"
msgstr "%s Ú %s"
-#: client/text.c:145
+#: client/text.c:200
msgid "Unclaimed territory"
msgstr ""
-#. TRANS: "City: Warsaw (Polish)"
-#: client/text.c:156
+#. TRANS: "City: <city name> | <username> (<nation + team>)"
+#: client/text.c:214
#, fuzzy, c-format
-msgid "City: %s (%s)"
-msgstr "í¦ÓÔÏ: %s(%s)"
+msgid "City: %s | %s (%s)"
+msgstr "í¦ÓÔÏ: %s(%s) %s"
-#. TRANS: "City: Warsaw (Polish, 5 turn cease-fire)"
-#: client/text.c:166
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <number> turn cease-fire)"
+#: client/text.c:224
#, fuzzy, c-format
-msgid "City: %s (%s, %d turn cease-fire)"
-msgid_plural "City: %s (%s, %d turn cease-fire)"
+msgid "City: %s | %s (%s, %d turn cease-fire)"
+msgid_plural "City: %s | %s (%s, %d turn cease-fire)"
msgstr[0] "ð¦ÄÒÏÚĦÌ: %s(%s%s)"
msgstr[1] "ð¦ÄÒÏÚĦÌ: %s(%s%s)"
msgstr[2] "ð¦ÄÒÏÚĦÌ: %s(%s%s)"
-#. TRANS: "City: Warsaw (Polish,friendly)"
-#: client/text.c:174
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <diplomatic state>)"
+#: client/text.c:231
#, fuzzy, c-format
-msgid "City: %s (%s, %s)"
+msgid "City: %s | %s (%s, %s)"
msgstr "í¦ÓÔÏ: %s(%s) %s"
#. TRANS: previous lines gave other information about the city.
-#: client/text.c:189
+#: client/text.c:246
#, fuzzy, c-format
msgid "?clistbegin: with %s"
msgstr " Ú %s"
#. TRANS: "Trade from Warsaw: 5"
-#: client/text.c:202
+#: client/text.c:259
#, fuzzy, c-format
msgid "Trade from %s: %d"
msgstr "ÄÁÌÅËÏ ×¦Ä %s"
-#: client/text.c:210
+#: client/text.c:267
#, fuzzy, c-format
msgid "Infrastructure: %s"
msgstr "¶ÆÒÁÓÔÒÕËÔÕÒÁ:"
-#: client/text.c:215
+#: client/text.c:272
#, fuzzy, c-format
msgid "Activity: %s"
msgstr "áËÔÉ×ΦÓÔØ:"
-#. TRANS: "Unit: Musketeers (Polish, Warsaw)"
-#. TRANS: "Unit: Musketeers (Polish,friendly)"
-#: client/text.c:226 client/text.c:253
+#. TRANS: "Unit: <unit type> | <username>
+#. * (<nation + team>, <homecity>)"
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <diplomatic state>)"
+#: client/text.c:287 client/text.c:313
#, fuzzy, c-format
-msgid "Unit: %s (%s, %s)"
+msgid "Unit: %s | %s (%s, %s)"
msgstr "ð¦ÄÒÏÚĦÌ: %s(%s%s)"
-#. TRANS: "Unit: Musketeers (Polish)"
-#: client/text.c:232
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>)"
+#: client/text.c:292
#, fuzzy, c-format
-msgid "Unit: %s (%s)"
-msgstr "ð¦ÄÒÏÚĦÌ: %s(%s)"
+msgid "Unit: %s | %s (%s)"
+msgstr "ð¦ÄÒÏÚĦÌ: %s(%s%s)"
-#. TRANS: "Unit: Musketeers (Polish, 5 turn cease-fire)"
-#: client/text.c:245
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <number> turn cease-fire)"
+#: client/text.c:305
#, fuzzy, c-format
-msgid "Unit: %s (%s, %d turn cease-fire)"
-msgid_plural "Unit: %s (%s, %d turn cease-fire)"
+msgid "Unit: %s | %s (%s, %d turn cease-fire)"
+msgid_plural "Unit: %s | %s (%s, %d turn cease-fire)"
msgstr[0] "ð¦ÄÒÏÚĦÌ: %s(%s%s)"
msgstr[1] "ð¦ÄÒÏÚĦÌ: %s(%s%s)"
msgstr[2] "ð¦ÄÒÏÚĦÌ: %s(%s%s)"
#. TRANS: "Chance to win: A:95% D:46%"
-#: client/text.c:279
+#: client/text.c:338
#, c-format
msgid "Chance to win: A:%d%% D:%d%%"
msgstr "ûÁÎÓ¦× ÎÁ ×ÉÇÒÁÛ: á:%d%% ú:%d%%"
#. TRANS: A is attack power, D is defense power, FP is firepower,
#. * HP is hitpoints (current and max).
-#: client/text.c:286
+#: client/text.c:345
#, fuzzy, c-format
msgid "A:%d D:%d FP:%d HP:%d/%d (%s)"
msgstr "á:%d ú:%d ó÷:%d ú:%d/%d%s%s"
#. TRANS: "5 more" units on this tile
-#: client/text.c:295
+#: client/text.c:354
#, c-format
msgid " (%d more)"
msgstr " (%d ¦ÌØÛÅ)"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:364
+#: client/text.c:423
#, c-format
msgid "far from %s"
msgstr "ÄÁÌÅËÏ ×¦Ä %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:367
+#: client/text.c:426
#, c-format
msgid "near %s"
msgstr "¦ÌÑ %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:370
+#: client/text.c:429
#, c-format
msgid "in %s"
msgstr "Õ %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:403
+#: client/text.c:462
#, c-format
msgid "from %s"
msgstr "Ú %s"
-#: client/text.c:466
+#: client/text.c:525
#, fuzzy
msgid "Progress: no research"
msgstr "òÁÈÕÎËÉ:"
-#: client/text.c:470
+#: client/text.c:529
#, fuzzy
msgid "Progress: no research target"
msgstr "òÁÈÕÎËÉ:"
-#: client/text.c:475
+#: client/text.c:534
#, fuzzy, c-format
msgid "Progress: %d turn/advance"
msgid_plural "Progress: %d turns/advance"
@@ -9543,7 +9615,7 @@ msgstr[0] "
msgstr[1] "û×ÉÄ˦ÓÔØ ÄÏÓ̦ÄÖÅÎØ: %d ÈÏÄÉ ÎÁ ÔÅÈÎÏÌÏǦÀ"
msgstr[2] "û×ÉÄ˦ÓÔØ ÄÏÓ̦ÄÖÅÎØ: %d ÈÏÄ¦× ÎÁ ÔÅÈÎÏÌÏǦÀ"
-#: client/text.c:480
+#: client/text.c:539
#, fuzzy, c-format
msgid "%d bulb/turn"
msgid_plural "%d bulbs/turn"
@@ -9551,7 +9623,7 @@ msgstr[0] "%d Ȧ
msgstr[1] "%d ÈÏÄÉ"
msgstr[2] "%d ÈÏĦ×"
-#: client/text.c:485
+#: client/text.c:544
#, c-format
msgid ", %d bulb/turn from team"
msgid_plural ", %d bulbs/turn from team"
@@ -9559,12 +9631,12 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: client/text.c:512
+#: client/text.c:571
#, fuzzy, c-format
msgid "%d/- (never)"
msgstr "(î¦ËÏÌÉ)"
-#: client/text.c:524
+#: client/text.c:583
#, fuzzy, c-format
msgid "%d/%d (%d turn)"
msgid_plural "%d/%d (%d turns)"
@@ -9572,12 +9644,12 @@ msgstr[0] "%d/%d %d
msgstr[1] "%d/%d %d ÈÏĦ×"
msgstr[2] "%d/%d %d ÈÏĦ×"
-#: client/text.c:527
+#: client/text.c:586
#, fuzzy, c-format
msgid "%d/%d (never)"
msgstr "(î¦ËÏÌÉ)"
-#: client/text.c:564
+#: client/text.c:623
#, fuzzy, c-format
msgid "%d step"
msgid_plural "%d steps"
@@ -9585,7 +9657,7 @@ msgstr[0] "(%d
msgstr[1] "(%d ÛÁÇÉ)"
msgstr[2] "(%d ÛÁǦ×)"
-#: client/text.c:566
+#: client/text.c:625
#, c-format
msgid "%d bulb"
msgid_plural "%d bulbs"
@@ -9593,7 +9665,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: client/text.c:570 client/agents/cma_fec.c:269 client/agents/cma_fec.c:313
+#: 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
#, c-format
msgid "%d turn"
@@ -9602,89 +9674,89 @@ msgstr[0] "%d Ȧ
msgstr[1] "%d ÈÏÄÉ"
msgstr[2] "%d ÈÏĦ×"
-#: client/text.c:592
+#: client/text.c:651
#, c-format
msgid "Population: %s"
msgstr "îÁÓÅÌÅÎÎÑ: %s"
-#: client/text.c:595
+#: client/text.c:654
#, fuzzy, c-format
msgid "Year: %s (T%d)"
msgstr "ò¦Ë: %s"
-#: client/text.c:598
+#: client/text.c:657
#, fuzzy, c-format
msgid "Gold: %d (%+d)"
msgstr "çÒÏÛÅÊ: %d"
-#: client/text.c:600
+#: client/text.c:659
#, fuzzy, c-format
msgid "Tax: %d Lux: %d Sci: %d"
msgstr "ðÏÄÁÔËÉ:%d òÏÚ˦Û:%d îÁÕËÁ:%d"
-#: client/text.c:607
+#: client/text.c:666
#, fuzzy
msgid "Moving: Nobody"
msgstr "Õ %s"
-#: client/text.c:609
+#: client/text.c:668
#, fuzzy, c-format
msgid "Moving: %s"
msgstr "Õ %s"
-#: client/text.c:613
+#: client/text.c:672
msgid "(Click for more info)"
msgstr ""
-#: client/text.c:629
+#: client/text.c:688
#, fuzzy, c-format
msgid "%s People"
msgstr "%s ìÁÓËÁ×Ï ÐÒÏÓÉÍÏ"
-#: client/text.c:633
+#: client/text.c:692
#, fuzzy, c-format
msgid "Turn: %d"
msgstr "ôÅÒÉÔÏÒ¦Ñ: %s"
-#: client/text.c:635 client/gui-win32/inteldlg.c:111
+#: client/text.c:694 client/gui-win32/inteldlg.c:111
#: client/gui-xaw/inteldlg.c:208
#, c-format
msgid "Gold: %d"
msgstr "çÒÏÛÅÊ: %d"
-#: client/text.c:636
+#: client/text.c:695
#, c-format
msgid "Net Income: %d"
msgstr ""
#. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:639
+#: client/text.c:698
#, fuzzy, c-format
msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
msgstr "ðÏÄÁÔËÉ:%d òÏÚ˦Û:%d îÁÕËÁ:%d"
-#: client/text.c:643
+#: client/text.c:702
#, fuzzy, c-format
msgid "Researching %s: %s"
msgstr "äÏÓ̦ÄÖÕ¤ÔØÓÑ %s: %d/%d"
-#: client/text.c:650
+#: client/text.c:709
#, c-format
msgid "Global warming chance: %d%% (%+d%%/turn)"
msgstr ""
-#: client/text.c:653
+#: client/text.c:712
#, c-format
msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
msgstr ""
-#: client/text.c:658 client/gui-win32/inteldlg.c:104
+#: client/text.c:717 client/gui-win32/inteldlg.c:104
#: client/gui-xaw/inteldlg.c:200
#, c-format
msgid "Government: %s"
msgstr "ëÅÒ¦×ÎÉÃÔ×Ï: %s"
-#: client/text.c:682
+#: client/text.c:741
#, fuzzy, c-format
msgid "%d unit"
msgid_plural "%d units"
@@ -9693,21 +9765,21 @@ msgstr[1] "
msgstr[2] " ÚÁǦÎ"
#. TRANS: Impossible to reach goto target tile
-#: client/text.c:715 client/gui-sdl/mapview.c:566
+#: client/text.c:774 client/gui-sdl/mapview.c:566
msgid "?goto:Unreachable"
msgstr ""
-#: client/text.c:717 client/gui-sdl/mapview.c:568
+#: client/text.c:776 client/gui-sdl/mapview.c:568
#, c-format
msgid "Turns to target: %d"
msgstr ""
-#: client/text.c:719 client/gui-sdl/mapview.c:570
+#: client/text.c:778 client/gui-sdl/mapview.c:570
#, c-format
msgid "Turns to target: %d to %d"
msgstr ""
-#: client/text.c:725 client/gui-sdl/mapview.c:576
+#: client/text.c:784 client/gui-sdl/mapview.c:576
#, fuzzy, c-format
msgid "%d unit selected"
msgid_plural "%d units selected"
@@ -9715,37 +9787,37 @@ msgstr[0] "
msgstr[1] "÷ÉÂ¦Ò Ð¦ÄÒÏÚĦÌÕ"
msgstr[2] "÷ÉÂ¦Ò Ð¦ÄÒÏÚĦÌÕ"
-#: client/text.c:730 client/gui-sdl/mapview.c:581
+#: client/text.c:789 client/gui-sdl/mapview.c:581
#, fuzzy
msgid "No units selected."
msgstr "ïÂÒÁÎÏ ÎÁæÀ"
-#: client/text.c:804 client/gui-sdl/mapview.c:654
+#: client/text.c:863 client/gui-sdl/mapview.c:654
#, c-format
msgid "Others: %d civil; %d military"
msgstr ""
-#: client/text.c:806 client/gui-sdl/mapview.c:656
+#: client/text.c:865 client/gui-sdl/mapview.c:656
#, c-format
msgid "Others: %d civilian"
msgstr ""
-#: client/text.c:808 client/gui-sdl/mapview.c:658
+#: client/text.c:867 client/gui-sdl/mapview.c:658
#, c-format
msgid "Others: %d military"
msgstr ""
-#: client/text.c:839
+#: client/text.c:898
#, fuzzy
msgid "No units to upgrade!"
msgstr "îÅ ÍÁ¤ ЦÄÒÏÚÄ¦Ì¦× ÄÌÑ ÍÏÄÅÒΦÚÁæ§."
-#: client/text.c:864
+#: client/text.c:923
#, fuzzy
msgid "None of these units may be upgraded."
msgstr "îÅ ÍÁ¤ ЦÄÒÏÚÄ¦Ì¦× ÄÌÑ ÍÏÄÅÒΦÚÁæ§."
-#: client/text.c:870
+#: client/text.c:929
#, fuzzy, c-format
msgid ""
"Upgrade %d unit for %d gold?\n"
@@ -9763,14 +9835,14 @@ msgstr[2] ""
"íÏÄÅÒΦÚÕ×ÁÔÉ %s ÄÏ %s ÚÁ %d ÇÒÉ×ÅÎØ?\n"
"âÀÄÖÅÔ ÎÁ̦ÞÕ¤ %d ÇÒÉ×ÅÎØ."
-#: client/text.c:891
+#: client/text.c:950
#, fuzzy
msgid "Shows your progress in researching the current technology."
msgstr ""
"äÅÍÏÎÓÔÒÕ¤ ÐÒÏÇÒÅÓ Õ ×É×ÞÅÎΦ ÎÏ×ÉÈ ÔÅÈÎÏÌÏǦÊ.\n"
"%s: %d/%d."
-#: client/text.c:897
+#: client/text.c:956
#, fuzzy
msgid "no research target."
msgstr ""
@@ -9778,46 +9850,46 @@ msgstr ""
"(ÎÅÍÁ¤ ÄÏÓ̦ÄÖÅÎØ)"
#. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:900
+#: client/text.c:959
#, c-format
msgid "%s: %d/%d."
msgstr ""
-#: client/text.c:920
+#: client/text.c:979
#, fuzzy
msgid "Shows the progress of global warming:"
msgstr ""
"äÅÍÏÎÓÔÒÕ¤ ÒÏÚ×ÉÔÏË ÇÌÏÂÁÌØÎÏÇÏ ÐÏÔÅÐ̦ÎÎÑ:\n"
"%d."
-#: client/text.c:921
+#: client/text.c:980
#, fuzzy, c-format
msgid "Pollution rate: %d%%"
msgstr "úÁÂÒÕÄÎÅÎÎÑ: %3d"
-#: client/text.c:923
+#: client/text.c:982
#, c-format
msgid "Chance of catastrophic warming each turn: %d%%"
msgstr ""
-#: client/text.c:939
+#: client/text.c:998
#, fuzzy
msgid "Shows the progress of nuclear winter:"
msgstr ""
"äÅÍÏÎÓÔÒÕ¤ ÒÏÚ×ÉÔÏË ÒÁĦÁæÊÎϧ ÚÉÍÉ:\n"
"%d."
-#: client/text.c:940
+#: client/text.c:999
#, fuzzy, c-format
msgid "Fallout rate: %d%%"
msgstr "%s ÍÁËÓÉÍÁÌØÎÉÊ Ò¦×ÅÎØ: %d%%"
-#: client/text.c:942
+#: client/text.c:1001
#, c-format
msgid "Chance of catastrophic winter each turn: %d%%"
msgstr ""
-#: client/text.c:957
+#: client/text.c:1016
#, fuzzy
msgid "Shows your current government:"
msgstr ""
@@ -9825,25 +9897,25 @@ msgstr ""
"%s."
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:981
+#: client/text.c:1040
#, fuzzy, c-format
msgid "Population: %5d"
msgstr "îÁÓÅÌÅÎÎÑ: %s"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:1043
#, c-format
msgid "Support: %5d %%"
msgstr ""
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:1047
#, fuzzy, c-format
msgid "Energy: %5d %%"
msgstr "íÁÓÁ: %5d ÔÏÎÁ"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:992
+#: client/text.c:1051
#, c-format
msgid "Mass: %5d ton"
msgid_plural "Mass: %5d tons"
@@ -9852,96 +9924,97 @@ msgstr[1] "
msgstr[2] "íÁÓÁ: %5d ÔÏÎ"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1057
#, c-format
msgid "Travel time: %5.1f years"
msgstr "þÁÓ ÐÅÒÅÌØÏÔÕ: %5.1f ÒÏ˦×"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1061
msgid "Travel time: N/A "
msgstr "þÁÓ ÐÅÒÅÌØÏÔÕ: ÎÅצÄÏÍÉÊ"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1065
#, c-format
msgid "Success prob.: %5d %%"
msgstr ""
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1010
+#: client/text.c:1069
#, c-format
msgid "Year of arrival: %8s"
msgstr ""
-#: client/text.c:1030
+#: client/text.c:1089
msgid "?timeout:off"
msgstr "?ÔÁÊÍÁÕÔ:Φ"
-#: client/text.c:1054
+#: client/text.c:1113
#, c-format
msgid "?seconds:%02ds"
msgstr "?ÓÅËÕÎÄ:%02dÓ"
-#: client/text.c:1056
+#: client/text.c:1115
#, c-format
msgid "?mins/secs:%02dm %02ds"
msgstr "?È×/ÓÅË:%02dÈ %02dÓ"
-#: client/text.c:1058
+#: client/text.c:1117
#, c-format
msgid "?hrs/mns:%02dh %02dm"
msgstr "?ÞÁÓ¦×/È×:%02dÞ %02dÈ"
-#: client/text.c:1060
+#: client/text.c:1119
#, c-format
msgid "?dys/hrs:%02dd %02dh"
msgstr "?ÄΦ×/ÞÁÓ¦×:%02dÄ %02dÞ"
-#: client/text.c:1063
+#: client/text.c:1122
msgid "?duration:overflow"
msgstr "?ÔÒÉ×Á̦ÓÔØ:ΦËÏÌÉ"
-#: client/text.c:1084
+#: client/text.c:1143
#, c-format
msgid "%6d.%02d ms"
msgstr "%6d.%02d ÍÓ"
-#. TRANS: "Republic of the Poles"
-#: client/text.c:1127
+#. TRANS: <nation adjective> <government name>.
+#. * E.g. "Polish Republic".
+#: client/text.c:1188
#, fuzzy, c-format
-msgid "%s of the %s"
-msgstr "%s Ú %s"
+msgid "?nationgovernment:%s %s"
+msgstr "ëÅÒ¦×ÎÉÃÔ×Ï: %s"
#. TRANS: "Observer: 1985"
-#: client/text.c:1137
+#: client/text.c:1198
#, fuzzy, c-format
msgid "Observer: %s"
msgstr " (ÓÐÏÓÔÅÒ¦ÇÁÞ)"
-#: client/text.c:1155
+#: client/text.c:1216
msgid "Buildings: "
msgstr "âÕĦ×̦:"
-#: client/text.c:1172 client/text.c:1211
+#: client/text.c:1233 client/text.c:1272
msgid "None. "
msgstr "î¦ÞÏÇÏ"
-#: client/text.c:1174 client/text.c:1213
+#: client/text.c:1235 client/text.c:1274
msgid "?clistend:."
msgstr "?blistend:"
-#: client/text.c:1192
+#: client/text.c:1253
msgid "Wonders: "
msgstr "äÉ×Á: "
-#: client/text.c:1247
+#: client/text.c:1308
#, 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:1251
+#: client/text.c:1312
#, fuzzy, c-format
msgid "%d content before penalty."
msgid_plural "%d content before penalty."
@@ -9950,7 +10023,7 @@ msgstr[1] "%d
msgstr[2] "%d ÎÅÊÔÒÁÌØÎÉÈ ÄÏ ÛÔÒÁÆÕ "
#. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1257
+#: client/text.c:1318
#, fuzzy, c-format
msgid "%d additional unhappy citizen."
msgid_plural "%d additional unhappy citizens."
@@ -9958,39 +10031,39 @@ msgstr[0] "%d
msgstr[1] "%d ÄÏÄÁÔËÏ×ÉÈ ÎÅÝÁÓÎÉÈ ÇÏÒÏÄÑÎ."
msgstr[2] "%d ÄÏÄÁÔËÏ×ÉÈ ÎÅÝÁÓÎÉÈ ÇÏÒÏÄÑÎ."
-#. TRANS: Martial law opening parenthesis
-#: client/text.c:1279
-msgid "Martial law in effect ("
+#: client/text.c:1339
+#, fuzzy
+msgid "Unlimited martial law in effect."
msgstr "䦤 צÊÓØËÏ×ÉÊ ÓÔÁÎ ("
-#. TRANS: no [unit] maximum
-#: client/text.c:1284
-msgid "no maximum, "
-msgstr "ÎÅ ÍÁËÓ¦ÍÕÍ, "
-
-#: client/text.c:1287
-#, c-format
-msgid "%d unit maximum, "
-msgid_plural "%d units maximum, "
-msgstr[0] "%d ЦÄÒÏÚÄ¦Ì ÍÁËÓÉÍÕÍ, "
-msgstr[1] "%d ЦÄÒÏÚĦÌÉ ÍÁËÓÉÍÕÍ, "
-msgstr[2] "%d ЦÄÒÏÚÄ¦Ì¦× ÍÁËÓÉÍÕÍ, "
+#: client/text.c:1341
+#, 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"
+msgstr[2] ""
+"* îŠצÊÓØËÏ×ÉÊ Ð¦ÄÒÏÚÄ¦Ì (ÎÅÍÏÖÅ ÁÔÁËÕ×ÁÔÉ; ÎÅÍÁ¤ צÊÓØËÏ×ÏÇÏ ÐÏÌÏÖÅÎÎÑ).\n"
-#. TRANS: Martial law closing parenthesis
-#: client/text.c:1294
-#, c-format
-msgid "%d per unit). "
-msgstr "%d ÎÁ ЦÄÒÏÚĦÌ). "
+#: client/text.c:1345
+#, 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 ÎÅÚÁÄÏ×ÏÌÅÎÉÈ Õ Í¦ÓÔ¦."
+msgstr[1] "òÏÚ×ÁÖÁ¤ ÇÏÒÏÄÑÎ, ÎÅÊÔÒÁ̦ÚÕ¤ 3 ÎÅÚÁÄÏ×ÏÌÅÎÉÈ Õ Í¦ÓÔ¦."
+msgstr[2] "òÏÚ×ÁÖÁ¤ ÇÏÒÏÄÑÎ, ÎÅÊÔÒÁ̦ÚÕ¤ 3 ÎÅÚÁÄÏ×ÏÌÅÎÉÈ Õ Í¦ÓÔ¦."
-#: client/text.c:1298
+#: client/text.c:1352
msgid "Military units in the field may cause unhappiness. "
msgstr "÷¦ÊÓØËÏצ ЦÄÒÏÚĦÌÉ Õ ÐÏ̦ ÍÏÖÕÔØ ÓÐÒÉÞÉÎÉÔÉ ÎÅÝÁÓÔÑ."
-#: client/text.c:1301
+#: client/text.c:1355
msgid "Military units have no happiness effect. "
msgstr "÷¦ÊÓØËÏצ ЦÄÒÏÚĦÌÉ ÎÅ ×ÐÌÉ×ÁÀÔØ ÎÁ ÝÁÓÔÑ."
-#: client/text.c:1316
+#: client/text.c:1370
#, c-format
msgid "Luxury: %d total."
msgstr "òÏÚ˦Û: %d ÚÁÇÁÌÏÍ."
@@ -10011,7 +10084,7 @@ msgid ""
"instead."
msgstr "ë̦¤ÎÔ ÎŠЦÄÔÒÉÍÕ¤ ÇÏÒ¦ÛΦ ÆÏÎÉ. ÷ÉËÏÒÉÓÔÏ×ÕÀ ÆÏÎÉ ÐÏ ÚÁÍÏ×ÞÕ×ÁÎÎÀ."
-#: client/tilespec.c:3968
+#: client/tilespec.c:3966
#, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
@@ -10032,12 +10105,12 @@ msgid ""
"have a look."
msgstr ""
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
-#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:599
+#: client/gui-gtk-2.0/cityrep.c:624 client/gui-sdl/citydlg.c:2009
msgid "none"
msgstr "ÎÅÍÁ¤"
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:645
msgid "custom"
msgstr "ÏÂÒÁÎÅ"
@@ -10351,7 +10424,7 @@ msgstr "
msgid "Enter Marketplace"
msgstr "òÉÎÏË"
-#: client/gui-gtk-2.0/chatline.c:144 client/gui-win32/chatline.c:134
+#: client/gui-gtk-2.0/chatline.c:218 client/gui-win32/chatline.c:134
#: client/gui-xaw/chatline.c:120
msgid "Cleared output window."
msgstr "ïÞÉÝÅÎÏ ×¦ËÎÏ ×É×ÏÄÕ"
@@ -10433,11 +10506,11 @@ msgid "%d/%d %d turns"
msgstr "%d/%d %d ÈÏĦ×"
#: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:821
+#: client/gui-gtk-2.0/cityrep.c:1027
msgid "_Buy"
msgstr "ëÕÐÉÔÉ"
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:869
#, fuzzy
msgid "_Production"
msgstr "÷ÉÒÏÂÎÉÃÔ×Ï"
@@ -10461,12 +10534,12 @@ msgid "Entertainers"
msgstr "ûÏÕÍÅÎÉ"
#: client/gui-gtk-2.0/citydlg.c:1029 client/gui-win32/citydlg.c:1989
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2403
msgid "Scientists"
msgstr "îÁÕËÏ×æ"
#: client/gui-gtk-2.0/citydlg.c:1030 client/gui-win32/citydlg.c:1991
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2404
msgid "Taxmen"
msgstr "ðÏÄÁÔ˦×æ"
@@ -10560,7 +10633,7 @@ msgstr "
msgid "Present units %d"
msgstr "ðÒÉÓÕÔΦ ЦÄÒÏÚĦÌÉ %d"
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:1019
msgid "Cen_ter"
msgstr "ãÅÎÔÒ"
@@ -10652,35 +10725,65 @@ msgstr "
msgid "What should we rename the city to?"
msgstr "ñËÁ ÎÏ×Á ÎÁÚ×Á ͦÓÔÁ?"
-#: client/gui-gtk-2.0/cityrep.c:699
+#: client/gui-gtk-2.0/cityrep.c:794
+#, fuzzy
+msgid "(no worklists defined)"
+msgstr "(ÐÌÁÎ ÂÕĦ×ÎÉÃÔ×Á)"
+
+#: client/gui-gtk-2.0/cityrep.c:876
msgid "Chan_ge"
msgstr "úͦÎÉÔÉ"
-#: client/gui-gtk-2.0/cityrep.c:703
+#: client/gui-gtk-2.0/cityrep.c:880
#, fuzzy
msgid "Add _First"
msgstr "äÏÄÁÔÉ ÐÒÅÄÕÓÔÁÎÏ×ËÕ"
-#: client/gui-gtk-2.0/cityrep.c:707
+#: client/gui-gtk-2.0/cityrep.c:884
#, fuzzy
msgid "Add _Next"
msgstr "äÏÄÁÔÉ ÐÒÅÄÕÓÔÁÎÏ×ËÕ"
-#: client/gui-gtk-2.0/cityrep.c:711
+#: client/gui-gtk-2.0/cityrep.c:888
+#, fuzzy
+msgid "Add _2nd Last"
+msgstr "äÏÄÁÔÉ ÐÒÅÄÕÓÔÁÎÏ×ËÕ"
+
+#: client/gui-gtk-2.0/cityrep.c:892
#, fuzzy
msgid "Add _Last"
msgstr "äÏÄÁÔÉ ÐÒÅÄÕÓÔÁÎÏ×ËÕ"
-#: client/gui-gtk-2.0/cityrep.c:715
+#: client/gui-gtk-2.0/cityrep.c:899
+#, fuzzy
+msgid "Set Worklist"
+msgstr "ðÌÁÎ ÂÕĦ×ÎÉÃÔ×Á"
+
+#: client/gui-gtk-2.0/cityrep.c:905
+#, fuzzy
+msgid "Append Worklist"
+msgstr "ðÅÒÅÊÍÅÎÕ×ÁÔÉ ÐÌÁÎ ÂÕĦ×ÎÉÃÔ×Á"
+
+#: client/gui-gtk-2.0/cityrep.c:911
+#, fuzzy
+msgid "Clear _Worklist"
+msgstr "ðÌÁÎ ÂÕĦ×ÎÉÃÔ×Á:"
+
+#: client/gui-gtk-2.0/cityrep.c:916
+#, fuzzy
+msgid "Gover_nor"
+msgstr "ëÅÒ¦×ÎÉÃÔ×Ï"
+
+#: client/gui-gtk-2.0/cityrep.c:921
msgid "_Select"
msgstr "ïÂÅÒ¦ÔØ"
-#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
+#: client/gui-gtk-2.0/cityrep.c:925 client/gui-gtk-2.0/plrdlg.c:521
#, fuzzy
msgid "_Display"
msgstr "ðÏËÁÚÁÔÉ"
-#: client/gui-gtk-2.0/cityrep.c:800 client/gui-gtk-2.0/menu.c:808
+#: 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-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
#: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -10690,101 +10793,101 @@ msgstr "
msgid "Cities"
msgstr "í¦ÓÔÁ"
-#: client/gui-gtk-2.0/cityrep.c:817
+#: client/gui-gtk-2.0/cityrep.c:1023
#, fuzzy
msgid "_Inspect"
msgstr "ðÏËÁÚÁÔÉ"
-#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
-#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-sdl/helpdlg.c:297 client/gui-win32/menu.c:342
-#: client/gui-xaw/menu.c:241
+#: 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
+#: client/gui-gtk-2.0/cityrep.c:1518 client/gui-gtk-2.0/menu.c:823
+#: client/gui-gtk-2.0/menu.c:825 client/gui-gtk-2.0/menu.c:827
+#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:831
+#: client/gui-gtk-2.0/menu.c:833 client/gui-sdl/helpdlg.c:297
+#: client/gui-win32/menu.c:342 client/gui-xaw/menu.c:241
msgid "Improvements"
msgstr "âÕĦ×̦"
-#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
-#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
-#: client/gui-xaw/menu.c:247
+#: client/gui-gtk-2.0/cityrep.c:1441 client/gui-gtk-2.0/cityrep.c:1460
+#: client/gui-gtk-2.0/cityrep.c:1479 client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1522 client/gui-xaw/menu.c:247
msgid "Wonders"
msgstr "äÉ×Á"
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1662 client/gui-win32/cityrep.c:439
#: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
msgid "All Cities"
msgstr "õÓ¦ ͦÓÔÁ"
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1667 client/gui-win32/cityrep.c:440
msgid "No Cities"
msgstr "îÅÍÁ ͦÓÔ"
-#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1672 client/gui-win32/cityrep.c:441
msgid "Invert Selection"
msgstr "ïÂÅÒÎÕÔÉ ×ÉĦÌÅÎÎÑ"
-#: client/gui-gtk-2.0/cityrep.c:1420
+#: client/gui-gtk-2.0/cityrep.c:1682
msgid "Building Units"
msgstr "âÕÄÕÀÔØ Ð¦ÄÒÏÚĦÌÉ"
-#: client/gui-gtk-2.0/cityrep.c:1426
+#: client/gui-gtk-2.0/cityrep.c:1688
msgid "Building Improvements"
msgstr "âÕÄÕÀÔØ ÂÕĦ×̦"
-#: client/gui-gtk-2.0/cityrep.c:1432
+#: client/gui-gtk-2.0/cityrep.c:1694
msgid "Building Wonders"
msgstr "âÕÄÕÀÔØ ÄÉ×Á"
-#: client/gui-gtk-2.0/cityrep.c:1444
+#: client/gui-gtk-2.0/cityrep.c:1706
msgid "Building Unit"
msgstr "âÕÄÕ¤ ЦÄÒÏÚĦÌ"
-#: client/gui-gtk-2.0/cityrep.c:1448
+#: client/gui-gtk-2.0/cityrep.c:1710
msgid "Building Improvement"
msgstr "âÕÄÕ¤ ÂÕĦ×ÌÀ"
-#: client/gui-gtk-2.0/cityrep.c:1452
+#: client/gui-gtk-2.0/cityrep.c:1714
msgid "Building Wonder"
msgstr "âÕÄÕ¤ ÄÉ×Ï"
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1722 client/gui-win32/cityrep.c:443
msgid "Coastal Cities"
msgstr "ðÒÉÂÅÒÅÖΦ ͦÓÔÁ"
-#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1727 client/gui-win32/cityrep.c:444
msgid "Same Island"
msgstr "ôÏÊ ÖÅ ÏÓÔÒ¦×"
-#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1737 client/gui-win32/cityrep.c:447
msgid "Supported Units"
msgstr "ð¦ÄÔÒÉÍÕ×ÁΦ ЦÄÒÏÚĦÌÉ"
-#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1740 client/gui-win32/cityrep.c:454
msgid "Units Present"
msgstr "ðÒÉÓÕÔΦ ЦÄÒÏÚĦÌÉ"
-#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1744 client/gui-win32/cityrep.c:469
msgid "Improvements in City"
msgstr "âÕĦ×̦ Õ Í¦ÓÔ¦"
-#: client/gui-gtk-2.0/cityrep.c:1486
+#: client/gui-gtk-2.0/cityrep.c:1748
msgid "Wonders in City"
msgstr "äÉ×Á Õ Í¦ÓÔ¦"
-#: client/gui-gtk-2.0/cityrep.c:1495
+#: client/gui-gtk-2.0/cityrep.c:1757
msgid "Available Units"
msgstr "äÏÓÔÕÐΦ ЦÄÒÏÚĦÌÉ"
-#: client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1760
msgid "Available Improvements"
msgstr "äÏÓÔÕÐΦ ÂÕĦ×̦"
-#: client/gui-gtk-2.0/cityrep.c:1501
+#: client/gui-gtk-2.0/cityrep.c:1763
msgid "Available Wonders"
msgstr "äÏÓÔÕÐΦ ÄÉ×Á"
-#: client/gui-gtk-2.0/cityrep.c:1625
+#: client/gui-gtk-2.0/cityrep.c:1882
#, fuzzy, c-format
msgid "Total Buy Cost: %d"
msgstr "úÁÇÁÌÏÍ ËÏÛÔÕ¤:"
@@ -10856,12 +10959,12 @@ msgstr "
msgid "Remove this preset?"
msgstr "÷ÉÄÁÌÉÔÉ ÃÀ ÐÒÅÄÕÓÔÁÎÏ×ËÕ?"
-#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:186
+#: client/gui-gtk-2.0/dialogs.c:196 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:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
#, fuzzy
msgid "Inspect _City"
msgstr "÷¦ÄËÒÉÔÉ Í¦ÓÔÏ"
@@ -10891,10 +10994,10 @@ msgstr "
msgid "Unit"
msgstr "ð¦ÄÒÏÚĦÌÉ"
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
-#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
-#: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
-#: manual/civmanual.c:302 data/Freeciv.in:80
+#: 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-win32/plrdlg.c:335 manual/civmanual.c:302 data/Freeciv.in:80
msgid "Name"
msgstr "îÁÚ×Á"
@@ -10920,7 +11023,7 @@ 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:1036 data/Freeciv.in:3371
+#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
#, fuzzy
msgid "Pick Nation"
msgstr "÷¦ÄÄ¦Ì Í¦Ì¦Ã¦§"
@@ -11003,7 +11106,7 @@ msgstr "
msgid "_Advances"
msgstr "ôÅÈÎÏÌÏǦ§"
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:910
+#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr "í¦ÓÔÁ"
@@ -11109,111 +11212,181 @@ msgstr "
msgid "Show _All Cities"
msgstr "õÓ¦ ͦÓÔÁ"
-#: client/gui-gtk-2.0/gui_main.c:150
+#: client/gui-gtk-2.0/gui_main.c:162
#, fuzzy
msgid "Show Map Scrollbars"
msgstr "ðÏËÁÚÕ×ÁÔÉ ÐÒÏËÒÕÔËÕ ÍÁÐÉ (Ô¦ÌØ˦ GTK+)"
-#: client/gui-gtk-2.0/gui_main.c:151
+#: client/gui-gtk-2.0/gui_main.c:163
msgid "Disable this option to hide the scrollbars on the map view."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:155
+#: client/gui-gtk-2.0/gui_main.c:167
msgid "Keyboardless goto"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:156
+#: client/gui-gtk-2.0/gui_main.c:168
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:161
+#: client/gui-gtk-2.0/gui_main.c:173
#, fuzzy
msgid "Keep dialogs on top"
msgstr "úÁ×ÖÄÉ ÐÏ×ÅÒÈ (ÌÉÛÅ GTK+ 2.0)"
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:174
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:166
+#: client/gui-gtk-2.0/gui_main.c:178
msgid "Show worklist task icons"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:179
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:171
+#: client/gui-gtk-2.0/gui_main.c:183
msgid "Enable status report tabs"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:172
+#: client/gui-gtk-2.0/gui_main.c:184
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:177 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:189 client/gui-win32/gui_main.c:110
msgid "Better fog-of-war drawing"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:178 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:190 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:277 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:195
+msgid "Show time for each chat message"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:196
+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
+msgid "Split bottom notebook area"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:202
+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
+msgid "New message events go to top of list"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:208
+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
+msgid "Show extra message window buttons"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:214
+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 "
+"is disabled, these buttons will not appear (you can still double-click with "
+"the left mouse button or right-click on a row to inspect or goto "
+"respectively). This option will only take effect once the message window is "
+"closed and reopened."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:224
+#, fuzzy
+msgid "Metaserver tab first in network page"
+msgstr "¶ÎÆÏÒÍÁæÊÎÕ ÓÔÒÏËÕ ÍÅÔÁÓÅÒ×ÅÒÁ ×ÓÔÁÎÏ×ÌÅÎÏ Õ '%s'."
+
+#: client/gui-gtk-2.0/gui_main.c:225
+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
+msgid "Plain chat messages are sent to allies only"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:231
+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 "
+"messages will be sent as public chat messages. To send a public chat message "
+"with this option enabled, prefix the message with a single colon ':'. This "
+"option can also be set using a toggle button beside the chat entry (only "
+"visible in multiplayer games)."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:340 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:723 client/gui-gtk-2.0/gui_main.c:1345
+#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
msgid "Freeciv"
msgstr "Freeciv"
-#: client/gui-gtk-2.0/gui_main.c:1088 client/gui-gtk-2.0/gui_main.c:1095
+#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
#: 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:1095 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1232 client/gui-sdl/mapctrl.c:1566
#: client/gui-sdl/mapview.c:1082
msgid "Shift+Return"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1127 client/gui-gtk-2.0/menu.c:770
-#: client/gui-gtk-2.0/menu.c:772 client/gui-gtk-2.0/menu.c:774
-#: client/gui-gtk-2.0/menu.c:776 client/gui-gtk-2.0/menu.c:778
-#: client/gui-gtk-2.0/menu.c:780 client/gui-gtk-2.0/menu.c:782
-#: client/gui-gtk-2.0/menu.c:784 client/gui-gtk-2.0/menu.c:786
-#: client/gui-gtk-2.0/menu.c:788 client/gui-gtk-2.0/menu.c:790
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-gtk-2.0/menu.c:804 client/gui-gtk-2.0/menu.c:806
-#: client/gui-gtk-2.0/menu.c:808 client/gui-gtk-2.0/menu.c:810
-#: client/gui-gtk-2.0/menu.c:812 client/gui-gtk-2.0/menu.c:814
-#: client/gui-gtk-2.0/menu.c:816 client/gui-gtk-2.0/menu.c:818
-#: client/gui-gtk-2.0/menu.c:820 client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/gui_main.c:1266 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
+#: client/gui-gtk-2.0/menu.c:811 client/gui-gtk-2.0/menu.c:813
+#: client/gui-gtk-2.0/menu.c:815 client/gui-gtk-2.0/menu.c:817
+#: client/gui-gtk-2.0/menu.c:819 client/gui-gtk-2.0/menu.c:821
+#: client/gui-gtk-2.0/menu.c:823 client/gui-gtk-2.0/menu.c:825
+#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
+#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
+#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
+#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
+#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
+#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
#: data/Freeciv.in:2028
msgid "View"
msgstr "äÉ×ÉÔÉÓØ"
-#: client/gui-gtk-2.0/gui_main.c:1208
+#: client/gui-gtk-2.0/gui_main.c:1359
#, fuzzy
msgid "Chat"
msgstr "ëÏÌÅÓΦÃÑ"
-#: client/gui-gtk-2.0/gui_main.c:1224 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1377 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"
@@ -11225,81 +11398,85 @@ msgstr ""
"á ÔÅÐÅÒ ÚÁÄÁÊÔÅ §Í ÐÅÒÃÀ!\n"
"óÌÁ×Á õËÒÁ§Î¦! çÅÒÏÑÍ ÓÌÁ×Á!"
-#: client/gui-gtk-2.0/gui_main.c:1491
+#: client/gui-gtk-2.0/gui_main.c:1392
+msgid "Allies Only"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:1657
msgid "Not _ready"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
+#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
#, fuzzy
msgid "_Ready"
msgstr "çÏÔÏ×ΦÓÔØ ÕÓ¦È"
-#: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2132
+#: 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
#, fuzzy
msgid "_Start"
msgstr "óÔÁÎ"
-#: client/gui-gtk-2.0/gui_main.c:1520
+#: client/gui-gtk-2.0/gui_main.c:1686
#, fuzzy
msgid "_Take Player"
msgstr "í¦ÓÔÁ"
-#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
+#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
#, fuzzy
msgid "Pick _Nation"
msgstr "÷¦ÄÄ¦Ì Í¦Ì¦Ã¦§"
-#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
+#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
#, fuzzy
msgid "_Observe"
msgstr " (ÓÐÏÓÔÅÒ¦ÇÁÞ)"
-#: client/gui-gtk-2.0/gui_main.c:1532
+#: client/gui-gtk-2.0/gui_main.c:1698
#, fuzzy
msgid "Do not _observe"
msgstr "ÔÅÐÅÒ ËÏÎÔÒÏÌÀ¤ÔØÓÑ"
-#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
#, fuzzy
msgid "<AI>"
msgstr "ëÏÍÐ'ÀÔÅÒ"
-#: client/gui-gtk-2.0/gui_main.c:1557
+#: client/gui-gtk-2.0/gui_main.c:1723
msgid "<Novice AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1560
+#: client/gui-gtk-2.0/gui_main.c:1726
#, fuzzy
msgid "<Easy AI>"
msgstr "ëÏÍÐ'ÀÔÅÒ"
-#: client/gui-gtk-2.0/gui_main.c:1563
+#: client/gui-gtk-2.0/gui_main.c:1729
msgid "<Normal AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1732
#, fuzzy
msgid "<Hard AI>"
msgstr "ëÏÍÐ'ÀÔÅÒ"
-#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1742 client/gui-win32/dialogs.c:594
#: client/gui-xaw/pages.c:217
#, fuzzy
msgid "Random"
msgstr "òÁĦÏ"
-#: client/gui-gtk-2.0/gui_main.c:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
#, fuzzy
msgid "Observer"
msgstr " (ÓÐÏÓÔÅÒ¦ÇÁÞ)"
-#: client/gui-gtk-2.0/gui_main.c:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
#, fuzzy
msgid "Detached"
msgstr ", ðÏÍÅÒ"
-#: client/gui-gtk-2.0/gui_main.c:1899
+#: client/gui-gtk-2.0/gui_main.c:2073
msgid "Are you sure you want to quit?"
msgstr ""
@@ -11536,494 +11713,530 @@ msgstr "
msgid "Foreign Intelligence: %s Empire"
msgstr "ú×¦Ô ¦ÎÏÚÅÍÎϧ ÒÏÚצÄËÉ"
-#: client/gui-gtk-2.0/mapctrl.c:195 client/gui-sdl/mapctrl.c:2565
+#: client/gui-gtk-2.0/mapctrl.c:179 client/gui-sdl/mapctrl.c:2565
#: client/gui-sdl/menu.c:839 client/gui-sdl/menu.c:1021
#: client/gui-win32/mapctrl.c:353
msgid "Build New City"
msgstr "âÕÄÕ×ÁÔÉ ÎÏ׊ͦÓÔÏ"
-#: client/gui-gtk-2.0/mapctrl.c:196 client/gui-sdl/mapctrl.c:2594
+#: client/gui-gtk-2.0/mapctrl.c:180 client/gui-sdl/mapctrl.c:2594
#: client/gui-win32/mapctrl.c:354 client/gui-xaw/mapctrl.c:89
msgid "What should we call our new city?"
msgstr "ñË ÎÁÚ×ÁÔÉ ÎÏ׊ͦÓÔÏ?"
-#: client/gui-gtk-2.0/mapview.c:147
+#: client/gui-gtk-2.0/mapview.c:158
msgid "Shows your current luxury/science/tax rates;click to toggle them."
msgstr ""
"ðÏËÁÚÁÔÉ ÷ÁÛ¦ ÐÏÔÏÞΦ ÕÓÔÁÎÏ×ËÉ ÒÏÚËÏÛ¦/ÎÁÕËÉ/ÐÏÄÁÔ˦×;Ë̦ËΦÔØ ÁÂÉ ×¦ÄËÒÉÔÉ "
"§È."
-#: client/gui-gtk-2.0/mapview.c:692 client/gui-win32/canvas.c:275
+#: client/gui-gtk-2.0/mapview.c:702 client/gui-win32/canvas.c:275
msgid "Better fog will only work in truecolor. Disabling it"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:250
+#: client/gui-gtk-2.0/menu.c:256
msgid "Leaving a local game will end it!"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:700 client/gui-win32/menu.c:303
+#: client/gui-gtk-2.0/menu.c:727 client/gui-win32/menu.c:303
msgid "_Game"
msgstr "çÒÁ"
-#: client/gui-gtk-2.0/menu.c:702 client/gui-gtk-2.0/menu.c:704
-#: client/gui-gtk-2.0/menu.c:706 client/gui-gtk-2.0/menu.c:708
-#: client/gui-gtk-2.0/menu.c:710 client/gui-gtk-2.0/menu.c:712
-#: client/gui-gtk-2.0/menu.c:714 client/gui-gtk-2.0/menu.c:717
-#: client/gui-gtk-2.0/menu.c:720 client/gui-gtk-2.0/menu.c:722
-#: client/gui-gtk-2.0/menu.c:724 client/gui-gtk-2.0/menu.c:726
-#: client/gui-gtk-2.0/menu.c:728 client/gui-gtk-2.0/menu.c:730
-#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:736
-#: client/gui-gtk-2.0/menu.c:738 client/gui-gtk-2.0/menu.c:740
+#: client/gui-gtk-2.0/menu.c:729 client/gui-gtk-2.0/menu.c:731
+#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:735
+#: client/gui-gtk-2.0/menu.c:737 client/gui-gtk-2.0/menu.c:739
+#: client/gui-gtk-2.0/menu.c:741 client/gui-gtk-2.0/menu.c:744
+#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
+#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
+#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
+#: client/gui-gtk-2.0/menu.c:760 client/gui-gtk-2.0/menu.c:763
+#: client/gui-gtk-2.0/menu.c:765 client/gui-gtk-2.0/menu.c:767
#: data/Freeciv.in:2026
msgid "Game"
msgstr "çÒÁ"
-#: client/gui-gtk-2.0/menu.c:704 client/gui-gtk-2.0/menu.c:706
-#: client/gui-gtk-2.0/menu.c:708
+#: client/gui-gtk-2.0/menu.c:731 client/gui-gtk-2.0/menu.c:733
+#: client/gui-gtk-2.0/menu.c:735
#, fuzzy
msgid "_Chat"
msgstr "ëÏÌÅÓΦÃÑ"
-#: client/gui-gtk-2.0/menu.c:706 client/gui-win32/menu.c:314
+#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:314
msgid "_Clear Log"
msgstr "ïÞÉÓÔÉÔÉ ÖÕÒÎÁÌ"
-#: client/gui-gtk-2.0/menu.c:708 client/gui-win32/menu.c:313
+#: client/gui-gtk-2.0/menu.c:735 client/gui-win32/menu.c:313
#, fuzzy
msgid "_Write Log"
msgstr "åËÓÐÏÒÔÕ×ÁÔÉ ÖÕÒÎÁÌ"
-#: client/gui-gtk-2.0/menu.c:710 client/gui-win32/menu.c:304
+#: client/gui-gtk-2.0/menu.c:737 client/gui-win32/menu.c:304
#, fuzzy
msgid "Local _Options"
msgstr "ìÏËÁÌØΦ ÏÐæ§"
-#: client/gui-gtk-2.0/menu.c:712 client/gui-win32/menu.c:305
+#: client/gui-gtk-2.0/menu.c:739 client/gui-win32/menu.c:305
#, fuzzy
msgid "_Message Options"
msgstr "ïÐæ§ ÐÏצÄÏÍÌÅÎØ"
-#: client/gui-gtk-2.0/menu.c:717
+#: client/gui-gtk-2.0/menu.c:744
#, fuzzy
msgid "_Reload Tileset"
msgstr "æÏÎÉ ÐÏ ÚÁÍÏ×ÞÕ×ÁÎÎÀ"
-#: client/gui-gtk-2.0/menu.c:720
+#: client/gui-gtk-2.0/menu.c:747
#, fuzzy
msgid "Save Options on _Exit"
msgstr "ïÐæ§ ÓÅÒ×ÅÒÁ (ÐÏÔÏÞΦ)"
-#: client/gui-gtk-2.0/menu.c:722
+#: client/gui-gtk-2.0/menu.c:749
#, fuzzy
msgid "Sa_ve Options"
msgstr "ïÐæ§ ÐÏצÄÏÍÌÅÎØ"
-#: client/gui-gtk-2.0/menu.c:726 client/gui-win32/menu.c:308
+#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:308
#, fuzzy
msgid "Server O_ptions"
msgstr "ðÏËÁÚÕ¤ ÏÐæ§ ÓÅÒ×ÅÒÁ."
-#: client/gui-gtk-2.0/menu.c:730 client/gui-win32/menu.c:310
+#: client/gui-gtk-2.0/menu.c:757 client/gui-win32/menu.c:310
#, fuzzy
msgid "_Save Game"
msgstr "úÂÅÒÅÇÔÉ ÇÒÕ"
-#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:311
+#: client/gui-gtk-2.0/menu.c:760 client/gui-win32/menu.c:311
#, fuzzy
msgid "Save Game _As..."
msgstr "úÂÅÒÅÇÔÉ ÇÒÕ"
-#: client/gui-gtk-2.0/menu.c:738
+#: client/gui-gtk-2.0/menu.c:765
#, fuzzy
msgid "_Leave"
msgstr "çÏÌÏ×Á:"
-#: client/gui-gtk-2.0/menu.c:740 client/gui-win32/menu.c:317
+#: client/gui-gtk-2.0/menu.c:767 client/gui-win32/menu.c:317
msgid "_Quit"
msgstr "÷ÉȦÄ"
-#: client/gui-gtk-2.0/menu.c:745 client/gui-win32/menu.c:321
+#: client/gui-gtk-2.0/menu.c:772 client/gui-win32/menu.c:321
#, fuzzy
msgid "Gov_ernment"
msgstr "ëÅÒ¦×ÎÉÃÔ×Ï"
-#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
-#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
-#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:774 client/gui-gtk-2.0/menu.c:776
+#: client/gui-gtk-2.0/menu.c:778 client/gui-gtk-2.0/menu.c:780
+#: client/gui-gtk-2.0/menu.c:782 client/gui-gtk-2.0/menu.c:784
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
#: client/gui-xaw/menu.c:248 data/Freeciv.in:2027 data/helpdata.txt:1320
msgid "Government"
msgstr "ëÅÒ¦×ÎÉÃÔ×Ï"
-#: client/gui-gtk-2.0/menu.c:749 client/gui-win32/menu.c:322
+#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:322
msgid "_Tax Rates"
msgstr "ðÏÄÁÔËÏצ ÓÔÁ×ËÉ"
-#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:324
+#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:324
msgid "_Find City"
msgstr "úÎÁÊÔÉ Í¦ÓÔÏ"
-#: client/gui-gtk-2.0/menu.c:755 client/gui-win32/menu.c:325
+#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:325
#, fuzzy
msgid "_Worklists"
msgstr "ðÌÁÎ ÂÕĦ×ÎÉÃÔ×Á:"
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
-#: client/gui-gtk-2.0/menu.c:764 client/gui-win32/menu.c:327
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
+#: client/gui-gtk-2.0/menu.c:791 client/gui-win32/menu.c:327
#, fuzzy
msgid "_Change Government"
msgstr "ëÅÒ¦×ÎÉÃÔ×Ï"
-#: client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:788
#, fuzzy
msgid "_Revolution..."
msgstr "òÅ×ÏÌÀæÑ"
-#: client/gui-gtk-2.0/menu.c:764 client/gui-gtk-2.0/menu.c:970
+#: client/gui-gtk-2.0/menu.c:791 client/gui-gtk-2.0/menu.c:1013
#: client/gui-win32/menu.c:431
msgid "_Government"
msgstr "ëÅÒ¦×ÎÉÃÔ×Ï"
-#: client/gui-gtk-2.0/menu.c:768 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:795 client/gui-gtk-2.0/menu.c:959
#: client/gui-win32/menu.c:334
msgid "_View"
msgstr "äÉ×ÉÔÉÓØ"
-#: client/gui-gtk-2.0/menu.c:772
+#: client/gui-gtk-2.0/menu.c:799
#, fuzzy
msgid "City Outlines"
msgstr "ïÐæ§ ͦÓÔÁ"
-#: client/gui-gtk-2.0/menu.c:774 client/gui-win32/menu.c:335
+#: client/gui-gtk-2.0/menu.c:801 client/gui-win32/menu.c:335
msgid "Map _Grid"
msgstr "ó¦ÔËÁ"
-#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:336
+#: client/gui-gtk-2.0/menu.c:803 client/gui-win32/menu.c:336
msgid "National _Borders"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:778 client/gui-win32/menu.c:337
+#: client/gui-gtk-2.0/menu.c:805 client/gui-win32/menu.c:337
msgid "City _Names"
msgstr "îÁÚ×É Í¦ÓÔ"
-#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:338
+#: client/gui-gtk-2.0/menu.c:807 client/gui-win32/menu.c:338
msgid "City G_rowth"
msgstr "ò¦ÓÔ í¦ÓÔÁ"
-#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:339
+#: client/gui-gtk-2.0/menu.c:809 client/gui-win32/menu.c:339
msgid "City _Productions"
msgstr "÷ÉÒÏÂÎÉÃÔ×Ï"
-#: client/gui-gtk-2.0/menu.c:784 client/gui-sdl/optiondlg.c:1719
+#: client/gui-gtk-2.0/menu.c:811
+#, fuzzy
+msgid "City Buy Cost"
+msgstr "úÁÇÁÌÏÍ ËÏÛÔÕ¤:"
+
+#: client/gui-gtk-2.0/menu.c:813
+#, fuzzy
+msgid "City Traderoutes"
+msgstr "ôÏÒÇÏצ ÛÌÑÈÉ"
+
+#: client/gui-gtk-2.0/menu.c:815 client/gui-sdl/optiondlg.c:1719
msgid "Draw city worker map grid"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:788 client/gui-sdl/optiondlg.c:1635
+#: client/gui-gtk-2.0/menu.c:819 client/gui-sdl/optiondlg.c:1635
#: client/gui-win32/menu.c:340 client/gui-xaw/menu.c:148
#: client/gui-xaw/menu.c:246 manual/civmanual.c:220 data/helpdata.txt:1220
msgid "Terrain"
msgstr "ôÅÒ¦ÔÏÒ¦Ñ"
-#: client/gui-gtk-2.0/menu.c:790 client/gui-win32/menu.c:341
+#: client/gui-gtk-2.0/menu.c:821 client/gui-win32/menu.c:341
#: client/gui-xaw/menu.c:149
msgid "Coastline"
msgstr "õÚÂÅÒ¦ÖÖÑ"
-#: client/gui-gtk-2.0/menu.c:796 client/gui-win32/menu.c:343
+#: client/gui-gtk-2.0/menu.c:827 client/gui-win32/menu.c:343
msgid "Roads & Rails"
msgstr "ûÌÑÈÉ ÔÁ úÁ̦ÚÎÉæ"
-#: client/gui-gtk-2.0/menu.c:800 client/gui-sdl/optiondlg.c:1933
+#: client/gui-gtk-2.0/menu.c:831 client/gui-sdl/optiondlg.c:1933
#: client/gui-win32/menu.c:345 client/gui-xaw/menu.c:152
msgid "Mines"
msgstr "ûÁÈÔÉ"
-#: client/gui-gtk-2.0/menu.c:802 client/gui-win32/menu.c:346
+#: client/gui-gtk-2.0/menu.c:833 client/gui-win32/menu.c:346
msgid "Fortress & Airbase"
msgstr "õËÒ¦ÐÌÅÎÎÑ ÔÁ áצÁÂÁÚÉ"
-#: client/gui-gtk-2.0/menu.c:804 client/gui-win32/menu.c:348
+#: client/gui-gtk-2.0/menu.c:835 client/gui-win32/menu.c:348
#: client/gui-xaw/menu.c:154
msgid "Specials"
msgstr "óÐÅæÁÌØÎÅ"
-#: client/gui-gtk-2.0/menu.c:806 client/gui-win32/menu.c:349
+#: client/gui-gtk-2.0/menu.c:837 client/gui-win32/menu.c:349
#: client/gui-xaw/menu.c:155
msgid "Pollution & Fallout"
msgstr "úÁÂÒÕÄÎÅÎÎÑ ÔÁ ëÁÔÁÓÔÒÏÆÉ"
-#: client/gui-gtk-2.0/menu.c:812 client/gui-win32/menu.c:352
+#: client/gui-gtk-2.0/menu.c:843 client/gui-win32/menu.c:352
#: client/gui-xaw/menu.c:158
msgid "Focus Unit"
msgstr "æÏËÕÓÕ×ÁÔÉ Ð¦ÄÒÏÚĦÌ"
-#: client/gui-gtk-2.0/menu.c:814 client/gui-sdl/optiondlg.c:1854
+#: client/gui-gtk-2.0/menu.c:845 client/gui-sdl/optiondlg.c:1854
#: client/gui-win32/menu.c:353 client/gui-xaw/menu.c:159
msgid "Fog of War"
msgstr "íÁÒÁ צÊÎÉ"
-#: client/gui-gtk-2.0/menu.c:818
+#: client/gui-gtk-2.0/menu.c:849
msgid "_Full Screen"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/menu.c:853
msgid "_Center View"
msgstr "ãÅÎÔÒÕ×ÁÔÉ"
-#: client/gui-gtk-2.0/menu.c:825 client/gui-win32/menu.c:358
+#: client/gui-gtk-2.0/menu.c:856 client/gui-win32/menu.c:358
msgid "_Orders"
msgstr "îÁËÁÚ"
-#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
-#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
-#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
-#: client/gui-gtk-2.0/menu.c:855 client/gui-gtk-2.0/menu.c:857
-#: client/gui-gtk-2.0/menu.c:859 client/gui-gtk-2.0/menu.c:861
-#: client/gui-gtk-2.0/menu.c:863 client/gui-gtk-2.0/menu.c:865
-#: client/gui-gtk-2.0/menu.c:867 client/gui-gtk-2.0/menu.c:869
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875 client/gui-gtk-2.0/menu.c:877
-#: client/gui-gtk-2.0/menu.c:879 client/gui-gtk-2.0/menu.c:881
-#: client/gui-gtk-2.0/menu.c:883 client/gui-gtk-2.0/menu.c:885
-#: client/gui-gtk-2.0/menu.c:887 client/gui-gtk-2.0/menu.c:889
-#: client/gui-gtk-2.0/menu.c:891 client/gui-gtk-2.0/menu.c:893
-#: client/gui-gtk-2.0/menu.c:895 client/gui-gtk-2.0/menu.c:897
-#: client/gui-gtk-2.0/menu.c:899 client/gui-gtk-2.0/menu.c:901
-#: client/gui-gtk-2.0/menu.c:903 data/Freeciv.in:2029
+#: client/gui-gtk-2.0/menu.c:858 client/gui-gtk-2.0/menu.c:860
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:864
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:868
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:872
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:876
+#: client/gui-gtk-2.0/menu.c:878 client/gui-gtk-2.0/menu.c:880
+#: client/gui-gtk-2.0/menu.c:882 client/gui-gtk-2.0/menu.c:884
+#: client/gui-gtk-2.0/menu.c:886 client/gui-gtk-2.0/menu.c:888
+#: client/gui-gtk-2.0/menu.c:890 client/gui-gtk-2.0/menu.c:892
+#: client/gui-gtk-2.0/menu.c:894 client/gui-gtk-2.0/menu.c:896
+#: client/gui-gtk-2.0/menu.c:898 client/gui-gtk-2.0/menu.c:900
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906 client/gui-gtk-2.0/menu.c:908
+#: client/gui-gtk-2.0/menu.c:910 client/gui-gtk-2.0/menu.c:912
+#: client/gui-gtk-2.0/menu.c:914 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:918 client/gui-gtk-2.0/menu.c:920
+#: client/gui-gtk-2.0/menu.c:922 client/gui-gtk-2.0/menu.c:924
+#: client/gui-gtk-2.0/menu.c:926 client/gui-gtk-2.0/menu.c:928
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
+#: client/gui-gtk-2.0/menu.c:946 data/Freeciv.in:2029
msgid "Orders"
msgstr "îÁËÁÚ"
-#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:1444
+#: client/gui-gtk-2.0/menu.c:860 client/gui-gtk-2.0/menu.c:1489
#: client/gui-win32/menu.c:359
msgid "_Build City"
msgstr "âÕÄÕ×ÁÔÉ Í¦ÓÔÏ"
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:1466
-#: client/gui-gtk-2.0/menu.c:1472 client/gui-win32/menu.c:360
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:1511
+#: client/gui-gtk-2.0/menu.c:1517 client/gui-win32/menu.c:360
msgid "Build _Road"
msgstr "âÕÄÕ×ÁÔÉ ÛÌÑÈ"
-#: client/gui-gtk-2.0/menu.c:833 client/gui-gtk-2.0/menu.c:1360
+#: 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 "âÕÄÕ×ÁÔÉ ÚÒÏÛÅÎÎÑ"
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:1361
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:1406
#: client/gui-win32/menu.c:362
msgid "Build _Mine"
msgstr "âÕÄÕ×ÁÔÉ ÛÁÈÔÕ"
-#: client/gui-gtk-2.0/menu.c:837 client/gui-gtk-2.0/menu.c:1362
+#: client/gui-gtk-2.0/menu.c:868 client/gui-gtk-2.0/menu.c:1407
msgid "Transf_orm Terrain"
msgstr "úͦÎÉÔÉ ÔÅÒ¦ÔÏÒ¦À"
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:1508
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:1553
#: client/gui-win32/menu.c:364
msgid "Build _Fortress"
msgstr "âÕÄÕ×ÁÔÉ ÕËÒ¦ÐÌÅÎÎÑ"
-#: client/gui-gtk-2.0/menu.c:841 client/gui-win32/menu.c:365
+#: client/gui-gtk-2.0/menu.c:872 client/gui-win32/menu.c:365
msgid "Build Airbas_e"
msgstr "âÕÄÕ×ÁÔÉ ÁצÁÂÁÚÕ"
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:1514
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:1559
#: client/gui-win32/menu.c:366
msgid "Clean _Pollution"
msgstr "ì¦ËצÄÕ×ÁÔÉ ÚÁÂÒÕÄÎÅÎÎÑ"
-#: client/gui-gtk-2.0/menu.c:845 client/gui-win32/menu.c:367
+#: client/gui-gtk-2.0/menu.c:876 client/gui-win32/menu.c:367
msgid "Clean _Nuclear Fallout"
msgstr "ì¦ËצÄÕ×ÁÔÉ ÒÁĦÁæÀ"
-#: client/gui-gtk-2.0/menu.c:849 client/gui-win32/menu.c:369
+#: client/gui-gtk-2.0/menu.c:880 client/gui-win32/menu.c:369
msgid "_Sentry"
msgstr "ïÈÏÒÏÎÑÔÉ"
-#: client/gui-gtk-2.0/menu.c:855 client/gui-win32/menu.c:372
+#: client/gui-gtk-2.0/menu.c:886 client/gui-win32/menu.c:372
msgid "Make _Homecity"
msgstr "úͦÎÉÔÉ ÄÏͦ×ËÕ"
-#: client/gui-gtk-2.0/menu.c:857 client/gui-win32/menu.c:373
+#: client/gui-gtk-2.0/menu.c:888 client/gui-win32/menu.c:373
#, fuzzy
msgid "_Load"
msgstr "÷É×ÁÎÔÁÖÉÔÉ"
-#: client/gui-gtk-2.0/menu.c:859
+#: client/gui-gtk-2.0/menu.c:890
#, fuzzy
msgid "_Unload Transporter"
msgstr "ôÒÁÎÓÐÏÒÔ"
-#: client/gui-gtk-2.0/menu.c:861 client/gui-win32/menu.c:374
+#: client/gui-gtk-2.0/menu.c:892 client/gui-win32/menu.c:374
msgid "_Unload"
msgstr "÷É×ÁÎÔÁÖÉÔÉ"
-#: client/gui-gtk-2.0/menu.c:863 client/gui-win32/menu.c:375
+#: client/gui-gtk-2.0/menu.c:894 client/gui-win32/menu.c:375
msgid "Wake up o_thers"
msgstr "ðÒÏÂÕÄÉÔÉ ×Ó¦È"
-#: client/gui-gtk-2.0/menu.c:867
+#: client/gui-gtk-2.0/menu.c:898
msgid "_Auto Settler"
msgstr "á×ÔÏËÏÌÏΦÚÕ×ÁÔÉ"
-#: client/gui-gtk-2.0/menu.c:869 client/gui-win32/menu.c:378
+#: client/gui-gtk-2.0/menu.c:900 client/gui-win32/menu.c:378
msgid "Auto E_xplore"
msgstr "á×ÔÏÄÏÓ̦ÄÖÕ×ÁÔÉ"
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906
msgid "_Connect"
msgstr "ú'¤ÄÎÁÔÉÓÑ"
-#: client/gui-gtk-2.0/menu.c:871 client/gui-win32/menu.c:380
+#: client/gui-gtk-2.0/menu.c:902 client/gui-win32/menu.c:380
#, fuzzy
msgid "_Road"
msgstr "ûÌÑÈ"
-#: client/gui-gtk-2.0/menu.c:873 client/gui-win32/menu.c:381
+#: client/gui-gtk-2.0/menu.c:904 client/gui-win32/menu.c:381
#, fuzzy
msgid "Rai_l"
msgstr "ðÁÒÕÓÎÉË"
-#: client/gui-gtk-2.0/menu.c:875 client/gui-win32/menu.c:382
+#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:382
#, fuzzy
msgid "_Irrigate"
msgstr "æÒ¦ÇÁÔ"
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
#, fuzzy
msgid "Go _to"
msgstr "êÔÉ"
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
#, fuzzy
msgid "_Build city"
msgstr "âÕÄÕ×ÁÔÉ Í¦ÓÔÏ"
-#: client/gui-gtk-2.0/menu.c:879
+#: client/gui-gtk-2.0/menu.c:910
msgid "Patrol (_Q)"
msgstr "ðÁÔÒÕÌÕ×ÁÔÉ (_Q)"
-#: client/gui-gtk-2.0/menu.c:881 client/gui-win32/menu.c:385
+#: client/gui-gtk-2.0/menu.c:912 client/gui-win32/menu.c:385
msgid "_Go to"
msgstr "êÔÉ (_G)"
-#: client/gui-gtk-2.0/menu.c:883
+#: client/gui-gtk-2.0/menu.c:914
msgid "Go\\/Airlift to City"
msgstr "êÔÉ\\/ðÅÒÅ̦ԦÔÉ ÄÏ Í¦ÓÔÁ"
-#: client/gui-gtk-2.0/menu.c:885 client/gui-sdl/menu.c:450
+#: client/gui-gtk-2.0/menu.c:916 client/gui-sdl/menu.c:450
#: client/gui-win32/menu.c:387 client/gui-xaw/menu.c:203
msgid "Return to nearest city"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:889 client/gui-win32/menu.c:389
+#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:389
#: client/gui-xaw/menu.c:205
msgid "Disband Unit"
msgstr "òÏÚÆÏÒÍÕ×ÁÔÉ Ð¦ÄÒÏÚĦÌ"
-#: client/gui-gtk-2.0/menu.c:891 client/gui-sdl/citydlg.c:532
+#: client/gui-gtk-2.0/menu.c:922 client/gui-sdl/citydlg.c:532
#: data/Freeciv.in:1186
msgid "Upgrade unit"
msgstr "íÏÄÅÒΦÚÕ×ÁÔÉ Ð¦ÄÒÏÚĦÌ"
-#: client/gui-gtk-2.0/menu.c:893
+#: client/gui-gtk-2.0/menu.c:924
msgid "Diplomat\\/Spy Actions"
msgstr "ä¦ÐÌÏÍÁÔÉÞΦ/ûÐÉÇÕÎÓØ˦ Ħ§"
-#: client/gui-gtk-2.0/menu.c:895 client/gui-sdl/menu.c:399
+#: client/gui-gtk-2.0/menu.c:926 client/gui-sdl/menu.c:399
#: client/gui-win32/menu.c:391 client/gui-xaw/menu.c:209
msgid "Explode Nuclear"
msgstr "ð¦Ä¦Ò×ÁÔÉ ÁÔÏÍÎÕ ÂÏÍÂÕ"
-#: client/gui-gtk-2.0/menu.c:899
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/cityrep.c:882
+msgid "Select"
+msgstr "ïÂÅÒ¦ÔØ"
+
+#: client/gui-gtk-2.0/menu.c:934
#, fuzzy
-msgid "Select same type"
-msgstr "ïÂÒÁÔÉ Í¦ÓÔÏ"
+msgid "Single"
+msgstr "äÖÕÎÇ̦"
+
+#: client/gui-gtk-2.0/menu.c:936
+msgid "Same Type On Tile"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:938
+msgid "All On Tile"
+msgstr ""
-#: client/gui-gtk-2.0/menu.c:901 client/gui-win32/menu.c:393
+#: client/gui-gtk-2.0/menu.c:940
+msgid "Same Type On Continent"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:942
+msgid "Same Type Everywhere"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:393
msgid "_Wait"
msgstr "þÅËÁÔÉ (_W)"
-#: client/gui-gtk-2.0/menu.c:903 client/gui-win32/menu.c:394
+#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:394
#: client/gui-xaw/menu.c:213
msgid "Done"
msgstr "úÁ×ÅÒÛÅÎÏ"
-#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:398
+#: client/gui-gtk-2.0/menu.c:949 client/gui-win32/menu.c:398
msgid "_Reports"
msgstr "úצÔÉ"
-#: client/gui-gtk-2.0/menu.c:908 client/gui-gtk-2.0/menu.c:910
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:914
-#: client/gui-gtk-2.0/menu.c:916 client/gui-gtk-2.0/menu.c:918
-#: client/gui-gtk-2.0/menu.c:920 client/gui-gtk-2.0/menu.c:922
-#: client/gui-gtk-2.0/menu.c:924 client/gui-gtk-2.0/menu.c:926
-#: client/gui-gtk-2.0/menu.c:928 client/gui-gtk-2.0/menu.c:930
-#: client/gui-gtk-2.0/menu.c:932 data/Freeciv.in:2030
+#: client/gui-gtk-2.0/menu.c:951 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:957
+#: client/gui-gtk-2.0/menu.c:959 client/gui-gtk-2.0/menu.c:961
+#: client/gui-gtk-2.0/menu.c:963 client/gui-gtk-2.0/menu.c:965
+#: client/gui-gtk-2.0/menu.c:967 client/gui-gtk-2.0/menu.c:969
+#: client/gui-gtk-2.0/menu.c:971 client/gui-gtk-2.0/menu.c:973
+#: client/gui-gtk-2.0/menu.c:975 data/Freeciv.in:2030
msgid "Reports"
msgstr "úצÔÉ"
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:958
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:1001
#: client/gui-win32/menu.c:400 client/gui-win32/menu.c:425
msgid "_Units"
msgstr "ð¦ÄÒÏÚĦÌÉ"
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/menu.c:914 client/gui-win32/menu.c:402
+#: client/gui-gtk-2.0/menu.c:957 client/gui-win32/menu.c:402
#, fuzzy
msgid "_Nations"
msgstr "_îÁæ§"
-#: client/gui-gtk-2.0/menu.c:918 client/gui-win32/menu.c:403
+#: client/gui-gtk-2.0/menu.c:961 client/gui-win32/menu.c:403
msgid "_Economy"
msgstr "åËÏÎÏͦËÁ"
#. TRANS: Research report action
-#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:405
+#: client/gui-gtk-2.0/menu.c:963 client/gui-win32/menu.c:405
#, fuzzy
msgid "_Research"
msgstr "_äÏÓ̦ÄÖÅÎÎÑ"
-#: client/gui-gtk-2.0/menu.c:924 client/gui-win32/menu.c:407
+#: client/gui-gtk-2.0/menu.c:967 client/gui-win32/menu.c:407
msgid "_Wonders of the World"
msgstr "äÉ×Á ÓצÔÕ"
-#: client/gui-gtk-2.0/menu.c:926 client/gui-win32/menu.c:408
+#: client/gui-gtk-2.0/menu.c:969 client/gui-win32/menu.c:408
msgid "_Top Five Cities"
msgstr "îÁÊ×ÉÚÎÁÞΦÛÉ Í¦ÓÔÁ"
-#: client/gui-gtk-2.0/menu.c:928 client/gui-win32/menu.c:409
+#: client/gui-gtk-2.0/menu.c:971 client/gui-win32/menu.c:409
msgid "_Messages"
msgstr "ðÏצÄÏÍÌÅÎÎÑ"
-#: client/gui-gtk-2.0/menu.c:930 client/gui-win32/menu.c:410
+#: client/gui-gtk-2.0/menu.c:973 client/gui-win32/menu.c:410
msgid "_Demographics"
msgstr "äÅÍÏÇÒÁƦÑ"
-#: client/gui-gtk-2.0/menu.c:932 client/gui-gtk-2.0/plrdlg.c:471
+#: client/gui-gtk-2.0/menu.c:975 client/gui-gtk-2.0/plrdlg.c:354
#: client/gui-win32/menu.c:411
msgid "_Spaceship"
msgstr "ëÏÓͦÞÎÉÊ ËÏÒÁÂÅÌØ"
-#: client/gui-gtk-2.0/menu.c:936 client/gui-win32/menu.c:415
+#: client/gui-gtk-2.0/menu.c:979 client/gui-win32/menu.c:415
msgid "_Help"
msgstr "äÏÐÏÍÏÇÁ"
-#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
-#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
-#: client/gui-gtk-2.0/menu.c:946 client/gui-gtk-2.0/menu.c:948
-#: client/gui-gtk-2.0/menu.c:950 client/gui-gtk-2.0/menu.c:952
-#: client/gui-gtk-2.0/menu.c:954 client/gui-gtk-2.0/menu.c:956
-#: client/gui-gtk-2.0/menu.c:958 client/gui-gtk-2.0/menu.c:960
-#: client/gui-gtk-2.0/menu.c:962 client/gui-gtk-2.0/menu.c:964
-#: client/gui-gtk-2.0/menu.c:966 client/gui-gtk-2.0/menu.c:968
-#: client/gui-gtk-2.0/menu.c:970 client/gui-gtk-2.0/menu.c:972
-#: client/gui-gtk-2.0/menu.c:974 client/gui-gtk-2.0/menu.c:976
-#: client/gui-gtk-2.0/menu.c:978 client/gui-gtk-2.0/menu.c:980
+#: client/gui-gtk-2.0/menu.c:981 client/gui-gtk-2.0/menu.c:983
+#: client/gui-gtk-2.0/menu.c:985 client/gui-gtk-2.0/menu.c:987
+#: client/gui-gtk-2.0/menu.c:989 client/gui-gtk-2.0/menu.c:991
+#: client/gui-gtk-2.0/menu.c:993 client/gui-gtk-2.0/menu.c:995
+#: client/gui-gtk-2.0/menu.c:997 client/gui-gtk-2.0/menu.c:999
+#: client/gui-gtk-2.0/menu.c:1001 client/gui-gtk-2.0/menu.c:1003
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-gtk-2.0/menu.c:1007
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-gtk-2.0/menu.c:1011
+#: client/gui-gtk-2.0/menu.c:1013 client/gui-gtk-2.0/menu.c:1015
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-gtk-2.0/menu.c:1019
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-gtk-2.0/menu.c:1023
#: client/gui-gtk-2.0/repodlgs.c:313 client/gui-win32/citydlg.c:1077
#: client/gui-win32/repodlgs.c:289 client/gui-win32/wldlg.c:846
#: data/Freeciv.in:1466 data/Freeciv.in:2031 data/Freeciv.in:2101
@@ -12031,119 +12244,119 @@ msgstr "
msgid "Help"
msgstr "äÏÐÏÍÏÇÁ"
-#: client/gui-gtk-2.0/menu.c:940 client/gui-win32/menu.c:416
+#: client/gui-gtk-2.0/menu.c:983 client/gui-win32/menu.c:416
msgid "Language_s"
msgstr "íÏ×Á"
-#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/menu.c:417
+#: client/gui-gtk-2.0/menu.c:985 client/gui-win32/menu.c:417
msgid "Co_nnecting"
msgstr "ú'¤ÄÎÕÀÓØ"
-#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:418
+#: client/gui-gtk-2.0/menu.c:987 client/gui-win32/menu.c:418
msgid "C_ontrols"
msgstr "õÐÒÁ×̦ÎÎÑ"
-#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:419
+#: client/gui-gtk-2.0/menu.c:989 client/gui-win32/menu.c:419
msgid "C_hatline"
msgstr "þÁÔ"
-#: client/gui-gtk-2.0/menu.c:948 client/gui-win32/menu.c:420
+#: client/gui-gtk-2.0/menu.c:991 client/gui-win32/menu.c:420
msgid "_Worklist Editor"
msgstr "òÅÄÁËÔÏÒ ÐÌÁÎ¦× ÂÕĦ×ÎÉÃÔ×Á "
-#: client/gui-gtk-2.0/menu.c:950 client/gui-win32/menu.c:421
+#: client/gui-gtk-2.0/menu.c:993 client/gui-win32/menu.c:421
msgid "Citizen _Management"
msgstr "õÐÒÁ×̦ÎÎÑ ÇÏÒÏÄÑÎÁÍÉ"
-#: client/gui-gtk-2.0/menu.c:952 client/gui-win32/menu.c:422
+#: client/gui-gtk-2.0/menu.c:995 client/gui-win32/menu.c:422
msgid "_Playing"
msgstr "çÒÁ"
-#: client/gui-gtk-2.0/menu.c:956 client/gui-win32/menu.c:424
+#: client/gui-gtk-2.0/menu.c:999 client/gui-win32/menu.c:424
msgid "City _Improvements"
msgstr "âÕĦ×̦ ͦÓÔÁ"
-#: client/gui-gtk-2.0/menu.c:960 client/gui-win32/menu.c:426
+#: client/gui-gtk-2.0/menu.c:1003 client/gui-win32/menu.c:426
msgid "Com_bat"
msgstr "âÉÔ×Á"
-#: client/gui-gtk-2.0/menu.c:962 client/gui-win32/menu.c:427
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-win32/menu.c:427
msgid "_ZOC"
msgstr "úÏÎÉ ËÏÎÔÒÏÌÀ"
-#: client/gui-gtk-2.0/menu.c:964 client/gui-win32/menu.c:428
+#: client/gui-gtk-2.0/menu.c:1007 client/gui-win32/menu.c:428
msgid "Techno_logy"
msgstr "ôÅÈÎÏÌÏǦ§"
-#: client/gui-gtk-2.0/menu.c:966 client/gui-win32/menu.c:429
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-win32/menu.c:429
msgid "_Terrain"
msgstr "ôÅÒ¦ÔÏÒ¦§"
-#: client/gui-gtk-2.0/menu.c:968 client/gui-win32/menu.c:430
+#: client/gui-gtk-2.0/menu.c:1011 client/gui-win32/menu.c:430
msgid "Won_ders"
msgstr "äÉ×Á"
-#: client/gui-gtk-2.0/menu.c:972 client/gui-win32/menu.c:432
+#: client/gui-gtk-2.0/menu.c:1015 client/gui-win32/menu.c:432
msgid "Happin_ess"
msgstr "ýÁÓÔÑ"
-#: client/gui-gtk-2.0/menu.c:974 client/gui-win32/menu.c:433
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-win32/menu.c:433
msgid "Space _Race"
msgstr "ëÏÓͦÞÎÁ ÇÏÎËÁ"
-#: client/gui-gtk-2.0/menu.c:978 client/gui-win32/menu.c:435
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-win32/menu.c:435
msgid "_Copying"
msgstr "ëÏЦÀ×ÁÎÎÑ"
-#: client/gui-gtk-2.0/menu.c:980 client/gui-win32/menu.c:436
+#: client/gui-gtk-2.0/menu.c:1023 client/gui-win32/menu.c:436
msgid "_About"
msgstr "ðÒÏ ÐÒÏÇÒÁÍÕ"
-#: client/gui-gtk-2.0/menu.c:1264
+#: client/gui-gtk-2.0/menu.c:1307
#, c-format
msgid "%s..."
msgstr ""
-#: client/gui-gtk-2.0/menu.c:1352
+#: client/gui-gtk-2.0/menu.c:1397
#, c-format
msgid "Change to %s (_I)"
msgstr "úͦÎÉÔÉ ÎÁ %s (_I)"
-#: client/gui-gtk-2.0/menu.c:1353
+#: client/gui-gtk-2.0/menu.c:1398
#, c-format
msgid "Change to %s (_M)"
msgstr "úͦÎÉÔÉ ÎÁ %s (_í)"
-#: client/gui-gtk-2.0/menu.c:1354
+#: client/gui-gtk-2.0/menu.c:1399
#, c-format
msgid "Transf_orm to %s"
msgstr "úͦÎÉÔÉ ÎÁ %s"
-#: client/gui-gtk-2.0/menu.c:1427
+#: client/gui-gtk-2.0/menu.c:1472
msgid "Help _Build Wonder"
msgstr "äÏÐÏÍÏÇÔÉ ÂÕÄÕ×ÁÔÉ ÄÉ×Ï"
-#: client/gui-gtk-2.0/menu.c:1441
+#: client/gui-gtk-2.0/menu.c:1486
msgid "Add to City (_B)"
msgstr "äÏÄÁÔÉ ÄÏ Í¦ÓÔÁ (_B)"
-#: client/gui-gtk-2.0/menu.c:1449
+#: client/gui-gtk-2.0/menu.c:1494
msgid "Make Trade _Route"
msgstr "÷ÓÔÁÎÏ×ÉÔÉ ÔÏÒÇÏ×ÉÊ ÛÌÑÈ"
-#: client/gui-gtk-2.0/menu.c:1463
+#: client/gui-gtk-2.0/menu.c:1508
msgid "Build _Railroad"
msgstr "âÕÄÕ×ÁÔÉ ÚÁ̦ÚÎÉÃÀ"
-#: client/gui-gtk-2.0/menu.c:1486
+#: client/gui-gtk-2.0/menu.c:1531
msgid "Bu_ild Farmland"
msgstr "âÕÄÕ×ÁÔÉ ÆÅÒÍÕ"
-#: client/gui-gtk-2.0/menu.c:1506
+#: client/gui-gtk-2.0/menu.c:1551
msgid "_Fortify"
msgstr "õËÒ¦ÐÉÔÉ"
-#: client/gui-gtk-2.0/menu.c:1512
+#: client/gui-gtk-2.0/menu.c:1557
msgid "_Paradrop"
msgstr "ðÁÒÁÛÕÔÕ×ÁÔÉ"
@@ -12178,13 +12391,32 @@ msgstr "
msgid "Pop"
msgstr "÷¦Ä"
-#: client/gui-gtk-2.0/messagewin.c:155 client/gui-sdl/messagewin.c:247
+#: client/gui-gtk-2.0/messagewin.c:186 client/gui-sdl/messagewin.c:247
#: client/gui-win32/messagewin.c:132 client/gui-xaw/menu.c:228
#: data/Freeciv.in:3273 data/Freeciv.in:3274 data/Freeciv.in:3283
msgid "Messages"
msgstr "ðÏצÄÏÍÌÅÎÎÑ"
-#: client/gui-gtk-2.0/plrdlg.c:330
+#: client/gui-gtk-2.0/plrdlg.c:317
+msgid "_Meet"
+msgstr "úÕÓÔÒ¦ÔÉÓØ"
+
+#: client/gui-gtk-2.0/plrdlg.c:323
+#, fuzzy
+msgid "Cancel _Treaty"
+msgstr "òÏÚ¦Ò×ÁÔÉ ÕÇÏÄÕ"
+
+#: client/gui-gtk-2.0/plrdlg.c:329
+#, fuzzy
+msgid "_Withdraw Vision"
+msgstr "úÁÂÒÁÔÉ ÂÁÞÅÎÎÑ"
+
+#: client/gui-gtk-2.0/plrdlg.c:348
+#, fuzzy
+msgid "_Report"
+msgstr "úצÔÉ"
+
+#: client/gui-gtk-2.0/plrdlg.c:386
msgid "?show:Dead Players"
msgstr ""
@@ -12192,291 +12424,294 @@ msgstr ""
#. TRANS: Nations report action
#. TRANS: Nations report title
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/plrdlg.c:350 client/gui-sdl/mapctrl.c:1580
+#: client/gui-gtk-2.0/plrdlg.c:406 client/gui-sdl/mapctrl.c:1580
#: client/gui-sdl/plrdlg.c:608 client/gui-win32/plrdlg.c:344
#: client/gui-xaw/menu.c:221 data/Freeciv.in:3192 data/Freeciv.in:3193
#, fuzzy
msgid "Nations"
msgstr "îÁæÑ"
-#: client/gui-gtk-2.0/plrdlg.c:443
-msgid "_Intelligence"
-msgstr "òÏÚצÄËÁ"
-
-#: client/gui-gtk-2.0/plrdlg.c:450
-msgid "_Meet"
-msgstr "úÕÓÔÒ¦ÔÉÓØ"
-
-#: client/gui-gtk-2.0/plrdlg.c:457
+#: client/gui-gtk-2.0/plrdlg.c:511
#, fuzzy
-msgid "Cancel _Treaty"
-msgstr "òÏÚ¦Ò×ÁÔÉ ÕÇÏÄÕ"
+msgid "Di_plomacy"
+msgstr "ä¦ÐÌÏÍÁÔ"
-#: client/gui-gtk-2.0/plrdlg.c:464
-msgid "_Withdraw vision"
-msgstr "úÁÂÒÁÔÉ ÂÁÞÅÎÎÑ"
+#: client/gui-gtk-2.0/plrdlg.c:516
+msgid "_Intelligence"
+msgstr "òÏÚצÄËÁ"
-#: client/gui-gtk-2.0/plrdlg.c:495
+#: client/gui-gtk-2.0/plrdlg.c:526
#, fuzzy
msgid "_AI"
msgstr "ëÏÍÐ'ÀÔÅÒ"
-#: client/gui-gtk-2.0/plrdlg.c:501
+#: client/gui-gtk-2.0/plrdlg.c:532
msgid "_Toggle AI Mode"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:208
+#: client/gui-gtk-2.0/pages.c:221
#, fuzzy
msgid "Start _New Game"
msgstr "óÔÁÒÔÕ×ÁÔÉ ÎÏ×Õ ÇÒÕ"
-#: client/gui-gtk-2.0/pages.c:214
+#: client/gui-gtk-2.0/pages.c:227
#, fuzzy
msgid "Start _Scenario Game"
msgstr "óÔÁÒÔÕ×ÁÔÉ ÎÏ×Õ ÇÒÕ"
-#: client/gui-gtk-2.0/pages.c:220
+#: client/gui-gtk-2.0/pages.c:233
#, fuzzy
msgid "_Load Saved Game"
msgstr "úÁ×ÁÎÔÁÖÉÔÉ ÇÒÕ"
-#: client/gui-gtk-2.0/pages.c:229
+#: client/gui-gtk-2.0/pages.c:239
msgid "C_onnect to Network Game"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:236
+#: client/gui-gtk-2.0/pages.c:247
#, fuzzy
msgid "Connect to Gaming _Zone"
msgstr "ð¦Ä'¤ÄÎÁÔÉÓÑ ÄÏ"
-#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:300
#: client/gui-xaw/connectdlg.c:326
msgid "Passwords don't match, enter password."
msgstr ""
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:779 client/gui-gtk-2.0/pages.c:820
+#: client/gui-win32/connectdlg.c:916
msgid "Server Name"
msgstr "áÄÒÅÓÁ"
-#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
+#: 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
+#: data/Freeciv.in:96
msgid "Port"
msgstr "ðÏÒÔ"
-#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
+#: client/gui-win32/connectdlg.c:917
msgid "Version"
msgstr "÷ÅÒÓ¦Ñ"
-#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
-#: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
+#: 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
msgid "Status"
msgstr "óÔÁÎ"
-#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
-#: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
+#: 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
msgid "Players"
msgstr "çÒÁ×æ×"
-#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
+#: client/gui-win32/connectdlg.c:918
msgid "Comment"
msgstr "ëÏÍÅÎÔÁÒ¦"
-#: client/gui-gtk-2.0/pages.c:747
+#: client/gui-gtk-2.0/pages.c:786
msgid "Local _Area Network"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:783
+#: client/gui-gtk-2.0/pages.c:827
#, fuzzy
msgid "Internet _Metaserver"
msgstr "íÅÔÁÓÅÒ×ÅÒÉ"
-#: client/gui-gtk-2.0/pages.c:817
+#: client/gui-gtk-2.0/pages.c:864
msgid "_Host:"
msgstr "èÏÓÔ:"
-#: client/gui-gtk-2.0/pages.c:834
+#: client/gui-gtk-2.0/pages.c:881
msgid "_Port:"
msgstr "ðÏÒÔ:"
-#: client/gui-gtk-2.0/pages.c:851
+#: client/gui-gtk-2.0/pages.c:898
#, fuzzy
msgid "_Login:"
msgstr "ìÅǦÏÎ"
-#: client/gui-gtk-2.0/pages.c:869
+#: client/gui-gtk-2.0/pages.c:916
msgid "Pass_word:"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:887
+#: client/gui-gtk-2.0/pages.c:934
msgid "Conf_irm Password:"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:912
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: 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/wldlg.c:800 client/gui-win32/wldlg.c:806
+msgid "Type"
+msgstr "ôÉÐ"
+
+#: client/gui-gtk-2.0/pages.c:952 client/gui-win32/plrdlg.c:337
+#: data/Freeciv.in:88
+msgid "Host"
+msgstr "èÏÓÔ"
+
+#: client/gui-gtk-2.0/pages.c:981
#, fuzzy
msgid "C_onnect"
msgstr "ðÒɤ'ÄÎÁÔÉÓØ"
-#: client/gui-gtk-2.0/pages.c:1142
+#: client/gui-gtk-2.0/pages.c:1211
#, fuzzy, c-format
msgid "Connection name: %s"
msgstr "ú'¤ÄÎÁÎÎÑ"
-#: client/gui-gtk-2.0/pages.c:1145
+#: client/gui-gtk-2.0/pages.c:1214
#, fuzzy, c-format
msgid "Player name: %s"
msgstr "?ͦÓÔÏ:îÁÚ×Á"
-#: client/gui-gtk-2.0/pages.c:1150
+#: client/gui-gtk-2.0/pages.c:1219
#, fuzzy, c-format
msgid "Host: %s"
msgstr "áÄÒÅÓÁ:"
-#: client/gui-gtk-2.0/pages.c:1158
+#: client/gui-gtk-2.0/pages.c:1227
msgid "Player/conn info"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1185
+#: client/gui-gtk-2.0/pages.c:1254
#, fuzzy, c-format
msgid "%s info"
msgstr "í¦ÓÔÏ ¦ÎÆÏ"
-#: client/gui-gtk-2.0/pages.c:1196
+#: client/gui-gtk-2.0/pages.c:1265
#, fuzzy
msgid "Toggle player ready"
msgstr "aitoggle <ÇÒÁ×ÅÃØ>"
-#: client/gui-gtk-2.0/pages.c:1204
+#: client/gui-gtk-2.0/pages.c:1273
#, fuzzy
msgid "Pick nation"
msgstr "÷¦ÄÄ¦Ì Í¦Ì¦Ã¦§"
-#: client/gui-gtk-2.0/pages.c:1214
+#: client/gui-gtk-2.0/pages.c:1283
msgid "Observe this player"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1221
+#: client/gui-gtk-2.0/pages.c:1290
#, fuzzy
msgid "Take this player"
msgstr "í¦ÓÔÁ"
-#: client/gui-gtk-2.0/pages.c:1238
+#: client/gui-gtk-2.0/pages.c:1307
#, fuzzy
msgid "Cut connection"
msgstr "÷ÉÄÁÌÑÀ Ú'¤ÄÎÁÎÎÑ %s."
-#: client/gui-gtk-2.0/pages.c:1248
+#: client/gui-gtk-2.0/pages.c:1317
#, fuzzy
msgid "Aitoggle player"
msgstr "aitoggle <ÇÒÁ×ÅÃØ>"
-#: client/gui-gtk-2.0/pages.c:1257
+#: client/gui-gtk-2.0/pages.c:1326
#, fuzzy
msgid "Remove player"
msgstr "÷ÉÄÁÌÑÀ ÇÒÁ×ÃÑ %s."
-#: client/gui-gtk-2.0/pages.c:1268
+#: client/gui-gtk-2.0/pages.c:1337
msgid "Give info access"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1276
+#: client/gui-gtk-2.0/pages.c:1345
msgid "Give ctrl access"
msgstr ""
#. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1338
+#: client/gui-gtk-2.0/pages.c:1407
#, fuzzy, c-format
msgid "Put on %s"
msgstr "îÁÓÅÌÅÎÎÑ: %s"
-#: client/gui-gtk-2.0/pages.c:1442
+#: client/gui-gtk-2.0/pages.c:1511
#, fuzzy
msgid "Number of _Players (including AI):"
msgstr "ë¦ÌØ˦ÓÔØ ËÏÍÐ'ÀÔÅÒÎÉÈ ÇÒÁ×æ×."
-#: client/gui-gtk-2.0/pages.c:1465
+#: client/gui-gtk-2.0/pages.c:1534
msgid "AI Skill _Level:"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1481
+#: client/gui-gtk-2.0/pages.c:1550
#, fuzzy
msgid "Ruleset _Version:"
msgstr "ðÒÅÄÕÓÔÁÎÏ×ËÉ:"
-#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
#, fuzzy
msgid "_More Game Options..."
msgstr "ïÐæ§ ÐÏצÄÏÍÌÅÎØ..."
-#: client/gui-gtk-2.0/pages.c:1514
+#: client/gui-gtk-2.0/pages.c:1583
#, fuzzy
msgid "Record"
msgstr "úצÔ"
-#: client/gui-gtk-2.0/pages.c:1519
+#: client/gui-gtk-2.0/pages.c:1588
#, fuzzy
msgid "Rating"
msgstr "ïÞÉËÕ×ÁÎÎÑ"
-#: client/gui-gtk-2.0/pages.c:1525
+#: client/gui-gtk-2.0/pages.c:1594
#, fuzzy
msgid "Ready"
msgstr "çÏÔÏ×ΦÓÔØ ÕÓ¦È"
-#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
-#: data/nation/slovakian.ruleset:26
-msgid "Leader"
-msgstr "çÏÌÏ×Á"
+#: client/gui-gtk-2.0/pages.c:1601
+#, fuzzy
+msgid "?player:Leader"
+msgstr "?ͦÓÔÏ:îÁÚ×Á"
-#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1732 client/gui-sdl/chatline.c:185
msgid "Choose Saved Game to Load"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1752
+#: client/gui-gtk-2.0/pages.c:1824
msgid "Choose Saved Game to _Load:"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
-#: client/gui-gtk-2.0/pages.c:2375
+#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
+#: client/gui-gtk-2.0/pages.c:2451
msgid "_Browse..."
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1839
+#: client/gui-gtk-2.0/pages.c:1911
#, fuzzy
msgid "Choose a Scenario"
msgstr "úÁ×ÁÎÔÁÖÉÔÉ ÓÃÅÎÁÒ¦Ê"
-#: client/gui-gtk-2.0/pages.c:1926
+#: client/gui-gtk-2.0/pages.c:1998
#, fuzzy
msgid "Choose a _Scenario:"
msgstr "úÁ×ÁÎÔÁÖÉÔÉ ÓÃÅÎÁÒ¦Ê"
-#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
-#: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
-#: client/gui-win32/wldlg.c:806
-msgid "Type"
-msgstr "ôÉÐ"
-
-#: client/gui-gtk-2.0/pages.c:2101
+#: client/gui-gtk-2.0/pages.c:2173
#, fuzzy
msgid "Choose a _nation to play:"
msgstr "ïÂÅÒ¦ÔØ Ä¦ÑÌØΦÓÔØ Ð¦ÄÒÏÚĦÌÕ"
-#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2363 client/gui-win32/menu.c:581
#, fuzzy
msgid "Select Location to Save"
msgstr "ïÂÅÒ¦ÔØ ÎÁæÀ ÔÁ ¦Í`Ñ"
-#: client/gui-gtk-2.0/pages.c:2372 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2448 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr "úÂÅÒÅÇÔÉ ÇÒÕ"
-#: client/gui-gtk-2.0/pages.c:2413
+#: client/gui-gtk-2.0/pages.c:2489
#, fuzzy
msgid "Saved _Games:"
msgstr "úÂÅÒÅÇÔÉ ÇÒÕ"
-#: client/gui-gtk-2.0/pages.c:2440
+#: client/gui-gtk-2.0/pages.c:2516
#, fuzzy
msgid "Save _Filename:"
msgstr "úÂÅÒÅÇÔÉ ÇÒÕ"
@@ -12835,7 +13070,7 @@ msgstr "
msgid "Total users logged in : %d"
msgstr ""
-#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1094
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
#, fuzzy
msgid "Back"
msgstr "âÁÎË"
@@ -12846,7 +13081,7 @@ msgid "Start"
msgstr "óÔÁÎ"
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:775
+#: client/gui-win32/connectdlg.c:777
msgid "Load Game"
msgstr "úÁ×ÁÎÔÁÖÉÔÉ ÇÒÕ"
@@ -12885,12 +13120,12 @@ msgid "Make new homecity"
msgstr "úͦÎÉÔÉ ÄÏͦ×ËÕ"
#: client/gui-sdl/citydlg.c:546 client/gui-sdl/citydlg.c:1418
-#: client/gui-sdl/connectdlg.c:307 client/gui-sdl/connectdlg.c:616
-#: client/gui-sdl/connectdlg.c:802 client/gui-sdl/connectdlg.c:984
+#: 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/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1039
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
#: 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
@@ -12938,7 +13173,7 @@ msgstr "
#: client/gui-sdl/diplodlg.c:1335 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:2427
+#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
#: client/gui-xaw/cityrep.c:666 client/gui-xaw/cma_fe.c:327
#: client/gui-xaw/cma_fe.c:511 client/gui-xaw/cma_fe.c:765
#: client/gui-xaw/messagedlg.c:72 client/gui-xaw/optiondlg.c:76
@@ -12954,7 +13189,7 @@ msgstr "
#: client/gui-sdl/diplodlg.c:1345 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:2427 client/gui-xaw/cityrep.c:666
+#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
#: client/gui-xaw/cma_fe.c:327 client/gui-xaw/cma_fe.c:511
#: client/gui-xaw/cma_fe.c:765 client/gui-xaw/messagedlg.c:72
#: client/gui-xaw/optiondlg.c:76 client/gui-xaw/optiondlg.c:304
@@ -13258,40 +13493,40 @@ msgstr "
msgid "Release city"
msgstr "÷¦ÄÐÕÓÔÉÔÉ Í¦ÓÔÏ"
-#: client/gui-sdl/connectdlg.c:238
+#: client/gui-sdl/connectdlg.c:239
#, fuzzy
msgid "Creating Server List..."
msgstr "÷ÉÂ¦Ò ÓÅÒ×ÅÒÁ Freeciv"
-#: client/gui-sdl/connectdlg.c:279 client/gui-sdl/connectdlg.c:343
+#: client/gui-sdl/connectdlg.c:280 client/gui-sdl/connectdlg.c:344
msgid "No LAN servers found"
msgstr ""
-#: client/gui-sdl/connectdlg.c:281 client/gui-sdl/connectdlg.c:345
+#: client/gui-sdl/connectdlg.c:282 client/gui-sdl/connectdlg.c:346
msgid "No public servers found"
msgstr ""
-#: client/gui-sdl/connectdlg.c:555
+#: client/gui-sdl/connectdlg.c:556
#, fuzzy
msgid "Player Name :"
msgstr "?ͦÓÔÏ:îÁÚ×Á"
-#: client/gui-sdl/connectdlg.c:571
+#: client/gui-sdl/connectdlg.c:572
#, fuzzy
msgid "Freeciv Server :"
msgstr "÷ÉÂ¦Ò ÓÅÒ×ÅÒÁ Freeciv"
-#: client/gui-sdl/connectdlg.c:588
+#: client/gui-sdl/connectdlg.c:589
#, fuzzy
msgid "Port :"
msgstr "ðÏÒÔ:"
-#: client/gui-sdl/connectdlg.c:608 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr "ðÒɤ'ÄÎÁÔÉÓØ"
-#: client/gui-sdl/connectdlg.c:794 client/gui-sdl/connectdlg.c:977
+#: client/gui-sdl/connectdlg.c:795 client/gui-sdl/connectdlg.c:978
#: client/gui-xaw/connectdlg.c:145
msgid "Next"
msgstr ""
@@ -13583,7 +13818,7 @@ msgstr ""
#: client/gui-sdl/graphics.c:1021
#, c-format
-msgid "Unable to initialize SDL_ttf library: %s"
+msgid "Unable to initialize SDL_ttf library: %s"
msgstr ""
#: client/gui-sdl/graphics.c:1058
@@ -13669,12 +13904,6 @@ msgstr ""
msgid "Waiting for the beginning of the game"
msgstr ""
-#: client/gui-sdl/gui_string.c:608
-msgid ""
-"Couldn't find stdfont.ttf file. Please link/copy/move anyunicode ttf font to "
-"data dir as stdfont.ttf"
-msgstr ""
-
#. TRANS: Future Technology
#: client/gui-sdl/gui_tilespec.c:506
msgid "FT"
@@ -14293,12 +14522,12 @@ msgid "Leave Game"
msgstr "úÂÅÒÅÇÔÉ ÇÒÕ"
#: client/gui-sdl/optiondlg.c:2302 client/gui-sdl/pages.c:255
-#: client/gui-win32/connectdlg.c:1098 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1100 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:963
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
msgid "Start New Game"
msgstr "óÔÁÒÔÕ×ÁÔÉ ÎÏ×Õ ÇÒÕ"
@@ -14425,8 +14654,8 @@ msgstr ""
msgid "%s max rate : %d%%"
msgstr "%s ÍÁËÓÉÍÁÌØÎÉÊ Ò¦×ÅÎØ: %d%%"
-#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1081
-#: client/gui-win32/connectdlg.c:1089 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
+#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
msgid "Update"
msgstr "ðÏÎÏ×ÉÔÉ"
@@ -14850,10 +15079,6 @@ msgstr "
msgid "Refresh"
msgstr "ðÏÎÏ×ÉÔÉ"
-#: client/gui-win32/cityrep.c:882
-msgid "Select"
-msgstr "ïÂÅÒ¦ÔØ"
-
#: client/gui-win32/cityrep.c:883
msgid "Configure"
msgstr "ëÏÎƦÇÕÒÕ×ÁÔÉ"
@@ -14905,60 +15130,60 @@ msgstr "
msgid "Verify Password"
msgstr ""
-#: client/gui-win32/connectdlg.c:912 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr "÷ÉÂ¦Ò ÓÅÒ×ÅÒÁ Freeciv"
-#: client/gui-win32/connectdlg.c:913
+#: client/gui-win32/connectdlg.c:915
msgid "Local Area Network"
msgstr ""
-#: client/gui-win32/connectdlg.c:947
+#: client/gui-win32/connectdlg.c:949
#, fuzzy
msgid "Welcome to Freeciv"
msgstr "ë̦¤ÎÔ ÄÌÑ Freeciv"
-#: client/gui-win32/connectdlg.c:965
+#: client/gui-win32/connectdlg.c:967
#, fuzzy
msgid "Load Saved Game"
msgstr "úÂÅÒÅÇÔÉ ÇÒÕ"
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
msgid "Connect To Network Game"
msgstr ""
-#: client/gui-win32/connectdlg.c:977
+#: client/gui-win32/connectdlg.c:979
msgid "Choose a nation to play"
msgstr ""
-#: client/gui-win32/connectdlg.c:1012
+#: client/gui-win32/connectdlg.c:1014
#, fuzzy
msgid "Number of players (Including AI):"
msgstr "ë¦ÌØ˦ÓÔØ ËÏÍÐ'ÀÔÅÒÎÉÈ ÇÒÁ×æ×."
-#: client/gui-win32/connectdlg.c:1020
+#: client/gui-win32/connectdlg.c:1022
msgid "AI skill level:"
msgstr ""
-#: client/gui-win32/connectdlg.c:1034 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
#, fuzzy
msgid "Game Options"
msgstr "ïÐæ§ ÐÏצÄÏÍÌÅÎØ"
-#: client/gui-win32/connectdlg.c:1038
+#: client/gui-win32/connectdlg.c:1040
msgid "Start Game"
msgstr "óÔÁÒÔÕ×ÁÔÉ ÇÒÕ"
-#: client/gui-win32/connectdlg.c:1057
+#: client/gui-win32/connectdlg.c:1059
#, fuzzy
msgid "Login:"
msgstr "ìÅǦÏÎ"
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
msgid "Host:"
msgstr "áÄÒÅÓÁ:"
-#: client/gui-win32/connectdlg.c:1060
+#: client/gui-win32/connectdlg.c:1062
msgid "Port:"
msgstr "ðÏÒÔ:"
@@ -15223,10 +15448,6 @@ msgstr[0] "(
msgstr[1] "(ÐÒÏÓÔÏÀ¤ %d ÈÏÄÉ)"
msgstr[2] "(ÐÒÏÓÔÏÀ¤ %d ÈÏĦ×)"
-#: client/gui-win32/plrdlg.c:337 data/Freeciv.in:88
-msgid "Host"
-msgstr "èÏÓÔ"
-
#: client/gui-win32/plrdlg.c:355 data/Freeciv.in:3230
msgid "Intelligence"
msgstr "òÏÚצÄËÁ"
@@ -16954,12 +17175,12 @@ msgstr ""
#: data/helpdata.txt:781
msgid ""
-" To have a diplomatic relationship with another player, you must fist "
-"establish first contact with that player. To establish first contact, you "
-"have to move one of your units next to a city or unit belonging to that "
-"player, or vice versa. Unless you establish an embassy with that player, you "
-"may again lose contact with them after a set number of turns without direct "
-"physical contact."
+" To have a diplomatic relationship with another player, you must first "
+"establish contact with that player. To establish contact, you have to move "
+"one of your units next to a city or unit belonging to that player, or vice "
+"versa. Unless you establish an embassy with that player, you may again lose "
+"contact with them after a set number of turns without direct physical "
+"contact."
msgstr ""
#: data/helpdata.txt:788
@@ -19700,7 +19921,7 @@ msgid "Communism"
msgstr "ëÏÍÕΦÚÍ"
#: data/default/governments.ruleset:121 data/civ2/governments.ruleset:118
-#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:26
+#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:27
msgid "Comrade"
msgstr "ôÏ×ÁÒÉÛ"
@@ -20708,6 +20929,11 @@ msgstr ""
"ÂÕÔÉ ×ÓÔÒÁÞÅÎÏ ÔÁ ÇÒÕÐÁ ëÏÌÏΦÓÔ¦× ÔÁ/ÁÂÏ ¶ÎÖÅÎÅÒ¦× ÄÕÖÅ ×ÒÁÚÌÉ×Á ÄÏ ×ÏÒÏÖ¦È "
"ÁÔÁË."
+#: data/default/units.ruleset:238
+#, fuzzy
+msgid "?unit:Workers"
+msgstr "ðÒÁæ×ÎÉËÉ"
+
#: data/default/units.ruleset:264
#, fuzzy
msgid ""
@@ -21366,6 +21592,11 @@ msgstr "
msgid "Explorers are very useful for mapping unknown territory."
msgstr "äÏÓ̦ÄÎÉËÉ ÓÔÁÀÔØ Õ ÐÒÉÇÏĦ ÐÒÉ ÄÏÓ̦ÄÖÅÎΦ ÎÅצÄÏÍÉÈ ÔÅÒÉÔÏÒ¦Ê."
+#: data/default/units.ruleset:1864
+#, fuzzy
+msgid "?unit:Leader"
+msgstr "çÏÌÏ×Á"
+
#: data/default/units.ruleset:1892
msgid "This is you. If you lose this unit, you lose the game. So don't."
msgstr ""
@@ -21631,7 +21862,7 @@ msgid "Emir"
msgstr ""
#: data/nation/afghani.ruleset:25 data/nation/slovakian.ruleset:30
-#: data/nation/soviet.ruleset:27
+#: data/nation/soviet.ruleset:28
#, fuzzy
msgid "General Secretary"
msgstr "ðÅÒÛÉÊ óÅËÒÅÔÁÒ"
@@ -21758,7 +21989,7 @@ msgstr "
msgid ""
"According to legend, the Armenian people are the descendants of Haik - the "
"great-great-grandson of Noah. The modern Republic of Armenia gained "
-"independence from Soviet in 1991 AD"
+"independence from the Soviet Union in 1991."
msgstr ""
#: data/nation/assyrian.ruleset:3
@@ -22817,12 +23048,11 @@ msgstr "
#: data/nation/illyrian.ruleset:6
msgid ""
-"Illyrians were Indo-European tribes who appeared in the western part of the "
-"Balkan Peninsula before 1000 BC, including the Dalmatians to the north, "
-"Corcyra island and Ambracia bay in prehistoric Epirus to the south, mixing "
-"with Thracians in Dardania to the east, and settling Messapia across the "
-"Adriatic Sea. Illyrian kingdoms were independent for centuries, until "
-"conquered by the Roman Republic."
+"Illyrians were Indo-European tribes who appeared in the western part of the "
+"Balkan Peninsula before 1000 BC, including Corcyra island and Ambracia bay "
+"in prehistoric Epirus to the south. They mixed with Thracians in Dardania to "
+"the east, and settled Messapia across the Adriatic Sea. Illyrian kingdoms "
+"were independent for centuries, until conquered by the Roman Republic."
msgstr ""
#: data/nation/inca.ruleset:3
@@ -23140,7 +23370,7 @@ msgid ""
"1953."
msgstr ""
-#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:28
+#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:29
#, fuzzy
msgid "Great Leader"
msgstr "äÉ×Ï"
@@ -23317,9 +23547,9 @@ msgstr "
msgid ""
"Sub-Saharan Africa has been a cultural and ethnical melting pot for "
"millennia. In medieval times, the region was home to a succession of empires "
-"called the Sahelian kingdoms. Of these, the Islamic Mali empire with it's "
+"called the Sahelian kingdoms. Of these, the Islamic Mali empire with its "
"capital in Timbuktu was the most influential. This empire reigned from the "
-"14th to the 17th century and was famed for it's wealth and benevolent kings. "
+"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 ""
@@ -23388,8 +23618,8 @@ msgstr "
#: data/nation/mayan.ruleset:6
msgid ""
-"The Mayans were a Mesoamerican civilization. Famous for building great "
-"pyramids and palaces in the jungle."
+"The Mayans were a Mesoamerican civilization. They are famous for building "
+"great pyramids and palaces in the jungle."
msgstr ""
#: data/nation/mayan.ruleset:19
@@ -23937,6 +24167,16 @@ msgstr ""
"óÕÞÁÓÎÁ þÅÓØËÁ ÒÅÓÐÕÂ̦ËÁ ¦ÓÎÕ×ÁÌÁ ÄÏ 1993 ÑË ÞÁÓÔÉÎÁ þÅÈÏÓÌÏ×Á˦§, ÝÏ ÂÕÌÁ "
"ÞÁÓÔÉÎÏÀ á×ÓÔÒÏ-õÇÏÒÓØËϧ ¦ÍÐÅÒ¦§ ÄÏ 1918."
+#: data/nation/slovakian.ruleset:26
+#, fuzzy
+msgid "?male:Leader"
+msgstr "çÏÌÏ×Á"
+
+#: data/nation/slovakian.ruleset:26
+#, fuzzy
+msgid "?female:Leader"
+msgstr "ôÏ×ÁÒÉÛ"
+
#: data/nation/slovakian.ruleset:29
#, fuzzy
msgid "Pope"
@@ -23981,11 +24221,12 @@ msgstr "
#: data/nation/soviet.ruleset:6
msgid ""
-"Soviet Union's history starts in November 1917, when under Lenin's "
+"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 "
-"republics integrated into one country. Soviet Union became one of most "
-"powerful states in the 20th century. But by the end of 1991 due to many "
-"social shocks it disintegrated into fifteen independent countries"
+"republics integrated into one country. The Soviet Union became one of most "
+"powerful states in the 20th century, but by the end of 1991 it had "
+"disintegrated into fifteen independent countries due to social and economic "
+"problems."
msgstr ""
#: data/nation/spanish.ruleset:3
@@ -24398,8 +24639,8 @@ msgstr "
#: data/nation/westphalian.ruleset:6
msgid ""
-"Westphalia, before becoming a Prussian province, was the western region the "
-"duchy of Saxony. Present-day it consists of the Northern part of the largest "
+"Westphalia, before becoming a Prussian province, was the western region of "
+"the duchy of Saxony. Today it makes up the northern part of the largest "
"German federal state, North Rhine-Westphalia."
msgstr ""
@@ -24549,7 +24790,7 @@ msgid ""
"The flag and background color indicate what civilization the city\n"
"belongs to (this will be useful when you meet other civilizations).\n"
"The top row of the bar also shows the name and size of the city, and\n"
-"will show one or more starts to indicate if there are units in the\n"
+"will show one or more stars to indicate if there are units in the\n"
"city. The bottom row shows what the city is building, and how long it\n"
"will take; it also shows how long the city will take to grow to the\n"
"next largest size."
@@ -24605,7 +24846,7 @@ msgid ""
"Now your city has grown to size five. As cities get larger unrest\n"
"becomes a problem. A city of this size will usually have one unhappy\n"
"citizen unless pacifying effects are used; meaning one entertainer\n"
-"specialist is required to keep your citzens content. This is basically\n"
+"specialist is required to keep your citizens content. This is basically\n"
"a wasted citizen.\n"
"\n"
"There are several things that can be done about this. One quick fix\n"
@@ -24677,7 +24918,7 @@ msgid ""
"existing cities. Generally when building new cities you want to make\n"
"sure that all tiles are covered by at least one city, but after that\n"
"it is best that your cities overlap as little as possible. Spreading\n"
-"out cities properly gives each city access to more resrouces, allowing\n"
+"out cities properly gives each city access to more resources, allowing\n"
"them to grow to larger sizes."
msgstr ""
@@ -24991,6 +25232,61 @@ msgstr "
msgid "Team 31"
msgstr "ëÏÍÁÎÄÁ"
+#, fuzzy
+#~ msgid "Auth config filename \"%s\" not allowed!"
+#~ msgstr "ñ˦ Ú'¤ÄÎÁÎÎÑ ÄÏÚ×ÏÌÅΦ."
+
+#, fuzzy
+#~ msgid "The %s of the %s (%s)"
+#~ msgstr "%s Ú %s"
+
+#, fuzzy
+#~ msgid "And, became more experienced!"
+#~ msgstr " ×ÄÁÌÁÓÑ!"
+
+#, fuzzy
+#~ msgid "%s territory"
+#~ msgstr "%s"
+
+#, fuzzy
+#~ msgid "%s territory (%d turn cease-fire)"
+#~ msgid_plural "%s territory (%d turn cease-fire)"
+#~ msgstr[0] "ð¦ÄÒÏÚĦÌ: %s(%s%s)"
+#~ msgstr[1] "ð¦ÄÒÏÚĦÌ: %s(%s%s)"
+#~ msgstr[2] "ð¦ÄÒÏÚĦÌ: %s(%s%s)"
+
+#, fuzzy
+#~ msgid "%s territory (%s)"
+#~ msgstr "%s Ú %s"
+
+#, fuzzy
+#~ msgid "City: %s (%s)"
+#~ msgstr "í¦ÓÔÏ: %s(%s)"
+
+#, fuzzy
+#~ msgid "Unit: %s (%s)"
+#~ msgstr "ð¦ÄÒÏÚĦÌ: %s(%s)"
+
+#, fuzzy
+#~ msgid "%s of the %s"
+#~ msgstr "%s Ú %s"
+
+#~ msgid "no maximum, "
+#~ msgstr "ÎÅ ÍÁËÓ¦ÍÕÍ, "
+
+#~ msgid "%d unit maximum, "
+#~ msgid_plural "%d units maximum, "
+#~ msgstr[0] "%d ЦÄÒÏÚÄ¦Ì ÍÁËÓÉÍÕÍ, "
+#~ msgstr[1] "%d ЦÄÒÏÚĦÌÉ ÍÁËÓÉÍÕÍ, "
+#~ msgstr[2] "%d ЦÄÒÏÚÄ¦Ì¦× ÍÁËÓÉÍÕÍ, "
+
+#~ msgid "%d per unit). "
+#~ msgstr "%d ÎÁ ЦÄÒÏÚĦÌ). "
+
+#, fuzzy
+#~ msgid "Select same type"
+#~ msgstr "ïÂÒÁÔÉ Í¦ÓÔÏ"
+
#~ msgid "Units: "
#~ msgstr "ð¦ÄÒÏÚĦÌÉ: "
@@ -25080,10 +25376,6 @@ msgstr "
#~ msgstr ", ÎÁÃ¦Ñ %s"
#, fuzzy
-#~ msgid ", team %s"
-#~ msgstr " ¦ÌÑ %s"
-
-#, fuzzy
#~ msgid "_Map"
#~ msgstr "íÁÐÉ"
@@ -26841,10 +27133,6 @@ msgstr "
#~ msgstr "ðÏÍÉÌËÁ ÓÔ×ÏÒÅÎÎÑ ÎÏ×ÏÇÏ ËÏÍÐ'ÀÔÅÒÎÏÇÏ ÇÒÁ×ÃÑ: %s\n"
#, fuzzy
-#~ msgid "Metaserver topic string set to '%s'."
-#~ msgstr "¶ÎÆÏÒÍÁæÊÎÕ ÓÔÒÏËÕ ÍÅÔÁÓÅÒ×ÅÒÁ ×ÓÔÁÎÏ×ÌÅÎÏ Õ '%s'."
-
-#, fuzzy
#~ msgid "Metaserver topic string set to '%s', not reporting to metaserver."
#~ msgstr "¶ÎÆÏÒÍÁæÊÎÕ ÓÔÒÏËÕ ÍÅÔÁÓÅÒ×ÅÒÁ ×ÓÔÁÎÏ×ÌÅÎÏ Õ '%s'."
@@ -28118,9 +28406,6 @@ msgstr "
#~ msgid "("
#~ msgstr "("
-#~ msgid "Location: (%d, %d)"
-#~ msgstr "òÏÚͦÝÅÎÎÑ: (%d, %d)"
-
#~ msgid "_Kingdom"
#~ msgstr "ëÏÒÏ̦×ÓÔ×Ï"
diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo
index 732e7c1..4ad7842 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 ceb5067..93c8d45 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: freeciv\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 07:45+0900\n"
+"POT-Creation-Date: 2009-03-29 21:13+0900\n"
"PO-Revision-Date: 2006-03-26 14:53+0800\n"
"Last-Translator: Hongjia Cao <hjcao at yahoo.com>\n"
"Language-Team: zh_CN <i18n-translation at linux.net.cn>\n"
@@ -653,7 +653,7 @@ msgid "Road"
msgstr "¹«Â·"
#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
-#: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
+#: client/gui-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"
@@ -670,7 +670,7 @@ msgid "Mine"
msgstr "¿ó¾®"
#: common/terrain.c:396 common/unit.c:548 server/report.c:124
-#: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
+#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr "ÎÛȾ"
@@ -716,7 +716,7 @@ msgstr "
msgid "Sentry"
msgstr "·ÅÉÚ"
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:851 client/gui-sdl/menu.c:648
+#: common/unit.c:566 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 "ÂÓ¶á"
@@ -733,7 +733,7 @@ msgstr "
msgid "Transform"
msgstr "¸ÄÔì"
-#: common/unit.c:584 client/text.c:106 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:584 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 "δ֪"
@@ -806,11 +806,11 @@ msgstr "
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1406
+#: common/unittype.c:349 client/helpdata.c:1404
msgid " and "
msgstr "£¬"
-#: common/unittype.c:355 client/helpdata.c:1392
+#: common/unittype.c:355 client/helpdata.c:1390
msgid "?and:, "
msgstr "£¬"
@@ -1365,104 +1365,99 @@ msgstr ""
#: server/auth.c:281
#, fuzzy, c-format
-msgid "Auth config filename \"%s\" not allowed!"
-msgstr "²»ÄÜʹÓøÃÃû×Ö¡£"
-
-#: server/auth.c:286
-#, fuzzy, c-format
msgid "Cannot load auth config file \"%s\"!"
msgstr "ÎÞ·¨ÕÒµ½ÒôЧÎļþ %s"
-#: server/auth.c:397
+#: server/auth.c:392
#, c-format
msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
msgstr "¾¯¸æ£º ¿ÍÈËÃû×Ö¡°%s¡±Òѱ»Ê¹Ó㬸üÃûΪ¡°%s¡±¡£"
-#: server/auth.c:404
+#: server/auth.c:399
msgid "Guests are not allowed on this server. Sorry."
msgstr "±§Ç¸£¬´Ë·þÎñÆ÷²»ÔÊÐí·Ã¿Í¡£"
-#: server/auth.c:406
+#: server/auth.c:401
#, fuzzy, c-format
msgid "%s was rejected: Guests not allowed."
msgstr "%s ±»¾Ü¾ø£ºÖظ´µÄµÇ¼Ãû [%s]¡£"
-#: server/auth.c:425
+#: server/auth.c:420
#, c-format
msgid ""
"There was an error reading the user database, logging in as guest connection "
"'%s'."
msgstr "¶ÁÈ¡Óû§Êý¾Ý¿â·¢Éú´íÎ󣬽«×÷Ϊ¿ÍÈËÁ¬½Ó¡°%s¡±µÇ¼¡£"
-#: server/auth.c:431
+#: server/auth.c:426
msgid ""
"There was an error reading the user database and guest logins are not "
"allowed. Sorry"
msgstr "¶ÁÈ¡Óû§Êý¾Ý¿â·¢Éú´íÎó²¢ÇÒ²»ÔÊÐí¿ÍÈ˵Ǽ¡£±§Ç¸"
-#: server/auth.c:434
+#: server/auth.c:429
#, c-format
msgid "%s was rejected: Database error and guests not allowed."
msgstr ""
-#: server/auth.c:441
+#: server/auth.c:436
#, c-format
msgid "Enter password for %s:"
msgstr "ÇëÊäÈë %s µÄ¿ÚÁ"
-#: server/auth.c:450
+#: server/auth.c:445
msgid "Enter a new password (and remember it)."
msgstr "ÇëÊäÈëпÚÁ²¢¼ÇסËü£©¡£"
-#: server/auth.c:456
+#: server/auth.c:451
msgid "This server allows only preregistered users. Sorry."
msgstr "´Ë·þÎñÆ÷Ö»ÔÊÐíÔ¤ÏÈ×¢²áµÄÓû§¡£±§Ç¸¡£"
-#: server/auth.c:459
+#: server/auth.c:454
#, fuzzy, c-format
msgid "%s was rejected: Only preregister users allowed."
msgstr "´Ë·þÎñÆ÷Ö»ÔÊÐíÔ¤ÏÈ×¢²áµÄÓû§¡£±§Ç¸¡£"
-#: server/auth.c:488 server/auth.c:547
+#: server/auth.c:483 server/auth.c:542
msgid "Sorry, too many wrong tries..."
msgstr "±§Ç¸£¬Ì«¶à´íÎó³¢ÊÔÁË¡¡"
-#: server/auth.c:489
+#: server/auth.c:484
#, c-format
msgid "%s was rejected: Too many wrong password verifies for new user."
msgstr ""
-#: server/auth.c:505
+#: server/auth.c:500
msgid ""
"Warning: There was an error in saving to the database. Continuing, but your "
"stats will not be saved."
msgstr ""
"¾¯¸æ£º ±£´æµ½Êý¾Ý¿â¹ý³ÌÖз¢Éú´íÎó¡£¼ÌÐøÖУ¬µ«ÊÇÄúµÄͳ¼ÆÐÅÏ¢½«²»»á±»±£´æ¡£"
-#: server/auth.c:549
+#: server/auth.c:544
#, fuzzy, c-format
msgid "%s was rejected: Too many wrong password tries."
msgstr "%s ±»¾Ü¾ø£º²»Æ¥ÅäµÄ¹¦ÄÜ¡£"
-#: server/auth.c:558
+#: server/auth.c:553
msgid "Your password is incorrect. Try again."
msgstr "ÄúµÄ¿ÚÁî²»ÕýÈ·¡£ÇëÔÙÊÔÒ»´Î¡£"
-#: server/auth.c:569
+#: server/auth.c:564
msgid "Sorry, your connection timed out..."
msgstr ""
-#: server/auth.c:571
+#: server/auth.c:566
#, c-format
msgid "%s was rejected: Connection timeout waiting for password."
msgstr ""
-#: server/auth.c:636
+#: server/auth.c:631
#, c-format
msgid "Your password is too short, the minimum length is %d. Try again."
msgstr "ÄúµÄ¿ÚÁîÌ«¶Ì£¬×îС³¤¶ÈÊÇ %d ¡£ÇëÔÙÊÔÒ»´Î¡£"
-#: server/auth.c:642
+#: server/auth.c:637
#, c-format
msgid ""
"The password must have at least %d capital letters, %d numbers, and be at "
@@ -1943,7 +1938,7 @@ msgstr "
msgid "You can learn a lot about Freeciv at %s"
msgstr "Äú¿ÉÒÔ´Ó %s »ñµÃ´óÁ¿¹ØÓÚ Freeciv µÄÐÅÏ¢¡£"
-#: server/civserver.c:206 client/civclient.c:237 manual/civmanual.c:380
+#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
@@ -1971,13 +1966,13 @@ msgstr " -N --Newusers\t
msgid " -b --bind ADDR\tListen for clients on ADDR\n"
msgstr " -b --bind ADDR\tÔÚµØÖ· ADDR ÉϼàÌý¿Í»§¶ËÁ¬½Ó\n"
-#: server/civserver.c:217 client/civclient.c:241
+#: server/civserver.c:217 client/civclient.c:242
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:245
+#: server/civserver.c:221 client/civclient.c:246
msgid " -d, --debug NUM\tSet debug log level (0 to 3)\n"
msgstr " -d, --debug NUM\t½«µ÷ÊÔÈÕÖ¾¼¶±ðÉèÖÃΪ (0 µ½ 3)\n"
@@ -1985,7 +1980,7 @@ msgstr " -d, --debug NUM\t
msgid " -f, --file FILE\tLoad saved game FILE\n"
msgstr " -f, --file FILE\t´Ó FILE ÖÐÔØÈë±£´æµÄÓÎÏ·\n"
-#: server/civserver.c:225 client/civclient.c:248 manual/civmanual.c:382
+#: server/civserver.c:225 client/civclient.c:249 manual/civmanual.c:382
msgid " -h, --help\t\tPrint a summary of the options\n"
msgstr " -h, --help\t\t´òÓ¡Ñ¡Ïî¸ÅÊö\n"
@@ -2033,11 +2028,11 @@ msgstr " -r, --read FILE\t
msgid " -R, --Ranklog FILE\tUse FILE as ranking logfile\n"
msgstr " -R, --Ranklog FILE\tʹÓà FILE ×÷Ϊ¼¶±ðÈÕÖ¾Îļþ\n"
-#: server/civserver.c:247 client/civclient.c:267 manual/civmanual.c:383
+#: server/civserver.c:247 client/civclient.c:268 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:279
+#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, c-format
@@ -3247,7 +3242,7 @@ msgstr "%s
msgid "Sea moving start units are not yet supported. Nobody gets %s."
msgstr "»¹²»Ö§³Öº£ÑóÒƶ¯µÄ³õʼ²¿¶Ó¡£Ã»È˵õ½ %s ¡£"
-#: server/gamehand.c:310 client/text.c:632
+#: server/gamehand.c:310 client/text.c:691
#, c-format
msgid "Year: %s"
msgstr "Äê´ú£º%s"
@@ -3512,10 +3507,10 @@ msgid "Could not throw %s into civil war - no available nations"
msgstr "²»ÄÜ°Ñ %s Ç£ÈëÄÚÕ½ £ Íæ¼ÒÌ«¶à"
#: server/plrhand.c:1686
-#, c-format
+#, fuzzy, c-format
msgid ""
-"Your nation is thrust into civil war, %s is declared the leader of the "
-"rebel states."
+"Your nation is thrust into civil war! %s is declared the leader of the rebel "
+"states."
msgstr "ÄúµÄ¹ú¼Ò±»ÍÆÈëÄÚÕ½£¬%s ±»Ðû²¼ÎªÆðÒåÕþ¸®µÄÊ×Áì¡£"
#: server/plrhand.c:1707
@@ -3612,7 +3607,7 @@ msgstr "
msgid "Literacy"
msgstr "ÎÄѧ"
-#: server/report.c:121 client/cityrepdata.c:526 client/cityrepdata.c:527
+#: server/report.c:121 client/cityrepdata.c:524 client/cityrepdata.c:525
#: client/gui-sdl/cityrep.c:174
msgid "Production"
msgstr "Éú²ú"
@@ -3759,7 +3754,7 @@ msgstr "
msgid "Demography string contains invalid characters. Try \"help demography\"."
msgstr "ÈË¿Úͳ¼Æ´®°üº¬ÎÞЧµÄ×Ö·û¡£Çë³¢ÊÔ¡°help demography¡±¡£"
-#: server/report.c:743 server/report.c:766
+#: server/report.c:743 server/report.c:768
msgid "Demographics Report:"
msgstr "ÈË¿Úͳ¼Æ±¨¸æ£º"
@@ -3767,10 +3762,12 @@ msgstr "
msgid "Sorry, the Demographics report is unavailable."
msgstr "±§Ç¸£¬ÈË¿Úͳ¼Æ±¨¸æÉв»¿ÉÓá£"
-#: server/report.c:748
-#, c-format
-msgid "The %s of the %s (%s)"
-msgstr "%2$s£¨%3$s£© µÄ %1$s"
+#. TRANS: <nation adjective> <government name> (<year>).
+#. * E.g. "Polish Despotism (200 AD)".
+#: server/report.c:750
+#, fuzzy, c-format
+msgid "%s %s (%s)"
+msgstr "%2$s £¨%3$s£© ÖÐµÄ %1$s\n"
#. TRANS: message about an installation error.
#: server/ruleset.c:163
@@ -3822,14 +3819,6 @@ msgstr "
msgid "%s had invalid nation; changing to %s."
msgstr ""
-#. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4073
-#, fuzzy, c-format
-msgid ""
-"Illegal alliance structure detected: %s alliance to %s reduced to peace "
-"treaty."
-msgstr "¼ì²âµ½·Ç·¨½áÃ˽ṹ£º %s ¶Ô %s ½áÃ˸ıäΪºÍƽж¨¡£"
-
#: server/settings.c:32
msgid "Geological"
msgstr "µØÖÊ"
@@ -4987,9 +4976,10 @@ msgid "Auto-save name prefix"
msgstr "×Ô¶¯±£´æÃû³Æǰ׺"
#: server/settings.c:1016
+#, fuzzy
msgid ""
-"Automatically saved games will have name \"<prefix><year>.sav\". This "
-"setting sets the <prefix> part."
+"Automatically saved games will have name \"<prefix>-T<turn>-Y<year>.sav\". "
+"This setting sets the <prefix> part."
msgstr ""
"×Ô¶¯±£´æµÄÓÎÏ·½«¾ßÓÐÃû×Ö¡°<ǰ׺><Äê´ú>.sav¡±¡£´ËÑ¡ÏÉèÖÃ<ǰ׺>²¿·ÖµÄ¸ñʽ¡£"
@@ -5006,11 +4996,11 @@ msgstr ""
"Èç¹û±»ÖÃΪ1£¬Ôòÿ¸ö»ØºÏºó¶¼½«°ÑÍæ¼Òͳ¼ÆÐÅÏ¢Ìí¼Óµ½Îļþ¡°civscore.log¡±ÖС£ÕâЩ"
"ͳ¼ÆÐÅÏ¢¿ÉÒÔÔÚÓÎÏ·½áÊøºóÓÃÓÚ´´½¨ÊÆÁ¦Í¼¡£"
-#: server/sernet.c:147
+#: server/sernet.c:150
msgid "Server cannot read standard input. Ignoring input."
msgstr "·þÎñÆ÷ÎÞ·¨¶ÁÈë±ê×¼ÊäÈë¡£ºöÂÔÊäÈë¡£"
-#: server/sernet.c:922
+#: server/sernet.c:929
#, c-format
msgid "Server: bad address: [%s:%d]."
msgstr "·þÎñÆ÷£º´íÎóµÄµØÖ·£º[%s:%d]¡£"
@@ -5129,112 +5119,112 @@ msgid ""
"alliance with both."
msgstr "ÄúµÄÍŶӻï°é %s ¶Ô %s ÐûÕ½ÁË¡£Äú±»ÆÈÈ¡ÏûÁËÓë %s µÄͬÃË¡£"
-#: server/srv_main.c:928
+#: server/srv_main.c:961
#, c-format
msgid "Failed saving game as %s"
msgstr "½«ÓÎÏ·±£´æΪ %s ʧ°Ü"
-#: server/srv_main.c:930
+#: server/srv_main.c:963
#, c-format
msgid "Game saved as %s"
msgstr "ÓÎÏ·ÒÑ´æΪ %s"
-#: server/srv_main.c:962
+#: server/srv_main.c:994
msgid "The game is already running."
msgstr "ÓÎÏ·ÒѾÔËÐС£"
-#: server/srv_main.c:970
+#: server/srv_main.c:1002
#, c-format
msgid "%s lost control cmdlevel on game start. Use voting from now on."
msgstr "ÓÎÏ·¿ªÊ¼Ê± %s ʧȥÁË¿ØÖÆÃüÁ±ð¡£´ÓÏÖÔÚ¿ªÊ¼Ê¹ÓÃͶƱ¡£"
-#: server/srv_main.c:977
+#: server/srv_main.c:1009
msgid "Starting game."
msgstr "ÕýÔÚÆô¶¯ÓÎÏ·¡£"
-#: server/srv_main.c:1039
+#: server/srv_main.c:1071
#, c-format
msgid "request for unknown report (type %d)"
msgstr "δ֪µÄ±¨¸æÇëÇó£¨ÀàÐÍ %d£©"
-#: server/srv_main.c:1104
+#: server/srv_main.c:1136
#, c-format
msgid "Warning: rejecting old client %s"
msgstr "¾¯¸æ£º ¾Ü¾ø¾ÉµÄ¿Í»§¶Ë %s "
-#: server/srv_main.c:1206
+#: server/srv_main.c:1238
#, c-format
msgid "Got a packet of type %d from a dead or observer player"
msgstr "ÊÕµ½À´×ÔËÀÍö»ò¹Û²ìÕßÍæ¼ÒµÄÀàÐÍΪ %d µÄ±¨ÎÄ"
-#: server/srv_main.c:1306
+#: server/srv_main.c:1338
msgid "Please choose a non-blank name."
msgstr "ÇëÑ¡ÔñÒ»¸ö·Ç¿ÕµÄÃû×Ö¡£"
-#: server/srv_main.c:1322
+#: server/srv_main.c:1354
msgid "That nation is already in use."
msgstr "¸ÃÃñ×åÒѾ±»Ê¹ÓÃÁË¡£"
-#: server/srv_main.c:1338
+#: server/srv_main.c:1370
#, c-format
msgid "Another player already has the name '%s'. Please choose another name."
msgstr "ÆäËüµÄÍæ¼ÒÒѾʹÓÃÁËÃû×Ö¡°%s¡±¡£ÇëÑ¡ÔñÁíÒ»¸öÃû×Ö¡£"
-#: server/srv_main.c:1359
+#: server/srv_main.c:1391
msgid "Please choose a name containing only ASCII characters."
msgstr "ÇëÑ¡ÔñÒ»¸ö½ö°üº¬ ASCII ×Ö·ûµÄÃû×Ö¡£"
-#: server/srv_main.c:1458
+#: server/srv_main.c:1490
#, c-format
msgid "%s nation is not available in this scenario."
msgstr "Ãñ×å %s ÔÚÕâ¸öÇé¾°Öв»ÄÜʹÓá£"
-#: server/srv_main.c:1464
+#: server/srv_main.c:1496
#, c-format
msgid "%s nation is already in use."
msgstr "%s Ãñ×åÒѾ±»Ê¹ÓÃÁË¡£"
-#: server/srv_main.c:1482
+#: server/srv_main.c:1514
#, c-format
msgid "%s is the %s ruler %s."
msgstr "%s ³ÉΪ %s µÄͳÖÎÕß %s ¡£"
-#: server/srv_main.c:1538
+#: server/srv_main.c:1570
#, 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:1582 server/srv_main.c:1586
+#: server/srv_main.c:1614 server/srv_main.c:1618
#, c-format
msgid "%s has been added as %s level AI-controlled player."
msgstr "%s ÒѾ×÷Ϊ %s ¼¶±ðµÄ AI Íæ¼Ò¼ÓÈë¡£"
-#: server/srv_main.c:1728
+#: server/srv_main.c:1760
#, c-format
msgid "Player %d"
msgstr "Íæ¼Ò %d"
-#: server/srv_main.c:1739 server/srv_main.c:1745
+#: server/srv_main.c:1771 server/srv_main.c:1777
#, c-format
msgid "%s rules the %s."
msgstr "%s ͳÖÎ %s¡£"
-#: server/srv_main.c:1910
+#: server/srv_main.c:1942
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
msgstr ""
-#: server/srv_main.c:1961
+#: server/srv_main.c:1993
#, c-format
msgid "Sending info to metaserver [%s]"
msgstr "½«ÐÅÏ¢·¢Ë͵½Ôª·þÎñÆ÷ [%s]"
-#: server/srv_main.c:1992
+#: server/srv_main.c:2024
msgid "The game is over..."
msgstr "ÓÎÏ·½áÊø..."
-#: server/srv_main.c:2205
+#: server/srv_main.c:2237
msgid "Now accepting new client connections."
msgstr "ÏÖÔÚ½ÓÊÜпͻ§¶ËµÄÁ¬½Ó¡£"
@@ -6033,24 +6023,24 @@ msgid "Barbarian"
msgstr "Ò°ÈË"
#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2030 client/gui-sdl/plrdlg.c:645
+#: client/gui-gtk-2.0/pages.c:2102 client/gui-sdl/plrdlg.c:645
#: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
msgid "AI"
msgstr "AI"
#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
+#: 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
msgid "Human"
msgstr "ÕæÈË"
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
-#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
+#: 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
msgid "Alive"
msgstr "»îµÄ"
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
#: client/gui-win32/connectdlg.c:200
msgid "Dead"
msgstr "ËÀµÄ"
@@ -6314,9 +6304,9 @@ 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:242
-#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
-#: client/text.c:1201
+#: 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
#, c-format
msgid "?clistmore:, %s"
msgstr " %s"
@@ -6562,7 +6552,7 @@ msgstr "Ö»
msgid "Cannot attack from sea."
msgstr "ÎÞ·¨´Óº£Ñó½øÐй¥»÷¡£"
-#: server/unithand.c:996 server/unittools.c:2103
+#: server/unithand.c:996 server/unittools.c:2137
msgid "Cannot attack unless you declare war first."
msgstr "³ý·ÇÄúÊ×ÏÈÐûÕ½·ñÔòÎÞ·¨¹¥»÷¡£"
@@ -6658,101 +6648,101 @@ msgid "%s was upgraded for free to %s."
msgstr "ÒѾ½« %s Ãâ·ÑÉý¼¶µ½ %s¡£"
#: server/unittools.c:297
-#, c-format
-msgid "Not enough gold. %s disbanded"
+#, fuzzy, c-format
+msgid "Not enough gold to pay upkeep for %s. Unit disbanded."
msgstr "»Æ½ð²»×ã¡£ %s ±»½âÉ¢ÁË"
-#: server/unittools.c:342
+#: server/unittools.c:343
#, c-format
msgid "Your %s has run out of hit points."
msgstr "ÄúµÄ %s ÒѾºÄ¾¡ÁËÉúÃüÖµ¡£"
-#: server/unittools.c:358
+#: server/unittools.c:359
#, c-format
msgid "Your %s has been lost on the high seas."
msgstr "ÄúµÄ %s ÔÚÔ¶º£Ê§×ÙÁË¡£"
-#: server/unittools.c:365
+#: server/unittools.c:366
#, c-format
msgid "Your %s survived on the high seas and became more experienced!"
msgstr "ÄúµÄ %s ÔÚÔ¶º£´æ»îÏÂÀ´²¢±äµÃ¸üÓоÑ飡"
-#: server/unittools.c:376
+#: server/unittools.c:377
#, c-format
msgid "Your %s has been lost on unsafe terrain."
msgstr "ÄúµÄ %s ÔÚΣÏÕµØÓòʧ×ÙÁË¡£"
-#: server/unittools.c:430
+#: server/unittools.c:431
#, c-format
msgid "Your %s has returned to refuel."
msgstr "ÄúµÄ %s ÒѾ»ØÈ¥Ìí¼ÓȼÁÏ¡£"
-#: server/unittools.c:454
+#: server/unittools.c:455
#, c-format
msgid "Your %s has run out of fuel."
msgstr "ÄúµÄ %s µÄȼÁÏÒѾºÄ¾¡¡£"
-#. TRANS: And, <the unit> became ...
-#: server/unittools.c:616
-#, fuzzy
-msgid "And, became more experienced!"
-msgstr " ¹¥»÷³É¹¦²¢±äµÃ¸üÓоÑé¡£"
-
#. TRANS: Your <unit> became ...
-#: server/unittools.c:620
+#: server/unittools.c:619
#, c-format
msgid "Your %s became more experienced!"
msgstr "ÄúµÄ %s ±äµÃ¸üÓоÑ飡"
-#: server/unittools.c:1011
+#: server/unittools.c:1009
#, c-format
msgid "Teleported your %s to %s."
msgstr "Òѽ«ÄúµÄ %s ´«Ë͵½ %s ¡£"
-#: server/unittools.c:1041
+#. TRANS: A unit is moved to resolve stack conflicts.
+#: server/unittools.c:1065
+#, fuzzy, c-format
+msgid "Moved your %s."
+msgstr "½âÉ¢ÁËÄúµÄ %s¡£"
+
+#: server/unittools.c:1076
#, c-format
msgid "Disbanded your %s."
msgstr "½âÉ¢ÁËÄúµÄ %s¡£"
-#: server/unittools.c:1363
+#: server/unittools.c:1397
#, c-format
msgid "Unable to defend %s, %s has lost the game."
msgstr "²»ÄÜ·ÀÓù %s £¬%s ÊäµôÁËÓÎÏ·¡£"
-#: server/unittools.c:1367
+#: server/unittools.c:1401
#, c-format
msgid "Losing %s meant losing the game! Be more careful next time!"
msgstr "¶ªµô %s ¾ÍÒâζ×ÅÊäµôÓÎÏ·£¡Ï´ÎСÐĵ㣡"
-#: server/unittools.c:1469
+#: server/unittools.c:1503
#, c-format
msgid "%s escaped the destruction of %s, and fled to %s."
msgstr "%s ´Ó %s µÄ½âÌåÖÐÌÓÍѳöÀ´£¬²¢Á÷Íöµ½ %s¡£"
-#: server/unittools.c:1478
+#: server/unittools.c:1512
#, c-format
msgid "%s lost when %s was lost."
msgstr "%s Ëæ %s µÄËðʧ¶øËðʧ¡£"
-#: server/unittools.c:1527
+#: server/unittools.c:1561
#, c-format
msgid "Barbarian leader captured, %d gold ransom paid."
msgstr "²¶»ñÒ°ÈËÍ·Á죬»ñµÃ %d Êê½ð¡£"
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unittools.c:1545
+#: server/unittools.c:1579
#, 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:1554 server/unittools.c:1612
+#: server/unittools.c:1588 server/unittools.c:1646
#, 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:1588
+#: server/unittools.c:1622
#, fuzzy, c-format
msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
msgid_plural ""
@@ -6761,14 +6751,14 @@ msgstr[0] "
#. TRANS: "Cannon lost when the Polish Destroyer
#. * attacked the German Musketeers."
-#: server/unittools.c:1621
+#: server/unittools.c:1655
#, 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:1636
+#: server/unittools.c:1670
#, fuzzy, c-format
msgid "%s (and %s) lost to an attack from the %s %s."
msgstr "ÔÚ %3$s µÄ %4$s µÄ¹¥»÷ÏÂËðʧÁË %1$s %2$s ¡£"
@@ -6776,7 +6766,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:1646
+#: server/unittools.c:1680
#, 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."
@@ -6785,192 +6775,192 @@ 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:1660
+#: server/unittools.c:1694
#, 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:1928
+#: server/unittools.c:1962
#, c-format
msgid "Your %s was nuked by %s."
msgstr "ÄúµÄ %s ±» %s ¡°ºË¡±ÁË¡£"
-#: server/unittools.c:1931 server/unittools.c:1947
+#: server/unittools.c:1965 server/unittools.c:1981
msgid "yourself"
msgstr "Äú×Ô¼º"
-#: server/unittools.c:1935
+#: server/unittools.c:1969
#, fuzzy, c-format
msgid "The %s %s was nuked."
msgstr "%s µÄ %s Ôâµ½ºËÎäÆ÷µÄ¹¥»÷¡£"
-#: server/unittools.c:1944
+#: server/unittools.c:1978
#, c-format
msgid "%s was nuked by %s."
msgstr "%s Ôâµ½ %s µÄºËÎäÆ÷µÄ¹¥»÷¡£"
-#: server/unittools.c:1952
+#: server/unittools.c:1986
#, c-format
msgid "You nuked %s."
msgstr "ÄúÒÔºËÎäÆ÷¹¥»÷ %s¡£"
-#: server/unittools.c:1993
+#: server/unittools.c:2027
#, fuzzy, c-format
msgid "The %s detonated a nuke!"
msgstr "%s Òý±¬Á˺˵¯£¡"
-#: server/unittools.c:2017
+#: server/unittools.c:2051
#, c-format
msgid "%s transported successfully."
msgstr "%s ÔËÊä³É¹¦¡£"
-#: server/unittools.c:2069
+#: server/unittools.c:2103
msgid "This unit type can not be paradropped."
msgstr "ÕâÖÖÀàÐ͵IJ¿¶Ó²»ÄÜ¿Õ½µ¡£"
-#: server/unittools.c:2079
+#: server/unittools.c:2113
#, fuzzy
msgid "You cannot paradrop a unit that is transporting other units."
msgstr "Äú²»ÄÜ¿Õ½µÒ»¸öÔËÊ䲿¶Ó¡£"
-#: server/unittools.c:2085
+#: server/unittools.c:2119
msgid "The destination location is not known."
msgstr "Ä¿µÄλÖÃδ֪¡£"
-#: server/unittools.c:2092
+#: server/unittools.c:2126
#, c-format
msgid "This unit cannot paradrop into %s."
msgstr "´Ë²¿¶Ó²»ÄÜ¿Õ½µµ½ %s¡£"
-#: server/unittools.c:2112
+#: server/unittools.c:2146
#, c-format
msgid "The distance to the target (%i) is greater than the unit's range (%i)."
msgstr "µ½Ä¿±êµÄ¾àÀ루%i£©³¬³öÁ˲¿¶ÓµÄ·¶Î§£¨%i£©¡£"
-#: server/unittools.c:2123
+#: server/unittools.c:2157
#, c-format
msgid "Your %s paradropped into the %s and was lost."
msgstr "ÄúµÄ %s ±»¿Õ½µµ½ %s ²¢È«²¿Ëðʧ¡£"
-#: server/unittools.c:2136
+#: server/unittools.c:2170
#, c-format
msgid "Your %s was killed by enemy units at the paradrop destination."
msgstr "ÄúµÄ %s ÔÚ¿Õ½µÄ¿µÄµØ±»µÐ·½²¿¶ÓɱËÀÁË¡£"
-#: server/unittools.c:2158
+#: server/unittools.c:2192
#, c-format
msgid "You found %d gold."
msgstr "ÄúÕÒµ½ %d »Æ½ð¡£"
-#: server/unittools.c:2175
+#: server/unittools.c:2209
#, c-format
msgid "You found %s in ancient scrolls of wisdom."
msgstr "ÄúÔڹŴú¾íÖáÖз¢ÏÖÁË %s¡£"
-#: server/unittools.c:2182
+#: server/unittools.c:2216
#, c-format
msgid "The %s have acquired %s from ancient scrolls of wisdom."
msgstr "%s ÔڹŴú¾íÖáÖеõ½ÁË %s¡£"
-#: server/unittools.c:2196
+#: server/unittools.c:2230
msgid "A band of friendly mercenaries joins your cause."
msgstr "Ò»Ö§ÓѺõĹÍÓ¶¾ü¼ÓÈëÁËÄúµÄ¶ÓÎé¡£"
-#: server/unittools.c:2214
+#: server/unittools.c:2248
msgid "An abandoned village is here."
msgstr "ÕâÀïÊÇÒ»×ù·ÏÆúµÄ´åׯ¡£"
-#: server/unittools.c:2224
+#: server/unittools.c:2258
msgid "You have unleashed a horde of barbarians!"
msgstr "Äú¼¤»îÁËһȺҰÈË£¡"
-#: server/unittools.c:2227
+#: server/unittools.c:2261
#, c-format
msgid "Your %s has been killed by barbarians!"
msgstr "ÄúµÄ %s ±»Ò°ÈËɱËÀÁË£¡"
-#: server/unittools.c:2243
+#: server/unittools.c:2277
msgid "You found a friendly city."
msgstr "ÄúÕÒµ½ÁËÒ»×ùÓѺóÇÊС£"
-#: server/unittools.c:2257
+#: server/unittools.c:2291
msgid "Friendly nomads are impressed by you, and join you."
msgstr "ÓѺõÄÁ÷ÀËÕß±»Äú¸Ð¶¯²¢¼ÓÈëÁËÄúµÄ¶ÓÎé¡£"
-#: server/unittools.c:2282
+#: server/unittools.c:2316
msgid "Your overflight frightens the tribe; they scatter in terror."
msgstr "ÄúÔÚ¿ÕÖеķɹý¾ªÏÅÁ˲¿Â䣻ËûÃDZ»ÏŵÃËÄÏÂÌÓ´Ü¡£"
-#: server/unittools.c:2540
+#: server/unittools.c:2574
#, c-format
msgid "Orders for %s aborted after enemy movement was spotted."
msgstr "Òò¸½½üÓв¿¶Ó¶øÈ¡Ïû¶Ô %s µÄÃüÁî¡£"
-#: server/unittools.c:2989
+#: server/unittools.c:3023
#, c-format
msgid "Orders for %s aborted as there are units nearby."
msgstr "Òò¸½½üÓв¿¶Ó¶øÈ¡Ïû¶Ô %s µÄÃüÁî¡£"
-#: server/unittools.c:3041
+#: server/unittools.c:3075
#, c-format
msgid "Orders for %s aborted because building of city failed."
msgstr "ÒòÐÞ½¨³ÇÊÐʧ°Ü¶øÈ¡Ïû¶Ô %s µÄÃüÁî¡£"
-#: server/unittools.c:3054
+#: server/unittools.c:3088
#, c-format
msgid "Orders for %s aborted since they give an invalid activity."
msgstr "%s µÄÃüÁȡÏûÒòΪËü¸ø³öÁËÎÞЧµÄ»î¶¯¡£"
-#: server/unittools.c:3068
+#: server/unittools.c:3102
#, c-format
msgid "Orders for %s aborted since they give an invalid location."
msgstr "%s µÄÃüÁȡÏûÒòΪËü¸ø³öÁËÎÞЧµÄλÖá£"
-#: server/unittools.c:3078
+#: server/unittools.c:3112
#, c-format
msgid "Orders for %s aborted as there are units in the way."
msgstr "ÒòÓв¿¶Óµ²ÔÚ·ÖжøÈ¡Ïû¶Ô %s µÄÃüÁî¡£"
-#: server/unittools.c:3104
+#: server/unittools.c:3138
#, c-format
msgid "Orders for %s aborted because of failed move."
msgstr "ÒòÒƶ¯ÎÞЧ¶øÈ¡Ïû¶Ô %s µÄÃüÁî¡£"
-#: server/unittools.c:3145
+#: server/unittools.c:3179
#, c-format
msgid "Attempt to change homecity for %s failed."
msgstr "ÊÔͼ¸Ä±ä %s µÄ»ùµØ³ÇÊÐʧ°Ü¡£"
-#: server/unittools.c:3156
+#: server/unittools.c:3190
#, c-format
msgid "Attempt to establish trade route for %s failed."
msgstr "ÊÔͼΪ %s ½¨Á¢Ã³Ò×·Ïßʧ°Ü¡£"
-#: server/unittools.c:3168
+#: server/unittools.c:3202
#, c-format
msgid "Attempt to build wonder for %s failed."
msgstr "ÊÔͼΪ %s ÐÞ½¨Æ漣ʧ°Ü¡£"
-#: server/unittools.c:3177
+#: server/unittools.c:3211
#, c-format
msgid "Your %s has invalid orders."
msgstr "ÄúµÄ %s µÃµ½ÁËÎÞЧµÄÃüÁî¡£"
-#: server/generator/mapgen.c:1737
+#: server/generator/mapgen.c:1771
msgid "High landmass - this may take a few seconds."
msgstr "´óÐ͵ĽµØ £Õâ¿ÉÄÜÐèÒª¼¸ÃëÖÓ¡£"
-#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
+#: server/generator/mapgen.c:1969 server/generator/mapgen.c:2039
#, c-format
msgid "Falling back to generator %d."
msgstr "»Øµ½Éú³ÉÆ÷ %d ¡£"
-#: server/generator/mapgen.c:2025
+#: server/generator/mapgen.c:2059
msgid "Generator 3 didn't place all big islands."
msgstr "Éú³ÉÆ÷ 3 δÄܳɹ¦·ÅÖÃËùÓеĴóÐ͵ºÓì¡£"
-#: server/generator/mapgen.c:2054
+#: server/generator/mapgen.c:2088
#, c-format
msgid "Generator 3 left %li landmass unplaced."
msgstr "Éú³ÉÆ÷3ÁôÏÂÁË %li ½µØδÄÜ·ÅÖá£"
@@ -7075,7 +7065,7 @@ msgid "%3d turn"
msgid_plural "%3d turns"
msgstr[0] "%3d »ØºÏ"
-#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:631
#: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
@@ -7192,335 +7182,336 @@ msgstr "ƽ
msgid "(worklist)"
msgstr "£¨¹¤×÷ÁÐ±í£©"
-#: client/cityrepdata.c:447
-msgid "Special"
-msgstr "רҵÈËÊ¿"
+#: client/cityrepdata.c:446
+msgid "?city:Name"
+msgstr "Ãû³Æ"
-#: client/cityrepdata.c:448
-msgid "?entertainers/scientists/taxmen:E/S/T"
-msgstr "ÒÕ/¿Æ/Ë°"
+#: client/cityrepdata.c:446 client/gui-sdl/cityrep.c:169
+msgid "City Name"
+msgstr "³ÇÊÐÃû³Æ"
-#: client/cityrepdata.c:449
-msgid "Entertainers, Scientists, Taxmen"
-msgstr "ÒÕÈË/¿Æѧ¼Ò/Ë°ÎñÔ±"
+#: client/cityrepdata.c:448
+msgid "?size [short]:Sz"
+msgstr "¹æÄ£"
-#: client/cityrepdata.c:452
-msgid "Concise + Rapture, - Disorder"
-msgstr "±ê¼Ç + ±íʾ¿ñ»¶£¬- ±íʾɧÂÒ"
+#: client/cityrepdata.c:448
+msgid "Size"
+msgstr "¹æÄ£"
-#: client/cityrepdata.c:454 client/plrdlg_common.c:261
+#: client/cityrepdata.c:450 client/plrdlg_common.c:261
#: client/gui-win32/plrdlg.c:337
msgid "State"
msgstr "״̬"
-#: client/cityrepdata.c:454
+#: client/cityrepdata.c:450
msgid "Rapture/Peace/Disorder"
msgstr "¿ñ»¶/ƽ¾²/ɧÂÒ"
+#: client/cityrepdata.c:452
+#, fuzzy
+msgid "Concise *=Rapture, X=Disorder"
+msgstr "±ê¼Ç + ±íʾ¿ñ»¶£¬- ±íʾɧÂÒ"
+
+#: client/cityrepdata.c:456
+msgid "Special"
+msgstr "רҵÈËÊ¿"
+
#: client/cityrepdata.c:457
+msgid "?entertainers/scientists/taxmen:E/S/T"
+msgstr "ÒÕ/¿Æ/Ë°"
+
+#: client/cityrepdata.c:458
+msgid "Entertainers, Scientists, Taxmen"
+msgstr "ÒÕÈË/¿Æѧ¼Ò/Ë°ÎñÔ±"
+
+#: client/cityrepdata.c:461
msgid "?Happy workers:H"
msgstr "ÀÖ"
-#: client/cityrepdata.c:457
+#: client/cityrepdata.c:461
msgid "Workers: Happy"
msgstr "¹¤ÈË£º¿ìÀÖ"
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
msgid "?Content workers:C"
msgstr "Âú"
-#: client/cityrepdata.c:459
+#: client/cityrepdata.c:463
msgid "Workers: Content"
msgstr "¹¤ÈË£ºÂú×ã"
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
msgid "?Unhappy workers:U"
msgstr "ÓÇ"
-#: client/cityrepdata.c:461
+#: client/cityrepdata.c:465
msgid "Workers: Unhappy"
msgstr "¹¤ÈË£ºÓÇÓô"
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
msgid "?Angry workers:A"
msgstr "Å"
-#: client/cityrepdata.c:463
+#: client/cityrepdata.c:467
msgid "Workers: Angry"
msgstr "¹¤ÈË£º·ßÅ"
-#: client/cityrepdata.c:465 client/gui-xaw/citydlg.c:2401
-#: data/default/units.ruleset:238
-msgid "Workers"
+#: client/cityrepdata.c:469 client/gui-xaw/citydlg.c:2402
+#, fuzzy
+msgid "?city:Workers"
msgstr "¹¤ÈË"
-#: client/cityrepdata.c:466
+#: client/cityrepdata.c:470
msgid "?happy/content/unhappy/angry:H/C/U/A"
msgstr "ÀÖ/Âú/ÓÇ/Å"
-#: client/cityrepdata.c:467
+#: client/cityrepdata.c:471
msgid "Workers: Happy, Content, Unhappy, Angry"
msgstr "¹¤ÈË£º¿ìÀÖ/Âú×ã/ÓÇÓô/·ßÅ"
-#: client/cityrepdata.c:470 client/cityrepdata.c:472
+#: client/cityrepdata.c:474 client/cityrepdata.c:476
msgid "Best"
msgstr "×î¼Ñ"
-#: client/cityrepdata.c:470
+#: client/cityrepdata.c:474
msgid "attack"
msgstr "¹¥»÷"
-#: client/cityrepdata.c:471
+#: client/cityrepdata.c:475
msgid "Best attacking units"
msgstr "×î¼Ñ¹¥»÷²¿¶Ó"
-#: client/cityrepdata.c:472
+#: client/cityrepdata.c:476
msgid "defense"
msgstr "·ÀÓù"
-#: client/cityrepdata.c:473
+#: client/cityrepdata.c:477
msgid "Best defending units"
msgstr "×î¼Ñ·ÀÓù²¿¶Ó"
-#: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
-#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
-#: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
-#: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
-#: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
-#: client/gui-win32/menu.c:351 client/gui-win32/repodlgs.c:616
-#: client/gui-win32/repodlgs.c:707 client/gui-win32/repodlgs.c:716
-#: client/gui-xaw/menu.c:157 client/gui-xaw/menu.c:219
-#: client/gui-xaw/menu.c:242 client/gui-xaw/repodlgs.c:881
-#: client/gui-xaw/repodlgs.c:1069 data/Freeciv.in:1895 data/helpdata.txt:909
+#: client/cityrepdata.c:478 client/cityrepdata.c:482
+#: client/gui-gtk-2.0/cityrep.c:1437 client/gui-gtk-2.0/cityrep.c:1456
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-gtk-2.0/cityrep.c:1494
+#: client/gui-gtk-2.0/cityrep.c:1514 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/repodlgs.c:960 client/gui-sdl/helpdlg.c:688
+#: client/gui-sdl/mapctrl.c:1605 client/gui-sdl/optiondlg.c:1827
+#: client/gui-sdl/repodlgs.c:356 client/gui-win32/menu.c:351
+#: client/gui-win32/repodlgs.c:616 client/gui-win32/repodlgs.c:707
+#: client/gui-win32/repodlgs.c:716 client/gui-xaw/menu.c:157
+#: client/gui-xaw/menu.c:219 client/gui-xaw/menu.c:242
+#: client/gui-xaw/repodlgs.c:881 client/gui-xaw/repodlgs.c:1069
+#: data/Freeciv.in:1895 data/helpdata.txt:909
msgid "Units"
msgstr "²¿¶Ó"
#. TRANS: Header "Number of units inside city"
-#: client/cityrepdata.c:476
+#: client/cityrepdata.c:480
msgid "?Present (units):Here"
msgstr "ÏÖÓÐ"
-#: client/cityrepdata.c:477
+#: client/cityrepdata.c:481
msgid "Number of units present"
msgstr "ÏÖÓв¿¶ÓÊý"
#. TRANS: Header "Number of units supported by given city"
-#: client/cityrepdata.c:480
+#: client/cityrepdata.c:484
msgid "?Supported (units):Owned"
msgstr "ÒÑÖ§³Ö"
-#: client/cityrepdata.c:481
+#: client/cityrepdata.c:485
msgid "Number of units supported"
msgstr "ÒÑÖ§³ÖµÄ²¿¶ÓÊý"
#. TRANS: Header "It will take this many turns before city grows"
-#: client/cityrepdata.c:484
+#: client/cityrepdata.c:488
msgid "?food (population):Grow"
msgstr "Ôö³¤"
-#: client/cityrepdata.c:485 client/cityrepdata.c:530
+#: client/cityrepdata.c:489 client/cityrepdata.c:528
msgid "?Stock/Target:(Have/Need)"
msgstr "£¨¿â´æ/Ä¿±ê"
-#: client/cityrepdata.c:486
+#: client/cityrepdata.c:490
msgid "Turns until growth/famine"
msgstr "¾àÀëÔö³¤/¼¢»ÄµÄ»ØºÏ"
-#: client/cityrepdata.c:488
-msgid "?size [short]:Sz"
-msgstr "¹æÄ£"
-
-#: client/cityrepdata.c:488
-msgid "Size"
-msgstr "¹æÄ£"
-
-#: client/cityrepdata.c:492
-msgid "?city:Name"
-msgstr "Ãû³Æ"
-
-#: client/cityrepdata.c:492 client/gui-sdl/cityrep.c:169
-msgid "City Name"
-msgstr "³ÇÊÐÃû³Æ"
-
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
msgid "Surplus"
msgstr "Ó¯Óà"
-#: client/cityrepdata.c:495
+#: client/cityrepdata.c:493
msgid "?food/production/trade:F/P/T"
msgstr "ʳ/×Ê/ó"
-#: client/cityrepdata.c:496
+#: client/cityrepdata.c:494
msgid "Surplus: Food, Production, Trade"
msgstr "Ó¯ÓࣺʳÎï/Îï×Ê/óÒ×"
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
msgid "?Food surplus [short]:+F"
msgstr "ʳ£«"
-#: client/cityrepdata.c:498
+#: client/cityrepdata.c:496
msgid "Surplus: Food"
msgstr "Ó¯ÓࣺʳÎï"
-#: client/cityrepdata.c:500
+#: client/cityrepdata.c:498
msgid "?Production surplus [short]:+P"
msgstr "×Ê£«"
-#: client/cityrepdata.c:501
+#: client/cityrepdata.c:499
msgid "Surplus: Production"
msgstr "Ó¯ÓࣺÎï×Ê"
-#: client/cityrepdata.c:502
+#: client/cityrepdata.c:500
msgid "?Production loss (waste) [short]:-P"
msgstr "ºÄ"
-#: client/cityrepdata.c:503
+#: client/cityrepdata.c:501
msgid "Waste"
msgstr "ËðºÄ"
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
msgid "?Trade surplus [short]:+T"
msgstr "ó£«"
-#: client/cityrepdata.c:504
+#: client/cityrepdata.c:502
msgid "Surplus: Trade"
msgstr "Ó¯ÓࣺóÒ×"
-#: client/cityrepdata.c:506
+#: client/cityrepdata.c:504
msgid "?Trade loss (corruption) [short]:-T"
msgstr "¸¯"
-#: client/cityrepdata.c:507
+#: client/cityrepdata.c:505
msgid "Corruption"
msgstr "¸¯°Ü"
-#: client/cityrepdata.c:509 client/gui-gtk-2.0/repodlgs.c:654
+#: client/cityrepdata.c:507 client/gui-gtk-2.0/repodlgs.c:654
#: client/gui-sdl/mapctrl.c:1400 client/gui-win32/repodlgs.c:334
#: client/gui-xaw/menu.c:222 client/gui-xaw/repodlgs.c:644
#: client/gui-xaw/repodlgs.c:773 data/Freeciv.in:1819
msgid "Economy"
msgstr "¾¼Ã"
-#: client/cityrepdata.c:509
+#: client/cityrepdata.c:507
msgid "?gold/luxury/science:G/L/S"
msgstr "½ð/Óé/ÑÐ"
-#: client/cityrepdata.c:510
+#: client/cityrepdata.c:508
msgid "Economy: Gold, Luxuries, Science"
msgstr "¾¼Ã£º»Æ½ð/ÓéÀÖ/¿ÆÑÐ"
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
msgid "?Gold:G"
msgstr "½ð"
-#: client/cityrepdata.c:512
+#: client/cityrepdata.c:510
msgid "Economy: Gold"
msgstr "¾¼Ã£º»Æ½ð"
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
msgid "?Luxury:L"
msgstr "Óé"
-#: client/cityrepdata.c:514
+#: client/cityrepdata.c:512
msgid "Economy: Luxury"
msgstr "¾¼Ã£ºÓéÀÖ"
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
msgid "?Science:S"
msgstr "ÑÐ"
-#: client/cityrepdata.c:516
+#: client/cityrepdata.c:514
msgid "Economy: Science"
msgstr "¾¼Ã£º¿ÆÑÐ"
-#: client/cityrepdata.c:518
+#: client/cityrepdata.c:516
msgid "?number_trade_routes:n"
msgstr "Êý"
-#: client/cityrepdata.c:518
+#: client/cityrepdata.c:516
msgid "?number_trade_routes:R"
msgstr "ó"
-#: client/cityrepdata.c:519
+#: client/cityrepdata.c:517
msgid "Number of Trade Routes"
msgstr "óÒ×·ÏßµÄÊýÁ¿"
-#: client/cityrepdata.c:521
+#: client/cityrepdata.c:519
msgid "?pollution [short]:Pol"
msgstr "ÎÛ"
-#: client/cityrepdata.c:523
+#: client/cityrepdata.c:521
msgid "?cma:Governor"
msgstr "¹ÜÀíÕß"
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
-#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
-#: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
-#: data/Freeciv.in:1459 data/helpdata.txt:820
+#: client/cityrepdata.c:521 client/gui-gtk-2.0/cityrep.c:1766
+#: client/gui-sdl/citydlg.c:3809 client/gui-sdl/cma_fe.c:858
+#: client/gui-win32/citydlg.c:726 data/Freeciv.in:1459 data/helpdata.txt:820
msgid "Citizen Governor"
msgstr "ÊÐÃñ¹ÜÀíÕß"
-#: client/cityrepdata.c:526
+#: client/cityrepdata.c:524
msgid "Turns/Buy"
msgstr "»ØºÏ/¹ºÂò£©"
-#: client/cityrepdata.c:529 client/cityrepdata.c:531
+#: client/cityrepdata.c:527 client/cityrepdata.c:529
msgid "Currently Building"
msgstr "Ä¿Ç°ÕýÔÚ½¨Ôì"
-#: client/cityrepdata.c:575
+#: client/cityrepdata.c:573
msgid "?specialist:S"
msgstr "ר"
-#: client/cityrepdata.c:578
+#: client/cityrepdata.c:576
msgid "Specialists"
msgstr "רҵÈËÔ±£º"
-#: client/civclient.c:239
+#: client/civclient.c:240
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr " -a, --autoconnect\tÌø¹ýÁ¬½Ó¶Ô»°¿ò\n"
-#: client/civclient.c:249
+#: client/civclient.c:250
msgid " -l, --log FILE\tUse FILE as logfile (spawned server also uses this)\n"
msgstr " -l, --log FILE\t½« FILE ×÷ΪÈÕÖ¾Îļþ£¨ÅÉÉúµÄ·þÎñÆ÷Ò²½«Ê¹ÓôËÎļþ£©\n"
-#: client/civclient.c:251
+#: client/civclient.c:252
msgid " -m, --meta HOST\tConnect to the metaserver at HOST\n"
msgstr " -m, --meta HOST\tÁ¬½Óµ½Î»ÓÚ HOST µÄÔª·þÎñÆ÷\n"
-#: client/civclient.c:253
+#: client/civclient.c:254
msgid " -n, --name NAME\tUse NAME as name\n"
msgstr " -n, --name NAME\tʹÓà NAME ×÷ΪÃû×Ö\n"
-#: client/civclient.c:255
+#: client/civclient.c:256
#, fuzzy
msgid " -p, --port PORT\tConnect to server port PORT (usually with -a)\n"
msgstr " -p, --port PORT\tÁ¬½Óµ½·þÎñÆ÷¶Ë¿Ú PORT\n"
-#: client/civclient.c:257
+#: client/civclient.c:258
#, c-format
msgid " -P, --Plugin PLUGIN\tUse PLUGIN for sound output %s\n"
msgstr " -P, --Plugin PLUGIN\tʹÓà PLUGIN ×÷ΪÉùЧ²å¼þ %s\n"
-#: client/civclient.c:259
+#: client/civclient.c:260
msgid " -r, --read FILE\tRead startup script FILE (for spawned server only)\n"
msgstr " -r, --read FILE\t¶ÁÈ¡Æô¶¯½Å±¾ FILE £¨½öÓÃÓÚÅÉÉúµÄ·þÎñÆ÷£©\n"
-#: client/civclient.c:262
+#: client/civclient.c:263
#, 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:264
+#: client/civclient.c:265
msgid " -S, --Sound FILE\tRead sound tags from FILE\n"
msgstr " -S, --Sound FILE\t´Ó FILE ÖжÁÈ¡ÒôЧ±ê¼Ç\n"
-#: client/civclient.c:265
+#: client/civclient.c:266
msgid " -t, --tiles FILE\tUse data file FILE.tilespec for tiles\n"
msgstr " -t, --tiles FILE\tʹÓÃÊý¾ÝÎļþ FILE.tilespec ×÷ΪµØͼ·ç¸ñ\n"
-#: client/civclient.c:268
+#: client/civclient.c:269
#, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -7530,144 +7521,154 @@ msgstr ""
"\t\t\tÇë³¢ÊÔ¡°%s -- --help¡±ÒԵõ½¸ü¶àÐÅÏ¢¡£\n"
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:273
+#: client/civclient.c:274
#, fuzzy, c-format
msgid "Report bugs at %s\n"
msgstr "½«´íÎ󱨸淢Ë͵½ <%s>¡£\n"
-#: client/civclient.c:297
+#: client/civclient.c:298
#, c-format
msgid "Invalid port \"%s\" specified with --port option.\n"
msgstr "--port Ñ¡ÏîÖ¸¶¨ÁËÎÞЧµÄ¶Ë¿Ú¡°%s¡±¡£\n"
-#: client/civclient.c:299 client/civclient.c:314
+#: client/civclient.c:300 client/civclient.c:315
msgid "Try using --help.\n"
msgstr "ÇëʹÓà --help Ñ¡Ïî¡£\n"
-#: client/civclient.c:312
+#: client/civclient.c:313
#, c-format
msgid "Invalid debug level \"%s\" specified with --debug option.\n"
msgstr "--debug Ñ¡ÏîÖ¸¶¨ÁËÎÞЧµÄµ÷ʽ¼¶±ð¡°%s¡±¡£\n"
-#: client/civclient.c:325
+#: client/civclient.c:326
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr "ÎÞ·¨Ê¶±ðµÄÑ¡Ï¡°%s¡±\n"
-#: client/civclient.c:539
+#: client/civclient.c:391
+#, fuzzy, c-format
+msgid "Updating old metaserver address \"%s\"."
+msgstr "metaserver <µØÖ·>"
+
+#: client/civclient.c:394
+#, fuzzy, c-format
+msgid "Default metaserver has been set to \"%s\"."
+msgstr "Ñ¡Ï%s Òѱ»ÉèÖÃΪ¡°%s¡±¡£"
+
+#: client/civclient.c:550
msgid "Game started."
msgstr "ÓÎÏ·ÒÑ¿ªÊ¼¡£"
-#: client/civclient.c:577
+#: client/civclient.c:588
msgid "There was an error while auto connecting; aborting."
msgstr "×Ô¶¯Á¬½Óʱ³öÏÖ´íÎó£»Öжϡ£"
-#: client/climisc.c:176
+#: client/climisc.c:177
#, c-format
msgid "Changing production of every %s into %s."
msgstr "°Ñÿ¸ö %s µÄÉú²ú¶¼¸Ä±äΪ %s ¡£"
-#: client/climisc.c:214
+#: client/climisc.c:215
msgid "?embassy:Both"
msgstr "»¥Ïà"
-#: client/climisc.c:216
+#: client/climisc.c:217
msgid "?embassy:Yes"
msgstr "¸øÎÒÃÇ"
-#: client/climisc.c:219
+#: client/climisc.c:220
msgid "?embassy:With Us"
msgstr "¸øËûÃÇ"
-#: client/climisc.c:222
+#: client/climisc.c:223
msgid "?embassy:Contact"
msgstr "?embassy:ÁªÏµ"
-#: client/climisc.c:224
+#: client/climisc.c:225
msgid "?embassy:No Contact"
msgstr "?embassy:ÎÞÁªÏµ"
-#: client/climisc.c:236
+#: client/climisc.c:237
msgid "?vision:Both"
msgstr "»¥Ïà"
-#: client/climisc.c:238
+#: client/climisc.c:239
msgid "?vision:To Them"
msgstr "¸øËûÃÇ"
-#: client/climisc.c:241
+#: client/climisc.c:242
msgid "?vision:To Us"
msgstr "¸øÎÒÃÇ"
-#: client/climisc.c:257 client/climisc.c:264
+#: client/climisc.c:258 client/climisc.c:265
#, c-format
msgid "The %s give %s"
msgstr "%s Ìṩ %s"
-#: client/climisc.c:268
+#: client/climisc.c:269
#, c-format
msgid "The %s give unknown city."
msgstr "%s Èóöij¸ö³ÇÊÐ"
-#: client/climisc.c:273
+#: client/climisc.c:274
#, c-format
msgid "The %s give %d gold"
msgstr "%s ½ø¹± %d »Æ½ð"
-#: client/climisc.c:278
+#: client/climisc.c:279
#, c-format
msgid "The %s give their worldmap"
msgstr "%s ÌṩÊÀ½çµØͼ"
-#: client/climisc.c:282
+#: client/climisc.c:283
#, c-format
msgid "The %s give their seamap"
msgstr "%s Ìṩº£Í¼"
-#: client/climisc.c:286
+#: client/climisc.c:287
msgid "The parties agree on a cease-fire"
msgstr "Óë»áÕßͬÒâÍ£»ð"
-#: client/climisc.c:289
+#: client/climisc.c:290
msgid "The parties agree on a peace"
msgstr "Óë»áÕßͬÒâºÍƽ"
-#: client/climisc.c:292
+#: client/climisc.c:293
msgid "The parties create an alliance"
msgstr "Óë»áÕß½¨Á¢Í¬ÃË"
-#: client/climisc.c:295
+#: client/climisc.c:296
#, c-format
msgid "The %s give shared vision"
msgstr "%s Ìṩ¹²ÏíÊÓÒ°"
-#: client/climisc.c:299
+#: client/climisc.c:300
#, c-format
msgid "The %s give an embassy"
msgstr "%s Ìṩʹ¹Ý"
-#: client/climisc.c:902
+#: client/climisc.c:906
msgid "Popup Request"
msgstr "µ¯³öÇëÇó"
-#: client/climisc.c:932
+#: client/climisc.c:936
msgid "Exporting output window to civgame.log ..."
msgstr "½«Êä³ö´°¿Úµ¼³öµ½ civgame.log ..."
-#: client/climisc.c:936
+#: client/climisc.c:940
msgid "Export complete."
msgstr "µ¼³öÍê³É¡£"
-#: client/climisc.c:938
+#: client/climisc.c:942
msgid "Export failed, couldn't write to file."
msgstr "µ¼³öʧ°Ü£¬ÎÞ·¨Ð´ÈëÎļþ¡£"
-#: client/climisc.c:1038
+#: client/climisc.c:1042
#, c-format
msgid "You don't buy %s in %s!"
msgstr "ÄúûÓÐÔÚ %2$s ÖйºÂò %1$s £¡"
-#: client/climisc.c:1056
+#: client/climisc.c:1060
#, c-format
msgid "%s costs %d gold and you only have %d gold."
msgstr "%s Òª»¨ %d »Æ½ð£¬¶øÄúÖ»ÓÐ %d »Æ½ð¡£"
@@ -7713,19 +7714,19 @@ msgid ""
"%d times"
msgstr "×Ô¶¯Ã¿¸ô %4$f ÃëÒÔ¡°%3$s¡±Á¬½Ó·þÎñÆ÷¡°%1$s¡±¶Ë¿Ú %2$d %5$d ´Î"
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1289
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
msgid "novice"
msgstr "¼«Ò×"
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1289
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1358
msgid "easy"
msgstr "ÈÝÒ×"
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1290
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
msgid "normal"
msgstr "ÆÕͨ"
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1290
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
msgid "hard"
msgstr "À§ÄÑ"
@@ -7754,38 +7755,42 @@ msgid "We probably couldn't start it from here."
msgstr "»òÐíÎÒÃDz»ÄÜ´ÓÕâÀïÆô¶¯Ö®¡£"
#: client/connectdlg_common.c:470
-msgid "We have control of the server (command access level hack)"
+#, fuzzy
+msgid ""
+"Established control over the server. You have command access level 'hack'."
msgstr "»ñµÃ¶Ô·þÎñÆ÷µÄ¿ØÖÆ£¨ÃüÁî·ÃÎʼ¶±ð hack£©¡£"
#: client/connectdlg_common.c:475
-msgid "We can't take control of server, attempting to kill it."
-msgstr "²»ÄÜ»ñµÃ¶Ô·þÎñÆ÷µÄ¿ØÖÆ£¬ÕýÔÚ³¢ÊԹرշþÎñÆ÷¡£"
+msgid ""
+"Failed to obtain the required access level to take control of the server. "
+"The server will now be shutdown."
+msgstr ""
-#: client/control.c:1104
+#: client/control.c:1123
msgid "Only transporter units can be unloaded."
msgstr "Ö»ÓÐÔËÊ䲿¶Ó¿ÉÒÔ±»Ð¶ÔØ¡£"
-#: client/control.c:1353
+#: client/control.c:1425
msgid "Only settler units can be put into auto mode."
msgstr "Ö»ÓÐÒÆÃñÕß²¿¶Ó¿ÉÒÔ±»ÉèÖÃΪ×Ô¶¯Ä£Ê½¡£"
-#: client/control.c:1444
+#: client/control.c:1516
msgid "Only nuclear units can do this."
msgstr "Ö»ÓкË×Ó²¿¶Ó¿ÉÒÔÕâÑù×ö¡£"
-#: client/control.c:1473
+#: client/control.c:1545
msgid "Only paratrooper units can do this."
msgstr "Ö»ÓÐÉ¡±ø²¿¶Ó¿ÉÒÔÕâÑù×÷¡£"
-#: client/control.c:1921
+#: client/control.c:2020
msgid "Too far for this unit."
msgstr "¶Ô´Ë²¿¶ÓÀ´ËµÌ«Ô¶¡£"
-#: client/control.c:2131 client/control.c:2161 client/control.c:2177
+#: client/control.c:2230 client/control.c:2260 client/control.c:2276
msgid "Didn't find a route to the destination!"
msgstr "ûÓз¢ÏÖµ½´ïÄ¿µÄµØµÄµÀ·£¡"
-#: client/control.c:2221
+#: client/control.c:2320
msgid "Oh my! You seem to have no capital!"
msgstr "ÌìÄÄ£¡ÄãºÃÏñûÓÐÊ׶¼ÁË£¡"
@@ -7869,16 +7874,16 @@ msgid "Allows %s (with %s)."
msgstr "ʹÄÜ %s £¨ÈôÓÐ %s£©¡£"
#. TRANS: preserve single space at beginning
-#: client/helpdata.c:418
+#: client/helpdata.c:416
msgid " Rivers"
msgstr " ºÓÁ÷"
-#: client/helpdata.c:576
+#: client/helpdata.c:574
#, c-format
msgid "Sorry, no help topic for %s.\n"
msgstr "±§Ç¸£¬Ã»ÓйØÓÚ %s µÄÇóÖúÖ÷Ìâ¡£\n"
-#: client/helpdata.c:580
+#: client/helpdata.c:578
#, c-format
msgid ""
"Sorry, no help topic for %s.\n"
@@ -7889,7 +7894,7 @@ msgstr ""
"±¾Ò³ÃæÊÇ×Ô¶¯²úÉúµÄ¡£\n"
"\n"
-#: client/helpdata.c:670
+#: client/helpdata.c:668
#, fuzzy
msgid ""
"Requires: Nothing\n"
@@ -7898,284 +7903,284 @@ msgstr ""
"ÐèÒª %s ½¨Öþ¡£\n"
"\n"
-#: client/helpdata.c:675
+#: client/helpdata.c:673
#, c-format
msgid "* The discovery of %s will make %s obsolete.\n"
msgstr "* %sµÄ·¢ÏÖ½«Ê¹%s×÷·Ï¡£\n"
-#: client/helpdata.c:694
+#: client/helpdata.c:692
#, c-format
msgid "* Allows all players with knowledge of %s to build %s units.\n"
msgstr "* ÔÊÐíËùÓÐÓµÓÐ %s ֪ʶµÄÍæ¼Ò½¨Ôì %s ²¿¶Ó¡£\n"
-#: client/helpdata.c:706
+#: client/helpdata.c:704
#, c-format
msgid "* Allows %s (with %s).\n"
msgstr "* ʹÄÜ %s £¨ÈôÓÐ %s£©¡£\n"
-#: client/helpdata.c:710
+#: client/helpdata.c:708
#, c-format
msgid "* Allows %s.\n"
msgstr "* ʹÄÜ %s¡£\n"
-#: client/helpdata.c:780
+#: client/helpdata.c:778
#, fuzzy, c-format
msgid "* Can only be built if there is %s in the city.\n"
msgstr "* Ö»ÄÜÔÚ %s Õþ¸®ÏÂÐÞ½¨¡£\n"
-#: client/helpdata.c:786
+#: client/helpdata.c:784
#, c-format
msgid "* Can only be built with %s as government.\n"
msgstr "* Ö»ÄÜÔÚ %s Õþ¸®ÏÂÐÞ½¨¡£\n"
-#: client/helpdata.c:791
+#: client/helpdata.c:789
msgid "* May not be built in cities.\n"
msgstr "* ²»ÄÜÔÚ³ÇÊÐÖÐÐÞ½¨¡£\n"
-#: client/helpdata.c:794
+#: client/helpdata.c:792
msgid "* Never has a home city.\n"
msgstr "* ´ÓÀ´Ã»ÓлùµØ³ÇÊС£\n"
-#: client/helpdata.c:797
+#: client/helpdata.c:795
msgid "* Losing this unit will lose you the game!\n"
msgstr "* ʧȥÕâ¸ö²¿¶Ó½«ÊäµôÓÎÏ·£¡\n"
-#: client/helpdata.c:801
+#: client/helpdata.c:799
msgid "* Each player may only have one of this type of unit.\n"
msgstr "* ÿ¸öÍæ¼ÒÖ»ÄÜÓµÓÐÒ»¸öÕâÖÖÀàÐ͵IJ¿¶Ó¡£\n"
-#: client/helpdata.c:805
+#: client/helpdata.c:803
#, c-format
msgid "* Requires %d population to build.\n"
msgstr "* ÐèÒª %d ÈË¿Ú²ÅÄÜÐÞ½¨¡£\n"
-#: client/helpdata.c:811
+#: client/helpdata.c:809
#, c-format
msgid "* Can carry and refuel %d air unit.\n"
msgid_plural "* Can carry and refuel %d air units.\n"
msgstr[0] "* Äܹ»Ð¯´ø²¢Îª %d ¸ö·ÉÐÐÆ÷¼ÓÓÍ¡£\n"
-#: client/helpdata.c:816
+#: client/helpdata.c:814
#, c-format
msgid "* Can carry and refuel %d missile unit.\n"
msgid_plural "* Can carry and refuel %d missile units.\n"
msgstr[0] "* Äܹ»Ð¯´ø²¢Îª %d ¸öµ¼µ¯¡£\n"
-#: client/helpdata.c:821
+#: client/helpdata.c:819
#, c-format
msgid "* Can carry %d ground unit across water.\n"
msgid_plural "* Can carry %d ground units across water.\n"
msgstr[0] "* Äܹ»Ð¯´ø %d ¸öµØÃ沿¶Ó¶ÉË®¡£\n"
-#: client/helpdata.c:830
+#: client/helpdata.c:828
msgid ""
"* Can establish trade routes (must travel to target city and must be at "
"least 9 tiles [in Manhattan distance] from this unit's home city).\n"
msgstr ""
-#: client/helpdata.c:836
+#: client/helpdata.c:834
#, c-format
msgid "* Can help build wonders (adds %d production).\n"
msgstr "* Äܹ»°ïÖúÐÞÖþÆæ¼££¨Ôö¼Ó %d ²ú³ö£©¡£\n"
-#: client/helpdata.c:840
+#: client/helpdata.c:838
msgid "* May not be disbanded.\n"
msgstr "* ²»Äܱ»½âÉ¢¡£\n"
-#: client/helpdata.c:842
+#: client/helpdata.c:840
#, c-format
msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
msgstr "* ¿ÉÒÔÔÚ³ÇÊÐÖнâÉ¢ÒÔÊÕ»Ø 50%% µÄÉú²ú³É±¾¡£\n"
-#: client/helpdata.c:846
+#: client/helpdata.c:844
msgid "* Can build new cities.\n"
msgstr "* Äܹ»ÐÞÖþгÇÊС£\n"
-#: client/helpdata.c:849
+#: client/helpdata.c:847
#, c-format
msgid "* Can add on %d population to cities of no more than size %d.\n"
msgstr ""
-#: client/helpdata.c:858
+#: client/helpdata.c:856
msgid "* Can build roads and railroads.\n"
msgstr "* Äܹ»ÐÞ½¨¹«Â·ºÍÌú·¡£\n"
-#: client/helpdata.c:859
+#: client/helpdata.c:857
msgid "* Can build mines on tiles.\n"
msgstr "* Äܹ»ÔÚ·½¸ñÉÏÐÞÖþ¿ó¾®¡£\n"
-#: client/helpdata.c:860
+#: client/helpdata.c:858
msgid "* Can build irrigation on tiles.\n"
msgstr "* Äܹ»ÔÚ·½¸ñÉÏÐÞ½¨Ë®ÀûÉèÊ©¡£\n"
-#: client/helpdata.c:865
+#: client/helpdata.c:863
msgid "* Can build farmland.\n"
msgstr "* Äܹ»ÐÞ½¨Å©³¡¡£\n"
-#: client/helpdata.c:869
+#: client/helpdata.c:867
#, c-format
msgid "* Can build farmland (if %s is known).\n"
msgstr "* Äܹ»ÐÞ½¨Å©³¡£¨Èç¹ûÕÆÎÕÁË %s )¡£\n"
-#: client/helpdata.c:873
+#: client/helpdata.c:871
#, c-format
msgid "* Can build farmland (if any of the following are known: %s).\n"
msgstr "* Äܹ»ÐÞ½¨Å©³¡£¨Èç¹ûÕÆÎÕÁËÏÂÃæÈκÎ֪ʶ£º%s£©¡£\n"
-#: client/helpdata.c:881
+#: client/helpdata.c:879
msgid "* Can build fortresses.\n"
msgstr "* Äܹ»½¨ÖþÒªÈû¡£\n"
-#: client/helpdata.c:885
+#: client/helpdata.c:883
#, c-format
msgid "* Can build fortresses (if %s is known).\n"
msgstr "* Äܹ»½¨ÖþÒªÈû£¨Èç¹ûÕÆÎÕÁË %s £©¡£\n"
-#: client/helpdata.c:889
+#: client/helpdata.c:887
#, c-format
msgid "* Can build fortresses (if any of the following are known: %s).\n"
msgstr "* Äܹ»½¨ÖþÒªÈû£¨Èç¹ûÕÆÎÕÁËÏÂÃæÈκÎ֪ʶ£º%s£©¡£\n"
-#: client/helpdata.c:895
+#: client/helpdata.c:893
msgid "* Can clean pollution from tiles.\n"
msgstr "* Äܹ»´Ó·½¸ñÉÏÇå³ýÎÛȾ¡£\n"
-#: client/helpdata.c:896
+#: client/helpdata.c:894
msgid "* Can clean nuclear fallout from tiles.\n"
msgstr "* Äܹ»´Ó·½¸ñÉÏÇå³ýºË·øÉä¡£\n"
-#: client/helpdata.c:899
+#: client/helpdata.c:897
msgid "* Can transform tiles.\n"
msgstr "* Äܹ»¸Ä±ä·½¸ñÀàÐÍ¡£\n"
-#: client/helpdata.c:902
+#: client/helpdata.c:900
msgid "* Can build airbases.\n"
msgstr "* Äܹ»ÐÞ½¨¿Õ¾ü»ùµØ¡£\n"
-#: client/helpdata.c:906
+#: client/helpdata.c:904
#, c-format
msgid "* May fortify, granting a 50%% defensive bonus.\n"
msgstr "* ¿ÉÒÔÉè·À£¬µÃµ½ 50%% µÄ·ÀÓù½±Àø¡£\n"
-#: client/helpdata.c:909
+#: client/helpdata.c:907
msgid "* May pillage to destroy infrastructure from tiles.\n"
msgstr "* ¿ÉÒÔ½øÐÐÆÆ»µÒԴݻٷ½¸ñÉϵĻù´¡ÉèÊ©¡£\n"
-#: client/helpdata.c:913
+#: client/helpdata.c:911
msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
msgstr "* Äܹ»½øÐÐÍâ½»»î¶¯£¬²¢¾ßÓÐÌرð¼äµýÄÜÁ¦¡£\n"
-#: client/helpdata.c:916
+#: client/helpdata.c:914
msgid "* Can perform diplomatic actions.\n"
msgstr "* Äܹ»½øÐÐÍâ½»»î¶¯¡£\n"
-#: client/helpdata.c:920
+#: client/helpdata.c:918
msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
msgstr "* ´Ó²»Êäµô Íâ½»¶ÔÍâ½» µÄÕ½¶·¡£\n"
-#: client/helpdata.c:923
+#: client/helpdata.c:921
msgid "* May not be bribed.\n"
msgstr "* ²»Äܱ»»ß¸¡£\n"
-#: client/helpdata.c:926
+#: client/helpdata.c:924
msgid "* Can attack enemy air units.\n"
msgstr "* Äܹ»¹¥»÷µÐ·½µÄ¿ÕÖв¿¶Ó¡£\n"
-#: client/helpdata.c:930
+#: client/helpdata.c:928
msgid "* Is invisible except when next to an enemy unit or city.\n"
msgstr "* ÊDz»¿É¼ûµÄ³ý·Ç½ô¿¿µÐ·½²¿¶Ó»ò³ÇÊС£\n"
-#: client/helpdata.c:934
+#: client/helpdata.c:932
msgid "* Can only attack units on ocean squares (no land attacks).\n"
msgstr "* Ö»Äܹ¥»÷º£Ñ󷽸ñµÄ²¿¶Ó£¨²»Äܹ¥»÷½µØ£©¡£\n"
-#: client/helpdata.c:938
+#: client/helpdata.c:936
msgid ""
"* Can attack from aboard sea units: against enemy cities and onto land "
"squares.\n"
msgstr "* Äܹ»´Ó´¬ÉϵIJ¿¶Ó¹¥»÷£ºÕë¶ÔµÐ·½³ÇÊкͽµØ·½¸ñ¡£\n"
-#: client/helpdata.c:943
+#: client/helpdata.c:941
#, c-format
msgid "* Can be paradropped from a friendly city (Range: %d).\n"
msgstr "* Äܹ»´ÓÓѺóÇÊпսµ£¨·¶Î§£º %d£©¡£\n"
-#: client/helpdata.c:949
+#: client/helpdata.c:947
msgid "* Gets double defense against units specified as 'mounted'.\n"
msgstr "* ¶Ô¡°Æï±ø¡±²¿¶ÓµÄ·ÀÓùÄÜÁ¦·±¶¡£\n"
-#: client/helpdata.c:953
+#: client/helpdata.c:951
msgid "* Counts as 'mounted' against certain defenders.\n"
msgstr "* ¶ÔijЩ·ÀÓùÕß¼ÆΪ¡°Æï±ø¡±¡£\n"
-#: client/helpdata.c:957
+#: client/helpdata.c:955
msgid "* A missile unit: gets used up in making an attack.\n"
msgstr "* µ¼µ¯²¿¶Ó£ºÔÚ½øÐй¥»÷ºóºÄ¾¡¡£\n"
-#: client/helpdata.c:960
+#: client/helpdata.c:958
msgid "* Making an attack ends this unit's turn.\n"
msgstr "* ½øÐй¥»÷½«½áÊø´Ë²¿¶Ó¡£\n"
-#: client/helpdata.c:964
+#: client/helpdata.c:962
msgid "* This unit's attack causes a nuclear explosion!\n"
msgstr "* ¸Ã²¿¶ÓµÄ¹¥»÷µ¼Öº˱¬Õ¨£¡\n"
-#: client/helpdata.c:968
+#: client/helpdata.c:966
msgid "* Gets double firepower when attacking cities.\n"
msgstr "* ¹¥»÷³ÇÊÐʱµÃµ½Ë«±¶»ðÁ¦¡£\n"
-#: client/helpdata.c:971
+#: client/helpdata.c:969
msgid "* Ignores the effects of city walls.\n"
msgstr "* ºöÂÔ³ÇǽµÄЧ¹û¡£\n"
-#: client/helpdata.c:975
+#: client/helpdata.c:973
#, c-format
msgid ""
"* Does bombard attacks (%d per turn). These attacks will only damage (never "
"kill) the defender, but have no risk for the attacker.\n"
msgstr ""
-#: client/helpdata.c:982
+#: client/helpdata.c:980
msgid "* Gets quintuple defense against missiles and aircraft.\n"
msgstr "* »ñµÃ5±¶µÄ¶Ôµ¼µ¯ºÍ·É»úµÄ·ÀÓùÄÜÁ¦¡£\n"
-#: client/helpdata.c:986
+#: client/helpdata.c:984
msgid "* Ignores terrain effects (treats all squares as roads).\n"
msgstr "* ºöÂÔµØÐÎЧ¹û£¨°ÑËùÓз½¸ñµ±×÷¹«Â·£©¡£\n"
-#: client/helpdata.c:989
+#: client/helpdata.c:987
msgid "* Ignores zones of control.\n"
msgstr "* ºöÂÔÇøÓò¿ØÖÆ¡£\n"
-#: client/helpdata.c:993
+#: client/helpdata.c:991
msgid "* A non-military unit (cannot attack; no martial law).\n"
msgstr "* ·Ç¾üʲ¿¶Ó£¨²»Äܹ¥»÷£»ÎÞ¾üʹÜÖÆ£©¡£\n"
-#: client/helpdata.c:997
+#: client/helpdata.c:995
msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
msgstr "* Õ½³¡²¿¶Ó£º¼´Ê¹ÊÇ·ÇÇÖÂÔÐ͵ÄÒ²½«ÒýÆð1µãÓÇÓô¡£\n"
-#: client/helpdata.c:1000
+#: client/helpdata.c:998
msgid "* Will never achieve veteran status.\n"
msgstr "* ´Ó²»»á´ïµ½ÀÏÁ·×´Ì¬¡£\n"
-#: client/helpdata.c:1002
+#: client/helpdata.c:1000
msgid "* May become veteran through training or combat.\n"
msgstr "* ¿ÉÒÔͨ¹ýѵÁ·»òÕ½¶·´ïµ½ÀÏÁ·¡£\n"
-#: client/helpdata.c:1008
+#: client/helpdata.c:1006
#, c-format
msgid ""
"* Must end turn in a city or next to land, or has a 50%% risk of being lost "
"at sea.\n"
msgstr "»ØºÏ½áÊøʱ±ØÐëλÓÚ³ÇÊлò¿¿½ü½µØ£¬·ñÔòÓÐ50%%µÄ·çÏÕ»áÔÚº£ÖÐʧ×Ù¡£\n"
-#: client/helpdata.c:1012
+#: client/helpdata.c:1010
#, c-format
msgid "* The discovery of %s reduces the risk to 25%%.\n"
msgstr "%sµÄ·¢ÏÖ½«·çÏÕ½µµÍµ½25%% ¡£\n"
-#: client/helpdata.c:1017
+#: client/helpdata.c:1015
#, c-format
msgid "* %s reduces the risk to 12%%.\n"
msgstr "* %s½«·çÏÕ½µµÍµ½12%% ¡£\n"
@@ -8184,114 +8189,114 @@ msgstr "* %s
#. * last two elements
#. TRANS: List of possible output types has this between
#. * last two elements
-#: client/helpdata.c:1068 client/helpdata.c:1402
+#: client/helpdata.c:1066 client/helpdata.c:1400
msgid " or "
msgstr " »ò "
-#: client/helpdata.c:1070 client/helpdata.c:1390
+#: client/helpdata.c:1068 client/helpdata.c:1388
msgid "?or:, "
msgstr " »ò "
-#: client/helpdata.c:1082
+#: 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"
msgstr[0] "* %2$d ¸ö»ØºÏÖ®ºó²¿¶Ó±ØÐëÔÚ³ÇÊÐÖлòÕß%1$sÉÏ¡£\n"
-#: client/helpdata.c:1124
+#: client/helpdata.c:1122
#, c-format
msgid "If we would now start with %s we would need %d bulbs."
msgstr "Èç¹ûÏÖÔÚ¿ªÊ¼Ñо¿ %s ÄÇô½«ÐèÒª %d µã¡£"
-#: client/helpdata.c:1129
+#: client/helpdata.c:1127
#, 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:1137
+#: client/helpdata.c:1135
msgid "You cannot research this technology."
msgstr "Äú²»ÄÜÑо¿ÕâÏî¿Æ¼¼¡£"
-#: client/helpdata.c:1141
+#: client/helpdata.c:1139
msgid " This number may vary depending on what other players will research.\n"
msgstr " ´ËÊý×Ö¿ÉÄÜÒòÆäËûÍæ¼ÒµÄÑо¿ÄÚÈݶø¸Ä±ä¡£\n"
-#: client/helpdata.c:1153
+#: client/helpdata.c:1151
#, c-format
msgid "* The first player to research %s gets an immediate advance.\n"
msgstr "* µÚÒ»¸öÑо¿ %s µÄÍæ¼Ò¿ÉÒÔÁ¢¿Ì»ñµÃÒ»Ïî½øÕ¹¡£\n"
-#: client/helpdata.c:1158
+#: client/helpdata.c:1156
#, c-format
msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
msgstr "* ½µµÍÔÚÔ¶ÑóÖÐʧȥ´¬Ö»µÄ»ú»áµ½ 25%% ¡£\n"
-#: client/helpdata.c:1161
+#: client/helpdata.c:1159
#, c-format
msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
msgstr "* ½µµÍÔÚÔ¶ÑóÖÐʧȥ´¬Ö»µÄ»ú»áµ½ 12%% ¡£\n"
-#: client/helpdata.c:1165
+#: client/helpdata.c:1163
msgid "* Increases the pollution generated by the population.\n"
msgstr "* Ôö¼ÓÓÉÈË¿ÚÌ«¶àÔì³ÉµÄÎÛȾ¡£\n"
-#: client/helpdata.c:1170
+#: client/helpdata.c:1168
#, c-format
msgid "* Allows %s to build roads on river squares.\n"
msgstr "* ʹ %s Äܹ»ÔÚºÓÁ÷ÉÏÐÞ½¨µÀ·¡£\n"
-#: client/helpdata.c:1177
+#: client/helpdata.c:1175
#, c-format
msgid "* Allows %s to build fortresses.\n"
msgstr "* ʹ %s Äܹ»½¨ÖþÒªÈû¡£\n"
-#: client/helpdata.c:1185
+#: client/helpdata.c:1183
#, c-format
msgid "* Allows %s to build airbases.\n"
msgstr "* ʹ %s Äܹ»½¨Öþ¿Õ¾ü»ùµØ¡£\n"
-#: client/helpdata.c:1194
+#: client/helpdata.c:1192
#, c-format
msgid "* Allows %s to upgrade roads to railroads.\n"
msgstr "* ʹ %s Äܹ»½«¹«Â·Éý¼¶ÎªÌú·¡£\n"
-#: client/helpdata.c:1202
+#: client/helpdata.c:1200
#, c-format
msgid "* Allows %s to upgrade irrigation to farmland.\n"
msgstr "* ʹ %s Äܹ»½«Ë®ÀûÉý¼¶ÎªÅ©³¡¡£\n"
-#: client/helpdata.c:1236
+#: client/helpdata.c:1234
msgid "* Pollution cannot be generated on this terrain."
msgstr "* ÔÚÕâÖÖµØÐÎÉϲ»»á²úÉúÎÛȾ¡£"
-#: client/helpdata.c:1241
+#: client/helpdata.c:1239
msgid "* You cannot build cities on this terrain."
msgstr "* Äú²»ÄÜÔڴ˵ØÐÎÉϽ¨Ôì³ÇÊС£"
-#: client/helpdata.c:1247
+#: client/helpdata.c:1245
msgid "* The coastline of this terrain is unsafe."
msgstr "* ÕâÖÖµØÐεĺ£°¶Ïß²»°²È«¡£"
-#: client/helpdata.c:1252
+#: client/helpdata.c:1250
msgid "* This terrain is unsafe for units to travel on."
msgstr "* ²¿¶ÓÔÚÕâÖÖµØÐÎÉÏ´©Ðв»°²È«¡£"
-#: client/helpdata.c:1257
+#: client/helpdata.c:1255
msgid "* Land units cannot travel on oceanic terrains."
msgstr "* ½µØ²¿¶Ó²»ÄÜÔÚº£ÑóµØÐÎÉÏ´©ÐС£"
-#: client/helpdata.c:1307
+#: client/helpdata.c:1305
msgid "Features:\n"
msgstr ""
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1413 client/helpdata.c:1414
+#: client/helpdata.c:1411 client/helpdata.c:1412
msgid "?outputlist: Nothing "
msgstr ""
-#: client/helpdata.c:1421
+#: client/helpdata.c:1419
#, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
@@ -8301,7 +8306,7 @@ msgid_plural ""
"become unhappy.\n"
msgstr[0] ""
-#: client/helpdata.c:1431
+#: client/helpdata.c:1429
#, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8309,48 +8314,48 @@ msgid ""
msgstr ""
#. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1439
+#: client/helpdata.c:1437
#, c-format
msgid "* You pay %d times normal %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1444
+#: client/helpdata.c:1442
#, 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:1449
+#: client/helpdata.c:1447
#, c-format
msgid "* You pay no %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1453
+#: client/helpdata.c:1451
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:1462
+#: client/helpdata.c:1460
#, 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:1470
+#: client/helpdata.c:1468
#, c-format
msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
msgstr ""
-#: client/helpdata.c:1477
+#: client/helpdata.c:1475
#, 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:1484
+#: client/helpdata.c:1482
#, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -8358,23 +8363,23 @@ msgid ""
msgstr ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1491
+#: client/helpdata.c:1489
#, 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:1499
+#: client/helpdata.c:1497
#, c-format
msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
msgstr ""
-#: client/helpdata.c:1504
+#: client/helpdata.c:1502
msgid "Has unlimited science/gold/luxuries rates.\n"
msgstr ""
-#: client/helpdata.c:1509
+#: client/helpdata.c:1507
#, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
@@ -8384,67 +8389,67 @@ msgid_plural ""
"force %d unhappy citizens to become content.\n"
msgstr[0] ""
-#: client/helpdata.c:1521
+#: client/helpdata.c:1519
#, 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:1532
+#: client/helpdata.c:1530
#, 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:1538
+#: client/helpdata.c:1536
msgid "* Your units cannot be bribed.\n"
msgstr "* ÄúµÄ²¿¶Ó²»Äܱ»»ß¸¡£\n"
-#: client/helpdata.c:1541
+#: client/helpdata.c:1539
msgid "* Your cities cannot be incited.\n"
msgstr "* ÄúµÄ³ÇÊв»Äܱ»É¿¶¯¡£\n"
-#: client/helpdata.c:1545
+#: client/helpdata.c:1543
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:1551
+#: client/helpdata.c:1549
msgid "* Has a senate that may prevent declaration of war.\n"
msgstr "* ÓµÓÐÒ»¸ö¿ÉÄÜ»á×èÖ¹ÐûÕ½µÄÒé»á¡£\n"
-#: client/helpdata.c:1555
+#: client/helpdata.c:1553
msgid "* Allows partisans when cities are taken by the enemy.\n"
msgstr ""
-#: client/helpdata.c:1559
+#: client/helpdata.c:1557
msgid ""
"* Buildings that normally confer bonuses against unhappiness will instead "
"give gold.\n"
msgstr ""
-#: client/helpdata.c:1563
+#: client/helpdata.c:1561
msgid "* Pays no upkeep for fanatics.\n"
msgstr ""
-#: client/helpdata.c:1566
+#: client/helpdata.c:1564
msgid "* Has no unhappy citizens.\n"
msgstr "* ûÓÐÓÇÓôµÄÊÐÃñ¡£\n"
-#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
+#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
#, c-format
msgid "* Veteran %s units.\n"
msgstr "* ÀÏÁ· %s ²¿¶Ó.\n"
-#: client/helpdata.c:1587
+#: client/helpdata.c:1585
msgid "* Veteran units.\n"
msgstr "* ÀÏÁ·²¿¶Ó¡£\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1593
+#: client/helpdata.c:1591
#, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8452,7 +8457,7 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1602
+#: client/helpdata.c:1600
#, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8460,443 +8465,490 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1610
+#: client/helpdata.c:1608
#, 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:1619
+#: client/helpdata.c:1617
#, 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:1627
+#: client/helpdata.c:1625
#, 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:1632
+#: client/helpdata.c:1630
#, 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:1637
+#: client/helpdata.c:1635
#, 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:1645
+#: client/helpdata.c:1643
#, 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:1651
+#: client/helpdata.c:1649
#, 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:1657
+#: client/helpdata.c:1655
#, c-format
msgid "* %s waste will increase slowly with distance from capital.\n"
msgstr "* %s ËðºÄ½«Ëæ×ÅÓëÊ׶¼¾àÀëµÄÔö´ó¶ø»ºÂýÔö¼Ó¡£\n"
-#: client/helpdata.c:1674
+#: client/helpdata.c:1672
#, c-format
msgid "* Allows you to build %s.\n"
msgstr "* ʹÄúÄܹ»ÐÞ½¨ %s ¡£\n"
#. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1701
+#: client/helpdata.c:1699
#, c-format
msgid "%s%d %s"
msgstr "%s%d %s"
-#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1700 client/helpdata.c:1708 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:1709
+#: client/helpdata.c:1707
#, c-format
msgid "%s%d unhappy"
msgstr "%s%d ÓÇÓô"
-#: client/mapctrl_common.c:382
+#: client/mapctrl_common.c:399
#, c-format
msgid "You don't know how to build %s!"
msgstr "Äú²»ÖªµÀÈçºÎÐÞ½¨ %s £¡"
-#: client/mapctrl_common.c:392
+#: client/mapctrl_common.c:409
#, c-format
msgid "Copy %s to clipboard."
msgstr "°Ñ %s ¸´ÖƵ½¼ôÌù°å"
-#: client/mapctrl_common.c:408
+#: client/mapctrl_common.c:425
msgid "Clipboard is empty."
msgstr "¼ôÌù°åΪ¿Õ¡£"
-#: client/options.c:98
+#: client/options.c:102
msgid "Graphics"
msgstr "ͼÐÎ"
-#: client/options.c:99
+#: client/options.c:103
msgid "Overview"
msgstr "ËõÂÔµØͼ"
-#: client/options.c:100
+#: client/options.c:104
msgid "Sound"
msgstr "ÒôЧ"
-#: client/options.c:101
+#: client/options.c:105
msgid "Interface"
msgstr "½Ó¿Ú"
-#: client/options.c:102
+#: client/options.c:106
msgid "Network"
msgstr "ÍøÂç"
-#: client/options.c:107
+#: client/options.c:111
msgid "Login name"
msgstr "µÇ¼Ãû"
-#: client/options.c:108
+#: client/options.c:112
msgid ""
"This is the default login username that will be used in the connection "
"dialogs or with the -a command-line parameter."
msgstr ""
-#: client/options.c:113
+#: client/options.c:117
msgid "Server"
msgstr "·þÎñÆ÷"
-#: client/options.c:114
+#: client/options.c:118
msgid ""
"This is the default server hostname that will be used in the connection "
"dialogs or with the -a command-line parameter."
msgstr ""
-#: client/options.c:119
+#: client/options.c:123
msgid "Server port"
msgstr "·þÎñÆ÷¶Ë¿Ú"
-#: client/options.c:120
+#: client/options.c:124
msgid ""
"This is the default server port that will be used in the connection dialogs "
"or with the -a command-line parameter."
msgstr ""
-#: client/options.c:125 client/gui-win32/connectdlg.c:912 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
msgid "Metaserver"
msgstr "Ôª·þÎñÆ÷"
-#: client/options.c:126
+#: client/options.c:130
msgid ""
"The metaserver is a host that the client contacts to find out about games on "
"the internet. Don't change this from its default value unless you know what "
"you're doing."
msgstr ""
-#: client/options.c:132
+#: client/options.c:136
msgid "Soundset"
msgstr "ÒôЧ¼¯"
-#: client/options.c:133
+#: client/options.c:137
msgid ""
"This is the soundset that will be used. Changing this is the same as using "
"the -S command-line parameter."
msgstr ""
-#: client/options.c:138
+#: client/options.c:142
msgid "Sound plugin"
msgstr "ÒôЧ²å¼þ"
-#: client/options.c:139
+#: client/options.c:143
msgid ""
"If you have a problem with sound, try changing the sound plugin. The new "
"plugin won't take effect until you restart Freeciv. Changing this is the "
"same as using the -P command-line option."
msgstr ""
-#: client/options.c:144 client/gui-sdl/gui_main.c:162
+#: client/options.c:148 client/gui-sdl/gui_main.c:162
#, fuzzy
msgid "Theme"
msgstr "ÃíÓî"
-#: client/options.c:145
+#: client/options.c:149
msgid "By changing this option you change the active theme."
msgstr ""
-#: client/options.c:148
+#: client/options.c:152
msgid "Tileset"
msgstr "µØͼ·½¸ñ·ç¸ñ"
-#: client/options.c:149
+#: client/options.c:153
msgid ""
"By changing this option you change the active tileset. This is the same as "
"using the -t command-line parameter."
msgstr ""
-#: client/options.c:156
+#: client/options.c:160
msgid "Solid unit background color"
msgstr "ʵÐIJ¿¶Ó±³¾°É«"
-#: client/options.c:157
+#: client/options.c:161
msgid ""
"Setting this option will cause units on the map view to be drawn with a "
"solid background color instead of the flag backdrop."
msgstr ""
-#: client/options.c:161 client/gui-sdl/optiondlg.c:960
+#: client/options.c:165 client/gui-sdl/optiondlg.c:960
msgid "Sound bell at new turn"
msgstr "»ØºÏ¿ªÊ¼ÁåÉù"
-#: client/options.c:162
+#: client/options.c:166
msgid ""
"Set this option to have a \"bell\" event be generated at the start of a new "
"turn. You can control the behavior of the \"bell\" event by editing the "
"message options."
msgstr ""
-#: client/options.c:168
+#: client/options.c:172
msgid "Unit movement animation time (milliseconds)"
msgstr "²¿¶ÓÒƶ¯¶¯»Ê±¼ä£¨ºÁÃ룩"
-#: client/options.c:169
+#: client/options.c:173
msgid ""
"This option controls how long unit \"animation\" takes when a unit moves on "
"the map view. Set it to 0 to disable animation entirely."
msgstr ""
-#: client/options.c:174
+#: client/options.c:178
msgid "Mapview recentering time (milliseconds)"
msgstr "µØͼÊÓͼÖØÐÂÒƶ¯µ½ÖÐÐĵÄʱ¼ä£¨ºÁÃ룩"
-#: client/options.c:175
+#: client/options.c:179
msgid ""
"When the map view is recentered, it will slide smoothly over the map to its "
"new position. This option controls how long this slide lasts. Set it to 0 "
"to disable mapview sliding entirely."
msgstr ""
-#: client/options.c:180 client/gui-sdl/optiondlg.c:1014
+#: client/options.c:184 client/gui-sdl/optiondlg.c:1014
msgid "Show combat animation"
msgstr "ÏÔʾ×÷Õ½¶¯»"
-#: client/options.c:181
+#: client/options.c:185
msgid ""
"Disabling this option will turn off combat animation between units on the "
"mapview."
msgstr ""
-#: client/options.c:184
+#: client/options.c:188
msgid "Draw the citybar"
msgstr ""
-#: client/options.c:185
+#: client/options.c:189
msgid ""
"Setting this option will display a 'citybar' containing useful information "
"beneath each city. Disabling this option will display only the city's name "
"and optionally, production."
msgstr ""
-#: client/options.c:191
+#: client/options.c:195
msgid "Show icons in the technology tree"
msgstr "ÔڿƼ¼Ê÷ÖÐÏÔʾͼ±ê"
-#: client/options.c:192
+#: client/options.c:196
msgid ""
"Setting this option will display icons on the technology tree diagram. "
"Turning this option off makes the technology tree more compact."
msgstr ""
-#: client/options.c:197
+#: client/options.c:201
msgid "Draw shield graphics for units"
msgstr ""
-#: client/options.c:198
+#: client/options.c:202
msgid ""
"Setting this option will draw a shield icon as the flags on units. If "
"unset, the full flag will be drawn."
msgstr ""
-#: client/options.c:202
+#: client/options.c:206
msgid "Manual Turn Done in AI Mode"
msgstr "AIģʽÏÂÊÖ¶¯½áÊø»ØºÏ"
-#: client/options.c:203
+#: client/options.c:207
msgid ""
"Disable this option if you do not want to press the Turn Done button "
"manually when watching an AI player."
msgstr ""
-#: client/options.c:207 client/gui-sdl/optiondlg.c:1121
+#: client/options.c:211 client/gui-sdl/optiondlg.c:1121
msgid "Auto Center on Units"
msgstr "×Ô¶¯Ê¹²¿¶ÓÏÔʾÓÚÖÐÑë"
-#: client/options.c:208
+#: client/options.c:212
msgid ""
"Set this option to have the active unit centered automatically when the unit "
"focus changes."
msgstr ""
-#: client/options.c:211 client/gui-sdl/optiondlg.c:1147
+#: client/options.c:215 client/gui-sdl/optiondlg.c:1147
msgid "Auto Center on Combat"
msgstr "×Ô¶¯Ê¹Õ½¶·ÏÔʾÓÚÖÐÑë"
-#: client/options.c:212
+#: client/options.c:216
msgid ""
"Set this option to have any combat be centered automatically. Disabled this "
"will speed up the time between turns but may cause you to miss combat "
"entirely."
msgstr ""
-#: client/options.c:217 client/gui-sdl/optiondlg.c:1174
+#: client/options.c:221 client/gui-sdl/optiondlg.c:1174
msgid "Focus on Awakened Units"
msgstr "¾Û½¹ÓÚ»½ÐѵIJ¿¶Ó"
-#: client/options.c:218
+#: client/options.c:222
msgid "Set this option to have newly awoken units be focused automatically."
msgstr ""
-#: client/options.c:221
+#: client/options.c:225
msgid "Allow goto into the unknown"
msgstr "ÔÊÐíÇ°Íùδ֪µØ"
-#: client/options.c:222
+#: client/options.c:226
msgid ""
"Setting this option will make the game consider moving into unknown tiles. "
"If not, then goto routes will detour around or be blocked by unknown tiles."
msgstr ""
-#: client/options.c:226
+#: client/options.c:230
msgid "Center map when Popup city"
msgstr "µ¯³ö³ÇÊÐʱʹ֮ÏÔʾÓÚµØͼÖÐÑë"
-#: client/options.c:227
+#: client/options.c:231
msgid ""
"Setting this option makes the mapview center on a city when its city dialog "
"is popped up."
msgstr ""
-#: client/options.c:230
+#: client/options.c:234
msgid "Concise City Production"
msgstr "¼òÃ÷³ÇÊÐÉú²ú"
-#: client/options.c:231
+#: client/options.c:235
msgid ""
"Set this option to make the city production (as shown in the city dialog) to "
"be more compact."
msgstr ""
-#: client/options.c:234 client/gui-sdl/optiondlg.c:1252
+#: client/options.c:238 client/gui-sdl/optiondlg.c:1252
msgid "End Turn when done moving"
msgstr "Òƶ¯Íê±Ïºó»ØºÏ½áÊø"
-#: client/options.c:235
+#: client/options.c:239
msgid ""
"Setting this option makes your turn end automatically when all your units "
"are done moving."
msgstr ""
-#: client/options.c:238 client/gui-sdl/optiondlg.c:1226
+#: client/options.c:242 client/gui-sdl/optiondlg.c:1226
msgid "Prompt for city names"
msgstr "ÌáʾÊäÈë³ÇÊÐÃû³Æ"
-#: client/options.c:239
+#: client/options.c:243
msgid ""
"Disabling this option will make the names of newly founded cities chosen "
"automatically by the server."
msgstr ""
-#: client/options.c:242 client/gui-sdl/optiondlg.c:1200
+#: client/options.c:246 client/gui-sdl/optiondlg.c:1200
msgid "Pop up city dialog for new cities"
msgstr "н¨³ÇÊÐ×Ô¶¯µ¯³ö³ÇÊжԻ°¿ò"
-#: client/options.c:243
+#: client/options.c:247
msgid ""
"Setting this option will pop up a newly-founded city's city dialog "
"automatically."
msgstr ""
-#: client/options.c:248
+#: client/options.c:250
+#, fuzzy
+msgid "Pop up caravan actions"
+msgstr "É̶Ó"
+
+#: client/options.c:251
+msgid ""
+"If this option is enabled, when caravans arrive at a city where they can "
+"establish a traderoute or help build a wonder, a window will popup asking "
+"which action should be performed. Disabling this option means you will have "
+"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 ""
+
+#: client/options.c:260
+msgid "Enable cursor changing"
+msgstr ""
+
+#: client/options.c:261
+msgid ""
+"This option controls whether the client should try to change the mouse "
+"cursor depending on what is being pointed at, as well as to indicate changes "
+"in the client or server state."
+msgstr ""
+
+#: client/options.c:266
+msgid "Select cities before units"
+msgstr ""
+
+#: 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 ""
+
+#: client/options.c:272
+msgid "Clear unit orders on selection"
+msgstr ""
+
+#: client/options.c:273
+msgid ""
+"Enabling this option will cause unit orders to be cleared whenever one or "
+"more units are selected. If this option is disabled, selecting units will "
+"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 ""
+
+#: client/options.c:282
msgid "Background layer"
msgstr "±³¾°²ã"
-#: client/options.c:249
+#: client/options.c:283
msgid "The background layer of the overview shows just ocean and land."
msgstr "ËõÂÔµØͼµÄ±³¾°²ã½öÏÔʾº£ÑóºÍ½µØ¡£"
-#: client/options.c:252
+#: client/options.c:286
msgid "Terrain relief map layer"
msgstr "µØÐÎÂÖÀª²ã"
-#: client/options.c:253
+#: client/options.c:287
msgid "The relief layer shows all terrains on the map."
msgstr "µØÐÎÂÖÀª²ãÏÔʾµØͼÉϵÄËùÓеØÐΡ£"
-#: client/options.c:256
+#: client/options.c:290
msgid "Borders layer"
msgstr "¹ú½ç²ã"
-#: client/options.c:257
+#: client/options.c:291
msgid ""
"The borders layer of the overview shows which tiles are owned by each player."
msgstr "ËõÂÔµØͼµÄ¹ú½ç²ãÏÔʾÿ¸öÍæ¼ÒÓµÓеķ½¸ñ¡£"
-#: client/options.c:261
+#: client/options.c:295
msgid "Units layer"
msgstr "²¿¶Ó²ã"
-#: client/options.c:262
+#: client/options.c:296
#, fuzzy
msgid "Enabling this will draw units on the overview."
msgstr "Èç¹ûÆôÓ㬽«ÔÚËõÂÔµØͼÉÏÏÔʾ²¿¶Ó¡£"
-#: client/options.c:265
+#: client/options.c:299
msgid "Cities layer"
msgstr "³ÇÊвã"
-#: client/options.c:266
+#: client/options.c:300
#, fuzzy
msgid "Enabling this will draw cities on the overview."
msgstr "Èç¹ûÆôÓ㬽«ÔÚËõÂÔµØͼÉÏÏÔʾ²¿¶Ó¡£"
-#: client/options.c:269
+#: client/options.c:303
msgid "Overview fog of war"
msgstr "Õ½Îí¸Å¿ö"
-#: client/options.c:270
+#: client/options.c:304
#, fuzzy
msgid "Enabling this will show fog of war on the overview."
msgstr "Èç¹ûÆôÓ㬽«ÔÚËõÂÔµØͼÉÏÏÔʾ²¿¶Ó¡£"
-#: client/options.c:488
+#: client/options.c:526
msgid "If you add a preset by hand, also update \"number_of_presets\""
msgstr "Èç¹ûÄúÊÖ¹¤Ìí¼ÓÁËÒ»¸öÔ¤ÉèÖµ£¬Çë¸üС°number_of_presets¡±"
-#: client/options.c:516
+#: client/options.c:554
msgid "Cannot find your home directory"
msgstr "ÕÒ²»µ½ÄúµÄhomeĿ¼"
-#: client/options.c:665 client/options.c:796
+#: client/options.c:703 client/options.c:834
msgid "Save failed, cannot find a filename."
msgstr "±£´æʧ°Ü£¬ÎÞ·¨ÕÒµ½ÎļþÃû¡£"
-#: client/options.c:678 client/options.c:859
+#: client/options.c:716 client/options.c:897
#, c-format
msgid "Save failed, cannot write to file %s"
msgstr "±£´æʧ°Ü£¬²»ÄÜдÈëÎļþ %s"
-#: client/options.c:680 client/options.c:862
+#: client/options.c:718 client/options.c:900
#, c-format
msgid "Saved settings to file %s"
msgstr "ÉèÖÃÒѱ£´æµ½Îļþ %s ÖÐ"
@@ -8921,16 +8973,16 @@ msgstr "
msgid "Start of turn %d"
msgstr "»ØºÏ %d ¿ªÊ¼"
-#: client/packhand.c:1590
+#: client/packhand.c:1591
#, c-format
msgid "AI Mode is now %s."
msgstr "µ±Ç°µÄ AI ģʽΪ %s¡£"
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "ON"
msgstr "¿ª"
-#: client/packhand.c:1591
+#: client/packhand.c:1592
msgid "OFF"
msgstr "¹Ø"
@@ -8962,14 +9014,15 @@ msgid "Username"
msgstr "̞"
#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
-#: client/gui-gtk-2.0/pages.c:2085
+#: client/gui-gtk-2.0/pages.c:2157
msgid "Flag"
msgstr "¹úÆì"
#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
-#: client/gui-gtk-2.0/pages.c:1536 client/gui-gtk-2.0/pages.c:2087
-#: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
-#: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
+#: 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/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr "Ãñ×å"
@@ -8981,7 +9034,7 @@ msgstr "
msgid "Score"
msgstr "·ÖÊý"
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
msgid "Team"
msgstr "ÍŶÓ"
@@ -9052,412 +9105,434 @@ msgstr "û
msgid "Could not open temp file."
msgstr "ÎÞ·¨´ò¿ªÁÙʱÎļþ¡£"
-#: client/servers.c:407
+#: client/servers.c:410
msgid "Invalid $http_proxy or metaserver value, must start with 'http://'"
msgstr "ÎÞЧµÄ $http_proxy »òÔª·þÎñÆ÷Öµ£¬±ØÐëÒÔ¡°http://¡±¿ªÍ·"
-#: client/servers.c:413
+#: client/servers.c:416
msgid "Failed looking up metaserver's host"
msgstr "²éÕÒÔª·þÎñÆ÷Ö÷»úʧ°Ü"
-#: client/text.c:85 client/text.c:86 client/text.c:91
+#. TRANS: "AI <player name>"
+#: client/text.c:94
+#, c-format
+msgid "AI %s"
+msgstr ""
+
+#. TRANS: "<nation adjective>, team <team name>"
+#: client/text.c:118
+#, fuzzy, c-format
+msgid "%s, team %s"
+msgstr "£¬ÍÅ¶Ó %s "
+
+#: client/text.c:135 client/text.c:136 client/text.c:141
#: client/gui-sdl/mapview.c:752
msgid "?nation:Neutral"
msgstr "ÖÐÁ¢"
-#: client/text.c:85 client/gui-sdl/mapview.c:752
+#: client/text.c:135 client/gui-sdl/mapview.c:752
msgid "?nation:Hostile"
msgstr "µÐ¶Ô"
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Peaceful"
msgstr "ºÍƽ"
-#: client/text.c:87 client/gui-sdl/mapview.c:754
+#: client/text.c:137 client/gui-sdl/mapview.c:754
msgid "?nation:Friendly"
msgstr "ÓѺÃ"
-#: client/text.c:88 client/gui-sdl/mapview.c:755
+#: client/text.c:138 client/gui-sdl/mapview.c:755
msgid "?nation:Mysterious"
msgstr "ÉñÃØ"
-#: client/text.c:88
+#: client/text.c:138
msgid "?nation:Friendly(team)"
msgstr "ÓѺã¨ÍŶӣ©"
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
msgid "?city:Neutral"
msgstr "ÖÐÁ¢"
-#: client/text.c:90 client/gui-sdl/mapview.c:785
+#: client/text.c:140 client/gui-sdl/mapview.c:785
msgid "?city:Hostile"
msgstr "µÐ¶Ô"
-#: client/text.c:92 client/gui-sdl/mapview.c:786
+#: client/text.c:142 client/gui-sdl/mapview.c:786
msgid "?city:Peaceful"
msgstr "ºÍƽ"
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Friendly"
msgstr "ÓѺÃ"
-#: client/text.c:92 client/gui-sdl/mapview.c:787
+#: client/text.c:142 client/gui-sdl/mapview.c:787
msgid "?city:Mysterious"
msgstr "ÉñÃØ"
-#: client/text.c:93
+#: client/text.c:143
msgid "?city:Friendly(team)"
msgstr "ÓѺã¨ÍŶӣ©"
-#: client/text.c:100
+#: client/text.c:151
#, c-format
msgid "Location: (%d, %d) [%d]"
msgstr "λÖãº(%d, %d) [%d]"
-#: client/text.c:109
+#: client/text.c:153
+#, c-format
+msgid "Native coordinates: (%d, %d)"
+msgstr ""
+
+#: client/text.c:160
#, c-format
msgid "Terrain: %s"
msgstr "µØÐΣº%s"
-#: client/text.c:110
+#: client/text.c:161
#, c-format
msgid "Food/Prod/Trade: %s"
msgstr "ʳÎï/Îï×Ê/óÒ×£º%s"
-#: client/text.c:113
+#: client/text.c:164
msgid "Minor Tribe Village"
msgstr "СÐͲ¿Âä´åׯ"
-#: client/text.c:119
+#: client/text.c:173
#, fuzzy
msgid "Our territory"
msgstr "±¾¹úÁìÍÁ"
-#. TRANS: "Polish territory"
-#: client/text.c:122
+#. TRANS: "Territory of <username> (<nation + team>)"
+#: client/text.c:176
#, fuzzy, c-format
-msgid "%s territory"
-msgstr "%s µÄÁìÍÁ"
+msgid "Territory of %s (%s)"
+msgstr "%s µÄ %s µÄÁìÍÁ"
-#. TRANS: "Polish territory (5 turn cease-fire)"
-#: client/text.c:131
-#, c-format
-msgid "%s territory (%d turn cease-fire)"
-msgid_plural "%s territory (%d turn cease-fire)"
-msgstr[0] "%s ÁìÍÁ£¨Í£»ð %d »ØºÏ£©"
+#: client/text.c:186
+#, fuzzy, c-format
+msgid "Territory of %s (%s) (%d turn cease-fire)"
+msgid_plural "Territory of %s (%s) (%d turn cease-fire)"
+msgstr[0] "³ÇÊУº%s £¨%s£¬Í£»ð %d »ØºÏ£©"
-#. TRANS: "Polish territory (friendly)"
-#: client/text.c:140
+#. TRANS: "Territory of <username>
+#. * (<nation + team> | <diplomatic state>)"
+#: client/text.c:195
#, fuzzy, c-format
-msgid "%s territory (%s)"
+msgid "Territory of %s (%s | %s)"
msgstr "%s µÄ %s µÄÁìÍÁ"
-#: client/text.c:145
+#: client/text.c:200
msgid "Unclaimed territory"
msgstr "ÎÞÖ÷Ö®µØ"
-#. TRANS: "City: Warsaw (Polish)"
-#: client/text.c:156
-#, c-format
-msgid "City: %s (%s)"
-msgstr "³ÇÊУº%s(%s)"
+#. TRANS: "City: <city name> | <username> (<nation + team>)"
+#: client/text.c:214
+#, fuzzy, c-format
+msgid "City: %s | %s (%s)"
+msgstr "³ÇÊУº%s (%s, %s)"
-#. TRANS: "City: Warsaw (Polish, 5 turn cease-fire)"
-#: client/text.c:166
-#, c-format
-msgid "City: %s (%s, %d turn cease-fire)"
-msgid_plural "City: %s (%s, %d turn cease-fire)"
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <number> turn cease-fire)"
+#: client/text.c:224
+#, fuzzy, c-format
+msgid "City: %s | %s (%s, %d turn cease-fire)"
+msgid_plural "City: %s | %s (%s, %d turn cease-fire)"
msgstr[0] "³ÇÊУº%s £¨%s£¬Í£»ð %d »ØºÏ£©"
-#. TRANS: "City: Warsaw (Polish,friendly)"
-#: client/text.c:174
-#, c-format
-msgid "City: %s (%s, %s)"
+#. TRANS: "City: <city name> | <username>
+#. * (<nation + team>, <diplomatic state>)"
+#: client/text.c:231
+#, fuzzy, c-format
+msgid "City: %s | %s (%s, %s)"
msgstr "³ÇÊУº%s (%s, %s)"
#. TRANS: previous lines gave other information about the city.
-#: client/text.c:189
+#: client/text.c:246
#, fuzzy, c-format
msgid "?clistbegin: with %s"
msgstr " ÈôÓÐ %s"
#. TRANS: "Trade from Warsaw: 5"
-#: client/text.c:202
+#: client/text.c:259
#, c-format
msgid "Trade from %s: %d"
msgstr "À´×Ô%s µÄóÒ×£º%d"
-#: client/text.c:210
+#: client/text.c:267
#, c-format
msgid "Infrastructure: %s"
msgstr "»ù´¡ÉèÊ©£º%s"
-#: client/text.c:215
+#: client/text.c:272
#, c-format
msgid "Activity: %s"
msgstr "»î¶¯£º%s"
-#. TRANS: "Unit: Musketeers (Polish, Warsaw)"
-#. TRANS: "Unit: Musketeers (Polish,friendly)"
-#: client/text.c:226 client/text.c:253
-#, c-format
-msgid "Unit: %s (%s, %s)"
+#. TRANS: "Unit: <unit type> | <username>
+#. * (<nation + team>, <homecity>)"
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <diplomatic state>)"
+#: client/text.c:287 client/text.c:313
+#, fuzzy, c-format
+msgid "Unit: %s | %s (%s, %s)"
msgstr "²¿¶Ó£º%s£¨%s£¬%s£©"
-#. TRANS: "Unit: Musketeers (Polish)"
-#: client/text.c:232
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>)"
+#: client/text.c:292
#, fuzzy, c-format
-msgid "Unit: %s (%s)"
-msgstr "²¿¶Ó£º%s£¨%s£©"
+msgid "Unit: %s | %s (%s)"
+msgstr "²¿¶Ó£º%s£¨%s£¬%s£©"
-#. TRANS: "Unit: Musketeers (Polish, 5 turn cease-fire)"
-#: client/text.c:245
-#, c-format
-msgid "Unit: %s (%s, %d turn cease-fire)"
-msgid_plural "Unit: %s (%s, %d turn cease-fire)"
+#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
+#. * <number> turn cease-fire)"
+#: client/text.c:305
+#, fuzzy, c-format
+msgid "Unit: %s | %s (%s, %d turn cease-fire)"
+msgid_plural "Unit: %s | %s (%s, %d turn cease-fire)"
msgstr[0] "²¿¶Ó£º%s£¨%s£¬Í£»ð %d »ØºÏ£©"
#. TRANS: "Chance to win: A:95% D:46%"
-#: client/text.c:279
+#: client/text.c:338
#, c-format
msgid "Chance to win: A:%d%% D:%d%%"
msgstr "»ñʤ»ú»á£º¹¥»÷£º%d%% ·ÀÓù£º%d%%"
#. TRANS: A is attack power, D is defense power, FP is firepower,
#. * HP is hitpoints (current and max).
-#: client/text.c:286
+#: client/text.c:345
#, c-format
msgid "A:%d D:%d FP:%d HP:%d/%d (%s)"
msgstr "¹¥:%d ·À:%d »ð:%d Ãü:%d/%d £¨%s£©"
#. TRANS: "5 more" units on this tile
-#: client/text.c:295
+#: client/text.c:354
#, c-format
msgid " (%d more)"
msgstr "£¨´Ë·½¸ñ»¹ÓÐ %d ²¿¶Ó£©"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:364
+#: client/text.c:423
#, c-format
msgid "far from %s"
msgstr "Ô¶Àë %s "
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:367
+#: client/text.c:426
#, c-format
msgid "near %s"
msgstr "½Ó½ü %s"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:370
+#: client/text.c:429
#, c-format
msgid "in %s"
msgstr "ÔÚ %s ÖÐ"
#. TRANS: on own line immediately following \n, ... <city>
-#: client/text.c:403
+#: client/text.c:462
#, c-format
msgid "from %s"
msgstr "À´×Ô %s"
-#: client/text.c:466
+#: client/text.c:525
msgid "Progress: no research"
msgstr "½ø¶È£ºÃ»ÓÐÑо¿"
-#: client/text.c:470
+#: client/text.c:529
msgid "Progress: no research target"
msgstr "½ø¶È£ºÃ»ÓÐÑо¿Ä¿±ê"
-#: client/text.c:475
+#: client/text.c:534
#, c-format
msgid "Progress: %d turn/advance"
msgid_plural "Progress: %d turns/advance"
msgstr[0] "½ø¶È£º%d »ØºÏ/½øÕ¹"
-#: client/text.c:480
+#: client/text.c:539
#, c-format
msgid "%d bulb/turn"
msgid_plural "%d bulbs/turn"
msgstr[0] "%d µã/»ØºÏ"
-#: client/text.c:485
+#: client/text.c:544
#, c-format
msgid ", %d bulb/turn from team"
msgid_plural ", %d bulbs/turn from team"
msgstr[0] "£¬ %d µã/»ØºÏ À´×ÔÍŶÓ"
-#: client/text.c:512
+#: client/text.c:571
#, c-format
msgid "%d/- (never)"
msgstr "%d/-£¨´Ó²»£©"
-#: client/text.c:524
+#: client/text.c:583
#, c-format
msgid "%d/%d (%d turn)"
msgid_plural "%d/%d (%d turns)"
msgstr[0] "%d/%d£¨%d »ØºÏ£©"
-#: client/text.c:527
+#: client/text.c:586
#, c-format
msgid "%d/%d (never)"
msgstr "%d/%d£¨´Ó²»£©"
-#: client/text.c:564
+#: client/text.c:623
#, c-format
msgid "%d step"
msgid_plural "%d steps"
msgstr[0] "%d ²½"
-#: client/text.c:566
+#: client/text.c:625
#, c-format
msgid "%d bulb"
msgid_plural "%d bulbs"
msgstr[0] "%d µã"
-#: client/text.c:570 client/agents/cma_fec.c:269 client/agents/cma_fec.c:313
+#: 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
#, c-format
msgid "%d turn"
msgid_plural "%d turns"
msgstr[0] "%d »ØºÏ"
-#: client/text.c:592
+#: client/text.c:651
#, c-format
msgid "Population: %s"
msgstr "ÈË¿Ú£º%s"
-#: client/text.c:595
+#: client/text.c:654
#, c-format
msgid "Year: %s (T%d)"
msgstr "Äê´ú£º%s£¨»ØºÏ %d£©"
-#: client/text.c:598
+#: client/text.c:657
#, c-format
msgid "Gold: %d (%+d)"
msgstr "»Æ½ð£º%d £¨%+d£©"
-#: client/text.c:600
+#: client/text.c:659
#, c-format
msgid "Tax: %d Lux: %d Sci: %d"
msgstr "Ë°£º%d Ó飺%d ÑУº%d"
-#: client/text.c:607
+#: client/text.c:666
#, fuzzy
msgid "Moving: Nobody"
msgstr "Òƶ¯ÖУº%s"
-#: client/text.c:609
+#: client/text.c:668
#, c-format
msgid "Moving: %s"
msgstr "Òƶ¯ÖУº%s"
-#: client/text.c:613
+#: client/text.c:672
msgid "(Click for more info)"
msgstr "£¨µã»÷ÒԲ鿴¸ü¶àÐÅÏ¢£©"
-#: client/text.c:629
+#: client/text.c:688
#, c-format
msgid "%s People"
msgstr "%s ÈË¿Ú"
-#: client/text.c:633
+#: client/text.c:692
#, c-format
msgid "Turn: %d"
msgstr "»ØºÏ£º%d"
-#: client/text.c:635 client/gui-win32/inteldlg.c:111
+#: client/text.c:694 client/gui-win32/inteldlg.c:111
#: client/gui-xaw/inteldlg.c:208
#, c-format
msgid "Gold: %d"
msgstr "»Æ½ð£º%d"
-#: client/text.c:636
+#: client/text.c:695
#, c-format
msgid "Net Income: %d"
msgstr "¾»ÊÕÈ룺%d"
#. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:639
+#: client/text.c:698
#, c-format
msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
msgstr "Ë°ÂÊ£º»Æ½ð£º%d%% ÓéÀÖ£º%d%% ¿ÆÑУº%d%%"
-#: client/text.c:643
+#: client/text.c:702
#, c-format
msgid "Researching %s: %s"
msgstr "ÕýÔÚÑо¿ %s£º%s"
-#: client/text.c:650
+#: client/text.c:709
#, c-format
msgid "Global warming chance: %d%% (%+d%%/turn)"
msgstr "È«Çò±äů¼¸ÂÊ£º%d%% £¨%+d%%/»ØºÏ£©"
-#: client/text.c:653
+#: client/text.c:712
#, c-format
msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
msgstr "ºË¶¬Ì켸ÂÊ£º%d%% £¨%+d%%/»ØºÏ£©"
-#: client/text.c:658 client/gui-win32/inteldlg.c:104
+#: client/text.c:717 client/gui-win32/inteldlg.c:104
#: client/gui-xaw/inteldlg.c:200
#, c-format
msgid "Government: %s"
msgstr "Õþ¸®£º%s"
-#: client/text.c:682
+#: client/text.c:741
#, c-format
msgid "%d unit"
msgid_plural "%d units"
msgstr[0] "%d ²¿¶Ó"
#. TRANS: Impossible to reach goto target tile
-#: client/text.c:715 client/gui-sdl/mapview.c:566
+#: client/text.c:774 client/gui-sdl/mapview.c:566
msgid "?goto:Unreachable"
msgstr ""
-#: client/text.c:717 client/gui-sdl/mapview.c:568
+#: client/text.c:776 client/gui-sdl/mapview.c:568
#, c-format
msgid "Turns to target: %d"
msgstr "¾àÀëÄ¿±ê»ØºÏÊý£º%d"
-#: client/text.c:719 client/gui-sdl/mapview.c:570
+#: client/text.c:778 client/gui-sdl/mapview.c:570
#, c-format
msgid "Turns to target: %d to %d"
msgstr "¾àÀëÄ¿±ê»ØºÏÊý£º%d µ½ %d"
-#: client/text.c:725 client/gui-sdl/mapview.c:576
+#: client/text.c:784 client/gui-sdl/mapview.c:576
#, c-format
msgid "%d unit selected"
msgid_plural "%d units selected"
msgstr[0] "Ñ¡ÖÐ %d ²¿¶Ó"
-#: client/text.c:730 client/gui-sdl/mapview.c:581
+#: client/text.c:789 client/gui-sdl/mapview.c:581
msgid "No units selected."
msgstr "δѡÖв¿¶Ó¡£"
-#: client/text.c:804 client/gui-sdl/mapview.c:654
+#: client/text.c:863 client/gui-sdl/mapview.c:654
#, c-format
msgid "Others: %d civil; %d military"
msgstr "ÆäËû£º%d °ÙÐÕ£»%d ¾üÊÂ"
-#: client/text.c:806 client/gui-sdl/mapview.c:656
+#: client/text.c:865 client/gui-sdl/mapview.c:656
#, c-format
msgid "Others: %d civilian"
msgstr "ÆäËû£º%d °ÙÐÕ"
-#: client/text.c:808 client/gui-sdl/mapview.c:658
+#: client/text.c:867 client/gui-sdl/mapview.c:658
#, c-format
msgid "Others: %d military"
msgstr ""
-#: client/text.c:839
+#: client/text.c:898
msgid "No units to upgrade!"
msgstr "ûÓпÉÒÔÉý¼¶µÄ²¿¶Ó¡£"
-#: client/text.c:864
+#: client/text.c:923
msgid "None of these units may be upgraded."
msgstr "ÕâЩ²¿¶Ó¶¼²»ÄÜÉý¼¶¡£"
-#: client/text.c:870
+#: client/text.c:929
#, c-format
msgid ""
"Upgrade %d unit for %d gold?\n"
@@ -9469,211 +9544,207 @@ msgstr[0] ""
"»¨·Ñ %2$d »Æ½ðÉý¼¶ %1$d ²¿¶Ó£¿\n"
"¹ú¿âÏÖÓÐ %3$d »Æ½ð¡£"
-#: client/text.c:891
+#: client/text.c:950
msgid "Shows your progress in researching the current technology."
msgstr "ÏÔʾÄúµ±Ç°¿Æ¼¼µÄÑо¿½ø¶È¡£"
-#: client/text.c:897
+#: client/text.c:956
msgid "no research target."
msgstr "ûÓÐÑо¿Ä¿±ê¡£"
#. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:900
+#: client/text.c:959
#, c-format
msgid "%s: %d/%d."
msgstr ""
-#: client/text.c:920
+#: client/text.c:979
msgid "Shows the progress of global warming:"
msgstr "ÏÔʾȫÇò±äůµÄ·¢Õ¹³Ì¶È£º"
-#: client/text.c:921
+#: client/text.c:980
#, c-format
msgid "Pollution rate: %d%%"
msgstr "ÎÛȾÂÊ£º%d%%"
-#: client/text.c:923
+#: client/text.c:982
#, c-format
msgid "Chance of catastrophic warming each turn: %d%%"
msgstr "ÿ»ØºÏÔÖÄÑÐÔ±äůµÄ¼¸ÂÊ£º%d%%"
-#: client/text.c:939
+#: client/text.c:998
msgid "Shows the progress of nuclear winter:"
msgstr "ÏÔʾºË¶¬ÌìµÄ·¢Õ¹³Ì¶È£º"
-#: client/text.c:940
+#: client/text.c:999
#, c-format
msgid "Fallout rate: %d%%"
msgstr "·øÉäÂÊ£º%d%%"
-#: client/text.c:942
+#: client/text.c:1001
#, c-format
msgid "Chance of catastrophic winter each turn: %d%%"
msgstr "ÿ»ØºÏÔÖÄÑÐÔ¶¬ÌìµÄ¼¸ÂÊ£º%d%%"
-#: client/text.c:957
+#: client/text.c:1016
msgid "Shows your current government:"
msgstr "ÏÔʾÄúµ±Ç°µÄÕþ¸®£º"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:981
+#: client/text.c:1040
#, c-format
msgid "Population: %5d"
msgstr "ÈË¿Ú£º %5d"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:1043
#, c-format
msgid "Support: %5d %%"
msgstr "Ö§³Ö£º %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:1047
#, c-format
msgid "Energy: %5d %%"
msgstr "ÄÜÔ´£º %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:992
+#: client/text.c:1051
#, c-format
msgid "Mass: %5d ton"
msgid_plural "Mass: %5d tons"
msgstr[0] "Îï×Ê£º %5d ¶Ö"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1057
#, c-format
msgid "Travel time: %5.1f years"
msgstr "ÂÃÐÐʱ¼ä£º %5.1f Äê"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1061
msgid "Travel time: N/A "
msgstr "ÂÃÐÐʱ¼ä£º ÎÞ "
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1065
#, c-format
msgid "Success prob.: %5d %%"
msgstr "´æ»î¸ÅÂÊ£º %5d %%"
#. TRANS: spaceship text; should have constant width.
-#: client/text.c:1010
+#: client/text.c:1069
#, c-format
msgid "Year of arrival: %8s"
msgstr "µ½´ïÄê´ú£º %8s"
-#: client/text.c:1030
+#: client/text.c:1089
msgid "?timeout:off"
msgstr "³¬Ê±¹Ø±Õ"
-#: client/text.c:1054
+#: client/text.c:1113
#, c-format
msgid "?seconds:%02ds"
msgstr "?seconds:%02d Ãë"
-#: client/text.c:1056
+#: client/text.c:1115
#, c-format
msgid "?mins/secs:%02dm %02ds"
msgstr "?mins/secs:%02d ·Ö %02d Ãë"
-#: client/text.c:1058
+#: client/text.c:1117
#, c-format
msgid "?hrs/mns:%02dh %02dm"
msgstr "?hrs/mns:%02d Сʱ %02d ·Ö"
-#: client/text.c:1060
+#: client/text.c:1119
#, c-format
msgid "?dys/hrs:%02dd %02dh"
msgstr "?dys/hrs:%02d Ìì %02d Сʱ"
-#: client/text.c:1063
+#: client/text.c:1122
msgid "?duration:overflow"
msgstr "?duration:Òç³ö"
-#: client/text.c:1084
+#: client/text.c:1143
#, c-format
msgid "%6d.%02d ms"
msgstr "%6d.%02d ms"
-#. TRANS: "Republic of the Poles"
-#: client/text.c:1127
-#, c-format
-msgid "%s of the %s"
-msgstr "%2$s µÄ %1$s"
+#. TRANS: <nation adjective> <government name>.
+#. * E.g. "Polish Republic".
+#: client/text.c:1188
+#, fuzzy, c-format
+msgid "?nationgovernment:%s %s"
+msgstr "Õþ¸®£º%s"
#. TRANS: "Observer: 1985"
-#: client/text.c:1137
+#: client/text.c:1198
#, c-format
msgid "Observer: %s"
msgstr "ÅÔ¹ÛÕߣº%s"
-#: client/text.c:1155
+#: client/text.c:1216
msgid "Buildings: "
msgstr "½¨Öþ£º"
-#: client/text.c:1172 client/text.c:1211
+#: client/text.c:1233 client/text.c:1272
msgid "None. "
msgstr "ÎÞ¡£ "
-#: client/text.c:1174 client/text.c:1213
+#: client/text.c:1235 client/text.c:1274
msgid "?clistend:."
msgstr "?blistend:"
-#: client/text.c:1192
+#: client/text.c:1253
msgid "Wonders: "
msgstr "Ææ¼££º"
-#: client/text.c:1247
+#: client/text.c:1308
#, 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:1251
+#: client/text.c:1312
#, 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:1257
+#: client/text.c:1318
#, fuzzy, c-format
msgid "%d additional unhappy citizen."
msgid_plural "%d additional unhappy citizens."
msgstr[0] "½«³öÏÖ¶îÍâ %d ¸öÓÇÓôÊÐÃñ¡£"
-#. TRANS: Martial law opening parenthesis
-#: client/text.c:1279
-msgid "Martial law in effect ("
+#: client/text.c:1339
+#, fuzzy
+msgid "Unlimited martial law in effect."
msgstr "¾üʹÜÖÆÖУ¨"
-#. TRANS: no [unit] maximum
-#: client/text.c:1284
-msgid "no maximum, "
-msgstr "ÎÞ²¿¶ÓÊýÉÏÏÞ£¬"
-
-#: client/text.c:1287
-#, c-format
-msgid "%d unit maximum, "
-msgid_plural "%d units maximum, "
-msgstr[0] "×î¶à %d ¸ö²¿¶Ó£¬"
+#: client/text.c:1341
+#, 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"
-#. TRANS: Martial law closing parenthesis
-#: client/text.c:1294
-#, c-format
-msgid "%d per unit). "
-msgstr "ÿ¸ö²¿¶Ó %d £©¡£"
+#: client/text.c:1345
+#, 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:1298
+#: client/text.c:1352
msgid "Military units in the field may cause unhappiness. "
msgstr "¾üʲ¿¶ÓÔÚÕâÀï¿ÉÄÜÒýÆðÓÇÓô¡£"
-#: client/text.c:1301
+#: client/text.c:1355
msgid "Military units have no happiness effect. "
msgstr "¾üʲ¿¶Ó¶Ô»¶ÀÖûÓÐÓ°Ïì¡£"
-#: client/text.c:1316
+#: client/text.c:1370
#, c-format
msgid "Luxury: %d total."
msgstr "ÓéÀÖ£º×ܹ² %d ¡£"
@@ -9693,7 +9764,7 @@ msgid ""
"instead."
msgstr "¿Í»§¶Ë²»Ö§³ÖÉÏ·½ÊӽǵĵØͼ·ç¸ñ¡£Ê¹ÓÃĬÈϵØͼ·ç¸ñ´úÌæ¡£"
-#: client/tilespec.c:3968
+#: client/tilespec.c:3966
#, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
@@ -9714,12 +9785,12 @@ msgid ""
"have a look."
msgstr ""
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
-#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:599
+#: client/gui-gtk-2.0/cityrep.c:624 client/gui-sdl/citydlg.c:2009
msgid "none"
msgstr "ÎÞ"
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:645
msgid "custom"
msgstr "¶¨ÖÆ"
@@ -10028,7 +10099,7 @@ msgstr "
msgid "Enter Marketplace"
msgstr "½øÈëÊг¡"
-#: client/gui-gtk-2.0/chatline.c:144 client/gui-win32/chatline.c:134
+#: client/gui-gtk-2.0/chatline.c:218 client/gui-win32/chatline.c:134
#: client/gui-xaw/chatline.c:120
msgid "Cleared output window."
msgstr "ÒÑÇå³ýµÄÊä³ö´°¿Ú¡£"
@@ -10109,11 +10180,11 @@ msgid "%d/%d %d turns"
msgstr "%d/%d %d »ØºÏ"
#: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:821
+#: client/gui-gtk-2.0/cityrep.c:1027
msgid "_Buy"
msgstr "¹ºÂò(_B)"
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:869
#, fuzzy
msgid "_Production"
msgstr "Éú²ú(_P)"
@@ -10135,12 +10206,12 @@ msgid "Entertainers"
msgstr "ÒÕÈË"
#: client/gui-gtk-2.0/citydlg.c:1029 client/gui-win32/citydlg.c:1989
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2403
msgid "Scientists"
msgstr "¿Æѧ¼Ò"
#: client/gui-gtk-2.0/citydlg.c:1030 client/gui-win32/citydlg.c:1991
-#: client/gui-xaw/citydlg.c:2401
+#: client/gui-xaw/citydlg.c:2404
msgid "Taxmen"
msgstr "Ë°ÎñÔ±"
@@ -10233,7 +10304,7 @@ msgstr "
msgid "Present units %d"
msgstr "ÏÖÓеIJ¿¶Ó£º%d"
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:1019
msgid "Cen_ter"
msgstr "ÖÐÐÄ(_T)"
@@ -10324,32 +10395,62 @@ msgstr "
msgid "What should we rename the city to?"
msgstr "°Ñ³ÇÊÐÃû³Æ¸ÄΪʲô£¿"
-#: client/gui-gtk-2.0/cityrep.c:699
+#: client/gui-gtk-2.0/cityrep.c:794
+#, fuzzy
+msgid "(no worklists defined)"
+msgstr "£¨¹¤×÷ÁÐ±í£©"
+
+#: client/gui-gtk-2.0/cityrep.c:876
msgid "Chan_ge"
msgstr "¸Ä±ä(_G)"
-#: client/gui-gtk-2.0/cityrep.c:703
+#: client/gui-gtk-2.0/cityrep.c:880
msgid "Add _First"
msgstr "¼ÓÈ빤×÷ÁбíÊ׸ö(_F)"
-#: client/gui-gtk-2.0/cityrep.c:707
+#: client/gui-gtk-2.0/cityrep.c:884
msgid "Add _Next"
msgstr "¼ÓÈ빤×÷Áбíϸö(_N)"
-#: client/gui-gtk-2.0/cityrep.c:711
+#: client/gui-gtk-2.0/cityrep.c:888
+#, fuzzy
+msgid "Add _2nd Last"
+msgstr "¼ÓÈ빤×÷ÁбíÄ©¸ö(_L)"
+
+#: client/gui-gtk-2.0/cityrep.c:892
msgid "Add _Last"
msgstr "¼ÓÈ빤×÷ÁбíÄ©¸ö(_L)"
-#: client/gui-gtk-2.0/cityrep.c:715
+#: client/gui-gtk-2.0/cityrep.c:899
+#, fuzzy
+msgid "Set Worklist"
+msgstr "¹¤×÷Áбí"
+
+#: client/gui-gtk-2.0/cityrep.c:905
+#, fuzzy
+msgid "Append Worklist"
+msgstr "ÖØÃüÃû¹¤×÷Áбí"
+
+#: client/gui-gtk-2.0/cityrep.c:911
+#, fuzzy
+msgid "Clear _Worklist"
+msgstr "Ä¿±ê¹¤×÷Áбí(_W)"
+
+#: client/gui-gtk-2.0/cityrep.c:916
+#, fuzzy
+msgid "Gover_nor"
+msgstr "×ܶ½"
+
+#: client/gui-gtk-2.0/cityrep.c:921
msgid "_Select"
msgstr "Ñ¡Ôñ(_S)"
-#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
+#: client/gui-gtk-2.0/cityrep.c:925 client/gui-gtk-2.0/plrdlg.c:521
#, fuzzy
msgid "_Display"
msgstr "ÏÔʾ(_D)"
-#: client/gui-gtk-2.0/cityrep.c:800 client/gui-gtk-2.0/menu.c:808
+#: 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-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
#: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -10359,101 +10460,101 @@ msgstr "
msgid "Cities"
msgstr "³ÇÊÐ"
-#: client/gui-gtk-2.0/cityrep.c:817
+#: client/gui-gtk-2.0/cityrep.c:1023
#, fuzzy
msgid "_Inspect"
msgstr "µ¯³ö(_I)"
-#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
-#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-sdl/helpdlg.c:297 client/gui-win32/menu.c:342
-#: client/gui-xaw/menu.c:241
+#: 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
+#: client/gui-gtk-2.0/cityrep.c:1518 client/gui-gtk-2.0/menu.c:823
+#: client/gui-gtk-2.0/menu.c:825 client/gui-gtk-2.0/menu.c:827
+#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:831
+#: client/gui-gtk-2.0/menu.c:833 client/gui-sdl/helpdlg.c:297
+#: client/gui-win32/menu.c:342 client/gui-xaw/menu.c:241
msgid "Improvements"
msgstr "½¨Öþ"
-#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
-#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
-#: client/gui-xaw/menu.c:247
+#: client/gui-gtk-2.0/cityrep.c:1441 client/gui-gtk-2.0/cityrep.c:1460
+#: client/gui-gtk-2.0/cityrep.c:1479 client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1522 client/gui-xaw/menu.c:247
msgid "Wonders"
msgstr "Ææ¼£"
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1662 client/gui-win32/cityrep.c:439
#: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
msgid "All Cities"
msgstr "ËùÓгÇÊÐ"
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1667 client/gui-win32/cityrep.c:440
msgid "No Cities"
msgstr "Çå³ýÑ¡Ôñ"
-#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1672 client/gui-win32/cityrep.c:441
msgid "Invert Selection"
msgstr "·´×ªÑ¡Ôñ"
-#: client/gui-gtk-2.0/cityrep.c:1420
+#: client/gui-gtk-2.0/cityrep.c:1682
msgid "Building Units"
msgstr "ÕýÔÚ½¨Ô첿¶Ó"
-#: client/gui-gtk-2.0/cityrep.c:1426
+#: client/gui-gtk-2.0/cityrep.c:1688
msgid "Building Improvements"
msgstr "ÕýÔÚ½¨Ô콨Öþ"
-#: client/gui-gtk-2.0/cityrep.c:1432
+#: client/gui-gtk-2.0/cityrep.c:1694
msgid "Building Wonders"
msgstr "ÕýÔÚ½¨ÔìÆæ¼£"
-#: client/gui-gtk-2.0/cityrep.c:1444
+#: client/gui-gtk-2.0/cityrep.c:1706
msgid "Building Unit"
msgstr "ÕýÔÚ½¨Ô첿¶Ó"
-#: client/gui-gtk-2.0/cityrep.c:1448
+#: client/gui-gtk-2.0/cityrep.c:1710
msgid "Building Improvement"
msgstr "ÕýÔÚ½¨Ô콨Öþ"
-#: client/gui-gtk-2.0/cityrep.c:1452
+#: client/gui-gtk-2.0/cityrep.c:1714
msgid "Building Wonder"
msgstr "ÕýÔÚ½¨ÔìÆæ¼£"
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1722 client/gui-win32/cityrep.c:443
msgid "Coastal Cities"
msgstr "Ñغ£³ÇÊÐ"
-#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1727 client/gui-win32/cityrep.c:444
msgid "Same Island"
msgstr "ÔÚͬһµºÓì"
-#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1737 client/gui-win32/cityrep.c:447
msgid "Supported Units"
msgstr "Ö§³Ö²¿¶Ó"
-#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1740 client/gui-win32/cityrep.c:454
msgid "Units Present"
msgstr "ÏÖÓв¿¶Ó"
-#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1744 client/gui-win32/cityrep.c:469
msgid "Improvements in City"
msgstr "³ÇÊÐÓµÓн¨Öþ"
-#: client/gui-gtk-2.0/cityrep.c:1486
+#: client/gui-gtk-2.0/cityrep.c:1748
msgid "Wonders in City"
msgstr "³ÇÊÐÓµÓÐÆæ¼£"
-#: client/gui-gtk-2.0/cityrep.c:1495
+#: client/gui-gtk-2.0/cityrep.c:1757
msgid "Available Units"
msgstr "¿ÉÓò¿¶Ó"
-#: client/gui-gtk-2.0/cityrep.c:1498
+#: client/gui-gtk-2.0/cityrep.c:1760
msgid "Available Improvements"
msgstr "¿ÉÓý¨Öþ"
-#: client/gui-gtk-2.0/cityrep.c:1501
+#: client/gui-gtk-2.0/cityrep.c:1763
msgid "Available Wonders"
msgstr "¿ÉÓÃÆæ¼£"
-#: client/gui-gtk-2.0/cityrep.c:1625
+#: client/gui-gtk-2.0/cityrep.c:1882
#, fuzzy, c-format
msgid "Total Buy Cost: %d"
msgstr "³É±¾×ܼƣº"
@@ -10526,12 +10627,12 @@ msgstr "
msgid "Remove this preset?"
msgstr "ɾ³ý´ËÔ¤É裿"
-#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:186
+#: client/gui-gtk-2.0/dialogs.c:196 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:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
#, fuzzy
msgid "Inspect _City"
msgstr "µ¯³ö³ÇÊжԻ°¿ò(_C)"
@@ -10560,10 +10661,10 @@ msgstr "
msgid "Unit"
msgstr "²¿¶Ó"
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
-#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
-#: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
-#: manual/civmanual.c:302 data/Freeciv.in:80
+#: 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-win32/plrdlg.c:335 manual/civmanual.c:302 data/Freeciv.in:80
msgid "Name"
msgstr "Ãû³Æ"
@@ -10589,7 +10690,7 @@ 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:1036 data/Freeciv.in:3371
+#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
#, fuzzy
msgid "Pick Nation"
msgstr "¾¯²ì¾Ö"
@@ -10672,7 +10773,7 @@ msgstr "
msgid "_Advances"
msgstr "¿Æ¼¼½øÕ¹(_A)"
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:910
+#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr "³ÇÊÐ(_C)"
@@ -10778,108 +10879,178 @@ msgstr "
msgid "Show _All Cities"
msgstr "ÏÔʾËùÓгÇÊÐ(_A)"
-#: client/gui-gtk-2.0/gui_main.c:150
+#: client/gui-gtk-2.0/gui_main.c:162
msgid "Show Map Scrollbars"
msgstr "ÏÔʾµØͼ¹ö¶¯Ìõ"
-#: client/gui-gtk-2.0/gui_main.c:151
+#: client/gui-gtk-2.0/gui_main.c:163
msgid "Disable this option to hide the scrollbars on the map view."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:155
+#: client/gui-gtk-2.0/gui_main.c:167
msgid "Keyboardless goto"
msgstr "ÓÃÊó±êÖ´ÐС°Ç°Íù¡±"
-#: client/gui-gtk-2.0/gui_main.c:156
+#: client/gui-gtk-2.0/gui_main.c:168
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:161
+#: client/gui-gtk-2.0/gui_main.c:173
msgid "Keep dialogs on top"
msgstr "¶Ô»°¿ò±£³ÖÔÚ¶¥¶Ë"
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:174
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:166
+#: client/gui-gtk-2.0/gui_main.c:178
msgid "Show worklist task icons"
msgstr "ÔÚ¹¤×÷ÁбíÖÐÏÔʾÈÎÎñͼ±ê"
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:179
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:171
+#: client/gui-gtk-2.0/gui_main.c:183
msgid "Enable status report tabs"
msgstr "ÔÊÐí״̬±¨¸æ·ÖÒ³"
-#: client/gui-gtk-2.0/gui_main.c:172
+#: client/gui-gtk-2.0/gui_main.c:184
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:177 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:189 client/gui-win32/gui_main.c:110
msgid "Better fog-of-war drawing"
msgstr "¸üºÃµÄÕ½Îí»æ»"
-#: client/gui-gtk-2.0/gui_main.c:178 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:190 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:277 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:195
+msgid "Show time for each chat message"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:196
+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
+msgid "Split bottom notebook area"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:202
+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
+msgid "New message events go to top of list"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:208
+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
+msgid "Show extra message window buttons"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:214
+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 "
+"is disabled, these buttons will not appear (you can still double-click with "
+"the left mouse button or right-click on a row to inspect or goto "
+"respectively). This option will only take effect once the message window is "
+"closed and reopened."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:224
+#, fuzzy
+msgid "Metaserver tab first in network page"
+msgstr "Ôª·þÎñÆ÷±êÌâ×Ö·û´®ÉèÖÃΪ¡°%s¡±¡£"
+
+#: client/gui-gtk-2.0/gui_main.c:225
+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
+msgid "Plain chat messages are sent to allies only"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:231
+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 "
+"messages will be sent as public chat messages. To send a public chat message "
+"with this option enabled, prefix the message with a single colon ':'. This "
+"option can also be set using a toggle button beside the chat entry (only "
+"visible in multiplayer games)."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:340 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:723 client/gui-gtk-2.0/gui_main.c:1345
+#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
msgid "Freeciv"
msgstr "Freeciv"
-#: client/gui-gtk-2.0/gui_main.c:1088 client/gui-gtk-2.0/gui_main.c:1095
+#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
#: 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:1095 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1232 client/gui-sdl/mapctrl.c:1566
#: client/gui-sdl/mapview.c:1082
msgid "Shift+Return"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1127 client/gui-gtk-2.0/menu.c:770
-#: client/gui-gtk-2.0/menu.c:772 client/gui-gtk-2.0/menu.c:774
-#: client/gui-gtk-2.0/menu.c:776 client/gui-gtk-2.0/menu.c:778
-#: client/gui-gtk-2.0/menu.c:780 client/gui-gtk-2.0/menu.c:782
-#: client/gui-gtk-2.0/menu.c:784 client/gui-gtk-2.0/menu.c:786
-#: client/gui-gtk-2.0/menu.c:788 client/gui-gtk-2.0/menu.c:790
-#: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
-#: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
-#: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
-#: client/gui-gtk-2.0/menu.c:804 client/gui-gtk-2.0/menu.c:806
-#: client/gui-gtk-2.0/menu.c:808 client/gui-gtk-2.0/menu.c:810
-#: client/gui-gtk-2.0/menu.c:812 client/gui-gtk-2.0/menu.c:814
-#: client/gui-gtk-2.0/menu.c:816 client/gui-gtk-2.0/menu.c:818
-#: client/gui-gtk-2.0/menu.c:820 client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/gui_main.c:1266 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
+#: client/gui-gtk-2.0/menu.c:811 client/gui-gtk-2.0/menu.c:813
+#: client/gui-gtk-2.0/menu.c:815 client/gui-gtk-2.0/menu.c:817
+#: client/gui-gtk-2.0/menu.c:819 client/gui-gtk-2.0/menu.c:821
+#: client/gui-gtk-2.0/menu.c:823 client/gui-gtk-2.0/menu.c:825
+#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
+#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
+#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
+#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
+#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
+#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
+#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
#: data/Freeciv.in:2028
msgid "View"
msgstr "²é¿´"
-#: client/gui-gtk-2.0/gui_main.c:1208
+#: client/gui-gtk-2.0/gui_main.c:1359
msgid "Chat"
msgstr "ÁÄÌì"
-#: client/gui-gtk-2.0/gui_main.c:1224 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1377 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"
@@ -10890,72 +11061,76 @@ msgstr ""
"¡°°ïÖú¡±²Ëµ¥µÄ¡°°æȨ¡±Ïî¡£\n"
"ºÃÁË£¬ÏÖÔÚ¡¡ÈÃËûÃÇÈ¥ËÀ°É£¡"
-#: client/gui-gtk-2.0/gui_main.c:1491
+#: client/gui-gtk-2.0/gui_main.c:1392
+msgid "Allies Only"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:1657
msgid "Not _ready"
msgstr "δ¾ÍÐ÷(_r)"
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
+#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
msgid "_Ready"
msgstr "¾ÍÐ÷(_R)"
-#: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2132
+#: 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
msgid "_Start"
msgstr "¿ªÊ¼(_S)"
-#: client/gui-gtk-2.0/gui_main.c:1520
+#: client/gui-gtk-2.0/gui_main.c:1686
#, fuzzy
msgid "_Take Player"
msgstr "È¡´ú´ËÍæ¼Ò"
-#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
+#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
msgid "Pick _Nation"
msgstr "Ñ¡ÔñÃñ×壨_N£©"
-#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
+#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
msgid "_Observe"
msgstr "ÅÔ¹Û(_O)"
-#: client/gui-gtk-2.0/gui_main.c:1532
+#: client/gui-gtk-2.0/gui_main.c:1698
#, fuzzy
msgid "Do not _observe"
msgstr "ÏÖÔÚÅÔ¹Û(_O)"
-#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
msgid "<AI>"
msgstr "<AI>"
-#: client/gui-gtk-2.0/gui_main.c:1557
+#: client/gui-gtk-2.0/gui_main.c:1723
msgid "<Novice AI>"
msgstr "<¼«Ò× AI>"
-#: client/gui-gtk-2.0/gui_main.c:1560
+#: client/gui-gtk-2.0/gui_main.c:1726
msgid "<Easy AI>"
msgstr "<ÈÝÒ× AI>"
-#: client/gui-gtk-2.0/gui_main.c:1563
+#: client/gui-gtk-2.0/gui_main.c:1729
msgid "<Normal AI>"
msgstr "<ÆÕͨ AI>"
-#: client/gui-gtk-2.0/gui_main.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1732
msgid "<Hard AI>"
msgstr "<À§ÄÑ AI>"
-#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1742 client/gui-win32/dialogs.c:594
#: client/gui-xaw/pages.c:217
msgid "Random"
msgstr "Ëæ»ú"
-#: client/gui-gtk-2.0/gui_main.c:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
msgid "Observer"
msgstr "ÅÔ¹ÛÕß"
-#: client/gui-gtk-2.0/gui_main.c:1642
+#: client/gui-gtk-2.0/gui_main.c:1808
#, fuzzy
msgid "Detached"
msgstr "ËÀµÄ"
-#: client/gui-gtk-2.0/gui_main.c:1899
+#: client/gui-gtk-2.0/gui_main.c:2073
msgid "Are you sure you want to quit?"
msgstr "È·ÈÏÏëÍ˳ö£¿"
@@ -11187,469 +11362,506 @@ msgstr "
msgid "Foreign Intelligence: %s Empire"
msgstr "Íâ¹úÇ鱨£º %s µÛ¹ú"
-#: client/gui-gtk-2.0/mapctrl.c:195 client/gui-sdl/mapctrl.c:2565
+#: client/gui-gtk-2.0/mapctrl.c:179 client/gui-sdl/mapctrl.c:2565
#: client/gui-sdl/menu.c:839 client/gui-sdl/menu.c:1021
#: client/gui-win32/mapctrl.c:353
msgid "Build New City"
msgstr "½¨ÔìгÇÊÐ"
-#: client/gui-gtk-2.0/mapctrl.c:196 client/gui-sdl/mapctrl.c:2594
+#: client/gui-gtk-2.0/mapctrl.c:180 client/gui-sdl/mapctrl.c:2594
#: client/gui-win32/mapctrl.c:354 client/gui-xaw/mapctrl.c:89
msgid "What should we call our new city?"
msgstr "гÇÊнÐʲôÃû×Ö£¿"
-#: client/gui-gtk-2.0/mapview.c:147
+#: client/gui-gtk-2.0/mapview.c:158
msgid "Shows your current luxury/science/tax rates;click to toggle them."
msgstr "ÏÔʾµ±Ç°µÄ ÓéÀÖ/¿ÆÑÐ/Ë°ÊÕ ±ÈÂÊ£»µ¥»÷ÔÚËüÃÇÖ®¼ä½øÐÐÇл»¡£"
-#: client/gui-gtk-2.0/mapview.c:692 client/gui-win32/canvas.c:275
+#: client/gui-gtk-2.0/mapview.c:702 client/gui-win32/canvas.c:275
msgid "Better fog will only work in truecolor. Disabling it"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:250
+#: client/gui-gtk-2.0/menu.c:256
msgid "Leaving a local game will end it!"
msgstr "À뿪±¾µØÓÎÏ·½«µ¼ÖÂÓÎÏ·½áÊø£¡"
-#: client/gui-gtk-2.0/menu.c:700 client/gui-win32/menu.c:303
+#: client/gui-gtk-2.0/menu.c:727 client/gui-win32/menu.c:303
msgid "_Game"
msgstr "ÓÎÏ·(_G)"
-#: client/gui-gtk-2.0/menu.c:702 client/gui-gtk-2.0/menu.c:704
-#: client/gui-gtk-2.0/menu.c:706 client/gui-gtk-2.0/menu.c:708
-#: client/gui-gtk-2.0/menu.c:710 client/gui-gtk-2.0/menu.c:712
-#: client/gui-gtk-2.0/menu.c:714 client/gui-gtk-2.0/menu.c:717
-#: client/gui-gtk-2.0/menu.c:720 client/gui-gtk-2.0/menu.c:722
-#: client/gui-gtk-2.0/menu.c:724 client/gui-gtk-2.0/menu.c:726
-#: client/gui-gtk-2.0/menu.c:728 client/gui-gtk-2.0/menu.c:730
-#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:736
-#: client/gui-gtk-2.0/menu.c:738 client/gui-gtk-2.0/menu.c:740
+#: client/gui-gtk-2.0/menu.c:729 client/gui-gtk-2.0/menu.c:731
+#: client/gui-gtk-2.0/menu.c:733 client/gui-gtk-2.0/menu.c:735
+#: client/gui-gtk-2.0/menu.c:737 client/gui-gtk-2.0/menu.c:739
+#: client/gui-gtk-2.0/menu.c:741 client/gui-gtk-2.0/menu.c:744
+#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
+#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
+#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
+#: client/gui-gtk-2.0/menu.c:760 client/gui-gtk-2.0/menu.c:763
+#: client/gui-gtk-2.0/menu.c:765 client/gui-gtk-2.0/menu.c:767
#: data/Freeciv.in:2026
msgid "Game"
msgstr "ÓÎÏ·"
-#: client/gui-gtk-2.0/menu.c:704 client/gui-gtk-2.0/menu.c:706
-#: client/gui-gtk-2.0/menu.c:708
+#: client/gui-gtk-2.0/menu.c:731 client/gui-gtk-2.0/menu.c:733
+#: client/gui-gtk-2.0/menu.c:735
msgid "_Chat"
msgstr "ÁÄÌì(_C)"
-#: client/gui-gtk-2.0/menu.c:706 client/gui-win32/menu.c:314
+#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:314
msgid "_Clear Log"
msgstr "Çå¿ÕÈÕÖ¾(_C)"
-#: client/gui-gtk-2.0/menu.c:708 client/gui-win32/menu.c:313
+#: client/gui-gtk-2.0/menu.c:735 client/gui-win32/menu.c:313
#, fuzzy
msgid "_Write Log"
msgstr "µ¼³öÈÕÖ¾(_X)"
-#: client/gui-gtk-2.0/menu.c:710 client/gui-win32/menu.c:304
+#: client/gui-gtk-2.0/menu.c:737 client/gui-win32/menu.c:304
msgid "Local _Options"
msgstr "±¾µØÑ¡Ïî(_O)"
-#: client/gui-gtk-2.0/menu.c:712 client/gui-win32/menu.c:305
+#: client/gui-gtk-2.0/menu.c:739 client/gui-win32/menu.c:305
msgid "_Message Options"
msgstr "ÏûϢѡÏî(_M)"
-#: client/gui-gtk-2.0/menu.c:717
+#: client/gui-gtk-2.0/menu.c:744
msgid "_Reload Tileset"
msgstr "ÖØÐÂÔØÈëµØͼ·ç¸ñ(_R)"
-#: client/gui-gtk-2.0/menu.c:720
+#: client/gui-gtk-2.0/menu.c:747
msgid "Save Options on _Exit"
msgstr "Í˳öʱ±£´æÑ¡Ïî(_E)"
-#: client/gui-gtk-2.0/menu.c:722
+#: client/gui-gtk-2.0/menu.c:749
msgid "Sa_ve Options"
msgstr "±£´æÓÎÏ·Ñ¡Ïî(_V)"
-#: client/gui-gtk-2.0/menu.c:726 client/gui-win32/menu.c:308
+#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:308
msgid "Server O_ptions"
msgstr "·þÎñÆ÷Ñ¡Ïî(_P)"
-#: client/gui-gtk-2.0/menu.c:730 client/gui-win32/menu.c:310
+#: client/gui-gtk-2.0/menu.c:757 client/gui-win32/menu.c:310
msgid "_Save Game"
msgstr "±£´æÓÎÏ·(_S)"
-#: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:311
+#: client/gui-gtk-2.0/menu.c:760 client/gui-win32/menu.c:311
msgid "Save Game _As..."
msgstr "ÓÎÏ·±£´æΪ(_A)¡"
-#: client/gui-gtk-2.0/menu.c:738
+#: client/gui-gtk-2.0/menu.c:765
msgid "_Leave"
msgstr "À뿪(_L)"
-#: client/gui-gtk-2.0/menu.c:740 client/gui-win32/menu.c:317
+#: client/gui-gtk-2.0/menu.c:767 client/gui-win32/menu.c:317
msgid "_Quit"
msgstr "Í˳ö(_Q)"
-#: client/gui-gtk-2.0/menu.c:745 client/gui-win32/menu.c:321
+#: client/gui-gtk-2.0/menu.c:772 client/gui-win32/menu.c:321
msgid "Gov_ernment"
msgstr "Õþ¸®(_E)"
-#: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
-#: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
-#: client/gui-gtk-2.0/menu.c:755 client/gui-gtk-2.0/menu.c:757
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:774 client/gui-gtk-2.0/menu.c:776
+#: client/gui-gtk-2.0/menu.c:778 client/gui-gtk-2.0/menu.c:780
+#: client/gui-gtk-2.0/menu.c:782 client/gui-gtk-2.0/menu.c:784
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
#: client/gui-xaw/menu.c:248 data/Freeciv.in:2027 data/helpdata.txt:1320
msgid "Government"
msgstr "Õþ¸®"
-#: client/gui-gtk-2.0/menu.c:749 client/gui-win32/menu.c:322
+#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:322
msgid "_Tax Rates"
msgstr "Ë°ÂÊ(_T)"
-#: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:324
+#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:324
msgid "_Find City"
msgstr "Ñ°ÕÒ³ÇÊÐ(_F)"
-#: client/gui-gtk-2.0/menu.c:755 client/gui-win32/menu.c:325
+#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:325
msgid "_Worklists"
msgstr "¹¤×÷Áбí(_W)"
-#: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
-#: client/gui-gtk-2.0/menu.c:764 client/gui-win32/menu.c:327
+#: client/gui-gtk-2.0/menu.c:786 client/gui-gtk-2.0/menu.c:788
+#: client/gui-gtk-2.0/menu.c:791 client/gui-win32/menu.c:327
msgid "_Change Government"
msgstr "¸Ä±äÕþ¸®(_C)"
-#: client/gui-gtk-2.0/menu.c:761
+#: client/gui-gtk-2.0/menu.c:788
msgid "_Revolution..."
msgstr "¸ïÃü(_R)..."
-#: client/gui-gtk-2.0/menu.c:764 client/gui-gtk-2.0/menu.c:970
+#: client/gui-gtk-2.0/menu.c:791 client/gui-gtk-2.0/menu.c:1013
#: client/gui-win32/menu.c:431
msgid "_Government"
msgstr "Õþ¸®(_G)"
-#: client/gui-gtk-2.0/menu.c:768 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:795 client/gui-gtk-2.0/menu.c:959
#: client/gui-win32/menu.c:334
msgid "_View"
msgstr "²é¿´(_V)"
-#: client/gui-gtk-2.0/menu.c:772
+#: client/gui-gtk-2.0/menu.c:799
msgid "City Outlines"
msgstr "³ÇÊÐÂÖÀª"
-#: client/gui-gtk-2.0/menu.c:774 client/gui-win32/menu.c:335
+#: client/gui-gtk-2.0/menu.c:801 client/gui-win32/menu.c:335
msgid "Map _Grid"
msgstr "µØͼդ¸ñ(_G)"
-#: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:336
+#: client/gui-gtk-2.0/menu.c:803 client/gui-win32/menu.c:336
msgid "National _Borders"
msgstr "¹ú¼Ò±ß½ç(_B)"
-#: client/gui-gtk-2.0/menu.c:778 client/gui-win32/menu.c:337
+#: client/gui-gtk-2.0/menu.c:805 client/gui-win32/menu.c:337
msgid "City _Names"
msgstr "³ÇÊÐÃû³Æ(_N)"
-#: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:338
+#: client/gui-gtk-2.0/menu.c:807 client/gui-win32/menu.c:338
msgid "City G_rowth"
msgstr "³ÇÊÐÔö³¤(_R)"
-#: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:339
+#: client/gui-gtk-2.0/menu.c:809 client/gui-win32/menu.c:339
msgid "City _Productions"
msgstr "³ÇÊÐÉú²ú(_P)"
-#: client/gui-gtk-2.0/menu.c:784 client/gui-sdl/optiondlg.c:1719
+#: client/gui-gtk-2.0/menu.c:811
+#, fuzzy
+msgid "City Buy Cost"
+msgstr "³É±¾×ܼƣº"
+
+#: client/gui-gtk-2.0/menu.c:813
+#, fuzzy
+msgid "City Traderoutes"
+msgstr "óÒ×·Ïß"
+
+#: client/gui-gtk-2.0/menu.c:815 client/gui-sdl/optiondlg.c:1719
msgid "Draw city worker map grid"
msgstr ""
-#: client/gui-gtk-2.0/menu.c:788 client/gui-sdl/optiondlg.c:1635
+#: client/gui-gtk-2.0/menu.c:819 client/gui-sdl/optiondlg.c:1635
#: client/gui-win32/menu.c:340 client/gui-xaw/menu.c:148
#: client/gui-xaw/menu.c:246 manual/civmanual.c:220 data/helpdata.txt:1220
msgid "Terrain"
msgstr "µØÐÎ"
-#: client/gui-gtk-2.0/menu.c:790 client/gui-win32/menu.c:341
+#: client/gui-gtk-2.0/menu.c:821 client/gui-win32/menu.c:341
#: client/gui-xaw/menu.c:149
msgid "Coastline"
msgstr "º£°¶Ïß"
-#: client/gui-gtk-2.0/menu.c:796 client/gui-win32/menu.c:343
+#: client/gui-gtk-2.0/menu.c:827 client/gui-win32/menu.c:343
msgid "Roads & Rails"
msgstr "¹«Â·ºÍÌú·"
-#: client/gui-gtk-2.0/menu.c:800 client/gui-sdl/optiondlg.c:1933
+#: client/gui-gtk-2.0/menu.c:831 client/gui-sdl/optiondlg.c:1933
#: client/gui-win32/menu.c:345 client/gui-xaw/menu.c:152
msgid "Mines"
msgstr "¿ó¾®"
-#: client/gui-gtk-2.0/menu.c:802 client/gui-win32/menu.c:346
+#: client/gui-gtk-2.0/menu.c:833 client/gui-win32/menu.c:346
msgid "Fortress & Airbase"
msgstr "ÒªÈûºÍ¿Õ¾ü»ùµØ"
-#: client/gui-gtk-2.0/menu.c:804 client/gui-win32/menu.c:348
+#: client/gui-gtk-2.0/menu.c:835 client/gui-win32/menu.c:348
#: client/gui-xaw/menu.c:154
msgid "Specials"
msgstr "Ìزú"
-#: client/gui-gtk-2.0/menu.c:806 client/gui-win32/menu.c:349
+#: client/gui-gtk-2.0/menu.c:837 client/gui-win32/menu.c:349
#: client/gui-xaw/menu.c:155
msgid "Pollution & Fallout"
msgstr "ÎÛȾÓë·øÉä"
-#: client/gui-gtk-2.0/menu.c:812 client/gui-win32/menu.c:352
+#: client/gui-gtk-2.0/menu.c:843 client/gui-win32/menu.c:352
#: client/gui-xaw/menu.c:158
msgid "Focus Unit"
msgstr "¾Û½¹²¿¶Ó"
-#: client/gui-gtk-2.0/menu.c:814 client/gui-sdl/optiondlg.c:1854
+#: client/gui-gtk-2.0/menu.c:845 client/gui-sdl/optiondlg.c:1854
#: client/gui-win32/menu.c:353 client/gui-xaw/menu.c:159
msgid "Fog of War"
msgstr "Õ½Îí"
-#: client/gui-gtk-2.0/menu.c:818
+#: client/gui-gtk-2.0/menu.c:849
msgid "_Full Screen"
msgstr "È«ÆÁģʽ(_F)"
-#: client/gui-gtk-2.0/menu.c:822
+#: client/gui-gtk-2.0/menu.c:853
msgid "_Center View"
msgstr "Òƶ¯µ½´°¿ÚÖÐÐÄ(_C)"
-#: client/gui-gtk-2.0/menu.c:825 client/gui-win32/menu.c:358
+#: client/gui-gtk-2.0/menu.c:856 client/gui-win32/menu.c:358
msgid "_Orders"
msgstr "ÃüÁî(_O)"
-#: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:837
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:841
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:845
-#: client/gui-gtk-2.0/menu.c:847 client/gui-gtk-2.0/menu.c:849
-#: client/gui-gtk-2.0/menu.c:851 client/gui-gtk-2.0/menu.c:853
-#: client/gui-gtk-2.0/menu.c:855 client/gui-gtk-2.0/menu.c:857
-#: client/gui-gtk-2.0/menu.c:859 client/gui-gtk-2.0/menu.c:861
-#: client/gui-gtk-2.0/menu.c:863 client/gui-gtk-2.0/menu.c:865
-#: client/gui-gtk-2.0/menu.c:867 client/gui-gtk-2.0/menu.c:869
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875 client/gui-gtk-2.0/menu.c:877
-#: client/gui-gtk-2.0/menu.c:879 client/gui-gtk-2.0/menu.c:881
-#: client/gui-gtk-2.0/menu.c:883 client/gui-gtk-2.0/menu.c:885
-#: client/gui-gtk-2.0/menu.c:887 client/gui-gtk-2.0/menu.c:889
-#: client/gui-gtk-2.0/menu.c:891 client/gui-gtk-2.0/menu.c:893
-#: client/gui-gtk-2.0/menu.c:895 client/gui-gtk-2.0/menu.c:897
-#: client/gui-gtk-2.0/menu.c:899 client/gui-gtk-2.0/menu.c:901
-#: client/gui-gtk-2.0/menu.c:903 data/Freeciv.in:2029
+#: client/gui-gtk-2.0/menu.c:858 client/gui-gtk-2.0/menu.c:860
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:864
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:868
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:872
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:876
+#: client/gui-gtk-2.0/menu.c:878 client/gui-gtk-2.0/menu.c:880
+#: client/gui-gtk-2.0/menu.c:882 client/gui-gtk-2.0/menu.c:884
+#: client/gui-gtk-2.0/menu.c:886 client/gui-gtk-2.0/menu.c:888
+#: client/gui-gtk-2.0/menu.c:890 client/gui-gtk-2.0/menu.c:892
+#: client/gui-gtk-2.0/menu.c:894 client/gui-gtk-2.0/menu.c:896
+#: client/gui-gtk-2.0/menu.c:898 client/gui-gtk-2.0/menu.c:900
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906 client/gui-gtk-2.0/menu.c:908
+#: client/gui-gtk-2.0/menu.c:910 client/gui-gtk-2.0/menu.c:912
+#: client/gui-gtk-2.0/menu.c:914 client/gui-gtk-2.0/menu.c:916
+#: client/gui-gtk-2.0/menu.c:918 client/gui-gtk-2.0/menu.c:920
+#: client/gui-gtk-2.0/menu.c:922 client/gui-gtk-2.0/menu.c:924
+#: client/gui-gtk-2.0/menu.c:926 client/gui-gtk-2.0/menu.c:928
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
+#: client/gui-gtk-2.0/menu.c:946 data/Freeciv.in:2029
msgid "Orders"
msgstr "ÃüÁî"
-#: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:1444
+#: client/gui-gtk-2.0/menu.c:860 client/gui-gtk-2.0/menu.c:1489
#: client/gui-win32/menu.c:359
msgid "_Build City"
msgstr "½¨Ôì³ÇÊÐ(_B)"
-#: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:1466
-#: client/gui-gtk-2.0/menu.c:1472 client/gui-win32/menu.c:360
+#: client/gui-gtk-2.0/menu.c:862 client/gui-gtk-2.0/menu.c:1511
+#: client/gui-gtk-2.0/menu.c:1517 client/gui-win32/menu.c:360
msgid "Build _Road"
msgstr "ÐÞÖþ¹«Â·(_R)"
-#: client/gui-gtk-2.0/menu.c:833 client/gui-gtk-2.0/menu.c:1360
+#: 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 "ÐËÐÞË®Àû(_I)"
-#: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:1361
+#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:1406
#: client/gui-win32/menu.c:362
msgid "Build _Mine"
msgstr "ÐÞÖþ¿ó¾®(_M)"
-#: client/gui-gtk-2.0/menu.c:837 client/gui-gtk-2.0/menu.c:1362
+#: client/gui-gtk-2.0/menu.c:868 client/gui-gtk-2.0/menu.c:1407
msgid "Transf_orm Terrain"
msgstr "¸Ä±äµØÐÎ(_O)"
-#: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:1508
+#: client/gui-gtk-2.0/menu.c:870 client/gui-gtk-2.0/menu.c:1553
#: client/gui-win32/menu.c:364
msgid "Build _Fortress"
msgstr "½¨ÖþÒªÈû"
-#: client/gui-gtk-2.0/menu.c:841 client/gui-win32/menu.c:365
+#: client/gui-gtk-2.0/menu.c:872 client/gui-win32/menu.c:365
msgid "Build Airbas_e"
msgstr "½¨Ôì¿Õ¾ü»ùµØ(_E)"
-#: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:1514
+#: client/gui-gtk-2.0/menu.c:874 client/gui-gtk-2.0/menu.c:1559
#: client/gui-win32/menu.c:366
msgid "Clean _Pollution"
msgstr "Çå³ýÎÛȾ(_P)"
-#: client/gui-gtk-2.0/menu.c:845 client/gui-win32/menu.c:367
+#: client/gui-gtk-2.0/menu.c:876 client/gui-win32/menu.c:367
msgid "Clean _Nuclear Fallout"
msgstr "Çå³ýºË·øÉä(_N)"
-#: client/gui-gtk-2.0/menu.c:849 client/gui-win32/menu.c:369
+#: client/gui-gtk-2.0/menu.c:880 client/gui-win32/menu.c:369
msgid "_Sentry"
msgstr "·ÅÉÚ(_S)"
-#: client/gui-gtk-2.0/menu.c:855 client/gui-win32/menu.c:372
+#: client/gui-gtk-2.0/menu.c:886 client/gui-win32/menu.c:372
msgid "Make _Homecity"
msgstr "ÉèΪ»ùµØ³ÇÊÐ(_H)"
-#: client/gui-gtk-2.0/menu.c:857 client/gui-win32/menu.c:373
+#: client/gui-gtk-2.0/menu.c:888 client/gui-win32/menu.c:373
msgid "_Load"
msgstr "×°ÔØ(_L)"
-#: client/gui-gtk-2.0/menu.c:859
+#: client/gui-gtk-2.0/menu.c:890
msgid "_Unload Transporter"
msgstr "жÔØÔËÊ䲿¶Ó(_U)"
-#: client/gui-gtk-2.0/menu.c:861 client/gui-win32/menu.c:374
+#: client/gui-gtk-2.0/menu.c:892 client/gui-win32/menu.c:374
msgid "_Unload"
msgstr "жÔØ(_U)"
-#: client/gui-gtk-2.0/menu.c:863 client/gui-win32/menu.c:375
+#: client/gui-gtk-2.0/menu.c:894 client/gui-win32/menu.c:375
msgid "Wake up o_thers"
msgstr "»½ÐÑÆäËü(_T)"
-#: client/gui-gtk-2.0/menu.c:867
+#: client/gui-gtk-2.0/menu.c:898
msgid "_Auto Settler"
msgstr "×Ô¶¯ÒÆÃñ(_A)"
-#: client/gui-gtk-2.0/menu.c:869 client/gui-win32/menu.c:378
+#: client/gui-gtk-2.0/menu.c:900 client/gui-win32/menu.c:378
msgid "Auto E_xplore"
msgstr "×Ô¶¯¿±Ì½(_X)"
-#: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
-#: client/gui-gtk-2.0/menu.c:875
+#: client/gui-gtk-2.0/menu.c:902 client/gui-gtk-2.0/menu.c:904
+#: client/gui-gtk-2.0/menu.c:906
msgid "_Connect"
msgstr "Á¬½Ó(_C)"
-#: client/gui-gtk-2.0/menu.c:871 client/gui-win32/menu.c:380
+#: client/gui-gtk-2.0/menu.c:902 client/gui-win32/menu.c:380
msgid "_Road"
msgstr "¹«Â·(_R)"
-#: client/gui-gtk-2.0/menu.c:873 client/gui-win32/menu.c:381
+#: client/gui-gtk-2.0/menu.c:904 client/gui-win32/menu.c:381
msgid "Rai_l"
msgstr "Ìú·(_L)"
-#: client/gui-gtk-2.0/menu.c:875 client/gui-win32/menu.c:382
+#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:382
msgid "_Irrigate"
msgstr "Ë®Àû(_I)"
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
msgid "Go _to"
msgstr "Ç°Íù(_T)"
-#: client/gui-gtk-2.0/menu.c:877
+#: client/gui-gtk-2.0/menu.c:908
msgid "_Build city"
msgstr "½¨Ôì³ÇÊÐ(_B)"
-#: client/gui-gtk-2.0/menu.c:879
+#: client/gui-gtk-2.0/menu.c:910
msgid "Patrol (_Q)"
msgstr "ѲÂß(_Q)"
-#: client/gui-gtk-2.0/menu.c:881 client/gui-win32/menu.c:385
+#: client/gui-gtk-2.0/menu.c:912 client/gui-win32/menu.c:385
msgid "_Go to"
msgstr "Ç°Íù(_G)"
-#: client/gui-gtk-2.0/menu.c:883
+#: client/gui-gtk-2.0/menu.c:914
msgid "Go\\/Airlift to City"
msgstr "Ç°Íù/¿ÕÔ˵½³ÇÊÐ"
-#: client/gui-gtk-2.0/menu.c:885 client/gui-sdl/menu.c:450
+#: client/gui-gtk-2.0/menu.c:916 client/gui-sdl/menu.c:450
#: client/gui-win32/menu.c:387 client/gui-xaw/menu.c:203
msgid "Return to nearest city"
msgstr "·µ»Ø×î½üµÄ³ÇÊÐ"
-#: client/gui-gtk-2.0/menu.c:889 client/gui-win32/menu.c:389
+#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:389
#: client/gui-xaw/menu.c:205
msgid "Disband Unit"
msgstr "½âÉ¢²¿¶Ó"
-#: client/gui-gtk-2.0/menu.c:891 client/gui-sdl/citydlg.c:532
+#: client/gui-gtk-2.0/menu.c:922 client/gui-sdl/citydlg.c:532
#: data/Freeciv.in:1186
msgid "Upgrade unit"
msgstr "Éý¼¶²¿¶Ó"
-#: client/gui-gtk-2.0/menu.c:893
+#: client/gui-gtk-2.0/menu.c:924
msgid "Diplomat\\/Spy Actions"
msgstr "Íâ½»¹Ù\\/¼äµý»î¶¯"
-#: client/gui-gtk-2.0/menu.c:895 client/gui-sdl/menu.c:399
+#: client/gui-gtk-2.0/menu.c:926 client/gui-sdl/menu.c:399
#: client/gui-win32/menu.c:391 client/gui-xaw/menu.c:209
msgid "Explode Nuclear"
msgstr "Òý±¬ºËµ¯"
-#: client/gui-gtk-2.0/menu.c:899
-msgid "Select same type"
-msgstr "Ñ¡ÔñÏàͬÀàÐͲ¿¶Ó"
+#: client/gui-gtk-2.0/menu.c:930 client/gui-gtk-2.0/menu.c:932
+#: client/gui-gtk-2.0/menu.c:934 client/gui-gtk-2.0/menu.c:936
+#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
+#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/cityrep.c:882
+msgid "Select"
+msgstr "Ñ¡Ôñ"
+
+#: client/gui-gtk-2.0/menu.c:934
+#, fuzzy
+msgid "Single"
+msgstr "´ÔÁÖ"
+
+#: client/gui-gtk-2.0/menu.c:936
+msgid "Same Type On Tile"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:938
+msgid "All On Tile"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:940
+msgid "Same Type On Continent"
+msgstr ""
+
+#: client/gui-gtk-2.0/menu.c:942
+msgid "Same Type Everywhere"
+msgstr ""
-#: client/gui-gtk-2.0/menu.c:901 client/gui-win32/menu.c:393
+#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:393
msgid "_Wait"
msgstr "µÈ´ý(_W)"
-#: client/gui-gtk-2.0/menu.c:903 client/gui-win32/menu.c:394
+#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:394
#: client/gui-xaw/menu.c:213
msgid "Done"
msgstr "Íê³É"
-#: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:398
+#: client/gui-gtk-2.0/menu.c:949 client/gui-win32/menu.c:398
msgid "_Reports"
msgstr "±¨¸æ(_R)"
-#: client/gui-gtk-2.0/menu.c:908 client/gui-gtk-2.0/menu.c:910
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:914
-#: client/gui-gtk-2.0/menu.c:916 client/gui-gtk-2.0/menu.c:918
-#: client/gui-gtk-2.0/menu.c:920 client/gui-gtk-2.0/menu.c:922
-#: client/gui-gtk-2.0/menu.c:924 client/gui-gtk-2.0/menu.c:926
-#: client/gui-gtk-2.0/menu.c:928 client/gui-gtk-2.0/menu.c:930
-#: client/gui-gtk-2.0/menu.c:932 data/Freeciv.in:2030
+#: client/gui-gtk-2.0/menu.c:951 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:957
+#: client/gui-gtk-2.0/menu.c:959 client/gui-gtk-2.0/menu.c:961
+#: client/gui-gtk-2.0/menu.c:963 client/gui-gtk-2.0/menu.c:965
+#: client/gui-gtk-2.0/menu.c:967 client/gui-gtk-2.0/menu.c:969
+#: client/gui-gtk-2.0/menu.c:971 client/gui-gtk-2.0/menu.c:973
+#: client/gui-gtk-2.0/menu.c:975 data/Freeciv.in:2030
msgid "Reports"
msgstr "±¨¸æ"
-#: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:958
+#: client/gui-gtk-2.0/menu.c:955 client/gui-gtk-2.0/menu.c:1001
#: client/gui-win32/menu.c:400 client/gui-win32/menu.c:425
msgid "_Units"
msgstr "²¿¶Ó(_U)"
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/menu.c:914 client/gui-win32/menu.c:402
+#: client/gui-gtk-2.0/menu.c:957 client/gui-win32/menu.c:402
#, fuzzy
msgid "_Nations"
msgstr "Ãñ×å(_N)£º"
-#: client/gui-gtk-2.0/menu.c:918 client/gui-win32/menu.c:403
+#: client/gui-gtk-2.0/menu.c:961 client/gui-win32/menu.c:403
msgid "_Economy"
msgstr "¾¼Ã(_E)"
#. TRANS: Research report action
-#: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:405
+#: client/gui-gtk-2.0/menu.c:963 client/gui-win32/menu.c:405
#, fuzzy
msgid "_Research"
msgstr "Ñо¿(_R)"
-#: client/gui-gtk-2.0/menu.c:924 client/gui-win32/menu.c:407
+#: client/gui-gtk-2.0/menu.c:967 client/gui-win32/menu.c:407
msgid "_Wonders of the World"
msgstr "ÊÀ½çÆæ¼£(_W)"
-#: client/gui-gtk-2.0/menu.c:926 client/gui-win32/menu.c:408
+#: client/gui-gtk-2.0/menu.c:969 client/gui-win32/menu.c:408
msgid "_Top Five Cities"
msgstr "³ÇÊÐÇ°ÎåÃûÅÅÐаñ(_T)"
-#: client/gui-gtk-2.0/menu.c:928 client/gui-win32/menu.c:409
+#: client/gui-gtk-2.0/menu.c:971 client/gui-win32/menu.c:409
msgid "_Messages"
msgstr "ÏûÏ¢(_M)"
-#: client/gui-gtk-2.0/menu.c:930 client/gui-win32/menu.c:410
+#: client/gui-gtk-2.0/menu.c:973 client/gui-win32/menu.c:410
msgid "_Demographics"
msgstr "ÈË¿Ú(_D)"
-#: client/gui-gtk-2.0/menu.c:932 client/gui-gtk-2.0/plrdlg.c:471
+#: client/gui-gtk-2.0/menu.c:975 client/gui-gtk-2.0/plrdlg.c:354
#: client/gui-win32/menu.c:411
msgid "_Spaceship"
msgstr "ÓîÖæ·É´¬(_S)"
-#: client/gui-gtk-2.0/menu.c:936 client/gui-win32/menu.c:415
+#: client/gui-gtk-2.0/menu.c:979 client/gui-win32/menu.c:415
msgid "_Help"
msgstr "°ïÖú(_H)"
-#: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
-#: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
-#: client/gui-gtk-2.0/menu.c:946 client/gui-gtk-2.0/menu.c:948
-#: client/gui-gtk-2.0/menu.c:950 client/gui-gtk-2.0/menu.c:952
-#: client/gui-gtk-2.0/menu.c:954 client/gui-gtk-2.0/menu.c:956
-#: client/gui-gtk-2.0/menu.c:958 client/gui-gtk-2.0/menu.c:960
-#: client/gui-gtk-2.0/menu.c:962 client/gui-gtk-2.0/menu.c:964
-#: client/gui-gtk-2.0/menu.c:966 client/gui-gtk-2.0/menu.c:968
-#: client/gui-gtk-2.0/menu.c:970 client/gui-gtk-2.0/menu.c:972
-#: client/gui-gtk-2.0/menu.c:974 client/gui-gtk-2.0/menu.c:976
-#: client/gui-gtk-2.0/menu.c:978 client/gui-gtk-2.0/menu.c:980
+#: client/gui-gtk-2.0/menu.c:981 client/gui-gtk-2.0/menu.c:983
+#: client/gui-gtk-2.0/menu.c:985 client/gui-gtk-2.0/menu.c:987
+#: client/gui-gtk-2.0/menu.c:989 client/gui-gtk-2.0/menu.c:991
+#: client/gui-gtk-2.0/menu.c:993 client/gui-gtk-2.0/menu.c:995
+#: client/gui-gtk-2.0/menu.c:997 client/gui-gtk-2.0/menu.c:999
+#: client/gui-gtk-2.0/menu.c:1001 client/gui-gtk-2.0/menu.c:1003
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-gtk-2.0/menu.c:1007
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-gtk-2.0/menu.c:1011
+#: client/gui-gtk-2.0/menu.c:1013 client/gui-gtk-2.0/menu.c:1015
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-gtk-2.0/menu.c:1019
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-gtk-2.0/menu.c:1023
#: client/gui-gtk-2.0/repodlgs.c:313 client/gui-win32/citydlg.c:1077
#: client/gui-win32/repodlgs.c:289 client/gui-win32/wldlg.c:846
#: data/Freeciv.in:1466 data/Freeciv.in:2031 data/Freeciv.in:2101
@@ -11657,119 +11869,119 @@ msgstr "
msgid "Help"
msgstr "°ïÖú"
-#: client/gui-gtk-2.0/menu.c:940 client/gui-win32/menu.c:416
+#: client/gui-gtk-2.0/menu.c:983 client/gui-win32/menu.c:416
msgid "Language_s"
msgstr "ÓïÑÔ(_S)"
-#: client/gui-gtk-2.0/menu.c:942 client/gui-win32/menu.c:417
+#: client/gui-gtk-2.0/menu.c:985 client/gui-win32/menu.c:417
msgid "Co_nnecting"
msgstr "Á¬½Ó(_N)"
-#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:418
+#: client/gui-gtk-2.0/menu.c:987 client/gui-win32/menu.c:418
msgid "C_ontrols"
msgstr "¿ØÖÆ(_O)"
-#: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:419
+#: client/gui-gtk-2.0/menu.c:989 client/gui-win32/menu.c:419
msgid "C_hatline"
msgstr "ÁÄÌì(_H)"
-#: client/gui-gtk-2.0/menu.c:948 client/gui-win32/menu.c:420
+#: client/gui-gtk-2.0/menu.c:991 client/gui-win32/menu.c:420
msgid "_Worklist Editor"
msgstr "¹¤×÷Áбí±à¼Æ÷(_W)"
-#: client/gui-gtk-2.0/menu.c:950 client/gui-win32/menu.c:421
+#: client/gui-gtk-2.0/menu.c:993 client/gui-win32/menu.c:421
msgid "Citizen _Management"
msgstr "ÊÐÃñ¹ÜÀí(_M)"
-#: client/gui-gtk-2.0/menu.c:952 client/gui-win32/menu.c:422
+#: client/gui-gtk-2.0/menu.c:995 client/gui-win32/menu.c:422
msgid "_Playing"
msgstr "ÓÎÏ·¼¼ÇÉ(_P)"
-#: client/gui-gtk-2.0/menu.c:956 client/gui-win32/menu.c:424
+#: client/gui-gtk-2.0/menu.c:999 client/gui-win32/menu.c:424
msgid "City _Improvements"
msgstr "³ÇÊн¨Öþ(_I)"
-#: client/gui-gtk-2.0/menu.c:960 client/gui-win32/menu.c:426
+#: client/gui-gtk-2.0/menu.c:1003 client/gui-win32/menu.c:426
msgid "Com_bat"
msgstr "Õ½¶·(_B)"
-#: client/gui-gtk-2.0/menu.c:962 client/gui-win32/menu.c:427
+#: client/gui-gtk-2.0/menu.c:1005 client/gui-win32/menu.c:427
msgid "_ZOC"
msgstr "_ZOC"
-#: client/gui-gtk-2.0/menu.c:964 client/gui-win32/menu.c:428
+#: client/gui-gtk-2.0/menu.c:1007 client/gui-win32/menu.c:428
msgid "Techno_logy"
msgstr "¿Æ¼¼(_L)"
-#: client/gui-gtk-2.0/menu.c:966 client/gui-win32/menu.c:429
+#: client/gui-gtk-2.0/menu.c:1009 client/gui-win32/menu.c:429
msgid "_Terrain"
msgstr "µØÐÎ(_T)"
-#: client/gui-gtk-2.0/menu.c:968 client/gui-win32/menu.c:430
+#: client/gui-gtk-2.0/menu.c:1011 client/gui-win32/menu.c:430
msgid "Won_ders"
msgstr "Ææ¼£(_D)"
-#: client/gui-gtk-2.0/menu.c:972 client/gui-win32/menu.c:432
+#: client/gui-gtk-2.0/menu.c:1015 client/gui-win32/menu.c:432
msgid "Happin_ess"
msgstr "Ȧ˅(_E)"
-#: client/gui-gtk-2.0/menu.c:974 client/gui-win32/menu.c:433
+#: client/gui-gtk-2.0/menu.c:1017 client/gui-win32/menu.c:433
msgid "Space _Race"
msgstr "Ì«¿Õ¾ºÈü(_R)"
-#: client/gui-gtk-2.0/menu.c:978 client/gui-win32/menu.c:435
+#: client/gui-gtk-2.0/menu.c:1021 client/gui-win32/menu.c:435
msgid "_Copying"
msgstr "°æȨ(_C)"
-#: client/gui-gtk-2.0/menu.c:980 client/gui-win32/menu.c:436
+#: client/gui-gtk-2.0/menu.c:1023 client/gui-win32/menu.c:436
msgid "_About"
msgstr "¹ØÓÚ(_A)"
-#: client/gui-gtk-2.0/menu.c:1264
+#: client/gui-gtk-2.0/menu.c:1307
#, c-format
msgid "%s..."
msgstr "%s..."
-#: client/gui-gtk-2.0/menu.c:1352
+#: client/gui-gtk-2.0/menu.c:1397
#, c-format
msgid "Change to %s (_I)"
msgstr "¸ÄÔìΪ %s (_I)"
-#: client/gui-gtk-2.0/menu.c:1353
+#: client/gui-gtk-2.0/menu.c:1398
#, c-format
msgid "Change to %s (_M)"
msgstr "¸ÄÔìΪ %s (_M)"
-#: client/gui-gtk-2.0/menu.c:1354
+#: client/gui-gtk-2.0/menu.c:1399
#, c-format
msgid "Transf_orm to %s"
msgstr "¸ÄÔìΪ %s (_O)"
-#: client/gui-gtk-2.0/menu.c:1427
+#: client/gui-gtk-2.0/menu.c:1472
msgid "Help _Build Wonder"
msgstr "°ïÖú½¨ÖþÆæ¼£(_B)"
-#: client/gui-gtk-2.0/menu.c:1441
+#: client/gui-gtk-2.0/menu.c:1486
msgid "Add to City (_B)"
msgstr "¼ÓÈë³ÇÊÐ(_B)"
-#: client/gui-gtk-2.0/menu.c:1449
+#: client/gui-gtk-2.0/menu.c:1494
msgid "Make Trade _Route"
msgstr "¿ª±ÙÉÌ·(_R)"
-#: client/gui-gtk-2.0/menu.c:1463
+#: client/gui-gtk-2.0/menu.c:1508
msgid "Build _Railroad"
msgstr "ÐÞÖþÌú·(_R)"
-#: client/gui-gtk-2.0/menu.c:1486
+#: client/gui-gtk-2.0/menu.c:1531
msgid "Bu_ild Farmland"
msgstr "½¨ÖþÅ©³¡"
-#: client/gui-gtk-2.0/menu.c:1506
+#: client/gui-gtk-2.0/menu.c:1551
msgid "_Fortify"
msgstr "Éè·À(_F)"
-#: client/gui-gtk-2.0/menu.c:1512
+#: client/gui-gtk-2.0/menu.c:1557
msgid "_Paradrop"
msgstr "¿Õ½µ(_P)"
@@ -11803,13 +12015,32 @@ msgstr "
msgid "Pop"
msgstr "¶ÀÁ¢"
-#: client/gui-gtk-2.0/messagewin.c:155 client/gui-sdl/messagewin.c:247
+#: client/gui-gtk-2.0/messagewin.c:186 client/gui-sdl/messagewin.c:247
#: client/gui-win32/messagewin.c:132 client/gui-xaw/menu.c:228
#: data/Freeciv.in:3273 data/Freeciv.in:3274 data/Freeciv.in:3283
msgid "Messages"
msgstr "ÏûÏ¢"
-#: client/gui-gtk-2.0/plrdlg.c:330
+#: client/gui-gtk-2.0/plrdlg.c:317
+msgid "_Meet"
+msgstr "»áÒé(_M)"
+
+#: client/gui-gtk-2.0/plrdlg.c:323
+#, fuzzy
+msgid "Cancel _Treaty"
+msgstr "È¡Ïûж¨(_C)"
+
+#: client/gui-gtk-2.0/plrdlg.c:329
+#, fuzzy
+msgid "_Withdraw Vision"
+msgstr "»ØÊÕÊÓÒ°(_W)"
+
+#: client/gui-gtk-2.0/plrdlg.c:348
+#, fuzzy
+msgid "_Report"
+msgstr "±¨¸æ(_R)"
+
+#: client/gui-gtk-2.0/plrdlg.c:386
msgid "?show:Dead Players"
msgstr "ÒÑËÀÍöÍæ¼Ò"
@@ -11817,272 +12048,275 @@ msgstr "
#. TRANS: Nations report action
#. TRANS: Nations report title
#. TRANS: Nations report action
-#: client/gui-gtk-2.0/plrdlg.c:350 client/gui-sdl/mapctrl.c:1580
+#: client/gui-gtk-2.0/plrdlg.c:406 client/gui-sdl/mapctrl.c:1580
#: client/gui-sdl/plrdlg.c:608 client/gui-win32/plrdlg.c:344
#: client/gui-xaw/menu.c:221 data/Freeciv.in:3192 data/Freeciv.in:3193
#, fuzzy
msgid "Nations"
msgstr "Ãñ×å"
-#: client/gui-gtk-2.0/plrdlg.c:443
-msgid "_Intelligence"
-msgstr "Ç鱨(_I)"
-
-#: client/gui-gtk-2.0/plrdlg.c:450
-msgid "_Meet"
-msgstr "»áÒé(_M)"
-
-#: client/gui-gtk-2.0/plrdlg.c:457
+#: client/gui-gtk-2.0/plrdlg.c:511
#, fuzzy
-msgid "Cancel _Treaty"
-msgstr "È¡Ïûж¨(_C)"
+msgid "Di_plomacy"
+msgstr "Íâ½»"
-#: client/gui-gtk-2.0/plrdlg.c:464
-msgid "_Withdraw vision"
-msgstr "»ØÊÕÊÓÒ°(_W)"
+#: client/gui-gtk-2.0/plrdlg.c:516
+msgid "_Intelligence"
+msgstr "Ç鱨(_I)"
-#: client/gui-gtk-2.0/plrdlg.c:495
+#: client/gui-gtk-2.0/plrdlg.c:526
msgid "_AI"
msgstr "_AI"
-#: client/gui-gtk-2.0/plrdlg.c:501
+#: client/gui-gtk-2.0/plrdlg.c:532
msgid "_Toggle AI Mode"
msgstr "Çл» AI ģʽ(_T)"
-#: client/gui-gtk-2.0/pages.c:208
+#: client/gui-gtk-2.0/pages.c:221
msgid "Start _New Game"
msgstr "¿ªÊ¼ÐÂÓÎÏ·(_N)"
-#: client/gui-gtk-2.0/pages.c:214
+#: client/gui-gtk-2.0/pages.c:227
msgid "Start _Scenario Game"
msgstr "¿ªÊ¼¾çÇéÓÎÏ·(_S)"
-#: client/gui-gtk-2.0/pages.c:220
+#: client/gui-gtk-2.0/pages.c:233
msgid "_Load Saved Game"
msgstr "ÔØÈë´æÅÌÓÎÏ·(_L)"
-#: client/gui-gtk-2.0/pages.c:229
+#: client/gui-gtk-2.0/pages.c:239
msgid "C_onnect to Network Game"
msgstr "Á¬½Óµ½ÍøÂçÓÎÏ·(_O)"
-#: client/gui-gtk-2.0/pages.c:236
+#: client/gui-gtk-2.0/pages.c:247
#, fuzzy
msgid "Connect to Gaming _Zone"
msgstr "Á¬½Óµ½ÍøÂçÓÎÏ·"
-#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:300
#: client/gui-xaw/connectdlg.c:326
msgid "Passwords don't match, enter password."
msgstr "¿ÚÁî²»ÕýÈ·£¬ÇåÊäÈë¿ÚÁî¡£"
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:779 client/gui-gtk-2.0/pages.c:820
+#: client/gui-win32/connectdlg.c:916
msgid "Server Name"
msgstr "·þÎñÆ÷Ãû³Æ"
-#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
+#: 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
+#: data/Freeciv.in:96
msgid "Port"
msgstr "¶Ë¿Ú"
-#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
+#: client/gui-win32/connectdlg.c:917
msgid "Version"
msgstr "°æ±¾"
-#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
-#: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
+#: 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
msgid "Status"
msgstr "״̬"
-#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
-#: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
+#: 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
msgid "Players"
msgstr "Íæ¼Ò"
-#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
+#: client/gui-win32/connectdlg.c:918
msgid "Comment"
msgstr "˵Ã÷"
-#: client/gui-gtk-2.0/pages.c:747
+#: client/gui-gtk-2.0/pages.c:786
msgid "Local _Area Network"
msgstr "¾ÖÓòÍø(_A)"
-#: client/gui-gtk-2.0/pages.c:783
+#: client/gui-gtk-2.0/pages.c:827
msgid "Internet _Metaserver"
msgstr "»¥ÁªÍøÔª·þÎñÆ÷(_M)"
-#: client/gui-gtk-2.0/pages.c:817
+#: client/gui-gtk-2.0/pages.c:864
msgid "_Host:"
msgstr "Ö÷»ú(_H)£º"
-#: client/gui-gtk-2.0/pages.c:834
+#: client/gui-gtk-2.0/pages.c:881
msgid "_Port:"
msgstr "¶Ë¿Ú(_P)£º"
-#: client/gui-gtk-2.0/pages.c:851
+#: client/gui-gtk-2.0/pages.c:898
msgid "_Login:"
msgstr "µÇ¼(_L)£º"
-#: client/gui-gtk-2.0/pages.c:869
+#: client/gui-gtk-2.0/pages.c:916
msgid "Pass_word:"
msgstr "¿ÚÁî(_W)£º"
-#: client/gui-gtk-2.0/pages.c:887
+#: client/gui-gtk-2.0/pages.c:934
msgid "Conf_irm Password:"
msgstr "È·ÈÏ¿ÚÁî(_I)£º"
-#: client/gui-gtk-2.0/pages.c:912
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: 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/wldlg.c:800 client/gui-win32/wldlg.c:806
+msgid "Type"
+msgstr "ÀàÐÍ"
+
+#: client/gui-gtk-2.0/pages.c:952 client/gui-win32/plrdlg.c:337
+#: data/Freeciv.in:88
+msgid "Host"
+msgstr "Ö÷»ú"
+
+#: client/gui-gtk-2.0/pages.c:981
msgid "C_onnect"
msgstr "Á¬½Ó(_O)"
-#: client/gui-gtk-2.0/pages.c:1142
+#: client/gui-gtk-2.0/pages.c:1211
#, fuzzy, c-format
msgid "Connection name: %s"
msgstr "ÕýÔÚÁ¬½ÓÖÐ"
-#: client/gui-gtk-2.0/pages.c:1145
+#: client/gui-gtk-2.0/pages.c:1214
#, c-format
msgid "Player name: %s"
msgstr "Íæ¼ÒÃû×Ö£º%s"
-#: client/gui-gtk-2.0/pages.c:1150
+#: client/gui-gtk-2.0/pages.c:1219
#, c-format
msgid "Host: %s"
msgstr "Ö÷»ú£º%s"
-#: client/gui-gtk-2.0/pages.c:1158
+#: client/gui-gtk-2.0/pages.c:1227
msgid "Player/conn info"
msgstr "Íæ¼Ò/Á¬½ÓÐÅÏ¢"
-#: client/gui-gtk-2.0/pages.c:1185
+#: client/gui-gtk-2.0/pages.c:1254
#, c-format
msgid "%s info"
msgstr "%s ÐÅÏ¢"
-#: client/gui-gtk-2.0/pages.c:1196
+#: client/gui-gtk-2.0/pages.c:1265
msgid "Toggle player ready"
msgstr "Çл»¾ÍÐ÷״̬"
-#: client/gui-gtk-2.0/pages.c:1204
+#: client/gui-gtk-2.0/pages.c:1273
msgid "Pick nation"
msgstr "Ñ¡ÔñÃñ×å"
-#: client/gui-gtk-2.0/pages.c:1214
+#: client/gui-gtk-2.0/pages.c:1283
msgid "Observe this player"
msgstr "ÅÔ¹Û´ËÍæ¼Ò"
-#: client/gui-gtk-2.0/pages.c:1221
+#: client/gui-gtk-2.0/pages.c:1290
msgid "Take this player"
msgstr "È¡´ú´ËÍæ¼Ò"
-#: client/gui-gtk-2.0/pages.c:1238
+#: client/gui-gtk-2.0/pages.c:1307
msgid "Cut connection"
msgstr "ÇжÏÁ¬½Ó"
-#: client/gui-gtk-2.0/pages.c:1248
+#: client/gui-gtk-2.0/pages.c:1317
msgid "Aitoggle player"
msgstr "Çл»Íæ¼ÒÊÇ·ñΪ AI"
-#: client/gui-gtk-2.0/pages.c:1257
+#: client/gui-gtk-2.0/pages.c:1326
msgid "Remove player"
msgstr "ɾ³ýÍæ¼Ò"
-#: client/gui-gtk-2.0/pages.c:1268
+#: client/gui-gtk-2.0/pages.c:1337
msgid "Give info access"
msgstr "¸øÓè info ·ÃÎʼ¶±ð"
-#: client/gui-gtk-2.0/pages.c:1276
+#: client/gui-gtk-2.0/pages.c:1345
msgid "Give ctrl access"
msgstr "¸øÓè ctrl ·ÃÎʼ¶±ð"
#. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1338
+#: client/gui-gtk-2.0/pages.c:1407
#, fuzzy, c-format
msgid "Put on %s"
msgstr "ÈË¿Ú£º%s"
-#: client/gui-gtk-2.0/pages.c:1442
+#: client/gui-gtk-2.0/pages.c:1511
#, fuzzy
msgid "Number of _Players (including AI):"
msgstr "Íæ¼ÒÊýÄ¿£¨°üÀ¨AI£©(_P)£º"
-#: client/gui-gtk-2.0/pages.c:1465
+#: client/gui-gtk-2.0/pages.c:1534
#, fuzzy
msgid "AI Skill _Level:"
msgstr "AI¼¼Äܼ¶±ð(_L)£º"
-#: client/gui-gtk-2.0/pages.c:1481
+#: client/gui-gtk-2.0/pages.c:1550
#, fuzzy
msgid "Ruleset _Version:"
msgstr "¹æÔò¼¯£¨(_V)£º"
-#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
msgid "_More Game Options..."
msgstr "¸ü¶àÓÎÏ·Ñ¡Ïî(_M)..."
-#: client/gui-gtk-2.0/pages.c:1514
+#: client/gui-gtk-2.0/pages.c:1583
#, fuzzy
msgid "Record"
msgstr "±¨¸æ"
-#: client/gui-gtk-2.0/pages.c:1519
+#: client/gui-gtk-2.0/pages.c:1588
#, fuzzy
msgid "Rating"
msgstr "ɳ»Ê»Êºó"
-#: client/gui-gtk-2.0/pages.c:1525
+#: client/gui-gtk-2.0/pages.c:1594
msgid "Ready"
msgstr "¾ÍÐ÷"
-#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
-#: data/nation/slovakian.ruleset:26
-msgid "Leader"
-msgstr "Áìµ¼Õß"
+#: client/gui-gtk-2.0/pages.c:1601
+#, fuzzy
+msgid "?player:Leader"
+msgstr "Ãû×Ö"
-#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1732 client/gui-sdl/chatline.c:185
msgid "Choose Saved Game to Load"
msgstr "ÇëÑ¡ÔñÒªÔØÈëµÄ´æÅÌÓÎÏ·Îļþ"
-#: client/gui-gtk-2.0/pages.c:1752
+#: client/gui-gtk-2.0/pages.c:1824
msgid "Choose Saved Game to _Load:"
msgstr "ÇëÑ¡ÔñÒªÔØÈëµÄ´æÅÌÓÎÏ·Îļþ(_L)£º"
-#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
-#: client/gui-gtk-2.0/pages.c:2375
+#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
+#: client/gui-gtk-2.0/pages.c:2451
msgid "_Browse..."
msgstr "ä¯ÀÀ(_B)..."
-#: client/gui-gtk-2.0/pages.c:1839
+#: client/gui-gtk-2.0/pages.c:1911
msgid "Choose a Scenario"
msgstr "ÇëÑ¡Ôñ¾çÇé"
-#: client/gui-gtk-2.0/pages.c:1926
+#: client/gui-gtk-2.0/pages.c:1998
msgid "Choose a _Scenario:"
msgstr "ÇëÑ¡Ôñ¾çÇé(_S)£º"
-#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
-#: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
-#: client/gui-win32/wldlg.c:806
-msgid "Type"
-msgstr "ÀàÐÍ"
-
-#: client/gui-gtk-2.0/pages.c:2101
+#: client/gui-gtk-2.0/pages.c:2173
msgid "Choose a _nation to play:"
msgstr "ÇëÑ¡ÔñÄúÒªÍæµÄÃñ×壺"
-#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2363 client/gui-win32/menu.c:581
msgid "Select Location to Save"
msgstr "Ñ¡ÔñÒª±£´æµ½µÄλÖÃ"
-#: client/gui-gtk-2.0/pages.c:2372 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2448 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr "±£´æÓÎÏ·"
-#: client/gui-gtk-2.0/pages.c:2413
+#: client/gui-gtk-2.0/pages.c:2489
msgid "Saved _Games:"
msgstr "´æÅÌÓÎÏ·(_G)£º"
-#: client/gui-gtk-2.0/pages.c:2440
+#: client/gui-gtk-2.0/pages.c:2516
msgid "Save _Filename:"
msgstr "´æÅÌÎļþÃû(_F)£º"
@@ -12435,7 +12669,7 @@ msgstr "
msgid "Total users logged in : %d"
msgstr ""
-#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1094
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
msgid "Back"
msgstr "ºóÍË"
@@ -12445,7 +12679,7 @@ msgid "Start"
msgstr "¿ªÊ¼(_S)"
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:775
+#: client/gui-win32/connectdlg.c:777
msgid "Load Game"
msgstr "×°ÈëÓÎÏ·"
@@ -12484,12 +12718,12 @@ msgid "Make new homecity"
msgstr "ÉèΪ»ùµØ³ÇÊÐ"
#: client/gui-sdl/citydlg.c:546 client/gui-sdl/citydlg.c:1418
-#: client/gui-sdl/connectdlg.c:307 client/gui-sdl/connectdlg.c:616
-#: client/gui-sdl/connectdlg.c:802 client/gui-sdl/connectdlg.c:984
+#: 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/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1039
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
#: 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
@@ -12537,7 +12771,7 @@ msgstr "
#: client/gui-sdl/diplodlg.c:1335 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:2427
+#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
#: client/gui-xaw/cityrep.c:666 client/gui-xaw/cma_fe.c:327
#: client/gui-xaw/cma_fe.c:511 client/gui-xaw/cma_fe.c:765
#: client/gui-xaw/messagedlg.c:72 client/gui-xaw/optiondlg.c:76
@@ -12553,7 +12787,7 @@ msgstr "
#: client/gui-sdl/diplodlg.c:1345 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:2427 client/gui-xaw/cityrep.c:666
+#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
#: client/gui-xaw/cma_fe.c:327 client/gui-xaw/cma_fe.c:511
#: client/gui-xaw/cma_fe.c:765 client/gui-xaw/messagedlg.c:72
#: client/gui-xaw/optiondlg.c:76 client/gui-xaw/optiondlg.c:304
@@ -12852,41 +13086,41 @@ msgstr "
msgid "Release city"
msgstr "½â³ý³ÇÊÐ"
-#: client/gui-sdl/connectdlg.c:238
+#: client/gui-sdl/connectdlg.c:239
#, fuzzy
msgid "Creating Server List..."
msgstr "Freeciv ·þÎñÆ÷Áбí"
-#: client/gui-sdl/connectdlg.c:279 client/gui-sdl/connectdlg.c:343
+#: client/gui-sdl/connectdlg.c:280 client/gui-sdl/connectdlg.c:344
#, fuzzy
msgid "No LAN servers found"
msgstr "¾ÖÓòÍø·þÎñÆ÷"
-#: client/gui-sdl/connectdlg.c:281 client/gui-sdl/connectdlg.c:345
+#: client/gui-sdl/connectdlg.c:282 client/gui-sdl/connectdlg.c:346
msgid "No public servers found"
msgstr ""
-#: client/gui-sdl/connectdlg.c:555
+#: client/gui-sdl/connectdlg.c:556
#, fuzzy
msgid "Player Name :"
msgstr "Ãû×Ö"
-#: client/gui-sdl/connectdlg.c:571
+#: client/gui-sdl/connectdlg.c:572
#, fuzzy
msgid "Freeciv Server :"
msgstr "Freeciv ·þÎñÆ÷Áбí"
-#: client/gui-sdl/connectdlg.c:588
+#: client/gui-sdl/connectdlg.c:589
#, fuzzy
msgid "Port :"
msgstr "״̬£º"
-#: client/gui-sdl/connectdlg.c:608 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr "Á¬½Ó"
-#: client/gui-sdl/connectdlg.c:794 client/gui-sdl/connectdlg.c:977
+#: client/gui-sdl/connectdlg.c:795 client/gui-sdl/connectdlg.c:978
#: client/gui-xaw/connectdlg.c:145
msgid "Next"
msgstr "ÏÂÒ»²½"
@@ -13178,7 +13412,7 @@ msgstr ""
#: client/gui-sdl/graphics.c:1021
#, c-format
-msgid "Unable to initialize SDL_ttf library: %s"
+msgid "Unable to initialize SDL_ttf library: %s"
msgstr ""
#: client/gui-sdl/graphics.c:1058
@@ -13265,12 +13499,6 @@ msgstr ""
msgid "Waiting for the beginning of the game"
msgstr ""
-#: client/gui-sdl/gui_string.c:608
-msgid ""
-"Couldn't find stdfont.ttf file. Please link/copy/move anyunicode ttf font to "
-"data dir as stdfont.ttf"
-msgstr ""
-
#. TRANS: Future Technology
#: client/gui-sdl/gui_tilespec.c:506
msgid "FT"
@@ -13877,12 +14105,12 @@ msgid "Leave Game"
msgstr "±£´æÓÎÏ·"
#: client/gui-sdl/optiondlg.c:2302 client/gui-sdl/pages.c:255
-#: client/gui-win32/connectdlg.c:1098 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1100 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:963
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
msgid "Start New Game"
msgstr "¿ªÊ¼ÐÂÓÎÏ·"
@@ -14010,8 +14238,8 @@ msgstr "
msgid "%s max rate : %d%%"
msgstr "%s ×î¸ß±ÈÂÊ£º%d%%"
-#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1081
-#: client/gui-win32/connectdlg.c:1089 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
+#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
msgid "Update"
msgstr "¸üÐÂ"
@@ -14442,10 +14670,6 @@ msgstr "È«
msgid "Refresh"
msgstr "Ë¢ÐÂ"
-#: client/gui-win32/cityrep.c:882
-msgid "Select"
-msgstr "Ñ¡Ôñ"
-
#: client/gui-win32/cityrep.c:883
msgid "Configure"
msgstr "ÅäÖÃ"
@@ -14495,56 +14719,56 @@ msgstr "
msgid "Verify Password"
msgstr "ÑéÖ¤¿ÚÁî"
-#: client/gui-win32/connectdlg.c:912 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr "Ñ¡Ôñ Freeciv ·þÎñÆ÷"
-#: client/gui-win32/connectdlg.c:913
+#: client/gui-win32/connectdlg.c:915
msgid "Local Area Network"
msgstr "¾ÖÓòÍø"
-#: client/gui-win32/connectdlg.c:947
+#: client/gui-win32/connectdlg.c:949
msgid "Welcome to Freeciv"
msgstr "»¶Ó½øÈë Freeciv"
-#: client/gui-win32/connectdlg.c:965
+#: client/gui-win32/connectdlg.c:967
msgid "Load Saved Game"
msgstr "×°Èë´æÅÌÓÎÏ·"
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
msgid "Connect To Network Game"
msgstr "Á¬½Óµ½ÍøÂçÓÎÏ·"
-#: client/gui-win32/connectdlg.c:977
+#: client/gui-win32/connectdlg.c:979
msgid "Choose a nation to play"
msgstr "ÇëÑ¡ÔñÄúÒªÍæµÄÃñ×壺"
-#: client/gui-win32/connectdlg.c:1012
+#: client/gui-win32/connectdlg.c:1014
msgid "Number of players (Including AI):"
msgstr "Íæ¼ÒÊýÄ¿£¨°üÀ¨AI£©£º"
-#: client/gui-win32/connectdlg.c:1020
+#: client/gui-win32/connectdlg.c:1022
msgid "AI skill level:"
msgstr "AI¼¼Äܼ¶±ð£º"
-#: client/gui-win32/connectdlg.c:1034 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
msgid "Game Options"
msgstr "ÓÎÏ·Ñ¡Ïî"
-#: client/gui-win32/connectdlg.c:1038
+#: client/gui-win32/connectdlg.c:1040
#, fuzzy
msgid "Start Game"
msgstr "¿ªÊ¼ÐÂÓÎÏ·"
-#: client/gui-win32/connectdlg.c:1057
+#: client/gui-win32/connectdlg.c:1059
msgid "Login:"
msgstr "µÇ¼£º"
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
msgid "Host:"
msgstr "Ö÷»ú£º"
-#: client/gui-win32/connectdlg.c:1060
+#: client/gui-win32/connectdlg.c:1062
msgid "Port:"
msgstr "״̬£º"
@@ -14806,10 +15030,6 @@ msgid "(idle %d turn)"
msgid_plural "(idle %d turns)"
msgstr[0] "(¿ÕÏÐ %d »ØºÏ)"
-#: client/gui-win32/plrdlg.c:337 data/Freeciv.in:88
-msgid "Host"
-msgstr "Ö÷»ú"
-
#: client/gui-win32/plrdlg.c:355 data/Freeciv.in:3230
msgid "Intelligence"
msgstr "Ç鱨"
@@ -16487,12 +16707,12 @@ msgstr ""
#: data/helpdata.txt:781
msgid ""
-" To have a diplomatic relationship with another player, you must fist "
-"establish first contact with that player. To establish first contact, you "
-"have to move one of your units next to a city or unit belonging to that "
-"player, or vice versa. Unless you establish an embassy with that player, you "
-"may again lose contact with them after a set number of turns without direct "
-"physical contact."
+" To have a diplomatic relationship with another player, you must first "
+"establish contact with that player. To establish contact, you have to move "
+"one of your units next to a city or unit belonging to that player, or vice "
+"versa. Unless you establish an embassy with that player, you may again lose "
+"contact with them after a set number of turns without direct physical "
+"contact."
msgstr ""
#: data/helpdata.txt:788
@@ -19014,7 +19234,7 @@ msgid "Communism"
msgstr "¹²²úÖ÷Òå"
#: data/default/governments.ruleset:121 data/civ2/governments.ruleset:118
-#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:26
+#: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:27
msgid "Comrade"
msgstr "ͬ־"
@@ -19907,6 +20127,11 @@ msgstr ""
"×¢Òâ²»ÒªÔÚÒ»¸ö»ØºÏÖÐͶÈëÌ«¶àµÄ¹¤×÷Õߣ¬¶àÓàµÄ×÷Óý«»á±»ÀË·Ñ£¬²¢ÇÒ¶ÔµÐÈ˵Ĺ¥»÷"
"À´ËµÒ»×éÒÆÃñÕß/¹¤³Ìʦ̫´àÈõÁË¡£"
+#: data/default/units.ruleset:238
+#, fuzzy
+msgid "?unit:Workers"
+msgstr "¹¤ÈË"
+
#: data/default/units.ruleset:264
msgid ""
"Workers are one of the key units in the game. They can be used to irrigate "
@@ -20533,6 +20758,11 @@ msgstr "̽
msgid "Explorers are very useful for mapping unknown territory."
msgstr "̽ÏÕ¼ÒÔÚΪδ֪ÇøÓò»æÖƵØͼ·½Ãæ×÷Óúܴó¡£"
+#: data/default/units.ruleset:1864
+#, fuzzy
+msgid "?unit:Leader"
+msgstr "Áìµ¼Õß"
+
#: data/default/units.ruleset:1892
msgid "This is you. If you lose this unit, you lose the game. So don't."
msgstr "¾ÍÊÇÄã×Ô¼º¡£Èç¹ûÄãËðʧÁËÕâ¸ö²¿¶Ó£¬Äã¾ÍÊäµôÁËÓÎÏ·¡£ËùÒÔ±ðËðʧËü¡£"
@@ -20774,7 +21004,7 @@ msgid "Emir"
msgstr ""
#: data/nation/afghani.ruleset:25 data/nation/slovakian.ruleset:30
-#: data/nation/soviet.ruleset:27
+#: data/nation/soviet.ruleset:28
msgid "General Secretary"
msgstr "µÚÒ»Êé¼Ç"
@@ -20886,10 +21116,11 @@ msgid "?plural:Armenians"
msgstr "ÑÇÃÀÄáÑÇÈË"
#: 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 "
-"independence from Soviet in 1991 AD"
+"independence from the Soviet Union in 1991."
msgstr ""
"¸ù¾Ý´«Ëµ£¬ÑÇÃÀÄáÑÇÈËÊÇŵÑǵÄÖØÖØËï×Ó£¬º£¿ËµÄºó´ú¡£ÏÖ´úµÄÑÇÃÀÄáÑǹ²ºÍ¹úÔÚ¹«Ôª "
"1991 Äê´ÓËÕÁª¶ÀÁ¢¡£"
@@ -21902,12 +22133,11 @@ msgstr "
#: data/nation/illyrian.ruleset:6
msgid ""
-"Illyrians were Indo-European tribes who appeared in the western part of the "
-"Balkan Peninsula before 1000 BC, including the Dalmatians to the north, "
-"Corcyra island and Ambracia bay in prehistoric Epirus to the south, mixing "
-"with Thracians in Dardania to the east, and settling Messapia across the "
-"Adriatic Sea. Illyrian kingdoms were independent for centuries, until "
-"conquered by the Roman Republic."
+"Illyrians were Indo-European tribes who appeared in the western part of the "
+"Balkan Peninsula before 1000 BC, including Corcyra island and Ambracia bay "
+"in prehistoric Epirus to the south. They mixed with Thracians in Dardania to "
+"the east, and settled Messapia across the Adriatic Sea. Illyrian kingdoms "
+"were independent for centuries, until conquered by the Roman Republic."
msgstr ""
#: data/nation/inca.ruleset:3
@@ -22217,7 +22447,7 @@ msgid ""
"1953."
msgstr ""
-#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:28
+#: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:29
#, fuzzy
msgid "Great Leader"
msgstr "´óͼÊé¹Ý"
@@ -22384,9 +22614,9 @@ msgstr "
msgid ""
"Sub-Saharan Africa has been a cultural and ethnical melting pot for "
"millennia. In medieval times, the region was home to a succession of empires "
-"called the Sahelian kingdoms. Of these, the Islamic Mali empire with it's "
+"called the Sahelian kingdoms. Of these, the Islamic Mali empire with its "
"capital in Timbuktu was the most influential. This empire reigned from the "
-"14th to the 17th century and was famed for it's wealth and benevolent kings. "
+"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 ""
@@ -22448,9 +22678,10 @@ msgid "?plural:Mayas"
msgstr "ÂêÑÅÈË"
#: data/nation/mayan.ruleset:6
+#, fuzzy
msgid ""
-"The Mayans were a Mesoamerican civilization. Famous for building great "
-"pyramids and palaces in the jungle."
+"The Mayans were a Mesoamerican civilization. They are famous for building "
+"great pyramids and palaces in the jungle."
msgstr "ÂêÑÅÈËÔøÊÇÒ»ÖÖÖÐÃÀÖÞÎÄÃ÷¡£ËûÃÇÒÔÔÚ´ÔÁÖÖÐÐÞ½¨ºêΰµÄ¹¬µîºÍ½ð×ÖËþÎÅÃû¡£"
#: data/nation/mayan.ruleset:19
@@ -22970,6 +23201,16 @@ msgstr ""
"˹Âå·¥¿ËÊÇÅ·ÖÞÖÐÐĵÄÒ»¸ö¹ú¼Ò¡£ÒÔÇ°ÊÇÊǽݿË˹Âå·¥¿ËµÄÒ»²¿·Ö£¬ÔÚ1918Äê֮ǰÊÇ°Â"
"ÐÙµÛ¹úµÄÒ»²¿·Ö¡£"
+#: data/nation/slovakian.ruleset:26
+#, fuzzy
+msgid "?male:Leader"
+msgstr "Áìµ¼Õß"
+
+#: data/nation/slovakian.ruleset:26
+#, fuzzy
+msgid "?female:Leader"
+msgstr "Ůͬ־"
+
#: data/nation/slovakian.ruleset:29
#, fuzzy
msgid "Pope"
@@ -23009,12 +23250,14 @@ msgid "?plural:Soviets"
msgstr "ËÕÁªÈË"
#: data/nation/soviet.ruleset:6
+#, fuzzy
msgid ""
-"Soviet Union's history starts in November 1917, when under Lenin's "
+"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 "
-"republics integrated into one country. Soviet Union became one of most "
-"powerful states in the 20th century. But by the end of 1991 due to many "
-"social shocks it disintegrated into fifteen independent countries"
+"republics integrated into one country. The Soviet Union became one of most "
+"powerful states in the 20th century, but by the end of 1991 it had "
+"disintegrated into fifteen independent countries due to social and economic "
+"problems."
msgstr ""
"ËÕÁªµÄÀúÊ·¿ªÊ¼ÓÚ 1917 Äê 11 Ô£¬ÔÚÁÐÄþµÄÁ쵼Ϸ¢ÉúÁ˲¼¶ûʲά¿Ë¸ïÃü¡£ÔÚ 1922 "
"Äê 12 Ô 31 ÈÕ£¬ËĸöËÕά°£¹²ºÍ¹úºÏ²¢³ÉÒ»¸ö¹ú¼Ò¡£ËÕÁª³ÉΪ 20 ÊÀ¼Í×îÇ¿´óµÄ¹ú¼Ò"
@@ -23410,8 +23653,8 @@ msgstr "
#: data/nation/westphalian.ruleset:6
msgid ""
-"Westphalia, before becoming a Prussian province, was the western region the "
-"duchy of Saxony. Present-day it consists of the Northern part of the largest "
+"Westphalia, before becoming a Prussian province, was the western region of "
+"the duchy of Saxony. Today it makes up the northern part of the largest "
"German federal state, North Rhine-Westphalia."
msgstr ""
@@ -23558,7 +23801,7 @@ msgid ""
"The flag and background color indicate what civilization the city\n"
"belongs to (this will be useful when you meet other civilizations).\n"
"The top row of the bar also shows the name and size of the city, and\n"
-"will show one or more starts to indicate if there are units in the\n"
+"will show one or more stars to indicate if there are units in the\n"
"city. The bottom row shows what the city is building, and how long it\n"
"will take; it also shows how long the city will take to grow to the\n"
"next largest size."
@@ -23614,7 +23857,7 @@ msgid ""
"Now your city has grown to size five. As cities get larger unrest\n"
"becomes a problem. A city of this size will usually have one unhappy\n"
"citizen unless pacifying effects are used; meaning one entertainer\n"
-"specialist is required to keep your citzens content. This is basically\n"
+"specialist is required to keep your citizens content. This is basically\n"
"a wasted citizen.\n"
"\n"
"There are several things that can be done about this. One quick fix\n"
@@ -23686,7 +23929,7 @@ msgid ""
"existing cities. Generally when building new cities you want to make\n"
"sure that all tiles are covered by at least one city, but after that\n"
"it is best that your cities overlap as little as possible. Spreading\n"
-"out cities properly gives each city access to more resrouces, allowing\n"
+"out cities properly gives each city access to more resources, allowing\n"
"them to grow to larger sizes."
msgstr ""
@@ -24000,6 +24243,61 @@ msgstr "
msgid "Team 31"
msgstr "ÍŶÓ"
+#, fuzzy
+#~ msgid "Auth config filename \"%s\" not allowed!"
+#~ msgstr "²»ÄÜʹÓøÃÃû×Ö¡£"
+
+#~ msgid "The %s of the %s (%s)"
+#~ msgstr "%2$s£¨%3$s£© µÄ %1$s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Illegal alliance structure detected: %s alliance to %s reduced to peace "
+#~ "treaty."
+#~ msgstr "¼ì²âµ½·Ç·¨½áÃ˽ṹ£º %s ¶Ô %s ½áÃ˸ıäΪºÍƽж¨¡£"
+
+#, fuzzy
+#~ msgid "And, became more experienced!"
+#~ msgstr " ¹¥»÷³É¹¦²¢±äµÃ¸üÓоÑé¡£"
+
+#~ msgid "We can't take control of server, attempting to kill it."
+#~ msgstr "²»ÄÜ»ñµÃ¶Ô·þÎñÆ÷µÄ¿ØÖÆ£¬ÕýÔÚ³¢ÊԹرշþÎñÆ÷¡£"
+
+#, fuzzy
+#~ msgid "%s territory"
+#~ msgstr "%s µÄÁìÍÁ"
+
+#~ msgid "%s territory (%d turn cease-fire)"
+#~ msgid_plural "%s territory (%d turn cease-fire)"
+#~ msgstr[0] "%s ÁìÍÁ£¨Í£»ð %d »ØºÏ£©"
+
+#, fuzzy
+#~ msgid "%s territory (%s)"
+#~ msgstr "%s µÄ %s µÄÁìÍÁ"
+
+#~ msgid "City: %s (%s)"
+#~ msgstr "³ÇÊУº%s(%s)"
+
+#, fuzzy
+#~ msgid "Unit: %s (%s)"
+#~ msgstr "²¿¶Ó£º%s£¨%s£©"
+
+#~ msgid "%s of the %s"
+#~ msgstr "%2$s µÄ %1$s"
+
+#~ msgid "no maximum, "
+#~ msgstr "ÎÞ²¿¶ÓÊýÉÏÏÞ£¬"
+
+#~ msgid "%d unit maximum, "
+#~ msgid_plural "%d units maximum, "
+#~ msgstr[0] "×î¶à %d ¸ö²¿¶Ó£¬"
+
+#~ msgid "%d per unit). "
+#~ msgstr "ÿ¸ö²¿¶Ó %d £©¡£"
+
+#~ msgid "Select same type"
+#~ msgstr "Ñ¡ÔñÏàͬÀàÐͲ¿¶Ó"
+
#~ msgid "Units: "
#~ msgstr "²¿¶Ó£º "
@@ -24089,9 +24387,6 @@ msgstr "
#~ msgid ", nation %s"
#~ msgstr "£¬Ãñ×å %s"
-#~ msgid ", team %s"
-#~ msgstr "£¬ÍÅ¶Ó %s "
-
#~ msgid "_Map"
#~ msgstr "µØͼ(_M)"
@@ -25308,9 +25603,6 @@ msgstr "
#~ msgid "Last player has disconnected: will need to restart."
#~ msgstr "×îºóÒ»¸öÍæ¼ÒÒѶϿªÁ¬½Ó£ºÐèÒªÖØпªÊ¼¡£"
-#~ msgid "Metaserver topic string set to '%s'."
-#~ msgstr "Ôª·þÎñÆ÷±êÌâ×Ö·û´®ÉèÖÃΪ¡°%s¡±¡£"
-
#~ msgid "Metaserver topic string set to '%s', not reporting to metaserver."
#~ msgstr "Ôª·þÎñÆ÷ÐÅÏ¢×Ö·û´®ÉèÖÃΪ¡°%s¡±£¬²»ÏòÔª·þÎñÆ÷±¨¸æ¡£"
diff --git a/server/auth.c b/server/auth.c
index 68969a0..e523e5d 100644
--- a/server/auth.c
+++ b/server/auth.c
@@ -277,11 +277,6 @@ static bool load_auth_config(const char *filename)
assert(filename != NULL);
- if (!is_safe_filename(filename)) {
- freelog(LOG_ERROR, _("Auth config filename \"%s\" not allowed!"), filename);
- return FALSE;
- }
-
if (!section_file_load_nodup(&file, filename)) {
freelog(LOG_ERROR, _("Cannot load auth config file \"%s\"!"), filename);
return FALSE;
diff --git a/server/diplomats.c b/server/diplomats.c
index 845fe62..888e3a8 100644
--- a/server/diplomats.c
+++ b/server/diplomats.c
@@ -456,7 +456,7 @@ void diplomat_bribe(struct player *pplayer, struct unit *pdiplomat,
unit_name_translation(pdiplomat),
unit_name_translation(pvictim));
if (maybe_make_veteran(pdiplomat)) {
- notify_unit_experience(pdiplomat, TRUE);
+ notify_unit_experience(pdiplomat);
}
notify_player(uplayer, pvictim->tile, E_ENEMY_DIPLOMAT_BRIBE,
/* TRANS: <unit> ... <Poles> */
@@ -1138,7 +1138,7 @@ static bool diplomat_infiltrate_tile(struct player *pplayer,
/* Defending unit became more experienced? */
if (maybe_make_veteran(punit)) {
- notify_unit_experience(punit, FALSE);
+ notify_unit_experience(punit);
}
wipe_unit(pdiplomat);
return FALSE;
@@ -1187,7 +1187,7 @@ static void diplomat_escape(struct player *pplayer, struct unit *pdiplomat,
unit_name_translation(pdiplomat),
city_name(spyhome));
if (maybe_make_veteran(pdiplomat)) {
- notify_unit_experience(pdiplomat, TRUE);
+ notify_unit_experience(pdiplomat);
}
/* being teleported costs all movement */
diff --git a/server/generator/mapgen.c b/server/generator/mapgen.c
index 8980468..a3d8396 100644
--- a/server/generator/mapgen.c
+++ b/server/generator/mapgen.c
@@ -1494,15 +1494,53 @@ static void fill_island(int coast, long int *bucket,
}
/**************************************************************************
- fill an island with rivers
+ Returns TRUE if ptile is suitable for a river mouth.
+**************************************************************************/
+static bool island_river_mouth_suitability(const struct tile *ptile)
+{
+ int num_card_ocean, pct_adj_ocean, num_adj_river;
+
+ num_card_ocean = count_ocean_near_tile(ptile, C_CARDINAL, C_NUMBER);
+ pct_adj_ocean = count_ocean_near_tile(ptile, C_ADJACENT, C_PERCENT);
+ num_adj_river = count_special_near_tile(ptile, C_ADJACENT, C_NUMBER,
+ S_RIVER);
+
+ return (num_card_ocean == 1 && pct_adj_ocean <= 35
+ && num_adj_river == 0);
+}
+
+/**************************************************************************
+ Returns TRUE if there is a river in a cardinal direction near the tile
+ and the tile is suitable for extending it.
+**************************************************************************/
+static bool island_river_suitability(const struct tile *ptile)
+{
+ int pct_adj_ocean, num_card_ocean, pct_adj_river, num_card_river;
+
+ num_card_river = count_special_near_tile(ptile, C_CARDINAL, C_NUMBER,
+ S_RIVER);
+ num_card_ocean = count_ocean_near_tile(ptile, C_CARDINAL, C_NUMBER);
+ pct_adj_ocean = count_ocean_near_tile(ptile, C_ADJACENT, C_PERCENT);
+ pct_adj_river = count_special_near_tile(ptile, C_ADJACENT, C_PERCENT,
+ S_RIVER);
+
+ return (num_card_river == 1 && num_card_ocean == 0
+ && pct_adj_ocean < 20 && pct_adj_river < 35
+ /* The following expression helps with straightness,
+ * ocean avoidance, and reduces forking. */
+ && (pct_adj_river + pct_adj_ocean * 2) < myrand(25) + 25);
+}
+
+/**************************************************************************
+ Fill an island with rivers.
**************************************************************************/
static void fill_island_rivers(int coast, long int *bucket,
- const struct gen234_state *const pstate)
+ const struct gen234_state *const pstate)
{
- int i, k, capac;
- long int failsafe;
+ long int failsafe, capac, i, k;
+ struct tile *ptile;
- if (*bucket <= 0 ) {
+ if (*bucket <= 0) {
return;
}
capac = pstate->totalmass;
@@ -1510,30 +1548,27 @@ static void fill_island_rivers(int coast, long int *bucket,
i++;
*bucket -= i * capac;
+ /* generate 75% more rivers than generator 1 */
+ i = (i * 175) / 100;
+
k = i;
- failsafe = i * (pstate->s - pstate->n) * (pstate->e - pstate->w);
+ failsafe = i * (pstate->s - pstate->n) * (pstate->e - pstate->w) * 5;
if (failsafe < 0) {
failsafe = -failsafe;
}
- while (i > 0 && (failsafe--) > 0) {
- struct tile *ptile = get_random_map_position_from_state(pstate);
- if (tile_get_continent(ptile) == pstate->isleindex
- && not_placed(ptile)) {
+ while (i > 0 && failsafe-- > 0) {
+ ptile = get_random_map_position_from_state(pstate);
+ if (tile_get_continent(ptile) != pstate->isleindex
+ || tile_has_special(ptile, S_RIVER)) {
+ continue;
+ }
- /* the first condition helps make terrain more contiguous,
- the second lets it avoid the coast: */
- if ((i * 3 > k * 2
- || count_special_near_tile(ptile, FALSE, TRUE, S_RIVER) > 0
- || myrand(100) < 50)
- && (!is_cardinally_adj_to_ocean(ptile) || myrand(100) < coast)) {
- if (is_water_adjacent_to_tile(ptile)
- && count_ocean_near_tile(ptile, FALSE, TRUE) < 50
- && count_special_near_tile(ptile, FALSE, TRUE, S_RIVER) < 35) {
- tile_set_special(ptile, S_RIVER);
- i--;
- }
- }
+ if ((island_river_mouth_suitability(ptile)
+ && (myrand(100) < coast || i == k))
+ || island_river_suitability(ptile)) {
+ tile_set_special(ptile, S_RIVER);
+ i--;
}
}
}
@@ -1546,8 +1581,7 @@ static bool is_near_land(struct tile *ptile)
{
/* Note this function may sometimes be called on land tiles. */
adjc_iterate(ptile, tile1) {
- if (tile1->terrain != T_UNKNOWN
- && !is_ocean(tile_get_terrain(tile1))) {
+ if (!is_ocean(tile_get_terrain(tile1))) {
return TRUE;
}
} adjc_iterate_end;
diff --git a/server/meta.h b/server/meta.h
index f2017ee..d7a02f8 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://meta.freeciv.org/metaserver.phtml"
+#define DEFAULT_META_SERVER_ADDR "http://www.cazfi.net/freeciv/metaserver/"
#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 1dd6184..f96c822 100644
--- a/server/plrhand.c
+++ b/server/plrhand.c
@@ -1683,9 +1683,9 @@ void civil_war(struct player *pplayer)
nation_rule_name(nation_of_player(pplayer)),
player_name(cplayer));
notify_player(pplayer, NULL, E_CIVIL_WAR,
- _("Your nation is thrust into civil war, "
- " %s is declared the leader of the rebel states."),
- player_name(cplayer));
+ _("Your nation is thrust into civil war! "
+ "%s is declared the leader of the rebel states."),
+ player_name(cplayer));
i = city_list_size(pplayer->cities)/2; /* number to flip */
j = city_list_size(pplayer->cities); /* number left to process */
diff --git a/server/report.c b/server/report.c
index 7bb265e..ef64d6e 100644
--- a/server/report.c
+++ b/server/report.c
@@ -745,10 +745,12 @@ void report_demographics(struct connection *pconn)
return;
}
- my_snprintf(civbuf, sizeof(civbuf), _("The %s of the %s (%s)"),
- government_name_for_player(pplayer),
- nation_plural_for_player(pplayer),
- textyear(game.info.year));
+ /* TRANS: <nation adjective> <government name> (<year>).
+ * E.g. "Polish Despotism (200 AD)". */
+ my_snprintf(civbuf, sizeof(civbuf), _("%s %s (%s)"),
+ nation_adjective_for_player(pplayer),
+ government_name_for_player(pplayer),
+ textyear(game.info.year));
buffer[0] = '\0';
for (i = 0; i < ARRAY_SIZE(rowtable); i++) {
diff --git a/server/savegame.c b/server/savegame.c
index 711c22f..2037bac 100644
--- a/server/savegame.c
+++ b/server/savegame.c
@@ -4069,11 +4069,10 @@ void game_load(struct section_file *file)
&& pplayers_allied(plr, aplayer)
&& pplayer_can_make_treaty(plr, aplayer, DS_ALLIANCE)
== DIPL_ALLIANCE_PROBLEM) {
- /* TRANS: ... <Danish> alliance to <Poles>.... */
- freelog(LOG_ERROR, _("Illegal alliance structure detected: "
- "%s alliance to %s reduced to peace treaty."),
- nation_adjective_for_player(plr),
- nation_plural_for_player(aplayer));
+ freelog(LOG_ERROR, "Illegal alliance structure detected: "
+ "%s alliance to %s reduced to peace treaty.",
+ nation_rule_name(plr->nation),
+ nation_rule_name(aplayer->nation));
plr->diplstates[aplayer->player_no].type = DS_PEACE;
aplayer->diplstates[plr->player_no].type = DS_PEACE;
}
diff --git a/server/scripting/api_gen.c b/server/scripting/api_gen.c
index a670df4..b139a06 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 Mon Sep 10 00:15:07 2007.
+** Generated automatically by tolua 5.0a on Wed Mar 25 09:24:49 2009.
*/
#ifndef __cplusplus
diff --git a/server/scripting/api_gen.h b/server/scripting/api_gen.h
index 3a648d7..c01b4bf 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 Mon Sep 10 00:15:07 2007.
+** Generated automatically by tolua 5.0a on Wed Mar 25 09:24:49 2009.
*/
/* Exported function */
diff --git a/server/sernet.c b/server/sernet.c
index 81d6493..b7ab4a5 100644
--- a/server/sernet.c
+++ b/server/sernet.c
@@ -116,6 +116,9 @@ static int socklan;
#define SPECLIST_TAG timer
#define SPECLIST_TYPE struct timer
#include "speclist.h"
+#define timer_list_iterate(ARG_list, NAME_item) \
+ TYPED_LIST_ITERATE(struct timer, (ARG_list), NAME_item)
+#define timer_list_iterate_end LIST_ITERATE_END
#define PROCESSING_TIME_STATISTICS 0
@@ -196,14 +199,18 @@ static void handle_readline_input_callback(char *line)
*****************************************************************************/
void close_connection(struct connection *pconn)
{
- while (timer_list_size(pconn->server.ping_timers) > 0) {
- struct timer *timer = timer_list_get(pconn->server.ping_timers, 0);
+ if (!pconn) {
+ return;
+ }
- timer_list_unlink(pconn->server.ping_timers, timer);
- free_timer(timer);
+ if (pconn->server.ping_timers != NULL) {
+ timer_list_iterate(pconn->server.ping_timers, timer) {
+ free_timer(timer);
+ } timer_list_iterate_end;
+ timer_list_unlink_all(pconn->server.ping_timers);
+ timer_list_free(pconn->server.ping_timers);
+ pconn->server.ping_timers = NULL;
}
- assert(timer_list_size(pconn->server.ping_timers) == 0);
- timer_list_free(pconn->server.ping_timers);
/* safe to do these even if not in lists: */
conn_list_unlink(game.all_connections, pconn);
diff --git a/server/settings.c b/server/settings.c
index f13b13b..2713bda 100644
--- a/server/settings.c
+++ b/server/settings.c
@@ -1014,7 +1014,7 @@ struct settings_s settings[] = {
SSET_META, SSET_INTERNAL, SSET_VITAL, SSET_SERVER_ONLY,
N_("Auto-save name prefix"),
N_("Automatically saved games will have name "
- "\"<prefix><year>.sav\". This setting sets "
+ "\"<prefix>-T<turn>-Y<year>.sav\". This setting sets "
"the <prefix> part."), NULL,
GAME_DEFAULT_SAVE_NAME)
diff --git a/server/srv_main.c b/server/srv_main.c
index b386a40..037de2f 100644
--- a/server/srv_main.c
+++ b/server/srv_main.c
@@ -866,6 +866,40 @@ 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:
+
+ <prefix> = game.save_name
+ <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.
+ <m> = "m" (for "manual save") if 'is_auto_save' is FALSE
+
+ 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)
+{
+ int nb, year;
+ const char *year_suffix;
+
+ if (game.info.year < 0) {
+ year = -game.info.year;
+ year_suffix = "BC";
+ } else {
+ year = game.info.year;
+ year_suffix = "AD";
+ }
+
+ /* 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");
+ return nb;
+}
+
+/**************************************************************************
Unconditionally save the game, with specified filename.
Always prints a message: either save ok, or failed.
@@ -890,10 +924,9 @@ void save_game(char *orig_filename, const char *save_reason)
*dot = '\0';
}
- /* If orig_filename is NULL or empty, use "civgame.info.year>m". */
+ /* If orig_filename is NULL or empty, use a generated default name. */
if (filename[0] == '\0'){
- my_snprintf(filename, sizeof(filename),
- "%s%+05dm", game.save_name, game.info.year);
+ generate_save_name(filename, sizeof(filename), FALSE);
}
timer_cpu = new_timer_start(TIMER_CPU, TIMER_ACTIVE);
@@ -947,8 +980,7 @@ void save_game_auto(const char *save_reason)
assert(strlen(game.save_name)<256);
- my_snprintf(filename, sizeof(filename),
- "%s%+05d.sav", game.save_name, game.info.year);
+ generate_save_name(filename, sizeof(filename), TRUE);
save_game(filename, save_reason);
save_ppm();
}
diff --git a/server/unithand.c b/server/unithand.c
index 7ffa30a..d5e8c8d 100644
--- a/server/unithand.c
+++ b/server/unithand.c
@@ -784,7 +784,7 @@ static bool unit_bombard(struct unit *punit, struct tile *ptile)
}
if (maybe_make_veteran(punit)) {
- notify_unit_experience(punit, FALSE);
+ notify_unit_experience(punit);
}
send_unit_info(NULL, punit);
@@ -903,7 +903,7 @@ static void handle_unit_attack_request(struct unit *punit, struct unit *pdefende
nation_adjective_for_player(unit_owner(plooser)),
unit_name_translation(plooser));
if (vet) {
- notify_unit_experience(pwinner, TRUE);
+ notify_unit_experience(pwinner);
}
notify_player(unit_owner(plooser), def_tile, E_UNIT_LOST_ATT,
/* TRANS: "... Cannon ... the Polish Destroyer." */
diff --git a/server/unittools.c b/server/unittools.c
index 455a9bb..2bf579d 100644
--- a/server/unittools.c
+++ b/server/unittools.c
@@ -294,8 +294,9 @@ void pay_for_units(struct player *pplayer, struct city *pcity)
assert(pplayer->economic.gold + potential_gold >= 0);
notify_player(pplayer, NULL, E_UNIT_LOST,
- _("Not enough gold. %s disbanded"),
- unit_name_translation(punit));
+ _("Not enough gold to pay upkeep "
+ "for %s. Unit disbanded."),
+ unit_name_translation(punit));
wipe_unit(punit);
} else {
/* Gold can get negative here as city improvements will be sold
@@ -605,21 +606,18 @@ static bool maybe_settler_become_veteran(struct unit *punit)
}
/**************************************************************************
- common notification for all experience levels.
- When used immediately after another unit message, set also to TRUE.
+ Common notification for all experience levels.
**************************************************************************/
-void notify_unit_experience(struct unit *punit, bool also)
+void notify_unit_experience(struct unit *punit)
{
- if (also) {
- notify_player(unit_owner(punit), punit->tile, E_UNIT_BECAME_VET,
- /* TRANS: And, <the unit> became ... */
- _("And, became more experienced!"));
- } else {
- notify_player(unit_owner(punit), punit->tile, E_UNIT_BECAME_VET,
- /* TRANS: Your <unit> became ... */
- _("Your %s became more experienced!"),
- unit_name_translation(punit));
+ if (!punit) {
+ return;
}
+
+ notify_player(unit_owner(punit), punit->tile, E_UNIT_BECAME_VET,
+ /* TRANS: Your <unit> became ... */
+ _("Your %s became more experienced!"),
+ unit_name_translation(punit));
}
/**************************************************************************
@@ -645,7 +643,7 @@ static void update_unit_activity(struct unit *punit)
/* settler may become veteran when doing something useful */
if (activity != ACTIVITY_FORTIFYING && activity != ACTIVITY_SENTRY
&& maybe_settler_become_veteran(punit)) {
- notify_unit_experience(punit, FALSE);
+ notify_unit_experience(punit);
}
}
@@ -1024,25 +1022,61 @@ bool teleport_unit_to_city(struct unit *punit, struct city *pcity,
}
/**************************************************************************
- Teleport or remove a unit due to stack conflict.
+ Move or remove a unit due to stack conflicts. This function will try to
+ find a random safe tile within a two tile distance of the unit's current
+ tile and move the unit there. If no tiles are found, the unit is
+ disbanded. If 'verbose' is TRUE, a message is sent to the unit owner
+ regarding what happened.
**************************************************************************/
void bounce_unit(struct unit *punit, bool verbose)
{
- struct player *pplayer = unit_owner(punit);
- struct city *pcity = find_closest_owned_city(pplayer, punit->tile,
- is_sailing_unit(punit), NULL);
+ struct player *pplayer;
+ struct tile *punit_tile;
+ int count = 0;
+
+ /* I assume that there are no topologies that have more than
+ * (2d + 1)^2 tiles in the "square" of "radius" d. */
+ const int DIST = 2;
+ struct tile *tiles[(2 * DIST + 1) * (2 * DIST + 1)];
+
+ if (!punit) {
+ return;
+ }
+
+ pplayer = unit_owner(punit);
+ punit_tile = punit->tile;
+
+ square_iterate(punit_tile, DIST, ptile) {
+ if (count >= ARRAY_SIZE(tiles)) {
+ break;
+ }
+ if (can_unit_survive_at_tile(punit, ptile)
+ && !is_non_allied_city_tile(ptile, pplayer)
+ && !is_non_allied_unit_tile(ptile, pplayer)) {
+ tiles[count++] = ptile;
+ }
+ } square_iterate_end;
+
+ if (count > 0) {
+ struct tile *ptile = tiles[myrand(count)];
- if (pcity && can_unit_exist_at_tile(punit, pcity->tile)) {
- (void) teleport_unit_to_city(punit, pcity, 0, verbose);
- } else {
- /* remove it */
if (verbose) {
- notify_player(unit_owner(punit), punit->tile, E_UNIT_LOST,
- _("Disbanded your %s."),
- unit_name_translation(punit));
+ /* TRANS: A unit is moved to resolve stack conflicts. */
+ notify_player(pplayer, ptile, E_UNIT_RELOCATED, _("Moved your %s."),
+ unit_name_translation(punit));
}
- wipe_unit(punit);
+ move_unit(punit, ptile, 0);
+ return;
+ }
+
+ /* Didn't find a place to bounce the unit, just disband it. */
+ if (verbose) {
+ /* TRANS: A unit is disbanded to resolve stack conflicts. */
+ notify_player(pplayer, punit_tile, E_UNIT_LOST,
+ _("Disbanded your %s."),
+ unit_name_translation(punit));
}
+ wipe_unit(punit);
}
@@ -1547,7 +1581,7 @@ void kill_unit(struct unit *pkiller, struct unit *punit, bool vet)
nation_adjective_for_player(pvictim),
unit_name_translation(punit));
if (vet) {
- notify_unit_experience(pkiller, TRUE);
+ notify_unit_experience(pkiller);
}
notify_player(pvictim, punit->tile, E_UNIT_LOST,
/* TRANS: "Cannon ... the Polish Destroyer." */
@@ -1594,7 +1628,7 @@ void kill_unit(struct unit *pkiller, struct unit *punit, bool vet)
unit_name_translation(punit),
unitcount - 1);
if (vet) {
- notify_unit_experience(pkiller, TRUE);
+ notify_unit_experience(pkiller);
}
/* inform the owners: this only tells about owned units that were killed.
diff --git a/server/unittools.h b/server/unittools.h
index 29e80cd..23d6efd 100644
--- a/server/unittools.h
+++ b/server/unittools.h
@@ -23,7 +23,7 @@
struct unit_type *find_a_unit_type(enum unit_role_id role,
enum unit_role_id role_tech);
bool maybe_make_veteran(struct unit *punit);
-void notify_unit_experience(struct unit *punit, bool also);
+void notify_unit_experience(struct unit *punit);
void unit_versus_unit(struct unit *attacker, struct unit *defender,
bool bombard);
diff --git a/utility/Makefile.am b/utility/Makefile.am
index 3fa02cc..154b313 100644
--- a/utility/Makefile.am
+++ b/utility/Makefile.am
@@ -27,6 +27,7 @@ libcivutility_a_SOURCES = \
inputfile.h \
ioz.c \
ioz.h \
+ iterator.h \
log.c \
log.h \
netintf.c \
diff --git a/utility/Makefile.in b/utility/Makefile.in
index 5e4f60f..0b24b50 100644
--- a/utility/Makefile.in
+++ b/utility/Makefile.in
@@ -204,6 +204,7 @@ libcivutility_a_SOURCES = \
inputfile.h \
ioz.c \
ioz.h \
+ iterator.h \
log.c \
log.h \
netintf.c \
diff --git a/utility/hash.c b/utility/hash.c
index e2e7dc2..a405edf 100644
--- a/utility/hash.c
+++ b/utility/hash.c
@@ -130,8 +130,16 @@ struct hash_table {
unsigned int num_entries; /* does not included deleted entries */
unsigned int num_deleted;
bool frozen; /* do not auto-resize when set */
+ bool no_shrink; /* do not auto-shrink when set */
};
+struct hash_iter {
+ struct iterator vtable;
+ const struct hash_bucket *b, *end;
+};
+
+#define HASH_ITER(p) ((struct hash_iter *)(p))
+
/* Calculate hash value given hash_table ptr and key: */
#define HASH_VAL(h,k) (((h)->fval)((k), ((h)->num_buckets)))
@@ -158,6 +166,7 @@ static void zero_htable(struct hash_table *h)
h->free_data_func = NULL;
h->num_buckets = h->num_entries = h->num_deleted = 0;
h->frozen = FALSE;
+ h->no_shrink = FALSE;
}
@@ -438,6 +447,9 @@ static void hash_maybe_resize(struct hash_table *h, bool expandingp)
if (h->frozen) {
return;
}
+ if (!expandingp && h->no_shrink) {
+ return;
+ }
num_used = h->num_entries + h->num_deleted;
if (expandingp) {
limit = FULL_RATIO * h->num_buckets;
@@ -663,9 +675,16 @@ void hash_delete_all_entries(struct hash_table *h)
{
unsigned int bucket_nr;
- /* Modeled after hash_key_by_number and hash_delete_entry. */
- for (bucket_nr = 0; bucket_nr < h->num_buckets; bucket_nr++) {
- hash_delete_bucket(h, &h->buckets[bucket_nr], NULL, NULL);
+ if (h->free_key_func == NULL && h->free_data_func == NULL) {
+ memset(h->buckets, 0, sizeof(struct hash_bucket) * h->num_buckets);
+ h->num_entries = 0;
+ h->num_deleted = 0;
+ h->frozen = FALSE;
+ } else {
+ /* Modeled after hash_key_by_number and hash_delete_entry. */
+ for (bucket_nr = 0; bucket_nr < h->num_buckets; bucket_nr++) {
+ hash_delete_bucket(h, &h->buckets[bucket_nr], NULL, NULL);
+ }
}
hash_maybe_shrink(h);
}
@@ -771,3 +790,112 @@ const void *hash_value_by_number(const struct hash_table *h,
{
return hash_lookup_data(h, hash_key_by_number(h, entry_number));
}
+
+/**************************************************************************
+ Prevent or allow the hash table automatically shrinking. Returns
+ the old value of the setting.
+**************************************************************************/
+bool hash_set_no_shrink(struct hash_table *h, bool no_shrink)
+{
+ bool old = h->no_shrink;
+ h->no_shrink = no_shrink;
+ return old;
+}
+
+/**************************************************************************
+ "Sizeof" function implementation for generic_iterate hash iterators.
+**************************************************************************/
+size_t hash_iter_sizeof(void)
+{
+ return sizeof(struct hash_iter);
+}
+
+/**************************************************************************
+ Helper function for hash (key, value) pair iteration.
+**************************************************************************/
+void *hash_iter_get_key(const struct iterator *hash_iter)
+{
+ struct hash_iter *it = HASH_ITER(hash_iter);
+ return (void *) it->b->key;
+}
+
+/**************************************************************************
+ Helper function for hash (key, value) pair iteration.
+**************************************************************************/
+void *hash_iter_get_value(const struct iterator *hash_iter)
+{
+ struct hash_iter *it = HASH_ITER(hash_iter);
+ return (void *) it->b->data;
+}
+
+/**************************************************************************
+ Iterator interface 'next' function implementation.
+**************************************************************************/
+static void hash_iter_next(struct iterator *iter)
+{
+ struct hash_iter *it = HASH_ITER(iter);
+ do {
+ it->b++;
+ } while (it->b < it->end && it->b->used != BUCKET_USED);
+}
+
+/**************************************************************************
+ Iterator interface 'get' function implementation. This just returns the
+ iterator itself, so you would need to use hash_iter_get_key/value to
+ get the actual keys and values.
+**************************************************************************/
+static void *hash_iter_get(const struct iterator *iter)
+{
+ return (void *) iter;
+}
+
+/**************************************************************************
+ Iterator interface 'valid' function implementation.
+**************************************************************************/
+static bool hash_iter_valid(const struct iterator *iter)
+{
+ struct hash_iter *it = HASH_ITER(iter);
+ return it->b < it->end;
+}
+
+/**************************************************************************
+ Returns an iterator that iterates over both keys and values of the hash
+ table. NB: iterator_get() returns an iterator pointer, so use the helper
+ functions hash_iter_get_{key,value} to access the key and value.
+**************************************************************************/
+struct iterator *hash_iter_init(struct hash_iter *it,
+ const struct hash_table *h)
+{
+ it->vtable.next = hash_iter_next;
+ it->vtable.get = hash_iter_get;
+ it->vtable.valid = hash_iter_valid;
+ it->b = h->buckets - 1;
+ it->end = h->buckets + h->num_buckets;
+
+ /* Seek to the first used bucket. */
+ hash_iter_next(ITERATOR(it));
+
+ return ITERATOR(it);
+}
+
+/**************************************************************************
+ Returns an iterator over the hash table's keys.
+**************************************************************************/
+struct iterator *hash_key_iter_init(struct hash_iter *it,
+ const struct hash_table *h)
+{
+ struct iterator *ret = hash_iter_init(it, h);
+ it->vtable.get = hash_iter_get_key;
+ return ret;
+}
+
+/**************************************************************************
+ Returns an iterator over the hash table's values.
+**************************************************************************/
+struct iterator *hash_value_iter_init(struct hash_iter *it,
+ const struct hash_table *h)
+{
+ struct iterator *ret = hash_iter_init(it, h);
+ it->vtable.get = hash_iter_get_value;
+ return ret;
+}
diff --git a/utility/hash.h b/utility/hash.h
index 9dc6e1d..4200d5c 100644
--- a/utility/hash.h
+++ b/utility/hash.h
@@ -79,4 +79,35 @@ unsigned int hash_num_entries(const struct hash_table *h);
unsigned int hash_num_buckets(const struct hash_table *h);
unsigned int hash_num_deleted(const struct hash_table *h);
+bool hash_set_no_shrink(struct hash_table *h,
+ bool no_shrink);
+
+#include "iterator.h"
+
+struct hash_iter;
+size_t hash_iter_sizeof(void);
+
+struct iterator *hash_key_iter_init(struct hash_iter *it,
+ const struct hash_table *h);
+#define hash_keys_iterate(ARG_ht, NAME_key)\
+ generic_iterate(struct hash_iter, void *, NAME_key,\
+ hash_iter_sizeof, hash_key_iter_init, (ARG_ht))
+#define hash_keys_iterate_end generic_iterate_end
+
+struct iterator *hash_value_iter_init(struct hash_iter *it,
+ const struct hash_table *h);
+#define hash_values_iterate(ARG_ht, NAME_value)\
+ generic_iterate(struct hash_iter, void *, NAME_value,\
+ hash_iter_sizeof, hash_value_iter_init, (ARG_ht))
+#define hash_values_iterate_end generic_iterate_end
+
+struct iterator *hash_iter_init(struct hash_iter *it,
+ const struct hash_table *h);
+void *hash_iter_get_key(const struct iterator *hash_iter);
+void *hash_iter_get_value(const struct iterator *hash_iter);
+#define hash_iterate(ARG_ht, NAME_iter)\
+ generic_iterate(struct hash_iter, struct iterator *, NAME_iter,\
+ hash_iter_sizeof, hash_iter_init, (ARG_ht))
+#define hash_iterate_end generic_iterate_end
+
#endif /* FC__HASH_H */
diff --git a/utility/iterator.h b/utility/iterator.h
new file mode 100644
index 0000000..738d019
--- /dev/null
+++ b/utility/iterator.h
@@ -0,0 +1,88 @@
+/***********************************************************************
+ 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__ITERATOR_H
+#define FC__ITERATOR_H
+
+/***********************************************************************
+ Iterator base class. "Derived" iterators must have this struct as
+ their first member (as a "vtable") and provide implementations of the
+ "pure virtual" member functions. See the function comment headers
+ below for the expected behaviour of these functions.
+***********************************************************************/
+struct iterator {
+ void (*next)(struct iterator *it);
+ void *(*get)(const struct iterator *it);
+ bool (*valid)(const struct iterator *it);
+};
+
+#define ITERATOR(p) ((struct iterator *)(p))
+
+/***********************************************************************
+ Advances the iterator to point to the next item in the sequence.
+***********************************************************************/
+static inline void iterator_next(struct iterator *it) {
+ it->next(it);
+}
+
+/***********************************************************************
+ Returns the item currently pointed to by the iterator. Note that the
+ iterator could point to an item whose value is NULL; to actually test
+ whether the iterator is still valid (e.g. has not gone past the
+ end of the sequence), use iterator_valid().
+***********************************************************************/
+static inline void *iterator_get(const struct iterator *it) {
+ return it->get(it);
+}
+
+/***********************************************************************
+ Returns TRUE if the iterator points to an item in the sequence.
+***********************************************************************/
+static inline bool iterator_valid(const struct iterator *it) {
+ return it->valid(it);
+}
+
+/***************************************************************************
+ Iteration macro for iterators derived from the 'iterator' base class.
+ Usually you would define a specific iteration macro for each derived
+ iterator type. The meaning of the arguments is as follows:
+
+ TYPE_it - The type of the derived iterator. E.g. 'struct foo_iter'.
+ TYPE_a - The real type of the items in the list. The variable with name
+ 'NAME_a' will be cast to this.
+ NAME_a - The name of the variable that will be assigned the current item
+ in each iteration. It will be declared for you within the scope
+ of the iteration loop.
+ FUNC_size - A function that returns the total size in bytes of a
+ 'TYPE_it'.
+ FUNC_init - A "construtor" for 'TYPE_it' objects. It returns a pointer to
+ a 'struct iterator' and takes as its first argument a pointer
+ to memory large enough to hold a 'TYPE_it' (this amount must
+ match the result of FUNC_size()). NB: This function must not
+ return NULL; it must return a valid iterator pointing to the
+ first element in the sequence, or an invalid iterator.
+ ... - Zero or more extra arguments that 'FUNC_init' expects.
+***************************************************************************/
+#define generic_iterate(TYPE_it, TYPE_a, NAME_a, FUNC_size, FUNC_init, ...)\
+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__);\
+ for (; iterator_valid(MY_it_##NAME_a); iterator_next(MY_it_##NAME_a)) {\
+ NAME_a = (TYPE_a) iterator_get(MY_it_##NAME_a);\
+
+#define generic_iterate_end\
+ }\
+} while (FALSE)
+
+#endif /* FC__ITERATOR_H */
diff --git a/utility/timing.c b/utility/timing.c
index 49337c8..ee2a6a1 100644
--- a/utility/timing.c
+++ b/utility/timing.c
@@ -213,7 +213,9 @@ struct timer *renew_timer_start(struct timer *t, enum timer_timetype type,
***********************************************************************/
void free_timer(struct timer *t)
{
- free(t);
+ if (t != NULL) {
+ free(t);
+ }
}
/**********************************************************************
diff --git a/version.in b/version.in
index 3c0865e..279d11d 100644
--- a/version.in
+++ b/version.in
@@ -6,13 +6,13 @@ FREECIV_VERSION_COMMENT(" are defined differently depending on ")
FREECIV_VERSION_COMMENT(" language used. Don't add comments ")
FREECIV_VERSION_COMMENT(" specific to some language into this file. ")
-FREECIV_VERSION_INFO(2,1,8,[""])
+FREECIV_VERSION_INFO(2,1,9,[""])
FREECIV_DEVEL_VERSION(0)
FREECIV_BETA_VERSION(0)
-FREECIV_NEXT_VERSION(["2.1.9"])
-FREECIV_RELEASE_MONTH(1)
+FREECIV_NEXT_VERSION(["2.1.10"])
+FREECIV_RELEASE_MONTH(5)
# Freeciv network capstring: see documentation in common/capstr.c
#
--
Civilization turn-based strategy game
More information about the Pkg-games-commits
mailing list